@thecb/components 7.11.0-beta.6 → 7.11.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thecb/components",
-  "version": "7.11.0-beta.6",
+  "version": "7.11.0-beta.7",
   "description": "Common lib for CityBase react components",
   "main": "dist/index.cjs.js",
   "typings": "dist/index.d.ts",

package/src/components/molecules/partial-amount-form/PartialAmountForm.js

@@ -38,15 +38,13 @@ const PartialAmountForm = ({
     )}`
   };
 
-  const getPartialAmountFormErrors = (maximum, itemAmount) => {
+  const getPartialAmountFormErrors = itemAmount => {
     let errorMessages = amountErrors;
     if (blockPartialPaymentOverpay) {
       console.log("item amount in form is", itemAmount);
-      let maxAmount = !maximum || itemAmount < maximum ? itemAmount : maximum;
       const maxAmountError = `There is a maximum payment of ${displayCurrency(
-        maxAmount
+        itemAmount
       )}`;
-      console.log("max amount in form is", maxAmount);
       return {
         ...errorMessages,
         [numberLessThanOrEqualTo.error]: maxAmountError
@@ -72,7 +70,7 @@ const PartialAmountForm = ({
             field={fields[li.id]}
             fieldActions={actions.fields[li.id]}
             showErrors={showErrors}
-            errorMessages={getPartialAmountFormErrors(maximum, li.amount)}
+            errorMessages={getPartialAmountFormErrors(li.amount)}
             style={{ textAlign: "right" }}
             placeholder="$0.00"
             formatter={moneyFormat}

package/src/components/molecules/partial-amount-form/PartialAmountForm.state.js

@@ -13,12 +13,6 @@ export const createPartialAmountFormState = (
   minimum = 1,
   blockPartialPaymentOverpay = false
 ) => {
-  const getPaymentMax = (maximum, itemAmount) => {
-    if (blockPartialPaymentOverpay) {
-      return !maximum || itemAmount < maximum ? itemAmount : maximum;
-    }
-    return maximum;
-  };
   const formConfig = lineItems.reduce((acc, item) => {
     console.log("maximum is", maximum);
     console.log("item amount is", item.amount);
@@ -33,16 +27,19 @@ export const createPartialAmountFormState = (
           .reduce((acc, curr) => [...acc, curr.id], [])
       )
     ];
-    if (!!maximum || blockPartialPaymentOverpay) {
+    if (!!maximum) {
       validators.push(
         validateSum(
-          numberLessThanOrEqualTo(getPaymentMax(maximum, item.amount)),
+          numberLessThanOrEqualTo(maximum),
           lineItems
             .filter(lineItem => lineItem != item)
             .reduce((acc, curr) => [...acc, curr.id], [])
         )
       );
     }
+    if (blockPartialPaymentOverpay) {
+      validators.push(numberLessThanOrEqualTo(item.amount));
+    }
     return {
       ...acc,
       [item.id]: {