217950_Payment_Module_Getting_Delivery_Mechanism_error_when_rejecting…

…_a_payment_plan_and_assigning_FSP
unicef · Oct 16, 2024 · 9b86316 · 9b86316
1 parent 865307e
commit 9b86316
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/...nDetails/FspSection/VolumeByDeliveryMechanismSection/VolumeByDeliveryMechanismSection.tsx b/...nDetails/FspSection/VolumeByDeliveryMechanismSection/VolumeByDeliveryMechanismSection.tsx
@@ -69,8 +69,8 @@ export const VolumeByDeliveryMechanismSection: React.FC<
           color={getDeliveryMechanismColor(vdm.deliveryMechanism.name)}
         >
           <LabelizedField
-            label={`${vdm.deliveryMechanism.name} (${vdm.deliveryMechanism.fsp?.name})`}
-            value={`${vdm.volume} ${paymentPlan.currency} (${vdm.volumeUsd} USD)`}
+            label={`${vdm.deliveryMechanism.name} (${vdm.deliveryMechanism.fsp?.name ?? '-'})`}
+            value={`${vdm.volume ?? '0.00'} ${paymentPlan.currency} (${vdm.volumeUsd ?? '0.00'} USD)`}
           />
         </FieldBorder>
       </Grid>

diff --git a/...nDetails/FspSection/VolumeByDeliveryMechanismSection/VolumeByDeliveryMechanismSection.tsx b/...nDetails/FspSection/VolumeByDeliveryMechanismSection/VolumeByDeliveryMechanismSection.tsx
@@ -69,8 +69,8 @@ export const VolumeByDeliveryMechanismSection: React.FC<
           color={getDeliveryMechanismColor(vdm.deliveryMechanism.name)}
         >
           <LabelizedField
-            label={`${vdm.deliveryMechanism.name} (${vdm.deliveryMechanism.fsp?.name})`}
-            value={`${vdm.volume} ${paymentPlan.currency} (${vdm.volumeUsd} USD)`}
+            label={`${vdm.deliveryMechanism.name} (${vdm.deliveryMechanism.fsp?.name ?? '-'})`}
+            value={`${vdm.volume ?? '0.00'} ${paymentPlan.currency} (${vdm.volumeUsd ?? '0.00'} USD)`}
           />
         </FieldBorder>
       </Grid>

diff --git a/src/frontend/src/containers/pages/paymentmodule/EditFollowUpSetUpFspPage.tsx b/src/frontend/src/containers/pages/paymentmodule/EditFollowUpSetUpFspPage.tsx
@@ -29,7 +29,7 @@ export function EditFollowUpSetUpFspPage(): React.ReactElement {
 
   const mappedInitialDeliveryMechanisms =
     paymentPlanData.paymentPlan.deliveryMechanisms.map((el) => ({
-      deliveryMechanism: el.name,
+      deliveryMechanism: el.code,
       fsp: el.fsp?.id || '',
       chosenConfiguration: el.chosenConfiguration || '',
     }));

diff --git a/src/frontend/src/containers/pages/paymentmodulepeople/EditPeopleFollowUpSetUpFspPage.tsx b/src/frontend/src/containers/pages/paymentmodulepeople/EditPeopleFollowUpSetUpFspPage.tsx
@@ -29,7 +29,7 @@ export const EditPeopleFollowUpSetUpFspPage = (): React.ReactElement => {
 
   const mappedInitialDeliveryMechanisms =
     paymentPlanData.paymentPlan.deliveryMechanisms.map((el) => ({
-      deliveryMechanism: el.name,
+      deliveryMechanism: el.code,
       fsp: el.fsp?.id || '',
       chosenConfiguration: el.chosenConfiguration || '',
     }));

diff --git a/src/frontend/src/containers/pages/paymentmodulepeople/EditPeopleSetUpFspPage.tsx b/src/frontend/src/containers/pages/paymentmodulepeople/EditPeopleSetUpFspPage.tsx
@@ -29,7 +29,7 @@ export const EditPeopleSetUpFspPage = (): React.ReactElement => {
 
   const mappedInitialDeliveryMechanisms =
     paymentPlanData.paymentPlan.deliveryMechanisms.map((el) => ({
-      deliveryMechanism: el.name,
+      deliveryMechanism: el.code,
       fsp: el.fsp?.id || '',
       chosenConfiguration: el.chosenConfiguration || '',
     }));