fix: project expenditure update label, and value

app/Http/Controllers/DashboardBoDController.php

@@ -32,51 +32,48 @@ class DashboardBoDController extends Controller
 	{
 		$totalExpenditure = $totalInvoice = $totalPaidInvoice = 0;
 
-		$totalBudgets = null;
+        $totalBudgets = [];
-		$role = urldecode($role_name);
+        $projects = [];
-		if (!empty($all_project) || $role === "Super Admin") {
+        $role = urldecode($role_name);
-			$totalBudgets = Project::sum(DB::raw('CAST("rencana_biaya" AS DOUBLE PRECISION)'));
+
-		} else {
+        if ($all_project) {
-			$totalBudgets = Project::where('created_by_id', $hierarchy)
+            $totalBudgets = Project::select(
-			->sum(DB::raw('CAST("rencana_biaya" AS DOUBLE PRECISION)'));
+                DB::raw('SUM(CAST(COALESCE(NULLIF(REPLACE(rencana_biaya, \'.\', \'\'), \'\'), \'0\') AS DOUBLE PRECISION)) AS total_rencana_biaya'),
-		}
+                DB::raw('SUM(CAST(COALESCE(NULLIF(REPLACE(value_proyek, \'.\', \'\'), \'\'), \'0\') AS DOUBLE PRECISION)) AS total_value_proyek'),
-		$totalBudgets = Project::sum(DB::raw('CAST("rencana_biaya" AS DOUBLE PRECISION)'));
+                DB::raw('SUM(CAST(COALESCE(NULLIF(REPLACE(income_year, \'.\', \'\'), \'\'), \'0\') AS DOUBLE PRECISION)) AS total_income_year')
-		$projects = null;
+            )->first();
-
+            $projects = Project::get();
-		if (!empty($all_project) || $role === "Super Admin") {
+            Log::info(['dataTotal' => $totalBudgets]);
-			$projects = Project::get();
+        } else {
-		} else {
+            $totalBudgets = Project::where('created_by_id', $hierarchy)
-			$projects = Project::where('created_by_id', $hierarchy)
+            ->select(
-				->get();
+                DB::raw('SUM(CAST(COALESCE(NULLIF(REPLACE(rencana_biaya, \'.\', \'\'), \'\'), \'0\') AS DOUBLE PRECISION)) AS total_rencana_biaya'),
-		}
+                DB::raw('SUM(CAST(COALESCE(NULLIF(REPLACE(value_proyek, \'.\', \'\'), \'\'), \'0\') AS DOUBLE PRECISION)) AS total_value_proyek'),
-
+                DB::raw('SUM(CAST(COALESCE(NULLIF(REPLACE(income_year, \'.\', \'\'), \'\'), \'0\') AS DOUBLE PRECISION)) AS total_income_year')
-		foreach ($projects as $project) {
+            )->first();
-			$project->expenses = 0;
+            $projects = Project::where('created_by_id', $hierarchy)->get();
-			$resp = null;
+        }
-			if ($project->kode_sortname != "") {
+
-
+        foreach ($projects as $project) {
-				// $resp = $this->getInvoiceIntegration($project->kode_sortname);
+            $project->expenses = 0;
-				// $cost = $resp->data->total_cost ?? 0;
+            if ($project->kode_sortname != "") {
-				// $cost = substr($cost, 0, strpos($cost, "."));
+                $cost = 0;
-				$cost = 0;
+                $totalExpenditure = 0;
-				$totalExpenditure = 0;
+                $totalInvoice = 0;
-				$totalInvoice = 0;
+                $totalPaidInvoice = 0;
-				$totalPaidInvoice = 0;
+            }
-
+        }
-				// $totalExpenditure += (int) $cost;
+
-				// $totalInvoice += $resp->data->total_invoice_amount ?? 0;
+        return response()->json([
-				// $totalPaidInvoice += $resp->data->total_invoice_paid_amount ?? 0;
+            'data' => [
-			}
+                'total_budget' => (int) ($totalBudgets->total_rencana_biaya ?? 0),
-		}
+                'total_expenditure' => $totalExpenditure,
-
+                'total_invoice' => $totalInvoice,
-		return response()->json([
+                'total_paid_invoice' => $totalPaidInvoice,
-			'data' => [
+                'total_value_proyek' => $totalBudgets->total_value_proyek ?? 0,
-				'total_budget' => (int) $totalBudgets ?? 0,
+                'total_income_year' => $totalBudgets->total_income_year ?? 0
-				'total_expenditure' => $totalExpenditure,
+            ]
-				'total_invoice' => $totalInvoice,
+        ], 200);
-				'total_paid_invoice' => $totalPaidInvoice,
-			]
-		], 200);
 	}
 
 	public function getDetailExpenditureColor($role_name)
@@ -460,8 +457,7 @@ class DashboardBoDController extends Controller
 
 	public function getDetailExpenditure($all_project, $hierarchy, $role_name)
 	{
-		// $year = $this->interpolateYear($year);
+		$projects = [];
-		$projects = null;
 		if ($all_project) {
 			$projects = Project::orderBy('id', 'desc')
 				->get();