Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

payment plan refactor #4597

Open
wants to merge 77 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
fc2be86
payment plan split / delivery mechanism per payment plan refactor
Jan 28, 2025
b9dec37
migrations
Jan 28, 2025
6b7925e
migrations
Jan 28, 2025
266e2cf
remove set up fsp related files + adjust payment plan schema
Jan 28, 2025
7fc55e8
schema
Jan 28, 2025
753689f
fixture fix
Jan 28, 2025
89ef0ac
delivery mechanism admin fix
Jan 28, 2025
5357c34
confirmation dialog if no fsp info provided
Jan 28, 2025
7c1f570
schema fix
Jan 29, 2025
7898db6
schema fix
Jan 29, 2025
a2d7f6b
fsp validation
Jan 29, 2025
7e4f9bc
schema
Jan 29, 2025
7ac2fa0
fsp requirements validation
Jan 29, 2025
4059deb
targeting failed_wallet_validation_collectors_ids
Jan 29, 2025
e2e47fd
handle delivery mechanism saving in create and edit TP
Jan 29, 2025
e0f86e2
display payment channel only in first criteria element
Jan 29, 2025
cbf8f10
add modals for ids in results section
Jan 29, 2025
ba24a18
ut fix
Jan 30, 2025
4056cd9
ut fix
Jan 30, 2025
490d6cf
ut
Jan 31, 2025
686e4d8
display real ids
Jan 30, 2025
37b361b
open dialog only if ids
Jan 30, 2025
cad8c69
migrations fix
Jan 31, 2025
698806e
ut
Feb 5, 2025
c4b996a
ut
Feb 5, 2025
206c952
ut
Feb 5, 2025
b2fc0e2
Merge branch 'develop' into payment_plan_refactor
MarekBiczysko Feb 7, 2025
591b1e7
fix test selenium test_targeting
Feb 7, 2025
bba8273
clear fsp on dm change
Feb 7, 2025
20c31f0
fix displaying fsp and dm in targeting criteria components, fix value…
Feb 9, 2025
a02785d
update pp fix
Feb 10, 2025
211b7c0
update pp fix
Feb 10, 2025
51bc9db
Merge branch 'develop' into payment_plan_refactor
MarekBiczysko Feb 10, 2025
c344c71
fix validation of fsp and dm
Feb 10, 2025
bb57085
Merge branch 'develop' into payment_plan_refactor
MarekBiczysko Feb 11, 2025
00c722f
e2e
Feb 11, 2025
b64a330
Merge branch 'develop' into payment_plan_refactor
MarekBiczysko Feb 11, 2025
878cf4a
e2e
Feb 11, 2025
ac75c12
Merge branch 'payment_plan_refactor' of github.com:unicef/hope into p…
Feb 11, 2025
d9d4802
fix opening first modal
Feb 12, 2025
39938e0
e2e
Feb 12, 2025
636ecd8
Merge branch 'payment_plan_refactor' of github.com:unicef/hope into p…
Feb 12, 2025
e6fca63
pytajniczki
Feb 12, 2025
04ee694
chain again
Feb 12, 2025
c102f21
e2e
Feb 12, 2025
476cb0b
e2e
Feb 12, 2025
5d31260
e2e
Feb 12, 2025
e3bae46
e2e
Feb 12, 2025
6fd052a
Merge remote-tracking branch 'origin/develop' into payment_plan_refactor
Feb 13, 2025
57a20b7
merge fix
Feb 13, 2025
4e89963
merge fix
Feb 13, 2025
3783a32
drop payment dmppp model
Feb 14, 2025
513d66e
schema fix
Feb 14, 2025
79a5802
fe pp fsp display fix
Feb 14, 2025
9783dc4
merge dev
Feb 14, 2025
e5859fd
fe merge fix
Feb 14, 2025
0e31548
schema
Feb 17, 2025
829b401
fe ut
Feb 17, 2025
544f3dd
fe ut
Feb 17, 2025
815e78e
Merge remote-tracking branch 'origin' into payment_plan_refactor
Feb 18, 2025
cfe7b18
Merge remote-tracking branch 'origin/develop' into payment_plan_refactor
Feb 19, 2025
a4e1d53
migration merge fix
Feb 19, 2025
8f49904
update schema
Feb 19, 2025
8ffd8b2
lint
Feb 19, 2025
d4315d4
update snapshots
Feb 19, 2025
a9bc619
Merge remote-tracking branch 'origin/develop' into payment_plan_refactor
Feb 20, 2025
43c0fc3
Merge branch 'payment_plan_refactor' of github.com:unicef/hope into p…
Feb 20, 2025
7b2cdb1
ut
Feb 20, 2025
a88c5f3
ut
Feb 20, 2025
7e751f3
ut
Feb 20, 2025
226f2d8
Merge branch 'develop' into payment_plan_refactor
MarekBiczysko Feb 20, 2025
7615def
ut
Feb 20, 2025
8986039
Merge branch 'payment_plan_refactor' of github.com:unicef/hope into p…
Feb 20, 2025
f078591
ut
Feb 20, 2025
dd9dd4e
Merge remote-tracking branch 'origin/develop' into payment_plan_refactor
Feb 25, 2025
2cdd11b
new refactor
Feb 27, 2025
49c1e2e
Merge remote-tracking branch 'origin/develop' into payment_plan_refactor
Feb 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
316 changes: 243 additions & 73 deletions src/frontend/data/schema.graphql

