@ikas/storefront 4.0.0-alpha.29 → 4.0.0-alpha.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront",
-  "version": "4.0.0-alpha.29",
+  "version": "4.0.0-alpha.30",
   "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.29",
-    "@ikas/storefront-config": "^4.0.0-alpha.29",
-    "@ikas/storefront-model-functions": "^4.0.0-alpha.29",
-    "@ikas/storefront-models": "^4.0.0-alpha.29",
-    "@ikas/storefront-providers": "^4.0.0-alpha.29",
+    "@ikas/storefront-api": "^4.0.0-alpha.30",
+    "@ikas/storefront-config": "^4.0.0-alpha.30",
+    "@ikas/storefront-model-functions": "^4.0.0-alpha.30",
+    "@ikas/storefront-models": "^4.0.0-alpha.30",
+    "@ikas/storefront-providers": "^4.0.0-alpha.30",
     "@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.29",
-    "@ikas/storefront-config": "^4.0.0-alpha.29",
-    "@ikas/storefront-model-functions": "^4.0.0-alpha.29",
-    "@ikas/storefront-models": "^4.0.0-alpha.29",
-    "@ikas/storefront-providers": "^4.0.0-alpha.29",
+    "@ikas/storefront-api": "^4.0.0-alpha.30",
+    "@ikas/storefront-config": "^4.0.0-alpha.30",
+    "@ikas/storefront-model-functions": "^4.0.0-alpha.30",
+    "@ikas/storefront-models": "^4.0.0-alpha.30",
+    "@ikas/storefront-providers": "^4.0.0-alpha.30",
     "mobx": "^6.1.3",
     "mobx-react-lite": "^3.1.5",
     "next": "12.2.0",

package/src/components/checkout/components/cart-summary/cart-item/index.tsx

@@ -4,7 +4,11 @@ import {
   IkasOrderLineItem,
   IkasProductOptionType,
 } from "../../../../../models";
-import { formatDate, formatMoney, useTranslation } from "../../../../../utils";
+import {
+  formatDate,
+  formatCurrency,
+  useTranslation,
+} from "../../../../../utils";
 import CheckoutViewModel from "../../../../../components/checkout/model";
 import { Modal } from "../../modal";
 
@@ -159,19 +163,17 @@ export const CartItem: React.FC<Props> = observer(
             {!!cartItem.overridenPriceWithQuantity && (
               <span className={styles.GrayPrice}>
                 {!!adjustmentTotal
-                  ? formatMoney(cartItem.finalPriceWithQuantity, currencyCode)
-                  : formatMoney(
-                      cartItem.overridenPriceWithQuantity,
-                      currencyCode
-                    )}
+                  ? cartItem.formattedFinalPriceWithQuantity
+                  : cartItem.formattedOverridenPriceWithQuantity}
               </span>
             )}
             {!!adjustmentTotal
-              ? formatMoney(
+              ? formatCurrency(
                   cartItem.finalPriceWithQuantity - adjustmentTotal,
-                  currencyCode
+                  currencyCode,
+                  cartItem.currencySymbol
                 )
-              : formatMoney(cartItem.finalPriceWithQuantity, currencyCode)}
+              : cartItem.formattedFinalPriceWithQuantity}
           </div>
         </div>
       </div>

package/src/components/checkout/components/cart-summary/index.tsx

@@ -5,7 +5,7 @@ import _sortBy from "lodash/sortBy";
 import InputWithButton from "../input-with-button";
 import NotificationBox from "../notification-box";
 import CheckoutViewModel, { CheckoutStep } from "../../model";
-import { formatMoney, useTranslation } from "../../../../utils";
+import { formatCurrency, useTranslation } from "../../../../utils";
 import { CartItem } from "./cart-item";
 import { FormItem } from "../form-item";
 import { FormItemType } from "../form-item/model";
