@lancom/shared 0.0.221 → 0.0.223
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/js/api/admin.js +6 -3
- package/components/order/order_view/order-view.scss +4 -0
- package/components/order/order_view/order-view.vue +34 -3
- package/components/quotes/quote_view/quote_view_product/quote-view-product.scss +10 -0
- package/components/quotes/quote_view/quote_view_product/quote-view-product.vue +27 -5
- package/package.json +1 -1
package/assets/js/api/admin.js
CHANGED
|
@@ -477,10 +477,13 @@ export default {
|
|
|
477
477
|
return _post(`admin/warehouse-locations/move/bulk`, move);
|
|
478
478
|
},
|
|
479
479
|
fetchWarehouseCanonicalProductsLocations(warehouse) {
|
|
480
|
-
return _get(`admin/warehouses/${warehouse}/
|
|
480
|
+
return _get(`admin/warehouses/${warehouse}/locations`);
|
|
481
481
|
},
|
|
482
|
-
removeCanonicalProductLocation(
|
|
483
|
-
return _delete(`admin/
|
|
482
|
+
removeCanonicalProductLocation(location) {
|
|
483
|
+
return _delete(`admin/locations/${location}`);
|
|
484
|
+
},
|
|
485
|
+
updateCanonicalProductLocation(location) {
|
|
486
|
+
return _put(`admin/locations/${location._id}`, location);
|
|
484
487
|
},
|
|
485
488
|
async fetchBanners(params) {
|
|
486
489
|
return sortByName(await _get('admin/banners', params));
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
</div>
|
|
54
54
|
<table class="OrderView__table mt-4 lc_table bordered">
|
|
55
55
|
<tr>
|
|
56
|
-
<td>
|
|
56
|
+
<td class="w-33">
|
|
57
57
|
<div class="lc_regular16">
|
|
58
58
|
<b>Order</b>
|
|
59
59
|
</div>
|
|
@@ -82,7 +82,7 @@
|
|
|
82
82
|
</td>
|
|
83
83
|
<td
|
|
84
84
|
v-if="model.paid"
|
|
85
|
-
class="w-
|
|
85
|
+
class="w-33">
|
|
86
86
|
<div class="lc_regular16">
|
|
87
87
|
<b>PAID VIA CREDIT CARD</b>
|
|
88
88
|
</div>
|
|
@@ -97,7 +97,7 @@
|
|
|
97
97
|
</td>
|
|
98
98
|
<td
|
|
99
99
|
v-else
|
|
100
|
-
class="w-
|
|
100
|
+
class="w-33">
|
|
101
101
|
<div class="lc_regular16">
|
|
102
102
|
<b>DIRECT DEPOSIT DETAILS</b>
|
|
103
103
|
</div>
|
|
@@ -114,6 +114,37 @@
|
|
|
114
114
|
Account: {{ depositInfo.account }}
|
|
115
115
|
</div>
|
|
116
116
|
</td>
|
|
117
|
+
<td class="w-33">
|
|
118
|
+
<div
|
|
119
|
+
class="OrderView__totals OrderView__totals--small">
|
|
120
|
+
<div class="lc_regular16">
|
|
121
|
+
Products Total: <b>{{ model.productsTotal | price(order.currency) }}</b>
|
|
122
|
+
</div>
|
|
123
|
+
<div class="lc_regular16">
|
|
124
|
+
Prints Total: <b>{{ model.printsTotal | price(order.currency) }}</b>
|
|
125
|
+
</div>
|
|
126
|
+
<div class="lc_regular16">
|
|
127
|
+
Shipping Total: <b>{{ model.shippingTotal | price(order.currency) }}</b>
|
|
128
|
+
</div>
|
|
129
|
+
<div class="lc_regular16">
|
|
130
|
+
Total ex GST: <b>{{ (model.total + couponTotal) | price(order.currency) }}</b>
|
|
131
|
+
</div>
|
|
132
|
+
<div class="lc_regular16">
|
|
133
|
+
GST: <b>{{ model.totalGST - model.total | price(order.currency) }}</b>
|
|
134
|
+
</div>
|
|
135
|
+
<div
|
|
136
|
+
v-if="!invoice && order.couponCode"
|
|
137
|
+
class="lc_regular16">
|
|
138
|
+
Coupon: <b>{{ couponTotal | price(order.currency) }}</b>
|
|
139
|
+
</div>
|
|
140
|
+
<div class="lc_regular16">
|
|
141
|
+
Total inc GST: <b>{{ model.totalGST | price(order.currency) }}</b>
|
|
142
|
+
</div>
|
|
143
|
+
<div class="lc_regular16">
|
|
144
|
+
{{ isPaid ? 'Paid' : 'Pending Payment' }}: <b>{{ model.totalGST | price(order.currency) }}</b>
|
|
145
|
+
</div>
|
|
146
|
+
</div>
|
|
147
|
+
</td>
|
|
117
148
|
</tr>
|
|
118
149
|
</table>
|
|
119
150
|
<div class="mt-3">
|
|
@@ -19,6 +19,10 @@
|
|
|
19
19
|
&>div:first-child {
|
|
20
20
|
margin-right: 6px;
|
|
21
21
|
}
|
|
22
|
+
&--custom {
|
|
23
|
+
width: 100%;
|
|
24
|
+
justify-content: space-between;
|
|
25
|
+
}
|
|
22
26
|
}
|
|
23
27
|
&__decorations {
|
|
24
28
|
margin-bottom: 20px;
|
|
@@ -26,4 +30,10 @@
|
|
|
26
30
|
&__subtotal {
|
|
27
31
|
text-align: right;
|
|
28
32
|
}
|
|
33
|
+
&__totals {
|
|
34
|
+
display: flex;
|
|
35
|
+
&--right {
|
|
36
|
+
justify-content: end;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
29
39
|
}
|
|
@@ -25,12 +25,34 @@
|
|
|
25
25
|
</div>
|
|
26
26
|
</div>
|
|
27
27
|
<div v-if="product.isCustom">
|
|
28
|
-
<div class="QuoteViewProduct__feature">
|
|
29
|
-
<div class="
|
|
30
|
-
|
|
28
|
+
<div class="QuoteViewProduct__feature QuoteViewProduct__feature--custom">
|
|
29
|
+
<div class="QuoteViewProduct__totals">
|
|
30
|
+
<div class="lc_title-small">
|
|
31
|
+
QTY:
|
|
32
|
+
</div>
|
|
33
|
+
<div class="lc_body-small ml-3">
|
|
34
|
+
{{ amount }}
|
|
35
|
+
</div>
|
|
31
36
|
</div>
|
|
32
|
-
<div
|
|
33
|
-
|
|
37
|
+
<div>
|
|
38
|
+
<div
|
|
39
|
+
v-if="simpleProducts[0]"
|
|
40
|
+
class="QuoteViewProduct__totals QuoteViewProduct__totals--right mb-6">
|
|
41
|
+
<div class="lc_title-small">
|
|
42
|
+
Unit Cost:
|
|
43
|
+
</div>
|
|
44
|
+
<div class="lc_body-small ml-3">
|
|
45
|
+
{{ simpleProducts[0].productCost | price(currency) }}
|
|
46
|
+
</div>
|
|
47
|
+
</div>
|
|
48
|
+
<div class="QuoteViewProduct__totals QuoteViewProduct__totals--right mb-6">
|
|
49
|
+
<div class="lc_title-small">
|
|
50
|
+
Total Qty:
|
|
51
|
+
</div>
|
|
52
|
+
<div class="lc_body-small ml-3">
|
|
53
|
+
{{ amount }}
|
|
54
|
+
</div>
|
|
55
|
+
</div>
|
|
34
56
|
</div>
|
|
35
57
|
</div>
|
|
36
58
|
</div>
|