mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git
synced 2026-08-19 04:24:12 +00:00
Looked into a 504 error order show page
This commit is contained in:
+2
-2
@@ -3,10 +3,10 @@
|
||||
<loading-component style="height: 200px; top: 0;" v-if="isLoading"></loading-component>
|
||||
<div class="row flex-wrap" v-if="!isLoading && transaction">
|
||||
<div class="col" v-if="getMergedInvoices(transaction).length > 1">
|
||||
<customer-payments-billing-with-storage-component :data="getMergedInvoices(transaction)" :storage="getStorageInfo(transaction)" invoice_status="Pending Payment" :section="section"></customer-payments-billing-with-storage-component>
|
||||
<customer-payments-billing-with-storage-component :data="getMergedInvoices(transaction)" :storage="getStorageInfo(transaction)" invoice_status="Pending Payment" :is-einvoice-applicable="data.is_einvoice_applicable" :section="section"></customer-payments-billing-with-storage-component>
|
||||
</div>
|
||||
<div class="col" v-else>
|
||||
<customer-payments-billing-component :data="transaction" invoice_status="Pending Payment" :section="section"></customer-payments-billing-component>
|
||||
<customer-payments-billing-component :data="transaction" invoice_status="Pending Payment" :is-einvoice-applicable="data.is_einvoice_applicable" :section="section"></customer-payments-billing-component>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
+4
-1
@@ -351,6 +351,10 @@
|
||||
type: String,
|
||||
required: true
|
||||
},
|
||||
isEinvoiceApplicable:{
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data(){
|
||||
return {
|
||||
@@ -361,7 +365,6 @@
|
||||
expanded: true,
|
||||
showPaymentProceedModal: false,
|
||||
showPaymentOutdatedModal: false,
|
||||
isEinvoiceApplicable: this.data.is_einvoice_applicable,
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
|
||||
+5
-4
@@ -432,13 +432,15 @@
|
||||
storage:{
|
||||
type: Object
|
||||
},
|
||||
isEinvoiceApplicable:{
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data(){
|
||||
const data = this.data;
|
||||
const match = data.find(item => item.bill_no.startsWith('SHIP'));
|
||||
|
||||
return {
|
||||
items: data,
|
||||
items: this.data,
|
||||
parameters: {
|
||||
packing_list_id: null,
|
||||
transaction_details: [],
|
||||
@@ -447,7 +449,6 @@
|
||||
showPaymentProceedModal: false,
|
||||
showPaymentOutdatedModal: false,
|
||||
selectedShippingInvoicesOnlyIds: [],
|
||||
isEinvoiceApplicable: match ? match.is_einvoice_applicable : false,
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
|
||||
Reference in New Issue
Block a user