Merge branch 'master' into fix_not_allowed_to_change_password

AliveMen · AliveMen · commit 50b36a878ed4 · 2019-05-29T09:33:09.000+03:00
diff --git a/Modules/vc-module-cart/VirtoCommerce.CartModule.Core/Model/ShippingEvaluationContext.cs b/Modules/vc-module-cart/VirtoCommerce.CartModule.Core/Model/ShippingEvaluationContext.cs
@@ -1,14 +1,15 @@
-using VirtoCommerce.CoreModule.Core.Common;
+using VirtoCommerce.ShippingModule.Core.Model;
 
 namespace VirtoCommerce.CartModule.Core.Model
 {
-    public class ShippingEvaluationContext : IEvaluationContext
+    public class ShippingEvaluationContext : ShippingRateEvaluationContext
     {
         public ShippingEvaluationContext(ShoppingCart shoppingCart)
         {
             ShoppingCart = shoppingCart;
+            Currency = shoppingCart.Currency;
         }
 
-        public ShoppingCart ShoppingCart { get; set; }
+        public ShoppingCart ShoppingCart { get; }
     }
 }
diff --git a/Modules/vc-module-cart/VirtoCommerce.CartModule.Data/Model/PaymentEntity.cs b/Modules/vc-module-cart/VirtoCommerce.CartModule.Data/Model/PaymentEntity.cs
@@ -88,6 +88,7 @@ public virtual Payment ToModel(Payment payment)
             //TODO
             //payment.Purpose = Purpose;
             payment.OuterId = OuterId;
