@ikas/storefront 4.0.0-alpha.3 → 4.0.0-alpha.31

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

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { observer } from "mobx-react-lite";
 import CheckoutViewModel from "../../model";
-import { formatMoney, useTranslation } from "../../../../utils";
+import { formatCurrency, useTranslation } from "../../../../utils";
 
 import styles from "./style.module.scss";
 import { Button } from "../../components/button";
@@ -59,7 +59,11 @@ const ShippingMethods: React.FC<CommonProps> = observer(({ vm }) => {
             <div className={styles.ShippingPrice}>
               {asm.price === 0
                 ? t("checkout-page:free")
-                : formatMoney(asm.price, vm.checkout.currencyCode)}
+                : formatCurrency(
+                    asm.price,
+                    vm.checkout.currencyCode,
+                    vm.checkout.currencySymbol
+                  )}
             </div>
           }
           onClick={() => vm.onShippingMethodChange(asm)}
@@ -95,9 +99,10 @@ const GiftPackage: React.FC<CommonProps> = observer(({ vm }) => {
   const checkboxLabel =
     t("checkout-page:giftPackageCta") +
     (giftPackagePrice && giftPackagePrice.price
-      ? ` (+ ${formatMoney(
+      ? ` (+ ${formatCurrency(
           giftPackagePrice!.price,
-          giftPackagePrice!.currencyCode
+          giftPackagePrice!.currencyCode,
+          giftPackagePrice!.currencySymbol
         )})`
       : "");
 

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

@@ -11,7 +11,7 @@ import SVGAmex from "../../components/credit-card-form/svg/amex";
 import SVGMasterCard from "../../components/credit-card-form/svg/master-card";
 import SVGTroy from "../../components/credit-card-form/svg/troy";
 import SVGVisa from "../../components/credit-card-form/svg/visa";
-import { formatMoney, useTranslation } from "../../../../utils";
+import { formatCurrency, useTranslation } from "../../../../utils";
 import { IkasOrderPackageStatus } from "../../../../models";
 import {
   IkasPaymentGatewayType,
@@ -125,9 +125,10 @@ export const StepSuccess: React.FC<Props> = observer(({ vm }) => {
                       null && (
                       <div className={styles.InfoText}>{`${
                         paymentMethodDetail.installment.installmentCount
-                      } x ${formatMoney(
+                      } x ${formatCurrency(
                         paymentMethodDetail.installment.installmentPrice,
-                        vm.checkout.currencyCode
+                        vm.checkout.currencyCode,
+                        vm.checkout.currencySymbol
                       )}`}</div>
                     )}
                   </React.Fragment>

package/src/components/page/head.tsx

@@ -251,6 +251,18 @@ function createStoreSchema(merchantSettings: IkasMerchantSettings) {
     logo: logo,
     image: logo,
     url: "https://" + IkasStorefrontConfig.getDomain(),
+    telephone: merchantSettings?.phone,
+    address: {
+      "@type": "PostalAddress",
+      streetAddress: merchantSettings.address?.addressLine1,
+      addressLocality: merchantSettings.address?.city?.name,
+      ...(merchantSettings.address &&
+        merchantSettings.address.state && {
+          addressRegion: merchantSettings.address.state.code,
+        }),
+      postalCode: merchantSettings.address?.postalCode,
+      addressCountry: merchantSettings.address?.country?.code,
+    },
   };
 }
 

package/src/components/page/index.tsx

@@ -19,6 +19,7 @@ import { ThemeComponent } from "./ThemeComponent";
 import { IkasBaseStore } from "../../store";
 import { initIkasEvents } from "../../analytics/events";
 import { IkasPageDataInit } from "../../page-data-init";
+import { setAPIClientConfig } from "@ikas/storefront-api";
 
 export type IkasPageProps = {
   propValues: IkasPageComponentPropValue[];
@@ -55,15 +56,16 @@ export const IkasPage: React.FC<IkasPageProps> = observer(
     productReviewSummary,
   }) => {
     const router = useRouter();
-    const store = IkasBaseStore.getInstance();
-    store.router = router;
 
     IkasStorefrontConfig.init({
       ...configJson,
       currentPageComponents: components,
     });
     IkasBaseStore.getInstance().router = router;
+    setAPIClientConfig();
 
+    const store = IkasBaseStore.getInstance();
+    store.router = router;
     store.currentPageType = pageType;
 
     const [isBrowser, setIsBrowser] = React.useState(false);

package/src/components/page-editor/model.ts

@@ -23,6 +23,7 @@ import HtmlMetaDataStore from "../../store/html-meta-data";
 import BlogStore from "../../store/blog";
 import RaffleStore from "../../store/raffle";
 import ProductStore from "../../store/product";
+import { setAPIClientConfig } from "@ikas/storefront-api";
 
 const PACKAGE_VERSION = "2.0.20";
 // import { version as PACKAGE_VERSION } from "../../../package.json";
@@ -565,7 +566,13 @@ export default class IkasPageEditorViewModel {
         translations: this.translations || {},
         isEditor: true,
         apiKey: data.apiKey,
+        apiUrl: data.apiUrl,
+        adminApiUrl: data.adminApiUrl,
+        cdnUrl: data.cdnUrl,
+        merchantSettings: data.merchantSettings,
       });
+
+      setAPIClientConfig();
     }
 
     // (window as any).editorApiKey = data.apiKey;
@@ -618,8 +625,6 @@ export default class IkasPageEditorViewModel {
     await this.pageDataProvider.setLinkSlugs();
 
     if (pageComponentPropValues) {
-      pageComponentPropValues.propValues[propName] = propValue;
-
       if (prop.type === IkasThemeJsonComponentPropType.CUSTOM) {
         IkasPageDataInit.initCustomDataPropValue(
           prop,
@@ -650,6 +655,12 @@ export default class IkasPageEditorViewModel {
           propValue,
           pageComponentPropValues
         );
+      } else if (prop.type === IkasThemeJsonComponentPropType.PRODUCT_LIST) {
+        IkasPageDataInit.initProductListPropValue(
+          prop,
+          propValue,
+          pageComponentPropValues
+        );
       } else if (prop.type === IkasThemeJsonComponentPropType.CATEGORY) {
         IkasPageDataInit.initCategoryPropValue(
           prop,
@@ -689,6 +700,8 @@ export default class IkasPageEditorViewModel {
           propValue,
           pageComponentPropValues
         );
+      } else {
+        pageComponentPropValues.propValues[propName] = propValue;
       }
     }
   };

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

@@ -2,7 +2,7 @@ import { IkasCart } from "../cart";
 import { IkasCheckout as ICheckout } from "@ikas/storefront-models";
 import { IkasCheckoutFunctions } from "@ikas/storefront-model-functions";
 import { IkasPaymentGateway } from "../payment-gateway";
-import { formatMoney } from "../../../utils/currency";
+import { formatCurrency } from "../../../utils/currency";
 import { computed, makeObservable, observable } from "mobx";
 import { formatDate } from "../../../utils/helper";
 
@@ -44,7 +44,11 @@ export class IkasCheckout extends IkasCart implements ICheckout {
   }
 
   get $formattedTotalFinalPrice() {
-    return formatMoney(this.$totalFinalPrice, this.currencySymbol);
+    return formatCurrency(
+      this.$totalFinalPrice,
+      this.currencyCode,
+      this.currencySymbol
+    );
   }
 
   get dateStr() {

package/src/models/data/checkout-settings/price/index.ts

@@ -3,10 +3,12 @@ import { makeAutoObservable } from "mobx";
 
 export class IkasCheckoutSettingsPrice implements ICheckoutSettingsPrice {
   currencyCode: string;
+  currencySymbol: string | null;
   price: number;
 
   constructor(data: ICheckoutSettingsPrice) {
     this.currencyCode = data.currencyCode;
+    this.currencySymbol = data.currencySymbol || null;
     this.price = data.price;
 
     makeAutoObservable(this);

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

@@ -1,15 +1,18 @@
 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;
@@ -19,6 +22,9 @@ 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;
 
     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 { formatMoney, getCurrencySymbol } from "../../../utils/currency";
+import { formatCurrency } from "../../../utils/currency";
 
 type IOrderConstructorData = {
   refundSettings?: IkasOrderRefundSettings | null;
@@ -31,6 +31,7 @@ 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;
@@ -66,6 +67,7 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
     this.cancelReason = data.cancelReason || null;
     this.cancelledAt = data.cancelledAt || null;
     this.currencyCode = data.currencyCode;
+    this.currencySymbol = data.currencySymbol || null;
     this.customer = data.customer ? new IkasOrderCustomer(data.customer) : null;
     this.customerId = data.customerId || null;
     this.giftPackageLines =
@@ -104,6 +106,7 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
       cancelReason: observable,
       cancelledAt: observable,
       currencyCode: observable,
+      currencySymbol: observable,
       customer: observable,
       customerId: observable,
       giftPackageLines: observable,
@@ -130,7 +133,6 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
 
       items: computed,
       itemCount: computed,
-      currencySymbol: computed,
       refundableItems: computed,
       unfullfilledItems: computed,
       refundedItems: computed,
@@ -157,10 +159,6 @@ 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).map(
@@ -185,7 +183,11 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
   }
 
   get formattedTotalTax() {
-    return formatMoney(this.totalTax, this.currencySymbol);
+    return formatCurrency(
+      this.totalTax,
+      this.currencyCode,
+      this.currencySymbol || ""
+    );
   }
 
   get shippingTotal() {
@@ -193,15 +195,27 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
   }
 
   get formattedShippingTotal() {
-    return formatMoney(this.shippingTotal, this.currencySymbol);
+    return formatCurrency(
+      this.shippingTotal,
+      this.currencyCode,
+      this.currencySymbol || ""
+    );
   }
 
   get formattedTotalFinalPrice() {
-    return formatMoney(this.totalFinalPrice, this.currencySymbol);
+    return formatCurrency(
+      this.totalFinalPrice,
+      this.currencyCode,
+      this.currencySymbol || ""
+    );
   }
 
   get formattedTotalPrice() {
-    return formatMoney(this.totalPrice, this.currencySymbol);
+    return formatCurrency(
+      this.totalPrice,
+      this.currencyCode,
+      this.currencySymbol || ""
+    );
   }
 
   get hasCustomer() {

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 { formatMoney, getCurrencySymbol } from "../../../../utils/currency";
+import { formatCurrency } from "../../../../utils/currency";
 
 type IOrderLineItemConstructorParams = {
   refundQuantity?: number;
@@ -16,6 +16,7 @@ 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;
@@ -37,6 +38,7 @@ 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;
@@ -55,6 +57,7 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
 
     makeObservable(this, {
       currencyCode: observable,
+      currencySymbol: observable,
       discount: observable,
       discountPrice: observable,
       finalPrice: observable,
@@ -69,7 +72,6 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
       variant: observable,
       orderedAt: observable,
 
-      currencySymbol: computed,
       priceWithQuantity: computed,
       formattedPriceWithQuantity: computed,
       overridenPriceWithQuantity: computed,
@@ -84,16 +86,16 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
     });
   }
 
-  get currencySymbol() {
-    return getCurrencySymbol(this.currencyCode || "");
-  }
-
   get priceWithQuantity() {
     return IkasOrderLineItemFunctions.getPriceWithQuantity(this);
   }
 
   get formattedPriceWithQuantity() {
-    return formatMoney(this.priceWithQuantity, this.currencySymbol);
+    return formatCurrency(
+      this.priceWithQuantity,
+      this.currencyCode || "",
+      this.currencySymbol || ""
+    );
   }
 
   get overridenPriceWithQuantity() {
@@ -101,18 +103,27 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
   }
 
   get formattedOverridenPriceWithQuantity() {
-    return formatMoney(
+    return formatCurrency(
       this.overridenPriceWithQuantity || 0,
-      this.currencySymbol
+      this.currencyCode || "",
+      this.currencySymbol || ""
     );
   }
 
   get formattedFinalPrice() {
-    return formatMoney(this.finalPrice || 0, this.currencySymbol);
+    return formatCurrency(
+      this.finalPrice || 0,
+      this.currencyCode || "",
+      this.currencySymbol || ""
+    );
   }
 
   get formattedDiscountPrice() {
-    return formatMoney(this.discountPrice || 0, this.currencySymbol);
+    return formatCurrency(
+      this.discountPrice || 0,
+      this.currencyCode || "",
+      this.currencySymbol || ""
+    );
   }
 
   get finalPriceWithQuantity() {
@@ -120,7 +131,11 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
   }
 
   get formattedFinalPriceWithQuantity() {
-    return formatMoney(this.finalPriceWithQuantity || 0, this.currencySymbol);
+    return formatCurrency(
+      this.finalPriceWithQuantity || 0,
+      this.currencyCode || "",
+      this.currencySymbol || ""
+    );
   }
 
   get tax() {
@@ -128,7 +143,11 @@ export class IkasOrderLineItem extends IkasBaseModel implements IOrderLineItem {
   }
 
   get formattedTax() {
-    return formatMoney(this.tax, this.currencySymbol);
+    return formatCurrency(
+      this.tax,
+      this.currencyCode || "",
+      this.currencySymbol || ""
+    );
   }
 
   get refundQuantity() {

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

@@ -5,7 +5,6 @@ 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";
 
@@ -14,6 +13,7 @@ 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,6 +33,7 @@ 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;
@@ -49,10 +50,6 @@ export class IkasOrderTransaction implements IOrderTransaction {
 
     makeAutoObservable(this);
   }
-
-  get currencySymbol() {
-    return getCurrencySymbol(this.currencyCode || "");
-  }
 }
 
 export { IkasTransactionStatus, IkasTransactionType };

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

@@ -1,11 +1,12 @@
 import { IkasProductPriceFunctions } from "@ikas/storefront-model-functions";
 import { IkasProductPrice as IProductPrice } from "@ikas/storefront-models";
 import { makeAutoObservable } from "mobx";
-import { getCurrencySymbol, formatMoney } from "../../../../../utils/currency";
+import { formatCurrency } from "../../../../../utils/currency";
 
 export class IkasProductPrice implements IProductPrice {
   buyPrice: number | null = null;
   currency: string | null = null;
+  currencySymbol: string | null = null;
   discountPrice: number | null = null;
   priceListId: string | null = null;
   sellPrice: number;
@@ -13,6 +14,7 @@ export class IkasProductPrice implements IProductPrice {
   constructor(data?: IProductPrice) {
     this.buyPrice = data?.buyPrice ?? null;
     this.currency = data?.currency ?? null;
+    this.currencySymbol = data?.currencySymbol ?? "";
     this.discountPrice = data?.discountPrice ?? null;
     this.priceListId = data?.priceListId ?? null;
     this.sellPrice = data?.sellPrice ?? 0;
@@ -20,28 +22,40 @@ export class IkasProductPrice implements IProductPrice {
     makeAutoObservable(this);
   }
 
-  get currencySymbol() {
-    return getCurrencySymbol(this.currency || "");
-  }
-
   get finalPrice() {
     return IkasProductPriceFunctions.getFinalPrice(this);
   }
 
   get formattedFinalPrice() {
-    return formatMoney(this.finalPrice, this.currencySymbol);
+    return formatCurrency(
+      this.finalPrice,
+      this.currency || "",
+      this.currencySymbol || ""
+    );
   }
 
   get formattedBuyPrice() {
-    return formatMoney(this.buyPrice || 0, this.currencySymbol);
+    return formatCurrency(
+      this.buyPrice || 0,
+      this.currency || "",
+      this.currencySymbol || ""
+    );
   }
 
   get formattedDiscountPrice() {
-    return formatMoney(this.discountPrice || 0, this.currencySymbol);
+    return formatCurrency(
+      this.discountPrice || 0,
+      this.currency || "",
+      this.currencySymbol || ""
+    );
   }
 
   get formattedSellPrice() {
-    return formatMoney(this.sellPrice || 0, this.currencySymbol);
+    return formatCurrency(
+      this.sellPrice || 0,
+      this.currency || "",
+      this.currencySymbol || ""
+    );
   }
 
   get hasDiscount() {

package/src/models/data/product/variant-type/index.ts

@@ -3,10 +3,12 @@ import { IkasProductVariantType as IProductVariantType } from "@ikas/storefront-
 import { makeAutoObservable } from "mobx";
 
 export class IkasProductVariantType implements IProductVariantType {
+  order: number;
   variantType: IkasVariantType;
   variantValueIds: string[];
 
   constructor(data: Partial<IkasProductVariantType>) {
+    this.order = data.order || 0;
     this.variantType = data.variantType
       ? new IkasVariantType(data.variantType)
       : new IkasVariantType();

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

@@ -8,6 +8,7 @@ import {
   IkasRaffleAppliedProduct as IRaffleAppliedProduct,
   IkasRaffleVerificationType,
   IkasRaffleMetadataTargetType,
+  IkasRaffleParticipantStatus,
 } from "@ikas/storefront-models";
 import { IkasRaffleFunctions } from "@ikas/storefront-model-functions";
 
@@ -33,13 +34,12 @@ export class IkasRaffle implements IRaffle {
   dateRange: IkasRaffleDateRangeField | null;
   metadata: IkasRaffleMetaData | null;
   name: string;
-  participantCount?: number | null;
   requiredCustomerAccount: boolean;
   status: boolean;
   variants: IkasRaffleAppliedProduct[] | null;
-  products: IkasProduct[];
   verificationType: IkasRaffleVerificationType;
-  isCustomerWinner: boolean | null;
+
+  products: IkasProduct[];
 
   constructor(data: Partial<IkasRaffle> = {}) {
     this.id = data.id || Date.now() + "";
@@ -47,12 +47,10 @@ export class IkasRaffle implements IRaffle {
     this.updatedAt = data.updatedAt || Date.now();
     this.deleted = data.deleted || null;
     this.name = data.name || "";
-    this.participantCount = data.participantCount || 0;
     this.requiredCustomerAccount = data.requiredCustomerAccount || false;
     this.status = data.status || false;
     this.verificationType =
       data.verificationType || IkasRaffleVerificationType.EMAIL;
-    this.isCustomerWinner = data.isCustomerWinner || null;
 
     this.dateRange = data.dateRange
       ? new IkasRaffleDateRangeField(data.dateRange)
@@ -113,8 +111,10 @@ export class IkasRaffleParticipant implements IRaffleParticipant {
   email: string;
   applicationDate: number;
   phone: string | null = null;
-  isWinner: boolean | null = null;
+  isDeliveredCargo: boolean | null;
 
+  raffle: IkasRaffle;
+  status: IkasRaffleParticipantStatus | null;
   extraData: Record<string, any> | null = null;
   appliedProduct: IkasRaffleAppliedProduct;
 
@@ -131,8 +131,10 @@ export class IkasRaffleParticipant implements IRaffleParticipant {
     this.email = data.email || "";
     this.applicationDate = data.applicationDate || 0;
     this.phone = data.phone || null;
-    this.isWinner = data.isWinner || null;
+    this.isDeliveredCargo = data.isDeliveredCargo || false;
 
+    this.raffle = new IkasRaffle(data.raffle);
+    this.status = data.status || null;
     this.extraData = data.extraData || {};
     this.appliedProduct = new IkasRaffleAppliedProduct(
       data.appliedProduct || {}

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

@@ -20,6 +20,7 @@ export class IkasStorefront implements IStorefront {
   analytics4Id: string | null;
   universalAnalyticsId: string | null;
   tiktokPixelId: string | null;
+  token: string | null;
 
   localizations: IkasStorefrontLocalization[];
   routings: IkasStorefrontRouting[];
@@ -40,6 +41,7 @@ export class IkasStorefront implements IStorefront {
     this.analytics4Id = data.analytics4Id || null;
     this.universalAnalyticsId = data.universalAnalyticsId || null;
     this.tiktokPixelId = data.tiktokPixelId || null;
+    this.token = data.token || null;
 
     // Sub Models
     this.localizations = data.localizations

package/src/models/ui/product-list/index.ts

@@ -221,12 +221,6 @@ export class IkasProductList {
 
   get filterQueryParams() {
     const queryParams: Record<string, any> = {};
-    const _getQueryParams = this.getQueryParams();
-    if (_getQueryParams) {
-      _getQueryParams.forEach((value, key) => {
-        queryParams[key] = value;
-      });
-    }
 
     this.filters?.forEach((f) => {
       if (f.keyList.length) queryParams[f.key] = f.keyList;

package/src/models/ui/raffle-list/index.ts

@@ -75,7 +75,7 @@ export class IkasRaffleList {
   }
 
   private async getRaffleList(page: number, limit: number) {
-    const response = await RaffleStore.listRaffle({
+    const response = await RaffleStore.listStorefrontRaffle({
       start: this._start ? { eq: this._start } : undefined,
       end: this._end ? { eq: this._end } : undefined,
       includeDeleted: this._includeDeleted || false,