Skip to content

Commit f46c39a

Browse files
committed
Merge remote-tracking branch 'origin/main' into 8392-allow-payout_id_to-be-configurable
2 parents c5a3361 + 0c64915 commit f46c39a

File tree

21 files changed

+1044
-2199
lines changed

21 files changed

+1044
-2199
lines changed

config/config.example.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ wise.base_url = "https://api.sandbox.transferwise.tech/"
299299
worldline.base_url = "https://eu.sandbox.api-ingenico.com/"
300300
worldpay.base_url = "https://try.access.worldpay.com/"
301301
worldpayvantiv.base_url = "https://transact.vantivprelive.com/vap/communicator/online"
302+
worldpayvantiv.secondary_base_url = "https://onlinessr.vantivprelive.com"
302303
worldpayxml.base_url = "https://secure-test.worldpay.com/jsp/merchant/xml/paymentService.jsp"
303304
xendit.base_url = "https://api.xendit.co"
304305
zsl.base_url = "https://api.sitoffalb.net/"
@@ -513,8 +514,8 @@ wallet.google_pay = { connector_list = "bankofamerica,authorizedotnet" }
513514
bank_redirect.giropay = { connector_list = "globalpay" }
514515

515516
[mandates.supported_payment_methods]
516-
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel"
517-
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel"
517+
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel,worldpayvantiv"
518+
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel,worldpayvantiv"
518519
wallet.paypal = { connector_list = "adyen,novalnet" } # Mandate supported payment method type and connector for wallets
519520
pay_later.klarna = { connector_list = "adyen" } # Mandate supported payment method type and connector for pay_later
520521
bank_debit.ach = { connector_list = "gocardless,adyen" } # Mandate supported payment method type and connector for bank_debit
@@ -1056,7 +1057,7 @@ webhook_source_verification_key= "" # webhook source verification key to verify
10561057
connector_list = "adyen,cybersource" # Supported connectors for network tokenization
10571058

10581059
[network_transaction_id_supported_connectors]
1059-
connector_list = "adyen,archipel,cybersource,novalnet,stripe,worldpay" # Supported connectors for network transaction id
1060+
connector_list = "adyen,archipel,cybersource,novalnet,stripe,worldpay,worldpayvantiv" # Supported connectors for network transaction id
10601061

10611062
[grpc_client.dynamic_routing_client] # Dynamic Routing Client Configuration
10621063
host = "localhost" # Client Host

config/deployments/integration_test.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ wise.base_url = "https://api.sandbox.transferwise.tech/"
134134
worldline.base_url = "https://eu.sandbox.api-ingenico.com/"
135135
worldpay.base_url = "https://try.access.worldpay.com/"
136136
worldpayvantiv.base_url = "https://transact.vantivprelive.com/vap/communicator/online"
137+
worldpayvantiv.secondary_base_url = "https://onlinessr.vantivprelive.com"
137138
worldpayxml.base_url = "https://secure-test.worldpay.com/jsp/merchant/xml/paymentService.jsp"
138139
xendit.base_url = "https://api.xendit.co"
139140
zen.base_url = "https://api.zen-test.com/"
@@ -209,8 +210,8 @@ bank_debit.ach = { connector_list = "gocardless,adyen,stripe" }
209210
bank_debit.becs = { connector_list = "gocardless,stripe,adyen" }
210211
bank_debit.bacs = { connector_list = "stripe,gocardless" }
211212
bank_debit.sepa = { connector_list = "gocardless,adyen,stripe,deutschebank" }
212-
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel"
213-
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel"
213+
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel,worldpayvantiv"
214+
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel,worldpayvantiv"
214215
pay_later.klarna.connector_list = "adyen,aci"
215216
wallet.apple_pay.connector_list = "stripe,adyen,cybersource,noon,bankofamerica,nexinets,novalnet,authorizedotnet,wellsfargo"
216217
wallet.samsung_pay.connector_list = "cybersource"
@@ -237,7 +238,7 @@ card.credit = { connector_list = "cybersource" } # Update Mandate sup
237238
card.debit = { connector_list = "cybersource" } # Update Mandate supported payment method type and connector for card
238239

239240
[network_transaction_id_supported_connectors]
240-
connector_list = "adyen,archipel,cybersource,novalnet,stripe,worldpay"
241+
connector_list = "adyen,archipel,cybersource,novalnet,stripe,worldpay,worldpayvantiv"
241242