@@ -95,9 +95,13 @@ export const CartSummary: React.FC<Props> = observer(({ vm, allowExpand }) => {
             <div className={styles.Left}>{t("checkout-page:summary")}</div>
             <div className={styles.Price}>
               <span className={styles.PriceText}>
-                {`${formatMoney(vm.finalPrice || 0, checkout.currencyCode)} (${
-                  checkout.items.length
-                } ${t("checkout-page:cartItemProduct")})`}
+                {`${formatCurrency(
+                  vm.finalPrice || 0,
+                  checkout.currencyCode,
+                  checkout.currencySymbol
+                )} (${checkout.items.length} ${t(
+                  "checkout-page:cartItemProduct"
+                )})`}
               </span>
               <span className={arrowDownClasses}>
                 <SVGArrowDown />
@@ -132,7 +136,7 @@ export const CartSummary: React.FC<Props> = observer(({ vm, allowExpand }) => {
               )}
               <InfoRow
                 label={t("checkout-page:subtotal")}
-                value={formatMoney(checkout.totalPrice, checkout.currencyCode)}
+                value={checkout.formattedTotalPrice}
                 tooltipText={t("checkout-page:subtotalTooltip")}
               />
               {!!checkout.shippingLines?.length && (
@@ -140,10 +144,7 @@ export const CartSummary: React.FC<Props> = observer(({ vm, allowExpand }) => {
                   label={t("checkout-page:cartShippingTitle")}
                   value={
                     checkout.shippingTotal
-                      ? formatMoney(
-                          checkout.shippingTotal,
-                          checkout.currencyCode
-                        )
+                      ? checkout.formattedShippingTotal
                       : t("checkout-page:free")
                   }
                 />
@@ -151,15 +152,16 @@ export const CartSummary: React.FC<Props> = observer(({ vm, allowExpand }) => {
               {!!checkout.totalTax && !!vm.customizationProps?.showTax && (
                 <InfoRow
                   label={t("checkout-page:cartTaxTitle")}
-                  value={formatMoney(checkout.totalTax, checkout.currencyCode)}
+                  value={checkout.formattedTotalTax}
                 />
               )}
               {!!vm.installmentExtraPrice && (
                 <InfoRow
                   label={t("checkout-page:cartInterest")}
-                  value={formatMoney(
+                  value={formatCurrency(
                     vm.installmentExtraPrice,
-                    checkout.currencyCode
+                    checkout.currencyCode,
+                    checkout.currencySymbol
                   )}
                 />
               )}
@@ -193,7 +195,11 @@ export const CartSummary: React.FC<Props> = observer(({ vm, allowExpand }) => {
                 <div className={styles.Title}>{t("checkout-page:total")}</div>
               </div>
               <div className={styles.TotalPrice}>
-                {formatMoney(vm.finalPrice || 0, checkout.currencyCode)}
+                {formatCurrency(
+                  vm.finalPrice || 0,
+                  checkout.currencyCode,
+                  checkout.currencySymbol
+                )}
               </div>
             </div>
 
@@ -273,7 +279,11 @@ const Adjustments: React.FC<CommonProps> = observer(({ vm }) => {
             <div className={styles.Value}>
               <span>{adjustment.type === "DECREMENT" ? "- " : ""}</span>{" "}
               <span>
-                {formatMoney(adjustment.amount, vm.checkout.currencyCode)}
+                {formatCurrency(
+                  adjustment.amount,
+                  vm.checkout.currencyCode,
+                  vm.checkout.currencySymbol
+                )}
               </span>
             </div>
           </div>
@@ -304,7 +314,11 @@ const CalculatedAdditionalPrices: React.FC<CommonProps> = observer(({ vm }) => {
               <div className={styles.Value}>
                 <span>{adjustment.type === "DECREMENT" ? "- " : ""}</span>{" "}
                 <span>
-                  {formatMoney(adjustment.amount, vm.checkout!.currencyCode)}
+                  {formatCurrency(
+                    adjustment.amount,
+                    vm.checkout!.currencyCode,
+                    vm.checkout!.currencySymbol
+                  )}
                 </span>
               </div>
             </div>
@@ -318,7 +332,13 @@ const CalculatedAdditionalPrices: React.FC<CommonProps> = observer(({ vm }) => {
             </div>
           </div>
           <div className={styles.Value}>
-            <span>{formatMoney(gpl.price, vm.checkout.currencyCode)}</span>
+            <span>
+              {formatCurrency(
+                gpl.price,
+                vm.checkout.currencyCode,
+                vm.checkout!.currencySymbol
+              )}
+            </span>
           </div>
         </div>
       ))}
@@ -410,7 +430,11 @@ const Coupon: React.FC<CouponProps> = observer(
           <div className={styles.Value}>
             <span>{adjustment?.type === "DECREMENT" ? "- " : ""}</span>{" "}
             <span>
-              {formatMoney(adjustment?.amount || 0, vm.checkout.currencyCode)}
+              {formatCurrency(
+                adjustment?.amount || 0,
+                vm.checkout.currencyCode,
+                vm.checkout.currencySymbol
+              )}
             </span>
           </div>
         )}

package/src/components/checkout/components/offer-product/index.tsx

@@ -8,7 +8,7 @@ import SVGCross from "../svg/cross";
 import styles from "./style.module.scss";
 import { useTranslation } from "../../../../utils/i18n";
 import { IkasProductVariant } from "../../../../models";
-import { formatMoney } from "../../../../utils/currency";
+import { formatCurrency } from "../../../../utils/currency";
 
 type Props = {
   vm: CheckoutViewModel;
@@ -95,12 +95,13 @@ const OfferProduct: React.FC<Props> = ({ vm, campaignOffer }) => {
               <span className={styles.Discount}>
                 {selectedVariant.price.formattedFinalPrice}
               </span>{" "}
-              {formatMoney(
+              {formatCurrency(
                 selectedVariant.price.finalPrice -
                   (selectedVariant.price.finalPrice *
                     (campaignOffer.offer.discountAmount || 100)) /
                     100,
-                vm.checkout!.currencyCode
+                vm.checkout!.currencyCode,
+                vm.checkout!.currencySymbol
               )}
             </div>
             <div className={styles.Actions}>

package/src/components/checkout/index.tsx

@@ -7,7 +7,7 @@ import ReactTooltip from "react-tooltip";
 import CheckoutViewModel, { CheckoutStep } from "./model";
 import { IkasCheckoutSettings } from "../../models/data/checkout-settings";
 import { IkasCheckout } from "../../models/data/checkout";
-import { formatMoney, useTranslation } from "../../utils";
+import { formatCurrency, useTranslation } from "../../utils";
 
 import CheckoutStepInfo from "./steps/step-info";
 import { CheckoutStepShipping } from "./steps/step-shipping";
@@ -443,9 +443,10 @@ const StepSummaryShipping: React.FC<CommonProps> = observer(({ vm }) => {
             {" / " +
               (vm.checkout.shippingLines[0].price === 0
                 ? t("checkout-page:free")
-                : formatMoney(
+                : formatCurrency(
                     vm.checkout.shippingLines[0].price,
-                    vm.checkout!.currencyCode
+                    vm.checkout!.currencyCode,
+                    vm.checkout.currencySymbol
                   ))}
           </span>
         </React.Fragment>

package/src/components/checkout/steps/step-payment/payment-gateways/index.tsx

@@ -12,7 +12,7 @@ import { CreditCardForm } from "../../../components/credit-card-form";
 import { Installments } from "./installments";
 import SelectBox from "../../../components/select-box";
 import styles from "./style.module.scss";
-import { formatMoney, useTranslation } from "../../../../../utils";
+import { formatCurrency, useTranslation } from "../../../../../utils";
 import SVGExternal from "../../../components/svg/external";
 import SVGMasterCard from "../../../components/master-pass/payment-gateway/svg/master-card";
 import { IkasPaymentGatewayAdditionalPrice } from "../../../../../models/data/payment-gateway/additional-price";
@@ -50,7 +50,11 @@ export const PaymentGateways: React.FC<Props> = observer(({ vm }) => {
 
     return `${
       ap.amountType === IkasPaymentGatewayTransactionFeeType.AMOUNT
-        ? formatMoney(ap.amount, vm.checkout.currencyCode)
+        ? formatCurrency(
+            ap.amount,
+            vm.checkout.currencyCode,
+            vm.checkout.currencySymbol
+          )
         : " %" + ap.amount
     }${
       ap.type === IkasPaymentGatewayAdditionalPriceType.DECREMENT

package/src/components/checkout/steps/step-payment/payment-gateways/installments/index.tsx

@@ -2,7 +2,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 { Toggle } from "../../../../../../components/checkout/components/toggle";
 
@@ -33,17 +33,19 @@ export const Installments: React.FC<Props> = observer(({ vm }) => {
               </div>
               {ip.installmentCount !== 1 && (
                 <div className={styles.InstallmentPrice}>
-                  {formatMoney(
+                  {formatCurrency(
                     ip.installmentPrice!,
                     vm.checkout!.currencyCode,
+                    vm.checkout!.currencySymbol
                   )}
                 </div>
               )}
             </div>
             <div className={styles.Price}>
-              {formatMoney(
+              {formatCurrency(
                 ip.totalPrice!,
                 vm.checkout!.currencyCode,
+                vm.checkout!.currencySymbol
               )}
             </div>
           </div>

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-editor/model.ts

@@ -461,8 +461,7 @@ export default class IkasPageEditorViewModel {
     const pageDataProvider = new IkasPageDataProvider(
       theme,
       pageParams,
-      pageType,
-      true
+      pageType
     );
 
     if (pageParams.blogId || pageParams.blogCategoryId) {

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/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/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/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,

package/src/store/customer/index.ts

@@ -24,6 +24,7 @@ import { IkasStorefrontConfig } from "@ikas/storefront-config";
 import { SaveMyCustomerInput } from "@ikas/storefront-api";
 import { populateRaffleProducts } from "@ikas/storefront-providers";
 import { IkasBaseStore } from "../base";
+import { IkasRaffle } from "@ikas/storefront-models";
 
 const isServer = typeof localStorage === "undefined";
 const LS_TOKEN_KEY = "customerToken";
@@ -403,22 +404,11 @@ export class IkasCustomerStore {
   };
 
   getRaffles = async () => {
-    const rafflesResponse = await RaffleStore.getRafflesByCustomerId({
-      winnerFilter: false,
-    });
-    const wonRafflesResponse = await RaffleStore.getRafflesByCustomerId({
-      winnerFilter: true,
-    });
-
-    const raffles = rafflesResponse.data;
-    const wonRaffles = wonRafflesResponse.data;
-
-    raffles?.forEach((raffle) => {
-      if (wonRaffles?.find((wonRaffle) => wonRaffle.id === raffle.id))
-        raffle.isCustomerWinner = true;
-    });
-
-    if (raffles) await populateRaffleProducts(raffles);
+    const rafflesResponse = await RaffleStore.listRaffleParticipants();
+    let raffles: IkasRaffle[] = [];
+    if (!rafflesResponse.data?.length) return raffles;
+    raffles = rafflesResponse.data;
+    if (raffles.length) await populateRaffleProducts(raffles);
     return raffles || [];
   };
 

package/src/store/raffle/index.ts

@@ -1,11 +1,10 @@
 import { APIResponse } from "@ikas/fe-api-client";
 import {
-  getRafflesByCustomerId,
-  GetRafflesByCustomerIdQueryParams,
-  listRaffle,
+  listRaffleParticipants,
+  listStorefrontRaffle,
   listRaffleMetaData,
   ListRaffleMetadataQueryParams,
-  ListRaffleQueryParams,
+  ListStorefrontRaffleParams,
   saveRaffleParticipant,
   SaveRaffleParticipantQueryParams,
 } from "@ikas/storefront-api";
@@ -16,8 +15,8 @@ import {
 } from "../../models/data/raffle";
 
 export default class RaffleStore {
-  static async listRaffle(params: ListRaffleQueryParams) {
-    const response = await listRaffle(params);
+  static async listStorefrontRaffle(params: ListStorefrontRaffleParams) {
+    const response = await listStorefrontRaffle(params);
     return new APIResponse({
       ...response.data,
       data: response.data?.data?.map(
@@ -46,10 +45,8 @@ export default class RaffleStore {
     );
   }
 
-  static async getRafflesByCustomerId(
-    params: GetRafflesByCustomerIdQueryParams
-  ) {
-    const response = await getRafflesByCustomerId(params);
+  static async listRaffleParticipants() {
+    const response = await listRaffleParticipants();
     return new APIResponse(
       response.data?.map((d) => new IkasRaffle(d as unknown as IkasRaffle)),
       response.graphQLErrors

package/src/utils/currency.ts

@@ -13,14 +13,19 @@ const format = (p: number, n: number, x: number, s: string, c: string) => {
 /**
  *
  * @param price Price to format
- * @param currencyCode Code for the currency, USD, EUR, TRY, etc..
+ * @param currencyCode Currency code
+ * @param currencySymbol Symbol for the currency
  */
-export const formatMoney = (price: number, currencyCode: string) => {
+export const formatCurrency = (
+  price: number,
+  currencyCode: string,
+  currencySymbol: string | null
+) => {
   const formatSettings =
     IkasStorefrontConfig.getMerchantSettings()?.currencyFormats?.find(
       (s) => s.currencyCode === currencyCode
     );
-  const symbol = formatSettings?.symbol || getCurrencySymbol(currencyCode);
+  const symbol = formatSettings?.symbol || currencySymbol || "";
   const decimalSeparator = formatSettings?.decimalSeparator || ".";
   const thousandSeparator = formatSettings?.thousandSeparator || ",";
   const symbolPosition = formatSettings?.symbolPosition || "LEFT";
@@ -62,189 +67,10 @@ export const formatMoney = (price: number, currencyCode: string) => {
       IkasStorefrontConfig.getCurrentLocale(),
       {
         style: "currency",
-        currency: currencyCode || "TRY",
+        currency: currencySymbol || "TRY",
       }
     );
 
     return formatter.format(price);
   }
 };
-
-export function getCurrencySymbol(currencyCode: string) {
-  return CURRENCIES[currencyCode] || currencyCode;
-}
-
-const CURRENCIES: Record<string, string> = {
-  TRY: "₺",
-  USD: "$",
-  EUR: "€",
-  AZN: "₼",
-  AED: "د.إ.",
-  AFN: "؋",
-  ALL: "L",
-  AMD: "դր",
-  ANG: "ƒ",
-  AOA: "Kz",
-  ARS: "$",
-  AUD: "$",
-  AWG: "ƒ",
-  BAM: "КМ",
-  BBD: "$",
-  BDT: "৳",
-  BGN: "лв.",
-  BHD: "د.ب.",
-  BIF: "FBu",
-  BMD: "$",
-  BND: "$",
-  BOB: "Bs.",
-  BRL: "R$",
-  BSD: "$",
-  BTN: "Nu.",
-  BWP: "P",
-  BYN: "руб.",
-  BZD: "$",
-  CAD: "$",
-  CDF: "₣",
-  CHF: "₣",
-  CKD: "$",
-  CLP: "$",
-  CNY: "¥元",
-  COP: "$",
-  CRC: "₡",
-  CUC: "$",
-  CUP: "₱",
-  CVE: "$",
-  CZK: "Kč",
-  DJF: "ف.ج.",
-  DKK: "kr.",
-  DOP: "$",
-  DZD: "د.ج.",
-  EGP: "ج.م.",
-  EHP: "Ptas.",
-  ERN: "ناكفا",
-  ETB: "ብር",
-  FJD: "$",
-  FKP: "£",
-  FOK: "kr",
-  GBP: "£",
-  GEL: "₾",
-  GGP: "£",
-  GHS: "₵",
-  GIP: "£",
-  GMD: "D",
-  GNF: "FG",
-  GTQ: "$",
-  GYD: "$",
-  HKD: "$",
-  HNL: "L",
-  HRK: "kn",
-  HTG: "G",
-  HUF: "Ft",
-  IDR: "Rp",
-  ILS: "₪",
-  IMP: "£",
-  INR: "₹",
-  IQD: "د.ع.",
-  IRR: "﷼",
-  ISK: "kr",
-  JEP: "£",
-  JMD: "$",
-  JOD: "د.أ.",
-  JPY: "¥",
-  KES: "KSh",
-  KGS: "с",
-  KHR: "៛",
-  KID: "$",
-  KMF: "CF",
-  KPW: "₩",
-  KRW: "₩",
-  KWD: "د.ك.",
-  KYD: "$",
-  KZT: "₸",
-  LAK: "₭",
-  LBP: "ل.ل.",
-  LKR: "රු or ரூ",
-  LRD: "$",
-  LSL: "L",
-  LYD: "ل.د.",
-  MAD: "د.م.",
-  MDL: "L",
-  MGA: "Ar",
-  MKD: "ден",
-  MMK: "Ks",
-  MNT: "₮",
-  MOP: "MOP$",
-  MRU: "أ.م.",
-  MUR: "रु ",
-  MVR: ".ރ",
-  MWK: "MK",
-  MXN: "$",
-  MYR: "RM",
-  MZN: "MT",
-  NAD: "$",
-  NGN: "₦",
-  NIO: "C$",
-  NOK: "kr",
-  NPR: "रू",
-  NZD: "$",
-  OMR: "ر.ع.",
-  PAB: "B/.",
-  PEN: "S/.",
-  PGK: "K",
-  PHP: "₱",
-  PKR: "Rs",
-  PLN: "zł",
-  PND: "$",
-  PRB: "р.",
-  PYG: "₲",
-  QAR: "ر.ق.",
-  RON: "L",
-  RSD: "дин",
-  RUB: "₽",
-  RWF: "R₣",
-  SAR: "ر.س.",
-  SBD: "$",
-  SCR: "Rs",
-  SDG: "ج.س.",
-  SEK: "kr",
-  SGD: "$",
-  SHP: "£",
-  SLL: "Le",
-  SLS: "Sl",
-  SOS: "Ssh",
-  SRD: "$",
-  SSP: "SS£",
-  STN: "Db",
-  SVC: "₡",
-  SYP: "ل.س.",
-  SZL: "L",
-  THB: "฿",
-  TJS: "SM",
-  TMT: "T",
-  TND: "د.ت.",
-  TOP: "PT",
-  TTD: "$",
-  TVD: "$",
-  TWD: "圓",
-  TZS: "TSh",
-  UAH: "грн",
-  UGX: "Sh",
-  UYU: "$",
-  UZS: "сум",
-  VED: "Bs.",
-  VES: "Bs.F",
-  VND: "₫",
-  VUV: "VT",
-  WST: "ST",
-  XAF: "Fr.",
-  XCD: "$",
-  XOF: "₣",
-  XPF: "₣",
-  YER: "ر.ي.",
-  ZAR: "R",
-  ZMW: "ZK",
-  ZWB: "",
-  ZWL: "$",
-  Abkhazia: "",
-  Artsakh: "դր.",
-};