@ikas/storefront 4.0.0-alpha.46 → 4.0.0-alpha.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront",
-  "version": "4.0.0-alpha.46",
+  "version": "4.0.0-alpha.47",
   "description": "Storefront functionality for ikas storefront themes.",
   "author": "Umut Ozan Yıldırım",
   "license": "ISC",
@@ -24,11 +24,11 @@
     "libphonenumber-js": "^1.10.6"
   },
   "devDependencies": {
-    "@ikas/storefront-api": "^4.0.0-alpha.46",
-    "@ikas/storefront-config": "^4.0.0-alpha.46",
-    "@ikas/storefront-model-functions": "^4.0.0-alpha.46",
-    "@ikas/storefront-models": "^4.0.0-alpha.46",
-    "@ikas/storefront-providers": "^4.0.0-alpha.46",
+    "@ikas/storefront-api": "^4.0.0-alpha.47",
+    "@ikas/storefront-config": "^4.0.0-alpha.47",
+    "@ikas/storefront-model-functions": "^4.0.0-alpha.47",
+    "@ikas/storefront-models": "^4.0.0-alpha.47",
+    "@ikas/storefront-providers": "^4.0.0-alpha.47",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
@@ -52,11 +52,11 @@
     "html-react-parser": "^1.4.0"
   },
   "peerDependencies": {
-    "@ikas/storefront-api": "^4.0.0-alpha.46",
-    "@ikas/storefront-config": "^4.0.0-alpha.46",
-    "@ikas/storefront-model-functions": "^4.0.0-alpha.46",
-    "@ikas/storefront-models": "^4.0.0-alpha.46",
-    "@ikas/storefront-providers": "^4.0.0-alpha.46",
+    "@ikas/storefront-api": "^4.0.0-alpha.47",
+    "@ikas/storefront-config": "^4.0.0-alpha.47",
+    "@ikas/storefront-model-functions": "^4.0.0-alpha.47",
+    "@ikas/storefront-models": "^4.0.0-alpha.47",
+    "@ikas/storefront-providers": "^4.0.0-alpha.47",
     "mobx": "^6.1.3",
     "mobx-react-lite": "^3.1.5",
     "next": "12.2.0",

package/src/analytics/ikas.ts

@@ -447,7 +447,7 @@ export default class IkasAnalytics {
     };
 
     await this.sendEvents([event]);
-    this.createSessionId();
+    await this.createSessionId();
   }
 
   static async beginCheckout(checkout: IkasCheckout) {

package/src/components/checkout/steps/step-success/index.tsx

@@ -19,6 +19,7 @@ import {
 } from "../../../../models/data/payment-gateway";
 import OfferProduct from "../../components/offer-product";
 import { IkasTransactionCardAssociation } from "@ikas/storefront-models";
+import { Analytics } from "../../../../analytics";
 
 type Props = {
   vm: CheckoutViewModel;
@@ -31,8 +32,12 @@ export const StepSuccess: React.FC<Props> = observer(({ vm }) => {
     if (typeof localStorage !== "undefined") {
       const lsCartId = localStorage.getItem(CART_LS_KEY);
 
-      if (lsCartId && lsCartId === vm.checkout.id)
+      if (lsCartId && lsCartId === vm.checkout.id) {
+        if (vm.successTransaction)
+          Analytics.purchase(vm.checkout, vm.successTransaction);
+
         localStorage.removeItem(CART_LS_KEY);
+      }
     }
   }, []);
 

package/src/models/data/product/base-unit/index.ts

@@ -1,18 +1,31 @@
 import {
   IkasProductUnitType,
   IkasProductBaseUnit as IProductBaseUnit,
+  IkasProductUnit as IProductUnit,
 } from "@ikas/storefront-models";
 import { makeAutoObservable } from "mobx";
 
 export class IkasProductBaseUnit implements IProductBaseUnit {
   baseAmount: number | null;
   type: IkasProductUnitType;
-  unitId: string | null;
+  unit: IkasProductUnit;
 
   constructor(data: IProductBaseUnit) {
     this.baseAmount = data.baseAmount;
     this.type = data.type;
-    this.unitId = data.unitId;
+    this.unit = new IkasProductUnit(data.unit);
+
+    makeAutoObservable(this);
+  }
+}
+
+export class IkasProductUnit implements IProductUnit {
+  id: string;
+  name: string;
+
+  constructor(data: IkasProductUnit) {
+    this.id = data.id;
+    this.name = data.name;
 
     makeAutoObservable(this);
   }

package/src/models/data/product/index.ts

@@ -13,10 +13,7 @@ import {
 } from "@ikas/storefront-models";
 import { IkasProductOptionSet } from "./option-set";
 import { makeAutoObservable } from "mobx";
-import {
-  IkasProductFunctions,
-  IkasProductOptionSetFunctions,
-} from "@ikas/storefront-model-functions";
+import { IkasProductFunctions } from "@ikas/storefront-model-functions";
 import { IkasVariantValue } from "../variant-type/variant-value";
 import { IkasProductCampaign } from "./campaign";
 import { IkasStorefrontConfig } from "@ikas/storefront-config";
@@ -26,6 +23,7 @@ import { IkasBaseStore } from "../../../store/base";
 import { IkasProductAttributeMap } from "./attribute-value";
 import _groupBy from "lodash/groupBy";
 import { IkasProductBaseUnit } from "./base-unit";
+import { formatCurrency } from "../../..";
 
 export class IkasProduct implements IProduct {
   id: string;
@@ -184,6 +182,10 @@ export class IkasProduct implements IProduct {
       .filter((v) => !!v) || []) as IkasProductAttributeMap[];
   }
 
+  get selectedVariantUnitPriceText() {
+    return this.getVariantUnitPriceText(this.selectedVariant);
+  }
+
   selectVariantValue(variantValue: IkasVariantValue) {
     const metaData = this.metaData;
     const selectedVariantValues = this.selectedVariantValues.map((vv) => {
@@ -281,6 +283,19 @@ export class IkasProduct implements IProduct {
     Analytics.productView(this);
   }
 
+  getVariantUnitPriceText(variant: IkasProductVariant) {
+    const price = variant.price;
+    if (!price.unitPrice || !this.baseUnit) {
+      return;
+    }
+
+    return `${formatCurrency(
+      price.unitPrice,
+      price.currency || "",
+      price.currencySymbol || ""
+    )} / ${this.baseUnit?.unit?.name}`;
+  }
+
   private setOptionPrices() {
     const variant = this.variants[0];
     if (!variant) return;

package/src/models/data/product/variant/price/index.ts

@@ -10,6 +10,7 @@ export class IkasProductPrice implements IProductPrice {
   discountPrice: number | null = null;
   priceListId: string | null = null;
   sellPrice: number;
+  unitPrice: number | null = null;
 
   constructor(data?: IProductPrice) {
     this.buyPrice = data?.buyPrice ?? null;
@@ -18,6 +19,7 @@ export class IkasProductPrice implements IProductPrice {
     this.discountPrice = data?.discountPrice ?? null;
     this.priceListId = data?.priceListId ?? null;
     this.sellPrice = data?.sellPrice ?? 0;
+    this.unitPrice = data?.unitPrice ?? null;
 
     makeAutoObservable(this);
   }