Large diffs are not rendered by default.

26 changes: 10 additions & 16 deletions src/frontend/fixtures/paymentmodule/fakeApolloPaymentPlan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,24 +171,19 @@ export const fakeApolloPaymentPlan: PaymentPlanQuery['paymentPlan'] = {
importedFileName: '',
totalEntitledQuantityUsd: 424,
paymentsConflictsCount: 0,
deliveryMechanisms: [
{
deliveryMechanism: {
id: 'RGVsaXZlcnlNZWNoYW5pc21QZXJQYXltZW50UGxhbk5vZGU6Y2JjN2IyZDMtZmQ5ZC00YWE1LWFjZWMtNWU4MmEzNjU0MDdm',
name: 'Cash',
code: 'cash',
order: 1,
sentToPaymentGateway: false,
chosenConfiguration: '',
fsp: {
id: 'RmluYW5jaWFsU2VydmljZVByb3ZpZGVyTm9kZTowMDAwMDAwMC0wMDAwLTAwMDAtMDAwMC1mMDAwMDAwMDAwMDE=',
name: 'Test FSP 1',
communicationChannel: 'XLSX',
isPaymentGateway: false,
__typename: 'FinancialServiceProviderNode',
},
__typename: 'DeliveryMechanismPerPaymentPlanNode',
},
],
__typename: 'DeliveryMechanismNode',
},
financialServiceProvider: {
id: 'RmluYW5jaWFsU2VydmljZVByb3ZpZGVyTm9kZTowMDAwMDAwMC0wMDAwLTAwMDAtMDAwMC1mMDAwMDAwMDAwMDE=',
name: 'Test FSP 1',
communicationChannel: 'XLSX',
isPaymentGateway: false,
__typename: 'FinancialServiceProviderNode',
},
canSendToPaymentGateway: false,
canSplit: true,
splitChoices: [
Expand Down Expand Up @@ -223,7 +218,6 @@ export const fakeApolloPaymentPlan: PaymentPlanQuery['paymentPlan'] = {
deliveryMechanism: {
id: 'RGVsaXZlcnlNZWNoYW5pc21QZXJQYXltZW50UGxhbk5vZGU6Y2JjN2IyZDMtZmQ5ZC00YWE1LWFjZWMtNWU4MmEzNjU0MDdm',
name: 'Cash',
order: 1,
fsp: {
id: 'RmluYW5jaWFsU2VydmljZVByb3ZpZGVyTm9kZTowMDAwMDAwMC0wMDAwLTAwMDAtMDAwMC1mMDAwMDAwMDAwMDE=',
name: 'Test FSP 1',
Expand Down
8 changes: 4 additions & 4 deletions src/frontend/fixtures/paymentmodule/fakeFspsData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { AvailableFspsForDeliveryMechanismsQuery } from '../../src/__generated__
export const fakeFspsData = {
availableFspsForDeliveryMechanisms: [
{
deliveryMechanism: 'Cash by FSP',
deliveryMechanism: {"code": 'cash_by_fsp', "name": 'Cash by FSP'},
fsps: [
{
id: 'RmluYW5jaWFsU2VydmljZVByb3ZpZGVyTm9kZTo0ZTE3Y2NjMy0xYjNjLTQ1NDctODFiMC04YTQ2NTFiNWJmNTA=',
Expand All @@ -24,7 +24,7 @@ export const fakeFspsData = {
__typename: 'FspChoices',
},
{
deliveryMechanism: 'Cheque',
deliveryMechanism: {"code": 'cheque', "name": 'Cheque'},
fsps: [
{
id: 'RmluYW5jaWFsU2VydmljZVByb3ZpZGVyTm9kZTozNmJjYjkxYy05ZDhiLTRhNTEtYjU3NC01OGYzYzU2YzIyNWQ=',
Expand All @@ -45,7 +45,7 @@ export const fakeFspsData = {
__typename: 'FspChoices',
},
{
deliveryMechanism: 'In Kind',
deliveryMechanism: {"code": 'in_kind', "name": 'In Kind'},
fsps: [
{
id: 'RmluYW5jaWFsU2VydmljZVByb3ZpZGVyTm9kZTo0ZTE3Y2NjMy0xYjNjLTQ1NDctODFiMC04YTQ2NTFiNWJmNTA=',
Expand All @@ -66,7 +66,7 @@ export const fakeFspsData = {
__typename: 'FspChoices',
},
{
deliveryMechanism: 'Cash',
deliveryMechanism: {"code": 'cash', "name": 'Cash'},
fsps: [
{
id: 'RmluYW5jaWFsU2VydmljZVByb3ZpZGVyTm9kZTowMDAwMDAwMC0wMDAwLTAwMDAtMDAwMC1mMDAwMDAwMDAwMDE=',
Expand Down
Loading
Loading