@lancom/shared 0.0.222 → 0.0.224
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 +12 -3
- package/assets/js/api/utils/product.js +0 -3
- package/components/order/order_view/order-view.vue +1 -4
- 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
|
@@ -58,6 +58,12 @@ export default {
|
|
|
58
58
|
getCanonicalProductProducts(id) {
|
|
59
59
|
return _get(`admin/canonical-product/${id}/products`);
|
|
60
60
|
},
|
|
61
|
+
getCanonicalProductLocations(id) {
|
|
62
|
+
return _get(`admin/canonical-product/${id}/locations`);
|
|
63
|
+
},
|
|
64
|
+
saveWarehouseCanonicalProduct(warehouseCanonicalProduct) {
|
|
65
|
+
return warehouseCanonicalProduct._id ? _put(`admin/warehouse-canonical-product/${warehouseCanonicalProduct._id}`, warehouseCanonicalProduct) : _post('admin/warehouse-canonical-product', warehouseCanonicalProduct);
|
|
66
|
+
},
|
|
61
67
|
fetchShops(params) {
|
|
62
68
|
return _get('admin/shops', params);
|
|
63
69
|
},
|
|
@@ -477,10 +483,13 @@ export default {
|
|
|
477
483
|
return _post(`admin/warehouse-locations/move/bulk`, move);
|
|
478
484
|
},
|
|
479
485
|
fetchWarehouseCanonicalProductsLocations(warehouse) {
|
|
480
|
-
return _get(`admin/warehouses/${warehouse}/
|
|
486
|
+
return _get(`admin/warehouses/${warehouse}/locations`);
|
|
487
|
+
},
|
|
488
|
+
removeCanonicalProductLocation(location) {
|
|
489
|
+
return _delete(`admin/locations/${location}`);
|
|
481
490
|
},
|
|
482
|
-
|
|
483
|
-
return
|
|
491
|
+
updateCanonicalProductLocation(location) {
|
|
492
|
+
return _put(`admin/locations/${location._id}`, location);
|
|
484
493
|
},
|
|
485
494
|
async fetchBanners(params) {
|
|
486
495
|
return sortByName(await _get('admin/banners', params));
|
|
@@ -116,10 +116,7 @@
|
|
|
116
116
|
</td>
|
|
117
117
|
<td class="w-33">
|
|
118
118
|
<div
|
|
119
|
-
class="OrderView__totals OrderView__totals--small"
|
|
120
|
-
:class="{
|
|
121
|
-
'OrderView__totals--paid': isPaid
|
|
122
|
-
}">
|
|
119
|
+
class="OrderView__totals OrderView__totals--small">
|
|
123
120
|
<div class="lc_regular16">
|
|
124
121
|
Products Total: <b>{{ model.productsTotal | price(order.currency) }}</b>
|
|
125
122
|
</div>
|
|
@@ -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>
|