Simplified a way to init schedule tasks from plugins. There's no need…

… to specify the fully qualified assembly name now
nopSolutions · Nov 8, 2017 · 6841ffd · 6841ffd
1 parent e23d595
commit 6841ffd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Libraries/Nop.Services/Tasks/Task.cs b/src/Libraries/Nop.Services/Tasks/Task.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Nop.Core.Caching;
 using Nop.Core.Configuration;
 using Nop.Core.Domain.Tasks;
@@ -43,7 +44,10 @@ private void ExecuteTask()
             if (!Enabled)
                 return;
 
-            var type = Type.GetType(ScheduleTask.Type);
+            var type = Type.GetType(ScheduleTask.Type) ??
+                       AppDomain.CurrentDomain.GetAssemblies()
+                           .Select(a => a.GetType(ScheduleTask.Type))
+                           .FirstOrDefault(t => t != null);
             if (type == null)
                 throw new Exception($"Schedule task ({ScheduleTask.Type}) cannot by instantiated");
 

diff --git a/src/Plugins/Nop.Plugin.Payments.Square/SquarePaymentDefaults.cs b/src/Plugins/Nop.Plugin.Payments.Square/SquarePaymentDefaults.cs
@@ -39,7 +39,7 @@ public static class SquarePaymentDefaults
         /// <summary>
         /// Type of the renew access token schedule task
         /// </summary>
-        public static string RenewAccessTokenTask => $"Nop.Plugin.Payments.Square.Services.RenewAccessTokenTask, {typeof(SquarePaymentDefaults).Assembly.FullName}";
+        public static string RenewAccessTokenTask => "Nop.Plugin.Payments.Square.Services.RenewAccessTokenTask";
 
         /// <summary>
         /// Default access token renewal period in days

diff --git a/src/Plugins/Nop.Plugin.Payments.Square/plugin.json b/src/Plugins/Nop.Plugin.Payments.Square/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Payment methods",
   "FriendlyName": "Credit Card",
   "SystemName": "Payments.Square",
-  "Version": "1.06",
+  "Version": "1.07",
   "SupportedVersions": [ "4.00" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,