@ikas/storefront-model-functions 4.0.0-alpha.5 → 4.0.0-alpha.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront-model-functions",
-  "version": "4.0.0-alpha.5",
+  "version": "4.0.0-alpha.50",
   "description": "Functions for ikas storefront models.",
   "author": "Umut Ozan Yıldırım",
   "license": "ISC",
@@ -16,8 +16,8 @@
     "build": "rm -rf build && rollup -c"
   },
   "devDependencies": {
-    "@ikas/storefront-config": "^4.0.0-alpha.5",
-    "@ikas/storefront-models": "^4.0.0-alpha.5",
+    "@ikas/storefront-config": "^4.0.0-alpha.50",
+    "@ikas/storefront-models": "^4.0.0-alpha.50",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@types/lodash": "^4.14.182",
@@ -32,8 +32,8 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "@ikas/storefront-config": "^4.0.0-alpha.5",
-    "@ikas/storefront-models": "^4.0.0-alpha.5",
+    "@ikas/storefront-config": "^4.0.0-alpha.50",
+    "@ikas/storefront-models": "^4.0.0-alpha.50",
     "lodash": "^4.17.21"
   }
 }

package/src/functions/order/address/index.ts

@@ -61,7 +61,7 @@ export function getValidationResult(
     country: !!address.country?.name,
     state: !!address.state,
     city: !!address.city?.name,
-    district: isDistrictRequired ? !!address.district?.id : true,
+    district: isDistrictRequired ? !!address.district?.name : true,
     phone:
       checkoutSettings.phoneRequirement === IkasCheckoutRequirement.MANDATORY ||
       (checkoutSettings.phoneRequirement === IkasCheckoutRequirement.OPTIONAL &&

package/src/functions/order/line-item/index.ts

@@ -5,21 +5,15 @@ export function getPriceWithQuantity(item: IkasOrderLineItem) {
 }
 
 export function getOverridenPriceWithQuantity(item: IkasOrderLineItem) {
-  const price =
-    item.discountPrice !== undefined && item.discountPrice !== null
-      ? item.price * item.quantity
-      : null;
-
-  return price !== null && price < 0 ? 0 : price;
+  if (item.price !== item.finalPrice) {
+    return item.price * item.quantity;
+  } else {
+    return 0;
+  }
 }
 
 export function getFinalPriceWithQuantity(item: IkasOrderLineItem) {
-  const price =
-    (item.discountPrice !== undefined && item.discountPrice !== null
-      ? item.discountPrice
-      : item.price) * item.quantity;
-
-  return price < 0 ? 0 : price;
+  return (item.finalPrice ?? item.price) * item.quantity;
 }
 
 export function getTax(item: IkasOrderLineItem) {

package/src/functions/product/filter/index.ts

@@ -54,6 +54,8 @@ export function getDisplayedValues(filter: IkasProductFilter) {
     IkasProductFilterSortType.ALPHABETICAL_DESC,
   ].includes(sortType);
 
+  const isCustomSort = sortType === IkasProductFilterSortType.CUSTOM_SORT;
+
   let _values = filter.values?.filter((v) =>
     v.resultCount === 0 ? v.isSelected : true
   );
@@ -63,6 +65,13 @@ export function getDisplayedValues(filter: IkasProductFilter) {
 
   if (isDesc) _values = _values?.reverse();
 
+  if (isCustomSort) {
+    const sortOrder = filter.settings?.customSortedValues || [];
+    _values = _values.sort(function (a, b) {
+      return sortOrder.indexOf(a.id) - sortOrder.indexOf(b.id);
+    });
+  }
+
   return _values;
 }