242243

243244
[payouts]

config/deployments/production.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ wise.base_url = "https://api.wise.com/"
138138
worldline.base_url = "https://eu.api-ingenico.com/"
139139
worldpay.base_url = "https://access.worldpay.com/"
140140
worldpayvantiv.base_url = "https://transact.vantivcnp.com/vap/communicator/online"
141+
worldpayvantiv.secondary_base_url = "https://onlinessr.vantivcnp.com"
141142
worldpayxml.base_url = "https://secure.worldpay.com/jsp/merchant/xml/paymentService.jsp"
142143
xendit.base_url = "https://api.xendit.co"
143144
zen.base_url = "https://api.zen.com/"
@@ -209,8 +210,8 @@ bank_debit.ach = { connector_list = "gocardless,adyen,stripe" }
209210
bank_debit.becs = { connector_list = "gocardless,stripe,adyen" }
210211
bank_debit.bacs = { connector_list = "stripe,gocardless" }
211212
bank_debit.sepa = { connector_list = "gocardless,adyen,stripe,deutschebank" }
212-
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel"
213-
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel"
213+
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel,worldpayvantiv"
214+
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel,worldpayvantiv"
214215
pay_later.klarna.connector_list = "adyen,aci"
215216
wallet.apple_pay.connector_list = "stripe,adyen,cybersource,noon,bankofamerica,nexinets,novalnet,authorizedotnet,wellsfargo"
216217
wallet.samsung_pay.connector_list = "cybersource"
@@ -237,7 +238,7 @@ card.credit = { connector_list = "cybersource" } # Update Mandate sup
237238
card.debit = { connector_list = "cybersource" } # Update Mandate supported payment method type and connector for card
238239

239240
[network_transaction_id_supported_connectors]
240-
connector_list = "adyen,archipel,stripe"
241+
connector_list = "adyen,archipel,stripe,worldpayvantiv"
241242

242243
[payouts]
243244
payout_eligibility = true # Defaults the eligibility of a payout method to true in case connector does not provide checks for payout eligibility

config/deployments/sandbox.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ wise.base_url = "https://api.sandbox.transferwise.tech/"
138138
worldline.base_url = "https://eu.sandbox.api-ingenico.com/"
139139
worldpay.base_url = "https://try.access.worldpay.com/"
140140
worldpayvantiv.base_url = "https://transact.vantivprelive.com/vap/communicator/online"
141+
worldpayvantiv.secondary_base_url = "https://onlinessr.vantivprelive.com"
141142
worldpayxml.base_url = "https://secure-test.worldpay.com/jsp/merchant/xml/paymentService.jsp"
142143
xendit.base_url = "https://api.xendit.co"
143144
zen.base_url = "https://api.zen-test.com/"
@@ -216,8 +217,8 @@ bank_debit.ach = { connector_list = "gocardless,adyen,stripe" }
216217
bank_debit.becs = { connector_list = "gocardless,stripe,adyen" }
217218
bank_debit.bacs = { connector_list = "stripe,gocardless" }
218219
bank_debit.sepa = { connector_list = "gocardless,adyen,stripe,deutschebank" }
219-
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel"
220-
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel"
220+
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel,worldpayvantiv"
221+
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel,worldpayvantiv"
221222
pay_later.klarna.connector_list = "adyen,aci"
222223
wallet.apple_pay.connector_list = "stripe,adyen,cybersource,noon,bankofamerica,nexinets,novalnet,authorizedotnet,wellsfargo"
223224
wallet.samsung_pay.connector_list = "cybersource"
@@ -244,7 +245,7 @@ card.credit = { connector_list = "cybersource" } # Update Mandate sup
244245
card.debit = { connector_list = "cybersource" } # Update Mandate supported payment method type and connector for card
245246

246247
[network_transaction_id_supported_connectors]
247-
connector_list = "adyen,archipel,cybersource,novalnet,stripe,worldpay"
248+
connector_list = "adyen,archipel,cybersource,novalnet,stripe,worldpay,worldpayvantiv"
248249

249250

250251
[payouts]

