@salla.sa/twilight-components 2.14.590 → 2.14.592

package/dist/components/salla-add-product-button2.js

@@ -4,7 +4,7 @@
 import { proxyCustomElement, HTMLElement, createEvent, h, Host } from '@stencil/core/internal/client';
 import { P as PendingOrdersIcon } from './cart.js';
 import { H as Helper } from './Helper.js';
-import { i as injectFreeProductsIntoPayload, d as defineCustomElement$3, c as canCompleteApplePay } from './salla-quick-buy2.js';
+import { i as injectFreeProductsIntoPayload, d as defineCustomElement$3, c as canCompleteApplePay, a as isApplePayHostedRedirect } from './salla-quick-buy2.js';
 import { d as defineCustomElement$h } from './salla-attachment-view2.js';
 import { d as defineCustomElement$g } from './salla-booking-field2.js';
 import { d as defineCustomElement$f } from './salla-button2.js';
@@ -432,8 +432,11 @@ const SallaAddProductButton = /*@__PURE__*/ proxyCustomElement(class SallaAddPro
                 && this.productType !== 'booking';
             // Cross-browser Apple Pay: native (Safari) OR the Payment Request API
             // (non-Safari browsers / non-Apple devices via the QR-code fallback).
+            // Hosted (MyFatoorah, S2S off) Apple Pay has no native sheet and no buy-now redirect
+            // path, so the quick-buy button below must not render for it either.
             this.isApplePayActive = salla.config.get('store.settings.payments')?.includes('apple_pay')
                 && salla.config.get('store.settings.is_salla_gateway', false)
+                && !isApplePayHostedRedirect()
                 && await canCompleteApplePay();
             this.passedLabel = this.host.innerHTML.replace('<!---->', '').trim();
             if (!!this.passedLabel && this.isDesktopViewport) {

package/dist/components/salla-bullet-delivery.js

@@ -2,7 +2,7 @@
  * Crafted with ❤ by Salla
  */
 import { proxyCustomElement, HTMLElement, createEvent, h, Host } from '@stencil/core/internal/client';
-import { i as isSaudiArabia, b as bulletDeliveryAPI, r as requireRegionAndDistrictForSA, g as getIntentLatitude, a as getIntentLongitude, h as hasSessionAddressIntent, c as getIntentCityId, d as getIntentCountryId, e as getIntentRegionId, f as getIntentDistrictId, j as filterBranches, k as findNearestBranch, l as getGeolocationErrorMessage, m as clearApiCache, n as getIntentSubtitle, o as getIntentBranchId, p as isMapOriginIntent, q as isBranchSelectable, s as getIntentCountryCode } from './helpers.js';
+import { i as isSaudiArabia, b as bulletDeliveryAPI, r as requireRegionAndDistrictForSA, g as getIntentLatitude, a as getIntentLongitude, h as hasSessionAddressIntent, c as getIntentCityId, d as getIntentCountryId, e as getIntentRegionId, f as getIntentDistrictId, j as isBranchSelectable, k as filterBranches, l as getIntentBranchId, m as findNearestBranch, n as getGeolocationErrorMessage, o as clearApiCache, p as getIntentSubtitle, q as isMapOriginIntent, s as getIntentCountryCode } from './helpers.js';
 import { S as SILocation } from './location.js';
 import { S as Search } from './search.js';
 import { d as defineCustomElement$7 } from './salla-button2.js';
@@ -500,10 +500,7 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
                 }
                 // Auto-select preselected branch if provided
                 if (this.preselectedBranchId) {
-                    const branch = this.branches.find((b) => b.id === this.preselectedBranchId);
-                    if (branch) {
-                        this.selectedBranch = branch;
-                    }
+                    this.preselectBranch(this.preselectedBranchId);
                 }
             }
             // Prefill form data from session storage
@@ -954,15 +951,30 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
     async loadBranches() {
         this.loadingBranches = true;
         try {
-            this.branches = await bulletDeliveryAPI.getBranches({
+            this.applyLoadedBranches(await bulletDeliveryAPI.getBranches({
                 country_id: this.selectedCountry?.id,
-            });
-            this.filterBranches();
+            }));
         }
         finally {
             this.loadingBranches = false;
         }
     }
