Merge pull request 'upload 2023-10-16' (#205) from staging into master

Reviewed-on: ordo/adw-backend#205

app/Http/Controllers/DivisiController.php

@@ -21,7 +21,8 @@ class DivisiController extends Controller
 		$this->validate($request, [
 			'name'          => 'string|required|unique:m_divisi,name',
 			'description'   => 'nullable|string',
-			'parent'   => 'nullable|integer'
+			'parent'   => 'nullable|integer',
+            'color'=>'nullable|string|max:10'
 		]);
 
 		$data = $request->all();

app/Models/Divisi.php

@@ -1,41 +1,42 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Divisi extends Model
-{
-    protected $table = 'm_divisi';
-
-    const CREATED_AT = 'created_at';
-    const UPDATED_AT = 'updated_at';
-
-    protected $fillable = [
-        'name',
-		'parent',
-        'description',
-        'created_at',
-        'created_by',
-        'updated_at',
-        'updated_by'
-    ];
-
-	public static function boot() {
-		parent::boot();
-
-		static::deleting(function($data)  {
-			$data->children()->delete();
-		});
-	}
-
-	public function parent()
-	{
-		return $this->belongsTo('App\Models\Divisi','parent')->where('parent', null)->with('parent');
-	}
-
-	public function children()
-	{
-		return $this->hasMany('App\Models\Divisi','parent')->with('children');
-	}
-}
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Divisi extends Model
+{
+    protected $table = 'm_divisi';
+
+    const CREATED_AT = 'created_at';
+    const UPDATED_AT = 'updated_at';
+
+    protected $fillable = [
+        'name',
+		'parent',
+        'description',
+        'color',
+        'created_at',
+        'created_by',
+        'updated_at',
+        'updated_by'
+    ];
+
+	public static function boot() {
+		parent::boot();
+
+		static::deleting(function($data)  {
+			$data->children()->delete();
+		});
+	}
+
+	public function parent()
+	{
+		return $this->belongsTo('App\Models\Divisi','parent')->where('parent', null)->with('parent');
+	}
+
+	public function children()
+	{
+		return $this->hasMany('App\Models\Divisi','parent')->with('children');
+	}
+}