From 0c052f379a086b41f149ce6696cbb5d5134dc61b Mon Sep 17 00:00:00 2001 From: Jagad R R Date: Thu, 2 Jan 2025 18:21:03 +0700 Subject: [PATCH] minor fixes --- .../Forms/FormUpCountryController.php | 8 +- .../backend/pages/admins/expense.blade.php | 1310 +++++++++-------- .../backend/pages/admins/index.blade.php | 104 +- .../backend/pages/audit_trail/index.blade.php | 88 +- .../pages/master/category/index.blade.php | 80 +- .../backend/pages/master/cost/index.blade.php | 80 +- .../pages/master/rayon/index.blade.php | 78 +- .../views/backend/pages/roles/index.blade.php | 100 +- 8 files changed, 935 insertions(+), 913 deletions(-) diff --git a/app/Http/Controllers/Forms/FormUpCountryController.php b/app/Http/Controllers/Forms/FormUpCountryController.php index e609c08..d1e4c07 100644 --- a/app/Http/Controllers/Forms/FormUpCountryController.php +++ b/app/Http/Controllers/Forms/FormUpCountryController.php @@ -12,7 +12,6 @@ use App\Models\Region; use App\Models\Cabang; use App\Models\UserHasCabang; use App\Models\Kategori; -use App\Helpers\NextCloudHelper; use Illuminate\Support\Str; use Illuminate\Support\Facades\Mail; use App\Mail\ExpenseApproved; @@ -20,6 +19,7 @@ use App\Mail\ExpenseRejected; use App\Mail\FinalApprove; use App\Helpers\WhatsappHelper; use App\Helpers\AuditTrailHelper; +use App\Helpers\NextCloudHelper; use App\Rules\FileType; class FormUpCountryController extends Controller @@ -70,9 +70,9 @@ class FormUpCountryController extends Controller $this->checkAuthorization(auth()->user(), ['forms.country.view']); $form = FormUpCountry::with(['rayon', 'user'])->findOrFail($id); - $form->bukti1 = NextCloudHelper::getFileUrl($form->bukti1); - $form->bukti2 = NextCloudHelper::getFileUrl($form->bukti2); - $form->bukti3 = NextCloudHelper::getFileUrl($form->bukti3); + $form->bukti1 = $form->bukti1 ? NextCloudHelper::getFileUrl($form->bukti1) : null; + $form->bukti2 = $form->bukti2 ? NextCloudHelper::getFileUrl($form->bukti2) : null; + $form->bukti3 = $form->bukti3 ? NextCloudHelper::getFileUrl($form->bukti3) : null; return response()->json($form); } diff --git a/resources/views/backend/pages/admins/expense.blade.php b/resources/views/backend/pages/admins/expense.blade.php index 9dae772..0288d84 100644 --- a/resources/views/backend/pages/admins/expense.blade.php +++ b/resources/views/backend/pages/admins/expense.blade.php @@ -35,150 +35,152 @@

Form Up Country

