Updated naming conventions

acoumb · acoumb · commit b8967c0b7320 · 2022-09-23T13:56:04.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/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/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/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,7 +7,7 @@ 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 static class ErrorCode
diff --git a/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/PaymentProviderWorkflow.cs b/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/PaymentProviderWorkflow.cs
@@ -42,27 +42,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",
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)"  />

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);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class Constants`
`7`	`7`
`8`	`8`	`public static class Configuration`
`9`	`9`	`{`
`10`		`- public const string Settings = "Umbraco:Forms:Integrations:Commerce:emerchantpay:Settings";`
	`10`	`+ public const string Settings = "Umbraco:Forms:Integrations:Commerce:Emerchantpay:Settings";`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`public static class ErrorCode`