Fix #763

tastyigniter · May 31, 2021 · 6744e2b · 6744e2b
1 parent 0f01d89
commit 6744e2b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/app/admin/controllers/StaffGroups.php b/app/admin/controllers/StaffGroups.php
@@ -57,10 +57,8 @@ public function __construct()
         AdminMenu::setContext('staffs', 'users');
     }
 
-    public function index()
+    public function formAfterSave()
     {
         Staff_groups_model::syncAutoAssignStatus();
-
-        $this->asExtension('ListController')->index();
     }
 }
diff --git a/app/admin/models/Assignable_logs_model.php b/app/admin/models/Assignable_logs_model.php
@@ -120,6 +120,7 @@ public function scopeApplyRoundRobinScope($query)
             ->select('assignee_id')
             ->selectRaw('MAX(created_at) as assign_value')
             ->whereIn('status_id', setting('processing_order_status', []))
+            ->whereNotNull('assignee_id')
             ->groupBy('assignee_id')
             ->orderBy('assign_value', 'asc');
     }
@@ -135,6 +136,7 @@ public function scopeApplyLoadBalancedScope($query, $limit)
             ->select('assignee_id')
             ->selectRaw('COUNT(assignee_id)/'.DB::getPdo()->quote($limit).' as assign_value')
             ->whereIn('status_id', setting('processing_order_status', []))
+            ->whereNotNull('assignee_id')
             ->groupBy('assignee_id')
             ->orderBy('assign_value', 'desc')
             ->havingRaw('assign_value < 1');

diff --git a/app/admin/models/Staff_groups_model.php b/app/admin/models/Staff_groups_model.php
@@ -2,7 +2,6 @@
 
 namespace Admin\Models;
 
-use Carbon\Carbon;
 use Model;
 
 /**
@@ -101,19 +100,16 @@ public function findAvailableAssignee()
     {
         $query = $this->assignable_logs()->newQuery();
 
-        $useLoadBalance = ($this->auto_assign_mode == self::AUTO_ASSIGN_LOAD_BALANCED);
+        $useLoadBalance = $this->auto_assign_mode == self::AUTO_ASSIGN_LOAD_BALANCED;
 
         $useLoadBalance
             ? $query->applyLoadBalancedScope($this->auto_assign_limit)
             : $query->applyRoundRobinScope();
 
         $logs = $query->pluck('assign_value', 'assignee_id');
 
-        $assignees = $this->listAssignees()->map(function (Staffs_model $model) use ($useLoadBalance, $logs) {
-            $assignValue = $useLoadBalance ?
-                0 : Carbon::now()->addYear()->toDateTimeString();
-
-            $model->assign_value = $logs[$model->getKey()] ?? $assignValue;
+        $assignees = $this->listAssignees()->map(function (Staffs_model $model) use ($logs) {
+            $model->assign_value = $logs[$model->getKey()] ?? 0;
 
             return $model;
         });