@salla.sa/twilight-components 2.14.536 → 2.14.537

package/dist/collection/components/salla-quick-buy/salla-quick-buy.js

@@ -103,13 +103,28 @@ export class SallaQuickBuy {
         //use this way to get quantity too
         let data = this.host.getElementSallaData();
         appendOrderOptionsToPayload(data, this.collectedOrderOptions);
+        // mini-checkout takes the product in the request body (quick-purchase used the URL).
+        // set() overwrites any `id` the surrounding product form already carries — append() would duplicate it.
+        if ('set' in data) {
+            data.set('id', this.productId);
+            data.set('source', 'buy_now');
+        }
+        else {
+            data.id = this.productId;
+            data.source = 'buy_now';
+        }
         // if the store doesn't have Apple Pay , just create a cart and then redirect to check out page
         if (!this.isApplePayActive) {
-            // return salla.product.buyNow(this.productId, data);
-            return salla.api.request('checkout/quick-purchase/' + this.productId, data, 'post')
+            return salla.api.request('checkout/mini', data, 'post')
+                .catch(err => this.legacyQuickPurchaseFallback(err, data))
                 .then(resp => {
-                if (resp.data.redirect) {
-                    window.location.href = resp.data.redirect;
+                // mini-checkout answers {to, url}; legacy quick-purchase answered {redirect}
+                const redirect = resp.data?.url || resp.data?.redirect;
+                if (redirect) {
+                    window.location.href = redirect;
+                }
+                else if (resp.data?.to === 'login') {
+                    salla.event.dispatch('login::open');
                 }
                 return resp;
             });
@@ -145,20 +160,28 @@ export class SallaQuickBuy {
                         salla.log('🍏 Pay: create checkout success: with id #' + this.cartId);
                         return Promise.resolve(response);
                     }
-                    return salla.api.request('checkout/quick-purchase/' + this.productId, typeof data == 'object' ? data : undefined, 'post', {}).then(response => {
-                        // if is redirect url returned for any reason, lets redirect the user to check out
-                        if (response?.data?.redirect) {
-                            salla.log('🍏 Pay: create checkout success: redirect exits, go to checkout page');
-                            window.location.href = response.data.redirect.url;
+                    return salla.api.request('checkout/mini', typeof data == 'object' ? data : undefined, 'post', {})
+                        .catch(err => this.legacyQuickPurchaseFallback(err, typeof data == 'object' ? data : undefined))
+                        .then(response => {
+                        // the cart id keeps the Apple Pay session going; mini-checkout exposes it
+                        // in the checkout url path (`/checkout/{cart}`), same encoding quick-purchase returned
+                        const cartId = response?.data?.id
+                            || response?.data?.url?.split('/checkout/')[1]?.split(/[/?#]/)[0];
+                        if (cartId) {
+                            window.SallaApplePay.id = cartId;
+                            salla.log('🍏 Pay: create checkout success: with id #' + window.SallaApplePay.id);
                             return response;
                         }
-                        // the cart is not ready to complete apply pay session
-                        if (!response?.data?.id) {
-                            salla.logger.warn('🍏 Pay: create checkout success: No id, or redirect');
+                        // no cart id: fall back to the checkout page if any redirect url was returned
+                        const redirect = response?.data?.url || response?.data?.redirect?.url || response?.data?.redirect;
+                        if (redirect) {
+                            salla.log('🍏 Pay: create checkout success: redirect exits, go to checkout page');
+                            window.location.href = redirect;
                             return response;
                         }
-                        window.SallaApplePay.id = response.data.id;
-                        salla.log('🍏 Pay: create checkout success: with id #' + window.SallaApplePay.id);
+                        // the cart is not ready to complete apply pay session
+                        salla.logger.warn('🍏 Pay: create checkout success: No id, or redirect');
+                        return response;
                     });
                 }
             },
@@ -194,6 +217,13 @@ export class SallaQuickBuy {
             }
         });
     }
+    legacyQuickPurchaseFallback(err, data) {
+        if (err?.response?.data?.error?.code !== 'token_not_provided') {
+            throw err;
+        }
+        salla.logger.warn('quick-buy: falling back to quick-purchase because of token_not_provided');
+        return salla.api.request('checkout/quick-purchase/' + this.productId, data, 'post');
+    }
     isGuestCheckout() {
         return salla.config.isGuest() && salla.config.get('store.features').includes('guest-checkout') && this.isPhysicalProduct();
     }
@@ -279,7 +309,7 @@ export class SallaQuickBuy {
         });
     }
     render() {
-        return h(Host, { key: '100f3cd501d568084f3596f5cef7c9b744f7ec82' }, this.quickBuyButton());
+        return h(Host, { key: 'fd28f7292f396779cbe6ae4d5986ab187be38c48' }, this.quickBuyButton());
     }
     quickBuyButton() {
         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 });