added view expense by user
This commit is contained in:
@@ -12,6 +12,11 @@ use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Spatie\Permission\Models\Role;
|
||||
use App\Helpers\NextcloudHelper;
|
||||
use App\Models\FormUpCountry;
|
||||
use App\Models\FormEntertaimentPresentation;
|
||||
use App\Models\FormVehicleRunningCost;
|
||||
use App\Models\FormOthers;
|
||||
use App\Models\FormMeetingSeminar;
|
||||
|
||||
class AdminsController extends Controller
|
||||
{
|
||||
@@ -121,6 +126,33 @@ class AdminsController extends Controller
|
||||
return redirect()->route('admin.admins.index');
|
||||
}
|
||||
|
||||
public function expense($user_id)
|
||||
{
|
||||
$formUpCountry = FormUpCountry::where('user_id', $user_id)->get();
|
||||
$formEntertaimentPresentation = FormEntertaimentPresentation::where('user_id', $user_id)->get();
|
||||
$formVehicleRunningCost = FormVehicleRunningCost::where('user_id', $user_id)->get();
|
||||
$formOthers = FormOthers::where('user_id', $user_id)->get();
|
||||
$formMeetingSeminar = FormMeetingSeminar::where('user_id', $user_id)->get();
|
||||
|
||||
// Combine all forms into a single array with keys for each form type
|
||||
$forms = [
|
||||
'form_up_country' => $formUpCountry,
|
||||
'form_entertainment_presentation' => $formEntertaimentPresentation,
|
||||
'form_vehicle_running_cost' => $formVehicleRunningCost,
|
||||
'form_others' => $formOthers,
|
||||
'form_meeting_seminar' => $formMeetingSeminar,
|
||||
];
|
||||
|
||||
// Pass the forms and page information to the view
|
||||
return view('backend.pages.admins.expense', [
|
||||
'pageInfo' => [
|
||||
'title' => 'Form Management',
|
||||
],
|
||||
'forms' => $forms,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
public function destroy(int $id): RedirectResponse
|
||||
{
|
||||
$this->checkAuthorization(auth()->user(), ['admin.delete']);
|
||||
|
||||
@@ -129,7 +129,7 @@ class FormEntertainmentPresentationController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been created.');
|
||||
return redirect()->route('forms.entertainment');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
@@ -221,7 +221,7 @@ class FormEntertainmentPresentationController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been updated.');
|
||||
return redirect()->route('forms.entertainment');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function approve($id)
|
||||
@@ -236,7 +236,7 @@ class FormEntertainmentPresentationController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been approved.');
|
||||
return redirect()->route('forms.entertainment');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function finalApprove($id)
|
||||
@@ -246,7 +246,7 @@ class FormEntertainmentPresentationController extends Controller
|
||||
$form = FormEntertaimentPresentation::findOrfail($id);
|
||||
if($form->approved_at == null) {
|
||||
session()->flash('error', 'Form must be approved by MIS first.');
|
||||
return redirect()->route('forms.entertainment');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
$form->update([
|
||||
@@ -256,7 +256,7 @@ class FormEntertainmentPresentationController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been final approved.');
|
||||
return redirect()->route('forms.entertainment');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function open($id)
|
||||
@@ -271,7 +271,7 @@ class FormEntertainmentPresentationController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been opened.');
|
||||
return redirect()->route('forms.entertainment');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function reject($id)
|
||||
@@ -284,7 +284,7 @@ class FormEntertainmentPresentationController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been rejected.');
|
||||
return redirect()->route('forms.entertainment');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function destroy($id)
|
||||
@@ -295,6 +295,6 @@ class FormEntertainmentPresentationController extends Controller
|
||||
$form->delete();
|
||||
|
||||
session()->flash('success', 'Form has been deleted.');
|
||||
return redirect()->route('forms.entertainment');
|
||||
return redirect()->back();
|
||||
}
|
||||
}
|
||||
@@ -122,7 +122,7 @@ class FormMeetingSeminarController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been created.');
|
||||
return redirect()->route('forms.meeting');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
@@ -207,7 +207,7 @@ class FormMeetingSeminarController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been updated.');
|
||||
return redirect()->route('forms.meeting');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function approve($id)
|
||||
@@ -222,7 +222,7 @@ class FormMeetingSeminarController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been approved.');
|
||||
return redirect()->route('forms.meeting');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function finalApprove($id)
|
||||
@@ -232,7 +232,7 @@ class FormMeetingSeminarController extends Controller
|
||||
$form = FormMeetingSeminar::findOrfail($id);
|
||||
if($form->approved_at == null) {
|
||||
session()->flash('error', 'Form must be approved by MIS first.');
|
||||
return redirect()->route('forms.meeting');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
$form->update([
|
||||
@@ -242,7 +242,7 @@ class FormMeetingSeminarController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been final approved.');
|
||||
return redirect()->route('forms.meeting');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function open($id)
|
||||
@@ -257,7 +257,7 @@ class FormMeetingSeminarController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been opened.');
|
||||
return redirect()->route('forms.meeting');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function reject($id)
|
||||
@@ -270,7 +270,7 @@ class FormMeetingSeminarController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been rejected.');
|
||||
return redirect()->route('forms.meeting');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function destroy($id)
|
||||
@@ -281,6 +281,6 @@ class FormMeetingSeminarController extends Controller
|
||||
$form->delete();
|
||||
|
||||
session()->flash('success', 'Form has been deleted.');
|
||||
return redirect()->route('forms.meeting');
|
||||
return redirect()->back();
|
||||
}
|
||||
}
|
||||
@@ -125,7 +125,7 @@ class FormOtherController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been created.');
|
||||
return redirect()->route('forms.other');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
@@ -212,7 +212,7 @@ class FormOtherController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been updated.');
|
||||
return redirect()->route('forms.other');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function approve($id)
|
||||
@@ -227,7 +227,7 @@ class FormOtherController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been approved.');
|
||||
return redirect()->route('forms.other');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function finalApprove($id)
|
||||
@@ -237,7 +237,7 @@ class FormOtherController extends Controller
|
||||
$form = FormOthers::findOrfail($id);
|
||||
if($form->approved_at == null) {
|
||||
session()->flash('error', 'Form must be approved by MIS first.');
|
||||
return redirect()->route('forms.other');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
$form->update([
|
||||
@@ -247,7 +247,7 @@ class FormOtherController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been final approved.');
|
||||
return redirect()->route('forms.other');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function open($id)
|
||||
@@ -262,7 +262,7 @@ class FormOtherController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been opened.');
|
||||
return redirect()->route('forms.other');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function reject($id)
|
||||
@@ -275,7 +275,7 @@ class FormOtherController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been rejected.');
|
||||
return redirect()->route('forms.other');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function destroy($id)
|
||||
@@ -286,6 +286,6 @@ class FormOtherController extends Controller
|
||||
$form->delete();
|
||||
|
||||
session()->flash('success', 'Form has been deleted.');
|
||||
return redirect()->route('forms.other');
|
||||
return redirect()->back();
|
||||
}
|
||||
}
|
||||
@@ -133,7 +133,7 @@ class FormUpCountryController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been created.');
|
||||
return redirect()->route('forms.up-country');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
@@ -229,7 +229,7 @@ class FormUpCountryController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been updated.');
|
||||
return redirect()->route('forms.up-country');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function approve($id)
|
||||
@@ -244,7 +244,7 @@ class FormUpCountryController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been approved.');
|
||||
return redirect()->route('forms.up-country');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function reject($id)
|
||||
@@ -257,7 +257,7 @@ class FormUpCountryController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been rejected.');
|
||||
return redirect()->route('forms.up-country');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function finalApprove($id)
|
||||
@@ -267,7 +267,7 @@ class FormUpCountryController extends Controller
|
||||
$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');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
$form->update([
|
||||
@@ -277,7 +277,7 @@ class FormUpCountryController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been final approved.');
|
||||
return redirect()->route('forms.up-country');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function open($id)
|
||||
@@ -292,7 +292,7 @@ class FormUpCountryController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been opened.');
|
||||
return redirect()->route('forms.up-country');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function destroy($id)
|
||||
@@ -303,6 +303,6 @@ class FormUpCountryController extends Controller
|
||||
$form->delete();
|
||||
|
||||
session()->flash('success', 'Form has been deleted.');
|
||||
return redirect()->route('forms.up-country');
|
||||
return redirect()->back();
|
||||
}
|
||||
}
|
||||
@@ -128,7 +128,7 @@ class FormVehicleController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been created.');
|
||||
return redirect()->route('forms.vehicle');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
@@ -221,7 +221,7 @@ class FormVehicleController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been updated.');
|
||||
return redirect()->route('forms.vehicle');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function approve($id)
|
||||
@@ -236,7 +236,7 @@ class FormVehicleController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been approved.');
|
||||
return redirect()->route('forms.vehicle');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function finalApprove($id)
|
||||
@@ -246,7 +246,7 @@ class FormVehicleController extends Controller
|
||||
$form = FormVehicleRunningCost::findOrfail($id);
|
||||
if($form->approved_at == null) {
|
||||
session()->flash('error', 'Form must be approved by MIS first.');
|
||||
return redirect()->route('forms.vehicle');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
$form->update([
|
||||
@@ -256,7 +256,7 @@ class FormVehicleController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been final approved.');
|
||||
return redirect()->route('forms.vehicle');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function open($id)
|
||||
@@ -271,7 +271,7 @@ class FormVehicleController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been opened.');
|
||||
return redirect()->route('forms.vehicle');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function reject($id)
|
||||
@@ -284,7 +284,7 @@ class FormVehicleController extends Controller
|
||||
]);
|
||||
|
||||
session()->flash('success', 'Form has been rejected.');
|
||||
return redirect()->route('forms.vehicle');
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
public function destroy($id)
|
||||
@@ -295,6 +295,6 @@ class FormVehicleController extends Controller
|
||||
$form->delete();
|
||||
|
||||
session()->flash('success', 'Form has been deleted.');
|
||||
return redirect()->route('forms.vehicle');
|
||||
return redirect()->back();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user