@salla.sa/twilight-components 2.14.346 → 2.14.349

package/dist/components/salla-quick-buy2.js

@@ -4,7 +4,7 @@
 import { proxyCustomElement, HTMLElement, createEvent, h, Host } from '@stencil/core/internal/client';
 import { a as axios } from './axios.js';
 
-var Http = {
+var http = {
     request(method, url, data, successCb = null, errorCb = null) {
         return axios
             .request({url, data, method: method.toLowerCase(), responseType: 'json'})
@@ -162,27 +162,70 @@ var DetectOS = {
  * @param {ApplePayPaymentContact} shippingContact
  *
  */
-function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthorized = false) {
-  console.log('mutateShipmentAddress called', shippingContact, isAuthorized);
+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;
   }
 
-  return Http.post(
+  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;
+  }
+
+  return http.post(
     SallaApplePay.detail.shippingContactSelected.url.replace('{id}', SallaApplePay.id),
     {
       '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);
       }
@@ -193,25 +236,29 @@ function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthorized = fa
       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 {
@@ -219,20 +266,25 @@ function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthorized = fa
       } 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);
@@ -244,19 +296,11 @@ function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthorized = fa
       // 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));
@@ -272,6 +316,56 @@ function mutateShipmentAddress(SallaApplePay, shippingContact, isAuthorized = fa
   );
 }
 
+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]));
+}
+
 window.Salla = window.Salla || {};
 window.Salla.Payments = window.Salla.Payments || {};
 
@@ -314,6 +408,8 @@ window.SallaApplePay = {
     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);
@@ -355,7 +451,7 @@ window.SallaApplePay = {
             SallaApplePay.detail.items = [
                 {
                     label: salla.lang.get('pages.cart.items_total'),
-                    amount: SallaApplePay.detail.amount
+                    amount: parseFloat(SallaApplePay.detail.amount).toString()
                 }
             ];
         }
@@ -368,10 +464,14 @@ window.SallaApplePay = {
             // apple ask to use business name
             label: window.location.hostname || 'Salla',
             //label: salla.lang.get('pages.cart.final_total'),
-            amount: SallaApplePay.detail.amount
+            amount: parseFloat(SallaApplePay.detail.amount).toString()
         }
     },
 
+    isPhysical() {
+        return SallaApplePay.detail?.requiredShippingContactFields?.includes('postalAddress');
+    },
+
     startSession: async function (event) {
 
         SallaApplePay.detail = event.detail || event;
@@ -412,30 +512,62 @@ 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.oncouponcodechanged = SallaApplePay.onCouponCodeChanged;
+        SallaApplePay.session.onpaymentmethodselected = SallaApplePay.onPaymentMethodSelected;
 
         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);
+            if (typeof SallaApplePay.detail.onCouponCodeChanged.onSuccess === 'function') {
+                SallaApplePay.detail.onCouponCodeChanged.onSuccess(data);
             }
 
             salla.log('🍏 Pay: Coupon applied success');
@@ -452,8 +584,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();
@@ -479,35 +611,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 }) => {
             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')]
+            });
         });
     },
 
@@ -522,7 +699,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
             });
 
