diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 921bd950..6122a79c 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -3,6 +3,7 @@ namespace App\Classes\Modules\Exports\Services; use App\Classes\ValueObjects\Constants\ApprovalStatus; +use App\Models\CompanyModule; use App\Models\PackingList; use Maatwebsite\Excel\Concerns\Exportable; use Maatwebsite\Excel\Concerns\FromCollection; @@ -40,7 +41,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, { $returnArray = collect(); - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->whereHas('transports', function ($query){ + $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ return $query->whereMonth('drop_date', '>', 3)->whereYear('drop_date', 2022); })->get();