@salla.sa/twilight-components 2.14.410 → 2.14.412

package/dist/collection/components/salla-delivery-promise/delivery-promise-labels.js

@@ -0,0 +1,39 @@
+/*!
+ * Crafted with ❤ by Salla
+ */
+export const DEFAULT_LABELS = {
+    deliveryTo: 'توصيل إلى',
+    pickupFromBranch: 'الاستلام من فرع',
+    noResults: 'لا توجد نتائج',
+    selectCity: 'اختر المدينة',
+    changeCityTitle: 'تغيير المدينة',
+    changeCitySubtitle: '',
+    cityFieldLabel: 'المدينة',
+    modalSearchPlaceholder: 'ابحث عن مدينة',
+    confirmAddress: 'تأكيد العنوان',
+    errorDeliveryPromise: 'لا يتوفر وعد تسليم لهذه المدينة',
+    errorPickupPromise: 'لا يتوفر وعد تسليم لهذا الفرع',
+};
+export function loadLabels() {
+    return {
+        deliveryTo: salla.lang.getWithDefault('pages.products.promise_deliver_to', DEFAULT_LABELS.deliveryTo),
+        pickupFromBranch: salla.lang.getWithDefault('pages.products.promise_pickup_from_branch', DEFAULT_LABELS.pickupFromBranch),
+        noResults: salla.lang.getWithDefault('common.elements.no_options', DEFAULT_LABELS.noResults),
+        selectCity: salla.lang.getWithDefault('common.elements.select_city', DEFAULT_LABELS.selectCity),
+        changeCityTitle: salla.lang.getWithDefault('pages.products.promise_change_city_title', DEFAULT_LABELS.changeCityTitle),
+        changeCitySubtitle: salla.lang.getWithDefault('pages.products.promise_change_city_subtitle', 'قد تتغيّر مدة التوصيل حسب المدينة.'),
+        cityFieldLabel: salla.lang.getWithDefault('pages.products.promise_city_field', DEFAULT_LABELS.cityFieldLabel),
+        modalSearchPlaceholder: salla.lang.getWithDefault('pages.products.promise_search_city', DEFAULT_LABELS.modalSearchPlaceholder),
+        confirmAddress: salla.lang.getWithDefault('pages.checkout.confirm_address', DEFAULT_LABELS.confirmAddress),
+        errorDeliveryPromise: salla.lang.getWithDefault('pages.products.promise_delivery_not_available', DEFAULT_LABELS.errorDeliveryPromise),
+        errorPickupPromise: salla.lang.getWithDefault('pages.products.promise_pickup_not_available', DEFAULT_LABELS.errorPickupPromise),
+    };
+}
+/** Localized city display name (English when available and user language is not Arabic). */
+export function getCityDisplayName(city) {
+    const lang = salla.config.get('user.language_code');
+    if (lang && lang !== 'ar' && city.name_en?.trim()) {
+        return city.name_en.trim();
+    }
+    return city.name;
+}

package/dist/collection/components/salla-delivery-promise/salla-delivery-promise.js

@@ -2,6 +2,10 @@
  * Crafted with ❤ by Salla
  */
 import { h, Host } from "@stencil/core";
