From 6ecfa8e031a4177ba60b90839e8b0786f560fc72 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Mon, 10 Oct 2022 17:43:32 +0800
Subject: [PATCH] fix invoice date

---
 app/Http/Resources/PackingListResource.php    |  6 +--
 app/Http/Resources/TransactionResource.php    |  2 +-
 .../AdminPaymentsBillingComponent.vue         | 54 +++++++++----------
 .../DeleteShippingInvoiceFormComponent.vue    |  4 +-
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/app/Http/Resources/PackingListResource.php b/app/Http/Resources/PackingListResource.php
index 7dcd6a68..462e4cdd 100644
--- a/app/Http/Resources/PackingListResource.php
+++ b/app/Http/Resources/PackingListResource.php
@@ -35,9 +35,9 @@ class PackingListResource extends JsonResource
             $this->mergeWhen($this->owner instanceof Order, [
                 'order' => New OrderResource($this->owner)
             ]),
-            'shippng_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()), 
+            '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/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index f68fe54a..26d3ab86 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -53,7 +53,7 @@ class TransactionResource extends JsonResource
             ),
             'remarks' => RemarkResource::collection($this->remarks),
             'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'),
-            'updated_at' => Carbon::parse($this->update_at)->format('d-m-Y')
+            'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y')
         ];
     }
 }
diff --git a/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
index f2785e18..0d430ccd 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
@@ -20,8 +20,8 @@
                         </div>
                         <div class="col">
                             <p class="no-margin fs-10 all-caps">Invoice Date</p>
-                            <div v-if="!item.shippng_transaction">n/a</div>
-                            <div v-if="item.shippng_transaction"> {{ item.shippng_transaction.updated_at }}</div>
+                            <div v-if="!item.shipping_transaction">n/a</div>
+                            <div v-if="item.shipping_transaction"> {{ item.shipping_transaction.updated_at }}</div>
                         </div>
                         <div class="col">
                             <div v-if="item.order">
@@ -37,13 +37,13 @@
                         </div>
                         <div class="col">
                             <p class="no-margin fs-10 all-caps">Amount</p>
-                            <div v-if="!item.shippng_transaction">n/a</div>
-                            <div v-if="item.shippng_transaction">MYR  {{ item.shippng_transaction.amount.toFixed(2) }}</div>
+                            <div v-if="!item.shipping_transaction">n/a</div>
+                            <div v-if="item.shipping_transaction">MYR  {{ item.shipping_transaction.amount.toFixed(2) }}</div>
                         </div>
                         <div class="col-auto p-l-0 p-r-0" v-if="['Pending Payment', 'Paid Invoice', 'Suspended Invoice'].includes(invoice_status)">
-                            <div v-if="item.shippng_transaction">
-                                <div v-if="item.shippng_transaction.documents.length">
-                                    <div v-for="file in item.shippng_transaction.documents[0].files" v-bind:key="file.id" class="col-auto no-padding">
+                            <div v-if="item.shipping_transaction">
+                                <div v-if="item.shipping_transaction.documents.length">
+                                    <div v-for="file in item.shipping_transaction.documents[0].files" v-bind:key="file.id" class="col-auto no-padding">
                                         <document-file-viewer-component :file="file">
                                             <template slot="button">
                                                 <div class="btn bg-grey no-border muted">
@@ -64,7 +64,7 @@
                             <div class="btn bg-grey no-border" @click="expanded = !expanded" v-if="['Pending Approval', 'Pending Payment'].includes(invoice_status)">
                                 <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
                             </div>
-                            <div v-if="!item.shippng_transaction">
+                            <div v-if="!item.shipping_transaction">
                                 <div v-if="item.order">
                                     <div v-if="!item.order.company_module.billingAddress">
                                         <div class="btn btn-primary btn-xs pointer requestModal btn-block" data-type="billingAddressComponent">Add Billing Address</div>
@@ -84,10 +84,10 @@
                                     <div class="btn btn-outline-primary btn-lg pointer invisible">Generate Invoice</div>
                                 </div>
                             </div>
