@salla.sa/twilight-components 2.14.446 → 2.14.448

package/dist/collection/components/salla-products-list/salla-products-list.js

@@ -432,6 +432,34 @@ export class SallaProductsList {
     getSourceValue() {
         return this.currentCategoryIdFilter ? this.currentCategoryIdFilter : Helper.getProductsSourceValue(this.source, this.sourceValue);
     }
+    logFetchError(errorPhase, error, fetchPath, http, response) {
+        try {
+            const body = response && typeof response === 'object' ? response : null;
+            const sourceValue = this.getSourceValue();
+            salla.analytics?.log('salla::products.list.fetch.error', {
+                errorPhase,
+                source: this.getSource(),
+                sourceValue: typeof sourceValue === 'string' && sourceValue.length > 200
+                    ? `${sourceValue.slice(0, 200)}…`
+                    : Array.isArray(sourceValue) ? { length: sourceValue.length } : sourceValue,
+                pageIndex: this.infiniteScroll?.pageIndex,
+                fetchPath,
+                httpStatus: http?.status,
+                httpStatusText: http?.statusText,
+                responseUrl: http?.url,
+                ...(body && {
+                    dataCount: Array.isArray(body.data) ? body.data.length : undefined,
+                    responseKeys: Object.keys(body).slice(0, 15),
+                    filtersCount: Array.isArray(body.filters) ? body.filters.length : undefined,
+                }),
+                errorMessage: error instanceof Error ? error.message : String(error),
+                ...(errorPhase === 'processing' && error instanceof Error && error.stack
+                    ? { errorStack: error.stack.slice(0, 500) }
+                    : {}),
+            });
+        }
+        catch { /* analytics */ }
+    }
     appendDataLayer(data) {
         if (typeof dataLayer !== 'object' || !Array.isArray(dataLayer)) {
             //todo:: check if we should define it here
@@ -508,47 +536,20 @@ export class SallaProductsList {
             }
             catch (error) {
                 console.error('Error during load:', error);
-                try {
-                    const res = httpResponse;
-                    salla.analytics?.log('salla::products.list.fetch.error', {
-                        source: this.getSource(),
-                        nextPage: this.nextPage,
-                        pageIndex: this.infiniteScroll?.pageIndex,
-                        fetchPath: typeof path === 'string' ? path : undefined,
-                        httpStatus: res?.status,
-                        httpStatusText: res?.statusText,
-                        responseUrl: res?.url,
-                        itemsLength: Array.isArray(response?.data) ? response.data.length : undefined,
-                        responseKeys: response && typeof response === 'object' ? Object.keys(response).slice(0, 30) : undefined,
-                        errorMessage: error instanceof Error ? error.message : String(error),
-                    });
-                }
-                catch { /* analytics */ }
+                const res = httpResponse;
+                this.logFetchError('processing', error, typeof path === 'string' ? path : undefined, res, response);
             }
             finally {
                 this.isProcessing = false;
             }
         });
         this.infiniteScroll?.on('error', (error, path, httpResponse) => {
-            console.log('Error occurred during request');
-            try {
-                const res = httpResponse;
-                salla.analytics?.log('salla::products.list.fetch.error', {
-                    source: this.getSource(),
-                    nextPage: this.nextPage,
-                    pageIndex: this.infiniteScroll?.pageIndex,
-                    fetchPath: path,
-                    httpStatus: res?.status,
-                    httpStatusText: res?.statusText,
-                    responseUrl: res?.url,
-                    errorMessage: error instanceof Error ? error.message : String(error),
-                });
-            }
-            catch { /* analytics */ }
+            const res = httpResponse;
             this.status.querySelector('.s-infinite-scroll-error').classList.remove('s-hidden');
             this.placeholderLoader && this.placeholderLoader.remove();
             this.loading(false);
             this.isProcessing = false;
+            this.logFetchError('fetch', error, path, res);
         });
         salla.onReady(() => {
             const snapshot = sessionStorage.getItem(this.infiniteScrollStateKey);

package/dist/collection/components/salla-tiered-offer/salla-tiered-offer.js

@@ -54,6 +54,15 @@ export class SallaTieredOffer {
         // If coupon is applied but offer doesn't support coupons, widget should be hidden
         return !(cartCoupon && !offerData.details?.applied_with_coupon);
     }
+    shouldHideForGuest() {
+        return salla.config.isGuest();
+    }
+    shouldHideUntilThreshold(details, tierIndex) {
+        return !!(details?.hide_until_threshold && tierIndex === 0);
+    }
+    resolveTierName(tiers, index) {
+        return TierUtils.getTierNameByIndex(tiers, index) || '';
+    }
     async fetchTieredOfferData() {
         try {
             const { data } = await salla.api.cart.offers();
@@ -80,14 +89,20 @@ export class SallaTieredOffer {
         // Find current tier index based on current_value from API
         const currentValue = this.apiOfferData.details?.current_value || 0;
         const currentTierIndex = this.findCurrentTierIndex(currentValue);
-        // Only render if user has reached at least the first tier
-        if (currentTierIndex === 0) {
+        // Hide entire widget for unauthenticated users
+        if (this.shouldHideForGuest()) {
+            this.canRender = false;
+            return;
+        }
+        // Only hide until threshold for merchants with the flag enabled (e.g. Arabian Oud)
+        if (this.shouldHideUntilThreshold(this.apiOfferData.details, currentTierIndex)) {
             this.canRender = false;
             return;
         }
         this.currentTierIndex = currentTierIndex;
-        this.currentTier = TierUtils.getTierNameByIndex(this.tieredOfferData.tiers, currentTierIndex);
-        this.activeTabTier = this.currentTier;
+        this.currentTier = this.resolveTierName(this.tieredOfferData.tiers, currentTierIndex);
+        // Default to first tab so tabs always have visible content
+        this.activeTabTier = this.currentTier || this.tieredOfferData.tiers[0]?.tier_name;
         this.canRender = true;
     }
     componentDidLoad() {
@@ -122,44 +137,46 @@ export class SallaTieredOffer {
         if (!freshOfferData || !this.tieredOfferData) {
             return;
         }
+        if (!freshOfferData.details?.discounts?.length) {
+            this.canRender = false;
+            return;
+        }
         // Check coupon compatibility
         if (!this.validateCouponCompatibility(freshOfferData, updatedCart.coupon)) {
             this.canRender = false;
             return;
         }
-        // If no coupon conflict, show widget
-        this.canRender = true;
-        // Check if this offer should update with cart changes
-        if (freshOfferData.details?.with_current_cart === false) {
+        // Hide entire widget for unauthenticated users
+        if (this.shouldHideForGuest()) {
+            this.canRender = false;
             return;
         }
-        // Update current_value in API offer data
-        //  const currentValue = updatedCart.sub_total;
-        //  console.log('currentValue #####3', currentValue);
-        //  this.apiOfferData = {
-        //    ...this.apiOfferData,
-        //    details: {
-        //      ...this.apiOfferData.details,
-        //      current_value: currentValue
-        //    }
-        //  };
-        // Use current_value from fresh API data instead of cart sub_total
+        // Build fresh tier map so index computation uses up-to-date thresholds
+        const freshTieredData = this.mapApiDataToTiers(freshOfferData);
         const currentValue = freshOfferData.details?.current_value || 0;
-        this.apiOfferData = freshOfferData;
-        // Update current tier based on new value
-        const newTierIndex = this.findCurrentTierIndex(currentValue);
-        // Check if user qualifies for any tier
-        if (newTierIndex === 0) {
+        const newTierIndex = this.findCurrentTierIndex(currentValue, freshTieredData.tiers);
+        // Only hide until threshold for merchants with the flag enabled (e.g. Arabian Oud)
+        if (this.shouldHideUntilThreshold(freshOfferData.details, newTierIndex)) {
             this.canRender = false;
             return;
         }
-        // user qualifies show widget
+        // Offer progress is based on historical purchases only — skip state update on cart changes
+        // Use strict === false to avoid treating an omitted flag as false
+        if (freshOfferData.details?.with_current_cart === false) {
+            this.canRender = true;
+            return;
+        }
+        // All guards passed — update state atomically
+        this.apiOfferData = freshOfferData;
+        this.tieredOfferData = freshTieredData;
         this.canRender = true;
         this.currentTierIndex = newTierIndex;
-        this.currentTier = TierUtils.getTierNameByIndex(this.tieredOfferData.tiers, newTierIndex);
-        // Update active tab if needed
-        if (this.activeTabTier !== this.currentTier) {
-            this.activeTabTier = this.currentTier;
+        // Tiers are 1-based; fall back to first tier when no tier has been reached yet
+        this.currentTier = this.resolveTierName(freshTieredData.tiers, newTierIndex);
+        // Update active tab if needed; default to first tab when no tier reached
+        const resolvedTab = this.currentTier || freshTieredData.tiers[0]?.tier_name;
+        if (this.activeTabTier !== resolvedTab) {
+            this.activeTabTier = resolvedTab;
         }
     }
     getLoadingSkeletonView() {
@@ -257,7 +274,7 @@ export class SallaTieredOffer {
             return null;
         }
         const currentTierData = this.getCurrentTierData();
-        return (h(Host, null, h("div", { class: "s-tiered-offer-container" }, h("div", { class: "s-tiered-offer-header" }, h("div", { class: "s-tiered-offer-header-content" }, h("p", { class: "s-tiered-offer-program-title" }, this.loyaltyProgramText), h("div", { class: "s-tiered-offer-current-tier-name-wrapper" }, h("h2", { class: "s-tiered-offer-current-tier" }, this.currentTierText, " ", h("span", { class: "s-tiered-offer-tier-name" }, currentTierData.name)), h("span", { innerHTML: currentTierData.icon })))), this.renderProgressBar(), this.renderTabs())));
+        return (h(Host, null, h("div", { class: "s-tiered-offer-container" }, h("div", { class: "s-tiered-offer-header" }, h("div", { class: "s-tiered-offer-header-content" }, h("p", { class: "s-tiered-offer-program-title" }, this.loyaltyProgramText), this.currentTier && (h("div", { class: "s-tiered-offer-current-tier-name-wrapper" }, h("h2", { class: "s-tiered-offer-current-tier" }, this.currentTierText, " ", h("span", { class: "s-tiered-offer-tier-name" }, currentTierData.name)), h("span", { innerHTML: currentTierData.icon }))))), this.renderProgressBar(), this.renderTabs())));
     }
     static get is() { return "salla-tiered-offer"; }
     static get originalStyleUrls() {