@licklist/design 0.44.486-dev.41 → 0.44.486-dev.42

package/dist/iframe/order-process/components/utils/useCategoryVerification.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCategoryVerification.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/order-process/components/utils/useCategoryVerification.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kEAAkE,CAAC;AAInG,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAElC,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAGD,eAAO,MAAM,uBAAuB,iBAIxB,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,sBACd,eAAe,EAAE,KACpC,aAAa,GAAG,IA8DpB,CAAC"}
+{"version":3,"file":"useCategoryVerification.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/order-process/components/utils/useCategoryVerification.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kEAAkE,CAAC;AAInG,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAElC,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAGD,eAAO,MAAM,uBAAuB,iBAIxB,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,sBACd,eAAe,EAAE,KACpC,aAAa,GAAG,IAkEpB,CAAC"}

package/dist/iframe/order-process/components/utils/useCategoryVerification.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@licklist/core/dist/Config"),r=require("react-i18next"),t=require("react-intl");exports.useCategoryVerification=function(){var n=r.useTranslation("Validation").t,i=t.useIntl().formatNumber;return function(r,t){var u,a=t.reduce((function(e,r){return e+r.products.reduce((function(e,r){return e+((null==r?void 0:r.minSpend)?r.minSpend:0)}),0)}),0),o=Object.values(r).filter((function(e){return(null==e?void 0:e.quantity)>0})),c=o.reduce((function(e,r){return e+r.price*r.quantity}),0);if(t.forEach((function(e){var r=e.minSubItems,t=e.maxSubItems,i=e.id,a=e.name;if(r||t){var c=o.filter((function(e){return(null==e?void 0:e.productsCategoryId)===i})).length;if(r&&c<r){var d=n("Validation:fieldMinNumber",{min:r,attribute:"number of products in the ".concat(a," category")});u={id:i,message:d}}else if(t&&c>t){d=n("Validation:fieldMaxNumber",{max:t,attribute:"number of products in the ".concat(a," category")});u={id:i,message:d}}}})),c<a&&!u){var d=n("Design:minimumSpendSumValidation",{minSpend:i(a,{style:"currency",currency:e.Currency.GBP})});u={message:d}}return u}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@licklist/core/dist/Config"),r=require("react-i18next"),t=require("react-intl");exports.useCategoryVerification=function(){var n=r.useTranslation("Validation").t,i=t.useIntl().formatNumber;return function(r,t){var u,a=Object.values(r).filter((function(e){return(null==e?void 0:e.quantity)>0})),o=t.reduce((function(e,r){var t=r.products.filter((function(e){return a.map((function(e){return e.id})).includes(null==e?void 0:e.id)}));return t.length?e+t.reduce((function(e,r){return e+((null==r?void 0:r.minSpend)||0)}),0):0}),0),c=a.reduce((function(e,r){return e+r.price*r.quantity}),0);if(t.forEach((function(e){var r=e.minSubItems,t=e.maxSubItems,i=e.id,o=e.name;if(r||t){var c=a.filter((function(e){return(null==e?void 0:e.productsCategoryId)===i})).length;if(r&&c<r){var d=n("Validation:fieldMinNumber",{min:r,attribute:"number of products in the ".concat(o," category")});u={id:i,message:d}}else if(t&&c>t){d=n("Validation:fieldMaxNumber",{max:t,attribute:"number of products in the ".concat(o," category")});u={id:i,message:d}}}})),c<o&&!u){var d=n("Design:minimumSpendSumValidation",{minSpend:i(o,{style:"currency",currency:e.Currency.GBP})});u={message:d}}return u}};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.44.486-dev.41",
+  "version": "0.44.486-dev.42",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"

package/src/iframe/order-process/components/utils/useCategoryVerification.ts

@@ -18,23 +18,27 @@ export const useCategoryVerification = () => {
     productCategories?: ProductCategory[]
   ): CategoryError | void => {
     let errorMessage: { id?: number; message: string } | void;
-
-    const sumOfMinSpends = productCategories.reduce(
-      (acc, productCategories) => {
-        const { products } = productCategories;
-
-        const productMinSpends = products.reduce((productAcc, product) => {
-          const minSpendValue = !product?.minSpend ? 0 : product.minSpend;
-          return productAcc + minSpendValue;
-        }, 0);
-
-        return acc + productMinSpends;
-      },
-      0
-    );
     const productArray = Object.values(values).filter(
       (product) => product?.quantity > 0
     );
+    const sumOfMinSpends = productCategories.reduce((acc, productCategory) => {
+      const { products } = productCategory;
+      const selectedProducts = products.filter((product) =>
+        productArray.map((el) => el.id).includes(product?.id)
+      );
+
+      if (!selectedProducts.length) {
+        return 0;
+      }
+
+      const productMinSpendsSum = selectedProducts.reduce(
+        (sum, product) => sum + (product?.minSpend || 0),
+        0
+      );
+
+      return acc + productMinSpendsSum;
+    }, 0);
+
     const totalPrice = productArray.reduce(
       (total, product) => total + product.price * product.quantity,
       0