@salla.sa/applepay 2.13.37 → 2.13.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salla.sa/applepay",
-  "version": "2.13.37",
+  "version": "2.13.38",
   "description": "Salla Apple Pay light",
   "main": "dist/app.js",
   "scripts": {
@@ -26,5 +26,5 @@
   "dependencies": {
     "axios": "^0.23.0"
   },
-  "gitHead": "77a9728c2fdc13d9cf9e1c5b661067927997abd2"
+  "gitHead": "c1a307509629e442ade1cae566690f3773bdf012"
 }

package/src/index.js

@@ -231,35 +231,45 @@ window.SallaApplePay = {
      *
      * @param event
      */
-    onValidateMerchant: (event) => {
-        Salla.event.dispatch('payments::apple-pay.validate-merchant.init', event);
+    onValidateMerchant: async (event) => {
+        try {
+            // Dispatch event to initialize Apple Pay merchant validation
+            Salla.event.dispatch('payments::apple-pay.validate-merchant.init', event);
 
-        Http.post(SallaApplePay.detail.validateMerchant.url.replace('{id}', SallaApplePay.id), {
-            validation_url: event.validationURL
-        }, ({data}) => {
+            // Post request to validate merchant
+            const { data } = await Http.post(SallaApplePay.detail.validateMerchant.url.replace('{id}', SallaApplePay.id), {
+                validation_url: event.validationURL
+            });
 
+            // Dispatch event on successful merchant validation
             Salla.event.dispatch('payments::apple-pay.validate-merchant.success', data);
 
+            // Define a function to handle the completion of merchant validation
+            const completeMerchantValidation = async (responseData) => {
+                try {
+                    await SallaApplePay.recalculateTotal();
+                } catch (error) {
+                    salla.logger.warn('🍏 Pay: Failed recalculate total', error);
+                }
+                SallaApplePay.session.completeMerchantValidation(responseData);
+            };
+
+            // Check if onSuccess function is defined in SallaApplePay.detail.validateMerchant
             if (typeof SallaApplePay.detail.validateMerchant.onSuccess === 'function') {
-                SallaApplePay.detail.validateMerchant.onSuccess(data).then((response) => {
-                    // check if there are redirect
-                    if (response?.redirect) {
-                        window.location = response.redirect;
-                        return SallaApplePay.abortValidateMerchant(response);
-                    }
-
-                    SallaApplePay.session.completeMerchantValidation(data.data);
-                }).catch((response) => {
-                    SallaApplePay.abortValidateMerchant(response);
-                });
-            } else {
-                SallaApplePay.session.completeMerchantValidation(data.data);
+                // Call onSuccess function and handle response
+                const response = await SallaApplePay.detail.validateMerchant.onSuccess(data);
+                if (response?.redirect) {
+                    // Handle redirect if present
+                    window.location = response.redirect;
+                    return SallaApplePay.abortValidateMerchant(response);
+                }
             }
-
-        }, (error) => {
+            completeMerchantValidation(data.data);
+        } catch (error) {
+            // Handle errors
             console.error(error);
             SallaApplePay.abortValidateMerchant(error?.response);
-        });
+        }
     },
 
     abortValidateMerchant: (response = null) => {