added isLoading to false and section for delete- packinglist-form-component, changed unclaimedpackinglist1 to section

app/Http/Resources/TransactionWithStorageResource.php

@@ -28,9 +28,7 @@ class TransactionWithStorageResource extends JsonResource
         $groupPaymentAttemptsFiltered = [];
         $group_payment_expired = null;
         $group_payment_history = null;
-        $group_payment_history_query = null;
         $groupTotalAmount = 0;
-        $payment_history = null;
 
         if ($this->owner instanceof Transaction) {
             if ($this->owner) {
@@ -46,8 +44,7 @@ class TransactionWithStorageResource extends JsonResource
             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]));
-                $group_payment_history_query = $this->groups->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED]);
-                $group_payment_history  = GroupForOrderV2Resource::collection($group_payment_history_query);
+                $group_payment_history  = GroupForOrderV2Resource::collection($this->groups->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED]));
             }
 
         } else {
@@ -64,7 +61,7 @@ class TransactionWithStorageResource extends JsonResource
         }
 
         $ts = $this->groups->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION])->last();
-        if ($ts && $group_payment_history && $group_payment_attempts) {
+        if ($ts) {
             $paymentTransaction = Transaction::where('payment_reference',  $ts->reference)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION])->first();
             if($paymentTransaction){
                 $groupTotalAmount = (double) $this->amount;
@@ -84,21 +81,6 @@ class TransactionWithStorageResource extends JsonResource
         }
 
 
-        $payment_history = TransactionResource::collection($this->transactions()
-        ->payments()
-        ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED])
-        ->get());
-
-        //For 'Your Payment Proof' at frontend
-
-        if($group_payment_history_query && count($group_payment_history_query) > 0){
-            if($this->getReferenceForGroupPayment($group_payment_history_query)){
-                foreach ($payment_history as $item) {
-                    $item['payment_reference'] = $this->getReferenceForGroupPayment($group_payment_history_query);
-                }
-            }
-        }
-
         return [
             'id' => $this->id,
             'owner_type' => $this->owner_type,
@@ -135,7 +117,12 @@ class TransactionWithStorageResource extends JsonResource
                     ->payments()->where('status', ApprovalStatus::EXPIRED)
                     ->get()
             ),
-            'payment_history' => $payment_history,
+            'payment_history' => TransactionResource::collection(
+                $this->transactions()
+                    ->payments()
+                    ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED])
+                    ->get()
+            ),
             'remarks' => RemarkResource::collection($this->remarks),
             'packing_list_reference' => $packingListReference,
             'storages' => $this->storages ? $this->storages : null, //from middleware
@@ -145,12 +132,4 @@ class TransactionWithStorageResource extends JsonResource
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y')
         ];
     }
-
-    private function getReferenceForGroupPayment($groups){
-        if(count($groups)){
-            $firstGroup = $groups[0];
-            return $firstGroup['reference'];
-        }
-        return null;
-    }
 }

resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue

@@ -17,7 +17,7 @@
                                 <div class="col-auto hide" v-if="$store.getters.isSuperAdmin">
                                     <button type="button" class="btn b-rad-none btn-danger fs-11 requestModal" data-type="deletePackingList"><i class="fa fa-times text-white fs-12"></i></button>
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deletePackingList">
-                                        <delete-packinglist-form-component :data="data"></delete-packinglist-form-component>
+                                        <delete-packinglist-form-component :data="data" section="section"></delete-packinglist-form-component>
                                     </modal-component>
                                     <button type="button" class="btn b-rad-none btn-primary fs-11 requestModal" data-type="claimPackingList">Claim</button>
                                 </div>
@@ -51,7 +51,7 @@
                                                                 <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
                                                             </div>
                                                             <div class="col p-l-5">
-                                                                <div class="btn btn-sm btn-danger btn-block b-rad-none" data-dismiss="modal" @click="submit(route('api.packing_list.delete', item.id), 'delete', 'unclaimedPackingListSection', true, true)">Confirm</div>
+                                                                <div class="btn btn-sm btn-danger btn-block b-rad-none" data-dismiss="modal" @click="submit(route('api.packing_list.delete', item.id), 'delete', section, true, true)">Confirm</div>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -78,6 +78,11 @@
 <script>
     import componentHandler from '../../../general/mixins/componentHandler';
     export default {
-        mixins: [componentHandler]
+        mixins: [componentHandler],
+        data() {
+            return {
+                isLoading: false
+            }
+        }
     }
 </script>

resources/assets/vue/components/paymentsBilling/elements/PaymentHistoryComponent.vue

@@ -157,13 +157,6 @@
                                     </div>
                                 </a>
                             </div>
-                            <div class="row no-margin" v-if="item.payment_method === 4 && item.payment_reference">
-                                <a :href="route('billplz.bill', item.payment_reference)" target="_blank">
-                                    <div class="icon-thumbnail fs-11 text-white icon-25 bg-primary btn-rounded float-left m-r-5">
-                                        <i class="fa fa-file-image-o fs-10"></i>
-                                    </div>
-                                </a>
-                            </div>
                         </div>
                     </div>
                 </div>
@@ -188,13 +181,9 @@
         },
         methods: {
             clickExpand(){
-                // if(this.item
-                // && ((this.item.payment_method !== 5 && this. item.documents.length)
-                // || (this.item.payment_method === 5 && (this.item.status === 2 || this.item.status === 3)))){
-                //     this.expandPaymentDetails = !this.expandPaymentDetails;
-                // }
-
-                if(this.item){
+                if(this.item
+                && ((this.item.payment_method !== 5 && this. item.documents.length)
+                || (this.item.payment_method === 5 && (this.item.status === 2 || this.item.status === 3)))){
                     this.expandPaymentDetails = !this.expandPaymentDetails;
                 }
             },