Skip to content

Commit 35ee07e

Browse files
SakilmostakSakilmostak
committed
Merge branch 'main' into payout_retrieve
2 parents 095f40a + 2149994 commit 35ee07e

File tree

167 files changed

+11600
-3599
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+11600
-3599
lines changed

‎CHANGELOG.md

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,65 @@ All notable changes to HyperSwitch will be documented here.
44

55
- - -
66

7+
## 2024.07.12.0
8+
9+
### Features
10+
11+
- **config:** [ZSL] Update ZSL base url for production ([#5290](https://github.com/juspay/hyperswitch/pull/5290)) ([`4e41827`](https://github.com/juspay/hyperswitch/commit/4e41827ade5a4c844cbc8822618ac2e35c6029e2))
12+
- **payouts:** Add country, currency filters for payout methods ([#5130](https://github.com/juspay/hyperswitch/pull/5130)) ([`d6f7f3c`](https://github.com/juspay/hyperswitch/commit/d6f7f3c799558a624d065b0eff31748c97e24baa))
13+
- Create key in encryption service for merchant and user ([#4910](https://github.com/juspay/hyperswitch/pull/4910)) ([`43741df`](https://github.com/juspay/hyperswitch/commit/43741df4a76a66faa472dacd66b396232a2fbdbf))
14+
15+
### Bug Fixes
16+
17+
- **analytics:** Resolve issues for payment-intent v2 analytics ([#5283](https://github.com/juspay/hyperswitch/pull/5283)) ([`bcb3450`](https://github.com/juspay/hyperswitch/commit/bcb3450445807a12cde70333bf24593ed57091b5))
18+
- **connector:** [BANKOFAMERICA] Remove cards 3ds flow ([#5294](https://github.com/juspay/hyperswitch/pull/5294)) ([`7c408af`](https://github.com/juspay/hyperswitch/commit/7c408aff1e7a664d38216fadb49730f378622ed2))
19+
- **cypress:** Validate false positives and fix PML tests ([#5293](https://github.com/juspay/hyperswitch/pull/5293)) ([`68adda0`](https://github.com/juspay/hyperswitch/commit/68adda036d4830a8803768efdeb7f43e09365339))
20+
- **router:**
21+
- Send assurance_details required as false in googlepay metadata during merchant_connector_account creation from dashboard ([#5278](https://github.com/juspay/hyperswitch/pull/5278)) ([`6f754ea`](https://github.com/juspay/hyperswitch/commit/6f754eaa1dee947bc0f4917bc8cb2ce49d59de67))
22+
- [razorpay] update refund webhook reference id ([#5297](https://github.com/juspay/hyperswitch/pull/5297)) ([`48e3b41`](https://github.com/juspay/hyperswitch/commit/48e3b41e32ba54a8d8642ba65b1cda251a6da315))
23+
- Fail refund with bad request error for duplicate refund_id in refunds create flow ([#5282](https://github.com/juspay/hyperswitch/pull/5282)) ([`f63a678`](https://github.com/juspay/hyperswitch/commit/f63a678d71ee1cc55aa3569a52d6e6541ba65c44))
24+
- Fixed integrity check failures in case of 3ds flow in sync flow ([#5279](https://github.com/juspay/hyperswitch/pull/5279)) ([`6d372ef`](https://github.com/juspay/hyperswitch/commit/6d372efbed08bc4ef7d946fb36acb67458896433))
25+
26+
### Refactors
27+
28+
- **analytics:** Create new permissions for Generate Report APIs ([#5178](https://github.com/juspay/hyperswitch/pull/5178)) ([`998ce02`](https://github.com/juspay/hyperswitch/commit/998ce02ebc1eed10e426987d1af9c02d1f1735fe))
29+
- **connectors:** [boa/cybs] add billing address to MIT request ([#5068](https://github.com/juspay/hyperswitch/pull/5068)) ([`66ac158`](https://github.com/juspay/hyperswitch/commit/66ac1584dfd6e8574732cb753bdce0136d36c205))
30+
- Move trait IncomingWebhook to hyperswitch_interfaces ([#5191](https://github.com/juspay/hyperswitch/pull/5191)) ([`35d502e`](https://github.com/juspay/hyperswitch/commit/35d502e3da6b271452011dfae178108e3ba8c3c7))
31+
32+
### Miscellaneous Tasks
33+
34+
- Fix file name ignored by git in cypress ([#5281](https://github.com/juspay/hyperswitch/pull/5281)) ([`3312e78`](https://github.com/juspay/hyperswitch/commit/3312e787f9873d10114e6a4ca78a0c3714ab2b1c))
35+
36+
**Full Changelog:** [`2024.07.11.0...2024.07.12.0`](https://github.com/juspay/hyperswitch/compare/2024.07.11.0...2024.07.12.0)
37+
38+
- - -
39+
40+
## 2024.07.11.0
41+
42+
### Features
43+
44+
- **connector:** [Bambora APAC] Add payment flows ([#5193](https://github.com/juspay/hyperswitch/pull/5193)) ([`f7abcee`](https://github.com/juspay/hyperswitch/commit/f7abcee625e87d3c2f5c3ab0327aa5dea3d5e0c4))
45+
- **merchant_account:** Add merchant account create v2 route ([#5061](https://github.com/juspay/hyperswitch/pull/5061)) ([`d6b9151`](https://github.com/juspay/hyperswitch/commit/d6b9151e9edae17e06234c8958170bf38ff060bc))
46+
- **router:** Add an api to migrate the payment method ([#5186](https://github.com/juspay/hyperswitch/pull/5186)) ([`125699f`](https://github.com/juspay/hyperswitch/commit/125699f89c603809778c276362f2d7825ab5a8de))
47+
48+
### Bug Fixes
49+
50+
- **analytics:** Updated frm clickhouse script for creating table ([#5272](https://github.com/juspay/hyperswitch/pull/5272)) ([`545a6db`](https://github.com/juspay/hyperswitch/commit/545a6dbfc60b5ad20a8fc9dd303998cb9aa255da))
51+
- **payments_create:** Save the `customer_id` in payments create ([#5262](https://github.com/juspay/hyperswitch/pull/5262)) ([`53cb953`](https://github.com/juspay/hyperswitch/commit/53cb95378e3974d1d46ff76873a95b4c5c9a4991))
52+
- **router:** [razorpay] make source verification false ([#5268](https://github.com/juspay/hyperswitch/pull/5268)) ([`3da93f1`](https://github.com/juspay/hyperswitch/commit/3da93f1f73680cc20313a068aacae3018b067b45))
53+
54+
### Refactors
55+
56+
- **connector:**
57+
- Update connector_refund_id and Refactor Webhook Status ([#5280](https://github.com/juspay/hyperswitch/pull/5280)) ([`5e4b082`](https://github.com/juspay/hyperswitch/commit/5e4b0826e6375b4e85916ee4990e405bb27e2a78))
58+
- [Mifinity] fix redirection after payment completion and handle 5xx error ([#5250](https://github.com/juspay/hyperswitch/pull/5250)) ([`38d5137`](https://github.com/juspay/hyperswitch/commit/38d5137c2736a38ee3b15288fed2ac9f9985bce8))
59+
- **cypress:** Unify fixtures in tests & follow conventions ([#5180](https://github.com/juspay/hyperswitch/pull/5180)) ([`1adcf01`](https://github.com/juspay/hyperswitch/commit/1adcf0150458c4670b81fa8e2307dc0c32aa1ff1))
60+
- **user_auth_method:** Populate default user auth method ([#5257](https://github.com/juspay/hyperswitch/pull/5257)) ([`f8f6972`](https://github.com/juspay/hyperswitch/commit/f8f69728b3303663942722acc1514249d98912d4))
61+
62+
**Full Changelog:** [`2024.07.10.1...2024.07.11.0`](https://github.com/juspay/hyperswitch/compare/2024.07.10.1...2024.07.11.0)
63+
64+
- - -
65+
766
## 2024.07.10.1
867

968
### Refactors

‎Cargo.lock

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api-reference/openapi_spec.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7736,6 +7736,7 @@
77367736
"coinbase",
77377737
"cryptopay",
77387738
"cybersource",
7739+
"datatrans",
77397740
"dlocal",
77407741
"ebanx",
77417742
"fiserv",
@@ -13765,6 +13766,14 @@
1376513766
}
1376613767
],
1376713768
"nullable": true
13769+
},
13770+
"billing": {
13771+
"allOf": [
13772+
{
13773+
"$ref": "#/components/schemas/Address"
13774+
}
13775+
],
13776+
"nullable": true
1376813777
}
1376913778
},
1377013779
"additionalProperties": false
@@ -19452,6 +19461,7 @@
1945219461
"coinbase",
1945319462
"cryptopay",
1945419463
"cybersource",
19464+
"datatrans",
1945519465
"dlocal",
1945619466
"ebanx",
1945719467
"fiserv",

‎config/config.example.toml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ certificate = "/path/to/certificate.pem"
2828
idle_pool_connection_timeout = 90 # Timeout for idle pool connections (defaults to 90s)
2929

3030

31+
# Configuration for the Key Manager Service
32+
[key_manager]
33+
url = "http://localhost:5000" # URL of the encryption service
34+
3135
# Main SQL data store credentials
3236
[master_database]
3337
username = "db_user" # DB Username
@@ -416,9 +420,10 @@ discord_invite_url = "https://www.example.com/" # Discord invite url for hypersw
416420
card.credit = { connector_list = "stripe,adyen,cybersource,bankofamerica" } # Mandate supported payment method type and connector for card
417421
wallet.paypal = { connector_list = "adyen" } # Mandate supported payment method type and connector for wallets
418422
pay_later.klarna = { connector_list = "adyen" } # Mandate supported payment method type and connector for pay_later
419-
bank_debit.ach = { connector_list = "gocardless" } # Mandate supported payment method type and connector for bank_debit
423+
bank_debit.ach = { connector_list = "gocardless,adyen" } # Mandate supported payment method type and connector for bank_debit
420424
bank_debit.becs = { connector_list = "gocardless" } # Mandate supported payment method type and connector for bank_debit
421-
bank_debit.sepa = { connector_list = "gocardless" } # Mandate supported payment method type and connector for bank_debit
425+
bank_debit.bacs = { connector_list = "adyen" } # Mandate supported payment method type and connector for bank_debit
426+
bank_debit.sepa = { connector_list = "gocardless,adyen" } # Mandate supported payment method type and connector for bank_debit
422427
bank_redirect.ideal = { connector_list = "stripe,adyen,globalpay" } # Mandate supported payment method type and connector for bank_redirect
423428
bank_redirect.sofort = { connector_list = "stripe,adyen,globalpay" }
424429
wallet.apple_pay = { connector_list = "stripe,adyen,cybersource,noon,bankofamerica" }
@@ -578,8 +583,13 @@ logo = "https://app.hyperswitch.io/HyperswitchFavicon.png"
578583
merchant_name = "HyperSwitch"
579584
[generic_link.payout_link.enabled_payment_methods]
580585
card = "credit,debit"
581-
bank_transfer = "ach,bacs,sepa"
582-
wallet = "paypal,pix,venmo"
586+
587+
#Payout Method Filters Based on Country and Currency
588+
[payout_method_filters.adyenplatform]
589+
sepa = { country = "ES,SK,AT,NL,DE,BE,FR,FI,PT,IE,EE,LT,LV,IT,CZ,DE,HU,NO,PL,SE,GB,CH" , currency = "EUR,CZK,DKK,HUF,NOK,PLN,SEK,GBP,CHF" }
590+
591+
[payout_method_filters.stripe]
592+
ach = { country = "US", currency = "USD" }
583593

584594
[payment_link]
585595
sdk_url = "http://localhost:9090/0.16.7/v0/HyperLoader.js"

‎config/deployments/env_specific.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,6 @@ logo = "https://app.hyperswitch.io/HyperswitchFavicon.png"
179179
merchant_name = "HyperSwitch"
180180
[generic_link.payout_link.enabled_payment_methods]
181181
card = "credit,debit"
182-
bank_transfer = "ach,bacs,sepa"
183-
wallet = "paypal,pix,venmo"
184182

185183
[payment_link]
186184
sdk_url = "http://localhost:9090/0.16.7/v0/HyperLoader.js"
@@ -248,6 +246,10 @@ payment_intents = "hyperswitch-payment-intent-events"
248246
refunds = "hyperswitch-refund-events"
249247
disputes = "hyperswitch-dispute-events"
250248

249+
# Configuration for the Key Manager Service
250+
[key_manager]
251+
url = "http://localhost:5000" # URL of the encryption service
252+
251253
# This section provides some secret values.
252254
[secrets]
253255
master_enc_key = "sample_key" # Master Encryption key used to encrypt merchant wise encryption key. Should be 32-byte long.

‎config/deployments/integration_test.toml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,10 @@ payout_connector_list = "stripe,wise"
133133
connectors_with_delayed_session_response = "trustpay,payme" # List of connectors which have delayed session response
134134

135135
[mandates.supported_payment_methods]
136-
bank_debit.ach.connector_list = "gocardless" # Mandate supported payment method type and connector for bank_debit
137-
bank_debit.becs.connector_list = "gocardless" # Mandate supported payment method type and connector for bank_debit
138-
bank_debit.sepa.connector_list = "gocardless" # Mandate supported payment method type and connector for bank_debit
136+
bank_debit.ach = { connector_list = "gocardless,adyen" } # Mandate supported payment method type and connector for bank_debit
137+
bank_debit.becs = { connector_list = "gocardless" } # Mandate supported payment method type and connector for bank_debit
138+
bank_debit.bacs = { connector_list = "adyen" } # Mandate supported payment method type and connector for bank_debit
139+
bank_debit.sepa = { connector_list = "gocardless,adyen" } # Mandate supported payment method type and connector for bank_debit
139140
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree" # Mandate supported payment method type and connector for card
140141
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree" # Mandate supported payment method type and connector for card
141142
pay_later.klarna.connector_list = "adyen" # Mandate supported payment method type and connector for pay_later
@@ -308,6 +309,12 @@ red_pagos = { country = "UY", currency = "UYU" }
308309
[pm_filters.zsl]
309310
local_bank_transfer = { country = "CN", currency = "CNY" }
310311

312+
[payout_method_filters.adyenplatform]
313+
sepa = { country = "ES,SK,AT,NL,DE,BE,FR,FI,PT,IE,EE,LT,LV,IT,CZ,DE,HU,NO,PL,SE,GB,CH" , currency = "EUR,CZK,DKK,HUF,NOK,PLN,SEK,GBP,CHF" }
314+
315+
[payout_method_filters.stripe]
316+
ach = { country = "US", currency = "USD" }
317+
311318
[temp_locker_enable_config]
312319
bluesnap.payment_method = "card"
313320
nuvei.payment_method = "card"

‎config/deployments/production.toml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ worldline.base_url = "https://eu.sandbox.api-ingenico.com/"
9696
worldpay.base_url = "https://try.access.worldpay.com/"
9797
zen.base_url = "https://api.zen.com/"
9898
zen.secondary_base_url = "https://secure.zen.com/"
99-
zsl.base_url = "https://api.prodoffalb.net/"
99+
zsl.base_url = "https://apirh.prodoffalb.net/"
100100
threedsecureio.base_url = "https://service.3dsecure.io"
101101
netcetera.base_url = "https://{{merchant_endpoint_prefix}}.3ds-server.prev.netcetera-cloud-payment.ch"
102102

@@ -133,9 +133,10 @@ base_url = "https://live.hyperswitch.io"
133133
enabled = false
134134

135135
[mandates.supported_payment_methods]
136-
bank_debit.ach.connector_list = "gocardless" # Mandate supported payment method type and connector for bank_debit
137-
bank_debit.becs.connector_list = "gocardless" # Mandate supported payment method type and connector for bank_debit
138-
bank_debit.sepa.connector_list = "gocardless" # Mandate supported payment method type and connector for bank_debit
136+
bank_debit.ach = { connector_list = "gocardless,adyen" } # Mandate supported payment method type and connector for bank_debit
137+
bank_debit.becs = { connector_list = "gocardless" } # Mandate supported payment method type and connector for bank_debit
138+
bank_debit.bacs = { connector_list = "adyen" } # Mandate supported payment method type and connector for bank_debit
139+
bank_debit.sepa = { connector_list = "gocardless,adyen" } # Mandate supported payment method type and connector for bank_debit
139140
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree" # Mandate supported payment method type and connector for card
140141
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree" # Mandate supported payment method type and connector for card
141142
pay_later.klarna.connector_list = "adyen" # Mandate supported payment method type and connector for pay_later
@@ -327,6 +328,12 @@ red_pagos = { country = "UY", currency = "UYU" }
327328
[pm_filters.zsl]
328329
local_bank_transfer = { country = "CN", currency = "CNY" }
329330

331+
[payout_method_filters.adyenplatform]
332+
sepa = { country = "ES,SK,AT,NL,DE,BE,FR,FI,PT,IE,EE,LT,LV,IT,CZ,DE,HU,NO,PL,SE,GB,CH" , currency = "EUR,CZK,DKK,HUF,NOK,PLN,SEK,GBP,CHF" }
333+
334+
[payout_method_filters.stripe]
335+
ach = { country = "US", currency = "USD" }
336+
330337
[temp_locker_enable_config]
331338
bluesnap.payment_method = "card"
332339
nuvei.payment_method = "card"

‎config/deployments/sandbox.toml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,10 @@ base_url = "https://app.hyperswitch.io"
133133
enabled = true
134134

135135
[mandates.supported_payment_methods]
136-
bank_debit.ach.connector_list = "gocardless" # Mandate supported payment method type and connector for bank_debit
137-
bank_debit.becs.connector_list = "gocardless" # Mandate supported payment method type and connector for bank_debit
138-
bank_debit.sepa.connector_list = "gocardless" # Mandate supported payment method type and connector for bank_debit
136+
bank_debit.ach = { connector_list = "gocardless,adyen" } # Mandate supported payment method type and connector for bank_debit
137+
bank_debit.becs = { connector_list = "gocardless" } # Mandate supported payment method type and connector for bank_debit
138+
bank_debit.bacs = { connector_list = "adyen" } # Mandate supported payment method type and connector for bank_debit
139+
bank_debit.sepa = { connector_list = "gocardless,adyen" } # Mandate supported payment method type and connector for bank_debit
139140
card.credit.connector_list = "stripe,adyen,authorizedotnet,cybersource,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree" # Mandate supported payment method type and connector for card
140141
card.debit.connector_list = "stripe,adyen,authorizedotnet,cybersource,globalpay,worldpay,multisafepay,nmi,nexinets,noon,bankofamerica,braintree" # Mandate supported payment method type and connector for card
141142
pay_later.klarna.connector_list = "adyen" # Mandate supported payment method type and connector for pay_later
@@ -331,6 +332,12 @@ red_pagos = { country = "UY", currency = "UYU" }
331332
[pm_filters.zsl]
332333
local_bank_transfer = { country = "CN", currency = "CNY" }
333334

335+
[payout_method_filters.adyenplatform]
336+
sepa = { country = "ES,SK,AT,NL,DE,BE,FR,FI,PT,IE,EE,LT,LV,IT,CZ,DE,HU,NO,PL,SE,GB,CH" , currency = "EUR,CZK,DKK,HUF,NOK,PLN,SEK,GBP,CHF" }
337+
338+
[payout_method_filters.stripe]
339+
ach = { country = "US", currency = "USD" }
340+
334341
[temp_locker_enable_config]
335342
bluesnap.payment_method = "card"
336343
nuvei.payment_method = "card"

0 commit comments

Comments
 (0)