VP-6864: Fix header icon (#18)

* Fix icon usage * Fix file name for *nix operation systems
VirtoCommerce · Feb 9, 2021 · b55dee5 · b55dee5
1 parent 4c2cd81
commit b55dee5
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 90 deletions.
diff --git a/VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests/ECommerceConverterTests.cs b/VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests/ECommerceConverterTests.cs
@@ -1,92 +1,87 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO;
 using VirtoCommerce.GoogleEcommerceAnalyticsModule.Data.Converters;
 using VirtoCommerce.OrdersModule.Core.Model;
 using Xunit;
 
 namespace VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests
 {
-	public class ECommerceConverterTests
-	{
-		protected CustomerOrder GetOrder()
-		{
-			var customerObjectJson = System.IO.File.ReadAllText(@"MoqData\CustomerOrder.json");
+    public class ECommerceConverterTests
+    {
+        protected CustomerOrder GetOrder()
+        {
+            var customerObjectJson = System.IO.File.ReadAllText(Path.Combine("MoqData", "CustomerOrder.json"));
 
-			return Newtonsoft.Json.JsonConvert.DeserializeObject<CustomerOrder>(customerObjectJson, new Newtonsoft.Json.JsonSerializerSettings { TypeNameHandling = Newtonsoft.Json.TypeNameHandling.All });
-		}
+            return Newtonsoft.Json.JsonConvert.DeserializeObject<CustomerOrder>(customerObjectJson, new Newtonsoft.Json.JsonSerializerSettings { TypeNameHandling = Newtonsoft.Json.TypeNameHandling.All });
+        }
 
-		[Fact]
-		public void LineItemToTransactionItem()
-		{
-			var customerOrder = GetOrder();
+        [Fact]
+        public void LineItemToTransactionItem()
+        {
+            var customerOrder = GetOrder();
 
-			foreach (var lineItem in customerOrder.Items)
-			{
-				var result = ECommerceConverter.LineItemToTransactionItem(customerOrder, lineItem, true);
-				Assert.Equal(customerOrder.Number, result.TransactionId);
-				Assert.Equal(customerOrder.CustomerId, result.ClientId);
-				Assert.Equal(customerOrder.Currency, result.CurrencyCode);
-				Assert.Equal(lineItem.CategoryId, result.ItemCategory);
-				Assert.Equal(lineItem.Sku, result.ItemCode);
-				Assert.Equal(lineItem.Name, result.ItemName);
-				Assert.Equal(lineItem.PlacedPrice, result.ItemPrice);
-				Assert.Equal(-1 * lineItem.Quantity, result.ItemQuantity);
-				Assert.Equal(customerOrder.CustomerId, result.UserId);
-			}
-		}
+            foreach (var lineItem in customerOrder.Items)
+            {
+                var result = ECommerceConverter.LineItemToTransactionItem(customerOrder, lineItem, true);
+                Assert.Equal(customerOrder.Number, result.TransactionId);
+                Assert.Equal(customerOrder.CustomerId, result.ClientId);
+                Assert.Equal(customerOrder.Currency, result.CurrencyCode);
+                Assert.Equal(lineItem.CategoryId, result.ItemCategory);
+                Assert.Equal(lineItem.Sku, result.ItemCode);
+                Assert.Equal(lineItem.Name, result.ItemName);
+                Assert.Equal(lineItem.PlacedPrice, result.ItemPrice);
+                Assert.Equal(-1 * lineItem.Quantity, result.ItemQuantity);
+                Assert.Equal(customerOrder.CustomerId, result.UserId);
+            }
+        }
 
-		[Fact]
-		public void LineItemToRevertTransactionItem()
-		{
-			var customerOrder = GetOrder();
+        [Fact]
+        public void LineItemToRevertTransactionItem()
+        {
+            var customerOrder = GetOrder();
 
-			foreach (var lineItem in customerOrder.Items)
-			{
-				var result = ECommerceConverter.LineItemToTransactionItem(customerOrder, lineItem);
-				Assert.Equal(customerOrder.Number, result.TransactionId);
-				Assert.Equal(customerOrder.CustomerId, result.ClientId);
-				Assert.Equal(customerOrder.Currency, result.CurrencyCode);
-				Assert.Equal(lineItem.CategoryId, result.ItemCategory);
-				Assert.Equal(lineItem.Sku, result.ItemCode);
-				Assert.Equal(lineItem.Name, result.ItemName);
-				Assert.Equal(lineItem.PlacedPrice, result.ItemPrice);
-				Assert.Equal(lineItem.Quantity, result.ItemQuantity);
-				Assert.Equal(customerOrder.CustomerId, result.UserId);
-			}
-		}
+            foreach (var lineItem in customerOrder.Items)
+            {
+                var result = ECommerceConverter.LineItemToTransactionItem(customerOrder, lineItem);
+                Assert.Equal(customerOrder.Number, result.TransactionId);
+                Assert.Equal(customerOrder.CustomerId, result.ClientId);
+                Assert.Equal(customerOrder.Currency, result.CurrencyCode);
+                Assert.Equal(lineItem.CategoryId, result.ItemCategory);
+                Assert.Equal(lineItem.Sku, result.ItemCode);
+                Assert.Equal(lineItem.Name, result.ItemName);
+                Assert.Equal(lineItem.PlacedPrice, result.ItemPrice);
+                Assert.Equal(lineItem.Quantity, result.ItemQuantity);
+                Assert.Equal(customerOrder.CustomerId, result.UserId);
+            }
+        }
 
-		[Fact]
-		public void OrderToTransaction()
-		{
-			var customerOrder = GetOrder();
+        [Fact]
+        public void OrderToTransaction()
+        {
+            var customerOrder = GetOrder();
 
-			var result = ECommerceConverter.OrderToTransaction(customerOrder);
-			Assert.Equal(customerOrder.Number, result.TransactionId);
-			Assert.Equal(customerOrder.CustomerId, result.ClientId);
-			Assert.Equal(customerOrder.Currency, result.CurrencyCode);
-			Assert.Equal(customerOrder.Total, result.TransactionRevenue);
-			Assert.Equal(customerOrder.ShippingTotal, result.TransactionShipping);
-			Assert.Equal(customerOrder.TaxTotal, result.TransactionTax);
-			Assert.Equal(customerOrder.CustomerId, result.UserId);
-		}
+            var result = ECommerceConverter.OrderToTransaction(customerOrder);
+            Assert.Equal(customerOrder.Number, result.TransactionId);
+            Assert.Equal(customerOrder.CustomerId, result.ClientId);
+            Assert.Equal(customerOrder.Currency, result.CurrencyCode);
+            Assert.Equal(customerOrder.Total, result.TransactionRevenue);
+            Assert.Equal(customerOrder.ShippingTotal, result.TransactionShipping);
+            Assert.Equal(customerOrder.TaxTotal, result.TransactionTax);
+            Assert.Equal(customerOrder.CustomerId, result.UserId);
+        }
 
-		[Fact]
-		public void OrderToRevertTransaction()
-		{
-			var customerOrder = GetOrder();
+        [Fact]
+        public void OrderToRevertTransaction()
+        {
+            var customerOrder = GetOrder();
 
-			var result = ECommerceConverter.OrderToTransaction(customerOrder, true);
-			Assert.Equal(customerOrder.Number, result.TransactionId);
-			Assert.Equal(customerOrder.CustomerId, result.ClientId);
-			Assert.Equal(customerOrder.Currency, result.CurrencyCode);
-			Assert.Equal(-1 * customerOrder.Total, result.TransactionRevenue);
-			Assert.Equal(-1 * customerOrder.ShippingTotal, result.TransactionShipping);
-			Assert.Equal(-1 * customerOrder.TaxTotal, result.TransactionTax);
-			Assert.Equal( customerOrder.CustomerId, result.UserId);
-		}
-
-	}
-}
+            var result = ECommerceConverter.OrderToTransaction(customerOrder, true);
+            Assert.Equal(customerOrder.Number, result.TransactionId);
+            Assert.Equal(customerOrder.CustomerId, result.ClientId);
+            Assert.Equal(customerOrder.Currency, result.CurrencyCode);
+            Assert.Equal(-1 * customerOrder.Total, result.TransactionRevenue);
+            Assert.Equal(-1 * customerOrder.ShippingTotal, result.TransactionShipping);
+            Assert.Equal(-1 * customerOrder.TaxTotal, result.TransactionTax);
+            Assert.Equal(customerOrder.CustomerId, result.UserId);
+        }
+    }
+}
diff --git a/VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests/TransactionManagerTests.cs b/VirtoCommerce.GoogleEcommerceAnalyticsModule.Tests/TransactionManagerTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Threading.Tasks;
 using Moq;
 using VirtoCommerce.GoogleEcommerceAnalyticsModule.Data.Services;
