@ikas/storefront 0.0.100 → 0.0.101

package/build/index.js

@@ -3,27 +3,25 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var mobx = require('mobx');
-var React = require('react');
+var fs = require('fs');
 var getConfig = require('next/config');
+var React = require('react');
 var mobxReactLite = require('mobx-react-lite');
 var router = require('next/router');
 var Image$1 = require('next/image');
 var Link = require('next/link');
 var Head = require('next/head');
-var fs = require('fs');
 var dynamic = require('next/dynamic');
-var Error$1 = require('next/error');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var getConfig__default = /*#__PURE__*/_interopDefaultLegacy(getConfig);
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var Image__default = /*#__PURE__*/_interopDefaultLegacy(Image$1);
 var Link__default = /*#__PURE__*/_interopDefaultLegacy(Link);
 var Head__default = /*#__PURE__*/_interopDefaultLegacy(Head);
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var dynamic__default = /*#__PURE__*/_interopDefaultLegacy(dynamic);
-var Error__default = /*#__PURE__*/_interopDefaultLegacy(Error$1);
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -11019,7 +11017,6 @@ var IkasProductDetailPropValueProvider = /** @class */ (function () {
                             return [2 /*return*/, null];
                         return [4 /*yield*/, IkasProductSearchAPI.searchProducts({
                                 productIdList: [this.productDetailPropValue.productId],
-                                priceListId: IkasStorefrontConfig.priceListId,
                             })];
                     case 1:
                         productSearchResponse = _b.sent();
@@ -12049,7 +12046,6 @@ var IkasPageDataProvider = /** @class */ (function () {
                             return [2 /*return*/];
                         return [4 /*yield*/, IkasProductSearchAPI.searchProducts({
                                 productIdList: [metaDataResponse.metaData.targetId],
-                                priceListId: IkasStorefrontConfig.priceListId,
                             })];
                     case 2:
                         productsResponse = _b.sent();
@@ -12807,10 +12803,6 @@ var IkasCart = /** @class */ (function () {
             : [];
         this.merchantId = data.merchantId || "";
         this.totalPrice = data.totalPrice || 0;
-        this.salesChannelId = data.salesChannelId || "";
-        this.storefrontId = data.storefrontId || null;
-        this.storefrontRoutingId = data.storefrontRoutingId || null;
-        this.storefrontThemeId = data.storefrontThemeId || null;
         mobx.makeAutoObservable(this);
     }
     Object.defineProperty(IkasCart.prototype, "totalTax", {
@@ -15830,7 +15822,7 @@ var MAX_CVC_LENGTH = 4;
 var USE_DIFFERENT_ADDRESS_KEY = "sAddr";
 var isServer$1 = typeof localStorage === "undefined";
 var CheckoutViewModel = /** @class */ (function () {
-    function CheckoutViewModel(checkout, queryParams, router, returnPolicy, privacyPolicy, termsOfService) {
+    function CheckoutViewModel(checkout, queryParams, router) {
         var _this = this;
         this.checkout = new IkasCheckout();
         this.storefront = null;
@@ -15936,7 +15928,7 @@ var CheckoutViewModel = /** @class */ (function () {
                             variantId: i.variant.id,
                             productId: i.variant.productId,
                         }); });
-                        return [4 /*yield*/, IkasCheckoutAPI.checkStocks(lines, IkasStorefrontConfig.stockLocationIds || [])];
+                        return [4 /*yield*/, IkasCheckoutAPI.checkStocks(lines)];
                     case 1:
                         result = _b.sent();
                         if (!result) {
@@ -15949,7 +15941,7 @@ var CheckoutViewModel = /** @class */ (function () {
                             data = unavailableItems.map(function (item) { return ({
                                 variant: _this.cart.items.find(function (i) { return i.variant.id === item.variantId; })
                                     .variant,
-                                availableQuantity: item.stockCount,
+                                availableQuantity: item.availableQuantity,
                             }); });
                             throw {
                                 type: ErrorType.STOCK_ERROR,
@@ -15966,7 +15958,7 @@ var CheckoutViewModel = /** @class */ (function () {
                 switch (_b.label) {
                     case 0:
                         _a = this;
-                        return [4 /*yield*/, IkasCountryAPI.listShippingCountries(IkasStorefrontConfig.storefrontId)];
+                        return [4 /*yield*/, IkasCountryAPI.listShippingCountries()];
                     case 1:
                         _a.shippingCountryIds = _b.sent();
                         return [2 /*return*/];
@@ -16042,6 +16034,30 @@ var CheckoutViewModel = /** @class */ (function () {
                 }
             });
         }); };
+        this.getStorefront = function () { return __awaiter(_this, void 0, void 0, function () {
+            var storefront;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!IkasStorefrontConfig.config.storefrontId || !!this.storefront)
+                            return [2 /*return*/];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, IkasStorefrontAPI.getStorefront(IkasStorefrontConfig.config.storefrontId)];
+                    case 2:
+                        storefront = _a.sent();
+                        if (storefront) {
+                            this.storefront = storefront;
+                        }
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        }); };
         this.createCustomer = function () {
             if (_this.customerStore.customer) {
                 _this.checkout.customer = _this.customerStore.customer;
@@ -16061,7 +16077,7 @@ var CheckoutViewModel = /** @class */ (function () {
                         _this.checkout.billingAddress || new IkasOrderAddress();
                 }
                 else {
-                    _this.checkout.billingAddress = _this.checkout.shippingAddress;
+                    _this.checkout.billingAddress = cloneDeep_1(_this.checkout.shippingAddress);
                 }
             }
         };
@@ -16173,7 +16189,7 @@ var CheckoutViewModel = /** @class */ (function () {
             _this.router.push("/");
         };
         this.onProceedToShippingClick = function () { return __awaiter(_this, void 0, void 0, function () {
-            var newAddress, customer, err_2;
+            var newAddress, customer, err_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -16203,12 +16219,12 @@ var CheckoutViewModel = /** @class */ (function () {
                         this.changeStep(CheckoutStep.SHIPPING);
                         return [3 /*break*/, 7];
                     case 6:
-                        err_2 = _a.sent();
-                        if (err_2.type) {
-                            this.error = err_2;
+                        err_3 = _a.sent();
+                        if (err_3.type) {
+                            this.error = err_3;
                         }
                         else {
-                            console.log(err_2);
+                            console.log(err_3);
                             this.error = {
                                 type: ErrorType.UNKNOWN,
                             };
@@ -16220,7 +16236,7 @@ var CheckoutViewModel = /** @class */ (function () {
             });
         }); };
         this.onProceedToPaymentClick = function () { return __awaiter(_this, void 0, void 0, function () {
-            var err_3;
+            var err_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -16240,12 +16256,12 @@ var CheckoutViewModel = /** @class */ (function () {
                         this.changeStep(CheckoutStep.PAYMENT);
                         return [3 /*break*/, 4];
                     case 3:
-                        err_3 = _a.sent();
-                        if (err_3.type) {
-                            this.error = err_3;
+                        err_4 = _a.sent();
+                        if (err_4.type) {
+                            this.error = err_4;
                         }
                         else {
-                            console.log(err_3);
+                            console.log(err_4);
                             this.error = {
                                 type: ErrorType.UNKNOWN,
                             };
@@ -16257,7 +16273,7 @@ var CheckoutViewModel = /** @class */ (function () {
             });
         }); };
         this.performPayment = function () { return __awaiter(_this, void 0, void 0, function () {
-            var response, transactionStatus, err_4;
+            var response, transactionStatus, err_5;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -16303,10 +16319,10 @@ var CheckoutViewModel = /** @class */ (function () {
                         }
                         return [3 /*break*/, 6];
                     case 5:
-                        err_4 = _a.sent();
-                        if (err_4.type) {
-                            console.log(err_4);
-                            this.error = err_4;
+                        err_5 = _a.sent();
+                        if (err_5.type) {
+                            console.log(err_5);
+                            this.error = err_5;
                         }
                         else {
                             this.error = {
@@ -16385,9 +16401,6 @@ var CheckoutViewModel = /** @class */ (function () {
         }); };
         this.checkout = checkout;
         this.router = router;
-        this.returnPolicy = returnPolicy;
-        this.privacyPolicy = privacyPolicy;
-        this.termsOfService = termsOfService;
         this.init(queryParams);
         mobx.makeAutoObservable(this);
     }
@@ -16398,6 +16411,15 @@ var CheckoutViewModel = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(CheckoutViewModel.prototype, "storefrontRegion", {
+        get: function () {
+            var _a;
+            return ((_a = this.storefront) === null || _a === void 0 ? void 0 : _a.regions.length) ? this.storefront.regions[0]
+                : undefined;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(CheckoutViewModel.prototype, "selectedPaymentGatewayIndex", {
         get: function () {
             var _this = this;
@@ -17061,7 +17083,6 @@ var IkasCustomerStore = /** @class */ (function () {
                             return [2 /*return*/, []];
                         return [4 /*yield*/, IkasProductSearchAPI.searchProducts({
                                 productIdList: favoriteProductsResult.map(function (fP) { return fP.productId; }),
-                                priceListId: IkasStorefrontConfig.priceListId,
                             })];
                     case 2:
                         productsResult = _b.sent();
@@ -21896,10 +21917,7 @@ var IkasProductList = /** @class */ (function () {
     Object.defineProperty(IkasProductList.prototype, "isFiltered", {
         get: function () {
             var _a;
-            return (((_a = this.filters) === null || _a === void 0 ? void 0 : _a.some(function (f) { return !!f.valueList.length; })) ||
-                !!this._searchKeyword ||
-                (this._pageType !== exports.IkasThemePageType.CATEGORY &&
-                    !!this._filterCategoryId));
+            return (((_a = this.filters) === null || _a === void 0 ? void 0 : _a.some(function (f) { return !!f.valueList.length; })) || !!this._searchKeyword);
         },
         enumerable: false,
         configurable: true
@@ -21962,20 +21980,13 @@ var IkasProductList = /** @class */ (function () {
     });
     Object.defineProperty(IkasProductList.prototype, "filterQueryParams", {
         get: function () {
-            var _this = this;
-            var _a, _b, _c;
+            var _a;
             var queryParams = {};
             (_a = this.filters) === null || _a === void 0 ? void 0 : _a.forEach(function (f) {
                 queryParams[f.key] = f.keyList;
             });
             if (this._searchKeyword)
                 queryParams.s = this._searchKeyword;
-            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;
-                if (slug)
-                    queryParams.c = slug;
-            }
             return queryString.stringify(queryParams, { arrayFormat: "comma" });
         },
         enumerable: false,
@@ -22030,7 +22041,6 @@ var IkasProductList = /** @class */ (function () {
                                 categoryIdList: this._filterCategoryId
                                     ? [this._filterCategoryId]
                                     : undefined,
-                                priceListId: IkasStorefrontConfig.priceListId,
                                 query: this._searchKeyword,
                             })];
                     case 1: return [2 /*return*/, _c.sent()];
@@ -22058,7 +22068,6 @@ var IkasProductList = /** @class */ (function () {
     };
     IkasProductList.prototype.applyQueryParamFilters = function (queryParams) {
         var _this = this;
-        var _a;
         try {
             queryParams === null || queryParams === void 0 ? void 0 : queryParams.forEach(function (value, key) {
                 var _a;
@@ -22070,15 +22079,6 @@ var IkasProductList = /** @class */ (function () {
             var querySearch = queryParams === null || queryParams === void 0 ? void 0 : queryParams.get("s");
             if (querySearch)
                 this._searchKeyword = querySearch;
-            if (this._pageType !== exports.IkasThemePageType.CATEGORY) {
-                var queryCategory_1 = queryParams === null || queryParams === void 0 ? void 0 : queryParams.get("c");
-                if (queryCategory_1) {
-                    var filterCategory = (_a = this.filterCategories) === null || _a === void 0 ? void 0 : _a.find(function (fc) { return fc.slug === queryCategory_1; });
-                    if (filterCategory) {
-                        this._filterCategoryId = filterCategory.id;
-                    }
-                }
-            }
         }
         catch (err) {
             console.log(err);
@@ -22125,32 +22125,12 @@ var IkasProductList = /** @class */ (function () {
         var _a;
         (_a = this.filters) === null || _a === void 0 ? void 0 : _a.forEach(function (filter) { return filter.clear(); });
         this._searchKeyword = "";
-        if (this._pageType !== exports.IkasThemePageType.CATEGORY) {
-            this._filterCategoryId = undefined;
-        }
         this.applyFilters();
     };
-    IkasProductList.prototype.onFilterCategoryClick = function (filterCategory, disableRoute) {
+    IkasProductList.prototype.onFilterCategoryClick = function (filterCategory) {
         var _a;
-        if (disableRoute === void 0) { disableRoute = false; }
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (!disableRoute) return [3 /*break*/, 2];
-                        this._filterCategoryId = filterCategory.id;
-                        return [4 /*yield*/, this.applyFilters()];
-                    case 1:
-                        _b.sent();
-                        return [3 /*break*/, 3];
-                    case 2:
-                        (_a = this.router) === null || _a === void 0 ? void 0 : _a.push(filterCategory.href +
-                            (this.filterQueryParams ? "?" + this.filterQueryParams : ""));
-                        _b.label = 3;
-                    case 3: return [2 /*return*/];
-                }
-            });
-        });
+        (_a = this.router) === null || _a === void 0 ? void 0 : _a.push(filterCategory.href +
+            (this.filterQueryParams ? "?" + this.filterQueryParams : ""));
     };
     IkasProductList.prototype.toJSON = function () {
         return {
@@ -24235,7 +24215,7 @@ var IkasCartAPI = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        MUTATION = src(templateObject_1$1 || (templateObject_1$1 = __makeTemplateObject(["\n      mutation saveItemToCart($input: SaveItemToCartInput!) {\n        saveItemToCart(input: $input) {\n          id\n          createdAt\n          updatedAt\n          dueDate\n          currencyCode\n          customerId\n          merchantId\n          itemCount\n          totalPrice\n          salesChannelId\n          storefrontId\n          storefrontRoutingId\n          storefrontThemeId\n          items {\n            createdAt\n            currencyCode\n            deleted\n            discount {\n              amount\n              amountType\n              reason\n            }\n            discountPrice\n            finalPrice\n            id\n            originalOrderLineItemId\n            price\n            quantity\n            status\n            statusUpdatedAt\n            stockLocationId\n            taxValue\n            updatedAt\n            variant {\n              id\n              name\n              sku\n              slug\n              barcodeList\n              mainImageId\n              productId\n              variantValues {\n                order\n                variantTypeId\n                variantTypeName\n                variantValueId\n                variantValueName\n              }\n            }\n          }\n        }\n      }\n    "], ["\n      mutation saveItemToCart($input: SaveItemToCartInput!) {\n        saveItemToCart(input: $input) {\n          id\n          createdAt\n          updatedAt\n          dueDate\n          currencyCode\n          customerId\n          merchantId\n          itemCount\n          totalPrice\n          salesChannelId\n          storefrontId\n          storefrontRoutingId\n          storefrontThemeId\n          items {\n            createdAt\n            currencyCode\n            deleted\n            discount {\n              amount\n              amountType\n              reason\n            }\n            discountPrice\n            finalPrice\n            id\n            originalOrderLineItemId\n            price\n            quantity\n            status\n            statusUpdatedAt\n            stockLocationId\n            taxValue\n            updatedAt\n            variant {\n              id\n              name\n              sku\n              slug\n              barcodeList\n              mainImageId\n              productId\n              variantValues {\n                order\n                variantTypeId\n                variantTypeName\n                variantValueId\n                variantValueName\n              }\n            }\n          }\n        }\n      }\n    "])));
+                        MUTATION = src(templateObject_1$1 || (templateObject_1$1 = __makeTemplateObject(["\n      mutation saveItemToCart($input: SaveItemToCartInput!) {\n        saveItemToCart(input: $input) {\n          id\n          createdAt\n          updatedAt\n          dueDate\n          currencyCode\n          customerId\n          merchantId\n          itemCount\n          totalPrice\n          items {\n            createdAt\n            currencyCode\n            deleted\n            discount {\n              amount\n              amountType\n              reason\n            }\n            discountPrice\n            finalPrice\n            id\n            originalOrderLineItemId\n            price\n            quantity\n            status\n            statusUpdatedAt\n            stockLocationId\n            taxValue\n            updatedAt\n            variant {\n              id\n              name\n              sku\n              slug\n              barcodeList\n              mainImageId\n              productId\n              variantValues {\n                order\n                variantTypeId\n                variantTypeName\n                variantValueId\n                variantValueName\n              }\n            }\n          }\n        }\n      }\n    "], ["\n      mutation saveItemToCart($input: SaveItemToCartInput!) {\n        saveItemToCart(input: $input) {\n          id\n          createdAt\n          updatedAt\n          dueDate\n          currencyCode\n          customerId\n          merchantId\n          itemCount\n          totalPrice\n          items {\n            createdAt\n            currencyCode\n            deleted\n            discount {\n              amount\n              amountType\n              reason\n            }\n            discountPrice\n            finalPrice\n            id\n            originalOrderLineItemId\n            price\n            quantity\n            status\n            statusUpdatedAt\n            stockLocationId\n            taxValue\n            updatedAt\n            variant {\n              id\n              name\n              sku\n              slug\n              barcodeList\n              mainImageId\n              productId\n              variantValues {\n                order\n                variantTypeId\n                variantTypeName\n                variantValueId\n                variantValueName\n              }\n            }\n          }\n        }\n      }\n    "])));
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 3, , 4]);
@@ -24270,7 +24250,7 @@ var IkasCartAPI = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        QUERY = src(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n      query getCart($cartId: String, $customerId: String) {\n        getCart(id: $cartId, customerId: $customerId) {\n          createdAt\n          currencyCode\n          customerId\n          dueDate\n          id\n          itemCount\n          salesChannelId\n          storefrontId\n          storefrontRoutingId\n          storefrontThemeId\n          items {\n            createdAt\n            currencyCode\n            discount {\n              amount\n              amountType\n              reason\n            }\n            discountPrice\n            finalPrice\n            id\n            originalOrderLineItemId\n            price\n            quantity\n            status\n            deleted\n            statusUpdatedAt\n            stockLocationId\n            taxValue\n            updatedAt\n            variant {\n              slug\n              barcodeList\n              id\n              mainImageId\n              name\n              productId\n              sku\n              variantValues {\n                order\n                variantTypeId\n                variantTypeName\n                variantValueId\n                variantValueName\n              }\n            }\n          }\n          merchantId\n          status\n          totalPrice\n          updatedAt\n        }\n      }\n    "], ["\n      query getCart($cartId: String, $customerId: String) {\n        getCart(id: $cartId, customerId: $customerId) {\n          createdAt\n          currencyCode\n          customerId\n          dueDate\n          id\n          itemCount\n          salesChannelId\n          storefrontId\n          storefrontRoutingId\n          storefrontThemeId\n          items {\n            createdAt\n            currencyCode\n            discount {\n              amount\n              amountType\n              reason\n            }\n            discountPrice\n            finalPrice\n            id\n            originalOrderLineItemId\n            price\n            quantity\n            status\n            deleted\n            statusUpdatedAt\n            stockLocationId\n            taxValue\n            updatedAt\n            variant {\n              slug\n              barcodeList\n              id\n              mainImageId\n              name\n              productId\n              sku\n              variantValues {\n                order\n                variantTypeId\n                variantTypeName\n                variantValueId\n                variantValueName\n              }\n            }\n          }\n          merchantId\n          status\n          totalPrice\n          updatedAt\n        }\n      }\n    "])));
+                        QUERY = src(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n      query getCart($cartId: String, $customerId: String) {\n        getCart(id: $cartId, customerId: $customerId) {\n          createdAt\n          currencyCode\n          customerId\n          dueDate\n          id\n          itemCount\n          items {\n            createdAt\n            currencyCode\n            discount {\n              amount\n              amountType\n              reason\n            }\n            discountPrice\n            finalPrice\n            id\n            originalOrderLineItemId\n            price\n            quantity\n            status\n            deleted\n            statusUpdatedAt\n            stockLocationId\n            taxValue\n            updatedAt\n            variant {\n              slug\n              barcodeList\n              id\n              mainImageId\n              name\n              productId\n              sku\n              variantValues {\n                order\n                variantTypeId\n                variantTypeName\n                variantValueId\n                variantValueName\n              }\n            }\n          }\n          merchantId\n          status\n          totalPrice\n          updatedAt\n        }\n      }\n    "], ["\n      query getCart($cartId: String, $customerId: String) {\n        getCart(id: $cartId, customerId: $customerId) {\n          createdAt\n          currencyCode\n          customerId\n          dueDate\n          id\n          itemCount\n          items {\n            createdAt\n            currencyCode\n            discount {\n              amount\n              amountType\n              reason\n            }\n            discountPrice\n            finalPrice\n            id\n            originalOrderLineItemId\n            price\n            quantity\n            status\n            deleted\n            statusUpdatedAt\n            stockLocationId\n            taxValue\n            updatedAt\n            variant {\n              slug\n              barcodeList\n              id\n              mainImageId\n              name\n              productId\n              sku\n              variantValues {\n                order\n                variantTypeId\n                variantTypeName\n                variantValueId\n                variantValueName\n              }\n            }\n          }\n          merchantId\n          status\n          totalPrice\n          updatedAt\n        }\n      }\n    "])));
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 3, , 4]);
@@ -24742,13 +24722,13 @@ var IkasCheckoutAPI = /** @class */ (function () {
             });
         });
     };
-    IkasCheckoutAPI.checkStocks = function (lines, stockLocationIdList) {
+    IkasCheckoutAPI.checkStocks = function (lines) {
         return __awaiter(this, void 0, void 0, function () {
             var QUERY, _a, data, errors, err_7;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        QUERY = src(templateObject_7 || (templateObject_7 = __makeTemplateObject(["\n      query checkStocks(\n        $lines: [CheckStocksLineInput!]!\n        $stockLocationIdList: [String!]\n      ) {\n        checkStocks(lines: $lines, stockLocationIdList: $stockLocationIdList) {\n          lines {\n            stockCount\n            isAvailable\n            variantId\n          }\n        }\n      }\n    "], ["\n      query checkStocks(\n        $lines: [CheckStocksLineInput!]!\n        $stockLocationIdList: [String!]\n      ) {\n        checkStocks(lines: $lines, stockLocationIdList: $stockLocationIdList) {\n          lines {\n            stockCount\n            isAvailable\n            variantId\n          }\n        }\n      }\n    "])));
+                        QUERY = src(templateObject_7 || (templateObject_7 = __makeTemplateObject(["\n      query checkStocks($lines: [CheckStocksLineInput!]!) {\n        checkStocks(lines: $lines) {\n          lines {\n            availableQuantity\n            isAvailable\n            stockLocationId\n            variantId\n          }\n        }\n      }\n    "], ["\n      query checkStocks($lines: [CheckStocksLineInput!]!) {\n        checkStocks(lines: $lines) {\n          lines {\n            availableQuantity\n            isAvailable\n            stockLocationId\n            variantId\n          }\n        }\n      }\n    "])));
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 3, , 4]);
@@ -24758,7 +24738,6 @@ var IkasCheckoutAPI = /** @class */ (function () {
                                 query: QUERY,
                                 variables: {
                                     lines: lines,
-                                    stockLocationIdList: stockLocationIdList,
                                 },
                             })];
                     case 2:
@@ -24870,13 +24849,13 @@ var IkasCountryAPI = /** @class */ (function () {
             });
         });
     };
-    IkasCountryAPI.listShippingCountries = function (storefrontId) {
+    IkasCountryAPI.listShippingCountries = function () {
         return __awaiter(this, void 0, void 0, function () {
             var QUERY, _a, data, errors, err_2;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        QUERY = src(templateObject_2$3 || (templateObject_2$3 = __makeTemplateObject(["\n      query getAvailableShippingCountries($storefrontId: String!) {\n        getAvailableShippingCountries(storefrontId: $storefrontId)\n      }\n    "], ["\n      query getAvailableShippingCountries($storefrontId: String!) {\n        getAvailableShippingCountries(storefrontId: $storefrontId)\n      }\n    "])));
+                        QUERY = src(templateObject_2$3 || (templateObject_2$3 = __makeTemplateObject(["\n      query getAvailableShippingCountries {\n        getAvailableShippingCountries\n      }\n    "], ["\n      query getAvailableShippingCountries {\n        getAvailableShippingCountries\n      }\n    "])));
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 3, , 4]);
@@ -24884,9 +24863,6 @@ var IkasCountryAPI = /** @class */ (function () {
                                 .getClient()
                                 .query({
                                 query: QUERY,
-                                variables: {
-                                    storefrontId: storefrontId,
-                                },
                             })];
                     case 2:
                         _a = _b.sent(), data = _a.data, errors = _a.errors;
@@ -25880,6 +25856,150 @@ var IkasStateAPI = /** @class */ (function () {
 }());
 var templateObject_1$e;
 
+var IkasStorefrontDomain = /** @class */ (function () {
+    function IkasStorefrontDomain(data) {
+        if (data === void 0) { data = {}; }
+        this.id = data.id || "";
+        this.merchantDomainId = data.merchantDomainId || "";
+        this.name = data.name || "";
+        this.redirectDomainName = data.redirectDomainName || null;
+        mobx.makeAutoObservable(this);
+    }
+    return IkasStorefrontDomain;
+}());
+
+var IkasStorefrontLocation = /** @class */ (function () {
+    function IkasStorefrontLocation(data) {
+        if (data === void 0) { data = {}; }
+        this.countryId = data.countryId || "";
+        this.stateId = data.stateId || null;
+        mobx.makeAutoObservable(this);
+    }
+    return IkasStorefrontLocation;
+}());
+
+var IkasStorefrontRoute = /** @class */ (function () {
+    function IkasStorefrontRoute(data) {
+        if (data === void 0) { data = {}; }
+        this.domainId = data.domainId || "";
+        this.useSubPath = data.useSubPath || false;
+        mobx.makeAutoObservable(this);
+    }
+    return IkasStorefrontRoute;
+}());
+
+var IkasStorefrontRegion = /** @class */ (function () {
+    function IkasStorefrontRegion(data) {
+        if (data === void 0) { data = {}; }
+        // Extra
+        this.theme = new IkasTheme();
+        this.id = data.id || "";
+        this.locale = data.locale || "";
+        this.themeJSON = data.themeJSON || "";
+        this.shipping = data.shipping || null;
+        this.paymentSettingsId = data.paymentSettingsId || null;
+        this.priceListId = data.priceListId || null;
+        this.locations = data.locations
+            ? data.locations.map(function (o) { return new IkasStorefrontLocation(o); })
+            : [];
+        this.routes = data.routes
+            ? data.routes.map(function (o) { return new IkasStorefrontRoute(o); })
+            : null;
+        this.termsOfService = data.termsOfService || "";
+        this.privacyPolicy = data.privacyPolicy || "";
+        this.returnPolicy = data.returnPolicy || "";
+        try {
+            this.theme = this.themeJSON
+                ? new IkasTheme(JSON.parse(this.themeJSON))
+                : new IkasTheme();
+        }
+        catch (err) { }
+        mobx.makeAutoObservable(this);
+    }
+    return IkasStorefrontRegion;
+}());
+
+var IkasStorefront = /** @class */ (function () {
+    function IkasStorefront(data) {
+        if (data === void 0) { data = {}; }
+        this.id = data.id || "";
+        this.name = data.name || "";
+        this.themeId = data.themeId || "";
+        this.themeVersionId = data.themeVersionId || "";
+        this.userId = data.userId || "";
+        this.domains = data.domains
+            ? data.domains.map(function (o) { return new IkasStorefrontDomain(o); })
+            : [];
+        this.regions = data.regions
+            ? data.regions.map(function (o) { return new IkasStorefrontRegion(o); })
+            : [];
+        mobx.makeAutoObservable(this);
+    }
+    return IkasStorefront;
+}());
+
+var IkasStorefrontAPI = /** @class */ (function () {
+    function IkasStorefrontAPI() {
+    }
+    IkasStorefrontAPI.getStorefront = function (storefrontId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var QUERY, _a, data, errors;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        QUERY = src(templateObject_1$f || (templateObject_1$f = __makeTemplateObject(["\n      query getStorefront($storefrontId: String!) {\n        getStorefront(id: $storefrontId) {\n          id\n          name\n          themeId\n          themeVersionId\n          userId\n          # domains {\n          #   id\n          #   merchantDomainId\n          #   name\n          #   redirectDomainName\n          # }\n          regions {\n            id\n            locale\n            # themeJSON\n            privacyPolicy\n            returnPolicy\n            termsOfService\n          }\n        }\n      }\n    "], ["\n      query getStorefront($storefrontId: String!) {\n        getStorefront(id: $storefrontId) {\n          id\n          name\n          themeId\n          themeVersionId\n          userId\n          # domains {\n          #   id\n          #   merchantDomainId\n          #   name\n          #   redirectDomainName\n          # }\n          regions {\n            id\n            locale\n            # themeJSON\n            privacyPolicy\n            returnPolicy\n            termsOfService\n          }\n        }\n      }\n    "])));
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, apollo
+                                .getClient()
+                                .query({
+                                query: QUERY,
+                                variables: {
+                                    storefrontId: storefrontId,
+                                },
+                            })];
+                    case 2:
+                        _a = _b.sent(), data = _a.data, errors = _a.errors;
+                        if (errors && errors.length) {
+                            console.log(errors);
+                        }
+                        if (data)
+                            return [2 /*return*/, new IkasStorefront(data.getStorefront)];
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _b.sent();
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/, new IkasStorefront()];
+                }
+            });
+        });
+    };
+    return IkasStorefrontAPI;
+}());
+var templateObject_1$f;
+
+var IkasThemeAPI = /** @class */ (function () {
+    function IkasThemeAPI() {
+    }
+    IkasThemeAPI.fetchTheme = function () {
+        return new Promise(function (resolve, reject) {
+            var serverRuntimeConfig = getConfig__default['default']().serverRuntimeConfig;
+            var themeJSONPath = serverRuntimeConfig.THEME_JSON_PATH || "./src/theme.json";
+            fs__default['default'].readFile(themeJSONPath, {
+                flag: "a+",
+            }, function (err, file) {
+                if (err) {
+                    return reject(err);
+                }
+                var result = file.length ? JSON.parse(file.toString()) : {};
+                resolve(new IkasTheme(result));
+            });
+        });
+    };
+    return IkasThemeAPI;
+}());
+
 var IkasVariantTypeAPI = /** @class */ (function () {
     function IkasVariantTypeAPI() {
     }
@@ -25889,7 +26009,7 @@ var IkasVariantTypeAPI = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        LIST_VARIANT_TYPE = src(templateObject_1$f || (templateObject_1$f = __makeTemplateObject(["\n      query listVariantType($id: StringFilterInput!) {\n        listVariantType(id: $id) {\n          id\n          createdAt\n          updatedAt\n          deleted\n          name\n          selectionType\n          values {\n            id\n            createdAt\n            updatedAt\n            deleted\n            name\n            thumbnailImageId\n            colorCode\n          }\n        }\n      }\n    "], ["\n      query listVariantType($id: StringFilterInput!) {\n        listVariantType(id: $id) {\n          id\n          createdAt\n          updatedAt\n          deleted\n          name\n          selectionType\n          values {\n            id\n            createdAt\n            updatedAt\n            deleted\n            name\n            thumbnailImageId\n            colorCode\n          }\n        }\n      }\n    "])));
+                        LIST_VARIANT_TYPE = src(templateObject_1$g || (templateObject_1$g = __makeTemplateObject(["\n      query listVariantType($id: StringFilterInput!) {\n        listVariantType(id: $id) {\n          id\n          createdAt\n          updatedAt\n          deleted\n          name\n          selectionType\n          values {\n            id\n            createdAt\n            updatedAt\n            deleted\n            name\n            thumbnailImageId\n            colorCode\n          }\n        }\n      }\n    "], ["\n      query listVariantType($id: StringFilterInput!) {\n        listVariantType(id: $id) {\n          id\n          createdAt\n          updatedAt\n          deleted\n          name\n          selectionType\n          values {\n            id\n            createdAt\n            updatedAt\n            deleted\n            name\n            thumbnailImageId\n            colorCode\n          }\n        }\n      }\n    "])));
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 3, , 4]);
@@ -25935,7 +26055,7 @@ var IkasVariantTypeAPI = /** @class */ (function () {
     };
     return IkasVariantTypeAPI;
 }());
-var templateObject_1$f;
+var templateObject_1$g;
 
 function styleInject(css, ref) {
   if ( ref === void 0 ) ref = {};
@@ -27125,11 +27245,6 @@ var IkasCartStore = /** @class */ (function () {
                                         name: product.name,
                                     },
                                 },
-                                priceListId: IkasStorefrontConfig.priceListId || null,
-                                salesChannelId: IkasStorefrontConfig.salesChannelId,
-                                storefrontId: IkasStorefrontConfig.storefrontId,
-                                storefrontRoutingId: IkasStorefrontConfig.storefrontRoutingId,
-                                storefrontThemeId: IkasStorefrontConfig.storefrontThemeId,
                             };
                             return [4 /*yield*/, IkasCartAPI.saveItemToCart(input)];
                         case 1:
@@ -27170,11 +27285,6 @@ var IkasCartStore = /** @class */ (function () {
                                     name: item.variant.name,
                                 },
                             },
-                            priceListId: IkasStorefrontConfig.priceListId || null,
-                            salesChannelId: IkasStorefrontConfig.salesChannelId,
-                            storefrontId: IkasStorefrontConfig.storefrontId,
-                            storefrontRoutingId: IkasStorefrontConfig.storefrontRoutingId,
-                            storefrontThemeId: IkasStorefrontConfig.storefrontThemeId,
                         };
                         return [4 /*yield*/, IkasCartAPI.saveItemToCart(input)];
                     case 1:
@@ -27537,11 +27647,9 @@ function createCategoryBreadcrumbSchema(pageSpecificDataStr) {
 
 var IkasCheckoutPage = mobxReactLite.observer(function (_a) {
     var _b, _c, _d;
-    var checkout = _a.checkout, returnPolicy = _a.returnPolicy, privacyPolicy = _a.privacyPolicy, termsOfService = _a.termsOfService, queryParams = _a.queryParams;
+    var checkout = _a.checkout, queryParams = _a.queryParams;
     var router$1 = router.useRouter();
-    var vm = React.useState(function () {
-        return new CheckoutViewModel(checkout, queryParams, router$1, returnPolicy, privacyPolicy, termsOfService);
-    })[0];
+    var vm = React.useState(function () { return new CheckoutViewModel(checkout, queryParams, router$1); })[0];
     React.useEffect(function () {
         Analytics.beginCheckout(vm.checkout);
         Analytics.checkoutStep(vm.checkout, vm.step);
@@ -27566,18 +27674,46 @@ var IkasCheckoutPage = mobxReactLite.observer(function (_a) {
     var onPolicyModalClose = function () {
         setPolicyModalText("");
     };
-    var onReturnPolicyClick = function () {
-        setPolicyModalTitle("Para İade Politikası");
-        setPolicyModalText(vm.returnPolicy);
-    };
-    var onPrivacyPolicyClick = function () {
-        setPolicyModalTitle("Gizlilik Politikası");
-        setPolicyModalText(vm.privacyPolicy);
-    };
-    var onTermsOfServiceClick = function () {
-        setPolicyModalTitle("Hizmet Şartları");
-        setPolicyModalText(vm.termsOfService);
-    };
+    var onReturnPolicyClick = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, vm.getStorefront()];
+                case 1:
+                    _c.sent();
+                    console.log((_a = vm.storefrontRegion) === null || _a === void 0 ? void 0 : _a.returnPolicy);
+                    setPolicyModalTitle("Para İade Politikası");
+                    setPolicyModalText(((_b = vm.storefrontRegion) === null || _b === void 0 ? void 0 : _b.returnPolicy) || "");
+                    return [2 /*return*/];
+            }
+        });
+    }); };
+    var onPrivacyPolicyClick = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, vm.getStorefront()];
+                case 1:
+                    _b.sent();
+                    setPolicyModalTitle("Gizlilik Politikası");
+                    setPolicyModalText(((_a = vm.storefrontRegion) === null || _a === void 0 ? void 0 : _a.privacyPolicy) || "");
+                    return [2 /*return*/];
+            }
+        });
+    }); };
+    var onTermsOfServiceClick = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, vm.getStorefront()];
+                case 1:
+                    _b.sent();
+                    setPolicyModalTitle("Hizmet Şartları");
+                    setPolicyModalText(((_a = vm.storefrontRegion) === null || _a === void 0 ? void 0 : _a.termsOfService) || "");
+                    return [2 /*return*/];
+            }
+        });
+    }); };
     var onErrorClose = function () {
         vm.error = undefined;
     };
@@ -28197,263 +28333,6 @@ var index = /*#__PURE__*/Object.freeze({
     Image: Image
 });
 
-var IkasStorefrontLocalization = /** @class */ (function () {
-    function IkasStorefrontLocalization(data) {
-        this.id = data.id || "";
-        this.isDefault = data.isDefault || false;
-        this.locale = data.locale || "";
-        this.name = data.name || "";
-    }
-    return IkasStorefrontLocalization;
-}());
-
-var IkasStorefrontDomain = /** @class */ (function () {
-    function IkasStorefrontDomain(data) {
-        if (data === void 0) { data = {}; }
-        this.id = data.id || "";
-        this.merchantDomainId = data.merchantDomainId || "";
-        this.name = data.name || "";
-        this.redirectDomainName = data.redirectDomainName || null;
-        this.isDefault = data.isDefault || false;
-        mobx.makeAutoObservable(this);
-    }
-    return IkasStorefrontDomain;
-}());
-
-var IkasStorefrontRouting = /** @class */ (function () {
-    function IkasStorefrontRouting(data) {
-        this.id = data.id || "";
-        this.countryCodes = data.countryCodes || null;
-        this.domain = data.domain || null;
-        this.locale = data.locale || "";
-        this.path = data.path || null;
-        this.priceListId = data.priceListId || null;
-    }
-    return IkasStorefrontRouting;
-}());
-
-var IkasStorefrontThemeStatus;
-(function (IkasStorefrontThemeStatus) {
-    IkasStorefrontThemeStatus["WAITING"] = "WAITING";
-    IkasStorefrontThemeStatus["READY"] = "READY";
-})(IkasStorefrontThemeStatus || (IkasStorefrontThemeStatus = {}));
-var IkasStorefrontTheme = /** @class */ (function () {
-    function IkasStorefrontTheme(data) {
-        this.id = data.id || "";
-        this.isMainTheme = data.isMainTheme || false;
-        this.name = data.name || "";
-        this.status = data.status || IkasStorefrontThemeStatus.WAITING;
-        this.themeId = data.themeId || "";
-        this.themeVersionId = data.themeVersionId || "";
-    }
-    return IkasStorefrontTheme;
-}());
-
-var IkasStorefrontThemeLocalization = /** @class */ (function () {
-    function IkasStorefrontThemeLocalization(data) {
-        this.id = data.id || "";
-        this.locale = data.locale || "";
-        this.storefrontId = data.storefrontId || "";
-        this.storefrontThemeId = data.storefrontThemeId || "";
-        this.themeJson = data.themeJson
-            ? new IkasTheme(data.themeJson)
-            : new IkasTheme();
-        this.privacyPolicy = data.privacyPolicy || null;
-        this.returnPolicy = data.returnPolicy || null;
-        this.termsOfService = data.termsOfService || null;
-    }
-    return IkasStorefrontThemeLocalization;
-}());
-
-var StorefrontStatus;
-(function (StorefrontStatus) {
-    StorefrontStatus["WAITING"] = "WAITING";
-    StorefrontStatus["READY"] = "READY";
-})(StorefrontStatus || (StorefrontStatus = {}));
-var IkasStorefront = /** @class */ (function () {
-    function IkasStorefront(data) {
-        if (data === void 0) { data = {}; }
-        this.id = data.id || "";
-        this.name = data.name || "";
-        this.status = data.status || StorefrontStatus.WAITING;
-        this.mainStorefrontThemeId = data.mainStorefrontThemeId || null;
-        this.emailSettingsId = data.emailSettingsId || null;
-        this.salesChannelId = data.salesChannelId || null;
-        this.gtmId = data.gtmId || null;
-        this.fbpId = data.fbpId || null;
-        // Sub Models
-        this.localizations = data.localizations
-            ? data.localizations.map(function (l) { return new IkasStorefrontLocalization(l); })
-            : [];
-        this.routings = data.routings
-            ? data.routings.map(function (r) { return new IkasStorefrontRouting(r); })
-            : [];
-        this.domains = data.domains
-            ? data.domains.map(function (o) { return new IkasStorefrontDomain(o); })
-            : [];
-        this.themes = data.themes
-            ? data.themes.map(function (t) { return new IkasStorefrontTheme(t); })
-            : [];
-        this.regions = data.regions
-            ? data.regions.map(function (r) { return new IkasStorefrontThemeLocalization(r); })
-            : [];
-    }
-    return IkasStorefront;
-}());
-
-var IkasSalesChannel = /** @class */ (function () {
-    function IkasSalesChannel(data) {
-        var _a;
-        this.id = data.id || "";
-        this.name = data.name || "";
-        this.priceListId = data.priceListId || "";
-        this.stockLocations =
-            ((_a = data.stockLocations) === null || _a === void 0 ? void 0 : _a.map(function (sl) { return new IkasSalesChannelStockLocation(sl); })) ||
-                [];
-    }
-    return IkasSalesChannel;
-}());
-var IkasSalesChannelStockLocation = /** @class */ (function () {
-    function IkasSalesChannelStockLocation(data) {
-        this.id = data.id || "";
-        this.order = data.order || 0;
-    }
-    return IkasSalesChannelStockLocation;
-}());
-
-var SettingsHelper = /** @class */ (function () {
-    function SettingsHelper() {
-    }
-    SettingsHelper.readSettingsFile = function () {
-        return new Promise(function (resolve) {
-            var serverRuntimeConfig = getConfig__default['default']().serverRuntimeConfig;
-            var settingsPath = serverRuntimeConfig.SETTINGS;
-            fs__default['default'].readFile(settingsPath, {
-                flag: "a+",
-            }, function (err, file) {
-                if (err) {
-                    console.error("SETTINGS FILE READ ERROR!!!");
-                    console.error(err);
-                    return resolve(null);
-                }
-                var result = file.length ? JSON.parse(file.toString()) : {};
-                resolve(result);
-            });
-        });
-    };
-    SettingsHelper.getSettings = function (locale) {
-        var _this = this;
-        return new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
-            var settings, storefront, salesChannel, localizationMap, themeLocalizationPath, routing;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, SettingsHelper.readSettingsFile()];
-                    case 1:
-                        settings = _a.sent();
-                        if (!settings)
-                            return [2 /*return*/, resolve(null)];
-                        storefront = new IkasStorefront(settings.storefront);
-                        salesChannel = new IkasSalesChannel(settings.salesChannel);
-                        localizationMap = settings.localizationMap;
-                        themeLocalizationPath = localizationMap[locale];
-                        routing = storefront.routings.find(function (r) { return r.id === locale || r.path === locale; });
-                        if (!themeLocalizationPath || !routing) {
-                            console.error("THEME LOCALIZATION PATH OR ROUTING MISSING!!!");
-                            return [2 /*return*/, resolve(null)];
-                        }
-                        fs__default['default'].readFile(themeLocalizationPath, {
-                            flag: "a+",
-                        }, function (err, file) {
-                            if (err) {
-                                console.error("THEME LOCALZIATION FILE READ ERROR!!!");
-                                console.error(err);
-                                return resolve(null);
-                            }
-                            var result = file.length ? JSON.parse(file.toString()) : {};
-                            resolve({
-                                storefront: storefront,
-                                themeLocalization: new IkasStorefrontThemeLocalization(result),
-                                salesChannel: salesChannel,
-                                routing: routing,
-                            });
-                        });
-                        return [2 /*return*/];
-                }
-            });
-        }); });
-    };
-    SettingsHelper.getPageData = function (context, isServer, pageType) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function () {
-            var locale, settings, storefront, themeLocalization, salesChannel, routing, provider;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        locale = context.locale || context.defaultLocale || "en";
-                        return [4 /*yield*/, SettingsHelper.getSettings(locale)];
-                    case 1:
-                        settings = _b.sent();
-                        if (!settings ||
-                            !settings.storefront.mainStorefrontThemeId ||
-                            !settings.storefront.salesChannelId) {
-                            return [2 /*return*/, {
-                                    props: {},
-                                    notFound: true,
-                                }];
-                        }
-                        storefront = settings.storefront, themeLocalization = settings.themeLocalization, salesChannel = settings.salesChannel, routing = settings.routing;
-                        IkasStorefrontConfig.storefrontId = storefront.id;
-                        IkasStorefrontConfig.storefrontRoutingId = routing.id;
-                        IkasStorefrontConfig.storefrontThemeId = storefront.mainStorefrontThemeId;
-                        IkasStorefrontConfig.salesChannelId = storefront.salesChannelId;
-                        IkasStorefrontConfig.priceListId = routing.priceListId || undefined;
-                        IkasStorefrontConfig.stockLocationIds = (_a = salesChannel.stockLocations) === null || _a === void 0 ? void 0 : _a.map(function (sl) { return sl.id; });
-                        provider = new IkasPageDataProvider(themeLocalization.themeJson, context.params, pageType);
-                        return [4 /*yield*/, provider.getPageData()];
-                    case 2:
-                        _b.sent();
-                        if (!provider.page) {
-                            return [2 /*return*/, {
-                                    props: {},
-                                    notFound: true,
-                                }];
-                        }
-                        if (isServer)
-                            return [2 /*return*/, provider.nextPageData];
-                        else
-                            return [2 /*return*/, {
-                                    props: __assign(__assign({}, provider.nextPageData.props), { pageSpecificDataStr: provider.pageSpecificData
-                                            ? JSON.stringify(provider.pageSpecificData || {})
-                                            : "" }),
-                                    revalidate: 60,
-                                }];
-                }
-            });
-        });
-    };
-    SettingsHelper.getStaticProps = function (context, pageType) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, SettingsHelper.getPageData(context, false, pageType)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    SettingsHelper.getServerSideProps = function (context, pageType) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, SettingsHelper.getPageData(context, false, pageType)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    return SettingsHelper;
-}());
-
 var Page = function (_a) {
     var page = _a.page, propValuesStr = _a.propValuesStr, settingsStr = _a.settingsStr, merchantSettings = _a.merchantSettings;
     var router$1 = router.useRouter();
@@ -28461,10 +28340,17 @@ var Page = function (_a) {
     return (React.createElement(IkasPage, { merchantSettings: merchantSettings, settingsStr: settingsStr, page: page, propValues: propValues, addOgpMetas: true }));
 };
 var getStaticProps = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.INDEX)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.INDEX);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -28506,7 +28392,6 @@ var getStaticPaths = function (context) { return __awaiter(void 0, void 0, void
                 productMetaData = metaData.filter(function (m) { return m.targetType && m.targetType === exports.IkasHTMLMetaDataTargetType.PRODUCT; });
                 return [4 /*yield*/, IkasProductSearchAPI.searchProducts({
                         productIdList: productMetaData.map(function (p) { return p.targetId; }),
-                        priceListId: IkasStorefrontConfig.priceListId,
                     })];
             case 2:
                 productsResponse = _b.sent();
@@ -28553,10 +28438,25 @@ var getStaticPaths = function (context) { return __awaiter(void 0, void 0, void
     });
 }); };
 var getStaticProps$1 = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, undefined);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                if (!provider.page) {
+                    return [2 /*return*/, {
+                            notFound: true,
+                        }];
+                }
+                return [2 /*return*/, {
+                        props: __assign(__assign({}, provider.nextPageData.props), { pageSpecificDataStr: JSON.stringify(provider.pageSpecificData || {}) }),
+                        revalidate: 60,
+                    }];
         }
     });
 }); };
