@salla.sa/applepay 3.0.19 → 3.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salla.sa/applepay",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "description": "Salla Apple Pay light",
   "main": "dist/app.js",
   "scripts": {
@@ -26,5 +26,5 @@
   "dependencies": {
     "axios": "^1.10.0"
   },
-  "gitHead": "7668f911e50da28e3b118964ad95591db283bf40"
+  "gitHead": "87982d444f0f3f162c8a96a5daaa004a0937487d"
 }

package/src/index.js

@@ -178,6 +178,17 @@ const SallaApplePay = typeof window !== 'undefined' ? {
 
         SallaApplePay.initDefault();
 
+        // A saved delivery address goes to the checkout directly, so the native sheet doesn't ask
+        // Apple for one. The QR (PaymentRequest) sheet always asks, so it keeps the default flow.
+        if (SallaApplePay.detail.savedAddress?.address_id) {
+            if (SallaApplePay.canUseNative()) {
+                SallaApplePay.detail.requiredShippingContactFields = (SallaApplePay.detail.requiredShippingContactFields || [])
+                    .filter((field) => field !== 'postalAddress');
+            } else {
+                SallaApplePay.detail.savedAddress = null;
+            }
+        }
+
         // Native (Safari / Apple devices) → classic ApplePaySession. Otherwise
         // (non-Safari / non-Apple device) → Payment Request API, which renders
         // Apple's "Scan Code with iPhone" QR sheet.
@@ -249,9 +260,14 @@ const SallaApplePay = typeof window !== 'undefined' ? {
     onPaymentMethodSelected: async (event) => {
         salla.logger.log('🍏 Pay: onPaymentMethodSelected', event);
 
-        // perform recalculate here only if digital product
+        // A saved address skips Apple's address step (postalAddress is removed), so isPhysical() is
+        // false for it even though the product ships: it takes this path to refresh the total and
+        // offer the carriers, since there is no shipping-contact step to do it.
+        const usesSavedAddress = !!SallaApplePay.detail.savedAddress?.address_id;
+
+        // perform recalculate here only if digital product or a saved address
         // if physical recalculate performed with shipping company
-        if (!SallaApplePay.isPhysical()) {
+        if (!SallaApplePay.isPhysical() || usesSavedAddress) {
             try {
                 await SallaApplePay.recalculateTotal();
     
@@ -259,7 +275,13 @@ const SallaApplePay = typeof window !== 'undefined' ? {
                     newTotal: SallaApplePay.prepareTotal(),
                     newLineItems: SallaApplePay.prepareLineItems()
                 };
-    
+
+                // A saved address skips Apple's address step, which is where the shipping methods
+                // are normally offered, so offer them here with the selected one first.
+                if (usesSavedAddress && SallaApplePay.shipping_methods?.length) {
+                    updatedPaymentDetails.newShippingMethods = SallaApplePay.savedAddressShippingMethods();
+                }
+
                 salla.logger.log('🍏 Pay: completePaymentMethodSelection', updatedPaymentDetails);
 
                 SallaApplePay.session.completePaymentMethodSelection(updatedPaymentDetails);
@@ -481,6 +503,12 @@ const SallaApplePay = typeof window !== 'undefined' ? {
                     return SallaApplePay.abortValidateMerchant(response);
                 }
             }
+
+            // The cart exists now, so the saved address can be set on it before the sheet opens.
+            if (SallaApplePay.detail.savedAddress?.address_id) {
+                await SallaApplePay.applySavedAddress();
+            }
+
             completeMerchantValidation(data.data);
         } catch (error) {
             // Handle errors
@@ -1046,6 +1074,16 @@ const SallaApplePay = typeof window !== 'undefined' ? {
         }
     },
 
+    /** Shipping options for the sheet with the currently selected one first, so Apple keeps it selected. */
+    savedAddressShippingMethods() {
+        const methods = SallaApplePay.shipping_methods || [];
+        const current = SallaApplePay.shippingCompany;
+        const selected = methods.find((method) => method.ship_id == current?.ship_id && method.private_ship_id == current?.private_ship_id);
+        const ordered = selected ? [selected, ...methods.filter((method) => method !== selected)] : methods;
+
+        return SallaApplePay.mappingShippingMethods(ordered);
+    },
+
     shouldUpdateShippingCompany(shippingCompany) {
         return SallaApplePay.shippingCompany?.ship_id != shippingCompany?.ship_id || SallaApplePay.shippingCompany?.private_ship_id != shippingCompany?.private_ship_id
     },
@@ -1155,6 +1193,36 @@ const SallaApplePay = typeof window !== 'undefined' ? {
             return response?.data?.message;
         });
     },
+    /**
+     * Sets the saved delivery address on the cart by its address_id (no address from Apple), then
+     * picks its first shipping method, as the Apple address flow does. Throws an axios-shaped error
+     * so onValidateMerchant's catch can show it through validateMerchant.onFailed.
+     */
+    applySavedAddress: async () => {
+        const { address_id, shippingMethods } = SallaApplePay.detail.savedAddress;
+        const fail = (message) => Object.assign(new Error(message), { response: { data: { error: { message } } } });
+        const outOfCoverage = () => salla.lang.get('pages.checkout.address_out_of_coverage');
+
+        let companies;
+        try {
+            const { data } = await http.get(shippingMethods.url.replace('{id}', SallaApplePay.id), null, null, { address_id });
+            companies = data?.data?.companies;
+        } catch (error) {
+            throw fail(error?.response?.data?.error?.message || outOfCoverage());
+        }
+
+        if (!companies?.length) {
+            throw fail(outOfCoverage());
+        }
+
+        SallaApplePay.address_id = address_id;
+        SallaApplePay.shipping_methods = companies;
+
+        const selected = await SallaApplePay.selectApplePayShippingMethod(companies[0]);
+        if (selected !== true) {
+            throw fail((typeof selected === 'string' && selected) || outOfCoverage());
+        }
+    },
     mappingShippingMethods: methods => methods.map(method => ({
         'label': method.shipping_title,
         'amount': method.enable_free_shipping ? 0 : method.ship_cost,