@@ -13,7 +14,7 @@ public class TransactionManagerTests
 
         protected CustomerOrder GetOrder()
         {
-            var customerObjectJson = System.IO.File.ReadAllText(@"MoqData\CustomerOrder.json");
+            var customerObjectJson = System.IO.File.ReadAllText(Path.Combine("MoqData", "CustomerOrder.json"));
 
             return Newtonsoft.Json.JsonConvert.DeserializeObject<CustomerOrder>(customerObjectJson);
         }
@@ -69,4 +70,4 @@ public async Task CreateAndRevertTransaction()
             await manager.RevertTransactionAsync(customerOrder);
         }
     }
-}
+}
diff --git a/VirtoCommerce.GoogleEcommerceAnalyticsModule.Web/Scripts/blades/store-settings.js b/VirtoCommerce.GoogleEcommerceAnalyticsModule.Web/Scripts/blades/store-settings.js
@@ -11,12 +11,12 @@
     }
 
     blade.refresh = function() {
-		blade.enableTracking = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.EnableTracking'; });
-		blade.createECommerceTransaction = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.CreateECommerceTransaction'; });
-		blade.reverseECommerceTransaction = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.ReverseECommerceTransaction'; });
+        blade.enableTracking = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.EnableTracking'; });
+        blade.createECommerceTransaction = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.CreateECommerceTransaction'; });
+        blade.reverseECommerceTransaction = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.ReverseECommerceTransaction'; });
 
-		blade.googleTagManagerId = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.GoogleTagManagerId'; });
-		blade.googleAnalyticsTrackingId = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.GoogleAnalyticsTrackingId'; });
+        blade.googleTagManagerId = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.GoogleTagManagerId'; });
+        blade.googleAnalyticsTrackingId = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.GoogleAnalyticsTrackingId'; });
     };
 
     function isDirty() {
@@ -28,11 +28,11 @@
         $scope.bladeClose();
     };
 