@@ -571,7 +748,7 @@ window.SallaApplePay = {
         salla.logger.log('🍏 Pay: onShippingContactSelected', event.shippingContact);
 
         // create address for shipping calculation
-        mutateShipmentAddress(SallaApplePay, event.shippingContact);
+        await mutateShippingContact(SallaApplePay, event.shippingContact);
     },
 
     /**
@@ -581,25 +758,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(),
+        });
     },
 
 
@@ -609,6 +815,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;
 
@@ -634,11 +844,17 @@ 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;
+            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 = payments?.gateways?.applePay?.supportedMultiCurrency ? cart.total_in_customer_currency : cart.total;
@@ -651,9 +867,9 @@ window.SallaApplePay = {
 
             // 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
@@ -662,27 +878,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;
+
         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'
         };
-        const selectedShippingMethod = SallaApplePay.shipping_methods?.find((item)=> item.company == company_id || item.ship_id == company_id);
-        if (selectedShippingMethod?.route_id){
-            payload.shipping_route_id = selectedShippingMethod.route_id;
-            payload.type = selectedShippingMethod.type;
-        }
-        return Http.requestWithSupportAjax(SallaApplePay.detail.shippingMethodSelected.url.replace('{id}', SallaApplePay.id), payload, 'post').then(() => {
+        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') {
@@ -705,7 +920,7 @@ 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 : '')
     }))
 };
 
@@ -746,7 +961,8 @@ const SallaQuickBuy = /*@__PURE__*/ proxyCustomElement(class SallaQuickBuy exten
         });
     }
     async quickBuyHandler() {
-        if (salla.config.isGuest()) {
+        // user guest and guest-checkout not enabled
+        if (salla.config.isGuest() && !this.isGuestCheckout()) {
             this.requireLogin.emit({ productId: this.productId });
             // todo (low) :: find a way to re-fire the method after success
             let afterLoginEvent = "salla-quick-buy::user.logged-in";
@@ -784,7 +1000,7 @@ const SallaQuickBuy = /*@__PURE__*/ proxyCustomElement(class SallaQuickBuy exten
         salla.event.dispatch('payments::apple-pay.start-transaction', {
             amount: this.amount, // 1000
             currency: this.currency || 'SAR', // SAR
-            requiredShippingContactFields: this.isRequireShipping ? ['postalAddress'] : undefined,
+            requiredShippingContactFields: this.getRequiredShippingContactFields(),
             shippingMethods: this.isRequireShipping ? [] : undefined,
             supportedNetworks: salla.config.get('store.settings.buy_now.networks'),
             supportedCountries: salla.config.get('store.settings.buy_now.countries'),
@@ -835,7 +1051,10 @@ const SallaQuickBuy = /*@__PURE__*/ proxyCustomElement(class SallaQuickBuy exten
             shippingContactSelected: this.isRequireShipping ? {
                 url: salla.url.get('checkout/{id}/address/add'),
             } : undefined,
-            oncouponcodechanged: {
+            guestContactSelected: this.isGuestCheckout() ? {
+                url: salla.url.get('checkout/{id}/customer'),
+            } : undefined,
+            onCouponCodeChanged: {
                 url: salla.url.get('checkout/{id}/coupons')
             },
             recalculateTotal: {
@@ -847,70 +1066,79 @@ const SallaQuickBuy = /*@__PURE__*/ proxyCustomElement(class SallaQuickBuy exten
             }
         });
     }
+    isGuestCheckout() {
+        return salla.config.isGuest() && salla.config.get('store.features').includes('guest-checkout');
+    }
+    getRequiredShippingContactFields() {
+        let fields = [];
+        if (this.isRequireShipping) {
+            fields.push('postalAddress');
+        }
+        if (this.isGuestCheckout()) {
+            fields.push('email', 'phone', 'name');
+        }
+        return fields;
+    }
     componentWillLoad() {
         console.log('🍏 Pay: Quick Buy Component Loaded');
-        return new Promise((resolve, reject) => {
-            salla.onReady(async () => {
-                if (!this.currency) {
-                    this.currency = salla.config.get('store.settings.buy_now.multi_currency') ? salla.config.get('user.currency_code') : 'SAR';
-                }
-                if (!this.productId && salla.config.get('page.id')) {
-                    this.productId = salla.config.get('page.id');
-                }
-                if (!this.applePayOnly && !this.productId) {
-                    salla.logger.warn('🍏 Pay: Failed load the quick buy, the product id is missing');
-                    return reject();
-                }
-                /**
-                 * We should check the product if it's required shipping
-                 * in order for apple pay sdk to show the required Shipping Contact Fields
-                 * components..
-                 */
-                if ((!this.amount || !this.isRequireShipping) && this.productId) {
-                    await salla.product.getDetails(this.productId, []).then((response) => {
-                        this.amount = response.data.price;
-                        this.isRequireShipping = response?.data?.is_require_shipping || false;
-                    }).catch((error) => {
-                        salla.logger.warn('🍏 Pay: Failed load the quick buy, get the product details failed: ', error);
-                        return reject();
-                    });
-                }
-                if (this.type == 'donate') {
-                    salla.event.on('product-options::donation-changed', (data) => {
-                        if (String(data.id) !== String(this.productId)) {
-                            return;
-                        }
-                        this.amount = data.price;
-                    });
-                }
-                else if (salla.url.is_page('product.single')) {
-                    salla.product.event?.onPriceUpdated(response => {
-                        this.amount = response.data.price;
-                    });
-                }
-                this.isApplePayActive = salla.helpers.hasApplePay()
-                    && salla.config.get('store.settings.payments')?.includes('apple_pay')
-                    && salla.config.get('store.settings.is_salla_gateway', false);
-                let applePaySdk = document.getElementById('apple-pay-sdk');
-                if (applePaySdk || !this.isApplePayActive) {
-                    salla.logger.warn('🍏 Pay: Skipped load apple pay because ' + (applePaySdk ? 'already loaded' : 'is not available in the browser'));
-                    resolve(true);
-                    return;
-                }
+        const canMakePayments = typeof window !== 'undefined' && !!window.ApplePaySession?.canMakePayments?.();
+        const storeHasApplePay = salla?.config?.get?.('store.settings.payments')?.includes?.('apple_pay') ?? true;
+        const isSallaGateway = salla?.config?.get?.('store.settings.is_salla_gateway', false) ?? true;
+        this.isApplePayActive = canMakePayments && storeHasApplePay && isSallaGateway;
+        const runInit = async () => {
+            if (!this.currency && salla?.config?.get) {
+                this.currency = salla.config.get('store.settings.buy_now.multi_currency') ? salla.config.get('user.currency_code') : 'SAR';
+            }
+            if (!this.productId && salla?.config?.get && salla.url?.is_page) {
+                this.productId = salla.config.get('page.id');
+            }
+            if (!this.applePayOnly && !this.productId) {
+                salla?.logger?.warn?.('🍏 Pay: Failed load the quick buy, the product id is missing');
+                return;
+            }
+            if ((!this.amount || !this.isRequireShipping) && this.productId && salla?.product?.getDetails) {
+                await salla.product.getDetails(this.productId, []).then((response) => {
+                    this.amount = response.data.price;
+                    this.isRequireShipping = response?.data?.is_require_shipping || false;
+                }).catch((error) => {
+                    salla?.logger?.warn?.('🍏 Pay: Failed load the quick buy, get the product details failed: ', error);
+                });
+            }
+            if (this.type === 'donate' && salla?.event?.on) {
+                salla.event.on('product-options::donation-changed', (data) => {
+                    if (String(data.id) !== String(this.productId))
+                        return;
+                    this.amount = data.price;
+                });
+            }
+            else if (salla?.url?.is_page?.('product.single') && salla?.product?.event?.onPriceUpdated) {
+                salla.product.event.onPriceUpdated(response => { this.amount = response.data.price; });
+            }
+            this.isApplePayActive = (salla?.helpers?.hasApplePay?.() ?? canMakePayments)
+                && (salla?.config?.get?.('store.settings.payments')?.includes?.('apple_pay') ?? storeHasApplePay)
+                && (salla?.config?.get?.('store.settings.is_salla_gateway', false) ?? isSallaGateway);
+            if (!document.getElementById('apple-pay-sdk') && this.isApplePayActive) {
                 const script = document.createElement('script');
                 script.src = 'https://applepay.cdn-apple.com/jsapi/v1/apple-pay-sdk.js';
                 script.setAttribute('id', 'apple-pay-sdk');
                 script.async = true;
                 document.body.appendChild(script);
-                resolve(true);
-            });
+            }
+        };
+        return new Promise((resolve) => {
+            if (typeof salla?.onReady === 'function') {
+                salla.onReady(() => runInit().then(() => resolve(true)));
+            }
+            else {
+                runInit().then(() => resolve(true));
+            }
         });
     }
     render() {
-        return h(Host, { key: '326f9d1a5336de18e77a71cef8d4e0118acb8055' }, this.quickBuyButton());
+        return h(Host, { key: '9a36fa6b7163dae6feed474712e3d0c3003d012c' }, this.quickBuyButton());
     }
     quickBuyButton() {
-        return h("apple-pay-button", { locale: salla.config.get('user.language_code'), onClick: () => this.quickBuyHandler(), "data-quick-purchase": "applepay", class: "s-quick-buy-apple-pay", "data-is-applepay": "1", buttonstyle: "black", type: this.type });
+        return h("apple-pay-button", { locale: salla?.config?.get?.('user.language_code') || 'ar', onClick: () => this.quickBuyHandler(), "data-quick-purchase": "applepay", class: "s-quick-buy-apple-pay", "data-is-applepay": "1", buttonstyle: "black", type: this.type });
     }
     get host() { return this; }
     static get style() { return sallaQuickBuyCss; }