Merge branch 'hotfix/2.4.7'

lyra · Jun 19, 2020 · 17290cd · 17290cd
2 parents 98e445c + 1445d35
commit 17290cd
Show file tree

Hide file tree

Showing 235 changed files with 94 additions and 17,072 deletions.
diff --git a/Block/Adminhtml/System/Config/Form/Field/CategoryMapping.php b/Block/Adminhtml/System/Config/Form/Field/CategoryMapping.php
@@ -14,7 +14,6 @@
  */
 class CategoryMapping extends \Lyranetwork\Payzen\Block\Adminhtml\System\Config\Form\Field\FieldArray\ConfigFieldArray
 {
-
     /**
      *
      * @var \Lyranetwork\Payzen\Model\System\Config\Source\CategoryFactory

diff --git a/Block/Adminhtml/System/Config/Form/Field/Choozeo/ChoozeoPaymentOptions.php b/Block/Adminhtml/System/Config/Form/Field/Choozeo/ChoozeoPaymentOptions.php
diff --git a/Block/Adminhtml/System/Config/Form/Field/CustgroupOptions.php b/Block/Adminhtml/System/Config/Form/Field/CustgroupOptions.php
@@ -14,7 +14,6 @@
  */
 class CustgroupOptions extends \Lyranetwork\Payzen\Block\Adminhtml\System\Config\Form\Field\FieldArray\ConfigFieldArray
 {
-
     /**
      *
      * @var \Magento\Customer\Model\GroupFactory

diff --git a/Block/Adminhtml/System/Config/Form/Field/FieldArray/ConfigFieldArray.php b/Block/Adminhtml/System/Config/Form/Field/FieldArray/ConfigFieldArray.php
@@ -14,7 +14,6 @@
  */
 abstract class ConfigFieldArray extends \Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray
 {
-
     /**
      *
      * @var bool

diff --git a/Block/Adminhtml/System/Config/Form/Field/Fullcb/FullcbPaymentOptions.php b/Block/Adminhtml/System/Config/Form/Field/Fullcb/FullcbPaymentOptions.php
@@ -14,7 +14,6 @@
  */
 class FullcbPaymentOptions extends \Lyranetwork\Payzen\Block\Adminhtml\System\Config\Form\Field\FieldArray\ConfigFieldArray
 {
-
     protected $staticTable = true;
 
     /**

diff --git a/Block/Adminhtml/System/Config/Form/Field/Gift/AddedCards.php b/Block/Adminhtml/System/Config/Form/Field/Gift/AddedCards.php
@@ -14,7 +14,6 @@
  */
 class AddedCards extends \Lyranetwork\Payzen\Block\Adminhtml\System\Config\Form\Field\FieldArray\ConfigFieldArray
 {
-
     /**
      * Prepare to render.
      *

diff --git a/Block/Adminhtml/System/Config/Form/Field/Label.php b/Block/Adminhtml/System/Config/Form/Field/Label.php
@@ -14,7 +14,6 @@
  */
 class Label extends \Magento\Config\Block\System\Config\Form\Field
 {
-
     /**
      * Unset some non-related element parameters.
      *

diff --git a/Block/Adminhtml/System/Config/Form/Field/Multi/MultiPaymentOptions.php b/Block/Adminhtml/System/Config/Form/Field/Multi/MultiPaymentOptions.php
@@ -14,7 +14,6 @@
  */
 class MultiPaymentOptions extends \Lyranetwork\Payzen\Block\Adminhtml\System\Config\Form\Field\FieldArray\ConfigFieldArray
 {
-
     /**
      * Prepare to render.
      *

diff --git a/Block/Adminhtml/System/Config/Form/Field/Renderer/ColumnLabel.php b/Block/Adminhtml/System/Config/Form/Field/Renderer/ColumnLabel.php
@@ -11,7 +11,6 @@
 
 class ColumnLabel extends \Magento\Framework\View\Element\AbstractBlock
 {
-
     protected function _toHtml()
     {
         $column = $this->getColumn();

diff --git a/Block/Adminhtml/System/Config/Form/Field/Renderer/ColumnList.php b/Block/Adminhtml/System/Config/Form/Field/Renderer/ColumnList.php
@@ -11,7 +11,6 @@
 
 class ColumnList extends \Magento\Framework\View\Element\AbstractBlock
 {
-
     protected function _toHtml()
     {
         $column = $this->getColumn();

diff --git a/Block/Adminhtml/System/Config/Form/Field/Renderer/ColumnUploadButton.php b/Block/Adminhtml/System/Config/Form/Field/Renderer/ColumnUploadButton.php
@@ -13,7 +13,6 @@
 
 class ColumnUploadButton extends \Magento\Framework\View\Element\AbstractBlock
 {
-
     /**
      *
      * @var\Magento\Store\Model\StoreManagerInterface

diff --git a/Block/Adminhtml/System/Config/Form/Field/Standard/RestPlaceholders.php b/Block/Adminhtml/System/Config/Form/Field/Standard/RestPlaceholders.php
@@ -14,7 +14,6 @@
  */
 class RestPlaceholders extends \Lyranetwork\Payzen\Block\Adminhtml\System\Config\Form\Field\FieldArray\ConfigFieldArray
 {
-
     /**
      *
      * @var bool

diff --git a/Block/Constants.php b/Block/Constants.php
@@ -11,7 +11,6 @@
 
 final class Constants
 {
-
     const PARAMS_REGISTRY_KEY = 'payzen_form_params';
 
     const URL_REGISTRY_KEY = 'payzen_form_url';

diff --git a/Block/Payment/Form/Choozeo.php b/Block/Payment/Form/Choozeo.php
diff --git a/Block/Payment/Form/Fullcb.php b/Block/Payment/Form/Fullcb.php
@@ -11,7 +11,6 @@
 
 class Fullcb extends Payzen
 {
-
     protected $_template = 'Lyranetwork_Payzen::payment/form/fullcb.phtml';
 
     public function getAvailableOptions()

diff --git a/Block/Payment/Form/Gift.php b/Block/Payment/Form/Gift.php
@@ -11,7 +11,6 @@
 
 class Gift extends Payzen
 {
-
     protected $_template = 'Lyranetwork_Payzen::payment/form/gift.phtml';
 
     public function getAvailableCcTypes()

diff --git a/Block/Payment/Form/Multi.php b/Block/Payment/Form/Multi.php
@@ -11,7 +11,6 @@
 
 class Multi extends Payzen
 {
-
     protected $_template = 'Lyranetwork_Payzen::payment/form/multi.phtml';
 
     public function getAvailableCcTypes()

diff --git a/Block/Payment/Form/Paypal.php b/Block/Payment/Form/Paypal.php
@@ -11,6 +11,5 @@
 
 class Paypal extends Payzen
 {
-
     protected $_template = 'Lyranetwork_Payzen::payment/form/paypal.phtml';
 }
diff --git a/Block/Payment/Form/Payzen.php b/Block/Payment/Form/Payzen.php
@@ -11,7 +11,6 @@
 
 abstract class Payzen extends \Magento\Payment\Block\Form
 {
-
     /**
      *
      * @var \Lyranetwork\Payzen\Helper\Data

diff --git a/Block/Payment/Form/Sepa.php b/Block/Payment/Form/Sepa.php
@@ -11,6 +11,5 @@
 
 class Sepa extends Payzen
 {
-
     protected $_template = 'Lyranetwork_Payzen::payment/form/sepa.phtml';
 }
diff --git a/Block/Payment/Form/Standard.php b/Block/Payment/Form/Standard.php
@@ -11,7 +11,6 @@
 
 class Standard extends Payzen
 {
-
     protected $_template = 'Lyranetwork_Payzen::payment/form/standard.phtml';
 
     public function getAvailableCcTypes()

diff --git a/Block/Payment/Iframe/Response.php b/Block/Payment/Iframe/Response.php
@@ -11,7 +11,6 @@
 
 class Response extends \Magento\Framework\View\Element\Template
 {
-
     /**
      *
      * @var string

diff --git a/Block/Payment/Info.php b/Block/Payment/Info.php
@@ -13,7 +13,6 @@
 
 class Info extends \Magento\Payment\Block\Info
 {
-
     /**
      *
      * @var string

diff --git a/Block/Payment/Redirect.php b/Block/Payment/Redirect.php
@@ -11,7 +11,6 @@
 
 class Redirect extends \Magento\Framework\View\Element\Template
 {
-
     /**
      *
      * @var \Magento\Framework\Registry

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+2.4.7, 2020-06-19:
+- [embedded] Bug fix: Amount did not include shipping fees when using embedded payment fields in some cases.
+- [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.
+- Bug fix: Fix brand choice field management when returning to store for a payment with gift card.
+
 2.4.6, 2020-05-12:
 - Some minor fixes.
 - [embedded] Bug fix: Use the correct return and private keys according to the plugin context mode.

diff --git a/Controller/Adminhtml/Payment/Response.php b/Controller/Adminhtml/Payment/Response.php
@@ -14,7 +14,6 @@
 
 class Response extends \Magento\Backend\App\Action
 {
-
     /**
      * @var \Lyranetwork\Payzen\Helper\Data
      */

diff --git a/Controller/Payment/Check.php b/Controller/Payment/Check.php
@@ -13,7 +13,6 @@
 
 class Check extends \Magento\Framework\App\Action\Action
 {
-
     /**
      *
      * @var \Lyranetwork\Payzen\Controller\Processor\CheckProcessor

diff --git a/Controller/Payment/Iframe/Loader.php b/Controller/Payment/Iframe/Loader.php
@@ -11,7 +11,6 @@
 
 class Loader extends \Magento\Framework\App\Action\Action
 {
-
     /**
      *
      * @var \Magento\Framework\View\Result\PageFactory

diff --git a/Controller/Payment/Redirect.php b/Controller/Payment/Redirect.php
@@ -13,7 +13,6 @@
 
 class Redirect extends \Magento\Framework\App\Action\Action
 {
-
     /**
      *
      * @var \Magento\Sales\Model\OrderFactory

diff --git a/Controller/Payment/Response.php b/Controller/Payment/Response.php
@@ -14,7 +14,6 @@
 
 class Response extends \Magento\Framework\App\Action\Action
 {
-
     /**
      *
      * @var \Lyranetwork\Payzen\Helper\Data

diff --git a/Controller/Payment/Rest/Check.php b/Controller/Payment/Rest/Check.php
@@ -14,7 +14,6 @@
 
 class Check extends \Lyranetwork\Payzen\Controller\Payment\Check
 {
-
     /**
      *
      * @var \Lyranetwork\Payzen\Helper\Data

diff --git a/Controller/Payment/Rest/Response.php b/Controller/Payment/Rest/Response.php
@@ -14,7 +14,6 @@
 
 class Response extends \Lyranetwork\Payzen\Controller\Payment\Response
 {
-
     /**
      *
      * @var \Magento\Sales\Model\OrderFactory

diff --git a/Controller/Payment/Rest/Token.php b/Controller/Payment/Rest/Token.php
@@ -13,7 +13,6 @@
 
 class Token extends \Magento\Framework\App\Action\Action
 {
-
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
      */

diff --git a/Controller/Processor/CheckProcessor.php b/Controller/Processor/CheckProcessor.php
@@ -14,7 +14,6 @@
 
 class CheckProcessor
 {
-
     /**
      *
      * @var \Lyranetwork\Payzen\Helper\Data

diff --git a/Controller/Processor/RedirectProcessor.php b/Controller/Processor/RedirectProcessor.php
@@ -11,7 +11,6 @@
 
 class RedirectProcessor
 {
-
     /**
      *
      * @var \Lyranetwork\Payzen\Helper\Data

diff --git a/Controller/Processor/ResponseProcessor.php b/Controller/Processor/ResponseProcessor.php
@@ -14,7 +14,6 @@
 
 class ResponseProcessor
 {
-
     /**
      *
      * @var \Lyranetwork\Payzen\Helper\Data
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ @@
      */
     class CategoryMapping extends \Lyranetwork\Payzen\Block\Adminhtml\System\Config\Form\Field\FieldArray\ConfigFieldArray
     {
         /**
          *
          * @var \Lyranetwork\Payzen\Model\System\Config\Source\CategoryFactory
@@ Expand Down @@