Skip to content

refactor(payment_methods): List the Payment Methods for Merchant , based on the connector type #4909

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.

Sign up for GitHub

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

Merged
merged 15 commits into from
Aug 2, 2024
Merged

refactor(payment_methods): List the Payment Methods for Merchant , based on the connector type #4909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1e5e6fe
refact-payment-methods
Aprabhat19 Jun 5, 2024
69fb5f6
remove transaction type from pml
Aprabhat19 Jun 7, 2024
f80bfbf
Merge branch 'main' into refact-payment-methods
Aprabhat19 Jun 7, 2024
b844574
Merge branch 'main' into refact-payment-methods
Narayanbhat166 Jul 10, 2024
fde9e12
Merge branch 'main' of https://github.com/juspay/hyperswitch into ref…
Aprabhat19 Jul 10, 2024
8f5e5a4
address clippy errors
Aprabhat19 Jul 10, 2024
3f8b447
Merge branch 'refact-payment-methods' of https://github.com/juspay/hy…
Aprabhat19 Jul 10, 2024
6800887
fix failing postman checks:
Aprabhat19 Jul 10, 2024
b011e67
Merge branch 'main' of https://github.com/juspay/hyperswitch into ref…
Aprabhat19 Jul 10, 2024
a084e3e
Merge branch 'main' into refact-payment-methods
Aprabhat19 Jul 10, 2024
fd40dd5
CArgo lock changes
Aprabhat19 Jul 11, 2024
b122066
Merge branch 'refact-payment-methods' of https://github.com/juspay/hy…
Aprabhat19 Jul 11, 2024
a8ef626
make changes for stripe postman collection
Aprabhat19 Jul 11, 2024
6e592b2
Merge branch 'main' into refact-payment-methods
Aprabhat19 Jul 16, 2024
5af7bae
Merge branch 'main' into refact-payment-methods
Aprabhat19 Aug 2, 2024
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
10 changes: 5 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion crates/router/src/core/payments/helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,10 @@ pub fn filter_mca_based_on_business_profile(
if let Some(profile_id) = profile_id {
merchant_connector_accounts
.into_iter()
.filter(|mca| mca.profile_id.as_ref() == Some(&profile_id))
.filter(|mca| {
mca.profile_id.as_ref() == Some(&profile_id)
&& mca.connector_type == ConnectorType::PaymentProcessor
})
.collect::<Vec<_>>()
} else {
merchant_connector_accounts
Expand Down
2 changes: 1 addition & 1 deletion postman/collection-dir/aci/Flow Testcases/QuickStart/Payment Connector - Create/request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"raw_json_formatted": {
"connector_type": "fiz_operations",
"connector_type": "payment_processor",
"connector_name": "aci",
"connector_account_details": {
"auth_type": "BodyKey",
Expand Down
19 changes: 5 additions & 14 deletions ...collection-dir/adyen_uk/Flow Testcases/QuickStart/Payment Connector - Create/request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"raw_json_formatted": {
"connector_type": "fiz_operations",
"connector_type": "payment_processor",
"connector_name": "adyen",
"connector_account_details": {
"auth_type": "BodyKey",
Expand Down Expand Up @@ -313,10 +313,7 @@
{
"type": "CARD",
"parameters": {
"allowed_auth_methods": [
"PAN_ONLY",
"CRYPTOGRAM_3DS"
],
"allowed_auth_methods": ["PAN_ONLY", "CRYPTOGRAM_3DS"],
"allowed_card_networks": [
"AMEX",
"DISCOVER",
Expand All @@ -340,14 +337,8 @@
},
"url": {
"raw": "{{baseUrl}}/account/:account_id/connectors",
"host": [
"{{baseUrl}}"
],
"path": [
"account",
":account_id",
"connectors"
],
"host": ["{{baseUrl}}"],
"path": ["account", ":account_id", "connectors"],
"variable": [
{
"key": "account_id",
Expand All @@ -357,4 +348,4 @@
]
},
"description": "Create a new Payment Connector for the merchant account. The connector could be a payment processor / facilitator / acquirer or specialised services like Fraud / Accounting etc."
}
}
2 changes: 1 addition & 1 deletion ...ollection-dir/airwallex/Flow Testcases/QuickStart/Payment Connector - Create/request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"raw_json_formatted": {
"connector_type": "fiz_operations",
"connector_type": "payment_processor",
"connector_name": "airwallex",
"connector_account_details": {
"auth_type": "BodyKey",
Expand Down
2 changes: 1 addition & 1 deletion ...ion-dir/authorizedotnet/Flow Testcases/QuickStart/Payment Connector - Create/request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"raw_json_formatted": {
"connector_type": "fiz_operations",
"connector_type": "payment_processor",
"connector_name": "authorizedotnet",
"connector_account_details": {
"auth_type": "BodyKey",
Expand Down
5 changes: 2 additions & 3 deletions ...n Cases/Scenario12-Failed case for wrong api keys/Payment Connector - Update/request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"raw_json_formatted": {
"connector_type": "fiz_operations",
"connector_type": "payment_processor",
"connector_account_details": {
"auth_type": "BodyKey",
"api_key": "{{connector_api_key}}",
Expand All @@ -49,7 +49,7 @@
"url": {
"raw": "{{baseUrl}}/account/:account_id/connectors/:connector_id",
"host": ["{{baseUrl}}"],
"path": ["account", ":account_id", "connectors",":connector_id"],
"path": ["account", ":account_id", "connectors", ":connector_id"],
"variable": [
{
"key": "account_id",
Expand All @@ -61,7 +61,6 @@
"value": "{{merchant_connector_id}}",
"description": "(Required) The unique identifier for the merchant connector account"
}

]
},
"description": "Create a new Payment Connector for the merchant account. The connector could be a payment processor / facilitator / acquirer or specialised services like Fraud / Accounting etc."
Expand Down
2 changes: 1 addition & 1 deletion .../collection-dir/bambora/Flow Testcases/QuickStart/Payment Connector - Create/request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"raw_json_formatted": {
"connector_type": "fiz_operations",
"connector_type": "payment_processor",
"connector_name": "bambora",
"connector_account_details": {
"auth_type": "BodyKey",
Expand Down
2 changes: 1 addition & 1 deletion ...lection-dir/bambora_3ds/Flow Testcases/QuickStart/Payment Connector - Create/request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"raw_json_formatted": {
"connector_type": "fiz_operations",
"connector_type": "payment_processor",
"connector_name": "bambora",
"connector_account_details": {
"auth_type": "BodyKey",
Expand Down
22 changes: 5 additions & 17 deletions ...ction-dir/bankofamerica/Flow Testcases/QuickStart/Payment Connector - Create/request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"raw_json_formatted": {
"connector_type": "fiz_operations",
"connector_type": "payment_processor",
"connector_name": "bankofamerica",
"business_country": "US",
"business_label": "default",
Expand All @@ -57,21 +57,15 @@
"payment_method_types": [
{
"payment_method_type": "credit",
"card_networks": [
"Visa",
"Mastercard"
],
"card_networks": ["Visa", "Mastercard"],
"minimum_amount": 1,
"maximum_amount": 68607706,
"recurring_enabled": true,
"installment_payment_enabled": true
},
{
"payment_method_type": "debit",
"card_networks": [
"Visa",
"Mastercard"
],
"card_networks": ["Visa", "Mastercard"],
"minimum_amount": 1,
"maximum_amount": 68607706,
"recurring_enabled": true,
Expand All @@ -88,14 +82,8 @@
},
"url": {
"raw": "{{baseUrl}}/account/:account_id/connectors",
"host": [
"{{baseUrl}}"
],
"path": [
"account",
":account_id",
"connectors"
],
"host": ["{{baseUrl}}"],
"path": ["account", ":account_id", "connectors"],
"variable": [
{
"key": "account_id",
Expand Down
22 changes: 5 additions & 17 deletions ...an/collection-dir/bankofamerica/PaymentConnectors/Payment Connector - Create/request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"raw_json_formatted": {
"connector_type": "fiz_operations",
"connector_type": "payment_processor",
"connector_name": "bankofamerica",
"business_country": "US",
"business_label": "default",
Expand All @@ -57,21 +57,15 @@
"payment_method_types": [
{
"payment_method_type": "credit",
"card_networks": [
"Visa",
"Mastercard"
],
"card_networks": ["Visa", "Mastercard"],
"minimum_amount": 1,
"maximum_amount": 68607706,
"recurring_enabled": true,
"installment_payment_enabled": true
},
{
"payment_method_type": "debit",
"card_networks": [
"Visa",
"Mastercard"
],
"card_networks": ["Visa", "Mastercard"],
"minimum_amount": 1,
"maximum_amount": 68607706,
"recurring_enabled": true,
Expand All @@ -88,14 +82,8 @@
},
"url": {
"raw": "{{baseUrl}}/account/:account_id/connectors",
"host": [
"{{baseUrl}}"
],
"path": [
"account",
":account_id",
"connectors"
],
"host": ["{{baseUrl}}"],
"path": ["account", ":account_id", "connectors"],
"variable": [
{
"key": "account_id",
Expand Down
23 changes: 5 additions & 18 deletions ...an/collection-dir/bankofamerica/PaymentConnectors/Payment Connector - Update/request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"raw_json_formatted": {
"connector_type": "fiz_operations",
"connector_type": "payment_processor",
"connector_account_details": {
"auth_type": "SignatureKey",
"api_key": "{{connector_api_key}}",
Expand All @@ -54,21 +54,15 @@
"payment_method_types": [
{
"payment_method_type": "credit",
"card_networks": [
"Visa",
"Mastercard"
],
"card_networks": ["Visa", "Mastercard"],
"minimum_amount": 1,
"maximum_amount": 68607706,
"recurring_enabled": true,
"installment_payment_enabled": true
},
{
"payment_method_type": "debit",
"card_networks": [
"Visa",
"Mastercard"
],
"card_networks": ["Visa", "Mastercard"],
"minimum_amount": 1,
"maximum_amount": 68607706,
"recurring_enabled": true,
Expand All @@ -85,15 +79,8 @@
},
"url": {
"raw": "{{baseUrl}}/account/:account_id/connectors/:connector_id",
"host": [
"{{baseUrl}}"
],
"path": [
"account",
":account_id",
"connectors",
":connector_id"
],
"host": ["{{baseUrl}}"],
"path": ["account", ":account_id", "connectors", ":connector_id"],
"variable": [
{
"key": "account_id",
Expand Down
36 changes: 23 additions & 13 deletions ...collection-dir/bluesnap/Flow Testcases/QuickStart/Payment Connector - Create/request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"raw_json_formatted": {
"connector_type": "fiz_operations",
"connector_type": "payment_processor",
"connector_name": "bluesnap",
"connector_account_details": {
"auth_type": "BodyKey",
Expand All @@ -53,25 +53,35 @@
"payment_method_types": [
{
"payment_method_type": "credit",
"card_networks": ["AmericanExpress",
"Discover",
"Interac",
"JCB",
"Mastercard",
"Visa", "DinersClub","UnionPay","RuPay"],
"card_networks": [
"AmericanExpress",
"Discover",
"Interac",
"JCB",
"Mastercard",
"Visa",
"DinersClub",
"UnionPay",
"RuPay"
],
"minimum_amount": 1,
"maximum_amount": 68607706,
"recurring_enabled": true,
"installment_payment_enabled": true
},
{
"payment_method_type": "debit",
"card_networks": ["AmericanExpress",
"Discover",
"Interac",
"JCB",
"Mastercard",
"Visa", "DinersClub","UnionPay","RuPay"],
"card_networks": [
"AmericanExpress",
"Discover",
"Interac",
"JCB",
"Mastercard",
"Visa",
"DinersClub",
"UnionPay",
"RuPay"
],
"minimum_amount": 1,
"maximum_amount": 68607706,
"recurring_enabled": true,
Expand Down
2 changes: 1 addition & 1 deletion ...ollection-dir/braintree/Flow Testcases/QuickStart/Payment Connector - Create/request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
},
"raw_json_formatted": {
"connector_type": "fiz_operations",
"connector_type": "payment_processor",
"connector_name": "braintree",
"connector_account_details": {
"auth_type": "SignatureKey",
Expand Down
Loading
Loading