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

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 } from "@ikas/storefront-api";
+import { getCartById, setAPIClientConfig } from "@ikas/storefront-api";
 import { IkasStorefrontConfig } from "@ikas/storefront-config";
 import { IkasBaseStore } from "..";
 import { IkasCheckout, IkasCheckoutSettings } from "../models/data";
@@ -35,6 +35,7 @@ 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>;
+  configJson?: Record<string, any>; // local only
   components?: Record<string, any>;
 };
 
@@ -19,9 +19,12 @@ 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 true;
+      return response;
     } catch (err) {
       console.log(err);
       return false;
@@ -145,7 +145,7 @@ export class IkasCartStore {
           Analytics.addToCart(item, quantity - oldQuantity, eventId, this.cart);
         }
       }
-      return true;
+      return response;
     } catch (err) {
       console.log(err);
       return 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";
@@ -293,7 +294,7 @@ export class IkasCustomerStore {
     const favoriteProductsResponse =
       await CustomerStoreAPI.listFavoriteProducts();
     if (
-      favoriteProductsResponse.isSuccess ||
+      !favoriteProductsResponse.isSuccess ||
       !favoriteProductsResponse.data?.length
     )
       return [];
@@ -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/constants.ts

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

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: "դր.",
-};

package/src/components/checkout/components/phone-number-input/locale/en.ts

@@ -1,257 +0,0 @@
-export default {
-	"AB": "Abkhazia",
-	"AC": "Ascension Island",
-	"AD": "Andorra",
-	"AE": "United Arab Emirates",
-	"AF": "Afghanistan",
-	"AG": "Antigua and Barbuda",
-	"AI": "Anguilla",
-	"AL": "Albania",
-	"AM": "Armenia",
-	"AO": "Angola",
-	"AQ": "Antarctica",
-	"AR": "Argentina",
-	"AS": "American Samoa",
-	"AT": "Austria",
-	"AU": "Australia",
-	"AW": "Aruba",
-	"AX": "Åland Islands",
-	"AZ": "Azerbaijan",
-	"BA": "Bosnia and Herzegovina",
-	"BB": "Barbados",
-	"BD": "Bangladesh",
-	"BE": "Belgium",
-	"BF": "Burkina Faso",
-	"BG": "Bulgaria",
-	"BH": "Bahrain",
-	"BI": "Burundi",
-	"BJ": "Benin",
-	"BL": "Saint Barthélemy",
-	"BM": "Bermuda",
-	"BN": "Brunei Darussalam",
-	"BO": "Bolivia",
-	"BQ": "Bonaire, Sint Eustatius and Saba",
-	"BR": "Brazil",
-	"BS": "Bahamas",
-	"BT": "Bhutan",
-	"BV": "Bouvet Island",
-	"BW": "Botswana",
-	"BY": "Belarus",
-	"BZ": "Belize",
-	"CA": "Canada",
-	"CC": "Cocos (Keeling) Islands",
-	"CD": "Congo, Democratic Republic of the",
-	"CF": "Central African Republic",
-	"CG": "Congo",
-	"CH": "Switzerland",
-	"CI": "Cote d'Ivoire",
-	"CK": "Cook Islands",
-	"CL": "Chile",
-	"CM": "Cameroon",
-	"CN": "China",
-	"CO": "Colombia",
-	"CR": "Costa Rica",
-	"CU": "Cuba",
-	"CV": "Cape Verde",
-	"CW": "Curaçao",
-	"CX": "Christmas Island",
-	"CY": "Cyprus",
-	"CZ": "Czech Republic",
-	"DE": "Germany",
-	"DJ": "Djibouti",
-	"DK": "Denmark",
-	"DM": "Dominica",
-	"DO": "Dominican Republic",
-	"DZ": "Algeria",
-	"EC": "Ecuador",
-	"EE": "Estonia",
-	"EG": "Egypt",
-	"EH": "Western Sahara",
-	"ER": "Eritrea",
-	"ES": "Spain",
-	"ET": "Ethiopia",
-	"FI": "Finland",
-	"FJ": "Fiji",
-	"FK": "Falkland Islands",
-	"FM": "Federated States of Micronesia",
-	"FO": "Faroe Islands",
-	"FR": "France",
-	"GA": "Gabon",
-	"GB": "United Kingdom",
-	"GD": "Grenada",
-	"GE": "Georgia",
-	"GF": "French Guiana",
-	"GG": "Guernsey",
-	"GH": "Ghana",
-	"GI": "Gibraltar",
-	"GL": "Greenland",
-	"GM": "Gambia",
-	"GN": "Guinea",
-	"GP": "Guadeloupe",
-	"GQ": "Equatorial Guinea",
-	"GR": "Greece",
-	"GS": "South Georgia and the South Sandwich Islands",
-	"GT": "Guatemala",
-	"GU": "Guam",
-	"GW": "Guinea-Bissau",
-	"GY": "Guyana",
-	"HK": "Hong Kong",
-	"HM": "Heard Island and McDonald Islands",
-	"HN": "Honduras",
-	"HR": "Croatia",
-	"HT": "Haiti",
-	"HU": "Hungary",
-	"ID": "Indonesia",
-	"IE": "Ireland",
-	"IL": "Israel",
-	"IM": "Isle of Man",
-	"IN": "India",
-	"IO": "British Indian Ocean Territory",
-	"IQ": "Iraq",
-	"IR": "Iran",
-	"IS": "Iceland",
-	"IT": "Italy",
-	"JE": "Jersey",
-	"JM": "Jamaica",
-	"JO": "Jordan",
-	"JP": "Japan",
-	"KE": "Kenya",
-	"KG": "Kyrgyzstan",
-	"KH": "Cambodia",
-	"KI": "Kiribati",
-	"KM": "Comoros",
-	"KN": "Saint Kitts and Nevis",
-	"KP": "North Korea",
-	"KR": "South Korea",
-	"KW": "Kuwait",
-	"KY": "Cayman Islands",
-	"KZ": "Kazakhstan",
-	"LA": "Laos",
-	"LB": "Lebanon",
-	"LC": "Saint Lucia",
-	"LI": "Liechtenstein",
-	"LK": "Sri Lanka",
-	"LR": "Liberia",
-	"LS": "Lesotho",
-	"LT": "Lithuania",
-	"LU": "Luxembourg",
-	"LV": "Latvia",
-	"LY": "Libya",
-	"MA": "Morocco",
-	"MC": "Monaco",
-	"MD": "Moldova",
-	"ME": "Montenegro",
-	"MF": "Saint Martin (French Part)",
-	"MG": "Madagascar",
-	"MH": "Marshall Islands",
-	"MK": "North Macedonia",
-	"ML": "Mali",
-	"MM": "Burma",
-	"MN": "Mongolia",
-	"MO": "Macao",
-	"MP": "Northern Mariana Islands",
-	"MQ": "Martinique",
-	"MR": "Mauritania",
-	"MS": "Montserrat",
-	"MT": "Malta",
-	"MU": "Mauritius",
-	"MV": "Maldives",
-	"MW": "Malawi",
-	"MX": "Mexico",
-	"MY": "Malaysia",
-	"MZ": "Mozambique",
-	"NA": "Namibia",
-	"NC": "New Caledonia",
-	"NE": "Niger",
-	"NF": "Norfolk Island",
-	"NG": "Nigeria",
-	"NI": "Nicaragua",
-	"NL": "Netherlands",
-	"NO": "Norway",
-	"NP": "Nepal",
-	"NR": "Nauru",
-	"NU": "Niue",
-	"NZ": "New Zealand",
-	"OM": "Oman",
-	"OS": "South Ossetia",
-	"PA": "Panama",
-	"PE": "Peru",
-	"PF": "French Polynesia",
-	"PG": "Papua New Guinea",
-	"PH": "Philippines",
-	"PK": "Pakistan",
-	"PL": "Poland",
-	"PM": "Saint Pierre and Miquelon",
-	"PN": "Pitcairn",
-	"PR": "Puerto Rico",
-	"PS": "Palestine",
-	"PT": "Portugal",
-	"PW": "Palau",
-	"PY": "Paraguay",
-	"QA": "Qatar",
-	"RE": "Reunion",
-	"RO": "Romania",
-	"RS": "Serbia",
-	"RU": "Russia",
-	"RW": "Rwanda",
-	"SA": "Saudi Arabia",
-	"SB": "Solomon Islands",
-	"SC": "Seychelles",
-	"SD": "Sudan",
-	"SE": "Sweden",
-	"SG": "Singapore",
-	"SH": "Saint Helena",
-	"SI": "Slovenia",
-	"SJ": "Svalbard and Jan Mayen",
-	"SK": "Slovakia",
-	"SL": "Sierra Leone",
-	"SM": "San Marino",
-	"SN": "Senegal",
-	"SO": "Somalia",
-	"SR": "Suriname",
-	"SS": "South Sudan",
-	"ST": "Sao Tome and Principe",
-	"SV": "El Salvador",
-	"SX": "Sint Maarten",
-	"SY": "Syria",
-	"SZ": "Swaziland",
-	"TA": "Tristan da Cunha",
-	"TC": "Turks and Caicos Islands",
-	"TD": "Chad",
-	"TF": "French Southern Territories",
-	"TG": "Togo",
-	"TH": "Thailand",
-	"TJ": "Tajikistan",
-	"TK": "Tokelau",
-	"TL": "Timor-Leste",
-	"TM": "Turkmenistan",
-	"TN": "Tunisia",
-	"TO": "Tonga",
-	"TR": "Turkey",
-	"TT": "Trinidad and Tobago",
-	"TV": "Tuvalu",
-	"TW": "Taiwan",
-	"TZ": "Tanzania",
-	"UA": "Ukraine",
-	"UG": "Uganda",
-	"UM": "United States Minor Outlying Islands",
-	"US": "United States",
-	"UY": "Uruguay",
-	"UZ": "Uzbekistan",
-	"VA": "Holy See (Vatican City State)",
-	"VC": "Saint Vincent and the Grenadines",
-	"VE": "Venezuela",
-	"VG": "Virgin Islands, British",
-	"VI": "Virgin Islands, U.S.",
-	"VN": "Vietnam",
-	"VU": "Vanuatu",
-	"WF": "Wallis and Futuna",
-	"WS": "Samoa",
-	"XK": "Kosovo",
-	"YE": "Yemen",
-	"YT": "Mayotte",
-	"ZA": "South Africa",
-	"ZM": "Zambia",
-	"ZW": "Zimbabwe",
-	"ZZ": "International"
-}