Skip to content

Commit

Permalink
resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
sumanmaji4 committed Nov 6, 2024
1 parent 5c4dbd8 commit 77fba65
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
2 changes: 2 additions & 0 deletions crates/api_models/src/connector_enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ pub enum Connector {
Nexinets,
Nexixpay,
Nmi,
//Nomupay
Noon,
Novalnet,
Nuvei,
Expand Down Expand Up @@ -229,6 +230,7 @@ impl Connector {
| Self::Multisafepay
| Self::Nexinets
| Self::Nexixpay
// | Self::Nomupay
| Self::Novalnet
| Self::Nuvei
| Self::Opennode
Expand Down
1 change: 1 addition & 0 deletions crates/common_enums/src/connector_enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ pub enum RoutableConnectors {
Nexinets,
Nexixpay,
Nmi,
// Nomupay,
Noon,
Novalnet,
Nuvei,
Expand Down
7 changes: 4 additions & 3 deletions crates/hyperswitch_connectors/src/connectors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ pub use self::{
digitalvirgo::Digitalvirgo, dlocal::Dlocal, elavon::Elavon, fiserv::Fiserv,
fiservemea::Fiservemea, fiuu::Fiuu, forte::Forte, globepay::Globepay, helcim::Helcim,
jpmorgan::Jpmorgan, mollie::Mollie, multisafepay::Multisafepay, nexinets::Nexinets,
nexixpay::Nexixpay, nomupay::Nomupay, novalnet::Novalnet, payeezy::Payeezy, payu::Payu, powertranz::Powertranz,
razorpay::Razorpay, shift4::Shift4, square::Square, stax::Stax, taxjar::Taxjar, thunes::Thunes,
tsys::Tsys, volt::Volt, worldline::Worldline, worldpay::Worldpay, zen::Zen, zsl::Zsl,
nexixpay::Nexixpay, nomupay::Nomupay, novalnet::Novalnet, payeezy::Payeezy, payu::Payu,
powertranz::Powertranz, razorpay::Razorpay, shift4::Shift4, square::Square, stax::Stax,
taxjar::Taxjar, thunes::Thunes, tsys::Tsys, volt::Volt, worldline::Worldline,
worldpay::Worldpay, zen::Zen, zsl::Zsl,
};
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ impl<F, T> TryFrom<ResponseRouterData<F, NomupayPaymentsResponse, T, PaymentsRes
status: common_enums::AttemptStatus::from(item.response.status),
response: Ok(PaymentsResponseData::TransactionResponse {
resource_id: ResponseId::ConnectorTransactionId(item.response.id),
redirection_data: None,
mandate_reference: None,
redirection_data: Box::new(None),
mandate_reference: Box::new(None),
connector_metadata: None,
network_txn_id: None,
connector_response_reference_id: None,
Expand Down
10 changes: 5 additions & 5 deletions crates/router/src/connector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ pub use hyperswitch_connectors::connectors::{
fiserv::Fiserv, fiservemea, fiservemea::Fiservemea, fiuu, fiuu::Fiuu, forte, forte::Forte,
globepay, globepay::Globepay, helcim, helcim::Helcim, jpmorgan, jpmorgan::Jpmorgan, mollie,
mollie::Mollie, multisafepay, multisafepay::Multisafepay, nexinets, nexinets::Nexinets,
nexixpay, nexixpay::Nexixpay, nomupay, nomupay::Nomupay, novalnet, novalnet::Novalnet, payeezy, payeezy::Payeezy, payu,
payu::Payu, powertranz, powertranz::Powertranz, razorpay, razorpay::Razorpay, shift4,
shift4::Shift4, square, square::Square, stax, stax::Stax, taxjar, taxjar::Taxjar, thunes,
thunes::Thunes, tsys, tsys::Tsys, volt, volt::Volt, worldline, worldline::Worldline, worldpay,
worldpay::Worldpay, zen, zen::Zen, zsl, zsl::Zsl,
nexixpay, nexixpay::Nexixpay, nomupay, nomupay::Nomupay, novalnet, novalnet::Novalnet, payeezy,
payeezy::Payeezy, payu, payu::Payu, powertranz, powertranz::Powertranz, razorpay,
razorpay::Razorpay, shift4, shift4::Shift4, square, square::Square, stax, stax::Stax, taxjar,
taxjar::Taxjar, thunes, thunes::Thunes, tsys, tsys::Tsys, volt, volt::Volt, worldline,
worldline::Worldline, worldpay, worldpay::Worldpay, zen, zen::Zen, zsl, zsl::Zsl,
};

#[cfg(feature = "dummy_connector")]
Expand Down

0 comments on commit 77fba65

Please sign in to comment.