Skip to content

Commit acead90

Browse files
Consistant alias casing
1 parent 9a33ce3 commit acead90

File tree

2 files changed

+24
-20
lines changed

2 files changed

+24
-20
lines changed

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public QuickpayCheckoutPaymentProvider(UmbracoCommerceContext ctx, ILogger<Quick
3737

3838
public override IEnumerable<TransactionMetaDataDefinition> TransactionMetaDataDefinitions => new[]
3939
{
40-
new TransactionMetaDataDefinition("quickPayOrderId", "Quickpay Order ID"),
41-
new TransactionMetaDataDefinition("quickPayPaymentId", "Quickpay Payment ID"),
42-
new TransactionMetaDataDefinition("quickPayPaymentHash", "Quickpay Payment Hash")
40+
new TransactionMetaDataDefinition("quickpayOrderId", "Quickpay Order ID"),
41+
new TransactionMetaDataDefinition("quickpayPaymentId", "Quickpay Payment ID"),
42+
new TransactionMetaDataDefinition("quickpayPaymentHash", "Quickpay Payment Hash")
4343
};
4444

4545
public override async Task<PaymentFormResult> GenerateFormAsync(PaymentProviderContext<QuickpayCheckoutSettings> ctx, CancellationToken cancellationToken = default)
@@ -64,12 +64,12 @@ public override async Task<PaymentFormResult> GenerateFormAsync(PaymentProviderC
6464
// Parse language - default language is English.
6565
Enum.TryParse(ctx.Settings.Lang, true, out QuickpayLang lang);
6666

67-
var quickPayOrderId = ctx.Order.Properties["quickPayOrderId"]?.Value;
68-
var quickPayPaymentId = ctx.Order.Properties["quickPayPaymentId"]?.Value;
69-
var quickPayPaymentHash = ctx.Order.Properties["quickPayPaymentHash"]?.Value ?? string.Empty;
70-
var quickPayPaymentLinkHash = ctx.Order.Properties["quickPayPaymentLinkHash"]?.Value ?? string.Empty;
67+
var quickpayOrderId = ctx.Order.Properties["quickpayOrderId"]?.Value;
68+
var quickpayPaymentId = ctx.Order.Properties["quickpayPaymentId"]?.Value;
69+
var quickpayPaymentHash = ctx.Order.Properties["quickpayPaymentHash"]?.Value ?? string.Empty;
70+
var quickpayPaymentLinkHash = ctx.Order.Properties["quickpayPaymentLinkHash"]?.Value ?? string.Empty;
7171

72-
if (quickPayPaymentHash != GetPaymentHash(quickPayPaymentId, ctx.Order.OrderNumber, currencyCode, orderAmount))
72+
if (quickpayPaymentHash != GetPaymentHash(quickpayPaymentId, ctx.Order.OrderNumber, currencyCode, orderAmount))
7373
{
7474
try
7575
{
@@ -118,18 +118,18 @@ public override async Task<PaymentFormResult> GenerateFormAsync(PaymentProviderC
118118
{ "orderNumber", ctx.Order.OrderNumber }
119119
};
120120

121-
quickPayOrderId = reference;
121+
quickpayOrderId = reference;
122122

123123
var payment = await client.CreatePaymentAsync(
124124
new QuickpayPaymentRequest
125125
{
126-
OrderId = quickPayOrderId,
126+
OrderId = quickpayOrderId,
127127
Currency = currencyCode,
128128
Variables = metaData
129129
},
130130
cancellationToken);
131131

132-
quickPayPaymentId = GetTransactionId(payment);
132+
quickpayPaymentId = GetTransactionId(payment);
133133

134134
var paymentLink = await client.CreatePaymentLinkAsync(payment.Id.ToString(), new QuickpayPaymentLinkRequest
135135
{
@@ -148,8 +148,8 @@ public override async Task<PaymentFormResult> GenerateFormAsync(PaymentProviderC
148148

149149
paymentFormLink = paymentLink.Url;
150150

151-
quickPayPaymentHash = GetPaymentHash(payment.Id.ToString(), ctx.Order.OrderNumber, currencyCode, orderAmount);
152-
quickPayPaymentLinkHash = Base64Encode(paymentFormLink);
151+
quickpayPaymentHash = GetPaymentHash(payment.Id.ToString(), ctx.Order.OrderNumber, currencyCode, orderAmount);
152+
quickpayPaymentLinkHash = Base64Encode(paymentFormLink);
153153
}
154154
catch (Exception ex)
155155
{
@@ -159,17 +159,17 @@ public override async Task<PaymentFormResult> GenerateFormAsync(PaymentProviderC
159159
else
160160
{
161161
// Get payment link from order properties.
162-
paymentFormLink = Base64Decode(quickPayPaymentLinkHash);
162+
paymentFormLink = Base64Decode(quickpayPaymentLinkHash);
163163
}
164164

165165
return new PaymentFormResult()
166166
{
167167
MetaData = new Dictionary<string, string>
168168
{
169-
{ "quickPayOrderId", quickPayOrderId },
170-
{ "quickPayPaymentId", quickPayPaymentId },
171-
{ "quickPayPaymentHash", quickPayPaymentHash },
172-
{ "quickPayPaymentLinkHash", quickPayPaymentLinkHash }
169+
{ "quickpayOrderId", quickpayOrderId },
170+
{ "quickpayPaymentId", quickpayPaymentId },
171+
{ "quickpayPaymentHash", quickpayPaymentHash },
172+
{ "quickpayPaymentLinkHash", quickpayPaymentLinkHash }
173173
},
174174
Form = new PaymentForm(paymentFormLink, PaymentFormMethod.Get)
175175
};
@@ -259,7 +259,7 @@ private static bool VerifyOrder(OrderReadOnly order, QuickpayPayment payment)
259259
}
260260
else
261261
{
262-
if (order.Properties["quickPayOrderId"]?.Value == payment.OrderId)
262+
if (order.Properties["quickpayOrderId"]?.Value == payment.OrderId)
263263
{
264264
return true;
265265
}

src/Umbraco.Commerce.PaymentProviders.Quickpay/wwwroot/lang/en.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,9 @@ export default {
3535

3636
'quickpayV10CheckoutSettingsFramedLabel': 'Framed',
3737
'quickpayV10CheckoutSettingsFramedDescription': 'Flag indicating whether to allow opening payment page in iframe',
38+
39+
'quickpayV10CheckoutMetaDataQuickpayOrderIdLabel': 'Order ID',
40+
'quickpayV10CheckoutMetaDataQuickpayPaymentIdLabel': 'Payment ID',
41+
'quickpayV10CheckoutMetaDataQuickpayPaymentHashLabel': 'Payment Hash',
3842
},
39-
};
43+
};

0 commit comments

Comments
 (0)