From 4d2f41e03abc17d7735e43c84d57cab8d7781182 Mon Sep 17 00:00:00 2001 From: Sk Sakil Mostak Date: Wed, 6 Nov 2024 15:48:13 +0530 Subject: [PATCH] refactor: resolve conflict with main --- crates/api_models/src/connector_enums.rs | 3 ++- crates/common_enums/src/connector_enums.rs | 2 +- .../src/connectors/airwallex/transformers.rs | 1 + .../src/connectors/digitalvirgo/transformers.rs | 6 +++--- .../src/connectors/multisafepay/transformers.rs | 2 ++ .../src/connectors/razorpay/transformers.rs | 1 + .../src/connectors/shift4/transformers.rs | 2 ++ .../src/connectors/worldpay/transformers.rs | 1 + .../src/connectors/zsl/transformers.rs | 1 + crates/router/src/connector/paypal/transformers.rs | 1 + 10 files changed, 15 insertions(+), 5 deletions(-) diff --git a/crates/api_models/src/connector_enums.rs b/crates/api_models/src/connector_enums.rs index 68fd73cd0de0..5e6a3471ee99 100644 --- a/crates/api_models/src/connector_enums.rs +++ b/crates/api_models/src/connector_enums.rs @@ -70,7 +70,7 @@ pub enum Connector { Cybersource, Datatrans, Deutschebank, - // Digitalvirgo, template code for future usage + Digitalvirgo, Dlocal, Ebanx, Fiserv, @@ -209,6 +209,7 @@ impl Connector { | Self::Coinbase | Self::Cryptopay | Self::Deutschebank + | Self::Digitalvirgo | Self::Dlocal | Self::Ebanx | Self::Fiserv diff --git a/crates/common_enums/src/connector_enums.rs b/crates/common_enums/src/connector_enums.rs index 386b4c35a4b7..4d4adea2b723 100644 --- a/crates/common_enums/src/connector_enums.rs +++ b/crates/common_enums/src/connector_enums.rs @@ -67,7 +67,7 @@ pub enum RoutableConnectors { Cybersource, Datatrans, Deutschebank, - // Digitalvirgo, template code for future usage + Digitalvirgo, Dlocal, Ebanx, Fiserv, diff --git a/crates/hyperswitch_connectors/src/connectors/airwallex/transformers.rs b/crates/hyperswitch_connectors/src/connectors/airwallex/transformers.rs index 5345c550cd18..bb3bc3990772 100644 --- a/crates/hyperswitch_connectors/src/connectors/airwallex/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/airwallex/transformers.rs @@ -212,6 +212,7 @@ impl TryFrom<&AirwallexRouterData<&types::PaymentsAuthorizeRouterData>> | PaymentMethodData::MandatePayment | PaymentMethodData::Reward | PaymentMethodData::RealTimePayment(_) + | PaymentMethodData::MobilePayment(_) | PaymentMethodData::Upi(_) | PaymentMethodData::Voucher(_) | PaymentMethodData::GiftCard(_) diff --git a/crates/hyperswitch_connectors/src/connectors/digitalvirgo/transformers.rs b/crates/hyperswitch_connectors/src/connectors/digitalvirgo/transformers.rs index fc4f5660628a..6cd2e460520c 100644 --- a/crates/hyperswitch_connectors/src/connectors/digitalvirgo/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/digitalvirgo/transformers.rs @@ -132,16 +132,16 @@ impl TryFrom, ) -> Result { let status = common_enums::AttemptStatus::from(item.response.state); - let redirection_data = match status { + let redirection_data = Box::new(match status { common_enums::AttemptStatus::AuthenticationPending => Some(RedirectForm::DigitalVirgo), _ => None, - }; + }); Ok(Self { status, response: Ok(PaymentsResponseData::TransactionResponse { resource_id: ResponseId::ConnectorTransactionId(item.response.transaction_id), redirection_data, - mandate_reference: None, + mandate_reference: Box::new(None), connector_metadata: None, network_txn_id: None, connector_response_reference_id: None, diff --git a/crates/hyperswitch_connectors/src/connectors/multisafepay/transformers.rs b/crates/hyperswitch_connectors/src/connectors/multisafepay/transformers.rs index 3048a203d1b1..180db6268646 100644 --- a/crates/hyperswitch_connectors/src/connectors/multisafepay/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/multisafepay/transformers.rs @@ -615,6 +615,7 @@ impl TryFrom<&MultisafepayRouterData<&types::PaymentsAuthorizeRouterData>> | PaymentMethodData::Crypto(_) | PaymentMethodData::Reward | PaymentMethodData::RealTimePayment(_) + | PaymentMethodData::MobilePayment(_) | PaymentMethodData::Upi(_) | PaymentMethodData::Voucher(_) | PaymentMethodData::GiftCard(_) @@ -795,6 +796,7 @@ impl TryFrom<&MultisafepayRouterData<&types::PaymentsAuthorizeRouterData>> | PaymentMethodData::Crypto(_) | PaymentMethodData::Reward | PaymentMethodData::RealTimePayment(_) + | PaymentMethodData::MobilePayment(_) | PaymentMethodData::Upi(_) | PaymentMethodData::Voucher(_) | PaymentMethodData::GiftCard(_) diff --git a/crates/hyperswitch_connectors/src/connectors/razorpay/transformers.rs b/crates/hyperswitch_connectors/src/connectors/razorpay/transformers.rs index 674f652a9336..3b2164dfc978 100644 --- a/crates/hyperswitch_connectors/src/connectors/razorpay/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/razorpay/transformers.rs @@ -405,6 +405,7 @@ impl | PaymentMethodData::MandatePayment | PaymentMethodData::Reward | PaymentMethodData::RealTimePayment(_) + | PaymentMethodData::MobilePayment(_) | PaymentMethodData::Voucher(_) | PaymentMethodData::GiftCard(_) | PaymentMethodData::OpenBanking(_) diff --git a/crates/hyperswitch_connectors/src/connectors/shift4/transformers.rs b/crates/hyperswitch_connectors/src/connectors/shift4/transformers.rs index 4fb48938c429..540bcaebaaeb 100644 --- a/crates/hyperswitch_connectors/src/connectors/shift4/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/shift4/transformers.rs @@ -266,6 +266,7 @@ where | PaymentMethodData::MandatePayment | PaymentMethodData::Reward | PaymentMethodData::RealTimePayment(_) + | PaymentMethodData::MobilePayment(_) | PaymentMethodData::Upi(_) | PaymentMethodData::OpenBanking(_) | PaymentMethodData::CardToken(_) @@ -479,6 +480,7 @@ impl TryFrom<&Shift4RouterData<&RouterData> for ZslPayment | PaymentMethodData::MandatePayment | PaymentMethodData::Reward | PaymentMethodData::RealTimePayment(_) + | PaymentMethodData::MobilePayment(_) | PaymentMethodData::Upi(_) | PaymentMethodData::Voucher(_) | PaymentMethodData::GiftCard(_) diff --git a/crates/router/src/connector/paypal/transformers.rs b/crates/router/src/connector/paypal/transformers.rs index 636e5593cf84..ed8369607df7 100644 --- a/crates/router/src/connector/paypal/transformers.rs +++ b/crates/router/src/connector/paypal/transformers.rs @@ -1010,6 +1010,7 @@ impl TryFrom<&PaypalRouterData<&types::PaymentsAuthorizeRouterData>> for PaypalP | enums::PaymentMethodType::Dana | enums::PaymentMethodType::DanamonVa | enums::PaymentMethodType::Debit + | enums::PaymentMethodType::DirectCarrierBilling | enums::PaymentMethodType::DuitNow | enums::PaymentMethodType::Efecty | enums::PaymentMethodType::Eps