Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development

app/Http/Controllers/Transactions/ListMappableTransactionsController.php

@@ -0,0 +1,20 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\ListMappableTransactionsLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+
+class ListMappableTransactionsController
+{
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListMappableTransactionsLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Resources/MappableTransactionResource.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use App\Models\Transaction;
+use App\Models\Wallet;
+use Carbon\Carbon;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class MappableTransactionResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $reference = null;
+        if($this->type === TransactionType::TOP_UP) {
+            $reference = $this->owner->owner->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
+        }
+
+        if($this->type === TransactionType::PAYMENT && $this->owner !== Wallet::class){
+            $reference = $this->owner->owner->owner->reference;
+        }
+
+        return [
+            'system' => 'SHIPPING_PORTAL',
+            'type' => $this->type,
+            'owner_type' => $this->owner_type,
+            'owner_id'=> $this->id,
+            'owner_reference'=> $reference,
+        ];
+    }
+}

app/Http/Resources/OrderResource.php

@@ -7,6 +7,7 @@ use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\TransportType;
+use App\Models\Transaction;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -20,6 +21,8 @@ class OrderResource extends JsonResource
      */
     public function toArray($request)
     {
+        $orderId = $this->id;
+
         return [
             'id' => $this->id,
             'reference' => $this->reference,
@@ -47,7 +50,7 @@ class OrderResource extends JsonResource
                     'received_packages' => PackingListResource::collection($this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('packages')->get()),
                 ];
             }),
-            'invoices' => $this->whenLoaded('packingLists', function() {
+            'invoices' => $this->whenLoaded('packingLists', function() use ($orderId) {
                 return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get());
             }),
             'remarks' => RemarkResource::collection($this->remarks),

app/Http/Resources/OrderV2Resource.php

@@ -5,6 +5,7 @@ namespace App\Http\Resources;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\TransportType;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -30,7 +31,7 @@ class OrderV2Resource extends JsonResource
             'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
             'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
             'invoices' => $this->whenLoaded('packingLists', function() {
-                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->get());
+                return TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->where('transactions.type', TransactionType::SHIPPING_INVOICE)->get());
             }),
             'remarks' => RemarkResource::collection($this->remarks),
             'created_at' => $this->created_at->format('d-m-Y')

app/Http/Resources/TransactionResource.php

@@ -22,6 +22,7 @@ class TransactionResource extends JsonResource
     {
         return [
             'id' => $this->id,
+            'owner_type' => $this->owner_type,
             'order' => ($this->owner instanceof Transaction) ? new OrderResource($this->owner->owner->owner) : new OrderResource($this->owner->owner),
             'documents' => DocumentResource::collection($this->documents),
             'type' => (int) $this->type,