Rp {{ number_format($forms->whereIn('status', ['Approved', 'Closed'])->sum('approved_total'), 0, ',', '.') }}
@@ -48,7 +48,7 @@
+
Rp {{ number_format($forms->where('status', 'On Progress')->sum('total'), 0, ',', '.') }}
@@ -59,18 +59,19 @@
-
-
-
-
-
Rp {{ number_format($availableBudget, 0, ',', '.') }}
-
Available Budget
-
-
-
+ @if($availableBudget > 0)
+
+
+
+
Rp {{ number_format($availableBudget, 0, ',', '.') }}
+
Available Budget
+
+
+
+
-
+ @endif
diff --git a/resources/views/backend/pages/report/all.blade.php b/resources/views/backend/pages/report/all.blade.php
new file mode 100644
index 0000000..e02959c
--- /dev/null
+++ b/resources/views/backend/pages/report/all.blade.php
@@ -0,0 +1,233 @@
+@extends('layouts.app')
+
+@section('title')
+ {{ $pageInfo['title'] }}
+@endsection
+
+@section('admin-content')
+
+
+
+ @php
+ use App\Helpers\NextCloudHelper;
+ @endphp
+
+
+
+
+
+
+
+
+
+
+ @include('backend.layouts.partials.messages')
+
+
+
+
+ | # |
+ No Expense |
+ Tipe |
+ Nama |
+ Region |
+ Cabang |
+ Total |
+ Total Approved |
+ Account Number |
+ Status |
+
+
+
+ @foreach ($forms as $item)
+
+ | {{ $loop->iteration }} |
+ {{ $item->expense_number }} |
+ {{ $item->type }} |
+ {{ $item->user->name }} |
+ {{ $item->user->region->cabang->region->name }} |
+ {{ $item->user->cabang->cabang->name }} |
+ {{ number_format($item->total, 0, ',', '.') }} |
+ {{ number_format($item->approved_total, 0, ',', '.') }} |
+ {{ $item->account_number }} |
+
+ @if ($item->status == 'On Progress')
+ {{ $item->status }}
+ @elseif ($item->status == 'Approved' || $item->status == 'Final Approved')
+ {{ $item->status }}
+ @else
+ {{ $item->status }}
+ @endif
+ |
+
+ @endforeach
+
+
+
+
+
+
+
+
+
+
+@endsection
+
+@section('scripts')
+
+@endsection
diff --git a/resources/views/backend/pages/report/others.blade.php b/resources/views/backend/pages/report/others.blade.php
index 703d195..45d11e5 100644
--- a/resources/views/backend/pages/report/others.blade.php
+++ b/resources/views/backend/pages/report/others.blade.php
@@ -117,6 +117,7 @@
Jenis |
Keterangan |
Total |
+
Total Aproved |
Bukti Total |
Account Number |
Status |
@@ -134,6 +135,7 @@
{{ $item->kategori->name }} |
{{ $item->keterangan }} |
{{ number_format($item->total, 0, ',', '.') }} |
+
{{ number_format($item->approved_total, 0, ',', '.') }} |
@if ($item->bukti_total)
diff --git a/routes/web.php b/routes/web.php
index 1dcbc47..c08b5a5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -108,6 +108,7 @@ Route::middleware(['auth:admin', 'menu'])->group(function () {
Route::get('/entertainment', [ReportController::class, 'entertainment'])->name('reports.entertainment');
Route::get('/meeting', [ReportController::class, 'meeting'])->name('reports.meeting');
Route::get('/others', [ReportController::class, 'others'])->name('reports.others');
+ Route::get('/all', [ReportController::class, 'all'])->name('reports.all');
});
// Forms
|