@include('backend.layouts.partials.messages') - - - - - - - - - - - - - - - - @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve')) - - @endif - - - - - @foreach ($forms['form_up_country'] as $index => $form) - - - - - - - - - - - - - - @if (auth()->user()->can('approval.approve')) +
+
#NamaRayonTanggalTujuanJarakTotalBukti 1Bukti 2Bukti 3Account NumberStatusApprovalAksi
{{ $loop->iteration }}{{ $form->user->name }}{{ $form->rayon->code }}{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('D MMMM Y') }}{{ $form->tujuan }}{{ $form->jarak }} km{{ number_format($form->total, 0, ',', '.') }} - @if ($form->bukti1) - - Download - - @else - - - @endif - - @if ($form->bukti2) - - Download - - @else - - - @endif - - @if ($form->bukti3) - - Download - - @else - - - @endif - {{ $form->account_number }} - @if ($form->status == 'On Progress') - {{ $form->status }} - @elseif ($form->status == 'Approved' || $form->status == 'Final Approved') - {{ $form->status }} - @else - {{ $form->status }} - @endif -
+ + + + + + + + + + + + + + + @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve')) + + @endif + + + + + @foreach ($forms['form_up_country'] as $index => $form) + + + + + + + + - @elseif(auth()->user()->can('final_approval.approve')) + + + + @if (auth()->user()->can('approval.approve')) + + @elseif(auth()->user()->can('final_approval.approve')) + + @endif + - @endif - - - @endforeach - -
#NamaRayonTanggalTujuanJarakTotalBukti 1Bukti 2Bukti 3Account NumberStatusApprovalAksi
{{ $loop->iteration }}{{ $form->user->name }}{{ $form->rayon->code }}{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('D MMMM Y') }}{{ $form->tujuan }}{{ $form->jarak }} km{{ number_format($form->total, 0, ',', '.') }} - {{-- approve / reject button --}} - @if ($form->status == 'On Progress') -
- @csrf - @method('PUT') - -
- -
- @csrf - @method('PUT') - -
+ @if ($form->bukti1) + + Download + @else - @if ($form->approved_at) - {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} - @elseif($form->rejected_at) - {{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }} - @else - - - @endif + - @endif 		- {{-- approve / reject button --}} - @if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at) -
- @csrf - @method('PUT') - -
+ @if ($form->bukti2) + + Download + @else - @if ($form->final_approved_at) -
+ - + @endif +
+ @if ($form->bukti3) + + Download + + @else + - + @endif + {{ $form->account_number }} + @if ($form->status == 'On Progress') + {{ $form->status }} + @elseif ($form->status == 'Approved' || $form->status == 'Final Approved') + {{ $form->status }} + @else + {{ $form->status }} + @endif + + {{-- approve / reject button --}} + @if ($form->status == 'On Progress') + @csrf @method('PUT') + + +
+ @csrf + @method('PUT') +
@else - - + @if ($form->approved_at) + {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} + @elseif($form->rejected_at) + {{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }} + @else + - + @endif @endif + 		+ {{-- approve / reject button --}} + @if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at) +
+ @csrf + @method('PUT') + +
+ @else + @if ($form->final_approved_at) +
+ @csrf + @method('PUT') + +
+ @else + - + @endif + @endif + 		+ @if (auth()->user()->can('forms.country.edit')) + + + + @endif + + @if (auth()->user()->can('forms.country.delete')) +
+ @csrf + @method('DELETE') + +
@endif 		- @if (auth()->user()->can('forms.country.edit')) - - - - @endif - - @if (auth()->user()->can('forms.country.delete')) -
- @csrf - @method('DELETE') - -
- @endif -
+ + @endforeach + + +
@@ -192,152 +194,154 @@

Form Vehicle Running Cost

