Release 13-03-2024

- Fix: remove double checkout payment initialization

Author: pk-nexigroup

Controller/Order/EmbeddedSaveOrder.php

@@ -10,7 +10,6 @@
 use Magento\Framework\App\ResponseInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Sales\Model\Order;
 
@@ -72,22 +71,22 @@ public function execute() {
         if (!$quote->getId()) {
             return $this->respondWithError('Empty quote');
         }
-        
+
         $this->logInfo("in EmbeddedSaveOrder to create order");
-        
+
         if (!$this->validateQuoteSignature()) {
             $this->logInfo("validation of quote signature failed");
-            
+
             return;
         }
-        
+
         $paymentId = $this->getRequest()->getPostValue('pid', null);
         if (!$paymentId) {
             return $this->respondWithError('Invalid payment id');
         }
-        
+
         $this->dibsCheckout->checkCart();
-        
+
         try {
             $this->logInfo("validation successful, creating order");
             $dibsPayment = $this->dibsCheckout->getDibsPaymentHandler()->loadDibsPaymentById($paymentId, $quote->getStoreId());
@@ -106,7 +105,8 @@ public function execute() {
         $result = $this->resultFactory->create('json');
         $result->setData([
                 'status' => 'Success.',
-                'paymentId' => $paymentId
+                'paymentId' => $paymentId,
+                'reload' => 0,
             ]);
         $result->setHttpResponseCode(200);
 

view/frontend/web/js/action/checkout-handler.js

@@ -53,9 +53,6 @@ define([
                         payment.thawCheckout();
                     }
                 });
-            },
-            validateTest: function() {
-
             },
             saveOrder: function(paymentId) {
                 const ctrlkey = this.ctrlkey;
@@ -73,13 +70,13 @@ define([
                     },
                     success: function (response) {
                         if ($.type(response) === 'object' && !$.isEmptyObject(response) && !response.reload) {
-                            this.sendPaymentOrderFinalizedEvent(true);
+                            this.send('payment-order-finalized', true);
                             if (response.messages) {
                                 alert(jQuery.mage.__(response.messages));
                             }
                         } else {
                             netsAlert({
-                                title: 'Error',
+                                title: 'Warning',
                                 content: response.messages,
                                 clickableOverlay: false,
                                 responsive: true,
@@ -96,7 +93,7 @@ define([
                                 }]
                             });
                             checkoutLoader.stopLoader();
-                            this.sendPaymentOrderFinalizedEvent(false);
+                            this.send('payment-order-finalized', false);
                             messageList.addErrorMessage({
                                message: response.messages
                             });
@@ -121,7 +118,7 @@ define([
                                     }
                                 }]
                             });
-                        this.sendPaymentOrderFinalizedEvent(false);
+                        this.send('payment-order-finalized', false);
                     }
                 });
             }

view/frontend/web/js/mixin/model/muodc/shipping-rate-processor.js

@@ -68,9 +68,6 @@ define([
                     }
 
                     var dibsCheckout = uiRegistry.get('nwtdibsCheckout');
-                    if (dibsCheckout) {
-                        dibsCheckout.initializeNewPayment();
-                    }
 
                     if (window.dibs_msuodc_enabled && dibsCheckout) {
                         dibsCheckout._ajaxSubmit(

view/frontend/web/js/view/payment/method-renderer/checkout-method.js

@@ -30,15 +30,14 @@ define(
             'use strict';
             var agreementsConfig = window.checkoutConfig.checkoutAgreements;
             var agreementsCheck = agreementsConfig.isEnabled;
-            
+
             var component = Component.extend({
 
                 defaults: {
                     template: 'Dibs_EasyCheckout/payment/checkout',
                     iframeUrl: null,
                     hideLoader: false
                 },
-                eventsInstantiated: false,
                 continueToDibsRedirect: function () {
                     let billingAddressComponent = require('uiRegistry').get('checkout.steps.billing-step.payment.payments-list.'+this.getCode()+'-form');
                     billingAddressComponent.updateAddress();
@@ -57,7 +56,7 @@ define(
                                     $.mage.redirect(paymentConfiguration.checkoutUrl);
                                 }
                             };
-    
+
                             this.initPaymentConfiguration(0, callback);
                         }.bind(this));
                         return false;
@@ -117,14 +116,12 @@ define(
                             };
                             self.dibsPayment = new Dibs.Checkout(checkoutOptions);
                             self.dibsPayment.ctrlkey = paymentConfiguration.ctrlkey;
-                            if (self.eventsInstantiated == false) {
-                                self.dibsPayment.on('payment-completed', vanillaCheckoutHandler.onCheckoutCompleteAction);
-                                self.dibsPayment.on('pay-initialized', vanillaCheckoutHandler.saveOrder);
-                                self.dibsPayment.on('payment-created', vanillaCheckoutHandler.validateTest);
-                                setCouponCodeAction.registerSuccessCallback(vanillaCheckoutHandler.updatePayment);
-                                cancelCouponCodeAction.registerSuccessCallback(vanillaCheckoutHandler.updatePayment);
-                                self.eventsInstantiated = true;
-                            }
+                            self.dibsPayment.on('pay-initialized', vanillaCheckoutHandler.saveOrder);
+                            self.dibsPayment.on('payment-completed', vanillaCheckoutHandler.onCheckoutCompleteAction);
+
+                            setCouponCodeAction.registerSuccessCallback(vanillaCheckoutHandler.updatePayment);
+                            cancelCouponCodeAction.registerSuccessCallback(vanillaCheckoutHandler.updatePayment);
+
                             self.hideLoader(true);
                         }
                     }.bind(this);