-                            <div class="btn bg-grey no-border muted requestModal" v-if="item.shippng_transaction && invoice_status == 'Pending Approval'" data-type="confirmInvoice">
+                            <div class="btn bg-grey no-border muted requestModal" v-if="item.shipping_transaction && invoice_status == 'Pending Approval'" data-type="confirmInvoice">
                                 <i class="fa fa-check fs-12"></i>
                             </div>
-                            <div class="btn bg-grey no-border muted requestModal" v-if="item.shippng_transaction && invoice_status == 'Pending Approval'" data-type="deleteInoive">
+                            <div class="btn bg-grey no-border muted requestModal" v-if="item.shipping_transaction && invoice_status == 'Pending Approval'" data-type="deleteInoive">
                                 <i class="fa fa-close fs-12"></i>
                             </div>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="confirmInvoice">
@@ -100,7 +100,7 @@
                     </div>
                 </div>
             </div>
-            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="item.shippng_transaction && ['Pending Approval', 'Suspended Invoice'].includes(invoice_status)">
+            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="item.shipping_transaction && ['Pending Approval', 'Suspended Invoice'].includes(invoice_status)">
                 <div class="col p-b-10">
                     <div class="row">
                         <div class="col p-l-20 p-r-20 p-t-10 p-b-10">
@@ -134,33 +134,33 @@
                     </div>
 
                     <h5 class="text-underline text-center">Invoice Details</h5>
-                    <invoice-items-form-component :data="item.shippng_transaction" :section="section"></invoice-items-form-component>
+                    <invoice-items-form-component :data="item.shipping_transaction" :section="section"></invoice-items-form-component>
 
                     <div class="row">
                         <div class="col">
                             <p class="no-margin fs-10 all-caps">Subtotal</p>
-                            <div>{{ item.shippng_transaction.amount -  item.shippng_transaction.service_charge - item.shippng_transaction.tax }}</div>
+                            <div>{{ item.shipping_transaction.amount -  item.shipping_transaction.service_charge - item.shipping_transaction.tax }}</div>
                         </div>
                         <div class="col">
                             <p class="no-margin fs-10 all-caps">Service Charges</p>
-                            <div>{{ item.shippng_transaction.service_charge }}</div>
+                            <div>{{ item.shipping_transaction.service_charge }}</div>
                         </div>
                         <div class="col">
                             <p class="no-margin fs-10 all-caps">Tax</p>
-                            <div>{{ item.shippng_transaction.tax }}</div>
+                            <div>{{ item.shipping_transaction.tax }}</div>
                         </div>
                         <div class="col">
                             <p class="no-margin fs-10 all-caps">Total</p>
-                            <div>{{ item.shippng_transaction.amount }}</div>
+                            <div>{{ item.shipping_transaction.amount }}</div>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="item.shippng_transaction && invoice_status == 'Pending Payment'">
+            <div class="row b-t b-grey p-t-10 m-l-5 m-r-5" v-show="expanded" v-if="item.shipping_transaction && invoice_status == 'Pending Payment'">
                 <div class="col-12 col-md-7 padding-20">
                     <div class="row bg-master-lightest h-100">
                         <div class="col">
-                            <div class="row bg-master-lightest" v-if="item.shippng_transaction.payment_attempts.length">
+                            <div class="row bg-master-lightest" v-if="item.shipping_transaction.payment_attempts.length">
                                 <div class="col">
                                     <div class="row m-t-10 m-b-10">
                                         <div class="col">
@@ -169,12 +169,12 @@
                                     </div>
                                     <div class="row">
                                         <div class="col">
-                                            <shipping-transaction-component v-for="item in item.shippng_transaction.payment_attempts" v-bind:key="item.id" :data="item" ></shipping-transaction-component>
+                                            <shipping-transaction-component v-for="item in item.shipping_transaction.payment_attempts" v-bind:key="item.id" :data="item" ></shipping-transaction-component>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                            <div class="row bg-master-lightest" v-if="item.shippng_transaction.payment_history.length">
+                            <div class="row bg-master-lightest" v-if="item.shipping_transaction.payment_history.length">
                                 <div class="col">
                                     <div class="row m-t-10 m-b-10">
                                         <div class="col">
@@ -183,7 +183,7 @@
                                     </div>
                                     <div class="row">
                                         <div class="col">