+import { fetchCities, fetchDeliveryMessage } from "./delivery-promise-api";
+import { filterCitiesForModal } from "./delivery-promise-city-filter";
+import { buildBulletOpenPayload, resolveIntent } from "./delivery-promise-intent";
+import { DEFAULT_LABELS, getCityDisplayName, loadLabels } from "./delivery-promise-labels";
 /**
  * @name SallaDeliveryPromise
  * @description Displays delivery promise message (from BE) with city selection
@@ -9,106 +13,127 @@ import { h, Host } from "@stencil/core";
  */
 export class SallaDeliveryPromise {
     constructor() {
-        this.cities = [];
-        this.filteredCities = [];
-        this.selectedCity = null;
+        // ── Feature flags & config ────────────────────────────────────────────
+        this.isDeliveryPromiseEnabled = false;
+        this.isLoginCycleEnabled = false;
+        this.canRender = false;
+        // ── Shared display state ──────────────────────────────────────────────
+        this.labels = DEFAULT_LABELS;
+        this.selectedLabel = null;
         this.deliveryMessage = null;
-        this.isLoadingCities = false;
-        this.isLoadingPromises = false;
-        this.isDropdownOpen = false;
-        this.searchQuery = '';
         this.hasError = false;
         this.errorMessage = '';
-        /** i18n labels for city selector only; message comes from BE */
-        this.labels = {
-            deliveryTo: 'توصيل إلى',
-            pickupFromBranch: 'الاستلام من فرع',
-            searchPlaceholder: 'بحث...',
-            noResults: 'لا توجد نتائج',
-            selectCity: 'اختر المدينة',
+        this.isLoadingPromises = false;
+        // ── Login-cycle state (bullet delivery integration) ───────────────────
+        this.selectedCityLoginCycle = null;
+        this.selectedBranchLoginCycle = null;
+        // ── Standard flow state (city list) ───────────────────────────────────
+        this.cities = [];
+        this.selectedCity = null;
+        this.isLoadingCities = false;
+        // ── City-change modal state (non–login-cycle) ─────────────────────────
+        this.modalSearchQuery = '';
+        this.cityPendingSelection = null;
+        this.isCityPopoverOpen = false;
+        // ═══════════════════════════════════════════════════════════════════════
+        //  Login-cycle (bullet delivery) integration
+        // ═══════════════════════════════════════════════════════════════════════
+        this.onBulletDeliveryConfirmed = () => {
+            this.applyBulletIntent();
         };
-        this.canRender = false;
-        this.requiresShipping = false;
-        /** Used only for API calls, not rendered — no need for @State */
-        this.productId = undefined;
-        this.onClickOutside = (e) => {
-            if (this.host.contains(e.target)) {
-                return; // click inside component (e.g. search input, city list) — don't close
-            }
-            this.isDropdownOpen = false;
-            window.removeEventListener('click', this.onClickOutside);
+        this.handleModalSearchInput = (event) => {
+            this.modalSearchQuery = event.target.value;
+            this.isCityPopoverOpen = true;
         };
-    }
-    setLabels() {
-        this.labels = {
-            deliveryTo: salla.lang.getWithDefault('pages.products.promise_deliver_to', 'توصيل إلى'),
-            pickupFromBranch: salla.lang.getWithDefault('pages.products.promise_pickup_from_branch', 'الاستلام من فرع'),
-            searchPlaceholder: salla.lang.getWithDefault('blocks.header.search_placeholder', 'بحث...'),
-            noResults: salla.lang.getWithDefault('common.elements.no_options', 'لا توجد نتائج'),
-            selectCity: salla.lang.getWithDefault('common.elements.select_city', 'اختر المدينة'),
+        this.handleModalComboboxActivate = () => {
+            this.isCityPopoverOpen = true;
         };
-    }
-    logger(message, data) {
-        if (localStorage.getItem('salla-delivery-promise-debug')) {
-            if (data) {
-                console.log(message, data);
+        // ═══════════════════════════════════════════════════════════════════════
+        //  Header click (dispatches to correct flow)
+        // ═══════════════════════════════════════════════════════════════════════
+        this.handleHeaderClick = (e) => {
+            e.stopPropagation();
+            if (this.isLoginCycleEnabled) {
+                this.openBulletDeliveryModal();
             }
             else {
-                console.log(message);
+                void this.openCityChangeModal();
             }
-        }
+        };
     }
+    // ═══════════════════════════════════════════════════════════════════════
+    //  Lifecycle
+    // ═══════════════════════════════════════════════════════════════════════
     async componentDidLoad() {
         await salla.onReady();
         await salla.lang.onLoaded();
-        this.setLabels();
-        this.requiresShipping = salla.url.is_page('product.single') &&
-            salla.config.get('store.features', []).includes('delivery-promises');
-        if (this.requiresShipping) {
-            this.logger('requiresShipping', this.requiresShipping);
-            this.productId = salla.config.get('page.id');
-            this.logger('productId', this.productId);
+        this.labels = loadLabels();
+        this.isDeliveryPromiseEnabled = salla.config.get('store.features', []).includes('delivery-promises');
+        this.isLoginCycleEnabled = salla.config.get('store.features', []).includes('bullet-delivery-v2');
+        this.productId = salla.config.get('page.id');
+        if (!this.isDeliveryPromiseEnabled) {
+            this.canRender = false;
+            return;
+        }
+        if (this.isLoginCycleEnabled) {
+            this.applyBulletIntent();
+            this.canRender = true;
+            window.addEventListener('bulletDeliveryConfirmed', this.onBulletDeliveryConfirmed);
         }
         else {
-            this.canRender = false;
-            this.logger('not requiresShipping', {
-                is_product_single: salla.url.is_page('product.single'),
-                includesDeliveryPromises: salla.config.get('store.features', []).includes('delivery-promises')
-            });
+            this.selectedLabel = `${this.labels.deliveryTo} ${this.labels.selectCity}`;
+            await this.loadCities();
+        }
+    }
+    disconnectedCallback() {
+        window.removeEventListener('bulletDeliveryConfirmed', this.onBulletDeliveryConfirmed);
+    }
+    applyBulletIntent() {
+        const resolved = resolveIntent();
+        if (!resolved) {
+            this.selectedLabel = `${this.labels.deliveryTo} ${this.labels.selectCity}`;
+            this.selectedCityLoginCycle = null;
+            this.selectedBranchLoginCycle = null;
+            this.deliveryMessage = null;
             return;
         }
-        await this.fetchCities();
+        if (resolved.type === 'address') {
+            this.selectedCityLoginCycle = resolved.option;
+            this.selectedBranchLoginCycle = null;
+            this.selectedLabel = `${this.labels.deliveryTo} ${resolved.option.name || this.labels.selectCity}`;
+            void this.loadDeliveryMessage(resolved.option.id, 'city');
+        }
+        else {
+            this.selectedBranchLoginCycle = resolved.option;
+            this.selectedCityLoginCycle = null;
+            this.selectedLabel = `${this.labels.pickupFromBranch} ${resolved.option.name}`;
+            void this.loadDeliveryMessage(resolved.option.id, 'branch');
+        }
     }
-    async fetchCities() {
-        this.logger('start startfetchCities');
+    openBulletDeliveryModal() {
+        salla.event.emit('bullet-delivery::open', buildBulletOpenPayload());
+    }
+    // ═══════════════════════════════════════════════════════════════════════
+    //  Standard flow (city list, no login cycle)
+    // ═══════════════════════════════════════════════════════════════════════
+    async loadCities() {
         this.isLoadingCities = true;
         this.hasError = false;
         try {
-            const response = await salla.api.request(salla.url.api(`products/${this.productId}/delivery-promises/cities`));
-            if (response.success && Array.isArray(response.data) && response.data.length > 0) {
-                this.logger('fetchCities success', { cities: response.data });
-                // Sort cities: explicit cities first (id !== -1), then "Rest of cities" (id === -1)
-                this.cities = this.sortCities(response.data);
-                this.filteredCities = [...this.cities];
-                // First, check if API returns a selected city (is_selected: true)
-                let cityToSelect = this.cities.find(c => c.is_selected);
-                if (!cityToSelect) {
-                    this.logger('no selectedCity from API response');
-                }
-                else {
-                    this.logger('selectedCity', cityToSelect);
-                    this.selectedCity = cityToSelect;
-                    await this.fetchDeliveryMessage(cityToSelect.id);
-                }
-                this.canRender = true;
-            }
-            else {
-                this.logger('no data returned from fetchCities', { response: response });
+            const { cities, preselected } = await fetchCities(this.productId);
+            if (cities.length === 0) {
                 this.canRender = false;
+                return;
+            }
+            this.cities = cities;
+            if (preselected) {
+                this.selectedCity = preselected;
+                this.selectedLabel = `${this.labels.deliveryTo} ${getCityDisplayName(preselected)}`;
+                await this.loadDeliveryMessage(preselected.id, 'city');
             }
+            this.canRender = true;
         }
         catch (error) {
-            this.logger('fetchCities error', { error: error.message });
             this.hasError = true;
             this.errorMessage = error.message || 'Failed to load cities';
             this.canRender = false;
@@ -117,130 +142,113 @@ export class SallaDeliveryPromise {
             this.isLoadingCities = false;
         }
     }
-    async fetchDeliveryMessage(cityId) {
-        this.logger('start fetchDeliveryMessage', { cityId });
+    // ═══════════════════════════════════════════════════════════════════════
+    //  Delivery message (shared by both flows)
+    // ═══════════════════════════════════════════════════════════════════════
+    async loadDeliveryMessage(id, optionType) {
         this.isLoadingPromises = true;
         this.hasError = false;
         this.deliveryMessage = null;
         try {
-            const response = await salla.api.withoutNotifier(() => salla.api.request(salla.url.api(`products/${this.productId}/delivery-promises?city_id=${cityId}`)));
-            if (response.success && response.data?.message) {
-                const message = response.data.message.trim();
-                this.logger('fetchDeliveryMessage success', { message });
-                this.deliveryMessage = message || null;
-            }
-            else {
-                this.logger('deliveryMessage not valid', { response });
-            }
+            this.deliveryMessage = await fetchDeliveryMessage(this.productId, id, optionType, this.isLoginCycleEnabled);
         }
         catch (error) {
-            this.logger('fetchDeliveryMessage error', { error: error.message });
             this.hasError = true;
-            this.errorMessage = error.message || 'Failed to load delivery message';
+            this.errorMessage = optionType === 'city' ? this.labels.errorDeliveryPromise : this.labels.errorPickupPromise;
         }
         finally {
             this.isLoadingPromises = false;
         }
     }
-    toggleDropdown(e) {
-        e?.stopPropagation();
-        this.isDropdownOpen = !this.isDropdownOpen;
-        if (this.isDropdownOpen) {
-            window.addEventListener('click', this.onClickOutside);
-            if (this.searchInputRef) {
-                setTimeout(() => this.searchInputRef.focus(), 100);
-            }
-        }
-        else {
-            window.removeEventListener('click', this.onClickOutside);
-        }
-    }
-    disconnectedCallback() {
-        window.removeEventListener('click', this.onClickOutside);
-    }
-    /**
-     * Sort cities: explicit cities first (id !== -1), then "Rest of cities" (id === -1) at the end
-     */
-    sortCities(cities) {
-        return [...cities].sort((a, b) => {
-            // "Rest of cities" (id === -1) should always be at the end
-            if (a.id === -1)
-                return 1;
-            if (b.id === -1)
-                return -1;
-            return 0;
-        });
-    }
-    handleSearch(event) {
-        const query = event.target.value.toLowerCase();
-        this.searchQuery = query;
-        if (query.length > 0) {
-            this.filteredCities = this.cities.filter(city => city.name.toLowerCase()?.includes(query) ||
-                (city.name_en || '').toLowerCase()?.includes(query));
-        }
-        else {
-            this.filteredCities = [...this.cities];
+    // ═══════════════════════════════════════════════════════════════════════
+    //  City-change modal handlers (non–login-cycle)
+    // ═══════════════════════════════════════════════════════════════════════
+    async openCityChangeModal() {
+        if (!this.cityModalRef)
+            return;
+        this.cityPendingSelection = null;
+        this.modalSearchQuery = '';
+        this.isCityPopoverOpen = false;
+        await this.cityModalRef.setTitle(this.labels.changeCityTitle);
+        await this.cityModalRef.open();
+    }
+    handleModalSelectCity(city) {
+        this.cityPendingSelection = city;
+        this.modalSearchQuery = getCityDisplayName(city);
+        this.isCityPopoverOpen = false;
+    }
+    async handleConfirmCityModal() {
+        if (!this.cityPendingSelection) {
+            await this.cityModalRef?.close();
+            return;
         }
-    }
-    async selectCity(city) {
-        this.logger('selectCity', { city: city });
+        const city = this.cityPendingSelection;
         this.selectedCity = city;
-        this.isDropdownOpen = false;
-        window.removeEventListener('click', this.onClickOutside);
-        this.searchQuery = '';
-        this.filteredCities = [...this.cities];
-        await this.fetchDeliveryMessage(city.id);
-    }
-    renderDropdown() {
-        return (h("div", { class: "s-delivery-promise-dropdown" }, h("div", { class: "s-delivery-promise-dropdown-search" }, h("i", { class: "sicon-search" }), h("input", { type: "text", placeholder: this.labels.searchPlaceholder, value: this.searchQuery, onInput: (e) => this.handleSearch(e), ref: el => this.searchInputRef = el })), h("div", { class: "s-delivery-promise-dropdown-list" }, this.filteredCities.length === 0 ? (h("div", { class: "s-delivery-promise-dropdown-empty" }, this.labels.noResults)) : (this.filteredCities.map(city => (h("div", { key: city.id, class: `s-delivery-promise-dropdown-item ${this.selectedCity?.id === city.id ? 'selected' : ''}`, onClick: () => this.selectCity(city) }, h("span", { class: "s-delivery-promise-city-name" }, city.name), this.selectedCity?.id === city.id && (h("i", { class: "sicon-check" })))))))));
-    }
-    /**
-     * Skeleton shown during initial city fetch to avoid blank period and layout shift.
-     * Matches the structure/size of the real content (header + message area).
-     */
-    renderInitialLoadingSkeleton() {
+        this.selectedLabel = `${this.labels.deliveryTo} ${getCityDisplayName(city)}`;
+        await this.loadDeliveryMessage(city.id, 'city');
+        await this.cityModalRef?.close();
+    }
+    // ═══════════════════════════════════════════════════════════════════════
+    //  Render helpers
+    // ═══════════════════════════════════════════════════════════════════════
+    renderLoadingSkeleton() {
         return (h(Host, { class: "s-delivery-promise-wrapper s-delivery-promise-skeleton" }, h("div", { class: "s-delivery-promise-container" }, h("div", { class: "s-delivery-promise-header s-delivery-promise-header-skeleton" }, h("div", { class: "s-delivery-promise-location" }, h("salla-skeleton", { height: "14px", width: "180px" })), h("salla-skeleton", { height: "18px", width: "18px" })), h("div", { class: "s-delivery-promise-loading" }, h("salla-skeleton", { height: "20px", width: "80%" })))));
     }
     renderDeliveryMessage() {
         if (this.isLoadingPromises) {
             return (h("div", { class: "s-delivery-promise-loading" }, h("salla-skeleton", { height: "20px", width: "80%" })));
         }
-        if (!this.deliveryMessage) {
+        if (!this.deliveryMessage)
             return null;
-        }
-        return (h("div", { class: "s-delivery-promise-message" }, this.deliveryMessage));
+        return h("div", { class: "s-delivery-promise-message" }, this.deliveryMessage);
+    }
+    renderCityModalBody() {
+        const filtered = filterCitiesForModal(this.cities, this.modalSearchQuery);
+        return (h("div", { class: "s-delivery-promise-modal-body" }, h("label", { class: "s-delivery-promise-modal-field-label", htmlFor: "s-delivery-promise-modal-search" }, this.labels.cityFieldLabel, h("span", { class: "s-delivery-promise-required", "aria-hidden": "true" }, " *")), h("div", { class: "s-delivery-promise-modal-combobox" }, h("div", { class: "s-delivery-promise-modal-search", onClick: this.handleModalComboboxActivate }, h("i", { class: "sicon-search", "aria-hidden": "true" }), h("input", { id: "s-delivery-promise-modal-search", type: "text", class: "form-input", placeholder: this.labels.modalSearchPlaceholder, value: this.modalSearchQuery, onInput: this.handleModalSearchInput, autocomplete: "off", "aria-autocomplete": "list", "aria-expanded": this.isCityPopoverOpen ? 'true' : 'false', "aria-controls": "s-delivery-promise-modal-listbox" })), h("div", { id: "s-delivery-promise-modal-listbox", class: "s-delivery-promise-modal-popover", role: "listbox", hidden: !this.isCityPopoverOpen }, h("div", { class: "s-delivery-promise-modal-list s-scrollbar" }, filtered.length === 0 ? (h("div", { class: "s-delivery-promise-modal-empty" }, this.labels.noResults)) : (filtered.map(city => (h("button", { key: city.id, type: "button", role: "option", class: {
+                's-delivery-promise-modal-item': true,
+                's-delivery-promise-modal-item--selected': this.cityPendingSelection?.id === city.id,
+            }, "aria-selected": this.cityPendingSelection?.id === city.id ? 'true' : 'false', onClick: e => {
+                e.stopPropagation();
+                this.handleModalSelectCity(city);
+            } }, h("span", { class: "s-delivery-promise-modal-item-name" }, city.name), this.cityPendingSelection?.id === city.id ? h("i", { class: "sicon-check", "aria-hidden": "true" }) : null)))))))));
+    }
+    renderCityChangeModal() {
+        if (this.isLoginCycleEnabled)
+            return null;
+        return (h("salla-modal", { id: "s-delivery-promise-city-modal", ref: el => { this.cityModalRef = el; }, class: "s-delivery-promise-city-modal", isClosable: true, width: "md", "modal-title": this.labels.changeCityTitle, subTitle: this.labels.changeCitySubtitle }, this.renderCityModalBody(), h("salla-button", { slot: "footer", width: "wide", disabled: !this.cityPendingSelection, onClick: () => this.handleConfirmCityModal() }, !this.isLoadingPromises && this.labels.confirmAddress)));
     }
+    // ═══════════════════════════════════════════════════════════════════════
+    //  Main render
+    // ═══════════════════════════════════════════════════════════════════════
     render() {
-        // Not on product page or delivery-promises disabled — hide entirely
-        if (!this.requiresShipping) {
+        if (!this.isDeliveryPromiseEnabled)
             return null;
-        }
-        // Initial city fetch: show skeleton to avoid blank period and layout shift
-        if (this.isLoadingCities) {
-            return this.renderInitialLoadingSkeleton();
-        }
-        // Fetch done but no cities / error — hide
-        if (!this.canRender || this.cities.length === 0) {
+        if (this.isLoadingCities)
+            return this.renderLoadingSkeleton();
+        if (!this.canRender)
             return null;
-        }
-        return (h(Host, { class: "s-delivery-promise-wrapper" }, h("div", { class: "s-delivery-promise-container" }, h("div", { class: "s-delivery-promise-header", onClick: (e) => this.toggleDropdown(e) }, h("div", { class: "s-delivery-promise-location" }, h("span", { class: "s-delivery-promise-title" }, this.labels.deliveryTo, " ", this.selectedCity?.name || this.labels.selectCity)), h("i", { class: `sicon-keyboard_arrow_down s-delivery-promise-arrow ${this.isDropdownOpen ? 'open' : ''}` })), this.hasError && (h("div", { class: "s-delivery-promise-error" }, this.errorMessage)), this.isDropdownOpen && this.renderDropdown(), !this.hasError && this.renderDeliveryMessage())));
+        return (h(Host, { class: "s-delivery-promise-wrapper" }, h("div", { class: "s-delivery-promise-container" }, h("div", { class: "s-delivery-promise-header", onClick: this.handleHeaderClick }, h("div", { class: "s-delivery-promise-location" }, h("span", { class: "s-delivery-promise-title" }, this.selectedLabel)), h("i", { class: `sicon-keyboard_arrow_down s-delivery-promise-arrow` })), this.hasError && h("div", { class: "s-delivery-promise-error" }, this.errorMessage), !this.hasError && this.renderDeliveryMessage()), this.renderCityChangeModal()));
     }
     static get is() { return "salla-delivery-promise"; }
     static get states() {
         return {
-            "cities": {},
-            "filteredCities": {},
-            "selectedCity": {},
+            "isDeliveryPromiseEnabled": {},
+            "isLoginCycleEnabled": {},
+            "canRender": {},
+            "labels": {},
+            "selectedLabel": {},
             "deliveryMessage": {},
-            "isLoadingCities": {},
-            "isLoadingPromises": {},
-            "isDropdownOpen": {},
-            "searchQuery": {},
             "hasError": {},
             "errorMessage": {},
-            "labels": {},
-            "canRender": {},
-            "requiresShipping": {}
+            "isLoadingPromises": {},
+            "selectedCityLoginCycle": {},
+            "selectedBranchLoginCycle": {},
+            "cities": {},
+            "selectedCity": {},
+            "isLoadingCities": {},
+            "modalSearchQuery": {},
+            "cityPendingSelection": {},
+            "isCityPopoverOpen": {}
         };
     }
     static get elementRef() { return "host"; }