Merge branch 'hotfix/2.1.4'

hipay · Jan 22, 2018 · d7c59f0 · d7c59f0
2 parents 48e87d1 + b74c21e
commit d7c59f0
Show file tree

Hide file tree

Showing 4 changed files with 342 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 2.1.4
+
+- Fix: credit card block are displaying even if no credit card payment are activated
+
 # Version 2.1.3
 
 - Fix local payment with hosted order

diff --git a/src/hipay_enterprise/classes/helper/HipayHelper.php b/src/hipay_enterprise/classes/helper/HipayHelper.php
@@ -324,15 +324,19 @@ public static function getSortedActivatedPaymentByCountryAndCurrency(
         $customer
     ) {
         $activatedCreditCard = array();
-        $activatedCreditCard["credit_card"]["frontPosition"] = $configHipay["payment"]["global"]["ccFrontPosition"];
-        $activatedCreditCard["credit_card"]["products"] = self::getActivatedPaymentByCountryAndCurrency(
+        $creditCards = self::getActivatedPaymentByCountryAndCurrency(
             $module,
             $configHipay,
             "credit_card",
             $country,
             $currency,
             $orderTotal
         );
+
+        if (!empty($creditCards)) {
+            $activatedCreditCard["credit_card"]["frontPosition"] = $configHipay["payment"]["global"]["ccFrontPosition"];
+            $activatedCreditCard["credit_card"]["products"] = $creditCards;
+        }
 
         $activatedLocalPayment = self::getActivatedPaymentByCountryAndCurrency(
             $module,
@@ -398,22 +402,27 @@ public static function getActivatedPaymentByCountryAndCurrency(
                             'views/img/' .
                             $settings["logo"];
 
-                        $checkoutFieldsMandatory = isset($module->hipayConfigTool->getLocalPayment()[$name]["checkoutFieldsMandatory"]) ?
+                        $checkoutFieldsMandatory = isset($module->hipayConfigTool->getLocalPayment(
+                            )[$name]["checkoutFieldsMandatory"]) ?
                             $module->hipayConfigTool->getLocalPayment()[$name]["checkoutFieldsMandatory"] : "";
                         $fieldMandatory = array();
                         if (!empty($checkoutFieldsMandatory)) {
                             foreach ($checkoutFieldsMandatory as $field) {
                                 switch ($field) {
                                     case "phone":
                                         if (empty($address->{$field})) {
-                                            $fieldMandatory[] = $module->l('Please enter your phone number to use this payment method.');
-                                        } else if (!preg_match('"(0|\\+33|0033)[1-9][0-9]{8}"',$address->{$field})) {
+                                            $fieldMandatory[] = $module->l(
+                                                'Please enter your phone number to use this payment method.'
+                                            );
+                                        } else if (!preg_match('"(0|\\+33|0033)[1-9][0-9]{8}"', $address->{$field})) {
                                             $fieldMandatory[] = $module->l('Please check the phone number entered.');
                                         }
                                         break;
                                     case "gender":
                                         if (empty($customer->id_gender)) {
-                                            $fieldMandatory[] = $module->l('Please inform your civility to use this method of payment.');
+                                            $fieldMandatory[] = $module->l(
+                                                'Please inform your civility to use this method of payment.'
+                                            );
                                         }
                                         break;
                                     default:
@@ -422,7 +431,7 @@ public static function getActivatedPaymentByCountryAndCurrency(
                                 }
                             }
 
-                            $activatedPayment[$name]['errorMsg'] =  $fieldMandatory;
+                            $activatedPayment[$name]['errorMsg'] = $fieldMandatory;
                         }
 
                     }
@@ -551,7 +560,9 @@ private static function cmpPaymentProduct($a, $b)
     public static function orderExists($cart_id)
     {
         if ($cart_id) {
-            $result = (bool)Db::getInstance()->getValue('SELECT count(*) FROM `'._DB_PREFIX_.'orders` WHERE `id_cart` = '.(int)$cart_id);
+            $result = (bool)Db::getInstance()->getValue(
+                'SELECT count(*) FROM `' . _DB_PREFIX_ . 'orders` WHERE `id_cart` = ' . (int)$cart_id
+            );
             return $result;
         }
         return false;

diff --git a/src/hipay_enterprise/hipay_enterprise.php b/src/hipay_enterprise/hipay_enterprise.php
@@ -36,7 +36,7 @@ public function __construct()
 
         $this->name = 'hipay_enterprise';
         $this->tab = 'payments_gateways';
-        $this->version = '2.1.3';
+        $this->version = '2.1.4';
         $this->module_key = 'c3c030302335d08603e8669a5210c744';
         $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
         $this->currencies = true;