@licklist/design 0.44.486-dev.45 → 0.44.486-dev.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/iframe/order-process/components/utils/useCategoryVerification.d.ts +1 -1
- package/dist/iframe/order-process/components/utils/useCategoryVerification.d.ts.map +1 -1
- package/dist/iframe/order-process/components/utils/useCategoryVerification.js +1 -1
- package/package.json +1 -1
- package/src/iframe/order-process/components/utils/useCategoryVerification.ts +3 -2
|
@@ -4,6 +4,6 @@ interface CategoryError {
|
|
|
4
4
|
message: string;
|
|
5
5
|
id?: number;
|
|
6
6
|
}
|
|
7
|
-
export declare const useCategoryVerification: () => (values: Record<Order["id"], Order>, productCategories?: ProductCategory[]) => CategoryError | void;
|
|
7
|
+
export declare const useCategoryVerification: () => (values: Record<Order["id"], Order>, productCategories?: ProductCategory[], isLastPage?: boolean) => CategoryError | void;
|
|
8
8
|
export {};
|
|
9
9
|
//# sourceMappingURL=useCategoryVerification.d.ts.map
|
|
@@ -1 +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,
|
|
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,eACxB,OAAO,KACnB,aAAa,GAAG,IA+DpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@licklist/core/dist/Config"),r=require("react-i18next"),n=require("react-intl");exports.useCategoryVerification=function(){var t=r.useTranslation("Validation").t,i=n.useIntl().formatNumber;return function(r,n){var
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@licklist/core/dist/Config"),r=require("react-i18next"),n=require("react-intl");exports.useCategoryVerification=function(){var t=r.useTranslation("Validation").t,i=n.useIntl().formatNumber;return function(r,n,u){var a,o=Object.values(r).filter((function(e){return(null==e?void 0:e.quantity)>0})),c=n.reduce((function(e,r){var n=r.products.filter((function(e){return o.map((function(e){return e.id})).includes(null==e?void 0:e.id)}));return e+((null==n?void 0:n.reduce((function(e,r){return e+((null==r?void 0:r.minSpend)||0)}),0))||0)}),0),d=o.reduce((function(e,r){return e+r.price*r.quantity}),0);if(n.forEach((function(e){var r=e.minSubItems,n=e.maxSubItems,i=e.id,u=e.name;if(r||n){var c=o.filter((function(e){return(null==e?void 0:e.productsCategoryId)===i})).length;if(r&&c<r){var d=t("Validation:fieldMinNumber",{min:r,attribute:"number of products in the ".concat(u," category")});a={id:i,message:d}}else if(n&&c>n){d=t("Validation:fieldMaxNumber",{max:n,attribute:"number of products in the ".concat(u," category")});a={id:i,message:d}}}})),d<c&&!a&&u){var l=t("Design:minimumSpendSumValidation",{minSpend:i(c,{style:"currency",currency:e.Currency.GBP})});a={message:l}}return a}};
|
package/package.json
CHANGED
|
@@ -15,7 +15,8 @@ export const useCategoryVerification = () => {
|
|
|
15
15
|
const { formatNumber } = useIntl();
|
|
16
16
|
return (
|
|
17
17
|
values: Record<Order["id"], Order>,
|
|
18
|
-
productCategories?: ProductCategory[]
|
|
18
|
+
productCategories?: ProductCategory[],
|
|
19
|
+
isLastPage?: boolean
|
|
19
20
|
): CategoryError | void => {
|
|
20
21
|
let errorMessage: { id?: number; message: string } | void;
|
|
21
22
|
const productArray = Object.values(values).filter(
|
|
@@ -67,7 +68,7 @@ export const useCategoryVerification = () => {
|
|
|
67
68
|
}
|
|
68
69
|
});
|
|
69
70
|
|
|
70
|
-
if (totalPrice < sumOfMinSpends && !errorMessage) {
|
|
71
|
+
if (totalPrice < sumOfMinSpends && !errorMessage && isLastPage) {
|
|
71
72
|
const message = t("Design:minimumSpendSumValidation", {
|
|
72
73
|
minSpend: formatNumber(sumOfMinSpends, {
|
|
73
74
|
style: "currency",
|