UI/UX amendment for order page when paying with storage invoice

app/Classes/Modules/Transactions/ControllersLogic/ListTransactionsLogic.php

@@ -5,7 +5,7 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\ListsTransactions;
-use App\Http\Resources\TransactionResource;
+use App\Http\Resources\TransactionWithStorageResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
@@ -51,6 +51,6 @@ class ListTransactionsLogic extends AbstractControllerLogic
             }
         }
 
-        return $this->collectionResponse(TransactionResource::collection($query));
+        return $this->collectionResponse(TransactionWithStorageResource::collection($query));
     }
 }

app/Classes/Modules/Transactions/Processors/CheckStorageInvoiceTransactionProcessor.php

@@ -24,7 +24,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\TransactionDetailType;
-use App\Http\Resources\TransactionForStorageInvoiceResource;
+use App\Http\Resources\TransactionWithStorageResource;
 use App\Models\Order;
 use App\Models\PackingList;
 use App\Models\Transaction;
@@ -247,7 +247,7 @@ class CheckStorageInvoiceTransactionProcessor
                 'currentDate' => $resultCurrentDate,
                 'cbm' => $cbm,
                 'pricePerCBM' => $pricePerCBM,
-                'storageInvoice' => new TransactionForStorageInvoiceResource($storageInvoice)
+                'storageInvoice' => new TransactionWithStorageResource($storageInvoice)
             ];
             return $result;
         }

app/Http/Resources/OrderV2Resource.php

@@ -31,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 TransactionForStorageInvoiceResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get());
+                return TransactionWithStorageResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->whereIn('transactions.type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get());
             }),
             'storages' => $this->storages ? $this->storages : null, //from middleware
             'remarks' => RemarkResource::collection($this->remarks),

app/Http/Resources/TransactionResource.php

@@ -3,14 +3,15 @@
 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\Group;
+use App\Models\Order;
 use App\Models\Transaction;
 use App\Models\Wallet;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
-
 class TransactionResource extends JsonResource
 {
     /**
@@ -23,8 +24,6 @@ class TransactionResource extends JsonResource
     {
         $order = null;
         $groupTransactions = null;
-        $group_payment_attempts = null;
-        $group_payment_expired = null;
 
         if ($this->owner instanceof Transaction) {
             if ($this->owner) {
@@ -36,12 +35,6 @@ class TransactionResource extends JsonResource
             if ($this->owner) {
                 $order = new OrderResource($this->owner->owner);
             }
-
-            if($this->groups){
-                $group_payment_attempts = GroupForOrderV2Resource::collection($this->groups->whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]));
-                $group_payment_expired = GroupForOrderV2Resource::collection($this->groupsWithTrashed->whereIn('status', [ApprovalStatus::EXPIRED]));
-            }
-
         } else {
             $group = Group::where('reference', $this->payment_reference)->first();
             if ($group) {
@@ -55,9 +48,7 @@ class TransactionResource extends JsonResource
             'owner_type' => $this->owner_type,
             'order' => $order,
             'group_transactions' => $groupTransactions,
-            'group_reference' => $groupTransactions ? ($group ? $group->reference : null ) : null,
-            'groups_payment_attempts' => $group_payment_attempts,
-            'groups_payment_expired' => $group_payment_expired,
+            'group_reference' => $groupTransactions ? ($group ? $group->reference : null )  : null,
             'documents' => $groupTransactions ? DocumentResource::collection($this->documents->where('status', ApprovalStatus::PENDING_VERIFICATION)) : DocumentResource::collection($this->documents),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
@@ -80,11 +71,6 @@ class TransactionResource extends JsonResource
                     ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
                     ->get()
             ),
-            'payments_expired' => TransactionResource::collection(
-                $this->transactions()
-                    ->payments()->where('status', ApprovalStatus::EXPIRED)
-                    ->get()
-            ),
             'payment_history' => TransactionResource::collection(
                 $this->transactions()
                     ->payments()
@@ -92,7 +78,6 @@ class TransactionResource extends JsonResource
                     ->get()
             ),
             'remarks' => RemarkResource::collection($this->remarks),
-            'storages' => $this->storages ? $this->storages : null, //from middleware
             'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y'),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y')

app/Http/Resources/TransactionWithStorageResource.php

@@ -11,7 +11,7 @@ use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Log;
 
-class TransactionForStorageInvoiceResource extends JsonResource
+class TransactionWithStorageResource extends JsonResource
 {
     /**
      * Transform the resource into an array.