From eaa21beb8368c56e9b999967eaedfd0087723355 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 25 Feb 2024 14:04:19 +0800 Subject: [PATCH] UI Update (Payment and Billing page) on Admin view to see shipping invoices with storage invoices on Pending Payment tab and Paid Invoice tab --- app/Http/Middleware/CheckForStorageInvoiceByPackingLists.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Middleware/CheckForStorageInvoiceByPackingLists.php b/app/Http/Middleware/CheckForStorageInvoiceByPackingLists.php index 28588555..a393e3b5 100644 --- a/app/Http/Middleware/CheckForStorageInvoiceByPackingLists.php +++ b/app/Http/Middleware/CheckForStorageInvoiceByPackingLists.php @@ -5,6 +5,8 @@ namespace App\Http\Middleware; use Closure; use App\Classes\Modules\Transactions\Processors\CheckStorageInvoiceTransactionProcessor; use App\Classes\Modules\PackingLists\Services\ListsPackingLists; +use App\Classes\ValueObjects\Constants\TransactionType; +use App\Models\CompanyConnection; use App\Models\Order; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; @@ -43,9 +45,9 @@ class CheckForStorageInvoiceByPackingLists // if(json_encode($filters['order_by']) == '{"column":"id","DESC":true}'){ // $filters['order_by_id_desc'] = true; // } - // unset($filters['order_by']); if(isset($filters['check_for_storage_invoice'])){ + unset($filters['order_by']); $packinglists = $this->listsPackingLists->execute($filters); foreach($packinglists as $packingList){ if($packingList){