rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-10-31 10:06:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(router): make the billing country for apple pay as optional field (#3188)

Browse Source
This commit is contained in:
Shankar Singh C
2023-12-21 18:26:32 +05:30
committed by GitHub
parent c51c761677
commit 15987cc81e
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/api_models/src/payments.rs
View File

@ -3004,7 +3004,7 @@ pub struct SecretInfoToInitiateSdk {
pub struct ApplePayPaymentRequest { pub struct ApplePayPaymentRequest {
/// The code for country /// The code for country
#[schema(value_type = CountryAlpha2, example = "US")] #[schema(value_type = CountryAlpha2, example = "US")]
pub country_code: api_enums::CountryAlpha2, pub country_code: Option<api_enums::CountryAlpha2>,
/// The code for currency /// The code for currency
#[schema(value_type = Currency, example = "USD")] #[schema(value_type = Currency, example = "USD")]
pub currency_code: api_enums::Currency, pub currency_code: api_enums::Currency,

2
crates/router/src/connector/bluesnap/transformers.rs
View File

@ -529,7 +529,7 @@ impl TryFrom<types::PaymentsSessionResponseRouterData<BluesnapWalletTokenRespons
session_response, session_response,
), ),
payment_request_data: Some(api_models::payments::ApplePayPaymentRequest { payment_request_data: Some(api_models::payments::ApplePayPaymentRequest {
country_code: item.data.get_billing_country()?, country_code: item.data.request.country,
currency_code: item.data.request.currency, currency_code: item.data.request.currency,
total: api_models::payments::AmountInfo { total: api_models::payments::AmountInfo {
label: payment_request_data.label, label: payment_request_data.label,

9
crates/router/src/connector/payme/transformers.rs
View File

@ -545,6 +545,13 @@ impl<F>
} }
_ => { _ => {
let currency_code = item.data.request.get_currency()?; let currency_code = item.data.request.get_currency()?;
let country_code = item
.data
.address
.billing
.as_ref()
.and_then(|billing| billing.address.as_ref())
.and_then(|address| address.country);
let amount = item.data.request.get_amount()?; let amount = item.data.request.get_amount()?;
let amount_in_base_unit = utils::to_currency_base_unit(amount, currency_code)?; let amount_in_base_unit = utils::to_currency_base_unit(amount, currency_code)?;
let pmd = item.data.request.payment_method_data.to_owned(); let pmd = item.data.request.payment_method_data.to_owned();
@ -559,7 +566,7 @@ impl<F>
api_models::payments::ApplePaySessionResponse::NoSessionResponse, api_models::payments::ApplePaySessionResponse::NoSessionResponse,
payment_request_data: Some( payment_request_data: Some(
api_models::payments::ApplePayPaymentRequest { api_models::payments::ApplePayPaymentRequest {
country_code: item.data.get_billing_country()?, country_code,
currency_code, currency_code,
total: api_models::payments::AmountInfo { total: api_models::payments::AmountInfo {
label: "Apple Pay".to_string(), label: "Apple Pay".to_string(),

2
crates/router/src/connector/trustpay/transformers.rs
View File

@ -1181,7 +1181,7 @@ pub fn get_apple_pay_session<F, T>(
}, },
), ),
payment_request_data: Some(api_models::payments::ApplePayPaymentRequest { payment_request_data: Some(api_models::payments::ApplePayPaymentRequest {
country_code: apple_pay_init_result.country_code, country_code: Some(apple_pay_init_result.country_code),
currency_code: apple_pay_init_result.currency_code, currency_code: apple_pay_init_result.currency_code,
supported_networks: Some(apple_pay_init_result.supported_networks.clone()), supported_networks: Some(apple_pay_init_result.supported_networks.clone()),
merchant_capabilities: Some( merchant_capabilities: Some(

8
crates/router/src/core/payments/flows/session_flow.rs
View File

@ -371,13 +371,7 @@ fn get_apple_pay_payment_request(
merchant_identifier: &str, merchant_identifier: &str,
) -> RouterResult<payment_types::ApplePayPaymentRequest> { ) -> RouterResult<payment_types::ApplePayPaymentRequest> {
let applepay_payment_request = payment_types::ApplePayPaymentRequest { let applepay_payment_request = payment_types::ApplePayPaymentRequest {
country_code: session_data country_code: session_data.country,
.country
.to_owned()
.get_required_value("country_code")
.change_context(errors::ApiErrorResponse::MissingRequiredField {
field_name: "country_code",
})?,
currency_code: session_data.currency, currency_code: session_data.currency,
total: amount_info, total: amount_info,
merchant_capabilities: Some(payment_request_data.merchant_capabilities), merchant_capabilities: Some(payment_request_data.merchant_capabilities),