Updated naming conventions

acoumb · acoumb · commit 6fd028589870 · 2022-09-23T11:41:24.000+03:00
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/currency.controller.js b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/currency.controller.js
@@ -14,4 +14,4 @@
 }
 
 angular.module("umbraco")
-    .controller("UmbracoForms.Integrations.Commerce.emerchantpay.CurrencyController", CurrencyController);
+    .controller("UmbracoForms.Integrations.Commerce.Emerchantpay.CurrencyController", CurrencyController);
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/currency.html b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/currency.html
@@ -1,4 +1,4 @@
-﻿<div ng-controller="UmbracoForms.Integrations.Commerce.emerchantpay.CurrencyController as vm">
+﻿<div ng-controller="UmbracoForms.Integrations.Commerce.Emerchantpay.CurrencyController as vm">
 
     <div>
         <select ng-model="vm.selectedCurrency" ng-click="vm.saveCurrency()">
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/customer-details-mapper.controller.js b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/customer-details-mapper.controller.js
@@ -68,4 +68,4 @@
 }
 
 angular.module("umbraco")
-    .controller("UmbracoForms.Integrations.Commerce.emerchantpay.CustomerDetailsMapperController", CustomerDetailsMapperController);
+    .controller("UmbracoForms.Integrations.Commerce.Emerchantpay.CustomerDetailsMapperController", CustomerDetailsMapperController);
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/customer-details-mapper.html b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/customer-details-mapper.html
@@ -1,4 +1,4 @@
-﻿<div ng-controller="UmbracoForms.Integrations.Commerce.emerchantpay.CustomerDetailsMapperController as vm">
+﻿<div ng-controller="UmbracoForms.Integrations.Commerce.Emerchantpay.CustomerDetailsMapperController as vm">
 
     <div>
         <select ng-model="vm.selectedCustomerProperty">
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/emerchantpay.resource.js b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/emerchantpay.resource.js
@@ -1,6 +1,6 @@
 ﻿function emerchantpayResource($http, umbRequestHelper) {
 
-    const apiEndpoint = "backoffice/UmbracoFormsIntegrationsCommerceEmerchantpay/emerchantpay";
+    const apiEndpoint = "backoffice/UmbracoFormsIntegrationsCommerceEmerchantpay/Emerchantpay";
 
     return {
         isAccountAvailable: function () {
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/field-picker.controller.js b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/field-picker.controller.js
@@ -21,4 +21,4 @@
 }
 
 angular.module("umbraco")
-    .controller("UmbracoForms.Integrations.Commerce.emerchantpay.FieldPickerController", FieldPickerController);
+    .controller("UmbracoForms.Integrations.Commerce.Emerchantpay.FieldPickerController", FieldPickerController);
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/field-picker.html b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/field-picker.html
@@ -1,4 +1,4 @@
-﻿<div ng-controller="UmbracoForms.Integrations.Commerce.emerchantpay.FieldPickerController as vm">
+﻿<div ng-controller="UmbracoForms.Integrations.Commerce.Emerchantpay.FieldPickerController as vm">
 
     <div>
         <select ng-model="vm.selectedField" ng-click="vm.saveField()">
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/package.manifest b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/package.manifest
@@ -1,10 +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"
+    "~/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": [ "" ]
 }
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Constants.cs b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Constants.cs
@@ -7,27 +7,27 @@ public class Constants
 
         public static class Configuration
         {
-            public const string Settings = "Umbraco:Forms:Integrations:Commerce:eMerchantPay:Settings";
+            public const string Settings = "Umbraco:Forms:Integrations:Commerce:Emerchantpay:Settings";
 
-            public const string GatewayBaseUrlKey = "Umbraco.Forms.Integrations.Commerce.eMerchantPay.GatewayBaseurl";
+            public const string GatewayBaseUrlKey = "Umbraco.Forms.Integrations.Commerce.Emerchantpay.GatewayBaseurl";
 
-            public const string WpfUrlKey = "Umbraco.Forms.Integrations.Commerce.eMerchantPay.WpfUrl";
+            public const string WpfUrlKey = "Umbraco.Forms.Integrations.Commerce.Emerchantpay.WpfUrl";
 
-            public const string UsernameKey = "Umbraco.Forms.Integrations.Commerce.eMerchantPay.Username";
+            public const string UsernameKey = "Umbraco.Forms.Integrations.Commerce.Emerchantpay.Username";
 
-            public const string PasswordKey = "Umbraco.Forms.Integrations.Commerce.eMerchantPay.Password";
+            public const string PasswordKey = "Umbraco.Forms.Integrations.Commerce.Emerchantpay.Password";
 
-            public const string SupplierKey = "Umbraco.Forms.Integrations.Commerce.eMerchantPay.Supplier";
+            public const string SupplierKey = "Umbraco.Forms.Integrations.Commerce.Emerchantpay.Supplier";
 
-            public const string UsageKey = "Umbraco.Forms.Integrations.Commerce.eMerchantPay.Usage";
+            public const string UsageKey = "Umbraco.Forms.Integrations.Commerce.Emerchantpay.Usage";
 
-            public const string CurrenciesKey = "Umbraco.Forms.Integrations.Commerce.eMerchantPay.Currencies";
+            public const string CurrenciesKey = "Umbraco.Forms.Integrations.Commerce.Emerchantpay.Currencies";
 
-            public const string TransactionTypesKey = "Umbraco.Forms.Integrations.Commerce.eMerchantPay.TransactionTypes";
+            public const string TransactionTypesKey = "Umbraco.Forms.Integrations.Commerce.Emerchantpay.TransactionTypes";
 
-            public const string MappingFieldsKey = "Umbraco.Forms.Integrations.Commerce.eMerchantPay.MappingFields";
+            public const string MappingFieldsKey = "Umbraco.Forms.Integrations.Commerce.Emerchantpay.MappingFields";
 
-            public const string UmbracoBaseUrlKey = "Umbraco.Forms.Integrations.Commerce.eMerchantPay.UmbracoBaseUrl";
+            public const string UmbracoBaseUrlKey = "Umbraco.Forms.Integrations.Commerce.Emerchantpay.UmbracoBaseUrl";
         }
 
         public static class ErrorCode
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/PaymentProviderWorkflow.cs b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/PaymentProviderWorkflow.cs
@@ -51,27 +51,27 @@ public class PaymentProviderWorkflow : WorkflowType
 
         [Core.Attributes.Setting("Currency",
             Description = "Payment currency",
-            View = "~/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/currency.html")]
+            View = "~/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/currency.html")]
         public string Currency { get; set; }
 
         [Core.Attributes.Setting("Number of Items",
            Description = "Map number of items with form field. If selected, final amount will be Amount x NumberOfItems.",
-           View = "~/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/field-picker.html")]
+           View = "~/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/field-picker.html")]
         public string NumberOfItems { get; set; }
 
         [Core.Attributes.Setting("Record Status",
            Description = "Map payment record status with form field",
-           View = "~/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/field-picker.html")]
+           View = "~/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/field-picker.html")]
         public string RecordStatus { get; set; }
 
         [Core.Attributes.Setting("Record Payment Unique ID",
            Description = "Map payment unique ID with form field",
-           View = "~/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/field-picker.html")]
+           View = "~/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/field-picker.html")]
         public string UniqueId { get; set; }
 
         [Core.Attributes.Setting("Customer Details",
             Description = "Map customer details with form fields",
-            View = "~/App_Plugins/UmbracoForms.Integrations/Commerce/eMerchantPay/customer-details-mapper.html")]
+            View = "~/App_Plugins/UmbracoForms.Integrations/Commerce/Emerchantpay/customer-details-mapper.html")]
         public string CustomerDetailsMappings { get; set; }
 
         [Core.Attributes.Setting("Success URL",
@@ -104,8 +104,8 @@ public PaymentProviderWorkflow(IHttpContextAccessor httpContextAccessor,
 #endif
         {
             Id = new Guid(Constants.WorkflowId);
-            Name = "eMerchantPay Gateway";
-            Description = "eMerchantPay provider handling form-based payments.";
+            Name = "emerchantpay Gateway";
+            Description = "emerchantpay provider handling form-based payments.";
             Icon = "icon-multiple-credit-cards";
 
             _consumerService = consumerService;
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Umbraco.Forms.Integrations.Commerce.EMerchantPay.csproj b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Umbraco.Forms.Integrations.Commerce.EMerchantPay.csproj
@@ -7,14 +7,14 @@
 	<PropertyGroup>
 		<PackageId>Umbraco.Forms.Integrations.Commerce.emerchantpay</PackageId>
 		<Title>Umbraco Forms Integrations: Commerce - emerchantpay</Title>
-		<Description>An extension for Umbraco Forms providing a custom workflow for handling payments through emerchantpay gateway.</Description>
+		<Description>An extension for Umbraco Forms containing a custom workflow for handling online payments using a hosted payment page provided by emerchantpay.</Description>
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Forms.Integrations</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Forms.Integrations</RepositoryUrl>
 		<Version>1.0.0</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
-		<ApplicationManifest>App_Plugins\UmbracoForms.Integrations\Commerce\emerchantpay\package.manifest</ApplicationManifest>
+		<ApplicationManifest>App_Plugins\UmbracoForms.Integrations\Commerce\Emerchantpay\package.manifest</ApplicationManifest>
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/build/Umbraco.Forms.Integrations.Commerce.EMerchantPay.targets b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/build/Umbraco.Forms.Integrations.Commerce.EMerchantPay.targets
@@ -1,7 +1,7 @@
 ﻿<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
 	<PropertyGroup>
-		<EmerchantpayPropertyEditorFiles>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoForms.Integrations\Commerce\emerchantpay\**\*.*</EmerchantpayPropertyEditorFiles>
+		<EmerchantpayPropertyEditorFiles>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoForms.Integrations\Commerce\Emerchantpay\**\*.*</EmerchantpayPropertyEditorFiles>
 	</PropertyGroup>
 
 	<Target Name="CopyEmerchantpayPropertyEditorAssets" BeforeTargets="Build">
@@ -11,14 +11,14 @@
 		<Message Text="Copying emerchantpay Property Editor files: $(EmerchantpayPropertyEditorFiles) - #@(EmerchantpayPropertyEditorFiles->Count()) files" Importance="high" />
 		<Copy
 			SourceFiles="@(EmerchantpayPropertyEditorFiles)"
-			DestinationFiles="@(EmerchantpayPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoForms.Integrations\Commerce\emerchantpay\%(RecursiveDir)%(Filename)%(Extension)')"
+			DestinationFiles="@(EmerchantpayPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoForms.Integrations\Commerce\Emerchantpay\%(RecursiveDir)%(Filename)%(Extension)')"
 			SkipUnchangedFiles="true" />
 
 	</Target>
 
 	<Target Name="ClearEmerchantpayPropertyEditorAssets" BeforeTargets="Clean">
 		<ItemGroup>
-			<EmerchantpayPropertyEditorDir Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoForms.Integrations\Commerce\emerchantpay\" />
+			<EmerchantpayPropertyEditorDir Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoForms.Integrations\Commerce\Emerchantpay\" />
 		</ItemGroup>
 		<Message Text="Clear emerchantpay Property Editor data" Importance="high" />
 		<RemoveDir Directories="@(EmerchantpayPropertyEditorDir)"  />
diff --git a/src/Umbraco.Forms.Integrations.sln b/src/Umbraco.Forms.Integrations.sln
@@ -33,9 +33,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Forms.Integrations.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Commerce", "Commerce", "{F436249E-0796-4FCC-85A5-180A0DCDB05F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eMerchantPay", "eMerchantPay", "{854D0DF1-AAEE-406A-82A8-B05992A0A74B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Emerchantpay", "Emerchantpay", "{854D0DF1-AAEE-406A-82A8-B05992A0A74B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Forms.Integrations.Commerce.Emerchantpay", "Umbraco.Forms.Integrations.Commerce.EMerchantPay\Umbraco.Forms.Integrations.Commerce.Emerchantpay.csproj", "{FD1A8505-A19E-4281-8701-6BA708C03CBE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Forms.Integrations.Commerce.Emerchantpay", "Umbraco.Forms.Integrations.Commerce.Emerchantpay\Umbraco.Forms.Integrations.Commerce.Emerchantpay.csproj", "{FD1A8505-A19E-4281-8701-6BA708C03CBE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Forms.Integrations.Testsite.V8", "Umbraco.Forms.Integrations.Testsite.V8\Umbraco.Forms.Integrations.Testsite.V8.csproj", "{0FF76D59-DE4A-4620-8734-CF3234F527B6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -71,6 +73,10 @@ Global
 		{FD1A8505-A19E-4281-8701-6BA708C03CBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD1A8505-A19E-4281-8701-6BA708C03CBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD1A8505-A19E-4281-8701-6BA708C03CBE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0FF76D59-DE4A-4620-8734-CF3234F527B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FF76D59-DE4A-4620-8734-CF3234F527B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FF76D59-DE4A-4620-8734-CF3234F527B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FF76D59-DE4A-4620-8734-CF3234F527B6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`angular.module("umbraco")`
`17`		`- .controller("UmbracoForms.Integrations.Commerce.emerchantpay.CurrencyController", CurrencyController);`
	`17`	`+ .controller("UmbracoForms.Integrations.Commerce.Emerchantpay.CurrencyController", CurrencyController);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div ng-controller="UmbracoForms.Integrations.Commerce.emerchantpay.CurrencyController as vm">`
	`1`	`+<div ng-controller="UmbracoForms.Integrations.Commerce.Emerchantpay.CurrencyController as vm">`
`2`	`2`
`3`	`3`	`<div>`
`4`	`4`	`<select ng-model="vm.selectedCurrency" ng-click="vm.saveCurrency()">`
Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,4 @@`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`angular.module("umbraco")`
`71`		`- .controller("UmbracoForms.Integrations.Commerce.emerchantpay.CustomerDetailsMapperController", CustomerDetailsMapperController);`
	`71`	`+ .controller("UmbracoForms.Integrations.Commerce.Emerchantpay.CustomerDetailsMapperController", CustomerDetailsMapperController);`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,4 @@`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`angular.module("umbraco")`
`24`		`- .controller("UmbracoForms.Integrations.Commerce.emerchantpay.FieldPickerController", FieldPickerController);`
	`24`	`+ .controller("UmbracoForms.Integrations.Commerce.Emerchantpay.FieldPickerController", FieldPickerController);`