Merge branch 'main-v10' into v10/dev

# Conflicts:
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/currency.controller.js
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/currency.html
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/customer-details-mapper.controller.js
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/customer-details-mapper.html
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/field-picker.controller.js
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/field-picker.html
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/emerchantpay.resource.js
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/package.manifest
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Configuration/NotificationModelBinder.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Configuration/PaymentProviderSettings.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Constants.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Controllers/EmerchantPayController.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Controllers/PaymentProviderController.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/ExtensionMethods/CustomerDetailsMappingsExtensions.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Helpers/MappingFieldHelper.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Models/Dtos/NotificationDto.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/PaymentProviderComposer.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/PaymentProviderWorkflow.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Services/ConsumerService.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Services/MappingService.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Services/PaymentService.cs
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Umbraco.Forms.Integrations.Commerce.EMerchantPay.csproj
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/build/Umbraco.Forms.Integrations.Commerce.EMerchantPay.targets
#	src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/package.xml

Author: acoumb

src/Umbraco.Forms.Integrations.Automation.Zapier/package.xml

@@ -3,7 +3,7 @@
 	<info>
 		<package>
 			<name>Umbraco.Forms.Integrations.Automation.Zapier</name>
-			<version>1.0.0</version>
+			<version>1.0.1</version>
 			<iconUrl></iconUrl>
 			<licence url="https://opensource.org/licenses/MIT">MIT</licence>
 			<url>https://github.com/umbraco/Umbraco.Forms.Integrations</url>
@@ -25,4 +25,4 @@
 	<files>
 		<file path="bin/release/net472/Umbraco.Forms.Integrations.Automation.Zapier.dll" orgPath="bin/Umbraco.Forms.Integrations.Automation.Zapier.dll" />
 	</files>
-</umbPackage>
+</umbPackage>

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/currency.controller.js renamed to src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/currency.controller.js

@@ -0,0 +1,29 @@
+function emerchantpayResource($http, umbRequestHelper) {
+
+    const apiEndpoint = "backoffice/UmbracoFormsIntegrationsCommerceEmerchantpay/Emerchantpay";
+
+    return {
+        isAccountAvailable: function () {
+            return umbRequestHelper.resourcePromise(
+                $http.get(`${apiEndpoint}/IsAccountAvailable`),
+                "Failed to get resource");
+        },
+        getCurrencies: function () {
+            return umbRequestHelper.resourcePromise(
+                $http.get(`${apiEndpoint}/GetCurrencies`),
+                "Failed to get resource");
+        },
+        getAvailableMappingFields: function () {
+            return umbRequestHelper.resourcePromise(
+                $http.get(`${apiEndpoint}/GetAvailableMappingFields`),
+                "Failed to get resource");
+        },
+        getRequiredMappingFields: function () {
+            return umbRequestHelper.resourcePromise(
+                $http.get(`${apiEndpoint}/GetRequiredMappingFields`),
+                "Failed to get resource");
+        }
+    };
+}
+
+angular.module('umbraco.resources').factory('umbracoFormsIntegrationsCommerceEmerchantpayResource', emerchantpayResource);

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/currency.html renamed to src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/currency.html

@@ -13,4 +13,4 @@
 }
 
 angular.module("umbraco.services")
-    .factory("emerchantpayService", emerchantpayService)
+    .factory("emerchantpayService", emerchantpayService)

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

@@ -0,0 +1,10 @@
+{
+  "javascript": [
+    "~/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/customer-details-mapper.controller.js",
+    "~/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/currency.controller.js",
+    "~/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/emerchantpay.resource.js",
+    "~/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/emerchantpay.service.js",
+    "~/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/field-picker.controller.js"
+  ],
+	"css": [ "" ]
+}