Merge branch 'release/moov-1.8.88'

Author: sipsorcery

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

@@ -175,11 +175,11 @@ public string BitcoinAddress
         "No identifier.";
 
     public string DisplayScanSummary =>
-        Currency == CurrencyTypeEnum.GBP && !string.IsNullOrEmpty(SortCode) && !string.IsNullOrEmpty(AccountNumber) && SortCode.Length == GBP_SORT_CODE_LENGTH
-            ? $"{SortCode[..2]}-{SortCode.Substring(2, 2)}-{SortCode.Substring(4, 2)} {AccountNumber}"
-            : $"{SortCode} {AccountNumber}";
+        !string.IsNullOrEmpty(SortCode) && !string.IsNullOrEmpty(AccountNumber) && SortCode.Length == GBP_SORT_CODE_LENGTH
+            ? $"{SortCode[..2]}-{SortCode[2..4]}-{SortCode[4..6]} / {AccountNumber}"
+            : $"{SortCode} / {AccountNumber}";
 
-    public string DisplayBicSummary => $"{BIC} {AccountNumber}";
+    public string DisplayBicSummary => $"{BIC} / {AccountNumber}";
 
     public bool IsSameDestination(AccountIdentifier other)
     {

src/NoFrixion.MoneyMoov/Models/Beneficiary/Beneficiary.cs

@@ -112,6 +112,12 @@ public class Beneficiary : IValidatableObject, IExportableToCsv
     public DateTimeOffset? LastAuthorised { get; set; }
 
     public User CreatedBy { get; set; }
+    
+    /// <summary>
+    /// The reference that will be used by default as TheirReference when creating payouts to this beneficiary
+    /// if no TheirReference is specified for the payout.
+    /// </summary>
+    [CanBeNull] public string TheirReference { get; set; }
 
     // Don't serialize the events if there are none.
     [System.Text.Json.Serialization.JsonIgnore(Condition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull)]

src/NoFrixion.MoneyMoov/Models/Beneficiary/BeneficiaryCreate.cs

@@ -15,6 +15,7 @@
 // -----------------------------------------------------------------------------
 
 using System.ComponentModel.DataAnnotations;
+using JetBrains.Annotations;
 
 #nullable disable
 
@@ -46,14 +47,20 @@ public class BeneficiaryCreate : IValidatableObject
 
     [Required(ErrorMessage = "Destination is required.")]
     public CounterpartyCreate Destination { get; set; }
+    
+    /// <summary>
+    /// Optional reference that will be used by default as TheirReference when creating payouts to this beneficiary 
+    /// if no TheirReference is specified for the payout.
+    /// </summary>
+    [CanBeNull] public string TheirReference { get; set; }
 
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
         var payout = ToPayout();
         payout.Amount = 0.01M;
         // Use dummy valid values for references. Beneficiaries can have invalid references as
         // they will be forced to fix them when the payout is created.
-        payout.TheirReference = "GoodRef";
+        payout.TheirReference = TheirReference ?? "GoodRef";
         payout.YourReference = "GoodRef";
         return payout.Validate(validationContext);
     }
@@ -91,7 +98,8 @@ public Dictionary<string, string> ToDictionary()
             { nameof(ID), ID.ToString() },
             { nameof(MerchantID), MerchantID.ToString() },
             { nameof(Name), Name },
-            { nameof(Currency), Currency.ToString() }
+            { nameof(Currency), Currency.ToString() },
+            { nameof(TheirReference), TheirReference}
         };
 
         if (Destination != null)

src/NoFrixion.MoneyMoov/Models/Beneficiary/BeneficiaryUpdate.cs

@@ -33,6 +33,12 @@ public class BeneficiaryUpdate
 
     public Counterparty? Destination { get; set; }
 
+    /// <summary>
+    /// The default reference that will be used by default as TheirReference when creating payouts to this beneficiary
+    /// if no TheirReference is specified for the payout.
+    /// </summary>
+    public string? TheirReference { get; set; }
+    
     public NoFrixionProblem Validate()
     {
         var context = new ValidationContext(this, serviceProvider: null, items: null);

src/NoFrixion.MoneyMoov/NoFrixion.MoneyMoov.csproj

@@ -4,8 +4,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<AssemblyVersion>1.8.84.0</AssemblyVersion>
-	<FileVersion>1.8.84.0</FileVersion>
+	<AssemblyVersion>1.8.88.0</AssemblyVersion>
+	<FileVersion>1.8.88.0</FileVersion>
 	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
 	<NoWarn>$(NoWarn);1591;NU1902;NU1903;</NoWarn>