config/development.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ wise.base_url = "https://api.sandbox.transferwise.tech/"
324324
worldline.base_url = "https://eu.sandbox.api-ingenico.com/"
325325
worldpay.base_url = "https://try.access.worldpay.com/"
326326
worldpayvantiv.base_url = "https://transact.vantivprelive.com/vap/communicator/online"
327+
worldpayvantiv.secondary_base_url = "https://onlinessr.vantivprelive.com"
327328
worldpayxml.base_url = "https://secure-test.worldpay.com/jsp/merchant/xml/paymentService.jsp"
328329
xendit.base_url = "https://api.xendit.co"
329330
trustpay.base_url = "https://test-tpgw.trustpay.eu/"
@@ -937,8 +938,8 @@ bank_debit.ach = { connector_list = "gocardless,adyen,stripe" }
937938
bank_debit.becs = { connector_list = "gocardless,stripe,adyen" }
938939
bank_debit.bacs = { connector_list = "stripe,gocardless" }
939940
bank_debit.sepa = { connector_list = "gocardless,adyen,stripe,deutschebank" }
940-
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel"
941-
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel"
941+
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel,worldpayvantiv"
942+
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree,nuvei,payme,wellsfargo,bamboraapac,elavon,fiuu,nexixpay,novalnet,paybox,paypal,xendit,moneris,archipel,worldpayvantiv"
942943
pay_later.klarna.connector_list = "adyen,aci"
943944
wallet.apple_pay.connector_list = "stripe,adyen,cybersource,noon,bankofamerica,nexinets,novalnet,authorizedotnet,wellsfargo"
944945
wallet.samsung_pay.connector_list = "cybersource"
@@ -965,7 +966,7 @@ card.credit = { connector_list = "cybersource" }
965966
card.debit = { connector_list = "cybersource" }
966967

967968
[network_transaction_id_supported_connectors]
968-
connector_list = "adyen,archipel,cybersource,novalnet,stripe,worldpay"
969+
connector_list = "adyen,archipel,cybersource,novalnet,stripe,worldpay,worldpayvantiv"
969970

970971
[connector_request_reference_id_config]
971972
merchant_ids_send_payment_id_as_connector_request_id = []

config/docker_compose.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ wise.base_url = "https://api.sandbox.transferwise.tech/"
225225
worldline.base_url = "https://eu.sandbox.api-ingenico.com/"
226226
worldpay.base_url = "https://try.access.worldpay.com/"
227227
worldpayvantiv.base_url = "https://transact.vantivprelive.com/vap/communicator/online"
228+
worldpayvantiv.secondary_base_url = "https://onlinessr.vantivprelive.com"
228229
worldpayxml.base_url = "https://secure-test.worldpay.com/jsp/merchant/xml/paymentService.jsp"
229230
xendit.base_url = "https://api.xendit.co"
230231
zen.base_url = "https://api.zen-test.com/"
@@ -865,8 +866,8 @@ wallet.google_pay = { connector_list = "stripe,adyen,bankofamerica,authorizedotn
865866
wallet.apple_pay = { connector_list = "stripe,adyen,cybersource,noon,bankofamerica,authorizedotnet,novalnet,multisafepay,wellsfargo" }
866867
wallet.samsung_pay = { connector_list = "cybersource" }
867868
wallet.paypal = { connector_list = "adyen,novalnet,authorizedotnet" }
868-
card.credit = { connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,elavon,xendit,novalnet,bamboraapac,archipel,wellsfargo" }
869-
card.debit = { connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,elavon,xendit,novalnet,bamboraapac,archipel,wellsfargo" }
869+
card.credit = { connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,elavon,xendit,novalnet,bamboraapac,archipel,wellsfargo,worldpayvantiv" }
870+
card.debit = { connector_list = "stripe,adyen,authorizedotnet,cybersource,datatrans,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,elavon,xendit,novalnet,bamboraapac,archipel,wellsfargo,worldpayvantiv" }
870871
bank_debit.ach = { connector_list = "gocardless,adyen" }
871872
bank_debit.becs = { connector_list = "gocardless" }
872873
bank_debit.bacs = { connector_list = "adyen" }
@@ -880,7 +881,7 @@ card.credit = { connector_list = "cybersource" }
880881
card.debit = { connector_list = "cybersource" }
881882

882883
[network_transaction_id_supported_connectors]
883-
connector_list = "adyen,archipel,cybersource,novalnet,stripe,worldpay"
884+
connector_list = "adyen,archipel,cybersource,novalnet,stripe,worldpay,worldpayvantiv"
884885

885886
[connector_customer]
886887
connector_list = "adyen,facilitapay,gocardless,hyperswitch_vault,stax,stripe"

0 commit comments

Comments
 (0)