@@ -28601,38 +28501,19 @@ var Page$2 = function (_a) {
     return (React.createElement(IkasPage, { page: page, settingsStr: settingsStr, propValues: propValues }));
 };
 var getStaticPaths$1 = function (context) { return __awaiter(void 0, void 0, void 0, function () {
-    var allSettings, customPagePaths;
+    var theme, customPages, customPagePaths;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0:
-                if (!context.locales)
-                    return [2 /*return*/, {
-                            paths: [],
-                            fallback: "blocking",
-                        }];
-                return [4 /*yield*/, Promise.all(context.locales.map(function (locale) { return SettingsHelper.getSettings(locale); }))];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
             case 1:
-                allSettings = (_a.sent());
-                customPagePaths = [];
-                allSettings.forEach(function (_a) {
-                    var themeLocalization = _a.themeLocalization, routing = _a.routing;
-                    if (!themeLocalization)
-                        return;
-                    var customPages = themeLocalization.themeJson.pages.filter(function (p) { return p.type === exports.IkasThemePageType.CUSTOM; });
-                    customPages.forEach(function (customPage) {
-                        if (customPage.slug &&
-                            !customPagePaths.some(function (p) { return p.params.slug === customPage.slug; })) {
-                            customPagePaths.push({
-                                params: { slug: customPage.slug },
-                                locale: routing.path || routing.id,
-                            });
-                        }
-                    });
-                });
+                theme = _a.sent();
+                customPages = theme.pages.filter(function (p) { return p.type === exports.IkasThemePageType.CUSTOM; });
+                customPagePaths = customPages.map(function (p) { return ({
+                    slug: p.slug,
+                }); });
                 return [2 /*return*/, {
                         paths: customPagePaths.map(function (p) { return ({
-                            params: p.params,
-                            locale: p.locale,
+                            params: p,
                         }); }),
                         fallback: "blocking",
                     }];
@@ -28640,10 +28521,17 @@ var getStaticPaths$1 = function (context) { return __awaiter(void 0, void 0, voi
     });
 }); };
 var getStaticProps$2 = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.CUSTOM)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.CUSTOM);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -28656,36 +28544,18 @@ var _slug_ = /*#__PURE__*/Object.freeze({
 });
 
 var CheckoutPage = function (_a) {
-    var checkoutStr = _a.checkoutStr, others = __rest(_a, ["checkoutStr"]);
+    var checkoutStr = _a.checkoutStr, queryParams = _a.queryParams;
     Analytics.disableHTML();
     var checkout = new IkasCheckout(JSON.parse(checkoutStr));
-    return React.createElement(IkasCheckoutPage, __assign({ checkout: checkout }, others));
+    return React.createElement(IkasCheckoutPage, { checkout: checkout, queryParams: queryParams });
 };
 var _id_ = mobxReactLite.observer(CheckoutPage);
 var getServerSideProps = function (context) { return __awaiter(void 0, void 0, void 0, function () {
-    var id, locale, settings, storefront, themeLocalization, routing, redirect, checkout;
+    var id, redirect, checkout;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 id = context.query.id;
-                locale = context.locale || context.defaultLocale || "en";
-                return [4 /*yield*/, SettingsHelper.getSettings(locale)];
-            case 1:
-                settings = _a.sent();
-                // TODO maybe remove this and convert this page to static
-                if (!settings ||
-                    !settings.storefront.mainStorefrontThemeId ||
-                    !settings.storefront.salesChannelId) {
-                    return [2 /*return*/, {
-                            props: {},
-                            notFound: true,
-                        }];
-                }
-                storefront = settings.storefront, themeLocalization = settings.themeLocalization, routing = settings.routing;
-                IkasStorefrontConfig.storefrontId = storefront.id;
-                IkasStorefrontConfig.storefrontRoutingId = routing.id;
-                IkasStorefrontConfig.storefrontThemeId = storefront.mainStorefrontThemeId;
-                IkasStorefrontConfig.salesChannelId = storefront.salesChannelId;
                 redirect = function () {
                     context.res.writeHead(302, { Location: "/" });
                     context.res.end();
@@ -28695,15 +28565,12 @@ var getServerSideProps = function (context) { return __awaiter(void 0, void 0, v
                     return [2 /*return*/, redirect()];
                 }
                 return [4 /*yield*/, IkasCheckoutAPI.getCheckoutById(id)];
-            case 2:
+            case 1:
                 checkout = _a.sent();
                 if (checkout) {
                     return [2 /*return*/, {
                             props: {
                                 checkoutStr: JSON.stringify(checkout),
-                                returnPolicy: themeLocalization.returnPolicy || "",
-                                privacyPolicy: themeLocalization.privacyPolicy || "",
-                                termsOfService: themeLocalization.termsOfService || "",
                                 queryParams: context.query,
                             },
                         }];
@@ -28728,10 +28595,17 @@ var Page$3 = function (_a) {
     return (React.createElement(IkasPage, { settingsStr: settingsStr, page: page, propValues: propValues }));
 };
 var getStaticProps$3 = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.ACCOUNT)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.ACCOUNT);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -28749,10 +28623,17 @@ var Page$4 = function (_a) {
     return (React.createElement(IkasPage, { settingsStr: settingsStr, page: page, propValues: propValues }));
 };
 var getStaticProps$4 = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.ADDRESSES)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.ADDRESSES);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -28770,10 +28651,17 @@ var Page$5 = function (_a) {
     return (React.createElement(IkasPage, { settingsStr: settingsStr, page: page, propValues: propValues }));
 };
 var getStaticProps$5 = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.ORDERS)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.ORDERS);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -28791,10 +28679,17 @@ var Page$6 = function (_a) {
     return (React.createElement(IkasPage, { settingsStr: settingsStr, page: page, propValues: propValues }));
 };
 var getServerSideProps$1 = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getServerSideProps(context, exports.IkasThemePageType.ORDER_DETAIL)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.ORDER_DETAIL);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, provider.nextPageData];
         }
     });
 }); };
