update seeder

Author: nb150301

app/Http/Controllers/Api/DashboardController.php

@@ -9,8 +9,8 @@
 class DashboardController extends Controller
 {
     public function getSummaryStatisticToday() {
-        $startDay = time() - 86400 + (time() % 86400);
-        $endDay = $startDay + 86400;
+        $startDay = strtotime("today", time());
+        $endDay = strtotime("tomorrow", $startDay) - 1;
 
         $startYesterday = $startDay - 86400;
         $endYesterday = $startDay;
@@ -27,10 +27,10 @@ public function getSummaryStatisticToday() {
 
         foreach($invoices as $invoice) {
             if ($invoice->created_at->timestamp >= $startDay && $invoice->created_at->timestamp <= $endDay) {
-                $totalIncomeToday += $invoice->total_price;
+                $totalIncomeToday += $invoice->final_price;
                 $totalInvoiceToday++;
                 if ($invoice->status == 'pending') {
-                    $totalIncomePending += $invoice->total;
+                    $totalIncomePending += $invoice->final_price;
                 }
 
                 $invoicesDetails = $invoice->invoiceDetails()->get();
@@ -41,7 +41,7 @@ public function getSummaryStatisticToday() {
             }
 
             if ($invoice->created_at->timestamp >= $startYesterday && $invoice->created_at->timestamp <= $endYesterday) {
-                $totalIncomeYesterday += $invoice->total;
+                $totalIncomeYesterday += $invoice->final_price;
                 $totalInvoiceYesterday++;
 
                 $totalCustomerYesterday += $invoice->invoiceDetails()->count();

app/Http/Controllers/Api/InvoiceController.php

@@ -9,6 +9,7 @@
 use App\Models\BankConfig;
 use App\Models\Customer;
 use App\Models\Invoice;
+use App\Models\InvoiceDetail;
 use App\Services\CartService;
 use App\Services\CustomerService;
 use App\Services\LoyalService;
@@ -21,7 +22,9 @@ class InvoiceController extends Controller
 {
     public function index()
     {
-        $invoices = Invoice::with('invoiceDetails', 'customer', 'staff', 'voucher')->paginate();
+        $invoices = Invoice::with('invoiceDetails', 'customer', 'staff', 'voucher')
+            ->orderBy('status', 'desc')
+            ->orderBy('id', 'desc')->paginate();
 
         return response()->json($invoices);
     }
@@ -391,4 +394,17 @@ public function getPending()
 
         return response()->json($pendingInvoices);
     }
-}
+
+    public function getTotalIncome()
+    {
+        $invoiceDetails = InvoiceDetail::all();
+
+        $totalIncome = 0;
+
+        foreach ($invoiceDetails as $invoiceDetail) {
+            $totalIncome += $invoiceDetail->unit_price * $invoiceDetail->quantity;
+        }
+
+        return response()->json(['total_income' => $totalIncome]);
+    }
+}

database/seeders/InvoiceSeeder.php

@@ -47,16 +47,13 @@ public function run()
             ],
         ];
 
-        for ($i = 0; $i < 200; $i++) {
+        for ($i = 0; $i < 300; $i++) {
             // Generate random date within the past 2 weeks
-            $totalPrice = rand(100000, 500000); // Adjust total price range
-            $randomDay = Carbon::now()->subDays(rand(1, 28));
+            $randomDay = Carbon::now()->subDays(rand(0, 28));
 
             $invoiceAdd = [
                 'user_id' => rand(1, 10), // Adjust user ID range
                 'table_number' => rand(1, 10), // Adjust table number range (optional)
-                'total_price' => $totalPrice, // Adjust total price range
-                'final_price' => $totalPrice,
                 'status' => 'finish', // Adjust status options (e.g., 'pending', 'cancelled')
                 'created_at' => $randomDay,
             ];
@@ -79,6 +76,7 @@ public function run()
             }
 
             $invoiceAdd['total_price'] = $totalPrice;
+            $invoiceAdd['final_price'] = $totalPrice;
 
             $invoices[] = $invoiceAdd;
         }

routes/api.php

@@ -44,11 +44,13 @@
             Route::get('/staffs/{staff}', [\App\Http\Controllers\Api\StaffController::class, 'show']);
 
             Route::get('/invoices', [\App\Http\Controllers\Api\InvoiceController::class, 'index']);
+            Route::get('/invoices/total-income', [\App\Http\Controllers\Api\InvoiceController::class, 'getTotalIncome']);
             Route::put('/invoices/{invoice}', [\App\Http\Controllers\Api\InvoiceController::class, 'update']);
             Route::delete('/invoices/bulk-delete', [\App\Http\Controllers\Api\InvoiceController::class, 'destroyMultiple']);
             Route::delete('/invoices/{invoice}', [\App\Http\Controllers\Api\InvoiceController::class, 'destroy']);
             Route::get('/invoices/{invoice}', [\App\Http\Controllers\Api\InvoiceController::class, 'show']);
 
+
             Route::get('/vouchers', [\App\Http\Controllers\Api\VoucherController::class, 'index']);
             Route::post('/vouchers', [\App\Http\Controllers\Api\VoucherController::class, 'store']);
             Route::put('/vouchers/{voucher}', [\App\Http\Controllers\Api\VoucherController::class, 'update']);