Merge branch 'release/biz-0.1.54'

Author: sipsorcery

src/NoFrixion.MoneyMoov/Extensions/PaymentSchedule.cs

@@ -34,7 +34,7 @@ public static string GetFormattedScheduleDayOnly(DateTimeOffset? scheduleDate) =
         scheduleDate == null ? NO_SCHEDULED_DATE_DESCRIPTION : GetScheduleDayOnlyString(scheduleDate.Value);
 
     public static string GetScheduleDayOnlyString(DateTimeOffset scheduleDate) =>
-        $"{scheduleDate.ToString("MMM")} {scheduleDate.Day}" + (scheduleDate.Year == DateTimeOffset.Now.Year ? string.Empty : $", {scheduleDate.Year}");
+        $"{scheduleDate.ToString("MMM")} {scheduleDate.Day}" + (scheduleDate.Year == DateTimeOffset.Now.Year ? string.Empty : $", {scheduleDate.Year}") + $" at {scheduleDate.LocalDateTime:HH:mm}";
 
     public static string GetDateSuffix(int num)
     {

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

@@ -216,4 +216,12 @@ public string Summary
     /// If an account receives a payment it will be automatically unarchived.
     /// </summary>
     public bool IsArchived { get; set; }
+
+    /// <summary>
+    /// If non-null it indicates that the account is a virtual account and this ID represents the 
+    /// backing physical account.
+    /// </summary>
+    public Guid? PhysicalAccountID { get; set; }
+
+    public bool IsVirtual => PhysicalAccountID.HasValue;
 }

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

@@ -9,7 +9,6 @@
 // 
 // History:
 // 09 Dec 2022  Aaron Clauson   Created, Stillorgan Wood, Dublin, Ireland.
-// 11 Dec 2022  Aaron Clauson   Renamed from PaymentAccountCreate to PaymentAccountCreate.
 // 
 // License:
 // MIT.
@@ -51,7 +50,7 @@ public class PaymentAccountCreate
     /// <summary>
     /// For internal use only. Leave empty unless requested otherwise.
     /// </summary>
-    public Guid PhysicalAccountID { get; set; }
+    public Guid SupplierPhysicalAccountID { get; set; }
 
     /// <summary>
     /// If specified the account type will be set to the specified value
@@ -64,6 +63,13 @@ public class PaymentAccountCreate
     /// </summary>
     public string? TribeAccountId { get; set; }
 
+    /// <summary>
+    /// For EUR accounts this can be set to the ID of another account that will act as the
+    /// backing phyiscal account. The new account will then act as a Virtual account, able to 
+    /// receive funds but the transactions will be recorded aginst the backing physical account.
+    /// </summary>
+    public Guid? PhysicalAccountID { get; set; }
+
     /// <summary>
     /// Places all the payment request's properties into a dictionary.
     /// </summary>
@@ -76,9 +82,10 @@ public Dictionary<string, string> ToDictionary()
             { nameof(MerchantID), MerchantID.ToString() },
             { nameof(Currency), Currency.ToString() },
             { nameof(AccountName), AccountName ?? string.Empty },
-            { nameof(PhysicalAccountID), PhysicalAccountID.ToString() },
+            { nameof(SupplierPhysicalAccountID), SupplierPhysicalAccountID.ToString() },
             { nameof(AccountType), AccountType?.ToString() ?? string.Empty },
-            { nameof(TribeAccountId), TribeAccountId ?? string.Empty }
+            { nameof(TribeAccountId), TribeAccountId ?? string.Empty },
+            { nameof(PhysicalAccountID), PhysicalAccountID?.ToString() ?? string.Empty }
         };
     }
 }

src/NoFrixion.MoneyMoov/Models/Mandates/Mandate.cs

@@ -92,12 +92,12 @@ public class Mandate
     /// <summary>
     /// Customer's account number in case of GBP account.
     /// </summary>
-    public int? CustomerAccountNumber { get; set; }
+    public string? CustomerAccountNumber { get; set; }
 
     /// <summary>
     /// Customer's sort code in case of GBP account.
     /// </summary>
-    public int? CustomerSortCode { get; set; }
+    public string? CustomerSortCode { get; set; }
 
     /// <summary>
     /// Reference assigned to this mandate.

src/NoFrixion.MoneyMoov/Models/Mandates/MandateCreate.cs

@@ -89,15 +89,15 @@ public class MandateCreate
     /// Account number of the customer's bank account in case of GBP account.
     /// </summary>
     [MaxLength(8)]
-    [RegularExpression("^[a-zA-Z0-9\\-,'. ]+$", ErrorMessage = "Please, provide a valid account number.")]
-    public int? AccountNumber { get; set; }
+    [RegularExpression("^[0-9]*$", ErrorMessage = "Please, provide a valid account number.")]
+    public string? AccountNumber { get; set; }
 
     /// <summary>
     /// Sort code of the customer's bank account in case of GBP account.
     /// </summary>
     [MaxLength(6)]
-    [RegularExpression("^[a-zA-Z0-9\\-,'. ]+$", ErrorMessage = "Please, provide a valid sort code.")]
-    public int? SortCode { get; set; }
+    [RegularExpression("^[0-9\\-]*$", ErrorMessage = "Please, provide a valid sort code.")]
+    public string? SortCode { get; set; }
 
     /// <summary>
     /// Customer's email address.

src/NoFrixion.MoneyMoov/Models/Transaction/Transaction.cs

@@ -110,4 +110,9 @@ public class Transaction : IWebhookPayload
     /// ID of the payout that resulted in the transaction.
     /// </summary>
     public Guid? PayoutID { get; set; }
+
+    /// <summary>
+    /// If set it indicates the  payin was to a virtual IBAN.
+    /// </summary>
+    public string VirtualIBAN { get; set; }
 }