2.5.37 (#146)

* Payment mappers refactorization and code improvements

* small fix

* bump up version

* small fixes

* small fix on total amount formating
bump up version

* fixed compatibility issues
Other fixes and improvements

* fixed compatibility issues
Other fixes and improvements

* Minor improvements

* Minor improvements

* Adyen v9 vault js mixin added for proper data collection

* Adyen v9 vault js mixin added for proper data collection

* Adyen v9 vault js mixin added for proper data collection

* bump up version

* bump up version

Author: cristianbalajosf

Model/ActionsHandler/Approve.php

@@ -80,7 +80,7 @@ public function __construct(
     public function handleApproveImmediatly($order)
     {
         try {
-            $paymentBaseAmountAuthorized = $order->getPayment()->getBaseAmountAuthorized();
+            $paymentBaseAmountAuthorized = $order->getPayment()->getBaseAmountAuthorized() ?? $order->getPayment()->getAmountAuthorized();
 
             if (!$paymentBaseAmountAuthorized || !($paymentBaseAmountAuthorized > 0)) {
                 return false;

Observer/OrderValidation/PaymentPlaceEnd.php

@@ -311,6 +311,9 @@ public function handleResponse($forterDecision, $order, $forterEntity)
             $message->metaData->pendingOnHoldEnabled = $this->forterConfig->isPendingOnHoldEnabled();
             $this->forterLogger->SendLog($message);
         }
+
+        $forterEntity->setEntityType('order');
+        $forterEntity->save();
     }
 
     public function handleDecline($order, $forterEntity)
@@ -328,8 +331,10 @@ public function handleDecline($order, $forterEntity)
             if ($order->canHold()) {
                 $order->setCanSendNewEmailFlag(false);
                 $this->decline->holdOrder($order);
-                $this->setMessage($order, 'decline', $forterEntity);
             }
+
+            $this->setMessage($order, 'decline', $forterEntity);
+
         } elseif ($result == '2') {
             $order->setCanSendNewEmailFlag(false);
             $this->decline->markOrderPaymentReview($order);

Observer/ThirdParty/Adyen/AdyenCcDataAssignObserver.php

@@ -14,6 +14,7 @@ class AdyenCcDataAssignObserver extends AbstractDataAssignObserver
     const CARD_BRAND = 'paymentMethod';
     const ADDITIONAL_DATA = 'additionalData';
 
+    const FORTER_STATE_DATA = 'forterData';
 
     /**
      * Approved root level keys from additional data array
@@ -62,6 +63,7 @@ public function execute(Observer $observer)
             $additionalData,
             self::$approvedAdditionalDataKeys
         );
+        $paymentInfo->unsAdditionalInformation(self::FORTER_STATE_DATA);
         $paymentInfo->setAdditionalInformation(self::ADDITIONAL_DATA, $additionalData);
     }
 }

composer.json

@@ -11,7 +11,7 @@
     "license": [
         "proprietary"
     ],
-    "version": "2.5.36",
+    "version": "2.5.37",
     "authors": [{
         "name": "Forter Dev",
         "email": "support@forter.com",

etc/adminhtml/system.xml

@@ -68,7 +68,7 @@
                     <label>Action On Decline (pre-authorization)</label>
                     <source_model>Forter\Forter\Model\Config\Source\PreAuthDeclineOptions</source_model>
                     <comment>
-                        On "Approve" or "Not Reviewed" we the action will be the payment gateway default
+                        On "Approve" or "Not Reviewed" the action will be the payment gateway default
                     </comment>
                     <depends>
                         <field id="pre_post_select" separator=",">1,4</field>

etc/module.xml

@@ -7,5 +7,5 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="Forter_Forter" setup_version="2.5.36"/>
+	<module name="Forter_Forter" setup_version="2.5.37"/>
 </config>

view/base/requirejs-config.js

@@ -11,8 +11,11 @@ var config = {
                 'Forter_Forter/js/model/vault-mixin': true
             },
             'PayPal_Braintree/js/view/payment/method-renderer/cc-form': {
-                 'Forter_Forter/js/model/paypal-braintree-cc-mixin': true
-            }
+                'Forter_Forter/js/model/paypal-braintree-cc-mixin': true
+            },
+             'Adyen_Payment/js/view/payment/method-renderer/adyen-cc-vault-method': {
+                'Forter_Forter/js/model/adyen-cc-vault-method-mixin': true
+            },
         }
     }
 };

view/frontend/web/js/model/adyen-cc-vault-method-mixin.js

@@ -0,0 +1,31 @@
+define([
+    'jquery',
+    'mage/utils/wrapper'
+], function ($, wrapper) {
+    'use strict';
+
+    return function (target) {
+        return target.extend({
+            getData: function () {
+                var data = this._super();
+
+                // Ensure additional_data exists
+                if (!data.additional_data) {
+                    data.additional_data = {};
+                }
+
+                // Check if methods exist before calling them
+                if (typeof this.getExpirationDate === 'function') {
+                    data.additional_data.expiryDate = this.getExpirationDate();
+                }
+                if (typeof this.getMaskedCard === 'function') {
+                    data.additional_data.cardSummary = this.getMaskedCard();
+                }
+                if (typeof this.getCardType === 'function') {
+                    data.additional_data.cardBrand = this.getCardType();
+                }
+                return data;
+            }
+        });
+    };
+});