Skip to content

Commit 1a9ce10

Browse files
bjarnefumbracotrd
authored andcommitted
Fix trim of order number based on order number template (#3)
* Fix reference when order number template ends with or contains {0}
1 parent 97fe979 commit 1a9ce10

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/Umbraco.Commerce.PaymentProviders.Quickpay/Api/QuickpayClient.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ private async Task<TResult> RequestAsync<TResult>(string url, Func<IFlurlRequest
9898
{
9999
throw;
100100
}
101+
catch (Exception ex)
102+
{
103+
throw;
104+
}
101105

102106
return result;
103107
}

src/Umbraco.Commerce.PaymentProviders.Quickpay/QuickpayCheckoutPaymentProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ public override async Task<PaymentFormResult> GenerateFormAsync(PaymentProviderC
9898
else if (orderNumberTemplate.EndsWith("{0}"))
9999
{
100100
// Trim prefix
101-
reference = reference.Substring(prefix.Length - 1);
101+
reference = reference.Substring(prefix.Length);
102102
}
103103
else if (orderNumberTemplate.Contains("{0}"))
104104
{
105105
// Trim prefix & suffix
106-
reference = reference.Substring(prefix.Length - 1, reference.Length - suffix.Length);
106+
reference = reference.Substring(prefix.Length, reference.Length - prefix.Length - suffix.Length);
107107
}
108108
}
109109
}

0 commit comments

Comments
 (0)