Skip to content

Commit e6ec03c

Browse files
committed
Feedback updates
1 parent 272b222 commit e6ec03c

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/customer-details-mapper.controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
function init() {
3434

35-
umbracoFormsIntegrationsCommerceEMerchantPayResource.getDefaultMappingFields().then(function (response) {
35+
umbracoFormsIntegrationsCommerceEMerchantPayResource.getAvailableMappingFields().then(function (response) {
3636
vm.customerProperties = response;
3737
});
3838

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/emerchantpay.resource.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
$http.get(`${apiEndpoint}/GetCurrencies`),
99
"Failed to get resource");
1010
},
11-
getDefaultMappingFields: function () {
11+
getAvailableMappingFields: function () {
1212
return umbRequestHelper.resourcePromise(
13-
$http.get(`${apiEndpoint}/GetDefaultMappingFields`),
13+
$http.get(`${apiEndpoint}/GetAvailableMappingFields`),
1414
"Failed to get resource");
1515
},
1616
getRequiredMappingFields: function () {

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Constants.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,10 @@ public static class NotificationProperty
6060

6161
public const string Status = "wpf_status";
6262
}
63+
64+
public static class PaymentStatus
65+
{
66+
public const string Approved = "approved";
67+
}
6368
}
6469
}

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Controllers/EmerchantPayController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public EmerchantPayController(CurrencyHelper currencyHelper, MappingFieldHelper
4242
public IEnumerable<CurrencyDto> GetCurrencies() => _currencyHelper.GetCurrencies();
4343

4444
[HttpGet]
45-
public IEnumerable<string> GetDefaultMappingFields() => new[]
45+
public IEnumerable<string> GetAvailableMappingFields() => new[]
4646
{
4747
"Email",
4848
"FirstName",

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Controllers/PaymentProviderController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public HttpResponseMessage NotifyPayment(string formId, string recordUniqueId, s
7979
var paymentStatusField = record.GetRecordField(Guid.Parse(statusFieldId));
8080
paymentStatusField.Values.Add(reconcileResponse.Status);
8181

82-
if(approve)
82+
if(approve && notificationDto.Status == Constants.PaymentStatus.Approved)
8383
{
8484
_recordService.Approve(record, form);
8585
}

0 commit comments

Comments
 (0)