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

added approval by MIS & final approval by superadmin

Browse Source
This commit is contained in:
Jagad R R
2024-12-23 10:10:09 +07:00
parent 53b60c42d6
commit 73d779ba85
24 changed files with 1009 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+75 -3
View File
@@ -21,7 +21,16 @@ class FormEntertainmentPresentationController extends Controller
{
$this->checkAuthorization(auth()->user(), ['forms.entertainment.view']);
$forms = FormEntertaimentPresentation::where('user_id', auth()->user()->id)->get();
// get user role
$role = auth()->user()->getRoleNames()[0];
$forms = null;
if($role == 'Marketing Information System' || $role == 'superadmin') {
$forms = FormEntertaimentPresentation::get();
} else {
$forms = FormEntertaimentPresentation::where('user_id', auth()->user()->id)->get();
}
return view('backend.pages.forms.entertainment.index', [
'forms' => $forms
]);
@@ -150,7 +159,8 @@ class FormEntertainmentPresentationController extends Controller
'bukti3' => 'nullable|file|mimes:pdf',
]);
$cabang = UserHasCabang::with('cabang')->where('user_id', auth()->user()->id)->first()->cabang;
$form = FormEntertaimentPresentation::findOrfail($id);
$cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()->cabang;
$region = Region::where('id', $cabang->region_id)->first();
$kategori = Kategori::where('name', 'Entertainment & Presentation')->first();
@@ -196,7 +206,6 @@ class FormEntertainmentPresentationController extends Controller
}
// Save the form data
$form = FormEntertaimentPresentation::findOrfail($id);
$form->update([
'tanggal' => $request->tanggal,
'jenis' => $request->jenis,
@@ -215,6 +224,69 @@ class FormEntertainmentPresentationController extends Controller
return redirect()->route('forms.entertainment');
}
public function approve($id)
{
$this->checkAuthorization(auth()->user(), ['approval.approve']);
$form = FormEntertaimentPresentation::findOrfail($id);
$form->update([
'approved_at' => now(),
'approved_by' => auth()->user()->id,
'status' => 'Approved'
]);
session()->flash('success', 'Form has been approved.');
return redirect()->route('forms.entertainment');
}
public function finalApprove($id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormEntertaimentPresentation::findOrfail($id);
if($form->approved_at == null) {
session()->flash('error', 'Form must be approved by MIS first.');
return redirect()->route('forms.entertainment');
}
$form->update([
'final_approved_at' => now(),
'final_approved_by' => auth()->user()->id,
'status' => 'Closed'
]);
session()->flash('success', 'Form has been final approved.');
return redirect()->route('forms.entertainment');
}
public function open($id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormEntertaimentPresentation::findOrfail($id);
$form->update([
'final_approved_at' => null,
'final_approved_by' => null,
'status' => 'Approved'
]);
session()->flash('success', 'Form has been opened.');
return redirect()->route('forms.entertainment');
}
public function reject($id)
{
$this->checkAuthorization(auth()->user(), ['approval.approve']);
$form = FormEntertaimentPresentation::findOrfail($id);
$form->update([
'status' => 'Rejected'
]);
session()->flash('success', 'Form has been rejected.');
return redirect()->route('forms.entertainment');
}
public function destroy($id)
{
$this->checkAuthorization(auth()->user(), ['forms.entertainment.delete']);
app/Http/Controllers/Forms/FormMeetingSeminarController.php
+75 -3
View File
@@ -20,8 +20,17 @@ class FormMeetingSeminarController extends Controller
public function index()
{
$this->checkAuthorization(auth()->user(), ['forms.meeting.view']);
// get user role
$role = auth()->user()->getRoleNames()[0];
$forms = null;
if($role == 'Marketing Information System' || $role == 'superadmin') {
$forms = FormMeetingSeminar::get();
} else {
$forms = FormMeetingSeminar::where('user_id', auth()->user()->id)->get();
}
$forms = FormMeetingSeminar::where('user_id', auth()->user()->id)->get();
return view('backend.pages.forms.meeting.index', [
'forms' => $forms
]);
@@ -139,7 +148,8 @@ class FormMeetingSeminarController extends Controller
'bukti3' => 'nullable|file|mimes:pdf',
]);
$cabang = UserHasCabang::with('cabang')->where('user_id', auth()->user()->id)->first()->cabang;
$form = FormMeetingSeminar::findOrfail($id);
$cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()->cabang;
$region = Region::where('id', $cabang->region_id)->first();
$kategori = Kategori::where('name', 'Meeting & Seminar')->first();
@@ -185,7 +195,6 @@ class FormMeetingSeminarController extends Controller
}
// Save the form data
$form = FormMeetingSeminar::findOrfail($id);
$form->update([
'allowance' => $request->allowance,
'transport_ankot' => $request->transport_ankot,
@@ -201,6 +210,69 @@ class FormMeetingSeminarController extends Controller
return redirect()->route('forms.meeting');
}
public function approve($id)
{
$this->checkAuthorization(auth()->user(), ['approval.approve']);
$form = FormMeetingSeminar::findOrfail($id);
$form->update([
'approved_at' => now(),
'approved_by' => auth()->user()->id,
'status' => 'Approved'
]);
session()->flash('success', 'Form has been approved.');
return redirect()->route('forms.meeting');
}
public function finalApprove($id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormMeetingSeminar::findOrfail($id);
if($form->approved_at == null) {
session()->flash('error', 'Form must be approved by MIS first.');
return redirect()->route('forms.meeting');
}
$form->update([
'final_approved_at' => now(),
'final_approved_by' => auth()->user()->id,
'status' => 'Closed'
]);
session()->flash('success', 'Form has been final approved.');
return redirect()->route('forms.meeting');
}
public function open($id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormMeetingSeminar::findOrfail($id);
$form->update([
'final_approved_at' => null,
'final_approved_by' => null,
'status' => 'Approved'
]);
session()->flash('success', 'Form has been opened.');
return redirect()->route('forms.meeting');
}
public function reject($id)
{
$this->checkAuthorization(auth()->user(), ['approval.approve']);
$form = FormMeetingSeminar::findOrfail($id);
$form->update([
'status' => 'Rejected'
]);
session()->flash('success', 'Form has been rejected.');
return redirect()->route('forms.meeting');
}
public function destroy($id)
{
$this->checkAuthorization(auth()->user(), ['forms.meeting.delete']);
app/Http/Controllers/Forms/FormOtherController.php
+75 -3
View File
@@ -21,7 +21,16 @@ class FormOtherController extends Controller
{
$this->checkAuthorization(auth()->user(), ['forms.other.view']);
$forms = FormOthers::where('user_id', auth()->user()->id)->get();
// get user role
$role = auth()->user()->getRoleNames()[0];
$forms = null;
if($role == 'Marketing Information System' || $role == 'superadmin') {
$forms = FormOthers::get();
} else {
$forms = FormOthers::where('user_id', auth()->user()->id)->get();
}
return view('backend.pages.forms.other.index', [
'forms' => $forms
]);
@@ -144,7 +153,8 @@ class FormOtherController extends Controller
'bukti3' => 'nullable|file|mimes:pdf',
]);
$cabang = UserHasCabang::with('cabang')->where('user_id', auth()->user()->id)->first()->cabang;
$form = FormOthers::findOrfail($id);
$cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()->cabang;
$region = Region::where('id', $cabang->region_id)->first();
$kategori = Kategori::where('id', $request->kategori_id)->first();
@@ -190,7 +200,6 @@ class FormOtherController extends Controller
}
// Save the form data
$form = FormOthers::findOrfail($id);
$form->update([
'kategori_id' => $request->kategori_id,
'tanggal' => $request->tanggal,
@@ -206,6 +215,69 @@ class FormOtherController extends Controller
return redirect()->route('forms.other');
}
public function approve($id)
{
$this->checkAuthorization(auth()->user(), ['approval.approve']);
$form = FormOthers::findOrfail($id);
$form->update([
'approved_at' => now(),
'approved_by' => auth()->user()->id,
'status' => 'Approved'
]);
session()->flash('success', 'Form has been approved.');
return redirect()->route('forms.other');
}
public function finalApprove($id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormOthers::findOrfail($id);
if($form->approved_at == null) {
session()->flash('error', 'Form must be approved by MIS first.');
return redirect()->route('forms.other');
}
$form->update([
'final_approved_at' => now(),
'final_approved_by' => auth()->user()->id,
'status' => 'Closed'
]);
session()->flash('success', 'Form has been final approved.');
return redirect()->route('forms.other');
}
public function open($id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormOthers::findOrfail($id);
$form->update([
'final_approved_at' => null,
'final_approved_by' => null,
'status' => 'Approved'
]);
session()->flash('success', 'Form has been opened.');
return redirect()->route('forms.other');
}
public function reject($id)
{
$this->checkAuthorization(auth()->user(), ['approval.approve']);
$form = FormOthers::findOrfail($id);
$form->update([
'status' => 'Rejected'
]);
session()->flash('success', 'Form has been rejected.');
return redirect()->route('forms.other');
}
public function destroy($id)
{
$this->checkAuthorization(auth()->user(), ['forms.other.delete']);
app/Http/Controllers/Forms/FormUpCountryController.php
+75 -3
View File
@@ -21,7 +21,16 @@ class FormUpCountryController extends Controller
{
$this->checkAuthorization(auth()->user(), ['forms.country.view']);
$forms = FormUpCountry::with('rayon')->where('user_id', auth()->user()->id)->get();
// get user role
$role = auth()->user()->getRoleNames()[0];
$forms = null;
if($role == 'Marketing Information System' || $role == 'superadmin') {
$forms = FormUpCountry::with('rayon')->get();
} else {
$forms = FormUpCountry::with('rayon')->where('user_id', auth()->user()->id)->get();
}
return view('backend.pages.forms.upcountry.index', [
'forms' => $forms
]);
@@ -156,7 +165,8 @@ class FormUpCountryController extends Controller
'bukti3' => 'nullable|file|mimes:pdf',
]);
$cabang = UserHasCabang::with('cabang')->where('user_id', auth()->user()->id)->first()->cabang;
$form = FormUpCountry::findOrfail($id);
$cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()->cabang;
$region = Region::where('id', $cabang->region_id)->first();
$kategori = Kategori::where('name', 'Up Country')->first();
@@ -202,7 +212,6 @@ class FormUpCountryController extends Controller
}
// Save the form data
$form = FormUpCountry::findOrfail($id);
$form->update([
'rayon_id' => $request->rayon_id,
'tanggal' => $request->tanggal,
@@ -223,6 +232,69 @@ class FormUpCountryController extends Controller
return redirect()->route('forms.up-country');
}
public function approve($id)
{
$this->checkAuthorization(auth()->user(), ['approval.approve']);
$form = FormUpCountry::findOrfail($id);
$form->update([
'approved_at' => now(),
'approved_by' => auth()->user()->id,
'status' => 'Approved'
]);
session()->flash('success', 'Form has been approved.');
return redirect()->route('forms.up-country');
}
public function reject($id)
{
$this->checkAuthorization(auth()->user(), ['approval.approve']);
$form = FormUpCountry::findOrfail($id);
$form->update([
'status' => 'Rejected'
]);
session()->flash('success', 'Form has been rejected.');
return redirect()->route('forms.up-country');
}
public function finalApprove($id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormUpCountry::findOrfail($id);
if($form->approved_at == null) {
session()->flash('error', 'Form must be approved by MIS first.');
return redirect()->route('forms.up-country');
}
$form->update([
'final_approved_at' => now(),
'final_approved_by' => auth()->user()->id,
'status' => 'Closed'
]);
session()->flash('success', 'Form has been final approved.');
return redirect()->route('forms.up-country');
}
public function open($id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormUpCountry::findOrfail($id);
$form->update([
'final_approved_at' => null,
'final_approved_by' => null,
'status' => 'Approved'
]);
session()->flash('success', 'Form has been opened.');
return redirect()->route('forms.up-country');
}
public function destroy($id)
{
$this->checkAuthorization(auth()->user(), ['forms.country.delete']);
app/Http/Controllers/Forms/FormVehicleController.php
+75 -3
View File
@@ -21,7 +21,16 @@ class FormVehicleController extends Controller
{
$this->checkAuthorization(auth()->user(), ['forms.vehicle.view']);
$forms = FormVehicleRunningCost::where('user_id', auth()->user()->id)->get();
// get user role
$role = auth()->user()->getRoleNames()[0];
$forms = null;
if($role == 'Marketing Information System' || $role == 'superadmin') {
$forms = FormVehicleRunningCost::get();
} else {
$forms = FormVehicleRunningCost::where('user_id', auth()->user()->id)->get();
}
return view('backend.pages.forms.vehicle.index', [
'forms' => $forms
]);
@@ -149,7 +158,8 @@ class FormVehicleController extends Controller
'bukti3' => 'nullable|file|mimes:pdf',
]);
$cabang = UserHasCabang::with('cabang')->where('user_id', auth()->user()->id)->first()->cabang;
$form = FormVehicleRunningCost::findOrfail($id);
$cabang = UserHasCabang::with('cabang')->where('user_id', $form->user_id)->first()->cabang;
$region = Region::where('id', $cabang->region_id)->first();
$kategori = Kategori::where('name', 'Vehicle Running Cost')->first();
@@ -195,7 +205,6 @@ class FormVehicleController extends Controller
}
// Save the form data
$form = FormVehicleRunningCost::findOrfail($id);
$form->update([
'tanggal' => $request->tanggal,
'liter' => $request->liter,
@@ -215,6 +224,69 @@ class FormVehicleController extends Controller
return redirect()->route('forms.vehicle');
}
public function approve($id)
{
$this->checkAuthorization(auth()->user(), ['approval.approve']);
$form = FormVehicleRunningCost::findOrfail($id);
$form->update([
'approved_at' => now(),
'approved_by' => auth()->user()->id,
'status' => 'Approved'
]);
session()->flash('success', 'Form has been approved.');
return redirect()->route('forms.vehicle');
}
public function finalApprove($id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormVehicleRunningCost::findOrfail($id);
if($form->approved_at == null) {
session()->flash('error', 'Form must be approved by MIS first.');
return redirect()->route('forms.vehicle');
}
$form->update([
'final_approved_at' => now(),
'final_approved_by' => auth()->user()->id,
'status' => 'Closed'
]);
session()->flash('success', 'Form has been final approved.');
return redirect()->route('forms.vehicle');
}
public function open($id)
{
$this->checkAuthorization(auth()->user(), ['final_approval.approve']);
$form = FormVehicleRunningCost::findOrfail($id);
$form->update([
'final_approved_at' => null,
'final_approved_by' => null,
'status' => 'Approved'
]);
session()->flash('success', 'Form has been opened.');
return redirect()->route('forms.vehicle');
}
public function reject($id)
{
$this->checkAuthorization(auth()->user(), ['approval.approve']);
$form = FormVehicleRunningCost::findOrfail($id);
$form->update([
'status' => 'Rejected'
]);
session()->flash('success', 'Form has been rejected.');
return redirect()->route('forms.vehicle');
}
public function destroy($id)
{
$this->checkAuthorization(auth()->user(), ['forms.vehicle.delete']);