-	$scope.cancelChanges = function () {
-		$scope.bladeClose();
-	};
+    $scope.cancelChanges = function () {
+        $scope.bladeClose();
+    };
 
-    $scope.blade.headIcon = 'fa-database';
+    $scope.blade.headIcon = 'fa fa-database';
 
     blade.toolbarCommands = [
         {

diff --git a/VirtoCommerce.GoogleEcommerceAnalyticsModule.Web/stats.json b/VirtoCommerce.GoogleEcommerceAnalyticsModule.Web/stats.json
@@ -225,7 +225,7 @@
                 "ModuleConcatenation bailout: Module is not an ECMAScript module"
               ],
               "depth": 1,
-              "source": "angular.module('virtoCommerce.googleEcommerceAnalyticsModule')\n.controller('virtoCommerce.googleEcommerceAnalyticsModule.storeSettingsController', ['$scope', function ($scope) {\n    var blade = $scope.blade;\n    blade.updatePermission = 'platform:setting:update';\n\n    function initializeBlade(data) {\n        blade.currentEntities = angular.copy(data);\n        blade.origEntity = data;\n        blade.refresh();\n        blade.isLoading = false;\n    }\n\n    blade.refresh = function() {\n\t\tblade.enableTracking = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.EnableTracking'; });\n\t\tblade.createECommerceTransaction = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.CreateECommerceTransaction'; });\n\t\tblade.reverseECommerceTransaction = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.ReverseECommerceTransaction'; });\n\n\t\tblade.googleTagManagerId = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.GoogleTagManagerId'; });\n\t\tblade.googleAnalyticsTrackingId = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.GoogleAnalyticsTrackingId'; });\n    };\n\n    function isDirty() {\n        return !angular.equals(blade.currentEntities, blade.origEntity) && blade.hasUpdatePermission();\n    }\n\n    $scope.saveChanges = function () {\n        angular.copy(blade.currentEntities, blade.origEntity);\n        $scope.bladeClose();\n    };\n\n\t$scope.cancelChanges = function () {\n\t\t$scope.bladeClose();\n\t};\n\n    $scope.blade.headIcon = 'fa-database';\n\n    blade.toolbarCommands = [\n        {\n            name: \"platform.commands.reset\", icon: 'fa fa-undo',\n            executeMethod: function () {\n                angular.copy(blade.origEntity, blade.currentEntities);\n                blade.refresh();\n            },\n            canExecuteMethod: isDirty,\n            permission: blade.updatePermission\n        }\n    ];\n\n    $scope.$watch('blade.parentBlade.currentEntity.settings', initializeBlade);\n}]);"
+              "source": "angular.module('virtoCommerce.googleEcommerceAnalyticsModule')\n.controller('virtoCommerce.googleEcommerceAnalyticsModule.storeSettingsController', ['$scope', function ($scope) {\n    var blade = $scope.blade;\n    blade.updatePermission = 'platform:setting:update';\n\n    function initializeBlade(data) {\n        blade.currentEntities = angular.copy(data);\n        blade.origEntity = data;\n        blade.refresh();\n        blade.isLoading = false;\n    }\n\n    blade.refresh = function() {\n\t\tblade.enableTracking = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.EnableTracking'; });\n\t\tblade.createECommerceTransaction = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.CreateECommerceTransaction'; });\n\t\tblade.reverseECommerceTransaction = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.ReverseECommerceTransaction'; });\n\n\t\tblade.googleTagManagerId = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.GoogleTagManagerId'; });\n\t\tblade.googleAnalyticsTrackingId = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.GoogleAnalyticsTrackingId'; });\n    };\n\n    function isDirty() {\n        return !angular.equals(blade.currentEntities, blade.origEntity) && blade.hasUpdatePermission();\n    }\n\n    $scope.saveChanges = function () {\n        angular.copy(blade.currentEntities, blade.origEntity);\n        $scope.bladeClose();\n    };\n\n\t$scope.cancelChanges = function () {\n\t\t$scope.bladeClose();\n\t};\n\n    $scope.blade.headIcon = 'fa fa-database';\n\n    blade.toolbarCommands = [\n        {\n            name: \"platform.commands.reset\", icon: 'fa fa-undo',\n            executeMethod: function () {\n                angular.copy(blade.origEntity, blade.currentEntities);\n                blade.refresh();\n            },\n            canExecuteMethod: isDirty,\n            permission: blade.updatePermission\n        }\n    ];\n\n    $scope.$watch('blade.parentBlade.currentEntity.settings', initializeBlade);\n}]);"
             },
             {
               "id": 3,
@@ -446,7 +446,7 @@
             "ModuleConcatenation bailout: Module is not an ECMAScript module"
           ],
           "depth": 1,
