@@ -94,9 +94,12 @@
| Bukti 3 |
Account Number |
Status |
- @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
+ @if (auth()->user()->can('approval.approve'))
Approval |
@endif
+ @if (auth()->user()->can('final_approval.approve'))
+ Final Approval |
+ @endif
Aksi |
@@ -179,7 +182,8 @@
@endif
@endif
- @elseif(auth()->user()->can('final_approval.approve'))
+ @endif
+ @if(auth()->user()->can('final_approval.approve'))
{{-- approve / reject button --}}
@if ($item->status == 'Approved' && $item->approved_at && !$item->final_approved_at)
@@ -199,6 +203,8 @@
Open
+ @elseif ($item->final_approved_at)
+ {{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
@else
-
@endif
diff --git a/resources/views/backend/pages/forms/meeting/index.blade.php b/resources/views/backend/pages/forms/meeting/index.blade.php
index a3a9aa7..10c46e0 100644
--- a/resources/views/backend/pages/forms/meeting/index.blade.php
+++ b/resources/views/backend/pages/forms/meeting/index.blade.php
@@ -78,7 +78,7 @@
@include('backend.layouts.partials.messages')
@@ -94,9 +94,12 @@
| Bukti 3 |
Account Number |
Status |
- @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
+ @if (auth()->user()->can('approval.approve'))
Approval |
@endif
+ @if (auth()->user()->can('final_approval.approve'))
+ Final Approval |
+ @endif
Aksi |
@@ -179,7 +182,8 @@
@endif
@endif
- @elseif(auth()->user()->can('final_approval.approve'))
+ @endif
+ @if(auth()->user()->can('final_approval.approve'))
{{-- approve / reject button --}}
@if ($item->status == 'Approved' && $item->approved_at && !$item->final_approved_at)
@@ -199,6 +203,8 @@
Open
+ @elseif ($item->final_approved_at)
+ {{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
@else
-
@endif
diff --git a/resources/views/backend/pages/forms/other/index.blade.php b/resources/views/backend/pages/forms/other/index.blade.php
index a31e6ff..5a61a69 100644
--- a/resources/views/backend/pages/forms/other/index.blade.php
+++ b/resources/views/backend/pages/forms/other/index.blade.php
@@ -78,7 +78,7 @@
@include('backend.layouts.partials.messages')
@@ -93,9 +93,12 @@
| Bukti 3 |
Account Number |
Status |
- @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
+ @if (auth()->user()->can('approval.approve'))
Approval |
@endif
+ @if (auth()->user()->can('final_approval.approve'))
+ Final Approval |
+ @endif
Aksi |
@@ -177,7 +180,8 @@
@endif
@endif
- @elseif(auth()->user()->can('final_approval.approve'))
+ @endif
+ @if(auth()->user()->can('final_approval.approve'))
{{-- approve / reject button --}}
@if ($item->status == 'Approved' && $item->approved_at && !$item->final_approved_at)
@@ -197,6 +201,8 @@
Open
+ @elseif ($item->final_approved_at)
+ {{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
@else
-
@endif
diff --git a/resources/views/backend/pages/forms/upcountry/index.blade.php b/resources/views/backend/pages/forms/upcountry/index.blade.php
index 7b371cd..a38b910 100644
--- a/resources/views/backend/pages/forms/upcountry/index.blade.php
+++ b/resources/views/backend/pages/forms/upcountry/index.blade.php
@@ -78,7 +78,7 @@
@include('backend.layouts.partials.messages')
@@ -94,9 +94,12 @@
| Bukti 3 |
Account Number |
Status |
- @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
+ @if (auth()->user()->can('approval.approve'))
Approval |
@endif
+ @if (auth()->user()->can('final_approval.approve'))
+ Final Approval |
+ @endif
Aksi |
@@ -179,7 +182,8 @@
@endif
@endif
- @elseif(auth()->user()->can('final_approval.approve'))
+ @endif
+ @if(auth()->user()->can('final_approval.approve'))
{{-- approve / reject button --}}
@if ($item->status == 'Approved' && $item->approved_at && !$item->final_approved_at)
@@ -199,6 +203,8 @@
Open
+ @elseif ($item->final_approved_at)
+ {{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
@else
-
@endif
diff --git a/resources/views/backend/pages/forms/vehicle/index.blade.php b/resources/views/backend/pages/forms/vehicle/index.blade.php
index 83a4203..86f2eee 100644
--- a/resources/views/backend/pages/forms/vehicle/index.blade.php
+++ b/resources/views/backend/pages/forms/vehicle/index.blade.php
@@ -78,7 +78,7 @@
@include('backend.layouts.partials.messages')
@@ -95,9 +95,12 @@
| Bukti 3 |
Account Number |
Status |
- @if (auth()->user()->can('approval.approve') || auth()->user()->can('final_approval.approve'))
+ @if (auth()->user()->can('approval.approve'))
Approval |
@endif
+ @if (auth()->user()->can('final_approval.approve'))
+ Final Approval |
+ @endif
Aksi |
@@ -181,7 +184,8 @@
@endif
@endif
- @elseif(auth()->user()->can('final_approval.approve'))
+ @endif
+ @if(auth()->user()->can('final_approval.approve'))
{{-- approve / reject button --}}
@if ($item->status == 'Approved' && $item->approved_at && !$item->final_approved_at)
@@ -201,6 +205,8 @@
Open
+ @elseif ($item->final_approved_at)
+ {{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
@else
-
@endif
| | | | |