fix: check for customer email if addresses already present

Author: malessani

components/data/AppProvider/index.tsx

@@ -133,15 +133,22 @@ export const AppProvider: React.FC<AppProviderProps> = ({
 
   const setAddresses = async () => {
     dispatch({ type: ActionType.START_LOADING })
+
+    // TODO  Set shipping method if only one
+
     const order = await cl.orders.retrieve(orderId, {
       fields: {
         orders: ["shipping_address", "billing_address", "shipments"],
+        shipments: ["shipping_method"],
       },
-      include: ["shipping_address", "billing_address", "shipments"],
+      include: [
+        "shipping_address",
+        "billing_address",
+        "shipments",
+        "shipments.shipping_method",
+      ],
     })
 
-    // TODO  Set shipping method if only one
-
     dispatch({
       type: ActionType.SET_ADDRESSES,
       payload: {

components/data/AppProvider/reducer.ts

@@ -12,6 +12,7 @@ import {
   calculateAddresses,
   calculateSelectedShipments,
   creditCardPayment,
+  hasShippingMethodSet,
 } from "components/data/AppProvider/utils"
 
 export enum ActionType {
@@ -101,15 +102,20 @@ export function reducer(state: AppStateData, action: Action): AppStateData {
         hasEmailAddress: Boolean(action.payload.customerEmail),
         isLoading: false,
       }
-    case ActionType.SET_ADDRESSES:
+    case ActionType.SET_ADDRESSES: {
+      const preparedShipments = prepareShipments(action.payload.order.shipments)
+      let { hasShippingMethod } = hasShippingMethodSet(preparedShipments)
+      if (!state.isShipmentRequired) {
+        hasShippingMethod = true
+      }
       return {
         ...state,
         ...calculateAddresses(action.payload.order, state.customerAddresses),
-        shipments: state.isShipmentRequired
-          ? prepareShipments(action.payload.order.shipments)
-          : [],
+        shipments: state.isShipmentRequired ? preparedShipments : [],
+        hasShippingMethod,
         isLoading: false,
       }
+    }
     case ActionType.SELECT_SHIPMENT: {
       return {
         ...state,

components/data/AppProvider/utils.ts

@@ -264,16 +264,6 @@ export async function checkIfShipmentRequired(
   return lineItems.length > 0
 }
 
-export function prepareShipments(shipments?: Shipment[]) {
-  return (shipments || []).map((a) => {
-    return {
-      shipmentId: a.id,
-      shippingMethodId: a.shipping_method?.id,
-      shippingMethodName: a.shipping_method?.name,
-    }
-  })
-}
-
 function isPaymentRequired(order: Order) {
   return !(order.total_amount_with_taxes_float === 0)
 }
@@ -392,13 +382,26 @@ export function calculateSelectedShipments(
         }
       : shipment
   })
+  const hasShippingMethod = hasShippingMethodSet(shipmentsSelected)
+  return { shipments: shipmentsSelected, ...hasShippingMethod }
+}
+
+export function prepareShipments(shipments?: Shipment[]) {
+  return (shipments || []).map((a) => {
+    return {
+      shipmentId: a.id,
+      shippingMethodId: a.shipping_method?.id,
+      shippingMethodName: a.shipping_method?.name,
+    }
+  })
+}
 
-  const shippingMethods = shipmentsSelected?.map(
+export function hasShippingMethodSet(shipments: ShipmentSelected[]) {
+  const shippingMethods = shipments?.map(
     (a: ShipmentSelected) => a.shippingMethodId
   )
   const hasShippingMethod = Boolean(
     shippingMethods?.length && !shippingMethods?.includes(undefined)
   )
-
-  return { shipments: shipmentsSelected, hasShippingMethod }
+  return { hasShippingMethod }
 }

components/hooks/useActiveStep.ts

@@ -54,7 +54,7 @@ export const useActiveStep = (): UseActiveStep => {
       }
 
       const canSelectCustomerAddress =
-        ctx.hasShippingAddress && ctx.hasBillingAddress
+        ctx.hasShippingAddress && ctx.hasBillingAddress && ctx.hasEmailAddress
       const canSelectShippingMethod =
         canSelectCustomerAddress &&
         (ctx.hasShippingAddress || !ctx.isShipmentRequired)

playwright.config.ts

@@ -10,6 +10,8 @@ const config: PlaywrightTestConfig = {
   retries: 0,
   // Artifacts folder where screenshots, videos, and traces are stored.
   outputDir: "test-results/",
+  workers: 1,
+  maxFailures: 2,
 
   // Run your local dev server before starting the tests:
   // https://playwright.dev/docs/test-advanced#launching-a-development-web-server-during-the-tests