@ikas/storefront 0.0.157 → 0.0.158-alpha.10

package/build/index.js

@@ -11075,6 +11075,8 @@ var IkasCategoryPath = /** @class */ (function () {
 }());
 var IkasFilterCategory = /** @class */ (function () {
     function IkasFilterCategory(data) {
+        // Extra
+        this._isSelected = false;
         this.id = data.id || "";
         this.name = data.name || "";
         this.slug = data.slug || "";
@@ -11082,8 +11084,16 @@ var IkasFilterCategory = /** @class */ (function () {
             data.resultCount !== undefined && data.resultCount !== null
                 ? data.resultCount
                 : null;
+        this._isSelected = data.isSelected || false;
         mobx.makeAutoObservable(this);
     }
+    Object.defineProperty(IkasFilterCategory.prototype, "isSelected", {
+        get: function () {
+            return this._isSelected;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(IkasFilterCategory.prototype, "href", {
         get: function () {
             if (!this.slug)
@@ -11093,6 +11103,9 @@ var IkasFilterCategory = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    IkasFilterCategory.prototype.toJSON = function () {
+        return __assign(__assign({}, this), { isSelected: this._isSelected });
+    };
     return IkasFilterCategory;
 }());
 
@@ -11185,7 +11198,7 @@ var IkasOrderAddress = /** @class */ (function () {
     });
     Object.defineProperty(IkasOrderAddress.prototype, "validationResult", {
         get: function () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d;
             var isValidPhone = !!this.phone &&
                 this.phone.length >= 10 &&
                 validatePhoneNumber(this.phone);
@@ -11206,10 +11219,7 @@ var IkasOrderAddress = /** @class */ (function () {
                     ? isValidPhone
                     : true,
                 identityNumber: ((_d = this.checkoutSettings) === null || _d === void 0 ? void 0 : _d.identityNumberRequirement) ===
-                    IkasCheckoutRequirementEnum.MANDATORY ||
-                    (((_e = this.checkoutSettings) === null || _e === void 0 ? void 0 : _e.identityNumberRequirement) ===
-                        IkasCheckoutRequirementEnum.OPTIONAL &&
-                        this.phone)
+                    IkasCheckoutRequirementEnum.MANDATORY
                     ? !!this.identityNumber
                     : true,
             };
@@ -11340,6 +11350,13 @@ var IkasOrderLineItem = /** @class */ (function () {
         this.status = data.status || OrderLineItemStatusEnum.FULFILLED;
         mobx.makeAutoObservable(this);
     }
+    Object.defineProperty(IkasOrderLineItem.prototype, "priceWithQuantity", {
+        get: function () {
+            return this.price * this.quantity;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(IkasOrderLineItem.prototype, "finalPriceWithQuantity", {
         get: function () {
             return this.finalPrice * this.quantity;
@@ -17474,6 +17491,8 @@ var LS_TOKEN_KEY = "customerToken";
 var LS_TOKEN_EXPIRY = "customerTokenExpiry";
 var LS_CUSTOMER_KEY = "customer";
 var LS_CUSTOMER_SUB_KEY = "customerEmailSubscription";
+var LS_LAST_VIEWED_PRODUCTS_KEY = "lastViewedProducts";
+var LS_CUSTOMER_CONSENT = "customerConsent";
 var IkasCustomerStore = /** @class */ (function () {
     function IkasCustomerStore(baseStore) {
         var _this = this;
@@ -17483,6 +17502,8 @@ var IkasCustomerStore = /** @class */ (function () {
         this.baseStore = null;
         this._initialized = false;
         this._visitorSubscribedEmail = false;
+        this._lastViewedProducts = [];
+        this._customerConsentGranted = false;
         this.login = function (email, password) { return __awaiter(_this, void 0, void 0, function () {
             var response, cart;
             var _a;
@@ -17502,7 +17523,9 @@ var IkasCustomerStore = /** @class */ (function () {
                     case 2:
                         _b.sent();
                         _b.label = 3;
-                    case 3: return [2 /*return*/, true];
+                    case 3:
+                        this.saveLocalLastViewedProducts();
+                        return [2 /*return*/, true];
                     case 4: return [2 /*return*/, false];
                 }
             });
@@ -17517,6 +17540,7 @@ var IkasCustomerStore = /** @class */ (function () {
                         if (response) {
                             this.setToken(response.token, response.tokenExpiry);
                             this.setCustomer(response.customer);
+                            this.saveLocalLastViewedProducts();
                             return [2 /*return*/, true];
                         }
                         return [2 /*return*/, false];
@@ -17732,6 +17756,9 @@ var IkasCustomerStore = /** @class */ (function () {
                 }
             });
         }); };
+        this.onCustomerConsentGrant = function () {
+            _this.saveCustomerConsent();
+        };
         this.baseStore = baseStore;
         this.init();
         mobx.makeAutoObservable(this);
@@ -17754,6 +17781,13 @@ var IkasCustomerStore = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(IkasCustomerStore.prototype, "customerConsentGranted", {
+        get: function () {
+            return this._customerConsentGranted;
+        },
+        enumerable: false,
+        configurable: true
+    });
     IkasCustomerStore.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -17761,6 +17795,8 @@ var IkasCustomerStore = /** @class */ (function () {
                     case 0:
                         this.loadToken();
                         this.loadCustomer();
+                        this.loadLastViewedProducts();
+                        this.loadCustomerConsent();
                         return [4 /*yield*/, this.refreshToken()];
                     case 1:
                         _a.sent();
@@ -17831,6 +17867,127 @@ var IkasCustomerStore = /** @class */ (function () {
         }
         catch (err) { }
     };
+    IkasCustomerStore.prototype.getLastViewedProducts = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!this.customer) return [3 /*break*/, 2];
+                        _a = this;
+                        return [4 /*yield*/, IkasCustomerAPI.getLastViewedProducts(this.customer.id)];
+                    case 1:
+                        _a._lastViewedProducts = _b.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        this.loadLastViewedProducts();
+                        _b.label = 3;
+                    case 3: return [2 /*return*/, this._lastViewedProducts];
+                }
+            });
+        });
+    };
+    IkasCustomerStore.prototype.saveLastViewedProducts = function () {
+        if (isServer$3)
+            return;
+        window.localStorage.setItem(LS_LAST_VIEWED_PRODUCTS_KEY, JSON.stringify(this._lastViewedProducts));
+    };
+    IkasCustomerStore.prototype.loadLastViewedProducts = function () {
+        if (isServer$3)
+            return;
+        try {
+            var lvpStr = window.localStorage.getItem(LS_LAST_VIEWED_PRODUCTS_KEY);
+            if (lvpStr) {
+                this._lastViewedProducts = JSON.parse(lvpStr);
+                this._lastViewedProducts = this._lastViewedProducts.reverse();
+            }
+        }
+        catch (err) { }
+    };
+    IkasCustomerStore.prototype.removeLastViewedProducts = function () {
+        if (isServer$3)
+            return;
+        window.localStorage.removeItem(LS_LAST_VIEWED_PRODUCTS_KEY);
+    };
+    IkasCustomerStore.prototype.onProductView = function (productId, variantId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var isSuccess;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.customer) return [3 /*break*/, 2];
+                        return [4 /*yield*/, IkasCustomerAPI.saveLastViewedProducts({
+                                customerId: this.customer.id,
+                                products: [
+                                    {
+                                        productId: productId,
+                                        variantId: variantId,
+                                    },
+                                ],
+                            })];
+                    case 1:
+                        isSuccess = _a.sent();
+                        if (isSuccess)
+                            this._lastViewedProducts.push({ productId: productId, variantId: variantId });
+                        return [3 /*break*/, 3];
+                    case 2:
+                        this._lastViewedProducts.push({ productId: productId, variantId: variantId });
+                        this._lastViewedProducts = this._lastViewedProducts.slice(0, 20);
+                        this.saveLastViewedProducts();
+                        _a.label = 3;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    IkasCustomerStore.prototype.saveLocalLastViewedProducts = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var isSuccess;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (isServer$3)
+                            return [2 /*return*/];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 4, , 5]);
+                        this.loadLastViewedProducts();
+                        if (!this._lastViewedProducts.length) return [3 /*break*/, 3];
+                        return [4 /*yield*/, IkasCustomerAPI.saveLastViewedProducts({
+                                customerId: this.customer.id,
+                                products: this._lastViewedProducts,
+                            })];
+                    case 2:
+                        isSuccess = _a.sent();
+                        if (isSuccess) {
+                            this.removeLastViewedProducts();
+                        }
+                        _a.label = 3;
+                    case 3: return [3 /*break*/, 5];
+                    case 4:
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 5: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    IkasCustomerStore.prototype.saveCustomerConsent = function () {
+        if (isServer$3)
+            return;
+        this._customerConsentGranted = true;
+        window.localStorage.setItem(LS_CUSTOMER_CONSENT, "true");
+    };
+    IkasCustomerStore.prototype.loadCustomerConsent = function () {
+        if (isServer$3)
+            return;
+        this._customerConsentGranted = !!window.localStorage.getItem(LS_CUSTOMER_CONSENT);
+    };
+    IkasCustomerStore.prototype.removeCustomerConsent = function () {
+        if (isServer$3)
+            return;
+        window.localStorage.removeItem(LS_CUSTOMER_CONSENT);
+    };
     IkasCustomerStore.prototype.setToken = function (token, tokenExpiry) {
         if (isServer$3)
             return;
@@ -20919,6 +21076,15 @@ var CustomerAccountStatusesEnum;
     CustomerAccountStatusesEnum["DISABLED_ACCOUNT"] = "DISABLED_ACCOUNT";
     CustomerAccountStatusesEnum["INVITED_TO_CREATE_ACCOUNT"] = "INVITED_TO_CREATE_ACCOUNT";
 })(CustomerAccountStatusesEnum || (CustomerAccountStatusesEnum = {}));
+/**
+ * Customer Email Subscription Statuses
+ */
+var CustomerEmailSubscriptionStatusesEnum;
+(function (CustomerEmailSubscriptionStatusesEnum) {
+    CustomerEmailSubscriptionStatusesEnum["NOT_SUBSCRIBED"] = "NOT_SUBSCRIBED";
+    CustomerEmailSubscriptionStatusesEnum["PENDING_CONFIRMATION"] = "PENDING_CONFIRMATION";
+    CustomerEmailSubscriptionStatusesEnum["SUBSCRIBED"] = "SUBSCRIBED";
+})(CustomerEmailSubscriptionStatusesEnum || (CustomerEmailSubscriptionStatusesEnum = {}));
 /**
  * Url Slug Target Type Enum Codes
  */
@@ -21172,6 +21338,7 @@ var IkasProductList = /** @class */ (function () {
         var _this = this;
         this.filters = null;
         this._filterCategories = null;
+        this._infiniteScrollPage = null;
         this._initialized = false;
         this._minPage = null;
         this._filterBrandId = null;
@@ -21182,12 +21349,12 @@ var IkasProductList = /** @class */ (function () {
         this.router = null;
         this.applyFilters = function () { return __awaiter(_this, void 0, void 0, function () {
             var resultsSet;
-            var _a, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getInitial()];
                     case 1:
-                        resultsSet = _c.sent();
+                        resultsSet = _b.sent();
                         if (![
                             exports.IkasThemePageType.CATEGORY,
                             exports.IkasThemePageType.BRAND,
@@ -21196,38 +21363,30 @@ var IkasProductList = /** @class */ (function () {
                             return [2 /*return*/];
                         // Change url params
                         if (resultsSet && this.isBrowser()) {
-                            if (this.isFiltered) {
-                                (_a = this.router) === null || _a === void 0 ? void 0 : _a.replace("" + location.pathname + (this.filterQueryParams ? "?" + this.filterQueryParams : ""), undefined, { shallow: true });
-                            }
-                            else {
-                                (_b = this.router) === null || _b === void 0 ? void 0 : _b.replace("" + location.pathname, undefined, {
-                                    shallow: true,
-                                });
-                            }
+                            (_a = this.router) === null || _a === void 0 ? void 0 : _a.replace("" + location.pathname + (this.filterQueryParams ? "?" + this.filterQueryParams : ""), undefined, { shallow: true });
                         }
                         return [2 /*return*/];
                 }
             });
         }); };
         this.getInitial = function (queryParams, isInfiteScrollReturn) { return __awaiter(_this, void 0, void 0, function () {
-            var fetchRequestTime, page, limit, response_1, data, err_1;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var fetchRequestTime, page, limit, productIdList, lastViewedProducts, response_1, data, idList, err_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         this._isLoading = true;
                         fetchRequestTime = Date.now();
                         this._fetchRequestTime = fetchRequestTime;
-                        _b.label = 1;
+                        _a.label = 1;
                     case 1:
-                        _b.trys.push([1, 5, 6, 7]);
+                        _a.trys.push([1, 12, 13, 14]);
                         page = isInfiteScrollReturn ? this._page : 1;
                         limit = this._limit;
                         if (!(this.isFilterable && !this.filters)) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.getFilters()];
                     case 2:
-                        _b.sent();
-                        _b.label = 3;
+                        _a.sent();
+                        _a.label = 3;
                     case 3:
                         this.applyQueryParamFilters(queryParams);
                         if (this.isSearch && !this.hasAppliedfilter) {
@@ -21238,27 +21397,48 @@ var IkasProductList = /** @class */ (function () {
                             this._initialized = true;
                             return [2 /*return*/, true];
                         }
-                        if (this.isStatic) {
-                            page = undefined;
-                            limit = undefined;
-                        }
-                        else if (this.isDiscounted) {
-                            page = 1;
-                            limit = 10;
-                        }
-                        else if (this.isRecommended) {
-                            page = 1;
-                            limit = 10;
-                        }
-                        return [4 /*yield*/, this.searchProducts(page || 1, limit || 10)];
+                        productIdList = void 0;
+                        if (!this.isStatic) return [3 /*break*/, 4];
+                        page = undefined;
+                        limit = undefined;
+                        return [3 /*break*/, 10];
                     case 4:
-                        response_1 = _b.sent();
+                        if (!this.isDiscounted) return [3 /*break*/, 5];
+                        page = 1;
+                        limit = 10;
+                        return [3 /*break*/, 10];
+                    case 5:
+                        if (!this.isRecommended) return [3 /*break*/, 6];
+                        page = 1;
+                        limit = 10;
+                        return [3 /*break*/, 10];
+                    case 6:
+                        if (!this.isLastViewed) return [3 /*break*/, 10];
+                        if (!this.isBrowser()) return [3 /*break*/, 9];
+                        return [4 /*yield*/, this.waitForCustomerStoreInit()];
+                    case 7:
+                        _a.sent();
+                        return [4 /*yield*/, IkasStorefrontConfig.store.customerStore.getLastViewedProducts()];
+                    case 8:
+                        lastViewedProducts = _a.sent();
+                        if (lastViewedProducts && lastViewedProducts.length) {
+                            productIdList = lastViewedProducts.map(function (p) { return p.productId; });
+                        }
+                        return [3 /*break*/, 10];
+                    case 9: return [2 /*return*/];
+                    case 10: return [4 /*yield*/, this.searchProducts(page || 1, limit || 10, productIdList)];
+                    case 11:
+                        response_1 = _a.sent();
                         if (!response_1 || this._fetchRequestTime !== fetchRequestTime)
                             return [2 /*return*/];
                         data = [];
-                        if (this.isStatic) {
+                        if (this.isStatic || this.isLastViewed) {
+                            idList = this.isStatic
+                                ? this._productListPropValue.productIds
+                                : //@ts-ignore
+                                    IkasStorefrontConfig.store.customerStore._lastViewedProducts;
                             data =
-                                ((_a = this._productListPropValue.productIds) === null || _a === void 0 ? void 0 : _a.map(function (pID) {
+                                (idList === null || idList === void 0 ? void 0 : idList.map(function (pID) {
                                     var product = response_1.data.find(function (p) { return p.id === pID.productId; });
                                     var variant = product === null || product === void 0 ? void 0 : product.variants.find(function (v) { return v.id === pID.variantId; });
                                     if (product && variant)
@@ -21276,16 +21456,18 @@ var IkasProductList = /** @class */ (function () {
                         this._initialized = true;
                         this._page = page || 1;
                         this._minPage = this.page;
+                        if (!isInfiteScrollReturn)
+                            this._infiniteScrollPage = null;
                         return [2 /*return*/, true];
-                    case 5:
-                        err_1 = _b.sent();
+                    case 12:
+                        err_1 = _a.sent();
                         console.log(err_1);
-                        return [3 /*break*/, 7];
-                    case 6:
+                        return [3 /*break*/, 14];
+                    case 13:
                         if (fetchRequestTime === this._fetchRequestTime)
                             this._isLoading = false;
                         return [7 /*endfinally*/];
-                    case 7: return [2 /*return*/];
+                    case 14: return [2 /*return*/];
                 }
             });
         }); };
@@ -21297,6 +21479,7 @@ var IkasProductList = /** @class */ (function () {
                         if (this.isStatic ||
                             this.isDiscounted ||
                             this.isRecommended ||
+                            this.isLastViewed ||
                             this._isLoading ||
                             !this.hasPrev)
                             return [2 /*return*/];
@@ -21336,6 +21519,7 @@ var IkasProductList = /** @class */ (function () {
                         if (this.isStatic ||
                             this.isDiscounted ||
                             this.isRecommended ||
+                            this.isLastViewed ||
                             this._isLoading ||
                             !this.hasNext)
                             return [2 /*return*/];
@@ -21374,7 +21558,8 @@ var IkasProductList = /** @class */ (function () {
                         if (this._isLoading ||
                             this.isStatic ||
                             this.isDiscounted ||
-                            this.isRecommended)
+                            this.isRecommended ||
+                            this.isLastViewed)
                             return [2 /*return*/];
                         this._isLoading = true;
                         _a.label = 1;
@@ -21404,6 +21589,13 @@ var IkasProductList = /** @class */ (function () {
                 }
             });
         }); };
+        this.setVisibleInfiniteScrollPage = function (page) {
+            var _a;
+            if (_this._infiniteScrollPage === page)
+                return;
+            _this._infiniteScrollPage = page;
+            (_a = _this.router) === null || _a === void 0 ? void 0 : _a.replace("" + location.pathname + (_this.filterQueryParams ? "?" + _this.filterQueryParams : ""), undefined, { shallow: true });
+        };
         this.searchDebouncer = debounce_1(function () {
             _this.applyFilters();
         }, 100);
@@ -21444,15 +21636,18 @@ var IkasProductList = /** @class */ (function () {
         this.router = router;
         mobx.makeAutoObservable(this);
         if (this.isBrowser()) {
-            this.checkRestoreInfiniteScroll();
+            this.restoreInfiniteScrollPage();
             if (location.search &&
                 (this.isFilterable || this._type === exports.IkasProductListType.SEARCH)) {
                 var queryParams = this.getQueryParams();
-                this.getInitial(queryParams);
+                this.getInitial(queryParams, this._page > 1);
             }
             else if (this._page > 1) {
                 this.getInitial(undefined, true);
             }
+            else if (this.isLastViewed) {
+                this.getInitial();
+            }
         }
     }
     Object.defineProperty(IkasProductList.prototype, "sort", {
@@ -21483,6 +21678,13 @@ var IkasProductList = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(IkasProductList.prototype, "minPage", {
+        get: function () {
+            return this._minPage || 1;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(IkasProductList.prototype, "count", {
         get: function () {
             return this._count;
@@ -21558,6 +21760,13 @@ var IkasProductList = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(IkasProductList.prototype, "isLastViewed", {
+        get: function () {
+            return this._type === exports.IkasProductListType.LAST_VIEWED;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(IkasProductList.prototype, "isSearch", {
         get: function () {
             return this._type === exports.IkasProductListType.SEARCH;
@@ -21599,10 +21808,13 @@ var IkasProductList = /** @class */ (function () {
             var _a, _b, _c;
             var queryParams = {};
             (_a = this.filters) === null || _a === void 0 ? void 0 : _a.forEach(function (f) {
-                queryParams[f.key] = f.keyList;
+                if (f.keyList.length)
+                    queryParams[f.key] = f.keyList;
             });
             if (this._searchKeyword)
                 queryParams.s = this._searchKeyword;
+            if (this._infiniteScrollPage)
+                queryParams.page = this._infiniteScrollPage;
             if (this._pageType !== exports.IkasThemePageType.CATEGORY &&
                 this._filterCategoryId) {
                 var slug = (_c = (_b = this.filterCategories) === null || _b === void 0 ? void 0 : _b.find(function (fc) { return fc.id === _this._filterCategoryId; })) === null || _c === void 0 ? void 0 : _c.slug;
@@ -21672,7 +21884,7 @@ var IkasProductList = /** @class */ (function () {
             type: type,
         };
     };
-    IkasProductList.prototype.searchProducts = function (page, limit) {
+    IkasProductList.prototype.searchProducts = function (page, limit, productIdList) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var filterList;
@@ -21700,7 +21912,7 @@ var IkasProductList = /** @class */ (function () {
                                 page: page,
                                 perPage: limit,
                                 productIdList: this.isStatic
-                                    ? (_b = this._productListPropValue.productIds) === null || _b === void 0 ? void 0 : _b.map(function (p) { return p.productId; }) : undefined,
+                                    ? (_b = this._productListPropValue.productIds) === null || _b === void 0 ? void 0 : _b.map(function (p) { return p.productId; }) : productIdList,
                                 filterList: filterList,
                                 brandId: this._pageType === exports.IkasThemePageType.BRAND &&
                                     this._type !== exports.IkasProductListType.SEARCH
@@ -21826,32 +22038,34 @@ var IkasProductList = /** @class */ (function () {
         });
     };
     IkasProductList.prototype.onFilterCategoryClick = function (filterCategory, disableRoute) {
-        var _a;
+        var _a, _b;
         if (disableRoute === void 0) { disableRoute = false; }
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         if (!disableRoute) return [3 /*break*/, 2];
-                        this._filterCategoryId = filterCategory.id;
+                        if (this._filterCategoryId === filterCategory.id)
+                            this._filterCategoryId = undefined;
+                        else
+                            this._filterCategoryId = filterCategory.id;
+                        (_a = this._filterCategories) === null || _a === void 0 ? void 0 : _a.forEach(function (fc) {
+                            //@ts-ignore
+                            fc._isSelected = fc.id === filterCategory.id;
+                        });
                         return [4 /*yield*/, this.applyFilters()];
                     case 1:
-                        _b.sent();
+                        _c.sent();
                         return [3 /*break*/, 3];
                     case 2:
-                        (_a = this.router) === null || _a === void 0 ? void 0 : _a.push(filterCategory.href +
+                        (_b = this.router) === null || _b === void 0 ? void 0 : _b.push(filterCategory.href +
                             (this.filterQueryParams ? "?" + this.filterQueryParams : ""));
-                        _b.label = 3;
+                        _c.label = 3;
                     case 3: return [2 /*return*/];
                 }
             });
         });
     };
-    IkasProductList.prototype.setVisibleInfiniteScrollPage = function (page) {
-        //@ts-ignore
-        var infiniteScrollPages = IkasStorefrontConfig.store.infiniteScrollPages;
-        infiniteScrollPages[this._productListPropValue.id] = page;
-    };
     IkasProductList.prototype.toJSON = function () {
         return {
             data: this.data,
@@ -21872,22 +22086,17 @@ var IkasProductList = /** @class */ (function () {
             productListPropValue: this._productListPropValue,
         };
     };
-    IkasProductList.prototype.checkRestoreInfiniteScroll = function () {
-        //@ts-ignore
-        var infiniteScrollPages = IkasStorefrontConfig.store.infiniteScrollPages;
-        var page = infiniteScrollPages[this._productListPropValue.id];
-        if (page) {
-            if (this.hasForwardRoute()) {
+    IkasProductList.prototype.restoreInfiniteScrollPage = function () {
+        var queryParams = this.getQueryParams();
+        var pageStr = queryParams === null || queryParams === void 0 ? void 0 : queryParams.get("page");
+        if (pageStr) {
+            var page = parseInt(pageStr);
+            if (!isNaN(page)) {
                 this._page = page;
-            }
-            else {
-                delete infiniteScrollPages[this._productListPropValue.id];
+                this._infiniteScrollPage = page;
             }
         }
     };
-    IkasProductList.prototype.hasForwardRoute = function () {
-        return this.isBrowser() && !!window.history.forward;
-    };
     IkasProductList.prototype.getQueryParams = function () {
         if (!this.isBrowser())
             return;
@@ -21896,6 +22105,16 @@ var IkasProductList = /** @class */ (function () {
     IkasProductList.prototype.isBrowser = function () {
         return typeof window !== "undefined";
     };
+    IkasProductList.prototype.waitForCustomerStoreInit = function () {
+        return new Promise(function (resolve) {
+            var interval = setInterval(function () {
+                if (IkasStorefrontConfig.store.customerStore.initialized) {
+                    clearInterval(interval);
+                    resolve(null);
+                }
+            }, 1000);
+        });
+    };
     return IkasProductList;
 }());
 (function (IkasProductListType) {
@@ -21905,6 +22124,7 @@ var IkasProductList = /** @class */ (function () {
     IkasProductListType["RECOMMENDED"] = "RECOMMENDED";
     IkasProductListType["CATEGORY"] = "CATEGORY";
     IkasProductListType["SEARCH"] = "SEARCH";
+    IkasProductListType["LAST_VIEWED"] = "LAST_VIEWED";
 })(exports.IkasProductListType || (exports.IkasProductListType = {}));
 (function (IkasProductListSortType) {
     // A_Z = "A_Z",
@@ -27658,9 +27878,73 @@ var IkasCustomerAPI = /** @class */ (function () {
             });
         });
     };
+    IkasCustomerAPI.getLastViewedProducts = function (customerId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var QUERY, _a, data, errors, error_2;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        QUERY = src(templateObject_13 || (templateObject_13 = __makeTemplateObject(["\n      query getLastViewedProducts($customerId: String) {\n        getLastViewedProducts(customerId: $customerId) {\n          products {\n            productId\n            variantId\n          }\n        }\n      }\n    "], ["\n      query getLastViewedProducts($customerId: String) {\n        getLastViewedProducts(customerId: $customerId) {\n          products {\n            productId\n            variantId\n          }\n        }\n      }\n    "])));
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, apollo
+                                .getClient()
+                                .query({
+                                query: QUERY,
+                                variables: {
+                                    customerId: customerId,
+                                },
+                            })];
+                    case 2:
+                        _a = _b.sent(), data = _a.data, errors = _a.errors;
+                        if (errors && errors.length)
+                            return [2 /*return*/, []];
+                        return [2 /*return*/, data.getLastViewedProducts.products];
+                    case 3:
+                        error_2 = _b.sent();
+                        console.log(error_2);
+                        return [2 /*return*/, []];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    IkasCustomerAPI.saveLastViewedProducts = function (input) {
+        return __awaiter(this, void 0, void 0, function () {
+            var MUTATION, errors, err_12;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        MUTATION = src(templateObject_14 || (templateObject_14 = __makeTemplateObject(["\n      mutation saveLastViewedProducts($input: ProductLastViewedInput!) {\n        saveLastViewedProducts(input: $input) {\n          id\n        }\n      }\n    "], ["\n      mutation saveLastViewedProducts($input: ProductLastViewedInput!) {\n        saveLastViewedProducts(input: $input) {\n          id\n        }\n      }\n    "])));
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, apollo
+                                .getClient()
+                                .mutate({
+                                mutation: MUTATION,
+                                variables: {
+                                    input: input,
+                                },
+                            })];
+                    case 2:
+                        errors = (_a.sent()).errors;
+                        if (errors && errors.length)
+                            return [2 /*return*/, false];
+                        return [3 /*break*/, 4];
+                    case 3:
+                        err_12 = _a.sent();
+                        console.log(err_12);
+                        return [2 /*return*/, false];
+                    case 4: return [2 /*return*/, true];
+                }
+            });
+        });
+    };
     return IkasCustomerAPI;
 }());
-var templateObject_1$7, templateObject_2$5, templateObject_3$3, templateObject_4$2, templateObject_5$1, templateObject_6$1, templateObject_7$1, templateObject_8$1, templateObject_9, templateObject_10, templateObject_11, templateObject_12;
+var templateObject_1$7, templateObject_2$5, templateObject_3$3, templateObject_4$2, templateObject_5$1, templateObject_6$1, templateObject_7$1, templateObject_8$1, templateObject_9, templateObject_10, templateObject_11, templateObject_12, templateObject_13, templateObject_14;
 
 var IkasDistrictAPI = /** @class */ (function () {
     function IkasDistrictAPI() {
@@ -29890,11 +30174,11 @@ var IkasCheckoutPage = mobxReactLite.observer(function (_a) {
     };
     var onPrivacyPolicyClick = function () {
         vm.policyModalTitle = "Gizlilik Politikası";
-        vm.policyModalText = vm.returnPolicy;
+        vm.policyModalText = vm.privacyPolicy;
     };
     var onTermsOfServiceClick = function () {
         vm.policyModalTitle = "Hizmet Şartları";
-        vm.policyModalText = vm.returnPolicy;
+        vm.policyModalText = vm.termsOfService;
     };
     var onErrorClose = function () {
         vm.error = undefined;
@@ -29975,7 +30259,7 @@ var style = {
     backgroundColor: "rgba(255, 0, 0, 0.5)",
 };
 
-var PACKAGE_VERSION = "0.0.139";
+var PACKAGE_VERSION = "0.0.158";
 var PageViewModel = /** @class */ (function () {
     function PageViewModel(router) {
         var _this = this;
@@ -30866,6 +31150,20 @@ var Page$1 = function (_a) {
     React.useEffect(function () {
         setPropValues(IkasPageDataProvider.initPropValues(propValuesStr, router$1, settingsStr, isBrowser));
     }, [isBrowser, propValuesStr]);
+    // If the user clicks a link for the same page, we need this logic to re-render the page
+    React.useEffect(function () {
+        router$1.events.on("routeChangeComplete", handleRouteChange);
+        return function () {
+            router$1.events.off("routeChangeComplete", handleRouteChange);
+        };
+    }, []);
+    var handleRouteChange = function (url, options) {
+        var shallow = options.shallow;
+        if (!shallow &&
+            [exports.IkasThemePageType.CATEGORY, exports.IkasThemePageType.BRAND].includes(page.type)) {
+            setPropValues(IkasPageDataProvider.initPropValues(propValuesStr, router$1, settingsStr, isBrowser));
+        }
+    };
     return (React.createElement(IkasPage, { page: page, propValues: propValues, pageSpecificDataStr: pageSpecificDataStr, settingsStr: settingsStr, merchantSettings: merchantSettings, addOgpMetas: true }));
 };
 var index$1 = mobxReactLite.observer(Page$1);
@@ -30913,6 +31211,8 @@ function handleAnalytics(page, pageSpecificDataStr) {
                 var productDetailParsed = JSON.parse(pageSpecificDataStr);
                 var productDetail = new IkasProductDetail(productDetailParsed.product, productDetailParsed.selectedVariantValues);
                 Analytics.productView(productDetail);
+                // @ts-ignore
+                IkasStorefrontConfig.store.customerStore.onProductView(productDetail.product.id, productDetail.selectedVariant.id);
             }
             if (page.type === exports.IkasThemePageType.CATEGORY) {
                 var category = JSON.parse(pageSpecificDataStr);
@@ -31514,7 +31814,6 @@ var IkasBaseStore = /** @class */ (function () {
         this.showLocaleOptions = false;
         this.localeChecked = false;
         this.settingsSet = false;
-        this.infiniteScrollPages = {}; // key is productListPropValueId
         this.customerStore = new IkasCustomerStore(this);
         this.cartStore = new IkasCartStore(this);
         mobx.makeObservable(this, {