refactor: add states in PayoutStatus

config/config.example.toml

@@ -415,7 +415,7 @@ cashapp = {country = "US", currency = "USD"}
 
 [connector_customer]
 connector_list = "gocardless,stax,stripe"
-payout_connector_list = "wise"
+payout_connector_list = "stripe,wise"
 
 [bank_config.online_banking_fpx]
 adyen.banks = "affin_bank,agro_bank,alliance_bank,am_bank,bank_islam,bank_muamalat,bank_rakyat,bank_simpanan_nasional,cimb_bank,hong_leong_bank,hsbc_bank,kuwait_finance_house,may_bank,ocbc_bank,public_bank,rhb_bank,standard_chartered_bank,uob_bank"

config/development.toml

@@ -387,7 +387,7 @@ bluesnap = {payment_method = "card"}
 
 [connector_customer]
 connector_list = "gocardless,stax,stripe"
-payout_connector_list = "wise"
+payout_connector_list = "stripe,wise"
 
 [dummy_connector]
 enabled = true

config/docker_compose.toml

@@ -306,7 +306,7 @@ bank_debit.sepa = { connector_list = "gocardless"}
 
 [connector_customer]
 connector_list = "gocardless,stax,stripe"
-payout_connector_list = "wise"
+payout_connector_list = "stripe,wise"
 
 [multiple_api_version_supported_connectors]
 supported_connectors = "braintree"

crates/api_models/src/enums.rs

@@ -258,6 +258,7 @@ pub enum RoutableConnectors {
 #[strum(serialize_all = "snake_case")]
 pub enum PayoutConnectors {
     Adyen,
+    Stripe,
     Wise,
 }
 
@@ -266,6 +267,7 @@ impl From<PayoutConnectors> for RoutableConnectors {
     fn from(value: PayoutConnectors) -> Self {
         match value {
             PayoutConnectors::Adyen => Self::Adyen,
+            PayoutConnectors::Stripe => Self::Stripe,
             PayoutConnectors::Wise => Self::Wise,
         }
     }

crates/api_models/src/payouts.rs

@@ -4,6 +4,7 @@ use common_utils::{
     pii::{self, Email},
 };
 use masking::Secret;
+use router_derive::DebugAsDisplay;
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
@@ -388,6 +389,7 @@ pub struct PayoutCreateResponse {
 #[derive(Default, Debug, Clone, Deserialize, ToSchema)]
 pub struct PayoutRetrieveBody {
     pub force_sync: Option<bool>,
+    pub merchant_id: Option<String>,
 }
 
 #[derive(Default, Debug, Serialize, ToSchema, Clone, Deserialize)]
@@ -406,6 +408,9 @@ pub struct PayoutRetrieveRequest {
     /// (defaults to false)
     #[schema(value_type = Option<bool>, default = false, example = true)]
     pub force_sync: Option<bool>,
+
+    /// The identifier for the Merchant Account.
+    pub merchant_id: Option<String>,
 }
 
 #[derive(Default, Debug, Serialize, ToSchema, Clone, Deserialize)]
@@ -420,3 +425,40 @@ pub struct PayoutActionRequest {
     )]
     pub payout_id: String,
 }
+
+#[derive(Default, DebugAsDisplay, Debug, ToSchema, Clone, Deserialize)]
+pub struct PayoutVendorAccountDetails {
+    pub vendor_details: PayoutVendorDetails,
+    pub individual_details: PayoutIndividualDetails,
+}
+
+#[derive(Default, DebugAsDisplay, Debug, Serialize, ToSchema, Clone, Deserialize)]
+pub struct PayoutVendorDetails {
+    pub account_type: String,
+    pub business_type: String,
+    pub business_profile_mcc: Option<i32>,
+    pub business_profile_url: Option<String>,
+    pub business_profile_name: Option<Secret<String>>,
+    pub company_address_line1: Option<Secret<String>>,
+    pub company_address_line2: Option<Secret<String>>,
+    pub company_address_postal_code: Option<Secret<String>>,
+    pub company_address_city: Option<Secret<String>>,
+    pub company_address_state: Option<Secret<String>>,
+    pub company_phone: Option<Secret<String>>,
+    pub company_tax_id: Option<Secret<String>>,
+    pub company_owners_provided: Option<bool>,
+    pub capabilities_card_payments: Option<bool>,
+    pub capabilities_transfers: Option<bool>,
+}
+
+#[derive(Default, DebugAsDisplay, Debug, Serialize, ToSchema, Clone, Deserialize)]
+pub struct PayoutIndividualDetails {
+    pub tos_acceptance_date: Option<i64>,
+    pub tos_acceptance_ip: Option<Secret<String>>,
+    pub individual_dob_day: Option<Secret<String>>,
+    pub individual_dob_month: Option<Secret<String>>,
+    pub individual_dob_year: Option<Secret<String>>,
+    pub individual_id_number: Option<Secret<String>>,
+    pub individual_ssn_last_4: Option<Secret<String>>,
+    pub external_account_account_holder_type: Option<String>,
+}

crates/common_enums/src/enums.rs

@@ -1668,15 +1668,19 @@ pub enum CanadaStatesAbbreviation {
 #[serde(rename_all = "snake_case")]
 #[strum(serialize_all = "snake_case")]
 pub enum PayoutStatus {
+    RequiresCustomerAction,
+    RequiresPayoutMethodData,
+    #[default]
+    RequiresCreation,
+    RequiresFulfillment,
+    Processing,
+    OutgoingPaymentSent,
     Success,
     Failed,
     Cancelled,
-    Pending,
     Ineligible,
-    #[default]
-    RequiresCreation,
-    RequiresPayoutMethodData,
-    RequiresFulfillment,
+    Expired,
+    FundsRefunded,
 }
 
 #[derive(

crates/common_utils/src/consts.rs

@@ -24,6 +24,8 @@ pub const PAYMENTS_LIST_MAX_LIMIT_V1: u32 = 100;
 /// Maximum limit for payments list post api with filters
 pub const PAYMENTS_LIST_MAX_LIMIT_V2: u32 = 20;
 
+/// Average delay (in ms) between account onboarding's API response and the changes to actually reflect at Stripe's end
+pub const STRIPE_ACCOUNT_ONBOARDING_DELAY_IN_SECONDS: i64 = 15;
 /// surcharge percentage maximum precision length
 pub const SURCHARGE_PERCENTAGE_PRECISION_LENGTH: u8 = 2;
 

crates/diesel_models/src/payout_attempt.rs

@@ -27,6 +27,7 @@ pub struct PayoutAttempt {
     #[serde(with = "common_utils::custom_serde::iso8601")]
     pub last_modified_at: PrimitiveDateTime,
     pub profile_id: Option<String>,
+    pub confirm: bool,
 }
 
 impl Default for PayoutAttempt {
@@ -51,6 +52,7 @@ impl Default for PayoutAttempt {
             created_at: now,
             last_modified_at: now,
             profile_id: None,
+            confirm: false,
         }
     }
 }
@@ -88,6 +90,7 @@ pub struct PayoutAttemptNew {
     #[serde(default, with = "common_utils::custom_serde::iso8601::option")]
     pub last_modified_at: Option<PrimitiveDateTime>,
     pub profile_id: Option<String>,
+    pub confirm: bool,
 }
 
 #[derive(Debug)]

crates/diesel_models/src/schema.rs

@@ -689,6 +689,7 @@ diesel::table! {
         last_modified_at -> Timestamp,
         #[max_length = 64]
         profile_id -> Nullable<Varchar>,
+        confirm -> Bool,
     }
 }
 

