diff --git a/app/Classes/General/Eloquent/Filters/WithContainersPackages.php b/app/Classes/General/Eloquent/Filters/WithContainersPackages.php
index 5fabff27..b4f30b31 100644
--- a/app/Classes/General/Eloquent/Filters/WithContainersPackages.php
+++ b/app/Classes/General/Eloquent/Filters/WithContainersPackages.php
@@ -4,6 +4,7 @@ namespace App\Classes\General\Eloquent\Filters;
 
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Log;
 
 class WithContainersPackages implements Filter
 {
@@ -15,6 +16,8 @@ class WithContainersPackages implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->with(['containers', 'packages']);
+        // Log::info('WithContainersPackages: '.$value);
+        // return $builder->with(['containers', 'packages']);
+        return null;
     }
 }
diff --git a/app/Classes/Modules/PackingLists/Processors/ListPackingListsJobProcessor.php b/app/Classes/Modules/PackingLists/Processors/ListPackingListsJobProcessor.php
index 2f3a5eed..535e5d29 100644
--- a/app/Classes/Modules/PackingLists/Processors/ListPackingListsJobProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/ListPackingListsJobProcessor.php
@@ -8,6 +8,7 @@ use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor;
 use App\Classes\General\Helper;
 use App\Classes\Modules\Jobs\DataTransferObjects\ListGenericJobObject;
 use App\Http\Resources\ListPackingListJobResource;
+use App\Http\Resources\ListPackingListDetailsJobResource;
 
 class ListPackingListsJobProcessor
 {
@@ -36,15 +37,22 @@ class ListPackingListsJobProcessor
      * @throws \App\Classes\Exceptions\JobResourceNotFoundException
      */
     public function execute(ListGenericJobObject $listGenericJobObject) {
-
         // $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page'], 'with_containers_packages' => true]);
-
-        $query = $this->listsPackingLists->execute(array_merge($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page'], 'with_containers_packages' => true]));
+        $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
+        // $query = $this->listsPackingLists->execute(array_merge($this->listsPackingLists->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page'], 'with_containers_packages' => true]));
 
         foreach ($query->items() as &$item) {
             $item['userInfo'] = $listGenericJobObject->getUserInfo();
         }
-        $resultCurrent = Helper::collectionResponse(ListPackingListJobResource::collection($query));
-        $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
+
+        $filtersArray = json_decode($listGenericJobObject->getPayload()['filters'], true);
+        if(isset($filtersArray['does_not_have_transaction_type'])){ //For Pending Invoice query
+            $resultCurrent = Helper::collectionResponse(ListPackingListDetailsJobResource::collection($query));
+            $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
+        }
+        else{
+            $resultCurrent = Helper::collectionResponse(ListPackingListJobResource::collection($query));
+            $this->updateJobResultProcessor->execute($listGenericJobObject, $resultCurrent);
+        }
     }
 }
diff --git a/app/Http/Resources/ListPackingListDetailsJobResource.php b/app/Http/Resources/ListPackingListDetailsJobResource.php
new file mode 100644
index 00000000..48bed481
--- /dev/null
+++ b/app/Http/Resources/ListPackingListDetailsJobResource.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\Order;
+use App\Models\PackingList;
+use Illuminate\Http\Resources\Json\JsonResource;
+use App\Http\Resources\V2\PackingListV2Resource;
+
+class ListPackingListDetailsJobResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $exceptionUsers = in_array($this->userInfo ? $this->userInfo->type : Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
+        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
+
+        return [
+            'id' => $this->id,
+            'claimant_id' => $this->claimant_id,
+            'reference' => $this->reference,
+            'status' => $this->status,
+            'transport' => new TransportResource($this->transports()->first()),
+            'type' => $this->type,
+            'receive_packing_list' => $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListV2Resource(PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first(), $this->userInfo)),
+            // 'packages' => PackageResource::collection($packages),
+            // $this->mergeWhen($this->owner instanceof Order, [
+            //     'order' => New OrderResource($this->owner)
+            // ]),
+            'container' => new ContainerResource($this->containers->first()),
+            'packages' => PackageWithoutOrderResource::collection($packages),
+            $this->mergeWhen($this->owner instanceof Order, [ 'order' => New OrderResource($this->owner) ]),
+            'shipping_transaction' => new TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereNotIn('status', [ApprovalStatus::SUSPENDED, ApprovalStatus::EXPIRED])->first()),
+            'suspended_invoice' => new TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->first()),
+            // 'suspended_invoices' => TransactionResource::collection($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->get()),
+        ];
+    }
+}
diff --git a/app/Http/Resources/ListPackingListJobResource.php b/app/Http/Resources/ListPackingListJobResource.php
index 6b13be59..db094db1 100644
--- a/app/Http/Resources/ListPackingListJobResource.php
+++ b/app/Http/Resources/ListPackingListJobResource.php
@@ -31,7 +31,7 @@ class ListPackingListJobResource extends JsonResource
             'status' => $this->status,
             'transport' => new TransportResource($this->transports()->first()),
             'type' => $this->type,
-            'receive_packing_list' => $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListV2Resource(PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first(), $this->userInfo)),
+            // 'receive_packing_list' => $this->when($this->type === PackingListType::SHIPPING_PACKING_LIST, new PackingListV2Resource(PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first(), $this->userInfo)),
             // 'packages' => PackageResource::collection($packages),
             // $this->mergeWhen($this->owner instanceof Order, [
             //     'order' => New OrderResource($this->owner)