Merge pull request #97 from andrewdwallo/development-3.x

Development 3.x

app/Filament/Company/Resources/Purchases/BillResource/Pages/ListBills.php

@@ -4,7 +4,6 @@ namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
 
 use App\Enums\Accounting\BillStatus;
 use App\Filament\Company\Resources\Purchases\BillResource;
-use App\Models\Accounting\Bill;
 use Filament\Actions;
 use Filament\Pages\Concerns\ExposesTableToWidgets;
 use Filament\Resources\Components\Tab;
@@ -47,15 +46,13 @@ class ListBills extends ListRecords
                 ->label('Outstanding')
                 ->modifyQueryUsing(function (Builder $query) {
                     $query->outstanding();
-                })
-                ->badge(Bill::outstanding()->count()),
+                }),
 
             'paid' => Tab::make()
                 ->label('Paid')
                 ->modifyQueryUsing(function (Builder $query) {
                     $query->where('status', BillStatus::Paid);
-                })
-                ->badge(Bill::where('status', BillStatus::Paid)->count()),
+                }),
         ];
     }
 }

app/Filament/Company/Resources/Sales/EstimateResource/Pages/ListEstimates.php

@@ -5,7 +5,6 @@ namespace App\Filament\Company\Resources\Sales\EstimateResource\Pages;
 use App\Enums\Accounting\EstimateStatus;
 use App\Filament\Company\Resources\Sales\EstimateResource;
 use App\Filament\Company\Resources\Sales\EstimateResource\Widgets;
-use App\Models\Accounting\Estimate;
 use Filament\Actions;
 use Filament\Pages\Concerns\ExposesTableToWidgets;
 use Filament\Resources\Components\Tab;
@@ -48,15 +47,13 @@ class ListEstimates extends ListRecords
                 ->label('Active')
                 ->modifyQueryUsing(function (Builder $query) {
                     $query->active();
-                })
-                ->badge(Estimate::active()->count()),
+                }),
 
             'draft' => Tab::make()
                 ->label('Draft')
                 ->modifyQueryUsing(function (Builder $query) {
                     $query->where('status', EstimateStatus::Draft);
-                })
-                ->badge(Estimate::where('status', EstimateStatus::Draft)->count()),
+                }),
         ];
     }
 }

app/Filament/Company/Resources/Sales/InvoiceResource/Pages/ListInvoices.php

@@ -6,7 +6,6 @@ use App\Enums\Accounting\InvoiceStatus;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Widgets;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages\ViewRecurringInvoice;
-use App\Models\Accounting\Invoice;
 use App\Models\Accounting\RecurringInvoice;
 use CodeWithDennis\SimpleAlert\Components\Infolists\SimpleAlert;
 use Filament\Actions;
@@ -110,15 +109,13 @@ class ListInvoices extends ListRecords
                 ->label('Unpaid')
                 ->modifyQueryUsing(function (Builder $query) {
                     $query->unpaid();
-                })
-                ->badge(Invoice::unpaid()->count()),
+                }),
 
             'draft' => Tab::make()
                 ->label('Draft')
                 ->modifyQueryUsing(function (Builder $query) {
                     $query->where('status', InvoiceStatus::Draft);
-                })
-                ->badge(Invoice::where('status', InvoiceStatus::Draft)->count()),
+                }),
         ];
     }
 }

app/Filament/Company/Resources/Sales/RecurringInvoiceResource/Pages/ListRecurringInvoices.php

@@ -4,7 +4,6 @@ namespace App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
 
 use App\Enums\Accounting\RecurringInvoiceStatus;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
-use App\Models\Accounting\RecurringInvoice;
 use Filament\Actions;
 use Filament\Resources\Components\Tab;
 use Filament\Resources\Pages\ListRecords;
@@ -37,15 +36,13 @@ class ListRecurringInvoices extends ListRecords
                 ->label('Active')
                 ->modifyQueryUsing(function (Builder $query) {
                     $query->where('status', RecurringInvoiceStatus::Active);
-                })
-                ->badge(RecurringInvoice::where('status', RecurringInvoiceStatus::Active)->count()),
+                }),
 
             'draft' => Tab::make()
                 ->label('Draft')
                 ->modifyQueryUsing(function (Builder $query) {
                     $query->where('status', RecurringInvoiceStatus::Draft);
-                })
-                ->badge(RecurringInvoice::where('status', RecurringInvoiceStatus::Draft)->count()),
+                }),
         ];
     }
 }

app/Models/Accounting/RecurringInvoice.php

@@ -283,7 +283,7 @@ class RecurringInvoice extends Document
         }
 
         $nextDate = match (true) {
-            $this->frequency->isDaily() => $lastDate->addDay(),
+            $this->frequency->isDaily() => $lastDate->copy()->addDay(),
 
             $this->frequency->isWeekly() => $this->calculateNextWeeklyDate($lastDate),
 

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.336.13",
+            "version": "3.336.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "dcb43c029ca74c52fa03a739341cc77086296a83"
+                "reference": "dc9ac0ab313bbfc4e41635ce6d6083f28d202bf0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dcb43c029ca74c52fa03a739341cc77086296a83",
-                "reference": "dcb43c029ca74c52fa03a739341cc77086296a83",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dc9ac0ab313bbfc4e41635ce6d6083f28d202bf0",
+                "reference": "dc9ac0ab313bbfc4e41635ce6d6083f28d202bf0",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.13"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.14"
             },
-            "time": "2025-01-10T19:04:25+00:00"
+            "time": "2025-01-13T19:04:40+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",

package-lock.json

@@ -1907,9 +1907,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.49",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-            "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+            "version": "8.5.0",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.0.tgz",
+            "integrity": "sha512-27VKOqrYfPncKA2NrFOVhP5MGAfHKLYn/Q0mz9cNQyRAKYi3VNHwYU2qKKqPCqgBmeeJ0uAFB56NumXZ5ZReXg==",
             "dev": true,
             "funding": [
                 {
@@ -1927,7 +1927,7 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "nanoid": "^3.3.7",
+                "nanoid": "^3.3.8",
                 "picocolors": "^1.1.1",
                 "source-map-js": "^1.2.1"
             },