feat: show shipping cost for order
This commit is contained in:
parent
6b44f8c27f
commit
d1cdc3cd5c
3 changed files with 15 additions and 6 deletions
|
|
@ -69,14 +69,14 @@
|
||||||
</q-tr>
|
</q-tr>
|
||||||
<q-tr v-if="props.row.expanded" :props="props">
|
<q-tr v-if="props.row.expanded" :props="props">
|
||||||
<q-td colspan="100%">
|
<q-td colspan="100%">
|
||||||
<div class="row items-center no-wrap q-mb-md">
|
<div class="row items-center no-wrap">
|
||||||
<div class="col-3 q-pr-lg">Products:</div>
|
<div class="col-3 q-pr-lg">Products:</div>
|
||||||
<div class="col-8">
|
<div class="col-8">
|
||||||
<div class="row items-center no-wrap q-mb-md">
|
<div class="row items-center no-wrap q-mb-md">
|
||||||
<div class="col-1">Quantity</div>
|
<div class="col-1"><strong>Quantity</strong></div>
|
||||||
<div class="col-1"></div>
|
<div class="col-1"></div>
|
||||||
<div class="col-4">Name</div>
|
<div class="col-4"><strong>Name</strong></div>
|
||||||
<div class="col-2">Price</div>
|
<div class="col-2"><strong>Price</strong></div>
|
||||||
<div class="col-4"></div>
|
<div class="col-4"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -96,6 +96,15 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-4"></div>
|
<div class="col-4"></div>
|
||||||
</div>
|
</div>
|
||||||
|
<div v-if="props.row.extra.shipping_cost" class="row items-center no-wrap q-mb-md">
|
||||||
|
<div class="col-1"></div>
|
||||||
|
<div class="col-1"></div>
|
||||||
|
<div class="col-4">Shipping Cost</div>
|
||||||
|
<div class="col-2">
|
||||||
|
{{props.row.extra.shipping_cost}} {{props.row.extra.currency}}
|
||||||
|
</div>
|
||||||
|
<div class="col-4"></div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-1"></div>
|
<div class="col-1"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -145,10 +145,11 @@ async function orderList(path) {
|
||||||
return ''
|
return ''
|
||||||
},
|
},
|
||||||
orderTotal: function (order) {
|
orderTotal: function (order) {
|
||||||
return order.items.reduce((t, item) => {
|
const productCost = order.items.reduce((t, item) => {
|
||||||
product = order.extra.products.find(p => p.id === item.product_id)
|
product = order.extra.products.find(p => p.id === item.product_id)
|
||||||
return t + item.quantity * product.price
|
return t + item.quantity * product.price
|
||||||
}, 0)
|
}, 0)
|
||||||
|
return productCost + order.extra.shipping_cost
|
||||||
},
|
},
|
||||||
getOrders: async function () {
|
getOrders: async function () {
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -182,7 +182,6 @@ const merchant = async () => {
|
||||||
}
|
}
|
||||||
if (data.type === 'dm:2') {
|
if (data.type === 'dm:2') {
|
||||||
const orderStatus = JSON.parse(data.dm.message)
|
const orderStatus = JSON.parse(data.dm.message)
|
||||||
console.log('### orderStatus', orderStatus)
|
|
||||||
this.$q.notify({
|
this.$q.notify({
|
||||||
timeout: 5000,
|
timeout: 5000,
|
||||||
type: 'positive',
|
type: 'positive',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue