@lancom/shared 0.0.115 → 0.0.118
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 +15 -0
- package/components/checkout/order/order-checkout-method/order-checkout-method.scss +1 -0
- package/components/checkout/order/order-checkout-method/order-checkout-method.vue +7 -4
- package/components/common/progress_steps/progress_steps_controls/progress-steps-controls.vue +5 -1
- package/package.json +1 -1
package/assets/js/api/admin.js
CHANGED
|
@@ -46,6 +46,9 @@ export default {
|
|
|
46
46
|
markShipmentAsDispatched(order, shipment) {
|
|
47
47
|
return _post(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}/dispatched`, shipment);
|
|
48
48
|
},
|
|
49
|
+
markSubOrderAsDispatched(order, subOrder) {
|
|
50
|
+
return _post(`admin/shop/${order.shop}/order/${order._id}/sub-order/${subOrder._id}/dispatched`, subOrder);
|
|
51
|
+
},
|
|
49
52
|
removeShipmentFromStarshipit(order, shipment) {
|
|
50
53
|
return _delete(`admin/shop/${order.shop}/order/${order._id}/shipment/${shipment._id || shipment.guid}`);
|
|
51
54
|
},
|
|
@@ -94,6 +97,18 @@ export default {
|
|
|
94
97
|
removePackage(id) {
|
|
95
98
|
return _delete(`admin/packages/${id}`);
|
|
96
99
|
},
|
|
100
|
+
fetchTaskTypes() {
|
|
101
|
+
return _get('admin/task-types');
|
|
102
|
+
},
|
|
103
|
+
fetchTaskTypeById(id) {
|
|
104
|
+
return _get(`admin/task-types/${id}`);
|
|
105
|
+
},
|
|
106
|
+
saveTaskType(item) {
|
|
107
|
+
return item._id ? _put(`admin/task-types/${item._id}`, item) : _post('admin/task-types', item);
|
|
108
|
+
},
|
|
109
|
+
removeTaskType(id) {
|
|
110
|
+
return _delete(`admin/task-types/${id}`);
|
|
111
|
+
},
|
|
97
112
|
fetchFAQ() {
|
|
98
113
|
return _get('admin/faq');
|
|
99
114
|
},
|
|
@@ -17,6 +17,13 @@
|
|
|
17
17
|
:btn-block="true"
|
|
18
18
|
@onclick="isRegister = true" />
|
|
19
19
|
</div>
|
|
20
|
+
<div style="margin-top: -10px">
|
|
21
|
+
<progress-steps-controls
|
|
22
|
+
next-btn-class="white"
|
|
23
|
+
:show-prev="false"
|
|
24
|
+
label-next="Checkout as Guest"
|
|
25
|
+
@next="$emit('next')" />
|
|
26
|
+
</div>
|
|
20
27
|
</div>
|
|
21
28
|
</div>
|
|
22
29
|
</div>
|
|
@@ -31,10 +38,6 @@
|
|
|
31
38
|
@signin="signin()" />
|
|
32
39
|
</div>
|
|
33
40
|
</div>
|
|
34
|
-
<progress-steps-controls
|
|
35
|
-
:show-prev="false"
|
|
36
|
-
label-next="Checkout as Guest"
|
|
37
|
-
@next="$emit('next')" />
|
|
38
41
|
</div>
|
|
39
42
|
</template>
|
|
40
43
|
|
package/components/common/progress_steps/progress_steps_controls/progress-steps-controls.vue
CHANGED
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
v-if="showNext"
|
|
13
13
|
:btn-disabled="disabledNext"
|
|
14
14
|
:btn-processing="processingNext"
|
|
15
|
-
btn-class="
|
|
15
|
+
:btn-class="nextBtnClass"
|
|
16
16
|
:btn-label="labelNext"
|
|
17
17
|
@onclick="$emit('next')">
|
|
18
18
|
<i
|
|
@@ -57,6 +57,10 @@ export default {
|
|
|
57
57
|
labelNext: {
|
|
58
58
|
type: String,
|
|
59
59
|
default: 'NEXT'
|
|
60
|
+
},
|
|
61
|
+
nextBtnClass: {
|
|
62
|
+
type: String,
|
|
63
|
+
default: 'green'
|
|
60
64
|
}
|
|
61
65
|
}
|
|
62
66
|
};
|