crates/router/src/bin/scheduler.rs

@@ -76,6 +76,8 @@ pub enum PTRunner {
     PaymentsSyncWorkflow,
     RefundWorkflowRouter,
     DeleteTokenizeDataWorkflow,
+    #[cfg(feature = "payouts")]
+    StripeAttachAccount,
 }
 
 #[derive(Debug, Copy, Clone)]
@@ -100,6 +102,10 @@ impl ProcessTrackerWorkflows<routes::AppState> for WorkflowRunner {
             Some(PTRunner::DeleteTokenizeDataWorkflow) => {
                 Box::new(workflows::tokenized_data::DeleteTokenizeDataWorkflow)
             }
+            #[cfg(feature = "payouts")]
+            Some(PTRunner::StripeAttachAccount) => Box::new(
+                workflows::stripe_attach_external_account::StripeAttachExternalAccountWorkflow,
+            ),
             _ => Err(ProcessTrackerError::UnexpectedFlow)?,
         };
         let app_state = &state.clone();

crates/router/src/connector/adyen/transformers.rs

@@ -4097,10 +4097,8 @@ impl<F> TryFrom<types::PayoutsResponseRouterData<F, AdyenPayoutResponse>>
         let status = payout_eligible.map_or(
             {
                 response.result_code.map_or(
-                    response
-                        .response
-                        .map(storage_enums::PayoutStatus::foreign_from),
-                    |rc| Some(storage_enums::PayoutStatus::foreign_from(rc)),
+                    response.response.map(storage_enums::PayoutStatus::from),
+                    |rc| Some(storage_enums::PayoutStatus::from(rc)),
                 )
             },
             |pe| {
@@ -4117,20 +4115,23 @@ impl<F> TryFrom<types::PayoutsResponseRouterData<F, AdyenPayoutResponse>>
                 status,
                 connector_payout_id: response.psp_reference,
                 payout_eligible,
+                should_add_next_step_to_process_tracker: false,
             }),
             ..item.data
         })
     }
 }
 
 #[cfg(feature = "payouts")]
-impl ForeignFrom<AdyenStatus> for storage_enums::PayoutStatus {
-    fn foreign_from(adyen_status: AdyenStatus) -> Self {
+impl From<AdyenStatus> for storage_enums::PayoutStatus {
+    fn from(adyen_status: AdyenStatus) -> Self {
         match adyen_status {
-            AdyenStatus::Authorised | AdyenStatus::PayoutConfirmReceived => Self::Success,
+            AdyenStatus::Authorised | AdyenStatus::PayoutConfirmReceived => {
+                Self::OutgoingPaymentSent
+            }
             AdyenStatus::Cancelled | AdyenStatus::PayoutDeclineReceived => Self::Cancelled,
             AdyenStatus::Error => Self::Failed,
-            AdyenStatus::Pending => Self::Pending,
+            AdyenStatus::Pending => Self::Processing,
             AdyenStatus::PayoutSubmitReceived => Self::RequiresFulfillment,
             _ => Self::Ineligible,
         }