diff --git a/app/Http/Controllers/Backend/BudgetControlController.php b/app/Http/Controllers/Backend/BudgetControlController.php index 95d6581..5025a98 100644 --- a/app/Http/Controllers/Backend/BudgetControlController.php +++ b/app/Http/Controllers/Backend/BudgetControlController.php @@ -107,6 +107,18 @@ class BudgetControlController extends Controller 'status' => 'Assigned', ]); + BudgetControlLog::create([ + 'cabang_id' => $cabang_id, + 'sender_id' => auth()->user()->id, + 'receiver_id' => $validated['receiver_id'], + 'periode_month' => $validated['periode_month'], + 'periode_year' => $validated['periode_year'], + 'amount' => $validated['amount'], + 'remarks' => $validated['remarks'], + 'closing_at' => null, + 'status' => 'Assigned', + ]); + session()->flash('success', 'Budget has been added or updated successfully'); return redirect()->route('budget_control'); } diff --git a/app/Http/Controllers/Backend/ReportController.php b/app/Http/Controllers/Backend/ReportController.php index 3f08a60..eeba15c 100644 --- a/app/Http/Controllers/Backend/ReportController.php +++ b/app/Http/Controllers/Backend/ReportController.php @@ -631,7 +631,9 @@ class ReportController extends Controller $year = $params['year']; $month = $params['month']; + // get last data $budget = BudgetControlLog::where('cabang_id', $cabang->id)->where('periode_year', $year)->where('periode_month', $month)->orderBy('created_at', 'desc')->first(); + $userIds = UserHasCabang::where('cabang_id', $cabang->id)->pluck('user_id'); // Fetch all relevant forms in one batch diff --git a/resources/views/backend/pages/budget_control/create.blade.php b/resources/views/backend/pages/budget_control/create.blade.php index 84f3ac8..744fffa 100644 --- a/resources/views/backend/pages/budget_control/create.blade.php +++ b/resources/views/backend/pages/budget_control/create.blade.php @@ -65,7 +65,10 @@ @foreach ($users as $receiver) @endforeach diff --git a/resources/views/backend/pages/report/generate_jurnal.blade.php b/resources/views/backend/pages/report/generate_jurnal.blade.php index 094fbc0..07d3f55 100644 --- a/resources/views/backend/pages/report/generate_jurnal.blade.php +++ b/resources/views/backend/pages/report/generate_jurnal.blade.php @@ -124,8 +124,8 @@