itdept/expense
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enhanced by codex

Browse Source
This commit is contained in:
Fiqh Pratama
2025-10-12 20:47:43 +07:00
parent 6b2e658070
commit 9375d2b45c
19 changed files with 556 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Backend/ReportController.php
+5
View File
@@ -747,6 +747,9 @@ class ReportController extends Controller
}
}
$totalKategori = array_sum($nominals);
$pettyCashAmount = $budget && $budget->amount ? $budget->amount : 0;
return view('backend.pages.report.generate_jurnal', [
'pageInfo' => [
'title' => 'Generate Reports For Jurnal',
@@ -758,6 +761,8 @@ class ReportController extends Controller
'kategori_bca' => $kategori_bca,
'nominals' => $nominals,
'budget' => $budget,
'totalKategori' => $totalKategori,
'pettyCashAmount' => $pettyCashAmount,
]);
}
}
app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+14 -3
View File
@@ -93,10 +93,16 @@ class FormEntertainmentPresentationController extends Controller
}
}
$outstandingForms = $forms->filter(function ($form) {
return is_null($form->final_approved_at) || is_null($form->final_approved_by);
});
session()->put('redirect_url', route('forms.entertainment'));
return view('backend.pages.forms.entertainment.index', [
'forms' => $forms,
'availableBudget' => $availableBudget,
'outstandingCount' => $outstandingForms->count(),
'outstandingTotal' => $outstandingForms->sum('total'),
]);
}
@@ -697,13 +703,18 @@ class FormEntertainmentPresentationController extends Controller
return redirect()->back();
}
public function reject($id)
public function reject(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['approval.reject']);
$request->validate([
'remarks' => 'required|string|max:500',
]);
$form = FormEntertaimentPresentation::findOrfail($id);
$form->update([
'status' => 'Rejected'
'status' => 'Rejected',
'remarks' => $request->remarks,
]);
$heads = $form->user->getCabangAndRegionHead();
@@ -795,4 +806,4 @@ class FormEntertainmentPresentationController extends Controller
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
}
}
app/Http/Controllers/Forms/FormMeetingSeminarController.php
+15 -4
View File
@@ -94,11 +94,17 @@ class FormMeetingSeminarController extends Controller
}
}
$outstandingForms = $forms->filter(function ($form) {
return is_null($form->final_approved_at) || is_null($form->final_approved_by);
});
session()->put('redirect_url', route('forms.meeting'));
return view('backend.pages.forms.meeting.index', [
'forms' => $forms,
'availableBudget' => $availableBudget
'availableBudget' => $availableBudget,
'outstandingCount' => $outstandingForms->count(),
'outstandingTotal' => $outstandingForms->sum('total'),
]);
}
@@ -751,13 +757,18 @@ class FormMeetingSeminarController extends Controller
return redirect()->back();
}
public function reject($id)
public function reject(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['approval.reject']);
$request->validate([
'remarks' => 'required|string|max:500',
]);
$form = FormMeetingSeminar::findOrfail($id);
$form->update([
'status' => 'Rejected'
'status' => 'Rejected',
'remarks' => $request->remarks,
]);
$heads = $form->user->getCabangAndRegionHead();
@@ -850,4 +861,4 @@ class FormMeetingSeminarController extends Controller
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
}
}
app/Http/Controllers/Forms/FormOtherController.php
+15 -4
View File
@@ -91,11 +91,17 @@ class FormOtherController extends Controller
}
}
$outstandingForms = $forms->filter(function ($form) {
return is_null($form->final_approved_at) || is_null($form->final_approved_by);
});
session()->put('redirect_url', route('forms.other'));
return view('backend.pages.forms.other.index', [
'forms' => $forms,
'availableBudget' => $availableBudget
'availableBudget' => $availableBudget,
'outstandingCount' => $outstandingForms->count(),
'outstandingTotal' => $outstandingForms->sum('total'),
]);
}
@@ -694,13 +700,18 @@ class FormOtherController extends Controller
return redirect()->back();
}
public function reject($id)
public function reject(Request $request, $id)
{
$this->checkAuthorization(auth()->user(), ['approval.reject']);
$request->validate([
'remarks' => 'required|string|max:500',
]);
$form = FormOthers::findOrfail($id);
$form->update([
'status' => 'Rejected'
'status' => 'Rejected',
'remarks' => $request->remarks,
]);
$heads = $form->user->getCabangAndRegionHead();
@@ -793,4 +804,4 @@ class FormOtherController extends Controller
session()->flash('success', 'Form has been deleted.');
return redirect()->back();
}
}
}
app/Http/Controllers/Forms/FormUpCountryController.php
+7 -1
View File
@@ -95,10 +95,16 @@ class FormUpCountryController extends Controller
$forms = $forms;
}
$outstandingForms = $forms->filter(function ($form) {
return is_null($form->final_approved_at) || is_null($form->final_approved_by);
});
session()->put('redirect_url', route('forms.up-country'));
return view('backend.pages.forms.upcountry.index', [
'forms' => $forms,
'availableBudget' => $availableBudget
'availableBudget' => $availableBudget,
'outstandingCount' => $outstandingForms->count(),
'outstandingTotal' => $outstandingForms->sum('total'),
]);
}
app/Http/Controllers/Forms/FormVehicleController.php
+7 -1
View File
@@ -94,11 +94,17 @@ class FormVehicleController extends Controller
}
}
$outstandingForms = $forms->filter(function ($form) {
return is_null($form->final_approved_at) || is_null($form->final_approved_by);
});
session()->put('redirect_url', route('forms.vehicle'));
return view('backend.pages.forms.vehicle.index', [
'forms' => $forms,
'availableBudget' => $availableBudget
'availableBudget' => $availableBudget,
'outstandingCount' => $outstandingForms->count(),
'outstandingTotal' => $outstandingForms->sum('total'),
]);
}
app/Models/FormEntertaimentPresentation.php
+1
View File
@@ -24,6 +24,7 @@ class FormEntertaimentPresentation extends Model
'bukti_total',
'account_number',
'status',
'remarks',
'approved_at',
'approved2_at',
'approved_by',
app/Models/FormMeetingSeminar.php
+1
View File
@@ -27,6 +27,7 @@ class FormMeetingSeminar extends Model
'bukti_hotel',
'account_number',
'status',
'remarks',
'approved_at',
'approved2_at',
'approved_by',
app/Models/FormOthers.php
+1
View File
@@ -21,6 +21,7 @@ class FormOthers extends Model
'bukti_total',
'account_number',
'status',
'remarks',
'approved_at',
'approved2_at',
'approved_by',