Merge pull request 'dev-wahyun' (#188) from dev-wahyun into staging

Reviewed-on: ordo/adw-backend#188

app/Http/Controllers/DashboardBoDController.php

@@ -271,7 +271,7 @@ class DashboardBoDController extends Controller
 	{
 		$year = $this->interpolateYear($year);
 
-		$divisions = Divisi::select('id', 'name')
+		$divisions = Divisi::select('id', 'name','parent')
 			->with('children')
 			->whereNull('parent')
 			->get();
@@ -358,4 +358,4 @@ class DashboardBoDController extends Controller
 			'total_manpowers' => User::count()
 		], 200);
 	}
-}
+}

app/Http/Controllers/DivisiController.php

@@ -92,7 +92,7 @@ class DivisiController extends Controller
 
 	public function list()
 	{
-		$parentMenus = Divisi::whereNull('parent')->with('children')->get();
+		$parentMenus = Divisi::with('children')->whereNull('parent')->get();
 		$divisions = [];
 		foreach($parentMenus as $menu){
 			$childs = $this->getAllChildren($menu);