From efce4ee1c3e6ad6843982a3e84689526a36f73fa Mon Sep 17 00:00:00 2001
From: Ivascu Madalin <madalin.ivascu@arnia.ro>
Date: Thu, 2 Nov 2023 15:48:22 +0000
Subject: [PATCH] fix issues

---
 .../templates/component/payment/after.phtml   | 24 +++++++++----------
 .../component/payment/method/applepay.phtml   |  7 +-----
 .../payment/method/creditcards.phtml          |  7 +-----
 .../component/payment/method/giftcards.phtml  |  8 +------
 .../component/payment/method/mrcash.phtml     |  8 +------
 .../component/payment/method/voucher.phtml    |  8 +------
 6 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/view/frontend/templates/component/payment/after.phtml b/view/frontend/templates/component/payment/after.phtml
index f23e2ad..0210427 100644
--- a/view/frontend/templates/component/payment/after.phtml
+++ b/view/frontend/templates/component/payment/after.phtml
@@ -1,4 +1,3 @@
-
 <div class="bk-modal-wrap" x-data="{
     showModal: false,
     title: '<?= $escaper->escapeHtml(__('Success')); ?>',
@@ -65,7 +64,7 @@
                     </p>
                 </div>
                 <!-- Modal footer -->
-                
+
                 <div class="flex items-center p-2 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
                     <template x-if="Array.isArray(buttons)">
                         <template x-for="(button, index) in buttons" :key="index">
@@ -89,18 +88,19 @@
 </div>
 <script>
     function buckarooStart() {
-        let buckarooTask;
-        window.addEventListener("buckaroo-add-task", (event) => {
-            if (event.detail.buckarooTask) {
-                buckarooTask = event.detail.buckarooTask;
-            }
+        const addTask = function() {
+            hyvaCheckout.navigation.addTask(async () => {
+                if (window.buckarooTask) {
+                    await window.buckarooTask();
+                }
+            })
+        }
+        addTask();
+        window.addEventListener('checkout:navigation:success', (event) => {
+            if (event.detail.route === 'payment')
+                addTask();
         });
 
-        hyvaCheckout.navigation.addTask(async () => {
-            if (buckarooTask) {
-                await buckarooTask();
-            }
-        })
 
         function buckaroo_load_sdk() {
             return new Promise(resolve => {
diff --git a/view/frontend/templates/component/payment/method/applepay.phtml b/view/frontend/templates/component/payment/method/applepay.phtml
index 0330bb4..1e229c8 100644
--- a/view/frontend/templates/component/payment/method/applepay.phtml
+++ b/view/frontend/templates/component/payment/method/applepay.phtml
@@ -86,15 +86,10 @@ use Magento\Framework\Escaper;
         this.config = this.$wire.get('config');
         this.loadSdk().then(async () => {
             this.canDisplay = await BuckarooApplePay.checkPaySupport();
-            const v = async () => {
+            window.buckarooTask = async () => {
                 if(this.canDisplay)
                     await this.beginPayment();
             };
-            window.dispatchEvent(new CustomEvent('buckaroo-add-task', {
-                detail: {
-                    buckarooTask: v
-                }
-            }));
         });
     }
 }" x-init="register()" novalidate>
diff --git a/view/frontend/templates/component/payment/method/creditcards.phtml b/view/frontend/templates/component/payment/method/creditcards.phtml
index 790bd4d..88a5976 100644
--- a/view/frontend/templates/component/payment/method/creditcards.phtml
+++ b/view/frontend/templates/component/payment/method/creditcards.phtml
@@ -50,7 +50,7 @@ use Magento\Framework\Escaper;
                             }
                             return true;
                         }
-                        const v = async () => {
+                        window.buckarooTask = async () => {
                             const isValid = await formValid();
                             if (this.cseHasLoaded && isValid) {
                                 const encryptedCardData = await this.saveEncryptedData();
@@ -60,11 +60,6 @@ use Magento\Framework\Escaper;
                                 );
                             }
                         };
-                        window.dispatchEvent(new CustomEvent('buckaroo-add-task', {
-                            detail: {
-                                buckarooTask: v
-                            }
-                        }));
 
                     },
                     getIssuerImage: function() {
diff --git a/view/frontend/templates/component/payment/method/giftcards.phtml b/view/frontend/templates/component/payment/method/giftcards.phtml
index 2a14a0c..7195177 100644
--- a/view/frontend/templates/component/payment/method/giftcards.phtml
+++ b/view/frontend/templates/component/payment/method/giftcards.phtml
@@ -69,17 +69,11 @@ if (!$magewire->isRedirect()) {
         },
         register() {
             this.listenToSubmit();
-            const v = async () => {
+            window.buckarooTask = async () => {
                 if(!this.canSubmit) {
                     await this.submit();
                 }
             };
-            window.dispatchEvent(new CustomEvent('buckaroo-add-task', {
-                detail: {
-                    buckarooTask: v
-                }
-            }));
-
         },
 
     })" x-init="register()" novalidate>
diff --git a/view/frontend/templates/component/payment/method/mrcash.phtml b/view/frontend/templates/component/payment/method/mrcash.phtml
index fc240e0..c1be663 100644
--- a/view/frontend/templates/component/payment/method/mrcash.phtml
+++ b/view/frontend/templates/component/payment/method/mrcash.phtml
@@ -48,19 +48,13 @@ use Magento\Framework\Escaper;
                             }
                             return true;
                         }
-                        const v = async () => {
+                        window.buckarooTask = async () => {
                             const isValid = await formValid();
                             if (this.cseHasLoaded && isValid) {
                                 const encryptedCardData = await this.saveEncryptedData();
                                 await this.$wire.updatedEncryptedData(encryptedCardData);
                             }
                         };
-                        window.dispatchEvent(new CustomEvent('buckaroo-add-task', {
-                            detail: {
-                                buckarooTask: v
-                            }
-                        }));
-
                     }
                 })" x-init="register()" novalidate>
             <div class="flex flex-col gap-y-2 field field-reserved">
diff --git a/view/frontend/templates/component/payment/method/voucher.phtml b/view/frontend/templates/component/payment/method/voucher.phtml
index 421b69c..5cf9d1d 100644
--- a/view/frontend/templates/component/payment/method/voucher.phtml
+++ b/view/frontend/templates/component/payment/method/voucher.phtml
@@ -72,17 +72,11 @@ use Magento\Framework\Escaper;
             }));
         },
         register() {
-            const v = async () => {
+            window.buckarooTask = async () => {
                 if(!this.canSubmit) {
                     await this.submit();
                 }
             };
-            window.dispatchEvent(new CustomEvent('buckaroo-add-task', {
-                detail: {
-                    buckarooTask: v
-                }
-            }));
-
         },
 
     })" x-init="register()" novalidate>