@ikas/storefront 4.0.0-alpha.39 → 4.0.0-alpha.4

package/src/pages/checkout.tsx

@@ -9,7 +9,7 @@ import IkasCheckoutPage, {
 import { useRouter } from "next/router.js";
 import { FullscreenLoading } from "../components/checkout/components/fullscreen-loading";
 import { CheckoutStep } from "../components/checkout/model";
-import { getCartById, setAPIClientConfig } from "@ikas/storefront-api";
+import { getCartById } from "@ikas/storefront-api";
 import { IkasStorefrontConfig } from "@ikas/storefront-config";
 import { IkasBaseStore } from "..";
 import { IkasCheckout, IkasCheckoutSettings } from "../models/data";
@@ -35,7 +35,6 @@ const CheckoutPage: React.FC<Props> = ({
   const [checkout, setCheckout] = React.useState<IkasCheckout | undefined>();
 
   IkasStorefrontConfig.init(configJson);
-  setAPIClientConfig();
 
   React.useEffect(() => {
     setCustomizationProps(customizationProps);

package/src/pages/editor.tsx

@@ -8,7 +8,7 @@ const IkasPageEditor = dynamic(
 );
 
 type Props = {
-  configJson?: Record<string, any>; // local only
+  configJson: Record<string, any>;
   components?: Record<string, any>;
 };
 
@@ -19,12 +19,9 @@ export default class Page extends React.Component<Props> {
     if (configJson) {
       IkasStorefrontConfig.init({
         ...configJson,
+        currentPageComponents: components || {},
       });
     }
-
-    IkasStorefrontConfig.init({
-      currentPageComponents: components || {},
-    });
   }
 
   render() {

package/src/store/cart/index.ts

@@ -100,7 +100,7 @@ export class IkasCartStore {
 
       product.productOptionSet?.initOptionValues();
 
-      return response;
+      return true;
     } catch (err) {
       console.log(err);
       return false;
@@ -145,7 +145,7 @@ export class IkasCartStore {
           Analytics.addToCart(item, quantity - oldQuantity, eventId, this.cart);
         }
       }
-      return response;
+      return true;
     } catch (err) {
       console.log(err);
       return false;

package/src/store/customer/index.ts

@@ -24,7 +24,6 @@ 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";
@@ -294,7 +293,7 @@ export class IkasCustomerStore {
     const favoriteProductsResponse =
       await CustomerStoreAPI.listFavoriteProducts();
     if (
-      !favoriteProductsResponse.isSuccess ||
+      favoriteProductsResponse.isSuccess ||
       !favoriteProductsResponse.data?.length
     )
       return [];
@@ -404,11 +403,22 @@ export class IkasCustomerStore {
   };
 
   getRaffles = async () => {
-    const rafflesResponse = await RaffleStore.listRaffleParticipants();
-    let raffles: IkasRaffle[] = [];
-    if (!rafflesResponse.data?.length) return raffles;
-    raffles = rafflesResponse.data;
-    if (raffles.length) await populateRaffleProducts(raffles);
+    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);
     return raffles || [];
   };
 

package/src/store/raffle/index.ts

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

package/src/utils/constants.ts

@@ -1,2 +1,2 @@
-export const FREE_TEXT_CITY_COUNTRY_LIST = ["DE", "US", "AT"];
+export const FREE_TEXT_CITY_COUNTRY_LIST = ["DE", "US"];
 export const DISTRICT_HIDDEN_COUNTRY_LIST = ["US"];

package/src/utils/currency.ts

@@ -13,19 +13,14 @@ const format = (p: number, n: number, x: number, s: string, c: string) => {
 /**
  *
  * @param price Price to format
- * @param currencyCode Currency code
- * @param currencySymbol Symbol for the currency
+ * @param currencyCode Code for the currency, USD, EUR, TRY, etc..
  */
-export const formatCurrency = (
-  price: number,
-  currencyCode: string,
-  currencySymbol: string | null
-) => {
+export const formatMoney = (price: number, currencyCode: string) => {
   const formatSettings =
     IkasStorefrontConfig.getMerchantSettings()?.currencyFormats?.find(
       (s) => s.currencyCode === currencyCode
     );
-  const symbol = formatSettings?.symbol || currencySymbol || "";
+  const symbol = formatSettings?.symbol || getCurrencySymbol(currencyCode);
   const decimalSeparator = formatSettings?.decimalSeparator || ".";
   const thousandSeparator = formatSettings?.thousandSeparator || ",";
   const symbolPosition = formatSettings?.symbolPosition || "LEFT";
@@ -67,10 +62,189 @@ export const formatCurrency = (
       IkasStorefrontConfig.getCurrentLocale(),
       {
         style: "currency",
-        currency: currencySymbol || "TRY",
+        currency: currencyCode || "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: "դր.",
+};