- - - - - - - - - - - - - - - - - @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve')) - - @endif - - - - - @foreach ($forms['form_vehicle_running_cost'] as $index => $form) - - - - - - - - - - - - - - - @if (auth()->user()->can('approval.approve')) +
+
#NamaTanggalLiterHargaJarakTipe BensinNomor PolisiBukti 1Bukti 2Bukti 3Account NumberStatusApprovalAksi
{{ $loop->iteration }}{{ $form->user->name }}{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('dddd, D MMMM Y HH:mm:ss') }}{{ $form->liter }}{{ number_format($form->harga, 0, ',', '.') }}{{ $form->jarak }}{{ $form->tipe_bensin }}{{ $form->nopol }} - @if ($form->bukti1) - - Download - - @else - - - @endif - - @if ($form->bukti2) - - Download - - @else - - - @endif - - @if ($form->bukti3) - - Download - - @else - - - @endif - {{ $form->account_number }} - @if ($form->status == 'On Progress') - {{ $form->status }} - @elseif ($form->status == 'Approved' || $form->status == 'Final Approved') - {{ $form->status }} - @else - {{ $form->status }} - @endif -
+ + + + + + + + + + + + + + + + @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve')) + + @endif + + + + + @foreach ($forms['form_vehicle_running_cost'] as $index => $form) + + + + + + + + + - @elseif(auth()->user()->can('final_approval.approve')) + + + + @if (auth()->user()->can('approval.approve')) + + @elseif(auth()->user()->can('final_approval.approve')) + + @endif + - @endif - - - @endforeach - -
#NamaTanggalLiterHargaJarakTipe BensinNomor PolisiBukti 1Bukti 2Bukti 3Account NumberStatusApprovalAksi
{{ $loop->iteration }}{{ $form->user->name }}{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('dddd, D MMMM Y HH:mm:ss') }}{{ $form->liter }}{{ number_format($form->harga, 0, ',', '.') }}{{ $form->jarak }}{{ $form->tipe_bensin }}{{ $form->nopol }} - {{-- approve / reject button --}} - @if ($form->status == 'On Progress') -
- @csrf - @method('PUT') - -
- -
- @csrf - @method('PUT') - -
+ @if ($form->bukti1) + + Download + @else - @if ($form->approved_at) - {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} - @elseif($form->rejected_at) - {{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }} - @else - - - @endif + - @endif 		- {{-- approve / reject button --}} - @if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at) -
- @csrf - @method('PUT') - -
+ @if ($form->bukti2) + + Download + @else - @if ($form->final_approved_at) -
+ - + @endif +
+ @if ($form->bukti3) + + Download + + @else + - + @endif + {{ $form->account_number }} + @if ($form->status == 'On Progress') + {{ $form->status }} + @elseif ($form->status == 'Approved' || $form->status == 'Final Approved') + {{ $form->status }} + @else + {{ $form->status }} + @endif + + {{-- approve / reject button --}} + @if ($form->status == 'On Progress') + @csrf @method('PUT') + + +
+ @csrf + @method('PUT') +
@else - - + @if ($form->approved_at) + {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} + @elseif($form->rejected_at) + {{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }} + @else + - + @endif @endif + 		+ {{-- approve / reject button --}} + @if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at) +
+ @csrf + @method('PUT') + +
+ @else + @if ($form->final_approved_at) +
+ @csrf + @method('PUT') + +
+ @else + - + @endif + @endif + 		+ @if (auth()->user()->can('forms.vehicle.edit')) + + + + @endif + + @if (auth()->user()->can('forms.vehicle.delete')) +
+ @csrf + @method('DELETE') + +
@endif 		- @if (auth()->user()->can('forms.vehicle.edit')) - - - - @endif - - @if (auth()->user()->can('forms.vehicle.delete')) -
- @csrf - @method('DELETE') - -
- @endif -
+ + @endforeach + + +
@@ -351,150 +355,152 @@

Form Entertainment Presentation

