@ikas/storefront 0.0.165-alpha.6 → 0.0.165-alpha.8

package/build/analytics/analytics.d.ts

@@ -5,10 +5,10 @@ export declare class Analytics {
     constructor();
     static pageView(url: string): void;
     static productView(productDetail: IkasProductDetail): void;
-    static addToCart(item: IkasProductDetail | IkasOrderLineItem, quantity: number): void;
+    static addToCart(item: IkasProductDetail | IkasOrderLineItem, quantity: number, eventId: string): void;
     static removeFromCart(item: IkasProductDetail | IkasOrderLineItem, quantity: number): void;
     static beginCheckout(checkout: IkasCheckout): void;
-    static purchase(checkout: IkasCheckout, orderId: string): void;
+    static purchase(checkout: IkasCheckout, eventId: string): void;
     static checkoutStep(checkout: IkasCheckout, step: CheckoutStep): void;
     static disableHTML(): void;
     static addToWishlist(id: string): void;

package/build/analytics/facebookPixel.d.ts

@@ -3,9 +3,9 @@ import { IkasCart } from "../models/data/cart/index";
 export declare class FacebookPixel {
     constructor();
     static productView(productDetail: IkasProductDetail): void;
-    static addToCart(item: IkasProductDetail | IkasOrderLineItem, quantity: number): void;
+    static addToCart(item: IkasProductDetail | IkasOrderLineItem, quantity: number, eventId: string): void;
     static beginCheckout(checkout: IkasCheckout): void;
-    static purchase(checkout: IkasCheckout, orderId: string): void;
+    static purchase(checkout: IkasCheckout, eventId: string): void;
     static addToWishlist(id: string): void;
     static search(searchKeyword: string): void;
     static completeRegistration(): void;

package/build/index.es.js

@@ -17876,13 +17876,13 @@ var FacebookPixel = /** @class */ (function () {
             console.error(err);
         }
     };
-    FacebookPixel.addToCart = function (item, quantity) {
+    FacebookPixel.addToCart = function (item, quantity, eventId) {
         try {
             !isServer &&
                 window.fbq &&
                 window.fbq("track", "AddToCart", item instanceof IkasProductDetail
                     ? productToFBPItem(item, quantity)
-                    : orderLineItemToFBPItem(item, quantity));
+                    : orderLineItemToFBPItem(item, quantity), { eventId: eventId });
             return;
         }
         catch (err) {
@@ -17900,11 +17900,11 @@ var FacebookPixel = /** @class */ (function () {
             console.error(err);
         }
     };
-    FacebookPixel.purchase = function (checkout, orderId) {
+    FacebookPixel.purchase = function (checkout, eventId) {
         try {
             !isServer &&
                 window.fbq &&
-                window.fbq("track", "Purchase", beginCheckoutFBPItem(checkout));
+                window.fbq("track", "Purchase", beginCheckoutFBPItem(checkout), { eventId: eventId });
             return;
         }
         catch (err) {
@@ -22514,7 +22514,7 @@ var IkasCartStore = /** @class */ (function () {
         this.addItem = function (variant, product, initialQuantity) {
             if (initialQuantity === void 0) { initialQuantity = 1; }
             return __awaiter(_this, void 0, void 0, function () {
-                var existingItem, input, cart, err_2;
+                var existingItem, input, cart, eventId, err_2;
                 var _a, _b, _c;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
@@ -22553,7 +22553,10 @@ var IkasCartStore = /** @class */ (function () {
                             _d.sent();
                             _d.label = 3;
                         case 3:
-                            Analytics.addToCart(new IkasProductDetail(product, variant.variantValues), initialQuantity);
+                            if (this.cart) {
+                                eventId = this.cart.id + "-" + this.cart.updatedAt;
+                                Analytics.addToCart(new IkasProductDetail(product, variant.variantValues), initialQuantity, eventId);
+                            }
                             return [3 /*break*/, 5];
                         case 4:
                             err_2 = _d.sent();
@@ -22565,7 +22568,7 @@ var IkasCartStore = /** @class */ (function () {
             });
         };
         this.changeItemQuantity = function (item, quantity) { return __awaiter(_this, void 0, void 0, function () {
-            var input, cart, oldQuantity, err_3;
+            var input, cart, eventId, oldQuantity, err_3;
             var _a, _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -22599,12 +22602,15 @@ var IkasCartStore = /** @class */ (function () {
                         _d.label = 3;
                     case 3:
                         this.removeCardIfEmpty();
-                        oldQuantity = item.quantity;
-                        if (oldQuantity > quantity) {
-                            Analytics.removeFromCart(item, oldQuantity - quantity);
-                        }
-                        else {
-                            Analytics.addToCart(item, quantity - oldQuantity);
+                        if (this.cart) {
+                            eventId = this.cart.id + "-" + this.cart.updatedAt;
+                            oldQuantity = item.quantity;
+                            if (oldQuantity > quantity) {
+                                Analytics.removeFromCart(item, oldQuantity - quantity);
+                            }
+                            else {
+                                Analytics.addToCart(item, quantity - oldQuantity, eventId);
+                            }
                         }
                         return [3 /*break*/, 5];
                     case 4:
@@ -24108,9 +24114,9 @@ var Analytics = /** @class */ (function () {
             console.error(err);
         }
     };
-    Analytics.addToCart = function (item, quantity) {
+    Analytics.addToCart = function (item, quantity, eventId) {
         try {
-            FacebookPixel.addToCart(item, quantity);
+            FacebookPixel.addToCart(item, quantity, eventId);
             GoogleTagManager.addToCart(item, quantity);
         }
         catch (err) {
@@ -24138,11 +24144,11 @@ var Analytics = /** @class */ (function () {
             console.error(err);
         }
     };
-    Analytics.purchase = function (checkout, orderId) {
+    Analytics.purchase = function (checkout, eventId) {
         try {
             localStorage.removeItem(LS_BEGIN_CHECKOUT_KEY);
-            FacebookPixel.purchase(checkout, orderId);
-            GoogleTagManager.purchase(checkout, orderId);
+            FacebookPixel.purchase(checkout, eventId);
+            GoogleTagManager.purchase(checkout, eventId);
         }
         catch (err) {
             console.error(err);
@@ -24958,11 +24964,15 @@ var IkasCustomerStore = /** @class */ (function () {
     };
     IkasCustomerStore.prototype.onProductView = function (productId, variantId) {
         return __awaiter(this, void 0, void 0, function () {
-            var isSuccess;
+            var existingItem, isSuccess;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.customer) return [3 /*break*/, 2];
+                        existingItem = this._lastViewedProducts.find(function (lvp) { return lvp.productId === productId; });
+                        if (existingItem) {
+                            return [2 /*return*/];
+                        }
                         return [4 /*yield*/, IkasCustomerAPI.saveLastViewedProducts({
                                 customerId: this.customer.id,
                                 products: [
@@ -27643,10 +27653,25 @@ var IkasProductDetail = /** @class */ (function () {
     });
     Object.defineProperty(IkasProductDetail.prototype, "href", {
         get: function () {
+            var _this = this;
             var metaData = this.product.metaData;
             if (!(metaData === null || metaData === void 0 ? void 0 : metaData.slug))
                 return "";
-            return "/" + metaData.slug;
+            var variantParams = this.product.variantTypes
+                .map(function (pvt) {
+                var vt = pvt.variantType;
+                var selectedVariant = vt.values.find(function (vv) {
+                    return _this.selectedVariantValues.some(function (svv) { return svv.id === vv.id; });
+                });
+                if (selectedVariant)
+                    return vt.slug + "=" + selectedVariant.slug;
+            })
+                .filter(function (param) { return !!param; })
+                .join("&");
+            if (variantParams)
+                return "/" + metaData.slug + "?" + variantParams;
+            else
+                return "/" + metaData.slug;
         },
         enumerable: false,
         configurable: true
@@ -27713,7 +27738,9 @@ var IkasProductDetail = /** @class */ (function () {
         })
             .filter(function (param) { return !!param; })
             .join("&");
-        var newUrl = "/" + metaData.slug + "?" + variantParams;
+        var newUrl = "/" + metaData.slug;
+        if (variantParams)
+            newUrl = "/" + metaData.slug + "?" + variantParams;
         if (newUrl === window.location.pathname)
             return;
         var isShallow = process.env.NODE_ENV !== "production";
@@ -61293,6 +61320,7 @@ var StepSuccess = observer(function (_a) {
     var t = useTranslation().t;
     var _f = useState(false), isContactModalVisible = _f[0], setContactModalVisible = _f[1];
     useEffect(function () {
+        var _a;
         if (typeof localStorage !== "undefined") {
             var lsCartId = localStorage.getItem(CART_LS_KEY);
             var lsCheckoutId = localStorage.getItem(CHECKOUT_LS_KEY);
@@ -61301,7 +61329,7 @@ var StepSuccess = observer(function (_a) {
             if (lsCheckoutId && lsCheckoutId === vm.checkout.id)
                 localStorage.removeItem(CHECKOUT_LS_KEY);
         }
-        Analytics.purchase(vm.checkout, vm.checkout.orderNumber);
+        Analytics.purchase(vm.checkout, ((_a = vm.successTransaction) === null || _a === void 0 ? void 0 : _a.id) || "");
     }, []);
     var customerName = (((_b = vm.checkout.customer) === null || _b === void 0 ? void 0 : _b.firstName) || "") +
         " " +
@@ -61519,11 +61547,28 @@ var OrderStatus = observer(function (_a) {
     })) === null || _d === void 0 ? void 0 : _d.text : ""));
 });
 
+var IMAGE_SIZES = [
+    180,
+    360,
+    540,
+    720,
+    900,
+    1080,
+    1296,
+    1512,
+    1728,
+    1950,
+    2560,
+    3840,
+];
 var Image = function (_a) {
     var image = _a.image, others = __rest(_a, ["image"]);
     var loader = function (_a) {
         var width = _a.width;
-        return image.getSrc(width);
+        var closest = IMAGE_SIZES.reduce(function (prev, curr) {
+            return Math.abs(curr - width) < Math.abs(prev - width) ? curr : prev;
+        });
+        return image.getSrc(closest);
     };
     return (createElement(NextImage, __assign({}, others, { loader: loader, quality: 100, src: image.src, alt: others.alt || "Image" })));
 };

package/build/index.js

@@ -17885,13 +17885,13 @@ var FacebookPixel = /** @class */ (function () {
             console.error(err);
         }
     };
-    FacebookPixel.addToCart = function (item, quantity) {
+    FacebookPixel.addToCart = function (item, quantity, eventId) {
         try {
             !isServer &&
                 window.fbq &&
                 window.fbq("track", "AddToCart", item instanceof IkasProductDetail
                     ? productToFBPItem(item, quantity)
-                    : orderLineItemToFBPItem(item, quantity));
+                    : orderLineItemToFBPItem(item, quantity), { eventId: eventId });
             return;
         }
         catch (err) {
@@ -17909,11 +17909,11 @@ var FacebookPixel = /** @class */ (function () {
             console.error(err);
         }
     };
-    FacebookPixel.purchase = function (checkout, orderId) {
+    FacebookPixel.purchase = function (checkout, eventId) {
         try {
             !isServer &&
                 window.fbq &&
-                window.fbq("track", "Purchase", beginCheckoutFBPItem(checkout));
+                window.fbq("track", "Purchase", beginCheckoutFBPItem(checkout), { eventId: eventId });
             return;
         }
         catch (err) {
@@ -22523,7 +22523,7 @@ var IkasCartStore = /** @class */ (function () {
         this.addItem = function (variant, product, initialQuantity) {
             if (initialQuantity === void 0) { initialQuantity = 1; }
             return __awaiter(_this, void 0, void 0, function () {
-                var existingItem, input, cart, err_2;
+                var existingItem, input, cart, eventId, err_2;
                 var _a, _b, _c;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
@@ -22562,7 +22562,10 @@ var IkasCartStore = /** @class */ (function () {
                             _d.sent();
                             _d.label = 3;
                         case 3:
-                            Analytics.addToCart(new IkasProductDetail(product, variant.variantValues), initialQuantity);
+                            if (this.cart) {
+                                eventId = this.cart.id + "-" + this.cart.updatedAt;
+                                Analytics.addToCart(new IkasProductDetail(product, variant.variantValues), initialQuantity, eventId);
+                            }
                             return [3 /*break*/, 5];
                         case 4:
                             err_2 = _d.sent();
@@ -22574,7 +22577,7 @@ var IkasCartStore = /** @class */ (function () {
             });
         };
         this.changeItemQuantity = function (item, quantity) { return __awaiter(_this, void 0, void 0, function () {
-            var input, cart, oldQuantity, err_3;
+            var input, cart, eventId, oldQuantity, err_3;
             var _a, _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -22608,12 +22611,15 @@ var IkasCartStore = /** @class */ (function () {
                         _d.label = 3;
                     case 3:
                         this.removeCardIfEmpty();
-                        oldQuantity = item.quantity;
-                        if (oldQuantity > quantity) {
-                            Analytics.removeFromCart(item, oldQuantity - quantity);
-                        }
-                        else {
-                            Analytics.addToCart(item, quantity - oldQuantity);
+                        if (this.cart) {
+                            eventId = this.cart.id + "-" + this.cart.updatedAt;
+                            oldQuantity = item.quantity;
+                            if (oldQuantity > quantity) {
+                                Analytics.removeFromCart(item, oldQuantity - quantity);
+                            }
+                            else {
+                                Analytics.addToCart(item, quantity - oldQuantity, eventId);
+                            }
                         }
                         return [3 /*break*/, 5];
                     case 4:
@@ -24117,9 +24123,9 @@ var Analytics = /** @class */ (function () {
             console.error(err);
         }
     };
-    Analytics.addToCart = function (item, quantity) {
+    Analytics.addToCart = function (item, quantity, eventId) {
         try {
-            FacebookPixel.addToCart(item, quantity);
+            FacebookPixel.addToCart(item, quantity, eventId);
             GoogleTagManager.addToCart(item, quantity);
         }
         catch (err) {
@@ -24147,11 +24153,11 @@ var Analytics = /** @class */ (function () {
             console.error(err);
         }
     };
-    Analytics.purchase = function (checkout, orderId) {
+    Analytics.purchase = function (checkout, eventId) {
         try {
             localStorage.removeItem(LS_BEGIN_CHECKOUT_KEY);
-            FacebookPixel.purchase(checkout, orderId);
-            GoogleTagManager.purchase(checkout, orderId);
+            FacebookPixel.purchase(checkout, eventId);
+            GoogleTagManager.purchase(checkout, eventId);
         }
         catch (err) {
             console.error(err);
@@ -24967,11 +24973,15 @@ var IkasCustomerStore = /** @class */ (function () {
     };
     IkasCustomerStore.prototype.onProductView = function (productId, variantId) {
         return __awaiter(this, void 0, void 0, function () {
-            var isSuccess;
+            var existingItem, isSuccess;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.customer) return [3 /*break*/, 2];
+                        existingItem = this._lastViewedProducts.find(function (lvp) { return lvp.productId === productId; });
+                        if (existingItem) {
+                            return [2 /*return*/];
+                        }
                         return [4 /*yield*/, IkasCustomerAPI.saveLastViewedProducts({
                                 customerId: this.customer.id,
                                 products: [
@@ -27627,10 +27637,25 @@ var IkasProductDetail = /** @class */ (function () {
     });
     Object.defineProperty(IkasProductDetail.prototype, "href", {
         get: function () {
+            var _this = this;
             var metaData = this.product.metaData;
             if (!(metaData === null || metaData === void 0 ? void 0 : metaData.slug))
                 return "";
-            return "/" + metaData.slug;
+            var variantParams = this.product.variantTypes
+                .map(function (pvt) {
+                var vt = pvt.variantType;
+                var selectedVariant = vt.values.find(function (vv) {
+                    return _this.selectedVariantValues.some(function (svv) { return svv.id === vv.id; });
+                });
+                if (selectedVariant)
+                    return vt.slug + "=" + selectedVariant.slug;
+            })
+                .filter(function (param) { return !!param; })
+                .join("&");
+            if (variantParams)
+                return "/" + metaData.slug + "?" + variantParams;
+            else
+                return "/" + metaData.slug;
         },
         enumerable: false,
         configurable: true
@@ -27697,7 +27722,9 @@ var IkasProductDetail = /** @class */ (function () {
         })
             .filter(function (param) { return !!param; })
             .join("&");
-        var newUrl = "/" + metaData.slug + "?" + variantParams;
+        var newUrl = "/" + metaData.slug;
+        if (variantParams)
+            newUrl = "/" + metaData.slug + "?" + variantParams;
         if (newUrl === window.location.pathname)
             return;
         var isShallow = process.env.NODE_ENV !== "production";
@@ -61273,6 +61300,7 @@ var StepSuccess = mobxReactLite.observer(function (_a) {
     var t = useTranslation().t;
     var _f = React.useState(false), isContactModalVisible = _f[0], setContactModalVisible = _f[1];
     React.useEffect(function () {
+        var _a;
         if (typeof localStorage !== "undefined") {
             var lsCartId = localStorage.getItem(CART_LS_KEY);
             var lsCheckoutId = localStorage.getItem(CHECKOUT_LS_KEY);
@@ -61281,7 +61309,7 @@ var StepSuccess = mobxReactLite.observer(function (_a) {
             if (lsCheckoutId && lsCheckoutId === vm.checkout.id)
                 localStorage.removeItem(CHECKOUT_LS_KEY);
         }
-        Analytics.purchase(vm.checkout, vm.checkout.orderNumber);
+        Analytics.purchase(vm.checkout, ((_a = vm.successTransaction) === null || _a === void 0 ? void 0 : _a.id) || "");
     }, []);
     var customerName = (((_b = vm.checkout.customer) === null || _b === void 0 ? void 0 : _b.firstName) || "") +
         " " +
@@ -61499,11 +61527,28 @@ var OrderStatus = mobxReactLite.observer(function (_a) {
     })) === null || _d === void 0 ? void 0 : _d.text : ""));
 });
 
+var IMAGE_SIZES = [
+    180,
+    360,
+    540,
+    720,
+    900,
+    1080,
+    1296,
+    1512,
+    1728,
+    1950,
+    2560,
+    3840,
+];
 var Image = function (_a) {
     var image = _a.image, others = __rest(_a, ["image"]);
     var loader = function (_a) {
         var width = _a.width;
-        return image.getSrc(width);
+        var closest = IMAGE_SIZES.reduce(function (prev, curr) {
+            return Math.abs(curr - width) < Math.abs(prev - width) ? curr : prev;
+        });
+        return image.getSrc(closest);
     };
     return (React.createElement(NextImage__default['default'], __assign({}, others, { loader: loader, quality: 100, src: image.src, alt: others.alt || "Image" })));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront",
-  "version": "0.0.165-alpha.6",
+  "version": "0.0.165-alpha.8",
   "main": "./build/index.js",
   "module": "./build/index.es.js",
   "author": "Umut Ozan Yıldırım",