-          "source": "angular.module('virtoCommerce.googleEcommerceAnalyticsModule')\n.controller('virtoCommerce.googleEcommerceAnalyticsModule.storeSettingsController', ['$scope', function ($scope) {\n    var blade = $scope.blade;\n    blade.updatePermission = 'platform:setting:update';\n\n    function initializeBlade(data) {\n        blade.currentEntities = angular.copy(data);\n        blade.origEntity = data;\n        blade.refresh();\n        blade.isLoading = false;\n    }\n\n    blade.refresh = function() {\n\t\tblade.enableTracking = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.EnableTracking'; });\n\t\tblade.createECommerceTransaction = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.CreateECommerceTransaction'; });\n\t\tblade.reverseECommerceTransaction = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.ReverseECommerceTransaction'; });\n\n\t\tblade.googleTagManagerId = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.GoogleTagManagerId'; });\n\t\tblade.googleAnalyticsTrackingId = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.GoogleAnalyticsTrackingId'; });\n    };\n\n    function isDirty() {\n        return !angular.equals(blade.currentEntities, blade.origEntity) && blade.hasUpdatePermission();\n    }\n\n    $scope.saveChanges = function () {\n        angular.copy(blade.currentEntities, blade.origEntity);\n        $scope.bladeClose();\n    };\n\n\t$scope.cancelChanges = function () {\n\t\t$scope.bladeClose();\n\t};\n\n    $scope.blade.headIcon = 'fa-database';\n\n    blade.toolbarCommands = [\n        {\n            name: \"platform.commands.reset\", icon: 'fa fa-undo',\n            executeMethod: function () {\n                angular.copy(blade.origEntity, blade.currentEntities);\n                blade.refresh();\n            },\n            canExecuteMethod: isDirty,\n            permission: blade.updatePermission\n        }\n    ];\n\n    $scope.$watch('blade.parentBlade.currentEntity.settings', initializeBlade);\n}]);"
+          "source": "angular.module('virtoCommerce.googleEcommerceAnalyticsModule')\n.controller('virtoCommerce.googleEcommerceAnalyticsModule.storeSettingsController', ['$scope', function ($scope) {\n    var blade = $scope.blade;\n    blade.updatePermission = 'platform:setting:update';\n\n    function initializeBlade(data) {\n        blade.currentEntities = angular.copy(data);\n        blade.origEntity = data;\n        blade.refresh();\n        blade.isLoading = false;\n    }\n\n    blade.refresh = function() {\n\t\tblade.enableTracking = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.EnableTracking'; });\n\t\tblade.createECommerceTransaction = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.CreateECommerceTransaction'; });\n\t\tblade.reverseECommerceTransaction = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.ReverseECommerceTransaction'; });\n\n\t\tblade.googleTagManagerId = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.GoogleTagManagerId'; });\n\t\tblade.googleAnalyticsTrackingId = _.find(blade.currentEntities, function (x) { return x.name === 'GoogleEcommerceAnalytics.GoogleAnalyticsTrackingId'; });\n    };\n\n    function isDirty() {\n        return !angular.equals(blade.currentEntities, blade.origEntity) && blade.hasUpdatePermission();\n    }\n\n    $scope.saveChanges = function () {\n        angular.copy(blade.currentEntities, blade.origEntity);\n        $scope.bladeClose();\n    };\n\n\t$scope.cancelChanges = function () {\n\t\t$scope.bladeClose();\n\t};\n\n    $scope.blade.headIcon = 'fa fa-database';\n\n    blade.toolbarCommands = [\n        {\n            name: \"platform.commands.reset\", icon: 'fa fa-undo',\n            executeMethod: function () {\n                angular.copy(blade.origEntity, blade.currentEntities);\n                blade.refresh();\n            },\n            canExecuteMethod: isDirty,\n            permission: blade.updatePermission\n        }\n    ];\n\n    $scope.$watch('blade.parentBlade.currentEntity.settings', initializeBlade);\n}]);"
         },
         {
           "id": 3,