Merge branch 'dillon/34.7-jenkins-vapor' into vapor/production

app/Classes/Modules/PackingLists/ControllersLogic/Containers/FetchContainerLogic.php

@@ -6,7 +6,7 @@ namespace App\Classes\Modules\PackingLists\ControllersLogic\Containers;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\PackingLists\Services\Containers\FetchesContainer;
 use App\Classes\Modules\PackingLists\Standards\Rules\Containers\CanFetchContainer;
-use App\Http\Resources\ContainerResource;
+use App\Http\Resources\ContainerBaseResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -54,7 +54,7 @@ class FetchContainerLogic extends AbstractControllerLogic
 
         $query = $this->fetchesContainer->execute(['id' => $request->route('id'), 'with_packing_lists' => true]);
 
-        return $this->resourceResponse(new ContainerResource($query));
+        return $this->resourceResponse(new ContainerBaseResource($query));
 
     }
 

app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php

@@ -8,7 +8,6 @@ use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
 use App\Classes\Modules\PackingLists\Standards\Rules\CanListPackingLists;
 use App\Http\Resources\PackingListBaseResource;
 use App\Http\Resources\PackingListResource;
-use App\Http\Resources\PackingListWithStorageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;

app/Http/Resources/ContainerBaseResource.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Resources;
+
+
+use App\Classes\ValueObjects\Constants\ContainerTypes;
+use App\Models\Remark;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\DB;
+
+class ContainerBaseResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            // 'id' => $this->id,
+            // 'container_reference' => $this->reference,
+            // 'container_specification' => ContainerTypes::CONTAINER_SPECIFICATION[$this->container_type],
+            // 'container_number' => $this->container_number,
+            // 'seal_reference' => $this->seal_reference,
+            // 'loading_date' => optional($this->loading_date)->format('d-m-Y'),
+            // 'transport' => new TransportResource($this->transports()->first()),
+            // 'packages_count' => $this->packages()->where('packages.type', '!=', 2)->sum('quantity'),
+            // 'total_cbm' => $this->packages()->sum(DB::raw('(width/100) * (height/100) * (length/100) * quantity')),
+            // 'remarks' => RemarkResource::collection($this->remarks),
+            // 'status' => $this->status,
+            'packing_lists' => $this->shouldIncludePackingListData($request) ? $this->getSortedPackingLists() : null,
+        ];
+    }
+
+    protected function shouldIncludePackingListData($request)
+    {
+        return (isset($request->all()['with_packing_list_data']) && ($request->all()['with_packing_list_data'] == false)) ? false : true;
+    }
+
+    protected function getSortedPackingLists()
+    {
+        $sortedPackingLists = $this->packingLists()->get()->sortBy(fn ($packingList) => $packingList->owner->company_module_id);
+        foreach ($sortedPackingLists as $item) {
+            $item['include_shipping_transaction'] = false;
+            $item['include_suspended_invoice'] = false;
+            $item['include_packages'] = true;
+            $item['include_receive_packing_list'] = true;
+            $item['include_order_in_packages'] = false;
+            $item['include_transport_in_packages'] = false;
+            $item['include_container_in_packages'] = true;
+        }
+        return $this->whenLoaded('packingLists', PackingListBaseResource::collection($sortedPackingLists));
+    }
+}

app/Http/Resources/PackingListWithStorageResource.php

@@ -1,56 +0,0 @@
-<?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 Illuminate\Support\Facades\Log;
-
-class PackingListWithStorageResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
-        $packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
-        $shippingTransaction = $this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereNotIn('status', [ApprovalStatus::SUSPENDED, ApprovalStatus::EXPIRED])->first();
-        $transactions = $this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get();
-        $storages = [];
-
-        if($this->storages){
-            $transactionId = $shippingTransaction->id;
-            $filteredStorages = array_filter($this->storages, function ($storage) use ($transactionId) {
-                return isset($storage['parentInvoiceId']) &&  $storage['parentInvoiceId'] == $transactionId;
-            });
-            $storages = $filteredStorages;
-        }
-
-        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 PackingListResource(PackingList::where('reference', $this->reference)->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->first())),
-            'packages' => PackageResource::collection($packages),
-            $this->mergeWhen($this->owner instanceof Order, [
-                'order' => New OrderResource($this->owner)
-            ]),
-            'shipping_transaction' => count($storages) == 0 ? new TransactionWithStorageResource($shippingTransaction): null,
-            'storages' => $storages,
-            'invoices' =>  TransactionWithStorageResource::collection($transactions),
-            'suspended_invoice' => new TransactionResource($this->transactions()->where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [ApprovalStatus::SUSPENDED])->first()),
-        ];
-    }
-}