Merge branch 'payment_plan_refactor' of github.com:unicef/hope into p…

…ayment_plan_refactor
unicef · Jan 31, 2025 · 5676dac · 5676dac
2 parents 269e3f0 + de5119a
commit 5676dac
Show file tree

Hide file tree

Showing 22 changed files with 60 additions and 840 deletions.
diff --git a/src/frontend/data/schema.graphql b/src/frontend/data/schema.graphql
@@ -2581,9 +2581,9 @@ type PaymentPlanNode implements Node {
   steficonTargetingAppliedDate: DateTime
   sourcePaymentPlan: PaymentPlanNode
   isFollowUp: Boolean!
-  excludedIds: String!
-  exclusionReason: String!
-  excludeHouseholdError: String!
+  excludedIds: String
+  exclusionReason: String
+  excludeHouseholdError: String
   name: String
   vulnerabilityScoreMin: Float
   vulnerabilityScoreMax: Float

diff --git a/src/frontend/src/__generated__/graphql.tsx b/src/frontend/src/__generated__/graphql.tsx
diff --git a/src/frontend/src/apollo/queries/paymentmodule/PaymentPlan.ts b/src/frontend/src/apollo/queries/paymentmodule/PaymentPlan.ts
@@ -10,6 +10,7 @@ export const PAYMENT_PLAN_QUERY = gql`
       status
       buildStatus
       canCreateFollowUp
+      failedWalletValidationCollectorsIds
       backgroundActionStatus
       canCreatePaymentVerificationPlan
       availablePaymentRecordsCount

diff --git a/src/frontend/src/apollo/queries/targeting/TargetPopulation.ts b/src/frontend/src/apollo/queries/targeting/TargetPopulation.ts
@@ -9,6 +9,7 @@ export const TARGET_POPULATION_QUERY = gql`
       status
       buildStatus
       adminUrl
+      failedWalletValidationCollectorsIds
       totalHouseholdsCount
       totalIndividualsCount
       femaleChildrenCount

diff --git a/src/frontend/src/components/paymentmodule/PaymentPlanDetails/FspSection/FspSection.test.tsx b/src/frontend/src/components/paymentmodule/PaymentPlanDetails/FspSection/FspSection.test.tsx
diff --git a/...meByDeliveryMechanismSection/__snapshots__/VolumeByDeliveryMechanismSection.test.tsx.snap b/...meByDeliveryMechanismSection/__snapshots__/VolumeByDeliveryMechanismSection.test.tsx.snap
@@ -48,60 +48,6 @@ exports[`components/paymentmodule/PaymentPlanDetails/VolumeByDeliveryMechanismSe
             </div>
           </div>
         </div>
-        <div
-          class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-6 css-1osj8n2-MuiGrid-root"
-        >
-          <div
-            class="sc-egkSDF eVkuQb"
-            color=" #d8d8d8"
-          >
-            <div>
-              <span
-                class="sc-blHHSb dUfUKp"
-                color="textSecondary"
-              >
-                In Kind (Frazier-Watson)
-              </span>
-              <div
-                data-cy="label-In Kind (Frazier-Watson)"
-              >
-                <span
-                  class="sc-gtLWhw dynQwi"
-                  color="textSecondary"
-                >
-                  0 PLN (0 USD)
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-6 css-1osj8n2-MuiGrid-root"
-        >
-          <div
-            class="sc-egkSDF dYDxEt"
-            color="#003C8F"
-          >
-            <div>
-              <span
-                class="sc-blHHSb dUfUKp"
-                color="textSecondary"
-              >
-                Transfer (Bray Group)
-              </span>
-              <div
-                data-cy="label-Transfer (Bray Group)"
-              >
-                <span
-                  class="sc-gtLWhw dynQwi"
-                  color="textSecondary"
-                >
-                  0 PLN (0 USD)
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
       </div>
       <div
         class="MuiGrid-root MuiGrid-container css-1e2bu2o-MuiGrid-root"

diff --git a/...onents/paymentmodule/PaymentPlanDetails/FspSection/__snapshots__/FspSection.test.tsx.snap b/...onents/paymentmodule/PaymentPlanDetails/FspSection/__snapshots__/FspSection.test.tsx.snap
diff --git a/...mponents/paymentmodule/PaymentPlanDetails/PaymentPlanDetailsHeader/LockFspPaymentPlan.tsx b/...mponents/paymentmodule/PaymentPlanDetails/PaymentPlanDetailsHeader/LockFspPaymentPlan.tsx
@@ -40,7 +40,7 @@ export function LockFspPaymentPlan({
     );
 
   const canLockFsp =
-    paymentPlan.deliveryMechanisms.length > 0 &&
+    paymentPlan.deliveryMechanism &&
     hasPermissions(PERMISSIONS.PM_LOCK_AND_UNLOCK_FSP, permissions);
 
   return (

diff --git a/...tend/src/components/paymentmodulepeople/PaymentPlanDetails/FspSection/FspSection.test.tsx b/...tend/src/components/paymentmodulepeople/PaymentPlanDetails/FspSection/FspSection.test.tsx
@@ -8,7 +8,7 @@ describe('components/paymentmodule/PaymentPlanDetails/FspSection', () => {
     const { container } = render(
       <FspSection
         baseUrl={fakeBaseUrl}
-        paymentPlan={{ ...fakeApolloPaymentPlan, deliveryMechanisms: [] }}
+        paymentPlan={{ ...fakeApolloPaymentPlan, deliveryMechanism: null }}
       />,
     );
     expect(container).toMatchSnapshot();