Merge branch 'support/1.x/hotfix/1.11.2' into support/1.x/master

Author: Alima Grine

CHANGELOG.md

@@ -1,3 +1,12 @@
+1.11.2, 2020-08-19:
+- [embedded] Bug fix: Do not cancel orders in status "Fraud suspected" when new IPN calls are made.
+- [embedded] Bug fix: Error due to strongAuthenticationState field renaming in REST token creation.
+- [embedded] Bug fix: Compatibility of payment with embedded fields with Internet Explorer 11.
+- [embedded] Bug fix: Error 500 due to riskControl modified format in REST response.
+- [oney] Bug fix: Fix Oney3x4x options requirement.
+- [oney] Make phone number mandatory for Oney 3x/4x payments.
+- Update payment means logos.
+
 1.11.1, 2020-04-29:
 - [embedded] Bugfix: Payment fields error relative to new JavaScript client library.
 - [embedded] Disable 1-Click payment buttons when using payment with embedded fields.

app/code/community/Lyranetwork/Payzen/Block/Adminhtml/System/Config/Field/CategoryMapping.php

@@ -43,9 +43,9 @@ public function __construct()
     }
 
     /**
-     * Obtain existing data from form element
+     * Obtain existing data from form element.
      *
-     * Each row will be instance of Varien_Object
+     * Each row will be instance of Varien_Object.
      *
      * @return array
      */

app/code/community/Lyranetwork/Payzen/Block/Adminhtml/System/Config/Field/Choozeo/CustgroupOptions.php

@@ -24,7 +24,14 @@ public function __construct()
             )
         );
 
-        $options = array('options' => Lyranetwork_Payzen_Model_Api_Api::getSupportedCardTypes());
+        $cards = Lyranetwork_Payzen_Model_Api_Api::getSupportedCardTypes();
+
+        foreach ($cards as $code => $label) {
+            $cards[$code] = $code . " - " . $label;
+        }
+
+        $options = array('options' => $cards);
+
         $this->addColumn(
             'means',
             array(

app/code/community/Lyranetwork/Payzen/Block/Adminhtml/System/Config/Field/Choozeo/PaymentOptions.php

@@ -10,9 +10,8 @@
 
 class Lyranetwork_Payzen_Block_Redirect extends Mage_Core_Block_Template
 {
-
     /**
-     * Get checkout session namespace
+     * Get checkout session namespace.
      *
      * @return Mage_Checkout_Model_Session
      */
@@ -32,7 +31,7 @@ protected function _getMethodInstance()
     }
 
     /**
-     * Return order instance with loaded information by increment id
+     * Return order instance with loaded information by increment id.
      *
      * @return Mage_Sales_Model_Order
      */
@@ -50,7 +49,7 @@ protected function _getOrder()
     }
 
     /**
-     * Get Form data by using ops payment api
+     * Get Form data by using ops payment api.
      *
      * @return array
      */
@@ -60,7 +59,7 @@ public function getFormFields()
     }
 
     /**
-     * Getting gateway url
+     * Getting gateway url.
      *
      * @return string
      */

app/code/community/Lyranetwork/Payzen/Block/Adminhtml/System/Config/Field/Other/PaymentMeans.php

@@ -10,7 +10,6 @@
 
 class Lyranetwork_Payzen_Helper_Data extends Mage_Core_Helper_Abstract
 {
-
     /**
      *
      * @var array a global var to easily enable/disable features
@@ -31,7 +30,6 @@ class Lyranetwork_Payzen_Helper_Data extends Mage_Core_Helper_Abstract
         'postfinance' => true,
         'giropay' => true,
         'ideal' => true,
-        'choozeo' => false,
         'fullcb' => true,
         'sepa' => true
     );

app/code/community/Lyranetwork/Payzen/Block/Choozeo.php

@@ -552,6 +552,14 @@ public function doPaymentRestCheck($controller)
             return;
         }
 
+        // Case of failure when retries are enabled, do nothing before last attempt.
+        if (! $response->isAcceptedPayment() && ($answer['orderCycle'] !== 'CLOSED')) {
+            $this->_getHelper()->log("Payment is not accepted but buyer can try to re-order. Do not create order at this time. Quote ID: #{$quoteId},
+                    reserved order ID: #{$quote->getReservedOrderId()}.");
+            $controller->getResponse()->setBody($response->getOutputForPlatform('payment_ko_bis'));
+            return;
+        }
+
         // Clear quote data.
         $quote->getPayment()->unsAdditionalInformation(self::TOKEN_DATA);
         $quote->getPayment()->unsAdditionalInformation(self::TOKEN);
@@ -904,7 +912,7 @@ public function updatePaymentInfo(Mage_Sales_Model_Order $order, $response)
                         ' '
                     );
 
-                    $amountDetail = $effectiveAmount. ' ' . $effectiveCurrency->getAlpha3() . ' (' . $amountDetail . ')';
+                    $amountDetail = $effectiveAmount . ' ' . $effectiveCurrency->getAlpha3() . ' (' . $amountDetail . ')';
                 }
 
                 $additionalInfo = array(

app/code/community/Lyranetwork/Payzen/Block/Redirect.php

@@ -10,9 +10,8 @@
 
 class Lyranetwork_Payzen_Helper_Payment_Data extends Mage_Payment_Helper_Data
 {
-
     /**
-     * Retrieve method model object
+     * Retrieve method model object.
      *
      * @param   string $code
      * @return  Mage_Payment_Model_Method_Abstract|false
@@ -23,7 +22,7 @@ public function getMethodInstance($code)
             $code = 'payzen_other';
         }
 
-        $key = self::XML_PATH_PAYMENT_METHODS.'/'.$code.'/model';
+        $key = self::XML_PATH_PAYMENT_METHODS . '/' . $code . '/model';
         $class = Mage::getStoreConfig($key);
         return Mage::getModel($class);
     }