dst/mastercut
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: menambahkan card baru di ikhtisar untuk setor uang

Browse Source
This commit is contained in:
Yoga Pangestu 2025-01-02 20:06:01 +07:00
parent 47277d18e5
commit 04676604c6
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Admin/Dashboard/OverviewController.php
View File

@ -4,6 +4,7 @@
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\Barbershop; use App\Models\Barbershop;
use App\Models\DepositMoney;
use App\Models\Expense; use App\Models\Expense;
use App\Models\Payroll; use App\Models\Payroll;
use App\Models\Transaction; use App\Models\Transaction;
@ -48,6 +49,10 @@ public function index()
$todayExpense = Expense::query()->barbershop()->today()->sum('amount'); $todayExpense = Expense::query()->barbershop()->today()->sum('amount');
$yesterdayExpense = Expense::query()->barbershop()->yesterday()->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'); $todayPayroll = Payroll::query()->barbershop()->today()->sum('total');
$yesterdayPayroll = Payroll::query()->barbershop()->yesterday()->sum('amount'); $yesterdayPayroll = Payroll::query()->barbershop()->yesterday()->sum('amount');
@ -104,6 +109,8 @@ public function index()
'todayShaving' => $todayShaving, 'todayShaving' => $todayShaving,
'yesterdayShaving' => $yesterdayShaving, 'yesterdayShaving' => $yesterdayShaving,
'todayExpense' => $todayExpense + $todayPayroll, 'todayExpense' => $todayExpense + $todayPayroll,
'todayDepositMoney' => $todayDepositMoney,
'yesterdayDepositMoney' => $yesterdayDepositMoney,
'yesterdayExpense' => $yesterdayExpense + $yesterdayPayroll, 'yesterdayExpense' => $yesterdayExpense + $yesterdayPayroll,
'todayNewCustomer' => $todayNewCustomer, 'todayNewCustomer' => $todayNewCustomer,
'yesterdayNewCustomer' => $yesterdayNewCustomer, 'yesterdayNewCustomer' => $yesterdayNewCustomer,

11
app/Models/DepositMoney.php
View File

@ -2,6 +2,7 @@
namespace App\Models; namespace App\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; 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); 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 public function user(): BelongsTo
{ {
return $this->belongsTo(User::class); return $this->belongsTo(User::class);

18
resources/views/pages/admin/dashboard/overview.blade.php
View File

@ -82,6 +82,24 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-6">
<div class="card small-widget">
<div class="card-body primary">
<span class="f-light">Setor Uang</span>
<div class="d-flex align-items-end gap-1">
<h4>{{ formatToRupiah($todayDepositMoney) }}</h4>
<span class="font-primary f-12 f-w-500">
<span>
{{ formatToRupiah($yesterdayDepositMoney) }}</span>
</span>
</div>
<div class="bg-gradient">
<svg class="stroke-icon svg-fill">
</svg>
</div>
</div>
</div>
</div>
@endif @endif
<div class="col-6"> <div class="col-6">
<div class="card small-widget"> <div class="card small-widget">