akaunting 3.0 (the last dance)

app/Console/Commands/BillReminder.php

@@ -8,6 +8,7 @@ use App\Models\Document\Document;
 use App\Notifications\Purchase\Bill as Notification;
 use App\Utilities\Date;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Builder;
 
 class BillReminder extends Command
 {
@@ -35,22 +36,29 @@ class BillReminder extends Command
         // Disable model cache
         config(['laravel-model-caching.enabled' => false]);
 
+        $today = Date::today();
+
+        $start_date = $today->copy()->subWeek()->toDateString() . ' 00:00:00';
+        $end_date = $today->copy()->addMonth()->toDateString() . ' 23:59:59';
+
         // Get all companies
-        $companies = Company::enabled()->with('bills')->cursor();
+        $companies = Company::whereHas('bills', function (Builder $query) use ($start_date, $end_date) {
+                                $query->allCompanies();
+                                $query->whereBetween('due_at', [$start_date, $end_date]);
+                                $query->accrued();
+                                $query->notPaid();
+                            })
+                            ->enabled()
+                            ->cursor();
 
         foreach ($companies as $company) {
-            // Has company bills
-            if (!$company->bills->count()) {
-                continue;
-            }
-
             $this->info('Sending bill reminders for ' . $company->name . ' company.');
 
             // Set company
             $company->makeCurrent();
 
             // Don't send reminders if disabled
-            if (!setting('schedule.send_bill_reminder')) {
+            if (! setting('schedule.send_bill_reminder')) {
                 $this->info('Bill reminders disabled by ' . $company->name . '.');
 
                 continue;
@@ -74,9 +82,11 @@ class BillReminder extends Command
         $date = Date::today()->addDays($day)->toDateString();
 
         // Get upcoming bills
-        $bills = Document::bill()->with('contact')->accrued()->notPaid()->due($date)->cursor();
+        $bills = Document::with('contact')->bill()->accrued()->notPaid()->due($date)->cursor();
 
         foreach ($bills as $bill) {
+            $this->info($bill->document_number . ' bill reminded.');
+
             try {
                 event(new DocumentReminded($bill, Notification::class));
             } catch (\Throwable $e) {