diff --git a/src/NoFrixion.MoneyMoov/Models/Mandates/Mandate.cs b/src/NoFrixion.MoneyMoov/Models/Mandates/Mandate.cs index 1ff11af5..9888d866 100755 --- a/src/NoFrixion.MoneyMoov/Models/Mandates/Mandate.cs +++ b/src/NoFrixion.MoneyMoov/Models/Mandates/Mandate.cs @@ -119,7 +119,7 @@ public class Mandate /// used to do a balance check on the payer's account. We don't currenlty support the AIS workflow. /// [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public decimal Amount { get; set; } /// diff --git a/src/NoFrixion.MoneyMoov/Models/Mandates/MandateCreate.cs b/src/NoFrixion.MoneyMoov/Models/Mandates/MandateCreate.cs index 416a2133..0bad495b 100644 --- a/src/NoFrixion.MoneyMoov/Models/Mandates/MandateCreate.cs +++ b/src/NoFrixion.MoneyMoov/Models/Mandates/MandateCreate.cs @@ -127,8 +127,8 @@ public class MandateCreate /// This is an optional field that with mandates created via Account Information Services can be /// used to do a balance check on the payer's account. We don't currenlty support the AIS workflow. /// - [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [System.Text.Json.Serialization.JsonIgnore] + [Newtonsoft.Json.JsonIgnore] public decimal Amount { get; set; } /// diff --git a/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequest.cs b/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequest.cs index 4740912a..f2c41752 100755 --- a/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequest.cs +++ b/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequest.cs @@ -236,7 +236,7 @@ public PaymentMethodTypeEnum PaymentMethodTypes public string? CardStripePaymentIntentSecret { get; set; } [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public Merchant? Merchant { get; set; } public List Addresses { get; set; } = new List(); @@ -287,7 +287,7 @@ public PaymentMethodTypeEnum PaymentMethodTypes /// /// The billing address or null if it's not set. [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public PaymentRequestAddress? BillingAddress => Addresses?.Where(x => x.AddressType == AddressTypesEnum.Billing).FirstOrDefault(); diff --git a/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestCreate.cs b/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestCreate.cs index 16042ef9..e664477b 100755 --- a/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestCreate.cs +++ b/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestCreate.cs @@ -308,15 +308,15 @@ public string? OriginUrl public string? CustomerEmailAddress { get; set; } [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public PaymentProcessorsEnum PaymentProcessor { get; set; } [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public string? LightningInvoice { get; set; } [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public DateTimeOffset? LightningInvoiceExpiresAt { get; set; } [EmailAddressMultiple(ErrorMessage = PaymentRequestConstants.NOTIFICATION_EMAIL_ADDRESSES_ERROR_MESSAGE)] diff --git a/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestEvent.cs b/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestEvent.cs index 7daa1c5e..30228c41 100755 --- a/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestEvent.cs +++ b/src/NoFrixion.MoneyMoov/Models/PaymentRequests/PaymentRequestEvent.cs @@ -17,7 +17,6 @@ // MIT. //----------------------------------------------------------------------------- -using System.Text.Json.Serialization; using System.ComponentModel.DataAnnotations; namespace NoFrixion.MoneyMoov.Models; @@ -44,11 +43,11 @@ public class PaymentRequestEvent public string? ErrorMessage { get; set; } [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public string? RawResponse { get; set; } [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public string? RawResponseHash { get; set; } public string? CardRequestID { get; set; } @@ -101,7 +100,7 @@ public class PaymentRequestEvent /// between submitting and finalising a payment initiation attempt. /// [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public string? PispToken { get; set; } /// @@ -139,7 +138,7 @@ public class PaymentRequestEvent /// of the tokenised card record that can be used with the pay with card token method. /// [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public Guid? TokenisedCardID { get; set; } /// @@ -164,6 +163,11 @@ public class PaymentRequestEvent /// public string? DirectDebitPaymentReference { get; set; } + /// + /// The ID of the mandate that was used wehn requesting payment. + /// + public Guid? DrirectDebitMandateID { get; set; } + /// /// Gets the amount to display with the correct number of decimal places based on the currency type. /// diff --git a/src/NoFrixion.MoneyMoov/Models/Payouts/Payout.cs b/src/NoFrixion.MoneyMoov/Models/Payouts/Payout.cs index 26dafe03..50f4cbd1 100755 --- a/src/NoFrixion.MoneyMoov/Models/Payouts/Payout.cs +++ b/src/NoFrixion.MoneyMoov/Models/Payouts/Payout.cs @@ -102,7 +102,7 @@ public class Payout : IValidatableObject, IWebhookPayload [Obsolete("Please use Destination.")] [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public Guid? DestinationAccountID { get => Destination?.AccountID; @@ -115,7 +115,7 @@ public Guid? DestinationAccountID [Obsolete("Please use Destination.")] [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public string? DestinationIBAN { get => Destination?.Identifier?.IBAN; @@ -129,7 +129,7 @@ public string? DestinationIBAN [Obsolete("Please use Destination.")] [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public string? DestinationAccountNumber { get => Destination?.Identifier?.AccountNumber; @@ -143,7 +143,7 @@ public string? DestinationAccountNumber [Obsolete("Please use Destination.")] [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public string? DestinationSortCode { get => Destination?.Identifier?.SortCode; @@ -157,7 +157,7 @@ public string? DestinationSortCode [Obsolete("Please use Destination.")] [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public string? DestinationAccountName { get => Destination?.Name; @@ -265,7 +265,7 @@ public AccountIdentifier? SourceAccountIdentifier [Obsolete("Please use Destination.")] [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] public Counterparty? DestinationAccount { get => Destination; diff --git a/src/NoFrixion.MoneyMoov/NoFrixionProblem.cs b/src/NoFrixion.MoneyMoov/NoFrixionProblem.cs index 1db1558e..27b10864 100755 --- a/src/NoFrixion.MoneyMoov/NoFrixionProblem.cs +++ b/src/NoFrixion.MoneyMoov/NoFrixionProblem.cs @@ -212,12 +212,12 @@ public static NoFrixionProblem Empty /// unknown, on non-JSON, format. /// [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] [IgnoreDataMember] public string RawError { get; set; } = string.Empty; [System.Text.Json.Serialization.JsonIgnore] - [Newtonsoft.Json.JsonProperty] + [Newtonsoft.Json.JsonIgnore] [IgnoreDataMember] public bool IsEmpty => _isEmpty;