Order before and after hooks by order key ASC

itsjeffro · Apr 23, 2021 · 17a2b41 · 17a2b41
1 parent 19986b7
commit 17a2b41
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Models/Action.php b/src/Models/Action.php
@@ -26,9 +26,9 @@ class Action extends Model
     /**
      * Fillable table column.
      *
-     * @var array
+     * @var string[]
      */
-    public $fillable = [
+    protected $fillable = [
         'name',
         'order',
     ];
@@ -59,10 +59,14 @@ public function getHooksByProject($project)
     {
         return $this->with([
             'beforeHooks' => function($query) use ($project) {
-                $query->where('project_id', $project->id);
+                $query
+                    ->where('project_id', $project->id)
+                    ->orderBy('order', 'asc');
             },
             'afterHooks' => function($query) use ($project) {
-                $query->where('project_id', $project->id);
+                $query
+                    ->where('project_id', $project->id)
+                    ->orderBy('order', 'asc');
             }
         ]);
     }