@@ -28812,10 +28707,17 @@ var Page$7 = function (_a) {
     return (React.createElement(IkasPage, { merchantSettings: merchantSettings, settingsStr: settingsStr, page: page, propValues: propValues }));
 };
 var getStaticProps$6 = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.LOGIN)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.LOGIN);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -28833,10 +28735,17 @@ var Page$8 = function (_a) {
     return (React.createElement(IkasPage, { merchantSettings: merchantSettings, settingsStr: settingsStr, page: page, propValues: propValues }));
 };
 var getStaticProps$7 = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.REGISTER)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.REGISTER);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -28854,10 +28763,17 @@ var Page$9 = function (_a) {
     return (React.createElement(IkasPage, { merchantSettings: merchantSettings, settingsStr: settingsStr, page: page, propValues: propValues }));
 };
 var getStaticProps$8 = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.FORGOT_PASSWORD)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.FORGOT_PASSWORD);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -28875,10 +28791,17 @@ var Page$a = function (_a) {
     return (React.createElement(IkasPage, { merchantSettings: merchantSettings, settingsStr: settingsStr, page: page, propValues: propValues }));
 };
 var getStaticProps$9 = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.RECOVER_PASSWORD)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.RECOVER_PASSWORD);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -28900,10 +28823,17 @@ var Page$b = function (_a) {
     return (React.createElement(IkasPage, { settingsStr: settingsStr, page: page, propValues: propValues }));
 };
 var getStaticProps$a = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.CART)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.CART);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -28932,10 +28862,17 @@ var Page$d = function (_a) {
     return (React.createElement(IkasPage, { settingsStr: settingsStr, page: page, propValues: propValues }));
 };
 var getStaticProps$b = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.FAVORITE_PRODUCTS)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.FAVORITE_PRODUCTS);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -28961,10 +28898,17 @@ var Page$e = function (_a) {
     return (React.createElement(IkasPage, { merchantSettings: merchantSettings, settingsStr: settingsStr, page: page, propValues: propValues, addOgpMetas: true }));
 };
 var getStaticProps$c = function (context) { return __awaiter(void 0, void 0, void 0, function () {
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.SEARCH)];
-            case 1: return [2 /*return*/, _a.sent()];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
+            case 1:
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.SEARCH);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -28977,27 +28921,22 @@ var search = /*#__PURE__*/Object.freeze({
 
 var Page$f = function (_a) {
     var page = _a.page, propValuesStr = _a.propValuesStr, settingsStr = _a.settingsStr, merchantSettings = _a.merchantSettings;
-    if (!propValuesStr || !page)
-        return React.createElement(Error__default['default'], { statusCode: 404 });
     var router$1 = router.useRouter();
     var propValues = React.useMemo(function () { return IkasPageDataProvider.initPropValues(propValuesStr, router$1); }, [propValuesStr]);
     return (React.createElement(IkasPage, { merchantSettings: merchantSettings, settingsStr: settingsStr, page: page, propValues: propValues }));
 };
 var getStaticProps$d = function (context) { return __awaiter(void 0, void 0, void 0, function () {
-    var props;
+    var theme, provider;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, SettingsHelper.getStaticProps(context, exports.IkasThemePageType.NOT_FOUND)];
+            case 0: return [4 /*yield*/, IkasThemeAPI.fetchTheme()];
             case 1:
-                props = _a.sent();
-                //@ts-ignore
-                if (props.notFound)
-                    return [2 /*return*/, {
-                            props: {},
-                            revalidate: 60,
-                        }];
-                else
-                    return [2 /*return*/, props];
+                theme = _a.sent();
+                provider = new IkasPageDataProvider(theme, context.params, exports.IkasThemePageType.NOT_FOUND);
+                return [4 /*yield*/, provider.getPageData()];
+            case 2:
+                _a.sent();
+                return [2 /*return*/, __assign(__assign({}, provider.nextPageData), { revalidate: 60 })];
         }
     });
 }); };
@@ -29097,8 +29036,10 @@ exports.IkasProductSearchAPI = IkasProductSearchAPI;
 exports.IkasProductVariant = IkasProductVariant;
 exports.IkasProductVariantType = IkasProductVariantType;
 exports.IkasStateAPI = IkasStateAPI;
+exports.IkasStorefrontAPI = IkasStorefrontAPI;
 exports.IkasStorefrontConfig = IkasStorefrontConfig;
 exports.IkasTheme = IkasTheme;
+exports.IkasThemeAPI = IkasThemeAPI;
 exports.IkasThemeComponent = IkasThemeComponent;
 exports.IkasThemeComponentProp = IkasThemeComponentProp;
 exports.IkasThemeCustomData = IkasThemeCustomData;