- - - - - - - - - - - - - - - - @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve')) - - @endif - - - - - @foreach ($forms['form_entertainment_presentation'] as $index => $form) - - - - - - - - - - - - - - @if (auth()->user()->can('approval.approve')) +
+
#NamaTanggalJenisKeteranganTotalNama PenerimaBukti 1Bukti 2Bukti 3Account NumberStatusApprovalAksi
{{ $loop->iteration }}{{ $form->user->name }}{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('D MMMM Y') }}{{ $form->jenis }}{{ $form->keterangan }}{{ number_format($form->total, 0, ',', '.') }}{{ $form->name }} - @if ($form->bukti1) - - Download - - @else - - - @endif - - @if ($form->bukti2) - - Download - - @else - - - @endif - - @if ($form->bukti3) - - Download - - @else - - - @endif - {{ $form->account_number }} - @if ($form->status == 'On Progress') - {{ $form->status }} - @elseif ($form->status == 'Approved' || $form->status == 'Final Approved') - {{ $form->status }} - @else - {{ $form->status }} - @endif -
+ + + + + + + + + + + + + + + @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve')) + + @endif + + + + + @foreach ($forms['form_entertainment_presentation'] as $index => $form) + + + + + + + + - @elseif(auth()->user()->can('final_approval.approve')) + + + + @if (auth()->user()->can('approval.approve')) + + @elseif(auth()->user()->can('final_approval.approve')) + + @endif + - @endif - - - @endforeach - -
#NamaTanggalJenisKeteranganTotalNama PenerimaBukti 1Bukti 2Bukti 3Account NumberStatusApprovalAksi
{{ $loop->iteration }}{{ $form->user->name }}{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('D MMMM Y') }}{{ $form->jenis }}{{ $form->keterangan }}{{ number_format($form->total, 0, ',', '.') }}{{ $form->name }} - {{-- approve / reject button --}} - @if ($form->status == 'On Progress') -
- @csrf - @method('PUT') - -
- -
- @csrf - @method('PUT') - -
+ @if ($form->bukti1) + + Download + @else - @if ($form->approved_at) - {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} - @elseif($form->rejected_at) - {{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }} - @else - - - @endif + - @endif 		- {{-- approve / reject button --}} - @if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at) -
- @csrf - @method('PUT') - -
+ @if ($form->bukti2) + + Download + @else - @if ($form->final_approved_at) -
+ - + @endif +
+ @if ($form->bukti3) + + Download + + @else + - + @endif + {{ $form->account_number }} + @if ($form->status == 'On Progress') + {{ $form->status }} + @elseif ($form->status == 'Approved' || $form->status == 'Final Approved') + {{ $form->status }} + @else + {{ $form->status }} + @endif + + {{-- approve / reject button --}} + @if ($form->status == 'On Progress') + @csrf @method('PUT') + + +
+ @csrf + @method('PUT') +
@else - - + @if ($form->approved_at) + {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} + @elseif($form->rejected_at) + {{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }} + @else + - + @endif @endif + 		+ {{-- approve / reject button --}} + @if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at) +
+ @csrf + @method('PUT') + +
+ @else + @if ($form->final_approved_at) +
+ @csrf + @method('PUT') + +
+ @else + - + @endif + @endif + 		+ @if (auth()->user()->can('forms.entertainment.edit')) + + + + @endif + + @if (auth()->user()->can('forms.entertainment.delete')) +
+ @csrf + @method('DELETE') + +
@endif 		- @if (auth()->user()->can('forms.entertainment.edit')) - - - - @endif - - @if (auth()->user()->can('forms.entertainment.delete')) -
- @csrf - @method('DELETE') - -
- @endif -
+ + @endforeach + + +
@@ -508,150 +514,152 @@

Form Meeting Seminar

