diff --git a/app/Http/Controllers/Reports/MonthlyReportController.php b/app/Http/Controllers/Reports/MonthlyReportController.php index 2dfc8304..2892c231 100644 --- a/app/Http/Controllers/Reports/MonthlyReportController.php +++ b/app/Http/Controllers/Reports/MonthlyReportController.php @@ -19,8 +19,9 @@ use Illuminate\Http\Request; class MonthlyReportController { public function salesReport(Request $request): JsonResponse { - $today = Carbon::now(); - $containers = Container::whereMonth('loading_date', $today->format('m'))->whereYear('loading_date', $today->format('Y'))->orderBy('loading_date')->get(); + $today = Carbon::now()->subMonth(); + + $containers = Container::whereDay('loading_date', '>=', 1)->whereDay('loading_date', '<=', 5)->whereMonth('loading_date', $today->format('m'))->whereYear('loading_date', $today->format('Y'))->orderBy('loading_date')->get(); $packages = $containers->flatMap(function ($container) {