From 04676604c6d775812ab551d28c717c0883d261c1 Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Thu, 2 Jan 2025 20:06:01 +0700 Subject: [PATCH] feat: menambahkan card baru di ikhtisar untuk setor uang --- .../Admin/Dashboard/OverviewController.php | 7 +++++++ app/Models/DepositMoney.php | 11 +++++++++++ .../pages/admin/dashboard/overview.blade.php | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/app/Http/Controllers/Admin/Dashboard/OverviewController.php b/app/Http/Controllers/Admin/Dashboard/OverviewController.php index 09b0307..2ed1e8f 100644 --- a/app/Http/Controllers/Admin/Dashboard/OverviewController.php +++ b/app/Http/Controllers/Admin/Dashboard/OverviewController.php @@ -4,6 +4,7 @@ use App\Http\Controllers\Controller; use App\Models\Barbershop; +use App\Models\DepositMoney; use App\Models\Expense; use App\Models\Payroll; use App\Models\Transaction; @@ -48,6 +49,10 @@ public function index() $todayExpense = Expense::query()->barbershop()->today()->sum('amount'); $yesterdayExpense = Expense::query()->barbershop()->yesterday()->sum('amount'); + + $todayDepositMoney = DepositMoney::query()->barbershop()->today()->sum('amount'); + $yesterdayDepositMoney = DepositMoney::query()->barbershop()->yesterday()->sum('amount'); + $todayPayroll = Payroll::query()->barbershop()->today()->sum('total'); $yesterdayPayroll = Payroll::query()->barbershop()->yesterday()->sum('amount'); @@ -104,6 +109,8 @@ public function index() 'todayShaving' => $todayShaving, 'yesterdayShaving' => $yesterdayShaving, 'todayExpense' => $todayExpense + $todayPayroll, + 'todayDepositMoney' => $todayDepositMoney, + 'yesterdayDepositMoney' => $yesterdayDepositMoney, 'yesterdayExpense' => $yesterdayExpense + $yesterdayPayroll, 'todayNewCustomer' => $todayNewCustomer, 'yesterdayNewCustomer' => $yesterdayNewCustomer, diff --git a/app/Models/DepositMoney.php b/app/Models/DepositMoney.php index 4048a1d..3e0e9bb 100644 --- a/app/Models/DepositMoney.php +++ b/app/Models/DepositMoney.php @@ -2,6 +2,7 @@ namespace App\Models; +use Carbon\Carbon; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -21,6 +22,16 @@ public function scopeBarbershop(Builder $query): Builder return $query->where('barbershop_id', Auth::user()->barbershop_id); } + public function scopeToday(Builder $query): Builder + { + return $query->whereDate('created_at', Carbon::today()); + } + + public function scopeYesterday(Builder $query): Builder + { + return $query->whereDate('created_at', Carbon::yesterday()); + } + public function user(): BelongsTo { return $this->belongsTo(User::class); diff --git a/resources/views/pages/admin/dashboard/overview.blade.php b/resources/views/pages/admin/dashboard/overview.blade.php index 488bb24..3599c2e 100644 --- a/resources/views/pages/admin/dashboard/overview.blade.php +++ b/resources/views/pages/admin/dashboard/overview.blade.php @@ -82,6 +82,24 @@ +
+
+
+ Setor Uang +
+

{{ formatToRupiah($todayDepositMoney) }}

+ + + {{ formatToRupiah($yesterdayDepositMoney) }} + +
+
+ + +
+
+
+
@endif