- - - - - - - - - - - - - - - - @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve')) - - @endif - - - - - @foreach ($forms['form_meeting_seminar'] as $index => $form) - - - - - - - - - - - - - - @if (auth()->user()->can('approval.approve')) +
+
#NamaTanggalAllowanceTransport AnkotHotelTotalBukti 1Bukti 2Bukti 3Account NumberStatusApprovalAksi
{{ $loop->iteration }}{{ $form->user->name }}{{ \Carbon\Carbon::parse($form->created_at)->locale('id')->isoFormat('D MMMM Y') }}{{ number_format($form->allowance, 0, ',', '.') }}{{ number_format($form->transport_ankot, 0, ',', '.') }}{{ number_format($form->hotel, 0, ',', '.') }}{{ number_format($form->total, 0, ',', '.') }} - @if ($form->bukti1) - - Download - - @else - - - @endif - - @if ($form->bukti2) - - Download - - @else - - - @endif - - @if ($form->bukti3) - - Download - - @else - - - @endif - {{ $form->account_number }} - @if ($form->status == 'On Progress') - {{ $form->status }} - @elseif ($form->status == 'Approved' || $form->status == 'Final Approved') - {{ $form->status }} - @else - {{ $form->status }} - @endif -
+ + + + + + + + + + + + + + + @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve')) + + @endif + + + + + @foreach ($forms['form_meeting_seminar'] as $index => $form) + + + + + + + + - @elseif(auth()->user()->can('final_approval.approve')) + + + + @if (auth()->user()->can('approval.approve')) + + @elseif(auth()->user()->can('final_approval.approve')) + + @endif + - @endif - - - @endforeach - -
#NamaTanggalAllowanceTransport AnkotHotelTotalBukti 1Bukti 2Bukti 3Account NumberStatusApprovalAksi
{{ $loop->iteration }}{{ $form->user->name }}{{ \Carbon\Carbon::parse($form->created_at)->locale('id')->isoFormat('D MMMM Y') }}{{ number_format($form->allowance, 0, ',', '.') }}{{ number_format($form->transport_ankot, 0, ',', '.') }}{{ number_format($form->hotel, 0, ',', '.') }}{{ number_format($form->total, 0, ',', '.') }} - {{-- approve / reject button --}} - @if ($form->status == 'On Progress') -
- @csrf - @method('PUT') - -
- -
- @csrf - @method('PUT') - -
+ @if ($form->bukti1) + + Download + @else - @if ($form->approved_at) - {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} - @elseif($form->rejected_at) - {{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }} - @else - - - @endif + - @endif 		- {{-- approve / reject button --}} - @if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at) -
- @csrf - @method('PUT') - -
+ @if ($form->bukti2) + + Download + @else - @if ($form->final_approved_at) -
+ - + @endif +
+ @if ($form->bukti3) + + Download + + @else + - + @endif + {{ $form->account_number }} + @if ($form->status == 'On Progress') + {{ $form->status }} + @elseif ($form->status == 'Approved' || $form->status == 'Final Approved') + {{ $form->status }} + @else + {{ $form->status }} + @endif + + {{-- approve / reject button --}} + @if ($form->status == 'On Progress') + @csrf @method('PUT') + + +
+ @csrf + @method('PUT') +
@else - - + @if ($form->approved_at) + {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} + @elseif($form->rejected_at) + {{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }} + @else + - + @endif @endif + 		+ {{-- approve / reject button --}} + @if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at) +
+ @csrf + @method('PUT') + +
+ @else + @if ($form->final_approved_at) +
+ @csrf + @method('PUT') + +
+ @else + - + @endif + @endif + 		+ @if (auth()->user()->can('forms.meeting.edit')) + + + + @endif + + @if (auth()->user()->can('forms.meeting.delete')) +
+ @csrf + @method('DELETE') + +
@endif 		- @if (auth()->user()->can('forms.meeting.edit')) - - - - @endif - - @if (auth()->user()->can('forms.meeting.delete')) -
- @csrf - @method('DELETE') - -
- @endif -
+ + @endforeach + + +
@@ -665,148 +673,150 @@

Form Others

