From dd723548b4add7a391509d9f811ba8d40db2b68c Mon Sep 17 00:00:00 2001
From: Henry Jordan <jonathan.quispe@processmaker.com>
Date: Thu, 9 Jul 2020 20:13:49 +0000
Subject: [PATCH] PMCORE-1789

---
 workflow/engine/menus/setup.php               |  4 +-
 .../BusinessModel/TaskSchedulerBM.php         | 58 ++++++++++---------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/workflow/engine/menus/setup.php b/workflow/engine/menus/setup.php
index 76d0b6c73..8bb2aac93 100755
--- a/workflow/engine/menus/setup.php
+++ b/workflow/engine/menus/setup.php
@@ -307,6 +307,7 @@ if ($RBAC->userCanAccess('PM_TASK_SCHEDULER_ADMIN') === 1) {
         G::LoadTranslation("ID_TASK_SCHEDULER_EMAILS_NOTIFICATIONS"),
         '', '', G::LoadTranslation("ID_TASK_SCHEDULER")
     );
+/*----------------------------------********---------------------------------*/
     $G_TMP_MENU->AddIdRawOption(
         'ID_MENU_PLUGINS', '../scheduler/index?category=plugins',
         G::LoadTranslation("ID_TASK_SCHEDULER_PLUGINS"),
@@ -321,5 +322,6 @@ if ($RBAC->userCanAccess('PM_TASK_SCHEDULER_ADMIN') === 1) {
         'ID_MENU_REPORTING', '../scheduler/index?category=reporting',
         G::LoadTranslation("ID_TASK_SCHEDULER_REPORTING"),
         '', '', G::LoadTranslation("ID_TASK_SCHEDULER")
-    );   
+    );
+/*----------------------------------********---------------------------------*/    
 }
\ No newline at end of file
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php b/workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php
index 31c1af331..08f1a7201 100755
--- a/workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php
@@ -61,6 +61,20 @@ class TaskSchedulerBM
             "expression" => "0 */1 * * 0,1,2,3,4,5,6",
             "description" => 'ID_TASK_SCHEDULER_CLEAN_SELF_DESC'
         ],
+        [
+            "title" => "ID_TIMER_EVENT",
+            "enable" => "1",
+            "service" => "",
+            "category" => "case_actions",
+            "file" => "workflow/engine/bin/timereventcron.php",
+            "filew" => "workflow\\engine\bin\\timereventcron.php",
+            "startingTime" => null,
+            "endingTime" => null,
+            "everyOn" => "1",
+            "interval" => "week",
+            "expression" => "*/1 * * * 0,1,2,3,4,5,6",
+            "description" => "ID_TIMER_EVENT_DESC"
+        ],
         [
             "title" => "ID_TASK_SCHEDULER_CASE_EMAILS",
             "enable" => "1",
@@ -75,20 +89,6 @@ class TaskSchedulerBM
             "expression" => "*/5 * * * 0,1,2,3,4,5,6",
             "description" => "ID_TASK_SCHEDULER_CASE_EMAILS_DESC"
         ],
-        [
-            "title" => "ID_TASK_SCHEDULER_ACTION_EMAIL",
-            "enable" => "1",
-            "service" => "",
-            "category" => "emails_notifications",
-            "file" => "workflow/engine/bin/actionsByEmailEmailResponse.php",
-            "filew" => "workflow\\engine\bin\actionsByEmailEmailResponse.php",
-            "startingTime" => null,
-            "endingTime" => null,
-            "everyOn" => "1",
-            "interval" => "week",
-            "expression" => "*/5 * * * 0,1,2,3,4,5,6",
-            "description" => "ID_TASK_SCHEDULER_ACTION_EMAIL_DESC"
-        ],
         [
             "title" => "ID_TASK_SCHEDULER_MESSAGE_EVENTS",
             "enable" => "1",
@@ -102,6 +102,21 @@ class TaskSchedulerBM
             "interval" => "week",
             "expression" => "*/5 * * * 0,1,2,3,4,5,6",
             "description" => "ID_TASK_SCHEDULER_MESSAGE_EVENTS_DESC"
+        ]
+    /*----------------------------------********---------------------------------*/
+        ,[
+            "title" => "ID_TASK_SCHEDULER_ACTION_EMAIL",
+            "enable" => "1",
+            "service" => "",
+            "category" => "emails_notifications",
+            "file" => "workflow/engine/bin/actionsByEmailEmailResponse.php",
+            "filew" => "workflow\\engine\bin\actionsByEmailEmailResponse.php",
+            "startingTime" => null,
+            "endingTime" => null,
+            "everyOn" => "1",
+            "interval" => "week",
+            "expression" => "*/5 * * * 0,1,2,3,4,5,6",
+            "description" => "ID_TASK_SCHEDULER_ACTION_EMAIL_DESC"
         ],
         [
             "title" => "ID_TASK_SCHEDULER_SEND_NOT",
@@ -174,21 +189,8 @@ class TaskSchedulerBM
             "interval" => "week",
             "expression" => "0 */1 * * 0,1,2,3,4,5,6",
             "description" => "ID_TASK_SCHEDULER_PM_PLUGINS_DESC"
-        ],
-        [
-            "title" => "ID_TIMER_EVENT",
-            "enable" => "1",
-            "service" => "",
-            "category" => "case_actions",
-            "file" => "workflow/engine/bin/timereventcron.php",
-            "filew" => "workflow\\engine\bin\\timereventcron.php",
-            "startingTime" => null,
-            "endingTime" => null,
-            "everyOn" => "1",
-            "interval" => "week",
-            "expression" => "*/1 * * * 0,1,2,3,4,5,6",
-            "description" => "ID_TIMER_EVENT_DESC"
         ]
+    /*----------------------------------********---------------------------------*/
     ];
     /**
      * Return the records in Schedule Table by category