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

#117: Draft orders should not show up in order tabs

Browse Source
This commit is contained in:
Nisse Lommerde 2025-03-11 11:44:51 -04:00
parent 0385f614d6
commit 47669851ff
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -1,4 +1,5 @@
# Changelog # Changelog
**2025-03-11** **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 - 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 private function excludeStatuses($query): mixed
{ {
return $query return $query
->whereNot('status', OrderStatus::DRAFT)
->whereNot('status', OrderStatus::READY_FOR_INVOICE) ->whereNot('status', OrderStatus::READY_FOR_INVOICE)
->whereNot('status', OrderStatus::INVOICED) ->whereNot('status', OrderStatus::INVOICED)
->whereNot('status', OrderStatus::SHIPPED); ->whereNot('status', OrderStatus::SHIPPED);
@ -26,6 +27,7 @@ private function excludeStatuses($query): mixed
private function getBadgeCount(callable $queryCallback): ?int private function getBadgeCount(callable $queryCallback): ?int
{ {
$count = Order::query()->when(true, $queryCallback) $count = Order::query()->when(true, $queryCallback)
->whereNot('status', OrderStatus::DRAFT)
->whereNot('status', OrderStatus::READY_FOR_INVOICE) ->whereNot('status', OrderStatus::READY_FOR_INVOICE)
->whereNot('status', OrderStatus::INVOICED) ->whereNot('status', OrderStatus::INVOICED)
->whereNot('status', OrderStatus::SHIPPED) ->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. | or any other location as required by the application or its packages.
*/ */
'version' => '20250310', 'version' => '20250311',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------