- - - - - - - - - - - - - - - @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve')) - - @endif - - - - - @foreach ($forms['form_others'] as $index => $form) - - - - - - - - - - - - - @if (auth()->user()->can('approval.approve')) +
+
#NamaTanggalJenisKeteranganTotalBukti 1Bukti 2Bukti 3Account NumberStatusApprovalAksi
{{ $loop->iteration }}{{ $form->user->name }}{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('D MMMM Y') }}{{ $form->kategori->name }}{{ $form->keterangan }}{{ number_format($form->total, 0, ',', '.') }} - @if ($form->bukti1) - - Download - - @else - - - @endif - - @if ($form->bukti2) - - Download - - @else - - - @endif - - @if ($form->bukti3) - - Download - - @else - - - @endif - {{ $form->account_number }} - @if ($form->status == 'On Progress') - {{ $form->status }} - @elseif ($form->status == 'Approved' || $form->status == 'Final Approved') - {{ $form->status }} - @else - {{ $form->status }} - @endif -
+ + + + + + + + + + + + + + @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve')) + + @endif + + + + + @foreach ($forms['form_others'] as $index => $form) + + + + + + + - @elseif(auth()->user()->can('final_approval.approve')) + + + + @if (auth()->user()->can('approval.approve')) + + @elseif(auth()->user()->can('final_approval.approve')) + + @endif + - @endif - - - @endforeach - -
#NamaTanggalJenisKeteranganTotalBukti 1Bukti 2Bukti 3Account NumberStatusApprovalAksi
{{ $loop->iteration }}{{ $form->user->name }}{{ \Carbon\Carbon::parse($form->tanggal)->locale('id')->isoFormat('D MMMM Y') }}{{ $form->kategori->name }}{{ $form->keterangan }}{{ number_format($form->total, 0, ',', '.') }} - {{-- approve / reject button --}} - @if ($form->status == 'On Progress') -
- @csrf - @method('PUT') - -
- -
- @csrf - @method('PUT') - -
+ @if ($form->bukti1) + + Download + @else - @if ($form->approved_at) - {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} - @elseif($form->rejected_at) - {{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }} - @else - - - @endif + - @endif 		- {{-- approve / reject button --}} - @if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at) -
- @csrf - @method('PUT') - -
+ @if ($form->bukti2) + + Download + @else - @if ($form->final_approved_at) -
+ - + @endif +
+ @if ($form->bukti3) + + Download + + @else + - + @endif + {{ $form->account_number }} + @if ($form->status == 'On Progress') + {{ $form->status }} + @elseif ($form->status == 'Approved' || $form->status == 'Final Approved') + {{ $form->status }} + @else + {{ $form->status }} + @endif + + {{-- approve / reject button --}} + @if ($form->status == 'On Progress') + @csrf @method('PUT') + + +
+ @csrf + @method('PUT') +
@else - - + @if ($form->approved_at) + {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} + @elseif($form->rejected_at) + {{ \Carbon\Carbon::parse($form->rejected_at)->locale('id')->isoFormat('D MMMM Y') }} + @else + - + @endif @endif + 		+ {{-- approve / reject button --}} + @if ($form->status == 'Approved' && $form->approved_at && !$form->final_approved_at) +
+ @csrf + @method('PUT') + +
+ @else + @if ($form->final_approved_at) +
+ @csrf + @method('PUT') + +
+ @else + - + @endif + @endif + 		+ @if (auth()->user()->can('forms.other.edit')) + + + + @endif + + @if (auth()->user()->can('forms.other.delete')) +
+ @csrf + @method('DELETE') + +
@endif 		- @if (auth()->user()->can('forms.other.edit')) - - - - @endif - - @if (auth()->user()->can('forms.other.delete')) -
- @csrf - @method('DELETE') - -
- @endif -
+ + @endforeach + + +
@@ -820,19 +830,19 @@ @endsection diff --git a/resources/views/backend/pages/admins/index.blade.php b/resources/views/backend/pages/admins/index.blade.php index 80da4b6..f8d468c 100644 --- a/resources/views/backend/pages/admins/index.blade.php +++ b/resources/views/backend/pages/admins/index.blade.php @@ -40,58 +40,60 @@
@include('backend.layouts.partials.messages') - - - - - - - - - - - - - - @foreach ($admins as $admin) +
+
{{ __('Sl') }}{{ __('Name') }}{{ __('Email') }}{{ __('Roles') }}RegionCabang{{ __('Action') }}
+ - - - - - - - + + + + + + + - @endforeach - -
{{ $loop->index + 1 }}{{ $admin->name }}{{ $admin->email }} - @foreach ($admin->roles as $role) - - {{ $role->name }} - - @endforeach - {{ $admin->getMyCabangAndRegion()['region'] }}{{ $admin->getMyCabangAndRegion()['cabang'] }} - View Expense - @if (auth()->user()->can('admin.edit')) - Edit - @endif - - @if (auth()->user()->can('admin.delete')) - - {{ __('Delete') }} - - - - @endif - {{ __('Sl') }}{{ __('Name') }}{{ __('Email') }}{{ __('Roles') }}RegionCabang{{ __('Action') }}
+ + + @foreach ($admins as $admin) + + {{ $loop->index + 1 }} + {{ $admin->name }} + {{ $admin->email }} + + @foreach ($admin->roles as $role) + + {{ $role->name }} + + @endforeach + + {{ $admin->getMyCabangAndRegion()['region'] }} + {{ $admin->getMyCabangAndRegion()['cabang'] }} + + View Expense + @if (auth()->user()->can('admin.edit')) + Edit + @endif + + @if (auth()->user()->can('admin.delete')) + + {{ __('Delete') }} + + + + @endif + + + @endforeach + + +
@@ -106,7 +108,7 @@ $(document).ready(function () { if ($('#dataTable').length) { $('#dataTable').DataTable({ - responsive: true, + responsive: false, dom: 'Bfrtip', buttons: [ 'excel', 'pdf', 'print' diff --git a/resources/views/backend/pages/audit_trail/index.blade.php b/resources/views/backend/pages/audit_trail/index.blade.php index 6bf439c..e477919 100644 --- a/resources/views/backend/pages/audit_trail/index.blade.php +++ b/resources/views/backend/pages/audit_trail/index.blade.php @@ -33,50 +33,52 @@
@include('backend.layouts.partials.messages') - - - - - - - - - - - - - - - @foreach ($data as $item) +
+
{{ __('User') }}{{ __('Ip Address') }}{{ __('Action') }}{{ __('Activity') }}BrowserUser AgentTanggalWaktu
+ - - - - - - - - + + + + + + + + - @endforeach - -
- {{ $item->user ? $item->user->username : preg_replace('/\).*$/', '', explode('(', $item->activity)[1]) }} - {{ $item->ip_address }} - @php - $color = 'info'; - if ($item->action == 'Create') { - $color = 'success'; - } elseif ($item->action == 'Update') { - $color = 'warning'; - } elseif ($item->action == 'Delete') { - $color = 'danger'; - } - @endphp -
- {{ $item->action }} -
- 		{{ $item->activity }}{{ $item->browser }}{{ $item->user_agent }}{{ $item->created_at }}{{ $item->created_at->diffForHumans() }}{{ __('User') }}{{ __('Ip Address') }}{{ __('Action') }}{{ __('Activity') }}BrowserUser AgentTanggalWaktu
+ + + @foreach ($data as $item) + + + {{ $item->user ? $item->user->username : preg_replace('/\).*$/', '', explode('(', $item->activity)[1]) }} + + {{ $item->ip_address }} + + @php + $color = 'info'; + if ($item->action == 'Create') { + $color = 'success'; + } elseif ($item->action == 'Update') { + $color = 'warning'; + } elseif ($item->action == 'Delete') { + $color = 'danger'; + } + @endphp +
+ {{ $item->action }} +
+ + {{ $item->activity }} + {{ $item->browser }} + {{ $item->user_agent }} + {{ $item->created_at }} + {{ $item->created_at->diffForHumans() }} + + @endforeach + + +
@@ -91,7 +93,7 @@ $(document).ready(function () { if ($('#dataTable').length) { $('#dataTable').DataTable({ - responsive: true, + responsive: false, dom: 'Bfrtip', buttons: [ 'excel', 'pdf', 'print' diff --git a/resources/views/backend/pages/master/category/index.blade.php b/resources/views/backend/pages/master/category/index.blade.php index c1559e4..129507f 100644 --- a/resources/views/backend/pages/master/category/index.blade.php +++ b/resources/views/backend/pages/master/category/index.blade.php @@ -35,45 +35,47 @@
@include('backend.layouts.partials.messages') - - - - - - - - - - - @foreach ($categories as $category) - - - - - + + @endforeach + +
#NamaAccount NumberAksi
{{ $loop->index + 1 }}{{ $category->name }}{{ $category->account_number }} - @if (auth()->user()->can('admin.edit')) - Edit - @endif - @if (auth()->user()->can('admin.delete')) - - {{ __('Delete') }} - +
+ + + + + + + + + + + @foreach ($categories as $category) + + + + + - - @endforeach - -
#NamaAccount NumberAksi
{{ $loop->index + 1 }}{{ $category->name }}{{ $category->account_number }} + @if (auth()->user()->can('admin.edit')) + Edit + @endif + @if (auth()->user()->can('admin.delete')) + + {{ __('Delete') }} + - - @endif -
+ + @endif +
+
@@ -86,7 +88,7 @@ $(document).ready(function () { if ($('#dataTable').length) { $('#dataTable').DataTable({ - responsive: true, + responsive: false, dom: 'Bfrtip', buttons: [ 'excel', 'pdf', 'print' diff --git a/resources/views/backend/pages/master/cost/index.blade.php b/resources/views/backend/pages/master/cost/index.blade.php index 8efb131..b21dffb 100644 --- a/resources/views/backend/pages/master/cost/index.blade.php +++ b/resources/views/backend/pages/master/cost/index.blade.php @@ -35,45 +35,47 @@
@include('backend.layouts.partials.messages') - - - - - - - - - - - @foreach ($costs as $cost) - - - - - + + @endforeach + +
#CodeNamaAksi
{{ $loop->index + 1 }}{{ $cost->code }}{{ $cost->name }} - @if (auth()->user()->can('admin.edit')) - Edit - @endif - @if (auth()->user()->can('admin.delete')) - - {{ __('Delete') }} - +
+ + + + + + + + + + + @foreach ($costs as $cost) + + + + + - - @endforeach - -
#CodeNamaAksi
{{ $loop->index + 1 }}{{ $cost->code }}{{ $cost->name }} + @if (auth()->user()->can('admin.edit')) + Edit + @endif + @if (auth()->user()->can('admin.delete')) + + {{ __('Delete') }} + - - @endif -
+ + @endif +
+
@@ -86,7 +88,7 @@ $(document).ready(function () { if ($('#dataTable').length) { $('#dataTable').DataTable({ - responsive: true, + responsive: false, dom: 'Bfrtip', buttons: [ 'excel', 'pdf', 'print' diff --git a/resources/views/backend/pages/master/rayon/index.blade.php b/resources/views/backend/pages/master/rayon/index.blade.php index 396b561..ddd42c9 100644 --- a/resources/views/backend/pages/master/rayon/index.blade.php +++ b/resources/views/backend/pages/master/rayon/index.blade.php @@ -35,45 +35,47 @@
@include('backend.layouts.partials.messages') - - - - - - - - - - - @foreach ($rayons as $rayon) - - - - - + + @endforeach + +
#CodeNamaAksi
{{ $loop->index + 1 }}{{ $rayon->code }}{{ $rayon->name }} - @if (auth()->user()->can('admin.edit')) - Edit - @endif - @if (auth()->user()->can('admin.delete')) - - {{ __('Delete') }} - +
+ + + + + + + + + + + @foreach ($rayons as $rayon) + + + + + - - @endforeach - -
#CodeNamaAksi
{{ $loop->index + 1 }}{{ $rayon->code }}{{ $rayon->name }} + @if (auth()->user()->can('admin.edit')) + Edit + @endif + @if (auth()->user()->can('admin.delete')) + + {{ __('Delete') }} + - - @endif -
+ + @endif +
+
diff --git a/resources/views/backend/pages/roles/index.blade.php b/resources/views/backend/pages/roles/index.blade.php index 70f44ac..7eb2a0c 100644 --- a/resources/views/backend/pages/roles/index.blade.php +++ b/resources/views/backend/pages/roles/index.blade.php @@ -38,56 +38,58 @@
@include('backend.layouts.partials.messages') - - - - - - - - - - - @foreach ($roles as $role) +
+
{{ __('Sl') }}{{ __('Role Name') }}{{ __('Permission List') }}{{ __('Action') }}
+ - - - - + + + + - @endforeach - -
{{ $loop->index + 1 }}{{ $role->name }} - @foreach ($role->permissions as $permission) - - {{ $permission->name }} - - @endforeach - - @if (auth()->user()->can('admin.edit')) - Edit - @endif - @if (auth()->user()->can('admin.delete')) - - {{ __('Delete') }} - - - - @endif - Assign - Menus - - {{ __('Sl') }}{{ __('Role Name') }}{{ __('Permission List') }}{{ __('Action') }}
+ + + @foreach ($roles as $role) + + {{ $loop->index + 1 }} + {{ $role->name }} + + @foreach ($role->permissions as $permission) + + {{ $permission->name }} + + @endforeach + + + @if (auth()->user()->can('admin.edit')) + Edit + @endif + @if (auth()->user()->can('admin.delete')) + + {{ __('Delete') }} + + + + @endif + Assign + Menus + + + + @endforeach + + +
@@ -103,7 +105,7 @@ $(document).ready(function () { if ($('#dataTable').length) { $('#dataTable').DataTable({ - responsive: true, + responsive: false, dom: 'Bfrtip', buttons: [ 'excel', 'pdf', 'print'