@salla.sa/twilight-components 2.14.543 → 2.14.545

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

@@ -2,6 +2,7 @@
  * Crafted with ❤ by Salla
  */
 import { proxyCustomElement, HTMLElement, h, Host } from '@stencil/core/internal/client';
+import { q as isMapOriginIntent } from './helpers.js';
 import { d as defineCustomElement$6 } from './salla-button2.js';
 import { d as defineCustomElement$5 } from './salla-loading2.js';
 import { d as defineCustomElement$4 } from './salla-modal2.js';
@@ -39,13 +40,17 @@ async function fetchDeliveryMessage(productId, id, optionType, isLoginCycleEnabl
     const response = (await salla.api.withoutNotifier(() => salla.api.request(salla.url.api(`products/${productId}/delivery-promises${queryString}`))));
     if (!response.success) {
         log('fetchDeliveryMessage error', { response });
-        throw new Error(response.error?.message || 'Failed to fetch delivery promise');
+        return null;
     }
     const message = response.data?.message?.trim();
     log('fetchDeliveryMessage success', { message });
     return message || null;
 }
 
+/**
+ * Bullet delivery intent helpers.
+ * Reads/writes the same storage key as salla-bullet-delivery so both components stay in sync.
+ */
 const INTENT_KEY = 'bullet_delivery_intent';
 function getIntentStorage() {
     const rememberLastSession = Boolean(salla.config.get('store.settings.bullet_delivery.settings.remember_last_session'));
@@ -67,6 +72,10 @@ function resolveIntent() {
         if (cityId != null) {
             return { type: 'address', option: { id: cityId, name: cityName } };
         }
+        // Map-origin pick: no city id to query a delivery estimate by, but still show the address.
+        if (isMapOriginIntent(intent) && intent.address_details?.formatted_address) {
+            return { type: 'address', option: { name: intent.address_details.formatted_address } };
+        }
         return null;
     }
     if (intent.type === 'branch') {
@@ -252,12 +261,19 @@ const SallaDeliveryPromise$1 = /*@__PURE__*/ proxyCustomElement(class SallaDeliv
             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');
+            // Map-origin picks have no resolved city id — nothing to query a delivery estimate by.
+            if (resolved.option.id != null) {
+                void this.loadDeliveryMessage(resolved.option.id, 'city');
+            }
+            else {
+                this.deliveryMessage = null;
+            }
         }
         else {
             this.selectedBranchLoginCycle = resolved.option;
             this.selectedCityLoginCycle = null;
             this.selectedLabel = `${this.labels.pickupFromBranch} ${resolved.option.name}`;
+            // Branch resolution in resolveIntent() always sets an id.
             void this.loadDeliveryMessage(resolved.option.id, 'branch');
         }
         return true;
@@ -312,8 +328,8 @@ const SallaDeliveryPromise$1 = /*@__PURE__*/ proxyCustomElement(class SallaDeliv
             this.deliveryMessage = await fetchDeliveryMessage(this.productId, id, optionType, this.isLoginCycleEnabled);
         }
         catch (error) {
-            this.hasError = true;
-            this.errorMessage = optionType === 'city' ? this.labels.errorDeliveryPromise : this.labels.errorPickupPromise;
+            log('loadDeliveryMessage failed', { id, optionType, error });
+            this.deliveryMessage = null;
         }
         finally {
             this.isLoadingPromises = false;

package/dist/components/salla-rating-modal-v22.js

@@ -247,7 +247,7 @@ const SallaRatingModalV2 = /*@__PURE__*/ proxyCustomElement(class SallaRatingMod
      * Show the rating modal
      */
     syncStoreSettings() {
-        if (this.orderId === undefined) {
+        if (!this.orderId) {
             this.orderId = salla.config.get('page.id');
         }
         this.allowAttachImages = !!salla.config.get('store.settings.rating.allow_attach_images');
@@ -316,15 +316,11 @@ const SallaRatingModalV2 = /*@__PURE__*/ proxyCustomElement(class SallaRatingMod
         this.setUploaderProcessing(productId, !!detail.uploading);
         this.scheduleUploaderHeightRefresh();
     }
-    /** An eligible review with no order behind it — product-only, no store/shipping steps. */
-    isUnverifiedReview() {
-        return this.orderId === null && !!this.productId;
-    }
     /** Encrypted order id from page config / prop — used to fetch order details. */
     getRatingOrderId() {
         return this.orderId || salla.config.get('page.id');
     }
-    /** Numeric order id from API response — used when submitting ratings. Null when unverified. */
+    /** Numeric order id from API response — used when submitting ratings. */
     getSubmitOrderId() {
         return this.orderId;
     }
@@ -393,9 +389,6 @@ const SallaRatingModalV2 = /*@__PURE__*/ proxyCustomElement(class SallaRatingMod
         return rating !== undefined && rating !== null && rating !== '' && Number(rating) > 0;
     }
     isTestimonialsEnabled(order = this.order) {
-        if (this.productId) {
-            return false;
-        }
         if (order?.testimonials_enabled === false) {
             return false;
         }
@@ -414,9 +407,6 @@ const SallaRatingModalV2 = /*@__PURE__*/ proxyCustomElement(class SallaRatingMod
         return this.getRateableProducts(order).length > 0;
     }
     isShippingEnabled(order = this.order) {
-        if (this.productId) {
-            return false;
-        }
         if (order?.shipping_enabled === false) {
             return false;
         }
@@ -438,8 +428,7 @@ const SallaRatingModalV2 = /*@__PURE__*/ proxyCustomElement(class SallaRatingMod
         return order.products.filter(item => item?.product?.id);
     }
     getRateableProducts(order = this.order) {
-        return this.getOrderProducts(order).filter(item => !this.hasRatingFeedback(item?.feedback) &&
-            (!this.productId || String(item.product.id) === String(this.productId)));
+        return this.getOrderProducts(order).filter(item => !this.hasRatingFeedback(item?.feedback));
     }
     getStepsCount(order = this.order) {
         if (!order) {
@@ -462,50 +451,6 @@ const SallaRatingModalV2 = /*@__PURE__*/ proxyCustomElement(class SallaRatingMod
         this.scheduleWizardSetup = true;
         forceUpdate(this);
     }
-    /**
-     * Point the modal at a different order/product and invalidate any cached
-     * order so the next open() re-fetches instead of reusing stale data.
-     * Pass `orderId` as `null` for an eligible-but-unverified product review.
-     */
-    async setOrder(orderId, productId) {
-        this.orderId = orderId;
-        this.productId = productId;
-        this.order = undefined;
-        this.hasError = false;
-        this.errorMessage = undefined;
-        this.showContactWidget = true;
-    }
-    /** Builds a single-product, order-less feedback target for unverified reviews. */
-    async loadUnverifiedProductOrder() {
-        const response = await salla.api
-            .withoutNotifier(() => salla.product.api.getDetails(this.productId))
-            .catch(() => null);
-        const product = response?.data;
-        this.order = {
-            products: [
-                {
-                    feedback: undefined,
-                    product: {
-                        id: Number(this.productId),
-                        name: product?.name || '',
-                        thumbnail: product?.image?.url || salla.url.cdn('images/s-empty.png'),
-                    },
-                },
-            ],
-            products_enabled: true,
-            testimonials_enabled: false,
-            shipping_enabled: false,
-            thanks_message: '',
-        };
-        this.productReviewFactors = await this.fetchAllProductReviewFactors(this.order);
-    }
-    getModalTitle() {
-        if (this.isUnverifiedReview()) {
-            const productName = this.getRateableProducts()[0]?.product?.name || '';
-            return `${salla.lang.get('pages.rating.rate')} ${productName}`.trim();
-        }
-        return `${salla.lang.get('pages.rating.rate_order')} <span class="unicode">(#${this.order?.id})</span>`;
-    }
     async open() {
         await salla.onReady();
         this.syncStoreSettings();
@@ -517,16 +462,14 @@ const SallaRatingModalV2 = /*@__PURE__*/ proxyCustomElement(class SallaRatingMod
                 this.modal
                     ?.open()
                     .then(() => this.order ||
-                    (this.isUnverifiedReview()
-                        ? this.loadUnverifiedProductOrder()
-                        : salla.api
-                            .withoutNotifier(() => salla.rating.api.order(this.getRatingOrderId()))
-                            .then(async (res) => {
-                            this.order = res.data;
-                            this.productReviewFactors = await this.fetchAllProductReviewFactors(res.data);
-                        })))
+                    salla.api
+                        .withoutNotifier(() => salla.rating.api.order(this.getRatingOrderId()))
+                        .then(async (res) => {
+                        this.order = res.data;
+                        this.productReviewFactors = await this.fetchAllProductReviewFactors(res.data);
+                    }))
                     .then(() => this.readyUpLoyaltyPoints())
-                    .then(() => this.modal?.setTitle(this.getModalTitle()))
+                    .then(() => this.modal?.setTitle(`${salla.lang.get('pages.rating.rate_order')} <span class="unicode">(#${this.order.id})</span>`))
                     .then(() => {
                     // Initialize productImages for all products
                     const initialImages = {};
@@ -961,9 +904,7 @@ const SallaRatingModalV2 = /*@__PURE__*/ proxyCustomElement(class SallaRatingMod
             Number(rating_product_with_image_points) + Number(rating_product_points);
     }
     loyaltyPointsNote() {
-        if (!this.loyaltyImageRatingPoints ||
-            !this.loyaltyPointsForImagesLabel ||
-            this.isUnverifiedReview()) {
+        if (!this.loyaltyImageRatingPoints || !this.loyaltyPointsForImagesLabel) {
             return null;
         }
         const svgIcon = (h("svg", { width: "17", height: "17", viewBox: "0 0 17 17", fill: "none", xmlns: "http://www.w3.org/2000/svg" }, h("path", { d: "M10 0C13.6819 0 16.6667 2.98477 16.6667 6.66664C16.6667 9.37047 15.057 11.6984 12.7437 12.7444C11.6978 15.0575 9.3701 16.6666 6.66668 16.6666C2.98477 16.6666 0 13.6819 0 9.99998C0 7.29656 1.60918 4.96894 3.92195 3.92276C4.96827 1.60964 7.29618 0 10 0ZM6.66668 5C3.90524 5 1.66667 7.23856 1.66667 9.99998C1.66667 12.7614 3.90524 15 6.66668 15C9.4281 15 11.6667 12.7614 11.6667 9.99998C11.6667 7.23856 9.4281 5 6.66668 5ZM7.50002 5.83333V6.66664H9.16668V8.33331H5.83333C5.60322 8.33331 5.41667 8.51989 5.41667 8.74998C5.41667 8.95456 5.56407 9.12464 5.75844 9.15998L5.83333 9.16664H7.50002C8.6506 9.16664 9.58335 10.0994 9.58335 11.25C9.58335 12.4006 8.6506 13.3333 7.50002 13.3333V14.1666H5.83333V13.3333H4.16667V11.6666H7.50002C7.7301 11.6666 7.91668 11.4801 7.91668 11.25C7.91668 11.0455 7.76927 10.8753 7.57493 10.8401L7.50002 10.8333H5.83333C4.68274 10.8333 3.75 9.90056 3.75 8.74998C3.75 7.59939 4.68274 6.66664 5.83333 6.66664V5.83333H7.50002ZM10 1.66667C8.51377 1.66667 7.17893 2.31513 6.26313 3.34457C6.39704 3.33736 6.53138 3.33333 6.66668 3.33333C10.3486 3.33333 13.3333 6.3181 13.3333 9.99998C13.3333 10.1356 13.3293 10.2702 13.3213 10.4037C14.3513 9.48814 15 8.15314 15 6.66664C15 3.90524 12.7614 1.66667 10 1.66667Z", fill: "#008C56" })));
@@ -1493,8 +1434,7 @@ const SallaRatingModalV2 = /*@__PURE__*/ proxyCustomElement(class SallaRatingMod
     get host() { return this; }
     static get style() { return sallaRatingModalCss; }
 }, [0, "salla-rating-modal-v2", {
-        "orderId": [1032, "order-id"],
-        "productId": [1032, "product-id"],
+        "orderId": [2, "order-id"],
         "order": [32],
         "hasError": [32],
         "showContactWidget": [32],
@@ -1524,7 +1464,6 @@ const SallaRatingModalV2 = /*@__PURE__*/ proxyCustomElement(class SallaRatingMod
         "uploadVideoCounts": [32],
         "hasUploadsInProgress": [32],
         "loyaltyImageRatingPoints": [32],
-        "setOrder": [64],
         "open": [64],
         "openEditModal": [64],
         "openDeleteModal": [64],