-                                            <payment-history-component v-for="item in item.shippng_transaction.payment_history" v-bind:key="item.id" :data="item" ></payment-history-component>
+                                            <payment-history-component v-for="item in item.shipping_transaction.payment_history" v-bind:key="item.id" :data="item" ></payment-history-component>
                                         </div>
                                     </div>
                                 </div>
@@ -201,7 +201,7 @@
                                             <div class="font-heading all-caps fs-12">Total Amount:</div>
                                         </div>
                                         <div class="col-auto text-right">
-                                            <div class="font-heading fs-12">MYR {{(Math.round((item.shippng_transaction.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                            <div class="font-heading fs-12">MYR {{(Math.round((item.shipping_transaction.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                                         </div>
                                     </div>
                                     <div class="row align-items-end m-b-10 text-success hide">
@@ -209,7 +209,7 @@
                                             <div class="font-heading all-caps fs-12">Paid Total:</div>
                                         </div>
                                         <div class="col-auto text-right">
-                                            <!-- <div class="font-heading fs-12">MYR {{(Math.round((item.shippng_transaction.paid_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div> -->
+                                            <!-- <div class="font-heading fs-12">MYR {{(Math.round((item.shipping_transaction.paid_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div> -->
                                             <div class="font-heading fs-12">Paid Total</div>
                                         </div>
                                     </div>
@@ -218,7 +218,7 @@
                                             <div class="font-heading all-caps fs-12">Floating Amount:</div>
                                         </div>
                                         <div class="col-auto text-right">
-                                            <!-- <div class="font-heading fs-12">MYR {{(Math.round((item.shippng_transaction.floating_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div> -->
+                                            <!-- <div class="font-heading fs-12">MYR {{(Math.round((item.shipping_transaction.floating_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div> -->
                                             <div class="font-heading fs-12">Floating Amount</div>
                                         </div>
                                     </div>
@@ -227,10 +227,10 @@
                                             <div class="font-heading all-caps fs-12">OutStanding Total:</div>
                                         </div>
                                         <div class="col-auto text-right">
-                                            <div class="font-heading fs-12">MYR {{(Math.round((item.shippng_transaction.outstanding + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
+                                            <div class="font-heading fs-12">MYR {{(Math.round((item.shipping_transaction.outstanding + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                                         </div>
                                     </div>
-                                    <div class="row m-t-20" v-if="item.shippng_transaction.outstanding > 0">
+                                    <div class="row m-t-20" v-if="item.shipping_transaction.outstanding > 0">
                                         <div class="col">
                                             <div class="btn btn-sm all-caps b-rad-none btn-success btn-block requestModal" data-type="makePayment">Make Payment</div>
                                         </div>
@@ -238,7 +238,7 @@
                                 </div>
                             </div>
                             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="makePayment">
-                                <payment-form-component :data="item.shippng_transaction" :section="section"></payment-form-component>
+                                <payment-form-component :data="item.shipping_transaction" :section="section"></payment-form-component>
                             </modal-component>
                         </div>
                     </div>
diff --git a/resources/assets/vue/components/paymentsBilling/forms/DeleteShippingInvoiceFormComponent.vue b/resources/assets/vue/components/paymentsBilling/forms/DeleteShippingInvoiceFormComponent.vue
index 2e27eb60..75029cc8 100644
--- a/resources/assets/vue/components/paymentsBilling/forms/DeleteShippingInvoiceFormComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/forms/DeleteShippingInvoiceFormComponent.vue
@@ -14,7 +14,7 @@
                             <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
                         </div>
                         <div class="col p-l-5">
-                            <div class="btn btn-danger w-100 btn-sm" @click="submit(route('api.transaction.update', data.shippng_transaction.id, 'reject'), 'put', section, true, true)">Confirm</div>
+                            <div class="btn btn-danger w-100 btn-sm" @click="submit(route('api.transaction.update', data.shipping_transaction.id, 'reject'), 'put', section, true, true)">Confirm</div>
                         </div>
                     </div>
                 </div>
@@ -28,4 +28,4 @@
         mixins: [modalFormHandler]
     }
 
-</script>
\ No newline at end of file
+</script>