@salla.sa/twilight-components 2.14.501 → 2.14.502

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

@@ -493,9 +493,15 @@ window.SallaApplePay = {
         SallaApplePay.initDefault();
 
         let version = SallaApplePay.getApplePaySessionVersion();
-        let supportedNetworks = SallaApplePay.detail.supportedNetworks || ['masterCard', 'visa'];
-
-        if (version === 5) {
+        // Normalize to an array: the backend can serialize the networks list as a JSON object
+        // (non-sequential PHP array keys). Copy it so we never mutate the shared `detail` reference.
+        // Works for both legacy (plain array) and unified (object-shaped) payloads.
+        let rawNetworks = SallaApplePay.detail.supportedNetworks;
+        let supportedNetworks = Array.isArray(rawNetworks) ? [...rawNetworks] : Object.values(rawNetworks || {});
+        if (!supportedNetworks.length) {
+            supportedNetworks = ['masterCard', 'visa'];
+        }
+        if (version === 5 && !supportedNetworks.includes('mada')) {
             supportedNetworks.push('mada');
         }
 
@@ -876,8 +882,16 @@ window.SallaApplePay = {
                 payments
             });
 
-            // todo :: enhance response from backend
-            SallaApplePay.detail.amount = payments?.gateways?.applePay?.supportedMultiCurrency ? cart.total_in_customer_currency : cart.total;
+            // BE-canary gate keyed on the live payload (not cached config): the unified BE adds
+            // applePay.amount, legacy BE doesn't — so gate and data can never desync.
+            if (payments?.gateways?.applePay?.amount != null) {
+                // Unified BE: Apple Pay is always charged in the store base currency.
+                SallaApplePay.detail.amount = payments.gateways.applePay.amount;
+                SallaApplePay.detail.currency = payments.gateways.applePay.currency ?? SallaApplePay.detail.currency;
+            } else {
+                // Legacy BE .
+                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,
@@ -1162,8 +1176,15 @@ const SallaQuickBuy = /*@__PURE__*/ proxyCustomElement(class SallaQuickBuy exten
             currency: this.currency || 'SAR', // SAR
             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'),
+            // Legacy BE 
+            supportedNetworks: this.isLegacyBuyNowBE()
+                ? salla.config.get('store.settings.buy_now.networks')
+                : ((Array.isArray(this.supportedNetworks) && this.supportedNetworks.length)
+                    ? this.supportedNetworks : salla.config.get('store.settings.buy_now.supportedNetworks')),
+            supportedCountries: this.isLegacyBuyNowBE()
+                ? salla.config.get('store.settings.buy_now.countries')
+                : ((Array.isArray(this.supportedCountries) && this.supportedCountries.length)
+                    ? this.supportedCountries : salla.config.get('store.settings.buy_now.supportedCountries')),
             countryCode: salla.config.get('store.store_country') || 'SA',
             onStartedSession: this.handleApplePaySessionStarted,
             validateMerchant: {
@@ -1240,6 +1261,35 @@ const SallaQuickBuy = /*@__PURE__*/ proxyCustomElement(class SallaQuickBuy exten
         }
         return fields;
     }
+    /**
+     * TEMPORARY for BE Vip sync
+     */
+    isLegacyBuyNowBE() {
+        return salla?.config?.get?.('store.settings.buy_now.networks') != null;
+    }
+    /** Set Apple Pay amount + currency from a price payload, always keeping the pair in one currency. */
+    applyBaseCurrencyPrice(data) {
+        // Legacy BE: amount only; currency is set once in runInit.
+        if (this.isLegacyBuyNowBE()) {
+            if (data?.price != null) {
+                this.amount = data.price;
+            }
+            return;
+        }
+        const base = data?.base_currency_price;
+        // Unified BE base pair (regular products): charge in base currency.
+        if (base?.amount != null) {
+            this.amount = base.amount;
+            if (base?.currency) {
+                this.currency = base.currency;
+            }
+            // Display-only payload (e.g. donation { id, price }): pair amount with its display currency.
+        }
+        else if (data?.price != null) {
+            this.amount = data.price;
+            this.currency = salla.config.get('user.currency_code') || this.currency || 'SAR';
+        }
+    }
     componentWillLoad() {
         console.log('🍏 Pay: Quick Buy Component Loaded');
         const canMakePayments = typeof window !== 'undefined' && !!window.ApplePaySession?.canMakePayments?.();
@@ -1247,7 +1297,9 @@ const SallaQuickBuy = /*@__PURE__*/ proxyCustomElement(class SallaQuickBuy exten
         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) {
+            if (this.isLegacyBuyNowBE() && !this.currency && salla?.config?.get) {
+                // Legacy BE (pre-PR): currency from the multi_currency flag. The unified BE instead
+                // sources amount + currency from `base_currency_price` (see applyBaseCurrencyPrice).
                 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) {
@@ -1259,7 +1311,7 @@ const SallaQuickBuy = /*@__PURE__*/ proxyCustomElement(class SallaQuickBuy exten
             }
             if ((!this.amount || !this.isRequireShipping) && this.productId && salla?.product?.getDetails) {
                 await salla.product.getDetails(this.productId, []).then((response) => {
-                    this.amount = response.data.price;
+                    this.applyBaseCurrencyPrice(response?.data);
                     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);
@@ -1269,11 +1321,11 @@ const SallaQuickBuy = /*@__PURE__*/ proxyCustomElement(class SallaQuickBuy exten
                 salla.event.on('product-options::donation-changed', (data) => {
                     if (String(data.id) !== String(this.productId))
                         return;
-                    this.amount = data.price;
+                    this.applyBaseCurrencyPrice(data);
                 });
             }
             else if (salla?.url?.is_page?.('product.single') && salla?.product?.event?.onPriceUpdated) {
-                salla.product.event.onPriceUpdated(response => { this.amount = response.data.price; });
+                salla.product.event.onPriceUpdated(response => { this.applyBaseCurrencyPrice(response?.data); });
             }
             this.isApplePayActive = (salla?.helpers?.hasApplePay?.() ?? canMakePayments)
                 && (salla?.config?.get?.('store.settings.payments')?.includes?.('apple_pay') ?? storeHasApplePay)
@@ -1296,7 +1348,7 @@ const SallaQuickBuy = /*@__PURE__*/ proxyCustomElement(class SallaQuickBuy exten
         });
     }
     render() {
-        return h(Host, { key: '1895bf6077b3c9d2068830ac621e8f5b8afd1193' }, this.quickBuyButton());
+        return h(Host, { key: '8df291680d9b59f1627c8e1185a01cb30b92c2e4' }, 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 });
@@ -1318,6 +1370,8 @@ const SallaQuickBuy = /*@__PURE__*/ proxyCustomElement(class SallaQuickBuy exten
         "isRequireShipping": [1028, "is-require-shipping"],
         "applePayOnly": [1028, "apple-pay-only"],
         "validateHost": [1025, "validate-host"],
+        "supportedNetworks": [1040, "supported-networks"],
+        "supportedCountries": [1040, "supported-countries"],
         "isApplePayActive": [32],
         "quickBuy": [32]
     }]);

package/dist/esm/{filepond-DQgEXp69.js → filepond--jRYda4S.js}

@@ -1,7 +1,7 @@
 /*!
  * Crafted with ❤ by Salla
  */
-import { d as getDefaultExportFromCjs } from './index-DW5RMC3M.js';
+import { d as getDefaultExportFromCjs } from './index-BOjfFBGe.js';
 
 function _mergeNamespaces(n, m) {
     m.forEach(function (e) {

package/dist/esm/{filepond-plugin-file-poster-BE5-JUQb.js → filepond-plugin-file-poster-CckDj7tB.js}

@@ -1,7 +1,7 @@
 /*!
  * Crafted with ❤ by Salla
  */
-import { d as getDefaultExportFromCjs } from './index-DW5RMC3M.js';
+import { d as getDefaultExportFromCjs } from './index-BOjfFBGe.js';
 
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {

package/dist/esm/{filepond-plugin-file-validate-size-CwWpBym0.js → filepond-plugin-file-validate-size-9b6v_l6Z.js}

@@ -1,7 +1,7 @@
 /*!
  * Crafted with ❤ by Salla
  */
-import { d as getDefaultExportFromCjs } from './index-DW5RMC3M.js';
+import { d as getDefaultExportFromCjs } from './index-BOjfFBGe.js';
 
 function _mergeNamespaces(n, m) {
     m.forEach(function (e) {

package/dist/esm/{filepond-plugin-file-validate-type-CovRSsjJ.js → filepond-plugin-file-validate-type-CjGNB5Pv.js}

@@ -1,7 +1,7 @@
 /*!
  * Crafted with ❤ by Salla
  */
-import { d as getDefaultExportFromCjs } from './index-DW5RMC3M.js';
+import { d as getDefaultExportFromCjs } from './index-BOjfFBGe.js';
 
 function _mergeNamespaces(n, m) {
     m.forEach(function (e) {

package/dist/esm/{filepond-plugin-image-edit-DY-5oWCU.js → filepond-plugin-image-edit-UIthhs_A.js}

@@ -1,7 +1,7 @@
 /*!
  * Crafted with ❤ by Salla
  */
-import { d as getDefaultExportFromCjs } from './index-DW5RMC3M.js';
+import { d as getDefaultExportFromCjs } from './index-BOjfFBGe.js';
 
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {

package/dist/esm/{filepond-plugin-image-exif-orientation-DQROYLkj.js → filepond-plugin-image-exif-orientation-DPcDqfwl.js}

@@ -1,7 +1,7 @@
 /*!
  * Crafted with ❤ by Salla
  */
-import { d as getDefaultExportFromCjs } from './index-DW5RMC3M.js';
+import { d as getDefaultExportFromCjs } from './index-BOjfFBGe.js';
 
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {

package/dist/esm/{filepond-plugin-image-preview-CZCR-9d7.js → filepond-plugin-image-preview-BWlnovlW.js}

@@ -1,7 +1,7 @@
 /*!
  * Crafted with ❤ by Salla
  */
-import { d as getDefaultExportFromCjs } from './index-DW5RMC3M.js';
+import { d as getDefaultExportFromCjs } from './index-BOjfFBGe.js';
 
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {

package/dist/esm/{functions-DWD7tnLk.js → functions-Vnk4zyHS.js}

@@ -1,7 +1,7 @@
 /*!
  * Crafted with ❤ by Salla
  */
-import { h } from './index-DW5RMC3M.js';
+import { h } from './index-BOjfFBGe.js';
 
 function nearestLowerMultiple(number, multipleOf = window.matchMedia('(min-width: 768px)').matches ? 3 : 2) {
     return number < multipleOf ? number : number - (number % multipleOf);