@ikas/storefront 4.0.0-alpha.33 → 4.0.0-alpha.34

package/package.json

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

package/src/components/checkout/model.ts

@@ -762,6 +762,8 @@ export default class CheckoutViewModel {
     const newCart = await this.saveCart();
 
     if (newCart) this.checkout = new IkasCheckout(newCart);
+    if (this.checkout.shippingAddress)
+      this.checkout.shippingAddress.checkoutSettings = this.checkoutSettings;
     this.isChangingShippingMethod = false;
   };
 
@@ -986,6 +988,9 @@ export default class CheckoutViewModel {
         customer.addresses.push(newAddress);
 
         await this.store.customerStore.saveCustomer(customer);
+        this.store.customerStore.customer.addresses?.forEach(
+          (address) => (address.checkoutSettings = this.checkoutSettings)
+        );
 
         if (type === "shipping") {
           this.checkout.shippingAddress!.id = newAddress.id;

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

@@ -48,7 +48,12 @@ export const CheckoutStepPayment: React.FC<Props> = observer(({ vm }) => {
   const policyLabel = policyInputData.map((p) =>
     p.isVariable ? (
       <span
-        className={styles.TermsLabelSpan}
+        className={[
+          styles.TermsLabelSpan,
+          vm.isErrorsVisible && !vm.isTermsAndConditionsChecked
+            ? styles.Error
+            : "",
+        ].join(" ")}
         onClick={
           p.value === "{{ ackPrivacyPolicy }}"
             ? onShowPrivacyPolicyClick

package/src/components/checkout/steps/step-payment/style.module.scss

@@ -5,12 +5,17 @@
 
   .TermsLabelSpan {
     color: $primaryTextColor;
+    font-weight: 500;
 
     &:hover {
       text-decoration: underline;
     }
   }
 
+  .Error {
+    color: $errorColor;
+  }
+
   .SecurePaymentContainer {
     width: 100%;
     display: flex;

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

@@ -627,10 +627,7 @@ export default class IkasPageEditorViewModel {
       prop
     );
 
-    if (
-      propValue &&
-      (propValue.linkType || JSON.stringify(propValue)?.includes("linkType"))
-    )
+    if (propValue && JSON.stringify(propValue).includes("href"))
       await this.pageDataProvider.setLinkSlugs();
 
     pageComponentPropValues.propValues[propName] =

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

@@ -20,6 +20,10 @@ export class IkasCheckout extends IkasCart implements ICheckout {
   constructor(data: Partial<IkasCheckoutConstructorData>) {
     super(data);
 
+    this.appliedCouponCode = data.couponCode;
+    this.selectedPaymentGateway = data.selectedPaymentGateway;
+    this.masterPassPaymentGateway = data.masterPassPaymentGateway;
+
     makeObservable(this, {
       appliedCouponCode: observable,
       selectedPaymentGateway: observable,

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

@@ -94,6 +94,8 @@ 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;

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

@@ -1,6 +1,6 @@
 import { IkasBaseModel } from "../base";
 import { IkasState as IState } from "@ikas/storefront-models";
-import { makeAutoObservable } from "mobx";
+import { makeObservable, observable } from "mobx";
 
 export class IkasState extends IkasBaseModel implements IState {
   countryId: string;
@@ -13,6 +13,10 @@ export class IkasState extends IkasBaseModel implements IState {
     this.name = data.name;
     this.stateCode = data.stateCode;
 
-    makeAutoObservable(this);
+    makeObservable(this, {
+      countryId: observable,
+      name: observable,
+      stateCode: observable,
+    });
   }
 }