@ikas/storefront 4.0.0-alpha.48 → 4.0.0-alpha.5

package/src/models/data/index.ts

@@ -190,6 +190,3 @@ export * from "./theme-json";
 // VARIANT-TYPE
 export * from "./variant-type/variant-value";
 export * from "./variant-type";
-
-// PROVIDER RE-EXPORT
-export type { IkasSliderPropValueData as IkasSlider } from "@ikas/storefront-providers";

package/src/models/data/merchant-settings/index.ts

@@ -1,18 +1,15 @@
 import {
   IkasMerchantSettingsCurrencyFormat,
   IkasMerchantSettings as IMerchantSettings,
-  IkasMerchantAddress,
 } from "@ikas/storefront-models";
 import { makeAutoObservable } from "mobx";
 import { IkasImage } from "../image";
 
 export class IkasMerchantSettings implements IMerchantSettings {
   currencyFormats: IkasMerchantSettingsCurrencyFormat[] | null;
-  address: IkasMerchantAddress | null;
   logoId: string | null;
   merchantId: string;
   merchantName: string;
-  phone: string | null;
 
   // Extra
   logo?: IkasImage | null;
@@ -22,13 +19,7 @@ export class IkasMerchantSettings implements IMerchantSettings {
     this.logoId = data.logoId;
     this.merchantId = data.merchantId;
     this.merchantName = data.merchantName;
-    this.phone = data.phone || null;
-    this.address = data.address || null;
-
     this.logo = data.logo ? new IkasImage(data.logo) : null;
-    if (!this.logo && this.logoId) {
-      this.logo = new IkasImage({ id: this.logoId, isVideo: false });
-    }
 
     makeAutoObservable(this);
   }

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

@@ -20,7 +20,7 @@ import {
 import { IkasOrder as IOrder } from "@ikas/storefront-models";
 import { computed, makeObservable, observable } from "mobx";
 import { IkasOrderFunctions } from "@ikas/storefront-model-functions";
-import { formatCurrency } from "../../../utils/currency";
+import { formatMoney, getCurrencySymbol } from "../../../utils/currency";
 
 type IOrderConstructorData = {
   refundSettings?: IkasOrderRefundSettings | null;
@@ -31,7 +31,6 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
   cancelReason: IkasOrderCancelReason | null = null;
   cancelledAt: number | null = null;
   currencyCode: string;
-  currencySymbol: string | null = null;
   customer: IkasOrderCustomer | null = null;
   customerId: string | null = null;
   giftPackageLines: IkasOrderGiftPackageLine[] | null = null;
@@ -58,16 +57,15 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
   // Extra
   refundSettings?: IkasOrderRefundSettings | null;
 
-  constructor(data: Partial<IOrderConstructorData>) {
-    super(data as any);
+  constructor(data: IOrderConstructorData) {
+    super(data);
 
     this.billingAddress = data.billingAddress
       ? new IkasOrderAddress(data.billingAddress)
       : null;
     this.cancelReason = data.cancelReason || null;
     this.cancelledAt = data.cancelledAt || null;
-    this.currencyCode = data.currencyCode || "";
-    this.currencySymbol = data.currencySymbol || null;
+    this.currencyCode = data.currencyCode;
     this.customer = data.customer ? new IkasOrderCustomer(data.customer) : null;
     this.customerId = data.customerId || null;
     this.giftPackageLines =
@@ -80,9 +78,7 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
     this.orderAdjustments =
       data.orderAdjustments?.map((oa) => new IkasOrderAdjustment(oa)) || null;
     this.orderLineItems =
-      data.orderLineItems
-        ?.map((oli) => new IkasOrderLineItem(oli))
-        .filter((i) => !i.deleted) || [];
+      data.orderLineItems.map((oli) => new IkasOrderLineItem(oli)) || null;
     this.orderNumber = data.orderNumber || null;
     this.orderPackageStatus = data.orderPackageStatus || null;
     this.orderPackages =
@@ -94,15 +90,12 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
     this.shippingAddress = data.shippingAddress
       ? new IkasOrderAddress(data.shippingAddress)
       : null;
-    this.shippingLines =
-      data.shippingLines?.map((sl) => new IkasOrderShippingLine(sl)) || null;
-    this.shippingMethod =
-      data.shippingMethod || IkasOrderShippingMethod.SHIPMENT;
-    this.status = data.status || IkasOrderStatus.CREATED;
+    this.shippingMethod = data.shippingMethod;
+    this.status = data.status;
     this.taxLines =
       data.taxLines?.map((tl) => new IkasOrderTaxLine(tl)) || null;
-    this.totalFinalPrice = data.totalFinalPrice ?? 0;
-    this.totalPrice = data.totalPrice ?? 0;
+    this.totalFinalPrice = data.totalFinalPrice;
+    this.totalPrice = data.totalPrice;
 
     this.refundSettings = data.refundSettings;
 
@@ -111,7 +104,6 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
       cancelReason: observable,
       cancelledAt: observable,
       currencyCode: observable,
-      currencySymbol: observable,
       customer: observable,
       customerId: observable,
       giftPackageLines: observable,
@@ -138,6 +130,7 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
 
       items: computed,
       itemCount: computed,
+      currencySymbol: computed,
       refundableItems: computed,
       unfullfilledItems: computed,
       refundedItems: computed,
@@ -164,20 +157,27 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
     return this.items?.length || 0;
   }
 
+  get currencySymbol() {
+    return getCurrencySymbol(this.currencyCode);
+  }
+
   get refundableItems() {
     if (!this.refundSettings) return [];
-    return IkasOrderFunctions.getRefundableItems(
-      this,
-      this.refundSettings
-    ) as IkasOrderLineItem[];
+    return IkasOrderFunctions.getRefundableItems(this, this.refundSettings).map(
+      (i) => new IkasOrderLineItem(i)
+    );
   }
 
   get unfullfilledItems() {
-    return IkasOrderFunctions.getUnfullfilledItems(this) as IkasOrderLineItem[];
+    return IkasOrderFunctions.getUnfullfilledItems(this).map(
+      (i) => new IkasOrderLineItem(i)
+    );
   }
 
   get refundedItems() {
-    return IkasOrderFunctions.getRefundedItems(this) as IkasOrderLineItem[];
+    return IkasOrderFunctions.getRefundedItems(this).map(
+      (i) => new IkasOrderLineItem(i)
+    );
   }
 
   get totalTax() {
@@ -185,11 +185,7 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
   }
 
   get formattedTotalTax() {
-    return formatCurrency(
-      this.totalTax,
-      this.currencyCode,
-      this.currencySymbol || ""
-    );
+    return formatMoney(this.totalTax, this.currencySymbol);
   }
 
   get shippingTotal() {
@@ -197,27 +193,15 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
   }
 
   get formattedShippingTotal() {
-    return formatCurrency(
-      this.shippingTotal,
-      this.currencyCode,
-      this.currencySymbol || ""
-    );
+    return formatMoney(this.shippingTotal, this.currencySymbol);
   }
 
   get formattedTotalFinalPrice() {
-    return formatCurrency(
-      this.totalFinalPrice,
-      this.currencyCode,
-      this.currencySymbol || ""
-    );
+    return formatMoney(this.totalFinalPrice, this.currencySymbol);
   }
 
   get formattedTotalPrice() {
-    return formatCurrency(
-      this.totalPrice,
-      this.currencyCode,
-      this.currencySymbol || ""
-    );
+    return formatMoney(this.totalPrice, this.currencySymbol);
   }
 
   get hasCustomer() {
@@ -237,17 +221,14 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
   }
 
   get couponAdjustment() {
-    return IkasOrderFunctions.getCouponAdjustment(this) as IkasOrderAdjustment;
+    const adjustment = IkasOrderFunctions.getCouponAdjustment(this);
+    return adjustment ? new IkasOrderAdjustment(adjustment) : undefined;
   }
 
   get nonCouponAdjustments() {
-    return IkasOrderFunctions.getNonCouponAdjustments(
-      this
-    ) as IkasOrderAdjustment[];
-  }
-
-  get isRefundEnabled() {
-    return !this.refundableItems.some((item) => item.refundQuantity === null);
+    return IkasOrderFunctions.getNonCouponAdjustments(this)?.map(
+      (a) => new IkasOrderAdjustment(a)
+    );
   }
 }
 

package/src/models/data/order/line-item/index.ts

@@ -8,7 +8,7 @@ import { IkasOrderLineItemOption } from "./option";
 import { IkasBaseModel } from "../../base";
 import { computed, makeObservable, observable } from "mobx";
 import { IkasOrderLineItemFunctions } from "@ikas/storefront-model-functions";
-import { formatCurrency } from "../../../../utils/currency";
+import { formatMoney, getCurrencySymbol } from "../../../../utils/currency";
 
 type IOrderLineItemConstructorParams = {
   refundQuantity?: number;
@@ -16,11 +16,9 @@ type IOrderLineItemConstructorParams = {
 
 export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
   currencyCode: string | null = null;
-  currencySymbol: string | null;
   discount: IkasOrderLineDiscount | null = null;
   discountPrice: number | null = null;
   finalPrice: number | null = null;
-  finalUnitPrice: number | null;
   options: IkasOrderLineItemOption[] | null = null;
   originalOrderLineItemId: string | null = null;
   price: number;
@@ -29,7 +27,6 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
   statusUpdatedAt: number | null = null;
   stockLocationId: string | null = null;
   taxValue: number | null = null;
-  unitPrice: number | null;
   variant: IkasOrderLineVariant;
   orderedAt: number;
 
@@ -40,23 +37,17 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
     super(data);
 
     this.currencyCode = data.currencyCode || null;
-    this.currencySymbol = data.currencySymbol || null;
     this.discount = data.discount
       ? new IkasOrderLineDiscount(data.discount)
       : null;
-    this.discountPrice = data.discountPrice ?? null;
-    this.finalPrice = data.finalPrice ?? null;
-    this.finalUnitPrice = data.finalUnitPrice ?? null;
-    this.options =
-      data.options?.map((o) => new IkasOrderLineItemOption(o)) || null;
-    this.originalOrderLineItemId = data.originalOrderLineItemId || null;
+    this.discountPrice = data.discountPrice || null;
+    this.finalPrice = data.finalPrice || null;
+    (this.options =
+      data.options?.map((o) => new IkasOrderLineItemOption(o)) || null),
+      (this.originalOrderLineItemId = data.originalOrderLineItemId || null);
     this.price = data.price;
     this.quantity = data.quantity;
     this.status = data.status;
-    this.statusUpdatedAt = data.statusUpdatedAt;
-    this.stockLocationId = data.stockLocationId;
-    this.taxValue = data.taxValue;
-    this.unitPrice = data.unitPrice ?? null;
     this.variant = new IkasOrderLineVariant(data.variant);
     this.orderedAt = data.orderedAt;
 
@@ -64,11 +55,9 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
 
     makeObservable(this, {
       currencyCode: observable,
-      currencySymbol: observable,
       discount: observable,
       discountPrice: observable,
       finalPrice: observable,
-      finalUnitPrice: observable,
       options: observable,
       originalOrderLineItemId: observable,
       price: observable,
@@ -77,19 +66,15 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
       statusUpdatedAt: observable,
       stockLocationId: observable,
       taxValue: observable,
-      unitPrice: observable,
       variant: observable,
       orderedAt: observable,
-      //@ts-ignore
-      _refundQuantity: observable,
 
+      currencySymbol: computed,
       priceWithQuantity: computed,
       formattedPriceWithQuantity: computed,
       overridenPriceWithQuantity: computed,
       formattedOverridenPriceWithQuantity: computed,
       formattedFinalPrice: computed,
-      formattedUnitPrice: computed,
-      formattedFinalUnitPrice: computed,
       formattedDiscountPrice: computed,
       finalPriceWithQuantity: computed,
       formattedFinalPriceWithQuantity: computed,
@@ -99,16 +84,16 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
     });
   }
 
+  get currencySymbol() {
+    return getCurrencySymbol(this.currencyCode || "");
+  }
+
   get priceWithQuantity() {
     return IkasOrderLineItemFunctions.getPriceWithQuantity(this);
   }
 
   get formattedPriceWithQuantity() {
-    return formatCurrency(
-      this.priceWithQuantity,
-      this.currencyCode || "",
-      this.currencySymbol || ""
-    );
+    return formatMoney(this.priceWithQuantity, this.currencySymbol);
   }
 
   get overridenPriceWithQuantity() {
@@ -116,53 +101,18 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
   }
 
   get formattedOverridenPriceWithQuantity() {
-    return formatCurrency(
+    return formatMoney(
       this.overridenPriceWithQuantity || 0,
-      this.currencyCode || "",
-      this.currencySymbol || ""
+      this.currencySymbol
     );
   }
 
   get formattedFinalPrice() {
-    return formatCurrency(
-      this.finalPrice || 0,
-      this.currencyCode || "",
-      this.currencySymbol || ""
-    );
-  }
-
-  get formattedUnitPrice() {
-    return formatCurrency(
-      this.unitPrice || 0,
-      this.currencyCode || "",
-      this.currencySymbol || ""
-    );
-  }
-
-  get formattedFinalUnitPrice() {
-    return formatCurrency(
-      this.finalUnitPrice || 0,
-      this.currencyCode || "",
-      this.currencySymbol || ""
-    );
-  }
-
-  get unitPriceText() {
-    if (this.finalUnitPrice === null) return;
-
-    return `${formatCurrency(
-      this.finalUnitPrice,
-      this.currencyCode || "",
-      this.currencySymbol || ""
-    )} / ${this.variant.baseUnit?.unit?.name || this.variant.baseUnit?.type}`;
+    return formatMoney(this.finalPrice || 0, this.currencySymbol);
   }
 
   get formattedDiscountPrice() {
-    return formatCurrency(
-      this.discountPrice || 0,
-      this.currencyCode || "",
-      this.currencySymbol || ""
-    );
+    return formatMoney(this.discountPrice || 0, this.currencySymbol);
   }
 
   get finalPriceWithQuantity() {
@@ -170,11 +120,7 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
   }
 
   get formattedFinalPriceWithQuantity() {
-    return formatCurrency(
-      this.finalPriceWithQuantity || 0,
-      this.currencyCode || "",
-      this.currencySymbol || ""
-    );
+    return formatMoney(this.finalPriceWithQuantity || 0, this.currencySymbol);
   }
 
   get tax() {
@@ -182,11 +128,7 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
   }
 
   get formattedTax() {
-    return formatCurrency(
-      this.tax,
-      this.currencyCode || "",
-      this.currencySymbol || ""
-    );
+    return formatMoney(this.tax, this.currencySymbol);
   }
 
   get refundQuantity() {

package/src/models/data/order/line-item/variant/index.ts

@@ -6,12 +6,9 @@ import { IkasOrderLineVariantBrand } from "./brand";
 import { IkasOrderLineVariantCategory } from "./category";
 import { IkasOrderLineVariantPrice } from "./price";
 import { makeAutoObservable } from "mobx";
-import { IkasOrderLineVariantUnit } from "./unit";
-import { IkasOrderLineBaseUnit } from "../base-unit";
 
 export class IkasOrderLineVariant implements IOrderLineVariant {
   barcodeList: string[] | null = null;
-  baseUnit: IkasOrderLineBaseUnit | null;
   brand: IkasOrderLineVariantBrand | null = null;
   categories: IkasOrderLineVariantCategory[] | null = null;
   id: string | null = null;
@@ -24,7 +21,6 @@ export class IkasOrderLineVariant implements IOrderLineVariant {
   tagIds: string[] | null = null;
   taxValue: number | null = null;
   type: number | null = null;
-  unit: IkasOrderLineVariantUnit | null;
   weight: number | null = null;
   variantValues: IkasOrderLineVariantVariantValue[] | null = null;
 
@@ -33,9 +29,6 @@ export class IkasOrderLineVariant implements IOrderLineVariant {
 
   constructor(data: IOrderLineVariant) {
     this.barcodeList = data.barcodeList || null;
-    this.baseUnit = data.baseUnit
-      ? new IkasOrderLineBaseUnit(data.baseUnit)
-      : null;
     this.brand = data.brand ? new IkasOrderLineVariantBrand(data.brand) : null;
     this.categories =
       data.categories?.map((c) => new IkasOrderLineVariantCategory(c)) || null;
@@ -50,7 +43,6 @@ export class IkasOrderLineVariant implements IOrderLineVariant {
     this.tagIds = data.tagIds || null;
     this.taxValue = data.taxValue || null;
     this.type = data.type || null;
-    this.unit = data.unit ? new IkasOrderLineVariantUnit(data.unit) : null;
     this.weight = data.weight || null;
     this.variantValues =
       data.variantValues?.map(

package/src/models/data/order/line-item/variant/price/index.ts

@@ -7,7 +7,6 @@ export class IkasOrderLineVariantPrice implements IOrderLineVariantPrice {
   discountPrice: number | null = null;
   priceListId: string | null = null;
   sellPrice: number;
-  unitPrice: number | null;
 
   constructor(data: IOrderLineVariantPrice) {
     this.buyPrice = data.buyPrice || null;
@@ -15,7 +14,6 @@ export class IkasOrderLineVariantPrice implements IOrderLineVariantPrice {
     this.discountPrice = data.discountPrice || null;
     this.priceListId = data.priceListId || null;
     this.sellPrice = data.sellPrice;
-    this.unitPrice = data.unitPrice;
 
     makeAutoObservable(this);
   }

package/src/models/data/order/line-item/variant/value/index.ts

@@ -16,7 +16,7 @@ export class IkasOrderLineVariantVariantValue
     this.variantTypeId = data.variantTypeId;
     this.variantTypeName = data.variantTypeName || null;
     this.variantValueId = data.variantValueId;
-    this.variantValueName = data.variantValueName || null;
+    this.variantTypeName = data.variantTypeName || null;
 
     makeAutoObservable(this);
   }

package/src/models/data/order/transaction/index.ts

@@ -5,6 +5,7 @@ import {
   IkasOrderTransaction as IOrderTransaction,
 } from "@ikas/storefront-models";
 import { makeAutoObservable } from "mobx";
+import { getCurrencySymbol } from "../../../../utils/currency";
 import { IkasTransactionError } from "./error";
 import { IkasTransactionPaymentMethodDetail } from "./payment-method-detail";
 
@@ -13,7 +14,6 @@ export class IkasOrderTransaction implements IOrderTransaction {
   checkoutId: string | null;
   createdAt: number | null;
   currencyCode: string | null;
-  currencySymbol: string | null;
   customerId: string | null;
   error: IkasTransactionError | null;
   id: string | null;
@@ -33,7 +33,6 @@ export class IkasOrderTransaction implements IOrderTransaction {
     this.checkoutId = data.checkoutId || null;
     this.createdAt = data.createdAt || null;
     this.currencyCode = data.currencyCode || null;
-    this.currencySymbol = data.currencySymbol || null;
     this.customerId = data.customerId || null;
     this.error = data.error ? new IkasTransactionError(data.error) : null;
     this.id = data.id;
@@ -50,6 +49,10 @@ export class IkasOrderTransaction implements IOrderTransaction {
 
     makeAutoObservable(this);
   }
+
+  get currencySymbol() {
+    return getCurrencySymbol(this.currencyCode || "");
+  }
 }
 
 export { IkasTransactionStatus, IkasTransactionType };

package/src/models/data/product/attribute-value/index.ts

@@ -5,11 +5,9 @@ import {
   IkasProductAttributeValue as IProductAttributeValue,
   IkasAttributeTableCellValue as IAttributeTableCellValue,
   IkasProductAttributeMap as IProductAttributeMap,
-  IkasProductAttributeType,
 } from "@ikas/storefront-models";
 import { makeAutoObservable } from "mobx";
 import { IkasProductAttributeValueFunctions } from "@ikas/storefront-model-functions";
-import ProductStore from "../../../../store/product";
 
 export class IkasProductAttributeValue implements IProductAttributeValue {
   imageIds: string[] | null = null;
@@ -42,44 +40,6 @@ export class IkasProductAttributeValue implements IProductAttributeValue {
   get tableValue() {
     return IkasProductAttributeValueFunctions.getTableValue(this.value);
   }
-
-  get productIds() {
-    if (
-      this.productAttribute?.type !== IkasProductAttributeType.PRODUCT ||
-      !this.value
-    ) {
-      return [];
-    }
-
-    try {
-      return JSON.parse(this.value) as string[];
-    } catch (err) {
-      console.error(err);
-      return [];
-    }
-  }
-
-  async getProducts() {
-    if (
-      this.productAttribute?.type !== IkasProductAttributeType.PRODUCT ||
-      !this.value
-    ) {
-      return [];
-    }
-
-    try {
-      const response = await ProductStore.searchProducts({
-        input: {
-          productIdList: this.productIds,
-        },
-      });
-
-      return response.data?.data || [];
-    } catch (err) {
-      console.error(err);
-      return [];
-    }
-  }
 }
 
 export class IkasAttributeTableCellValue implements IAttributeTableCellValue {

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

@@ -160,7 +160,7 @@ export class IkasApplicableProductFilterValue
   resultCount?: number | null;
 
   // Extra
-  isSelected: boolean;
+  private _isSelected: boolean;
 
   constructor(data: IApplicableProductFilterValue) {
     this.id = data.id || "";
@@ -174,7 +174,7 @@ export class IkasApplicableProductFilterValue
         isVideo: false,
       });
 
-    this.isSelected = data.isSelected || false;
+    this._isSelected = data.isSelected || false;
     this.resultCount =
       data.resultCount !== undefined && data.resultCount !== null
         ? data.resultCount
@@ -182,6 +182,17 @@ export class IkasApplicableProductFilterValue
 
     makeAutoObservable(this);
   }
+
+  get isSelected() {
+    return this._isSelected;
+  }
+
+  toJSON() {
+    return {
+      ...this,
+      isSelected: this._isSelected,
+    };
+  }
 }
 
 export class IkasProductFilterValue implements IProductFilterValue {
@@ -205,14 +216,12 @@ export class IkasProductFilterSettings implements IProductFilterSettings {
   showCollapsedOnDesktop: boolean;
   showCollapsedOnMobile: boolean;
   sortType: IkasProductFilterSortType;
-  customSortedValues: string[] | null;
 
   constructor(data: Partial<IkasProductFilterSettings>) {
     this.useAndFilter = data.useAndFilter || false;
     this.showCollapsedOnDesktop = data.showCollapsedOnDesktop || false;
     this.showCollapsedOnMobile = data.showCollapsedOnMobile || false;
     this.sortType = data.sortType || IkasProductFilterSortType.ALPHABETICAL_ASC;
-    this.customSortedValues = data.customSortedValues || null;
 
     makeAutoObservable(this);
   }