@lancom/shared 0.0.450 → 0.0.451
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/components/editor/editor_workspace/editor_workspace_side/editor-workspace-side.vue +6 -3
- package/components/order/order_view/order-view.mixin.js +4 -1
- package/components/order/order_view/order-view.vue +1 -1
- package/components/product/editor_pricing/editor-pricing.vue +0 -1
- package/mixins/layouts/products.js +7 -2
- package/package.json +1 -1
|
@@ -326,7 +326,7 @@ export default {
|
|
|
326
326
|
const layer = this.printAreaLayers.find(l => l.editableDetails);
|
|
327
327
|
if (layer?.editableDetails) {
|
|
328
328
|
this.setSelectedLayer(layer);
|
|
329
|
-
this.setEditModeSelectedLayer(true);
|
|
329
|
+
this.$nextTick(() => this.setEditModeSelectedLayer(true));
|
|
330
330
|
}
|
|
331
331
|
},
|
|
332
332
|
checkVisibleWireframe() {
|
|
@@ -380,7 +380,10 @@ export default {
|
|
|
380
380
|
this.setSelectedLayerField(data);
|
|
381
381
|
this.saveLayersAsImageWithDebounce();
|
|
382
382
|
});
|
|
383
|
-
this.fabricHelper.on('selectLayer',
|
|
383
|
+
this.fabricHelper.on('selectLayer', (layer) => {
|
|
384
|
+
this.setSelectedLayer(layer);
|
|
385
|
+
this.$nextTick(() => this.setEditModeSelectedLayer(true));
|
|
386
|
+
});
|
|
384
387
|
this.fabricHelper.on('removeLayer', (layer) => {
|
|
385
388
|
setTimeout(() => {
|
|
386
389
|
if (!this.editModeSelectedLayer) {
|
|
@@ -464,7 +467,7 @@ export default {
|
|
|
464
467
|
if (!this.isEditMode) {
|
|
465
468
|
setTimeout(() => {
|
|
466
469
|
this.setSelectedLayer(layer);
|
|
467
|
-
this.setEditModeSelectedLayer(true);
|
|
470
|
+
this.$nextTick(() => this.setEditModeSelectedLayer(true));
|
|
468
471
|
this.toogleBoundBox(true);
|
|
469
472
|
});
|
|
470
473
|
}
|
|
@@ -100,13 +100,16 @@ export default {
|
|
|
100
100
|
taxName() {
|
|
101
101
|
return this.settings?.pricing?.taxName || 'GST';
|
|
102
102
|
},
|
|
103
|
+
isPayedViaLink() {
|
|
104
|
+
return this.model.charge?.payment_method_details?.type === 'link';
|
|
105
|
+
},
|
|
103
106
|
paymentCard() {
|
|
104
107
|
if (this.model.charge?.card) {
|
|
105
108
|
return {
|
|
106
109
|
number: this.model.charge.card.display_number,
|
|
107
110
|
scheme: this.model.charge.card.scheme
|
|
108
111
|
};
|
|
109
|
-
} else if (this.model.charge) {
|
|
112
|
+
} else if (this.model.charge && !this.isPayedViaLink) {
|
|
110
113
|
return {
|
|
111
114
|
number: `XXXX-XXXX-XXXX-${this.model.charge.payment_method_details?.card?.last4 || 'XXXX'}`,
|
|
112
115
|
scheme: this.model.charge.payment_method_details?.card?.brand
|
|
@@ -125,7 +125,7 @@
|
|
|
125
125
|
v-if="model.paid"
|
|
126
126
|
class="w-33">
|
|
127
127
|
<div class="lc_regular16">
|
|
128
|
-
<b>PAID VIA CREDIT CARD</b>
|
|
128
|
+
<b>{{ isPayedViaLink ? 'PAID VIA Stripe(Link)' : 'PAID VIA CREDIT CARD' }}</b>
|
|
129
129
|
</div>
|
|
130
130
|
<div v-if="paymentCard">
|
|
131
131
|
<div class="lc_regular16">
|
|
@@ -192,7 +192,6 @@ export default {
|
|
|
192
192
|
return this.availableColors?.filter(color => this.product.colorsPricing?.some(c => c.colors?.includes(color._id) && c.clearance)) || [];
|
|
193
193
|
},
|
|
194
194
|
clearanceColorsWithQty() {
|
|
195
|
-
console.log('clearanceColors: ', this.clearanceColors);
|
|
196
195
|
return this.clearanceColors.map(color => {
|
|
197
196
|
const qty = this.usedSimpleProducts.reduce((sum, sp) => sp.color._id === color._id ? sum + (sp.amount || 0) : sum, 0);
|
|
198
197
|
return qty > 0 ? { ...color, qty } : null;
|
|
@@ -60,7 +60,6 @@ export default {
|
|
|
60
60
|
if (this.currentCategory) {
|
|
61
61
|
const categoriesBreadcrumbs = [];
|
|
62
62
|
let category = this.currentCategory;
|
|
63
|
-
console.log('category: ', category);
|
|
64
63
|
while (category) {
|
|
65
64
|
categoriesBreadcrumbs.unshift({
|
|
66
65
|
to: generateProductsLink(this.$route, {
|
|
@@ -120,7 +119,13 @@ export default {
|
|
|
120
119
|
|
|
121
120
|
const items = ['Products'];
|
|
122
121
|
if (this.currentCategory) {
|
|
123
|
-
|
|
122
|
+
const categoryNames = [];
|
|
123
|
+
let category = this.currentCategory;
|
|
124
|
+
while (category) {
|
|
125
|
+
categoryNames.unshift(category.name);
|
|
126
|
+
category = category.parent;
|
|
127
|
+
}
|
|
128
|
+
items.push(...categoryNames);
|
|
124
129
|
}
|
|
125
130
|
if (this.currentProductType) {
|
|
126
131
|
items.push(this.currentProductType.name);
|