order, report and dashboard changes
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
use App\Models\Shipment;
|
||||
use App\Models\Invoice;
|
||||
use App\Models\User;
|
||||
use App\Models\Staff;
|
||||
use App\Models\Admin;
|
||||
|
||||
$totalOrders = Order::count();
|
||||
$pendingOrders = Order::where('status', 'pending')->count();
|
||||
@@ -16,12 +16,12 @@
|
||||
|
||||
$totalRevenue = Invoice::sum('final_amount_with_gst');
|
||||
|
||||
// USERS (USING status COLUMN)
|
||||
// USERS (CUSTOMERS)
|
||||
$activeCustomers = User::where('status', 'active')->count();
|
||||
$inactiveCustomers = User::where('status', 'inactive')->count();
|
||||
|
||||
// STAFF (ACTIVE ONLY, SoftDeletes SAFE)
|
||||
$totalStaff = Staff::where('status', 'active')->count();
|
||||
// STAFF (FROM ADMINS TABLE)
|
||||
$totalStaff = Admin::where('type', 'staff')->count();
|
||||
|
||||
$orders = Order::latest()->get();
|
||||
@endphp
|
||||
@@ -356,6 +356,13 @@ body, .container-fluid {
|
||||
border-color: #f59e0b !important;
|
||||
}
|
||||
|
||||
.badge-loading {
|
||||
background: linear-gradient(135deg, #e3f2fd, #90caf9) !important;
|
||||
color: #1565c0 !important;
|
||||
border-color: #2196f3 !important;
|
||||
width: 110px;
|
||||
}
|
||||
|
||||
/* In Transit Status - SAME SIZE WITH TRUCK ICON */
|
||||
.badge-in_transit {
|
||||
background: linear-gradient(135deg, #dbeafe, #93c5fd) !important;
|
||||
@@ -1124,6 +1131,7 @@ body, .container-fluid {
|
||||
break-inside: avoid;
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<div class="container-fluid py-3">
|
||||
|
||||
Reference in New Issue
Block a user