Merge branch 'release/moov-1.8.23'

Author: sipsorcery

src/NoFrixion.MoneyMoov/Constants/HttpClientConstants.cs

@@ -36,6 +36,8 @@ public static class HttpClientConstants
     public static string HTTP_BANKINGCIRCLE_AUTHORISATION_CLIENT_NAME = "BankingCircleAuthorisationClient";
 
     public static string HTTP_BANKINGCIRCLE_DIRECTDEBIT_API_CLIENT_NAME = "BankingCircleDirectDebitApiClient";
+    
+    public static string HTTP_TRIBE_CLIENT_NAME = "TribeClient";
 
     /// <summary>
     /// The minimum value the timeout for the HTTP client timeout can be set to. The HTTP client

src/NoFrixion.MoneyMoov/Enums/AccountStatus.cs

@@ -0,0 +1,37 @@
+// -----------------------------------------------------------------------------
+//  Filename: AccountTypeEnum.cs
+// 
+//  Description: Provides an enumeration of account types. Mainly for fee calculations.
+// 
+//  Author(s):
+//  Axel Granillo ([email protected])
+// 
+//  History:
+//  16 07 2024  Axel Granillo   Created, Remote, Mexico City, Mexico.
+// 
+//  License:
+//  Proprietary NoFrixion.
+// -----------------------------------------------------------------------------
+
+namespace NoFrixion.MoneyMoov.Enums;
+
+/// <summary>
+/// Enumeration of all possible account types.
+/// </summary>
+public enum AccountTypeEnum
+{
+    /// <summary>
+    /// Standard accounts. No fees applied.
+    /// </summary>
+    Standard,
+    
+    /// <summary>
+    /// Standard fee accounts. Fees are applied.
+    /// </summary>
+    StandardFee,
+    
+    /// <summary>
+    /// Account associated with Tribe.
+    /// </summary>
+    Tribe,
+}

src/NoFrixion.MoneyMoov/Enums/AccountTypeEnum.cs

@@ -100,6 +100,11 @@ public enum PaymentProcessorsEnum
     /// <summary>
     /// To pay with SEPA Direct Debit, handled by Banking Circle.
     /// </summary>
-    BankingCircleDirectDebit
+    BankingCircleDirectDebit,
+    
+    /// <summary>
+    /// Tribe payments processor.
+    /// </summary>
+    Tribe
 }
 

src/NoFrixion.MoneyMoov/Enums/PaymentProcessorsEnum.cs

@@ -29,8 +29,14 @@ public enum PaymentRailEnum
     SEPA_CT,
 
     /// <summary>
-    /// Single Euro Payments Area (SEPA) Instant scheme. Paymnets are processed 24/7 in
+    /// Single Euro Payments Area (SEPA) Instant scheme. Payments are processed 24/7 in
     /// seconds. Not yet supported by all EU institutions.
     /// </summary>
-    SEPA_INST
+    SEPA_INST,
+
+    /// <summary>
+    /// TARGET2 is the real-time gross settlement (RTGS) system for the Euro. Payments are processed 
+    /// in real-time and are used for high-value transfers within the EU.
+    /// </summary>
+    TARGET2
 }

src/NoFrixion.MoneyMoov/Enums/PaymentRailEnum.cs

@@ -37,4 +37,8 @@ public enum PayrunEventTypeEnum
     TopupInitiated = 8,
 
     FundsArrived = 9,
+    
+    Archived = 10,
+    
+    Unarchived = 11
 }

src/NoFrixion.MoneyMoov/Enums/PayrunEventTypeEnum.cs

@@ -84,5 +84,8 @@ public enum TransactionTypesEnum
     /// The transaction type was not recognised.
     /// </summary>
     [Display(Name = "Unknown type")]
-    Unknown = 12
+    Unknown = 12,
+
+    [Display(Name = "TARGET2")]
+    TARGET2 = 13
 }

src/NoFrixion.MoneyMoov/Enums/TransactionTypesEnum.cs

@@ -35,11 +35,6 @@ public class PaymentAccount
     /// </summary>
     public Guid MerchantID { get; set; }
 
-    /// <summary>
-    /// Status of the account.
-    /// </summary>
-    public AccountStatus Status { get; set; }
-
     /// <summary>
     /// Balance of the account.
     /// </summary>
@@ -204,6 +199,13 @@ public string Summary
     [CanBeNull]
     public User CreatedBy { get; set; }
 
+    /// <summary>
+    /// Indicates the default payment rail for this account. Normally it will be left as the
+    /// default value but in some special cases it may be set to indicate payouts from this account
+    /// should be attempted with a specific payment rail.
+    /// </summary>
+    public PaymentRailEnum DefaultPaymentRail { get; set; }
+
     /// <summary>
     /// The list of rules associated with this account.
     /// </summary>

src/NoFrixion.MoneyMoov/Models/Account/PaymentAccount.cs

@@ -15,6 +15,8 @@
 // MIT.
 //-----------------------------------------------------------------------------
 
+using NoFrixion.MoneyMoov.Enums;
+
 namespace NoFrixion.MoneyMoov.Models;
 
 public class PaymentAccountCreate
@@ -50,6 +52,17 @@ public class PaymentAccountCreate
     /// For internal use only. Leave empty unless requested otherwise.
     /// </summary>
     public Guid PhysicalAccountID { get; set; }
+    
+    /// <summary>
+    /// If specified the account type will be set to the specified value
+    /// disregarding the merchant default account type.
+    /// </summary>
+    public AccountTypeEnum? AccountType { get; set; }
+    
+    /// <summary>
+    /// If creating a Tribe account type, then this is the tribe account id
+    /// </summary>
+    public string? TribeAccountId { get; set; }
 
     /// <summary>
     /// Places all the payment request's properties into a dictionary.
@@ -64,6 +77,8 @@ public Dictionary<string, string> ToDictionary()
             { nameof(Currency), Currency.ToString() },
             { nameof(AccountName), AccountName ?? string.Empty },
             { nameof(PhysicalAccountID), PhysicalAccountID.ToString() },
+            { nameof(AccountType), AccountType?.ToString() ?? string.Empty },
+            { nameof(TribeAccountId), TribeAccountId ?? string.Empty }
         };
     }
 }

src/NoFrixion.MoneyMoov/Models/Account/PaymentAccountCreate.cs

@@ -159,6 +159,11 @@ public class PaymentRequestEvent
     /// </summary>
     public string? DirectDebitPaymentID { get; set; }
 
+    /// <summary>
+    /// Reference string issued by the Direct Debit supplier.
+    /// </summary>
+    public string? DirectDebitPaymentReference { get; set; }
+
     /// <summary>
     /// Gets the amount to display with the correct number of decimal places based on the currency type. 
     /// </summary>