@salla.sa/applepay 3.0.0-alpha.0 → 3.0.0-beta.1

package/deploy.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "https://cdn.assets.salla.network/json-schemas/deploy.json",
+  "type": "package",
+  "publish": {
+    "npm": true,
+    "cdn": false
+  }
+}

package/package.json

@@ -1,13 +1,8 @@
 {
   "name": "@salla.sa/applepay",
-  "version": "3.0.0-alpha.0",
+  "version": "3.0.0-beta.1",
   "description": "Salla Apple Pay light",
   "main": "dist/app.js",
-  "scripts": {
-    "watch": "echo \"There is no watch!\"",
-    "build": "echo \"There is no build!\"",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/SallaApp/twilight.git"
@@ -24,7 +19,11 @@
   "license": "UNLICENSED",
   "homepage": "https://github.com/SallaApp/twilight#readme",
   "dependencies": {
-    "axios": "^0.23.0"
+    "axios": "^1.10.0"
   },
-  "gitHead": "741e5aadebda0f980c7c3ed2e9a85036e50d154c"
-}
+  "scripts": {
+    "watch": "echo \"There is no watch!\"",
+    "build": "echo \"There is no build!\"",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  }
+}

package/src/DetectOS.js

@@ -1,75 +1,84 @@
 export default {
-    options: [],
-    header: [navigator.platform, navigator.userAgent, navigator.appVersion, navigator.vendor, window.opera],
-    dataos: [
-        {name: 'Windows Phone', value: 'Windows Phone', version: 'OS'},
-        {name: 'Windows', value: 'Win', version: 'NT'},
-        {name: 'iPhone', value: 'iPhone', version: 'OS'},
-        {name: 'iPad', value: 'iPad', version: 'OS'},
-        {name: 'Kindle', value: 'Silk', version: 'Silk'},
-        {name: 'Android', value: 'Android', version: 'Android'},
-        {name: 'PlayBook', value: 'PlayBook', version: 'OS'},
-        {name: 'BlackBerry', value: 'BlackBerry', version: '/'},
-        {name: 'Macintosh', value: 'Mac', version: 'OS X'},
-        {name: 'Linux', value: 'Linux', version: 'rv'},
-        {name: 'Palm', value: 'Palm', version: 'PalmOS'}
-    ],
-    databrowser: [
-        {name: 'Chrome', value: 'Chrome', version: 'Chrome'},
-        {name: 'Firefox', value: 'Firefox', version: 'Firefox'},
-        {name: 'Safari', value: 'Safari', version: 'Version'},
-        {name: 'Internet Explorer', value: 'MSIE', version: 'MSIE'},
-        {name: 'Opera', value: 'Opera', version: 'Opera'},
-        {name: 'BlackBerry', value: 'CLDC', version: 'CLDC'},
-        {name: 'Mozilla', value: 'Mozilla', version: 'Mozilla'}
-    ],
-    init: function () {
-        var agent = this.header.join(' '),
-            os = this.matchItem(agent, this.dataos),
-            browser = this.matchItem(agent, this.databrowser);
+  options: [],
+  header:
+    typeof navigator !== "undefined" && typeof window !== "undefined"
+      ? [
+          navigator.platform,
+          navigator.userAgent,
+          navigator.appVersion,
+          navigator.vendor,
+          window.opera,
+        ]
+      : [],
+  dataos: [
+    { name: "Windows Phone", value: "Windows Phone", version: "OS" },
+    { name: "Windows", value: "Win", version: "NT" },
+    { name: "iPhone", value: "iPhone", version: "OS" },
+    { name: "iPad", value: "iPad", version: "OS" },
+    { name: "Kindle", value: "Silk", version: "Silk" },
+    { name: "Android", value: "Android", version: "Android" },
+    { name: "PlayBook", value: "PlayBook", version: "OS" },
+    { name: "BlackBerry", value: "BlackBerry", version: "/" },
+    { name: "Macintosh", value: "Mac", version: "OS X" },
+    { name: "Linux", value: "Linux", version: "rv" },
+    { name: "Palm", value: "Palm", version: "PalmOS" },
+  ],
+  databrowser: [
+    { name: "Chrome", value: "Chrome", version: "Chrome" },
+    { name: "Firefox", value: "Firefox", version: "Firefox" },
+    { name: "Safari", value: "Safari", version: "Version" },
+    { name: "Internet Explorer", value: "MSIE", version: "MSIE" },
+    { name: "Opera", value: "Opera", version: "Opera" },
+    { name: "BlackBerry", value: "CLDC", version: "CLDC" },
+    { name: "Mozilla", value: "Mozilla", version: "Mozilla" },
+  ],
+  init: function () {
+    var agent = this.header.join(" "),
+      os = this.matchItem(agent, this.dataos),
+      browser = this.matchItem(agent, this.databrowser);
 
-        return {os: os, browser: browser};
-    },
-    matchItem: function (string, data) {
-        var i = 0,
-            j = 0,
-            html = '',
-            regex,
-            regexv,
-            match,
-            matches,
-            version;
+    return { os: os, browser: browser };
+  },
+  matchItem: function (string, data) {
+    var i = 0,
+      j = 0,
+      html = "",
+      regex,
+      regexv,
+      match,
+      matches,
+      version;
 
-        for (i = 0; i < data.length; i += 1) {
-            regex = new RegExp(data[i].value, 'i');
-            match = regex.test(string);
-            if (match) {
-                regexv = new RegExp(data[i].version + '[- /:;]([\\d._]+)', 'i');
-                matches = string.match(regexv);
-                version = '';
-                if (matches) {
-                    if (matches[1]) {
-                        matches = matches[1];
-                    }
-                }
-                if (matches) {
-                    matches = matches.split(/[._]+/);
-                    for (j = 0; j < matches.length; j += 1) {
-                        if (j === 0) {
-                            version += matches[j] + '.';
-                        } else {
-                            version += matches[j];
-                        }
-                    }
-                } else {
-                    version = '0';
-                }
-                return {
-                    name: data[i].name,
-                    version: parseFloat(version)
-                };
+    for (i = 0; i < data.length; i += 1) {
+      regex = new RegExp(data[i].value, "i");
+      match = regex.test(string);
+      if (match) {
+        regexv = new RegExp(data[i].version + "[- /:;]([\\d._]+)", "i");
+        matches = string.match(regexv);
+        version = "";
+        if (matches) {
+          if (matches[1]) {
+            matches = matches[1];
+          }
+        }
+        if (matches) {
+          matches = matches.split(/[._]+/);
+          for (j = 0; j < matches.length; j += 1) {
+            if (j === 0) {
+              version += matches[j] + ".";
+            } else {
+              version += matches[j];
             }
+          }
+        } else {
+          version = "0";
         }
-        return {name: 'unknown', version: 0};
+        return {
+          name: data[i].name,
+          version: parseFloat(version),
+        };
+      }
     }
+    return { name: "unknown", version: 0 };
+  },
 };

package/src/index.js

@@ -1,9 +1,12 @@
-import Http from './http';
+import http from './http';
 import DetectOS from './DetectOS';
-import { mutateShipmentAddress } from './utils';
+import { mutateShippingContact } from './utils';
 
-window.Salla = window.Salla || {};
-window.Salla.Payments = window.Salla.Payments || {};
+// SSR-safe: only access window in browser environment
+if (typeof window !== 'undefined') {
+  window.Salla = window.Salla || {};
+  window.Salla.Payments = window.Salla.Payments || {};
+}
 
 /**
  * Full Example
@@ -35,7 +38,9 @@ window.Salla.Payments = window.Salla.Payments || {};
  *                  // }
  *              });
  */
-window.SallaApplePay = {
+
+// SSR-safe: define SallaApplePay as a stub during SSR, actual object in browser
+const SallaApplePay = typeof window !== 'undefined' ? {
     session: null,
     detail: null,
     address_id: null,
@@ -43,6 +48,9 @@ window.SallaApplePay = {
     total: undefined,
     request: undefined,
     id: undefined,
+    countryCode: null,
+    totals: [],
+    shippingCompany: null,
     init: function () {
         document.removeEventListener('payments::apple-pay.start-transaction', SallaApplePay.startSession);
         Salla.event.addEventListener('payments::apple-pay.start-transaction', SallaApplePay.startSession);
@@ -66,7 +74,7 @@ window.SallaApplePay = {
         if (!SallaApplePay.detail.validateMerchant.onFailed) {
             SallaApplePay.detail.validateMerchant.onFailed = (response) => {
                 salla.logger.log(JSON.stringify(response))
-                salla.api.handleErrorResponse(response);
+                salla.api.handleErrorResponse({response});
                 SallaApplePay.onCancel({}, response.data.error.message);
             };
         }
@@ -80,11 +88,11 @@ window.SallaApplePay = {
     },
 
     prepareLineItems: function () {
-        if(!SallaApplePay.detail?.items?.length){
+        if (!SallaApplePay.detail?.items?.length) {
             SallaApplePay.detail.items = [
                 {
                     label: salla.lang.get('pages.cart.items_total'),
-                    amount: SallaApplePay.detail.amount
+                    amount: parseFloat(SallaApplePay.detail.amount).toString()
                 }
             ]
         }
@@ -93,12 +101,16 @@ window.SallaApplePay = {
     },
 
     prepareTotal: function () {
-       return {
-           // apple ask to use business name
-           label: window.location.hostname || 'Salla',
-           //label: salla.lang.get('pages.cart.final_total'),
-           amount: SallaApplePay.detail.amount
-       }
+        return {
+            // apple ask to use business name
+            label: window.location.hostname || 'Salla',
+            //label: salla.lang.get('pages.cart.final_total'),
+            amount: parseFloat(SallaApplePay.detail.amount).toString()
+        }
+    },
+
+    isPhysical() {
+        return SallaApplePay.detail?.requiredShippingContactFields?.includes('postalAddress');
     },
 
     startSession: async function (event) {
@@ -117,7 +129,7 @@ window.SallaApplePay = {
         }
 
         SallaApplePay.request = {
-            countryCode: 'SA',
+            countryCode: SallaApplePay.detail.countryCode || 'SA',
             supportsCouponCode: true,
             couponCode: '',
             currencyCode: SallaApplePay.detail.currency || 'SAR',
@@ -141,30 +153,70 @@ window.SallaApplePay = {
         SallaApplePay.session.onvalidatemerchant = SallaApplePay.onValidateMerchant;
         SallaApplePay.session.onpaymentauthorized = SallaApplePay.onPaymentAuthorized;
         SallaApplePay.session.oncancel = SallaApplePay.onCancel;
-        SallaApplePay.session.oncouponcodechanged = SallaApplePay.oncouponcodechanged;
-        SallaApplePay.session.onpaymentmethodselected = SallaApplePay.onpaymentmethodselected;
-
-        SallaApplePay.session.begin();
+        SallaApplePay.session.oncouponcodechanged = SallaApplePay.onCouponCodeChanged;
+        SallaApplePay.session.onpaymentmethodselected = SallaApplePay.onPaymentMethodSelected;
+
+        // Hook between session creation and begin(). Return truthy to skip
+        // begin() (caller handles it later, e.g. after async work).
+        let skipBegin;
+        if (typeof SallaApplePay.detail.onStartedSession === 'function') {
+            skipBegin = SallaApplePay.detail.onStartedSession(SallaApplePay.session);
+        }
+        if (!skipBegin) {
+            SallaApplePay.session.begin();
+        }
     },
-    async onpaymentmethodselected(event) {
-        await SallaApplePay.recalculateTotal();
-        const updatedPaymentDetails = {
+    onPaymentMethodSelected: async (event) => {
+        salla.logger.log('🍏 Pay: onPaymentMethodSelected', event);
+
+        // perform recalculate here only if digital product
+        // if physical recalculate performed with shipping company
+        if (!SallaApplePay.isPhysical()) {
+            try {
+                await SallaApplePay.recalculateTotal();
+    
+                const updatedPaymentDetails = {
+                    newTotal: SallaApplePay.prepareTotal(),
+                    newLineItems: SallaApplePay.prepareLineItems()
+                };
+    
+                salla.logger.log('🍏 Pay: completePaymentMethodSelection', updatedPaymentDetails);
+
+                SallaApplePay.session.completePaymentMethodSelection(updatedPaymentDetails);
+
+            } catch (error) {
+                salla.logger.warn('🍏 Pay: Failed recalculate total', error);
+    
+                SallaApplePay.session.completePaymentMethodSelection({
+                    newTotal: SallaApplePay.prepareTotal(),
+                    newLineItems: SallaApplePay.prepareLineItems(),
+                    status: SallaApplePay.session.STATUS_FAILURE,
+                    errors: [new window.ApplePayError("unknown", undefined, error?.response?.data?.error?.message || error?.response?.data?.error?.code || 'Failed to recalculate total')]
+                });
+            }
+            return;
+        }
+
+        salla.logger.log('🍏 Pay: completePaymentMethodSelection', {
             newTotal: SallaApplePay.prepareTotal(),
             newLineItems: SallaApplePay.prepareLineItems(),
-        };
+        });
 
-        SallaApplePay.session.completePaymentMethodSelection(updatedPaymentDetails);
+        SallaApplePay.session.completePaymentMethodSelection({
+            newTotal: SallaApplePay.prepareTotal(),
+            newLineItems: SallaApplePay.prepareLineItems(),
+        });
     },
 
-    oncouponcodechanged(event) {
+    onCouponCodeChanged(event) {
         Salla.event.dispatch('payments::apple-pay.coupon.change', event);
 
-        return Http.post(SallaApplePay.detail.oncouponcodechanged.url.replace('{id}', SallaApplePay.id), {
+        return http.post(SallaApplePay.detail.onCouponCodeChanged.url.replace('{id}', SallaApplePay.id), {
             'coupon': event.couponCode,
             'payment_method': 'apple_pay',
-        }, async ({data}) => {
-            if (typeof SallaApplePay.detail.oncouponcodechanged.onSuccess === 'function') {
-                SallaApplePay.detail.oncouponcodechanged.onSuccess(data);
+        }, async ({ data }) => {
+            if (typeof SallaApplePay.detail.onCouponCodeChanged.onSuccess === 'function') {
+                SallaApplePay.detail.onCouponCodeChanged.onSuccess(data);
             }
 
             salla.log('🍏 Pay: Coupon applied success');
@@ -181,8 +233,8 @@ window.SallaApplePay = {
             Salla.event.dispatch('payments::apple-pay.coupon.failed', response);
 
             // SallaApplePay.abortSession();
-            if (typeof SallaApplePay.detail.oncouponcodechanged.onFailed === 'function') {
-                SallaApplePay.detail.oncouponcodechanged.onFailed(response);
+            if (typeof SallaApplePay.detail.onCouponCodeChanged.onFailed === 'function') {
+                SallaApplePay.detail.onCouponCodeChanged.onFailed(response);
             }
 
             await SallaApplePay.recalculateTotal();
@@ -208,35 +260,80 @@ window.SallaApplePay = {
     onPaymentAuthorized: async (event) => {
         salla.logger.log('🍏 Pay: onPaymentAuthorized', event.payment);
 
-        // Update the payment address
-        await mutateShipmentAddress(SallaApplePay, event.payment.shippingContact, true);
+        // update guest details
+        try {
+            await mutateShippingContact(SallaApplePay, event.payment.shippingContact, true);
+        } catch (error) {
+            salla.logger.error('🍏 Pay: Failed to update guest contact details', error);
+            
+            const response = error?.response || error;
+            
+            // Parse backend errors for shipping contact fields
+            const fields = response?.data?.error?.fields || {};
+            const errors = [];
+            
+            // Map backend field errors to Apple Pay contact field errors
+            if (fields?.email && fields.email.length > 0) {
+                errors.push(new window.ApplePayError('shippingContactInvalid', 'emailAddress', fields.email[0]));
+            }
+
+            if (fields?.phone && fields.phone.length > 0) {
+                errors.push(new window.ApplePayError('shippingContactInvalid', 'phoneNumber', fields.phone[0]));
+            }
+
+            if (fields?.first_name && fields.first_name.length > 0) {
+                errors.push(new window.ApplePayError('shippingContactInvalid', 'name', fields.first_name[0]));
+            } else if (fields?.last_name && fields.last_name.length > 0) {
+                errors.push(new window.ApplePayError('shippingContactInvalid', 'name', fields.last_name[0]));
+            }
+            
+            // If no specific field errors, use general error message
+            if (errors.length === 0) {
+                const errorMessage = response?.data?.error?.message || response?.data?.error?.code || 'Invalid shipping contact details';
+                errors.push(new window.ApplePayError('shippingContactInvalid', 'name', errorMessage));
+            }
+            
+            Salla.event.dispatch('payments::apple-pay.authorized.failed', response);
+            
+            if (typeof SallaApplePay.detail.authorized.onFailed === 'function') {
+                SallaApplePay.detail.authorized.onFailed(response);
+            }
+
+            // Complete shipping contact selection with invalid contact status
+            SallaApplePay.session.completePayment({
+                status: ApplePaySession.STATUS_INVALID_SHIPPING_CONTACT,
+                errors: errors
+            });
+
+            return;
+        }
 
         Salla.event.dispatch('payments::apple-pay.authorized.init', event);
-        Http.post(SallaApplePay.detail.authorized.url.replace('{id}', SallaApplePay.id), {
+        http.post(SallaApplePay.detail.authorized.url.replace('{id}', SallaApplePay.id), {
             payment_method: 'apple_pay',
             applepay_token: JSON.stringify(event.payment)
-        }, ({data}) => {
+        }, ({ data }) => {
             Salla.event.dispatch('payments::apple-pay.authorized.success', data);
 
-            SallaApplePay.session.completePayment(ApplePaySession.STATUS_SUCCESS);
-
             if (typeof SallaApplePay.detail.authorized.onSuccess === 'function') {
                 SallaApplePay.detail.authorized.onSuccess(data);
             }
+
+            SallaApplePay.session.completePayment(ApplePaySession.STATUS_SUCCESS);
         }, (error) => {
 
             let response = error?.response;
 
             Salla.event.dispatch('payments::apple-pay.authorized.failed', response);
 
-            SallaApplePay.session.completePayment({
-                status: ApplePaySession.STATUS_FAILURE,
-                errors: [new ApplePayError("unknown", undefined, response?.data?.error?.message || response?.data?.error?.code || 'Failed to parse authorized response')]
-            })
-
             if (typeof SallaApplePay.detail.authorized.onFailed === 'function') {
                 SallaApplePay.detail.authorized.onFailed(response);
             }
+
+            SallaApplePay.session.completePayment({
+                status: ApplePaySession.STATUS_FAILURE,
+                errors: [new window.ApplePayError("unknown", undefined, response?.data?.error?.message || response?.data?.error?.code || 'Failed to parse authorized response')]
+            })
         });
     },
 
@@ -251,7 +348,7 @@ window.SallaApplePay = {
             Salla.event.dispatch('payments::apple-pay.validate-merchant.init', event);
 
             // Post request to validate merchant
-            const { data } = await Http.post(SallaApplePay.detail.validateMerchant.url.replace('{id}', SallaApplePay.id), {
+            const { data } = await http.post(SallaApplePay.detail.validateMerchant.url.replace('{id}', SallaApplePay.id), {
                 validation_url: event.validationURL
             });
 
@@ -300,7 +397,7 @@ window.SallaApplePay = {
         salla.logger.log('🍏 Pay: onShippingContactSelected', event.shippingContact);
 
         // create address for shipping calculation
-        mutateShipmentAddress(SallaApplePay, event.shippingContact);
+        await mutateShippingContact(SallaApplePay, event.shippingContact);
     },
 
     /**
@@ -310,25 +407,54 @@ window.SallaApplePay = {
      *
      */
     onShippingMethodSelected: async (event) => {
-        salla.logger.log(event);
 
         let shipping_ids = event.shippingMethod.identifier.split(',');
+        let shippingMethod = {
+            ship_id: shipping_ids[0],
+            private_ship_id: typeof shipping_ids[1] === 'undefined' ? null : shipping_ids[1],
+            type: typeof shipping_ids[2] === 'undefined' ? null : shipping_ids[2],
+            route_id: typeof shipping_ids[3] === 'undefined' ? null : shipping_ids[3],
+        };
 
-        try {
-            await SallaApplePay.selectApplePayShippingMethod(shipping_ids[0], typeof shipping_ids[1] === 'undefined' ? null : shipping_ids[1]);
+        salla.logger.log('🍏 Pay: onShippingMethodSelected', {
+            event,
+            previous: SallaApplePay.shippingCompany,
+            current: shippingMethod,
+        });
 
-            await SallaApplePay.recalculateTotal();
+        if (SallaApplePay.shouldUpdateShippingCompany(shippingMethod)) {
+            try {
+
+                await SallaApplePay.selectApplePayShippingMethod(shippingMethod);
+    
+                await SallaApplePay.recalculateTotal();
+    
+            } catch (error) {
+                salla.logger.warn('🍏 Pay: Failed set the shipping details to api', error);
+    
+                // todo :: find a better handling for error without abort session
+                SallaApplePay.session.completeShippingMethodSelection({
+                    newTotal: SallaApplePay.prepareTotal(),
+                    newLineItems: SallaApplePay.prepareLineItems(),
+                    status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
+                    errors: [
+                      new window.ApplePayError('addressUnserviceable')
+                    ]
+                });
+
+                return;
+            }
+        }
 
-            SallaApplePay.session.completeShippingMethodSelection({
-                newTotal: SallaApplePay.prepareTotal(),
-                newLineItems: SallaApplePay.prepareLineItems(),
-            });
-        } catch (error) {
-            salla.logger.warn('🍏 Pay: Failed set the shipping details to api', error);
+        salla.logger.log('🍏 Pay: completeShippingMethodSelection', {
+            newTotal: SallaApplePay.prepareTotal(),
+            newLineItems: SallaApplePay.prepareLineItems(),
+        });
 
-            // todo :: find a better handling for error without abort session
-            SallaApplePay.abortSession();
-        }
+        SallaApplePay.session.completeShippingMethodSelection({
+            newTotal: SallaApplePay.prepareTotal(),
+            newLineItems: SallaApplePay.prepareLineItems(),
+        });
     },
 
 
@@ -338,6 +464,10 @@ window.SallaApplePay = {
         }
     },
 
+    shouldUpdateShippingCompany(shippingCompany) {
+        return SallaApplePay.shippingCompany?.ship_id != shippingCompany?.ship_id || SallaApplePay.shippingCompany?.private_ship_id != shippingCompany?.private_ship_id
+    },
+
     getApplePaySessionVersion: () => {
         const userAgent = navigator.userAgent || navigator.vendor || window.opera;
 
@@ -363,24 +493,32 @@ window.SallaApplePay = {
     },
 
     recalculateTotal: () => {
-        salla.logger.log('Recalculate Total');
+        salla.logger.log('🍏 Pay: recalculate total');
 
-        return Http.requestWithSupportAjax(SallaApplePay.detail.recalculateTotal.url.replace('{id}', SallaApplePay.id),{}, 'get').then((data) => {
+        return http.get(SallaApplePay.detail.recalculateTotal.url.replace('{id}', SallaApplePay.id), ({ data }) => {
+            salla.logger.log('🍏 Pay: recalculate total success', data);
             let cart = data.data.initial_data?.cart || data.data.cart;
+            let payments = data.data.initial_data?.payments || data.data.payments;
+
+            salla.logger.log('🍏 Pay: recalculate total success', {
+                cart,
+                payments
+            });
+
             // todo :: enhance response from backend
-            SallaApplePay.detail.amount = cart.total;
+            SallaApplePay.detail.amount = payments?.gateways?.applePay?.supportedMultiCurrency ? cart.total_in_customer_currency : cart.total;
             SallaApplePay.detail.items = (cart.totals || cart.items).map((item) => {
                 return {
                     label: item.title,
-                    amount: item.amount === 'مجاني' ? 0 : item.amount.toString().replace('+', ''),
+                    amount: (item.amount === 'مجاني' || item.amount === 'Free') ? 0 : item.amount.toString().replace('+', ''),
                 };
             })
 
             // lets remove last element (final total)
             SallaApplePay.detail.items.pop();
+            SallaApplePay.totals = SallaApplePay.detail.items;
 
-            return data;
-        }).catch((error) => {
+        }, (error) => {
             salla.logger.warn('🍏 Pay: recalculate total failed', error);
 
             // general error
@@ -389,22 +527,26 @@ window.SallaApplePay = {
     },
 
 
-    selectApplePayShippingMethod: (company_id, private_company_id) => {
-        salla.logger.log('🍏 Pay: select shipping method ', 'company_id : ' + company_id, 'private_company_id: ' + private_company_id);
+    selectApplePayShippingMethod: (shippingMethod) => {
+        salla.logger.log('🍏 Pay: select shipping method ', shippingMethod);
+        SallaApplePay.shippingCompany = shippingMethod;
 
-        return Http.requestWithSupportAjax(SallaApplePay.detail.shippingMethodSelected.url.replace('{id}', SallaApplePay.id), {
+        const payload = {
             address_id: SallaApplePay.address_id,
-            company_id: company_id,
-            private_company_id: private_company_id,
+            company_id: shippingMethod.ship_id,
+            private_company_id: shippingMethod.private_ship_id,
+            type: shippingMethod.type || undefined,
+            route_id: shippingMethod.route_id || undefined,
             payment_method: 'apple_pay'
-        }, 'post').then(() => {
-            if (typeof SallaApplePay.detail. shippingMethodSelected.onSuccess === 'function') {
+        }
+        return http.post(SallaApplePay.detail.shippingMethodSelected.url.replace('{id}', SallaApplePay.id), payload, ({ data }) => {
+            if (typeof SallaApplePay.detail.shippingMethodSelected.onSuccess === 'function') {
                 SallaApplePay.detail.shippingMethodSelected.onSuccess(data);
             }
 
             // we don't have any data in this request, lets resolve the promise
             return true;
-        }).catch((error) => {
+        }, (error) => {
             salla.logger.warn('🍏 Pay: Set shipping method failed', error);
 
             if (typeof SallaApplePay.detail.shippingMethodSelected.onFailed === 'function') {
@@ -427,15 +569,22 @@ window.SallaApplePay = {
         'label': method.shipping_title,
         'amount': method.enable_free_shipping ? 0 : method.ship_cost,
         'detail': '',
-        'identifier': method.ship_id.toString() + (method.private_ship_id ? ',' + method.private_ship_id.toString() : '')
+        'identifier': method.ship_id.toString() + (method.private_ship_id ? ',' + method.private_ship_id.toString() : '') + (method.type ? ',' + method.type : '') + (method.route_id ? ',' + method.route_id : '')
     }))
+} : {};
+
+// SSR-safe: export and assign to window in browser
+if (typeof window !== 'undefined') {
+  window.SallaApplePay = SallaApplePay;
 }
 
 //applePay doesn't allow iframes
-// if (window.ApplePaySession && window.self === window.top && ApplePaySession.canMakePayments()) {
-if (window.ApplePaySession?.canMakePayments()) {
+// SSR-safe: only initialize in browser
+if (typeof window !== 'undefined' && window.ApplePaySession?.canMakePayments()) {
     SallaApplePay.init();
-} else {
+} else if (typeof document !== 'undefined') {
     // You can hide the Apple Pay button easy with add data-show-if-apple-pay-supported to element like <div data-show-if-apple-pay-supported>
     document.querySelectorAll('data-show-if-apple-pay-supported').forEach(element => element.style.display = 'none');
 }
+
+export default SallaApplePay;

package/src/utils.js

@@ -26,10 +26,55 @@ import http from "./http";
  * @param {ApplePayPaymentContact} shippingContact
  *
  */
-export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthorized = false) {
-  console.log('mutateShipmentAddress called', shippingContact, isAuthorized);
+export async function mutateShippingContact(SallaApplePay, shippingContact, isAuthorized = false) {
+  salla.logger.log('🍏 Pay: mutateShippingContact called', shippingContact, isAuthorized);
 
-  if (!SallaApplePay.detail.requiredShippingContactFields) {
+  if (!SallaApplePay.detail.requiredShippingContactFields || SallaApplePay.detail.requiredShippingContactFields.length == 0) {
+    return;
+  }
+
+  if (isAuthorized) {
+    if (isGuestCheckout()) {
+
+      if (
+        !shippingContact.emailAddress ||
+        !shippingContact.givenName ||
+        !shippingContact.familyName ||
+        !shippingContact.phoneNumber
+      ) {
+  
+        salla.logger.warn('🍏 Pay: Guest contact fields are required', shippingContact);
+  
+        const errors = [];
+        if (!shippingContact.emailAddress) {
+          errors.push(new window.ApplePayError('shippingContactInvalid', 'emailAddress', 'Email address is required'));
+        }
+
+        if (!shippingContact.phoneNumber) {
+          errors.push(new window.ApplePayError('shippingContactInvalid', 'phoneNumber', 'Phone number is required'));
+        }
+
+        if (!shippingContact.givenName || !shippingContact.familyName) {
+          errors.push(new window.ApplePayError('shippingContactInvalid', 'name', 'Name is required'));
+        }
+
+        SallaApplePay.session.completePayment({
+          status: SallaApplePay.session.STATUS_INVALID_SHIPPING_CONTACT,
+          errors: errors
+        });
+
+        return;
+      }
+
+      await updateGuestContact(SallaApplePay, shippingContact);
+
+    }
+
+    // if authorized and not guest checkout, do nothing address already added
+    return;
+  }
+
+  if (!SallaApplePay.detail.requiredShippingContactFields.includes('postalAddress')) {
     return;
   }
 
@@ -38,15 +83,13 @@ export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthoriz
     {
       'country': shippingContact.country,
       'city': shippingContact.locality,
-      'local': shippingContact.subLocality,
+      'local': shippingContact.subLocality || shippingContact.administrativeArea || shippingContact.locality,
       'description': shippingContact.subAdministrativeArea,
       'street': shippingContact.addressLines?.join(", ") || shippingContact.administrativeArea,
       'country_code': shippingContact.countryCode,
       'postal_code': shippingContact.postalCode,
-      'is_authorized': isAuthorized
     },
     async ({ data }) => {
-      if (isAuthorized) { return }
       if (typeof SallaApplePay.detail.shippingContactSelected.onSuccess === 'function') {
         SallaApplePay.detail.shippingContactSelected.onSuccess(data);
       }
@@ -57,25 +100,29 @@ export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthoriz
       if (!SallaApplePay.shipping_methods || (SallaApplePay.shipping_methods && !SallaApplePay.shipping_methods.length)) {
         salla.logger.warn('🍏 Pay: We dont found any supported methods', data);
 
-        return SallaApplePay.session.completeShippingContactSelection({
+        SallaApplePay.session.completeShippingContactSelection({
           status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
           errors: [
             new window.ApplePayError('addressUnserviceable')
           ]
         });
+
+        return
       }
 
       try {
-        await SallaApplePay.selectApplePayShippingMethod(SallaApplePay.shipping_methods[0]['ship_id'], SallaApplePay.shipping_methods[0]['private_ship_id']);
+        await SallaApplePay.selectApplePayShippingMethod(SallaApplePay.shipping_methods[0]);
       } catch (error) {
         salla.logger.warn('Failed set the shipping details to api', error);
 
-        return SallaApplePay.session.completeShippingContactSelection({
+        SallaApplePay.session.completeShippingContactSelection({
           status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
           errors: [
             new window.ApplePayError('addressUnserviceable')
           ]
         });
+
+        return;
       }
 
       try {
@@ -83,20 +130,25 @@ export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthoriz
       } catch (error) {
         salla.logger.warn('🍏 Pay: Failed recalculate total', error);
 
-        return SallaApplePay.session.completeShippingContactSelection({
+        SallaApplePay.session.completeShippingContactSelection({
           status: SallaApplePay.session.STATUS_INVALID_SHIPPING_POSTAL_ADDRESS,
           errors: [
             new window.ApplePayError('addressUnserviceable')
           ]
         });
+
+        return;
       }
 
-      SallaApplePay.session.completeShippingContactSelection({
+      const updatedShippingContactSelection = {
         newTotal: SallaApplePay.prepareTotal(),
         newLineItems: SallaApplePay.prepareLineItems(),
         newShippingMethods: SallaApplePay.mappingShippingMethods(SallaApplePay.shipping_methods)
-      });
+      };
 
+      salla.logger.log('🍏 Pay: completeShippingContactSelection', updatedShippingContactSelection);
+
+      SallaApplePay.session.completeShippingContactSelection(updatedShippingContactSelection);
     },
     ({ response }) => {
       salla.logger.warn('🍏 Pay: Failed add address via api', response);
@@ -108,19 +160,11 @@ export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthoriz
       // parse 422 errors
       let fields = response?.data?.error?.fields;
 
-      let errors = [];
-
-      if (fields?.country_code) {
-        errors.push(new window.ApplePayError('shippingContactInvalid', 'countryCode', fields?.country_code[0]))
-      }
-
-      if (fields?.city) {
-        errors.push(new window.ApplePayError('shippingContactInvalid', 'locality', fields?.city[0]))
-      }
-
-      if (fields?.country) {
-        errors.push(new window.ApplePayError('shippingContactInvalid', 'country', fields?.country[0]))
-      }
+      let errors = getApplePayErrors({
+        countryCode: fields?.country_code && fields.country_code.length > 0 ? fields.country_code[0] : null,
+        locality: fields?.city && fields.city.length > 0 ? fields.city[0] : null,
+        country: fields?.country && fields.country.length > 0 ? fields.country[0] : null,
+      });
 
       if (errors.length === 0 && response?.data?.error?.message) {
         errors.push(new window.ApplePayError('shippingContactInvalid', 'locality', response?.data?.error?.message))
@@ -135,3 +179,53 @@ export function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthoriz
     }
   );
 }
+
+function isGuestCheckout() {
+  return salla.config.isGuest() && salla.config.get('store.features').includes('guest-checkout');
+}
+
+/**
+ * Update guest contact
+ *
+ * @param {SallaApplePay} SallaApplePay
+ * @param {ApplePayPaymentContact} shippingContact
+ *
+ */
+async function updateGuestContact(SallaApplePay, shippingContact) {
+  salla.logger.log('🍏 Pay: Updating guest contact', shippingContact);
+
+  return new Promise((resolve, reject) => {
+    http.post(
+      SallaApplePay.detail.guestContactSelected.url.replace('{id}', SallaApplePay.id),
+      {
+        'email': shippingContact.emailAddress || null,
+        'first_name': shippingContact.givenName || null,
+        'last_name': shippingContact.familyName || null,
+        'phone_number': shippingContact.phoneNumber || null,
+        'country_code': shippingContact.countryCode || null,
+      },
+      async ({ data }) => {
+        if (typeof SallaApplePay.detail.guestContactSelected?.onSuccess === 'function') {
+          SallaApplePay.detail.guestContactSelected.onSuccess(data);
+        }
+        resolve(data);
+      },
+      ({ response }) => {
+        salla.logger.warn('🍏 Pay: Failed to update guest contact via api', response);
+
+        if (typeof SallaApplePay.detail.guestContactSelected?.onFailed === 'function') {
+          SallaApplePay.detail.guestContactSelected.onFailed(response);
+        }
+
+        // Reject the promise so it can be caught in onPaymentAuthorized
+        reject({ response });
+      }
+    );
+  });
+}
+
+function getApplePayErrors(fields) {
+  return Object.entries(fields)
+    .filter(([field, messages]) => messages && messages.length > 0)
+    .map(([field, messages]) => new window.ApplePayError('shippingContactInvalid', field, messages[0]));
+}