resolved conflicts

juspay · May 7, 2024 · 4a9d2b1 · 4a9d2b1
1 parent 93c5ce0
commit 4a9d2b1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/crates/api_models/src/enums.rs b/crates/api_models/src/enums.rs
@@ -365,7 +365,6 @@ impl From<PayoutConnectors> for RoutableConnectors {
             PayoutConnectors::Ebanx => Self::Ebanx,
             PayoutConnectors::Cybersource => Self::Cybersource,
             PayoutConnectors::Wise => Self::Wise,
-
         }
     }
 }

diff --git a/crates/connector_configs/src/connector.rs b/crates/connector_configs/src/connector.rs
@@ -229,8 +229,6 @@ impl ConnectorConfig {
             PayoutConnectors::Ebanx => Ok(connector_data.ebanx_payout),
             PayoutConnectors::Cybersource => Ok(connector_data.cybersource_payout),
             PayoutConnectors::Payone => Ok(connector_data.payone_payout),
-            PayoutConnectors::Paypal => Ok(connector_data.paypal),
-            PayoutConnectors::Wise => Ok(connector_data.wise_payout),
         }
     }
 

diff --git a/crates/router/src/connector/payone.rs b/crates/router/src/connector/payone.rs
@@ -93,7 +93,6 @@ impl
         types::PaymentsResponseData,
     > for Payone
 {
-
 }
 
 impl<Flow, Request, Response> ConnectorCommonExt<Flow, Request, Response> for Payone

diff --git a/crates/router/src/connector/payone/transformers.rs b/crates/router/src/connector/payone/transformers.rs
@@ -18,11 +18,7 @@ use crate::{
     connector::utils::RouterData,
     core::errors,
     logger,
-    types::{
-        self,
-        storage::enums as storage_enums,
-        transformers::ForeignFrom,
-    },
+    types::{self, storage::enums as storage_enums, transformers::ForeignFrom},
 };
 
 pub struct PayoneRouterData<T> {
@@ -317,7 +313,7 @@ impl<F> TryFrom<types::PayoutsResponseRouterData<F, PayonePayoutFulfillResponse>
                 status: Some(storage_enums::PayoutStatus::foreign_from(response.status)),
                 connector_payout_id: "".to_string(),
                 payout_eligible: None,
-                should_add_next_step_to_process_tracker:false
+                should_add_next_step_to_process_tracker: false,
             }),
             ..item.data
         })

diff --git a/crates/router/src/connector/utils.rs b/crates/router/src/connector/utils.rs
@@ -1130,6 +1130,11 @@ impl CardData for payouts::Card {
         }
         Secret::new(year)
     }
+    fn get_expiry_date_as_mmyy(&self) -> Result<Secret<String>, errors::ConnectorError> {
+        let year = self.get_card_expiry_year_2_digit()?.expose();
+        let month = self.expiry_month.clone().expose();
+        Ok(Secret::new(format!("{month}{year}")))
+    }
     fn get_expiry_date_as_yymm(&self) -> Result<Secret<String>, errors::ConnectorError> {
         let year = self.get_card_expiry_year_2_digit()?.expose();
         let month = self.expiry_month.clone().expose();