Use customer default payment method to fetch service estimations

Autofleet · Jun 24, 2024 · 5993138 · 5993138
1 parent eb23fd6
commit 5993138
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/examples/client/Locomotion/src/context/newRideContext/api.js b/examples/client/Locomotion/src/context/newRideContext/api.js
@@ -1,8 +1,8 @@
 import network from '../../services/network';
 
-export const createServiceEstimations = async (stopPoints, scheduledTo, businessAccountId) => {
+export const createServiceEstimations = async (stopPoints, scheduledTo, businessAccountId, paymentMethodId) => {
   try {
-    const { data } = await network.post('api/v1/services/service-estimations', { stopPoints, scheduledTo, businessAccountId });
+    const { data } = await network.post('api/v1/services/service-estimations', { stopPoints, scheduledTo, businessAccountId, paymentMethodId });
     return data;
   } catch (e) {
     console.error(e);

diff --git a/examples/client/Locomotion/src/context/newRideContext/index.tsx b/examples/client/Locomotion/src/context/newRideContext/index.tsx
@@ -440,8 +440,9 @@ const RidePageContextProvider = ({ children }: {
         const unixScheduledTo = moment.unix(Number(ride.scheduledTo) / 1000);
         scheduledTime = await getLocationTimezoneTime(formattedStopPoints[0].lat, formattedStopPoints[0].lng, unixScheduledTo);
       }
+      const defaultPaymentMethodId = getClientDefaultMethod()?.id;
       const { estimations, services } = await rideApi
-        .createServiceEstimations(formattedStopPoints, scheduledTime, relevantBusinessAccountId);
+        .createServiceEstimations(formattedStopPoints, scheduledTime, relevantBusinessAccountId, defaultPaymentMethodId);
 
       const tags = getEstimationTags(estimations);
       const formattedEstimations = formatEstimations(services, estimations, tags);

diff --git a/examples/client/Locomotion/src/context/payments/index.js b/examples/client/Locomotion/src/context/payments/index.js
@@ -108,12 +108,16 @@ const usePayments = () => {
   && paymentMethods.some(pm => !pm.isExpired);
 
   const getClientDefaultMethod = (enableCash) => {
+    if (customer.defaultPaymentMethodId) {
+      return customer.defaultPaymentMethodId;
+    }
     if (paymentMethods && paymentMethods.length) {
-      return (paymentMethods || []).find(pm => pm.isDefault) || paymentMethods[0];
+      return paymentMethods.find(pm => pm.isDefault) || paymentMethods[0];
     }
     if (enableCash) {
       return cashPaymentMethod;
     }
+    return null;
   };
 
   const createPaymentMethod = async (paymentMethodId) => {