From 77fba65f678af1a855fca70d25b861ae917c5573 Mon Sep 17 00:00:00 2001
From: sumanmaji4 <suman.maji@juspay.in>
Date: Wed, 6 Nov 2024 12:25:03 +0530
Subject: [PATCH] resolved conflicts

---
 crates/api_models/src/connector_enums.rs               |  2 ++
 crates/common_enums/src/connector_enums.rs             |  1 +
 crates/hyperswitch_connectors/src/connectors.rs        |  7 ++++---
 .../src/connectors/nomupay/transformers.rs             |  4 ++--
 crates/router/src/connector.rs                         | 10 +++++-----
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/crates/api_models/src/connector_enums.rs b/crates/api_models/src/connector_enums.rs
index 68fd73cd0de0..f5dbc9cb5ec5 100644
--- a/crates/api_models/src/connector_enums.rs
+++ b/crates/api_models/src/connector_enums.rs
@@ -93,6 +93,7 @@ pub enum Connector {
     Nexinets,
     Nexixpay,
     Nmi,
+    //Nomupay
     Noon,
     Novalnet,
     Nuvei,
@@ -229,6 +230,7 @@ impl Connector {
             | Self::Multisafepay
             | Self::Nexinets
             | Self::Nexixpay
+            // | Self::Nomupay
             | Self::Novalnet
             | Self::Nuvei
             | Self::Opennode
diff --git a/crates/common_enums/src/connector_enums.rs b/crates/common_enums/src/connector_enums.rs
index 386b4c35a4b7..11b9863eb4c1 100644
--- a/crates/common_enums/src/connector_enums.rs
+++ b/crates/common_enums/src/connector_enums.rs
@@ -88,6 +88,7 @@ pub enum RoutableConnectors {
     Nexinets,
     Nexixpay,
     Nmi,
+    // Nomupay,
     Noon,
     Novalnet,
     Nuvei,
diff --git a/crates/hyperswitch_connectors/src/connectors.rs b/crates/hyperswitch_connectors/src/connectors.rs
index 73811245aafa..0b898fa790fe 100644
--- a/crates/hyperswitch_connectors/src/connectors.rs
+++ b/crates/hyperswitch_connectors/src/connectors.rs
@@ -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,
 };
diff --git a/crates/hyperswitch_connectors/src/connectors/nomupay/transformers.rs b/crates/hyperswitch_connectors/src/connectors/nomupay/transformers.rs
index cec4e8d3a326..bea8b607daea 100644
--- a/crates/hyperswitch_connectors/src/connectors/nomupay/transformers.rs
+++ b/crates/hyperswitch_connectors/src/connectors/nomupay/transformers.rs
@@ -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,
diff --git a/crates/router/src/connector.rs b/crates/router/src/connector.rs
index 133f9c9ee8ff..3fb5509c061a 100644
--- a/crates/router/src/connector.rs
+++ b/crates/router/src/connector.rs
@@ -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")]