rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-11-02 04:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(connector): [Adyen] Fetch email from customer email for payment request (#6676)

Browse Source
This commit is contained in:
Debarati Ghatak
2024-11-29 15:32:21 +05:30
committed by GitHub
parent 6a2070172b
commit 9998c557c9
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
crates/router/src/connector/adyen/transformers.rs
View File

@ -728,7 +728,7 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for JCSVoucherData {
Ok(Self {
first_name: item.get_billing_first_name()?,
last_name: item.get_optional_billing_last_name(),
shopper_email: item.get_billing_email()?,
shopper_email: item.get_billing_email().or(item.request.get_email())?,
telephone_number: item.get_billing_phone_number()?,
})
}
@ -2552,11 +2552,18 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for DokuBankData {
Ok(Self {
first_name: item.get_billing_first_name()?,
last_name: item.get_optional_billing_last_name(),
shopper_email: item.get_billing_email()?,
shopper_email: item.get_billing_email().or(item.request.get_email())?,
})
}
}
fn get_optional_shopper_email(item: &types::PaymentsAuthorizeRouterData) -> Option<Email> {
match item.get_billing_email() {
Ok(email) => Some(email),
Err(_) => item.request.get_optional_email(),
}
}
impl<'a> TryFrom<&domain::payments::CardRedirectData> for AdyenPaymentMethod<'a> {
type Error = Error;
fn try_from(
@ -2593,6 +2600,7 @@ impl<'a>
let amount = get_amount_data(item);
let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;
let shopper_interaction = AdyenShopperInteraction::from(item.router_data);
let shopper_email = get_optional_shopper_email(item.router_data);
let (recurring_processing_model, store_payment_method, shopper_reference) =
get_recurring_processing_model(item.router_data)?;
let browser_info = None;
@ -2694,7 +2702,7 @@ impl<'a>
mpi_data: None,
telephone_number: None,
shopper_name: None,
shopper_email: None,
shopper_email,
shopper_locale: None,
social_security_number: None,
billing_address: None,
@ -2742,7 +2750,7 @@ impl<'a>
let return_url = item.router_data.request.get_return_url()?;
let card_holder_name = item.router_data.get_optional_billing_full_name();
let payment_method = AdyenPaymentMethod::try_from((card_data, card_holder_name))?;
let shopper_email = item.router_data.get_optional_billing_email();
let shopper_email = get_optional_shopper_email(item.router_data);
let shopper_name = get_shopper_name(item.router_data.get_optional_billing());
Ok(AdyenPaymentRequest {
@ -2801,6 +2809,7 @@ impl<'a>
let return_url = item.router_data.request.get_return_url()?;
let payment_method = AdyenPaymentMethod::try_from((bank_debit_data, item.router_data))?;
let country_code = get_country_code(item.router_data.get_optional_billing());
let shopper_email = get_optional_shopper_email(item.router_data);
let request = AdyenPaymentRequest {
amount,
merchant_account: auth_type.merchant_account,
@ -2814,7 +2823,7 @@ impl<'a>
mpi_data: None,
shopper_name: None,
shopper_locale: None,
shopper_email: item.router_data.get_optional_billing_email(),
shopper_email,
social_security_number: None,
telephone_number: None,
billing_address: None,
@ -2860,6 +2869,7 @@ impl<'a>
let billing_address =
get_address_info(item.router_data.get_optional_billing()).and_then(Result::ok);
let shopper_name = get_shopper_name(item.router_data.get_optional_billing());
let shopper_email = get_optional_shopper_email(item.router_data);
let request = AdyenPaymentRequest {
amount,
@ -2873,7 +2883,7 @@ impl<'a>
additional_data,
shopper_name,
shopper_locale: None,
shopper_email: item.router_data.get_optional_billing_email(),
shopper_email,
social_security_number,
mpi_data: None,
telephone_number: None,
@ -2913,6 +2923,7 @@ impl<'a>
let shopper_interaction = AdyenShopperInteraction::from(item.router_data);
let payment_method = AdyenPaymentMethod::try_from((bank_transfer_data, item.router_data))?;
let return_url = item.router_data.request.get_return_url()?;
let shopper_email = get_optional_shopper_email(item.router_data);
let request = AdyenPaymentRequest {
amount,
merchant_account: auth_type.merchant_account,
@ -2926,7 +2937,7 @@ impl<'a>
mpi_data: None,
shopper_name: None,
shopper_locale: None,
shopper_email: item.router_data.get_optional_billing_email(),
shopper_email,
social_security_number: None,
telephone_number: None,
billing_address: None,
@ -2965,6 +2976,7 @@ impl<'a>
let shopper_interaction = AdyenShopperInteraction::from(item.router_data);
let return_url = item.router_data.request.get_router_return_url()?;
let payment_method = AdyenPaymentMethod::try_from(gift_card_data)?;
let shopper_email = get_optional_shopper_email(item.router_data);
let request = AdyenPaymentRequest {
amount,
merchant_account: auth_type.merchant_account,
@ -2978,7 +2990,7 @@ impl<'a>
mpi_data: None,
shopper_name: None,
shopper_locale: None,
shopper_email: item.router_data.get_optional_billing_email(),
shopper_email,
telephone_number: None,
billing_address: None,
delivery_address: None,
@ -3028,6 +3040,7 @@ impl<'a>
let line_items = Some(get_line_items(item));
let billing_address =
get_address_info(item.router_data.get_optional_billing()).and_then(Result::ok);
let shopper_email = get_optional_shopper_email(item.router_data);
Ok(AdyenPaymentRequest {
amount,
@ -3042,7 +3055,7 @@ impl<'a>
mpi_data: None,
telephone_number: None,
shopper_name: None,
shopper_email: item.router_data.get_optional_billing_email(),
shopper_email,
shopper_locale,
social_security_number: None,
billing_address,
@ -3094,11 +3107,13 @@ fn get_shopper_email(
.as_ref()
.ok_or(errors::ConnectorError::MissingPaymentMethodType)?;
match payment_method_type {
storage_enums::PaymentMethodType::Paypal => Ok(Some(item.get_billing_email()?)),
_ => Ok(item.get_optional_billing_email()),
storage_enums::PaymentMethodType::Paypal => {
Ok(Some(item.get_billing_email().or(item.request.get_email())?))
}
_ => Ok(get_optional_shopper_email(item)),
}
} else {
Ok(item.get_optional_billing_email())
Ok(get_optional_shopper_email(item))
}
}
@ -3205,7 +3220,7 @@ impl<'a>
get_recurring_processing_model(item.router_data)?;
let return_url = item.router_data.request.get_return_url()?;
let shopper_name = get_shopper_name(item.router_data.get_optional_billing());
let shopper_email = item.router_data.get_optional_billing_email();
let shopper_email = get_optional_shopper_email(item.router_data);
let billing_address =
get_address_info(item.router_data.get_optional_billing()).and_then(Result::ok);
let delivery_address =
@ -3273,7 +3288,7 @@ impl<'a>
let shopper_interaction = AdyenShopperInteraction::from(item.router_data);
let return_url = item.router_data.request.get_return_url()?;
let shopper_name = get_shopper_name(item.router_data.get_optional_billing());
let shopper_email = item.router_data.get_optional_billing_email();
let shopper_email = get_optional_shopper_email(item.router_data);
let telephone_number = item
.router_data
.get_billing_phone()