Fixed error notification for missing rate currency plugin

anzolin · Nov 6, 2018 · 3fa85e9 · 3fa85e9
1 parent 2d6d8b3
commit 3fa85e9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/Libraries/Nop.Services/Installation/CodeFirstInstallationService.cs b/src/Libraries/Nop.Services/Installation/CodeFirstInstallationService.cs
@@ -6327,7 +6327,7 @@ protected virtual void InstallSettings(bool installSampleData)
                 DisplayCurrencyLabel = false,
                 PrimaryStoreCurrencyId = _currencyRepository.Table.Single(c => c.CurrencyCode == "USD").Id,
                 PrimaryExchangeRateCurrencyId = _currencyRepository.Table.Single(c => c.CurrencyCode == "USD").Id,
-                ActiveExchangeRateProviderSystemName = "CurrencyExchange.MoneyConverter",
+                ActiveExchangeRateProviderSystemName = "CurrencyExchange.ECB",
                 AutoUpdateEnabled = false
             });
 

diff --git a/src/Presentation/Nop.Web/Areas/Admin/Controllers/CurrencyController.cs b/src/Presentation/Nop.Web/Areas/Admin/Controllers/CurrencyController.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using Nop.Core;
 using Nop.Core.Domain.Directory;
 using Nop.Services.Configuration;
@@ -114,8 +115,17 @@ public virtual IActionResult List(bool liveRates = false)
             if (!_permissionService.Authorize(StandardPermissionProvider.ManageCurrencies))
                 return AccessDeniedView();
 
-            //prepare model
-            var model = _currencyModelFactory.PrepareCurrencySearchModel(new CurrencySearchModel(), liveRates);
+            var model = new CurrencySearchModel();
+
+            try
+            {
+                //prepare model
+                model = _currencyModelFactory.PrepareCurrencySearchModel(new CurrencySearchModel(), liveRates);
+            }
+            catch (Exception e)
+            {
+                _notificationService.ErrorNotification(e);
+            }
 
             return View(model);
         }