fix: Disabled the place order button

commercelayer · May 12, 2022 · 35754d8 · 35754d8
1 parent 19175d7
commit 35754d8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/components/PlaceOrderButton.tsx b/src/components/PlaceOrderButton.tsx
@@ -53,14 +53,14 @@ const PlaceOrderButton: FunctionComponent<PlaceOrderButtonProps> = (props) => {
           paymentType,
         })
         if (
-          (isFree ||
+          ((isFree && isPermitted) ||
             currentPaymentMethodRef?.current?.onsubmit ||
             card.brand) &&
           isPermitted
         ) {
           setNotPermitted(false)
         }
-      } else if (isFree) {
+      } else if (isFree && isPermitted) {
         setNotPermitted(false)
       } else {
         setNotPermitted(true)

diff --git a/src/reducers/PlaceOrderReducer.ts b/src/reducers/PlaceOrderReducer.ts
@@ -87,19 +87,19 @@ export const placeOrderPermitted: PlaceOrderPermitted = async ({
       isPermitted = localStorage.getItem('privacy-terms') === 'true'
     }
     const billingAddress = order.billing_address
-    if (isEmpty(billingAddress)) isPermitted = false
     const shippingAddress = order.shipping_address
     const doNotShip = isDoNotShip(order.line_items)
-    if (isEmpty(shippingAddress) && !doNotShip) isPermitted = false
     const shipments = order.shipments
     const shipment = shipments && shipmentsFilled(shipments)
-    if (!isEmpty(shipments) && !shipment) isPermitted = false
     const paymentMethod = order.payment_method
     const paymentSource = order.payment_source
-    // @ts-ignore
-    if (paymentSource?.mismatched_amounts) isPermitted = false
     if (order.total_amount_with_taxes_cents !== 0 && isEmpty(paymentMethod?.id))
       isPermitted = false
+    if (isEmpty(billingAddress)) isPermitted = false
+    if (isEmpty(shippingAddress) && !doNotShip) isPermitted = false
+    if (!isEmpty(shipments) && !shipment) isPermitted = false
+    // @ts-ignore
+    if (paymentSource?.mismatched_amounts) isPermitted = false
     dispatch({
       type: 'setPlaceOrderPermitted',
       payload: {