nisse/topnotch_website
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Version 20250311 #121

Merged
nisse merged 4 commits from development into main 2025-03-11 17:33:41 +01:00
Conversation 0 Commits 4 Files Changed 9 +4 -1
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 47669851ff - Show all commits

1
README.md
View File

@ -1,4 +1,5 @@
# Changelog
**2025-03-11**
- Fixed #117 - Draft orders should not show up in order tabs
- Fixed #116 - 'Ready for invoice'-badge shows 0 instead of hiding

2
app/Filament/Admin/Resources/OrderResource/Pages/ListOrders.php
View File

@ -18,6 +18,7 @@ class ListOrders extends ListRecords
private function excludeStatuses($query): mixed
{
return $query
->whereNot('status', OrderStatus::DRAFT)
->whereNot('status', OrderStatus::READY_FOR_INVOICE)
->whereNot('status', OrderStatus::INVOICED)
->whereNot('status', OrderStatus::SHIPPED);
@ -26,6 +27,7 @@ private function excludeStatuses($query): mixed
private function getBadgeCount(callable $queryCallback): ?int
{
$count = Order::query()->when(true, $queryCallback)
->whereNot('status', OrderStatus::DRAFT)
->whereNot('status', OrderStatus::READY_FOR_INVOICE)
->whereNot('status', OrderStatus::INVOICED)
->whereNot('status', OrderStatus::SHIPPED)

2
config/app.php
View File

@ -25,7 +25,7 @@
| or any other location as required by the application or its packages.
*/
'version' => '20250310',
'version' => '20250311',
/*
|--------------------------------------------------------------------------