+    /**
+     * Store a freshly fetched branch list and reconcile the current selection with it.
+     * `selectedBranch` is a snapshot from selection time: when the refreshed list carries the
+     * same branch, swap in the fresh copy, and drop it if it is no longer selectable (INV-1407).
+     * A selection missing from the list (e.g. filtered out by a search) is left untouched.
+     */
+    applyLoadedBranches(branches) {
+        this.branches = branches;
+        if (this.selectedBranch) {
+            const fresh = branches.find((b) => b.id === this.selectedBranch?.id);
+            if (fresh) {
+                this.selectedBranch = isBranchSelectable(fresh) ? fresh : null;
+            }
+        }
+        this.filterBranches();
+    }
     filterBranches() {
         this.filteredBranches = filterBranches(this.branches, this.branchSearchQuery);
     }
@@ -989,13 +1001,7 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
                     if (country) {
                         this.selectedCountry = country;
                         this.updateNewAddressForm({ country_id: Number(country.id) });
-                        const branchId = getIntentBranchId(intent);
-                        if (branchId != null && this.branches.length > 0) {
-                            const branch = this.branches.find((b) => b.id === branchId);
-                            if (branch) {
-                                this.selectedBranch = branch;
-                            }
-                        }
+                        this.preselectBranch(getIntentBranchId(intent));
                     }
                 }
             }
@@ -1159,11 +1165,10 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
                 return;
             this.loadingBranches = true;
             try {
-                this.branches = await bulletDeliveryAPI.getBranches({
+                this.applyLoadedBranches(await bulletDeliveryAPI.getBranches({
                     country_id: this.selectedCountry?.id,
                     query,
-                });
-                this.filterBranches();
+                }));
             }
             finally {
                 this.loadingBranches = false;
@@ -1196,12 +1201,11 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
     async loadBranchesWithLocation(lat, lng) {
         this.loadingBranches = true;
         try {
-            this.branches = await bulletDeliveryAPI.getBranches({
+            this.applyLoadedBranches(await bulletDeliveryAPI.getBranches({
                 country_id: this.selectedCountry?.id,
                 lat,
                 lng,
-            });
-            this.filterBranches();
+            }));
             // Auto-select country from first branch if no country is selected
             if (!this.selectedCountry && this.branches.length > 0) {
                 const firstBranch = this.branches[0];
@@ -1258,6 +1262,18 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
         this.selectedBranch = branch;
         this.allocationOutOfCoverageMessage = null;
     }
+    /**
+     * Restore a remembered / event-provided branch — but only one the list renders as selectable,
+     * so a branch that has closed since it was remembered is never silently preselected (INV-1407).
+     */
+    preselectBranch(branchId) {
+        if (branchId == null)
+            return;
+        const branch = this.branches.find((b) => b.id === branchId);
+        if (branch && isBranchSelectable(branch)) {
+            this.selectedBranch = branch;
+        }
+    }
     handleSavedAddressSelect(address) {
         if (address.is_in_coverage === false) {
             // Show toast notification for out of coverage address
@@ -1497,13 +1513,7 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
                         await this.loadBranches();
                     }
                     // Preselect branch from session storage if available
-                    const branchId = getIntentBranchId(savedIntent);
-                    if (branchId != null && this.branches.length > 0) {
-                        const branch = this.branches.find((b) => b.id === branchId);
-                        if (branch) {
-                            this.selectedBranch = branch;
-                        }
-                    }
+                    this.preselectBranch(getIntentBranchId(savedIntent));
                 }
                 else if (tab === "address") {
                     // Lazy-load saved addresses when switching to address tab (if not loaded yet).
@@ -1532,7 +1542,8 @@ const SallaBulletDelivery$1 = /*@__PURE__*/ proxyCustomElement(class SallaBullet
     }
     isConfirmDisabled() {
         if (this.activeTab === "branch") {
-            return !this.selectedBranch;
+            // Backstop for any selection path: the allocation API rejects non-selectable branches (INV-1407).
+            return !isBranchSelectable(this.selectedBranch);
         }
         if (this.activeTab === "address") {
             if (this.isLoggedIn && this.selectedSessionAddress) {