diff --git a/app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php b/app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php index d670e02e..647dcc1a 100644 --- a/app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php +++ b/app/Classes/Modules/Exports/Services/ExportsWarehousePackingList.php @@ -5,7 +5,6 @@ namespace App\Classes\Modules\Exports\Services; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\PackingListType; use App\Models\Order; -use App\Models\State; use Maatwebsite\Excel\Concerns\Exportable; use Maatwebsite\Excel\Concerns\FromQuery; use Maatwebsite\Excel\Concerns\WithHeadingRow; @@ -32,10 +31,8 @@ class ExportsWarehousePackingList implements FromQuery, WithHeadings, WithHeadin */ public function query() { - $johor_state_id = State::where('name', 'johor')->first()->id; - - return Order::whereHas('addresses', function($address) use ($johor_state_id){ - $address->where('status', ApprovalStatus::APPROVED)->where('state_id', $johor_state_id); + return Order::whereHas('addresses', function($address) { + $address->where('status', ApprovalStatus::APPROVED); })->whereHas('packingLists', function($packingLists) { $packingLists->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('transports'); });