+            payment.Currency = Currency;
 
             if (!TaxDetails.IsNullOrEmpty())
             {
@@ -132,6 +133,7 @@ public virtual PaymentEntity FromModel(Payment payment, PrimaryKeyResolvingMap p
             Total = payment.Total;
             TotalWithTax = payment.TotalWithTax;
             OuterId = payment.OuterId;
+            Currency = payment.Currency;
             //TODO
             //Purpose = payment.Purpose;
 
@@ -171,6 +173,7 @@ public virtual void Patch(PaymentEntity target)
             target.TotalWithTax = TotalWithTax;
             target.Purpose = Purpose;
             target.OuterId = OuterId;
+            target.Currency = Currency;
 
             if (!Addresses.IsNullCollection())
             {
diff --git a/Modules/vc-module-catalog/VirtoCommerce.CatalogModule.Data/Search/Indexing/CatalogDocumentBuilder.cs b/Modules/vc-module-catalog/VirtoCommerce.CatalogModule.Data/Search/Indexing/CatalogDocumentBuilder.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using VirtoCommerce.CatalogModule.Core;
 using VirtoCommerce.CatalogModule.Core.Model;
 using VirtoCommerce.CoreModule.Core.Outlines;
 using VirtoCommerce.Platform.Core.Settings;
@@ -17,7 +18,7 @@ protected CatalogDocumentBuilder(ISettingsManager settingsManager)
             _settingsManager = settingsManager;
         }
 
-        protected virtual bool StoreObjectsInIndex => _settingsManager.GetValue("Catalog.Search.UseFullObjectIndexStoring", true);
+        protected virtual bool StoreObjectsInIndex => _settingsManager.GetValue(ModuleConstants.Settings.Search.UseFullObjectIndexStoring.Name, true);
 
         protected virtual void IndexCustomProperties(IndexDocument document, ICollection<Property> properties, ICollection<PropertyType> contentPropertyTypes)
         {
diff --git a/Modules/vc-module-catalog/VirtoCommerce.CatalogModule.Data/Search/Indexing/CatalogIndexedSearchService.cs b/Modules/vc-module-catalog/VirtoCommerce.CatalogModule.Data/Search/Indexing/CatalogIndexedSearchService.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using VirtoCommerce.CatalogModule.Core;
 using VirtoCommerce.CatalogModule.Core.Model;
 using VirtoCommerce.CatalogModule.Core.Model.Search;
 using VirtoCommerce.Platform.Core.Common;
@@ -69,11 +70,11 @@ protected virtual ISearchRequestBuilder GetRequestBuilder(TCriteria criteria)
 
         protected virtual async Task<TItem[]> ConvertDocuments(IList<SearchDocument> documents, TCriteria criteria)
         {
-            TItem[] result = null;
+            TItem[] result = Array.Empty<TItem>();
 
             if (documents?.Any() == true)
             {
-                var returnObjectsFromIndex = _settingsManager.GetValue("Catalog.Search.UseFullObjectIndexStoring", false);
+                var returnObjectsFromIndex = _settingsManager.GetValue(ModuleConstants.Settings.Search.UseFullObjectIndexStoring.Name, false);
                 var itemsMap = documents.ToDictionary(doc => doc.Id.ToString(), doc => returnObjectsFromIndex ? doc.GetObjectFieldValue<TItem>() : null);
 
                 var missingObjectIds = itemsMap
diff --git a/Modules/vc-module-sitemaps/VirtoCommerce.SitemapsModule.Data/Services/SitemapItemRecordProviders/StaticContentSitemapItemRecordProvider.cs b/Modules/vc-module-sitemaps/VirtoCommerce.SitemapsModule.Data/Services/SitemapItemRecordProviders/StaticContentSitemapItemRecordProvider.cs
@@ -14,6 +14,7 @@
 using VirtoCommerce.StoreModule.Core.Model;
 using VirtoCommerce.Tools;
 using YamlDotNet.RepresentationModel;
+using VirtoCommerce.SitemapsModule.Core;
 
 namespace VirtoCommerce.SitemapsModule.Data.Services.SitemapItemRecordProviders
 {
@@ -45,7 +46,7 @@ public virtual async Task LoadSitemapItemRecordsAsync(Store store, Sitemap sitem
             {
                 var processedCount = 0;
 
-                var acceptedFilenameExtensions = SettingsManager.GetValue("Sitemap.AcceptedFilenameExtensions", ".md,.html")
+                var acceptedFilenameExtensions = SettingsManager.GetValue(ModuleConstants.Settings.General.AcceptedFilenameExtensions.Name, ".md,.html")
                     .Split(',')
                     .Select(i => i.Trim())
                     .Where(i => !string.IsNullOrEmpty(i))
diff --git a/Modules/vc-module-sitemaps/VirtoCommerce.SitemapsModule.Data/Services/SitemapXmlGenerator.cs b/Modules/vc-module-sitemaps/VirtoCommerce.SitemapsModule.Data/Services/SitemapXmlGenerator.cs
@@ -14,6 +14,7 @@
 using VirtoCommerce.SitemapsModule.Data.Models.Xml;
 using VirtoCommerce.StoreModule.Core.Model;
 using VirtoCommerce.StoreModule.Core.Services;
+using VirtoCommerce.SitemapsModule.Core;
 
 namespace VirtoCommerce.SitemapsModule.Data.Services
 {
@@ -77,8 +78,8 @@ public virtual async Task<Stream> GenerateSitemapXmlAsync(string storeId, string
         {
             var stream = new MemoryStream();
 
-            var filenameSeparator = _settingsManager.GetValue("Sitemap.FilenameSeparator", "--");
-            var recordsLimitPerFile = _settingsManager.GetValue("Sitemap.RecordsLimitPerFile", 10000);
+            var filenameSeparator = _settingsManager.GetValue(ModuleConstants.Settings.General.FilenameSeparator.Name, "--");
+            var recordsLimitPerFile = _settingsManager.GetValue(ModuleConstants.Settings.General.RecordsLimitPerFile.Name, 10000);
 
             var xmlNamespaces = new XmlSerializerNamespaces();
             xmlNamespaces.Add("", "http://www.sitemaps.org/schemas/sitemap/0.9");
@@ -151,8 +152,8 @@ private async Task<ICollection<Sitemap>> LoadAllStoreSitemaps(Store store, strin
 
         private async Task LoadSitemapRecords(Store store, Sitemap sitemap, string baseUrl, Action<ExportImportProgressInfo> progressCallback = null)
         {
-            var recordsLimitPerFile = _settingsManager.GetValue("Sitemap.RecordsLimitPerFile", 10000);
-            var filenameSeparator = _settingsManager.GetValue("Sitemap.FilenameSeparator", "--");
+            var recordsLimitPerFile = _settingsManager.GetValue(ModuleConstants.Settings.General.RecordsLimitPerFile.Name, 10000);
+            var filenameSeparator = _settingsManager.GetValue(ModuleConstants.Settings.General.FilenameSeparator.Name, "--");
 
             var sitemapItemSearchCriteria = new SitemapItemSearchCriteria
             {
diff --git a/VirtoCommerce.Platform.Web/npm-shrinkwrap.json b/VirtoCommerce.Platform.Web/npm-shrinkwrap.json
diff --git a/VirtoCommerce.Platform.Web/wwwroot/js/app/security/security.js b/VirtoCommerce.Platform.Web/wwwroot/js/app/security/security.js
@@ -31,7 +31,7 @@ angular.module('platformWebApp')
                                 function (x) {
                                     $scope.loginProgress = false;
                                     if (angular.isDefined(x.status)) {
-                                        if (x.status == 401) {
+                                        if (x.status === 401) {
                                             $scope.authError = 'The login or password is incorrect.';
                                         } else {
                                             $scope.authError = 'Authentication error (code: ' + x.status + ').';
@@ -123,12 +123,13 @@ angular.module('platformWebApp')
                 },
                 controller: ['$q', '$scope', '$stateParams', 'platformWebApp.accounts', 'platformWebApp.authService', 'platformWebApp.passwordValidationService', function ($q, $scope, $stateParams, accounts, authService, passwordValidationService) {
                     $scope.userName = authService.userName;
-
-                    accounts.get({ id: $stateParams.userName }, function (user) {
-                        if (!user || !user.passwordExpired) {
-                            $stateParams.onClose();
-                        }
-                    });
+                    if ($scope.userName) {
+                        accounts.get({ id: $scope.userName }, function (user) {
+                            if (!user || !user.passwordExpired) {
+                                $stateParams.onClose();
+                            }
+                        });
+                    }
 
                     $scope.validatePasswordAsync = function (value) {
                         return passwordValidationService.validatePasswordAsync(value);

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,15 @@`
`1`		`-using VirtoCommerce.CoreModule.Core.Common;`
	`1`	`+using VirtoCommerce.ShippingModule.Core.Model;`
`2`	`2`
`3`	`3`	`namespace VirtoCommerce.CartModule.Core.Model`
`4`	`4`	`{`
`5`		`- public class ShippingEvaluationContext : IEvaluationContext`
	`5`	`+ public class ShippingEvaluationContext : ShippingRateEvaluationContext`
`6`	`6`	`{`
`7`	`7`	`public ShippingEvaluationContext(ShoppingCart shoppingCart)`
`8`	`8`	`{`
`9`	`9`	`ShoppingCart = shoppingCart;`
	`10`	`+ Currency = shoppingCart.Currency;`
`10`	`11`	`}`
`11`	`12`
`12`		`- public ShoppingCart ShoppingCart { get; set; }`
	`13`	`+ public ShoppingCart ShoppingCart { get; }`
`13`	`14`	`}`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
	`4`	`+using VirtoCommerce.CatalogModule.Core;`
`4`	`5`	`using VirtoCommerce.CatalogModule.Core.Model;`
`5`	`6`	`using VirtoCommerce.CoreModule.Core.Outlines;`
`6`	`7`	`using VirtoCommerce.Platform.Core.Settings;`
`@@ -17,7 +18,7 @@ protected CatalogDocumentBuilder(ISettingsManager settingsManager)`
`17`	`18`	`_settingsManager = settingsManager;`
`18`	`19`	`}`
`19`	`20`
`20`		`- protected virtual bool StoreObjectsInIndex => _settingsManager.GetValue("Catalog.Search.UseFullObjectIndexStoring", true);`
	`21`	`+ protected virtual bool StoreObjectsInIndex => _settingsManager.GetValue(ModuleConstants.Settings.Search.UseFullObjectIndexStoring.Name, true);`
`21`	`22`
`22`	`23`	`protected virtual void IndexCustomProperties(IndexDocument document, ICollection<Property> properties, ICollection<PropertyType> contentPropertyTypes)`
`23`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`using VirtoCommerce.StoreModule.Core.Model;`
`15`	`15`	`using VirtoCommerce.Tools;`
`16`	`16`	`using YamlDotNet.RepresentationModel;`
	`17`	`+using VirtoCommerce.SitemapsModule.Core;`
`17`	`18`
`18`	`19`	`namespace VirtoCommerce.SitemapsModule.Data.Services.SitemapItemRecordProviders`
`19`	`20`	`{`
`@@ -45,7 +46,7 @@ public virtual async Task LoadSitemapItemRecordsAsync(Store store, Sitemap sitem`
`45`	`46`	`{`
`46`	`47`	`var processedCount = 0;`
`47`	`48`
`48`		`- var acceptedFilenameExtensions = SettingsManager.GetValue("Sitemap.AcceptedFilenameExtensions", ".md,.html")`
	`49`	`+ var acceptedFilenameExtensions = SettingsManager.GetValue(ModuleConstants.Settings.General.AcceptedFilenameExtensions.Name, ".md,.html")`
`49`	`50`	`.Split(',')`
`50`	`51`	`.Select(i => i.Trim())`
`51`	`52`	`.Where(i => !string.IsNullOrEmpty(i))`