@lancom/shared 0.0.288 → 0.0.290
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/constants/fonts.js +105 -105
- package/assets/js/utils/fabric-helper.js +9 -8
- package/assets/js/utils/fonts-helper.js +3 -1
- package/assets/js/utils/shop.js +4 -0
- package/components/checkout/order/order-payment-information/order-payment-information.vue +3 -2
- package/components/editor/editor_layers/editor_layer_forms/editor_layer_form_text/editor-layer-form-text.vue +110 -111
- package/components/editor/editor_workspace/editor-workspace.vue +2 -1
- package/components/editor/editor_workspace/editor_workspace_side/editor-workspace-side.vue +1 -1
- package/components/quotes/quote_view/quote-view.mixin.js +1 -0
- package/components/quotes/quote_view/quote-view.vue +1 -1
- package/nuxt.config.js +1 -0
- package/package.json +1 -1
- package/store/cart.js +2 -2
|
@@ -1,137 +1,137 @@
|
|
|
1
1
|
export const FONTS = {
|
|
2
|
-
acme: '/
|
|
3
|
-
allan: '/
|
|
4
|
-
'allan-bold': '/
|
|
5
|
-
amaranth: '/
|
|
6
|
-
anton: '/
|
|
7
|
-
'archivo-black': '/
|
|
8
|
-
'asap-medium': '/
|
|
9
|
-
'assistant-semibold': '/
|
|
10
|
-
'baloo-bhaina': '/
|
|
11
|
-
bangers: '/
|
|
12
|
-
baumans: '/
|
|
13
|
-
'berkshire-swash': '/
|
|
14
|
-
bevan: '/
|
|
15
|
-
'black-ops-one': '/
|
|
16
|
-
bonbon: '/
|
|
17
|
-
boongaloo: '/
|
|
18
|
-
'bree-serif': '/
|
|
19
|
-
'bubblegum-sans': '/
|
|
20
|
-
'carter-one': '/
|
|
21
|
-
'caveat-b': '/
|
|
22
|
-
'caveat-brush': '/
|
|
23
|
-
'chela-one': '/
|
|
24
|
-
'cherry-swash-bold': '/
|
|
25
|
-
chewy: '/
|
|
26
|
-
coiny: '/
|
|
27
|
-
'concert-one': '/
|
|
28
|
-
cookie: '/
|
|
29
|
-
creepster: '/
|
|
30
|
-
cutive: '/
|
|
31
|
-
'dancing-script_bold': '/
|
|
32
|
-
'dr-sugiyama': '/
|
|
33
|
-
'eagle-lake': '/
|
|
34
|
-
fascinate: '/
|
|
35
|
-
'fredoka-one': '/
|
|
36
|
-
'fugaz-one': '/
|
|
37
|
-
'germania-one': '/
|
|
38
|
-
graduate: '/
|
|
39
|
-
'grand-hotel': '/
|
|
40
|
-
'hanalei-fill': '/
|
|
41
|
-
'josefin-sans': '/
|
|
42
|
-
'just-me-again': '/
|
|
43
|
-
'kaushan-script': '/
|
|
44
|
-
knewave: '/
|
|
45
|
-
'leckerli-one': '/
|
|
46
|
-
lemonada: '/
|
|
47
|
-
'lemonada-bold': '/
|
|
48
|
-
'lexend-deca': '/
|
|
49
|
-
'londrina-solid': '/
|
|
50
|
-
'love-ya': '/
|
|
51
|
-
'luckiest-guy': '/
|
|
52
|
-
mclaren: '/
|
|
53
|
-
molle: '/
|
|
54
|
-
'montserrat-b': '/
|
|
55
|
-
'montserrat-m': '/
|
|
56
|
-
'mountains-of-christmas-bold': '/
|
|
57
|
-
notable: '/
|
|
58
|
-
'noto-sans-jp': '/
|
|
59
|
-
'noto-sans-jp-black': '/
|
|
60
|
-
'oleo-script': '/
|
|
61
|
-
'open-sans-b': '/
|
|
62
|
-
'open-sans-eb': '/
|
|
63
|
-
'orbitron-medium': '/
|
|
64
|
-
'oswald-b': '/
|
|
65
|
-
'oswald-m': '/
|
|
66
|
-
pacifico: '/
|
|
67
|
-
'passion-one': '/
|
|
68
|
-
'passion-one-bold': '/
|
|
69
|
-
pattaya: '/
|
|
70
|
-
'patua-one': '/
|
|
71
|
-
'permanent-marker': '/
|
|
72
|
-
'playfair-display-bold': '/
|
|
73
|
-
'poppins-medium': '/
|
|
74
|
-
'press-start-2p': '/
|
|
75
|
-
'princess-sofia': '/
|
|
76
|
-
'pt-sans-bold': '/
|
|
77
|
-
quantico: '/
|
|
78
|
-
'quicksand-bold': '/
|
|
79
|
-
rakkas: '/
|
|
80
|
-
'rammetto-one': '/
|
|
81
|
-
shojumaru: '/
|
|
82
|
-
shrikhand: '/
|
|
83
|
-
'spicy-rice': '/
|
|
84
|
-
'squada-one': '/
|
|
85
|
-
swanky: '/
|
|
86
|
-
'vampiro-one': '/
|
|
87
|
-
'vollkorn-b': '/
|
|
88
|
-
'vollkorn-sb': '/
|
|
89
|
-
'wendy-one': '/
|
|
90
|
-
'yeseva-one': '/
|
|
2
|
+
acme: '/mr-fonts/Acme_Regular.ttf',
|
|
3
|
+
allan: '/mr-fonts/Allan-Regular.ttf',
|
|
4
|
+
'allan-bold': '/mr-fonts/Allan-Bold.ttf',
|
|
5
|
+
amaranth: '/mr-fonts/Amaranth_Regular.ttf',
|
|
6
|
+
anton: '/mr-fonts/Anton_Regular.ttf',
|
|
7
|
+
'archivo-black': '/mr-fonts/ArchivoBlack-Regular.ttf',
|
|
8
|
+
'asap-medium': '/mr-fonts/Asap_Medium.ttf',
|
|
9
|
+
'assistant-semibold': '/mr-fonts/Assistant_SemiBold.ttf',
|
|
10
|
+
'baloo-bhaina': '/mr-fonts/BalooBhaina-Regular.ttf',
|
|
11
|
+
bangers: '/mr-fonts/Bangers_Regular.ttf',
|
|
12
|
+
baumans: '/mr-fonts/Baumans-Regular.ttf',
|
|
13
|
+
'berkshire-swash': '/mr-fonts/BerkshireSwash_Regular.ttf',
|
|
14
|
+
bevan: '/mr-fonts/Bevan_Regular.ttf',
|
|
15
|
+
'black-ops-one': '/mr-fonts/BlackOpsOne_Regular.ttf',
|
|
16
|
+
bonbon: '/mr-fonts/Bonbon_Regular.ttf',
|
|
17
|
+
boongaloo: '/mr-fonts/Boogaloo_Regular.ttf',
|
|
18
|
+
'bree-serif': '/mr-fonts/BreeSerif_Regular.ttf',
|
|
19
|
+
'bubblegum-sans': '/mr-fonts/BubblegumSans-Regular.ttf',
|
|
20
|
+
'carter-one': '/mr-fonts/CarterOne-Regular.ttf',
|
|
21
|
+
'caveat-b': '/mr-fonts/Caveat_Bold.ttf',
|
|
22
|
+
'caveat-brush': '/mr-fonts/CaveatBrush_Regular.ttf',
|
|
23
|
+
'chela-one': '/mr-fonts/ChelaOne_Regular.ttf',
|
|
24
|
+
'cherry-swash-bold': '/mr-fonts/CherrySwash_Bold.ttf',
|
|
25
|
+
chewy: '/mr-fonts/Chewy_Regular.ttf',
|
|
26
|
+
coiny: '/mr-fonts/Coiny_Regular.ttf',
|
|
27
|
+
'concert-one': '/mr-fonts/ConcertOne_Regular.ttf',
|
|
28
|
+
cookie: '/mr-fonts/Cookie_Regular.ttf',
|
|
29
|
+
creepster: '/mr-fonts/Creepster_Regular.ttf',
|
|
30
|
+
cutive: '/mr-fonts/Cutive_Regular.ttf',
|
|
31
|
+
'dancing-script_bold': '/mr-fonts/DancingScript_Bold.ttf',
|
|
32
|
+
'dr-sugiyama': '/mr-fonts/DrSugiyama_Regular.ttf',
|
|
33
|
+
'eagle-lake': '/mr-fonts/EagleLake_Regular.ttf',
|
|
34
|
+
fascinate: '/mr-fonts/Fascinate_Regular.ttf',
|
|
35
|
+
'fredoka-one': '/mr-fonts/FredokaOne_Regular.ttf',
|
|
36
|
+
'fugaz-one': '/mr-fonts/FugazOne-Regular.ttf',
|
|
37
|
+
'germania-one': '/mr-fonts/GermaniaOne_Regular.ttf',
|
|
38
|
+
graduate: '/mr-fonts/Graduate_Regular.ttf',
|
|
39
|
+
'grand-hotel': '/mr-fonts/GrandHotel_Regular.ttf',
|
|
40
|
+
'hanalei-fill': '/mr-fonts/HanaleiFill_Regular.ttf',
|
|
41
|
+
'josefin-sans': '/mr-fonts/JosefinSans-Regular.ttf',
|
|
42
|
+
'just-me-again': '/mr-fonts/JustMeAgainDownHere_Regular.ttf',
|
|
43
|
+
'kaushan-script': '/mr-fonts/KaushanScript_Regular.ttf',
|
|
44
|
+
knewave: '/mr-fonts/Knewave_Regular.ttf',
|
|
45
|
+
'leckerli-one': '/mr-fonts/LeckerliOne_Regular.ttf',
|
|
46
|
+
lemonada: '/mr-fonts/Lemonada_Regular.ttf',
|
|
47
|
+
'lemonada-bold': '/mr-fonts/Lemonada_Bold.ttf',
|
|
48
|
+
'lexend-deca': '/mr-fonts/LexendDeca-Regular.ttf',
|
|
49
|
+
'londrina-solid': '/mr-fonts/LondrinaSolid_Regular.ttf',
|
|
50
|
+
'love-ya': '/mr-fonts/LoveYaLikeASister_Regular.ttf',
|
|
51
|
+
'luckiest-guy': '/mr-fonts/LuckiestGuy_Regular.ttf',
|
|
52
|
+
mclaren: '/mr-fonts/McLaren-Regular.ttf',
|
|
53
|
+
molle: '/mr-fonts/Molle_RegularItalic.ttf',
|
|
54
|
+
'montserrat-b': '/mr-fonts/Montserrat_Bold.ttf',
|
|
55
|
+
'montserrat-m': '/mr-fonts/Montserrat_Medium.ttf',
|
|
56
|
+
'mountains-of-christmas-bold': '/mr-fonts/MountainsofChristmas_Bold.ttf',
|
|
57
|
+
notable: '/mr-fonts/Notable-Regular.ttf',
|
|
58
|
+
'noto-sans-jp': '/mr-fonts/NotoSansJP-Regular.otf',
|
|
59
|
+
'noto-sans-jp-black': '/mr-fonts/NotoSansJP-Black.otf',
|
|
60
|
+
'oleo-script': '/mr-fonts/OleoScript-Regular.ttf',
|
|
61
|
+
'open-sans-b': '/mr-fonts/OpenSans_Bold.ttf',
|
|
62
|
+
'open-sans-eb': '/mr-fonts/OpenSans_ExtraBold.ttf',
|
|
63
|
+
'orbitron-medium': '/mr-fonts/Orbitron_Medium.ttf',
|
|
64
|
+
'oswald-b': '/mr-fonts/Oswald_Bold.ttf',
|
|
65
|
+
'oswald-m': '/mr-fonts/Oswald_Medium.ttf',
|
|
66
|
+
pacifico: '/mr-fonts/Pacifico_Regular.ttf',
|
|
67
|
+
'passion-one': '/mr-fonts/PassionOne-Regular.ttf',
|
|
68
|
+
'passion-one-bold': '/mr-fonts/PassionOne-Bold.ttf',
|
|
69
|
+
pattaya: '/mr-fonts/Pattaya_Regular.ttf',
|
|
70
|
+
'patua-one': '/mr-fonts/PatuaOne_Regular.ttf',
|
|
71
|
+
'permanent-marker': '/mr-fonts/PermanentMarker_Regular.ttf',
|
|
72
|
+
'playfair-display-bold': '/mr-fonts/PlayfairDisplay_Bold.ttf',
|
|
73
|
+
'poppins-medium': '/mr-fonts/Poppins_Medium.ttf',
|
|
74
|
+
'press-start-2p': '/mr-fonts/PressStart2P_Regular.ttf',
|
|
75
|
+
'princess-sofia': '/mr-fonts/PrincessSofia_Regular.ttf',
|
|
76
|
+
'pt-sans-bold': '/mr-fonts/PTSans_Bold.ttf',
|
|
77
|
+
quantico: '/mr-fonts/Quantico_Regular.ttf',
|
|
78
|
+
'quicksand-bold': '/mr-fonts/Quicksand_Bold.ttf',
|
|
79
|
+
rakkas: '/mr-fonts/Rakkas-Regular.ttf',
|
|
80
|
+
'rammetto-one': '/mr-fonts/RammettoOne_Regular.ttf',
|
|
81
|
+
shojumaru: '/mr-fonts/Shojumaru_Regular.ttf',
|
|
82
|
+
shrikhand: '/mr-fonts/Shrikhand_Regular.ttf',
|
|
83
|
+
'spicy-rice': '/mr-fonts/SpicyRice_Regular.ttf',
|
|
84
|
+
'squada-one': '/mr-fonts/SquadaOne-Regular.ttf',
|
|
85
|
+
swanky: '/mr-fonts/SwankyandMooMoo_Regular.ttf',
|
|
86
|
+
'vampiro-one': '/mr-fonts/VampiroOne_Regular.ttf',
|
|
87
|
+
'vollkorn-b': '/mr-fonts/Vollkorn_Bold.ttf',
|
|
88
|
+
'vollkorn-sb': '/mr-fonts/Vollkorn_SemiBold.ttf',
|
|
89
|
+
'wendy-one': '/mr-fonts/WendyOne_Regular.ttf',
|
|
90
|
+
'yeseva-one': '/mr-fonts/YesevaOne-Regular.ttf'
|
|
91
91
|
};
|
|
92
92
|
|
|
93
93
|
export const FONTS_HEBREW = {
|
|
94
|
-
secular_one: '/
|
|
95
|
-
frank_ruhl_libre: '/
|
|
96
|
-
rubik: '/
|
|
97
|
-
bellefair: '/
|
|
98
|
-
amatic_sc: '/
|
|
94
|
+
secular_one: '/mr-fonts/hebrew/SecularOne-Regular.ttf',
|
|
95
|
+
frank_ruhl_libre: '/mr-fonts/hebrew/FrankRuhlLibre-Medium.ttf',
|
|
96
|
+
rubik: '/mr-fonts/hebrew/Rubik-Medium.ttf',
|
|
97
|
+
bellefair: '/mr-fonts/hebrew/Bellefair-Regular.ttf',
|
|
98
|
+
amatic_sc: '/mr-fonts/hebrew/AmaticSC-Bold.ttf'
|
|
99
99
|
};
|
|
100
100
|
|
|
101
101
|
export const FONTS_HINDI = {
|
|
102
|
-
hind: '/
|
|
103
|
-
kalam: '/
|
|
102
|
+
hind: '/mr-fonts/hindi/Hind-Regular.ttf',
|
|
103
|
+
kalam: '/mr-fonts/hindi/Kalam-Bold.ttf'
|
|
104
104
|
};
|
|
105
105
|
|
|
106
106
|
export const FONTS_BENGALI = {
|
|
107
|
-
hind_siliguri: '/
|
|
107
|
+
hind_siliguri: '/mr-fonts/bengali/HindSiliguri-Medium.ttf'
|
|
108
108
|
};
|
|
109
109
|
|
|
110
110
|
export const FONTS_GUJARATI = {
|
|
111
|
-
kumar_one: '/
|
|
111
|
+
kumar_one: '/mr-fonts/gujarati/KumarOne-Regular.ttf'
|
|
112
112
|
};
|
|
113
113
|
|
|
114
114
|
export const FONTS_KANNADA = {
|
|
115
|
-
baloo_tamma2: '/
|
|
115
|
+
baloo_tamma2: '/mr-fonts/kannada/BalooTamma2-SemiBold.ttf'
|
|
116
116
|
};
|
|
117
117
|
|
|
118
118
|
export const FONTS_MALYALAM = {
|
|
119
|
-
gayathri: '/
|
|
119
|
+
gayathri: '/mr-fonts/malyalam/Gayathri-Bold.ttf'
|
|
120
120
|
};
|
|
121
121
|
|
|
122
122
|
export const FONTS_MARATHI = {
|
|
123
|
-
lohit_marathi: '/
|
|
123
|
+
lohit_marathi: '/mr-fonts/marathi/Lohit-Marathi.ttf'
|
|
124
124
|
};
|
|
125
125
|
|
|
126
126
|
export const FONTS_TAMIL = {
|
|
127
|
-
pavanam: '/
|
|
127
|
+
pavanam: '/mr-fonts/tamil/Pavanam-Regular.ttf'
|
|
128
128
|
};
|
|
129
129
|
|
|
130
130
|
export const FONTS_TELUGU = {
|
|
131
|
-
suranna: '/
|
|
132
|
-
timmana: '/
|
|
131
|
+
suranna: '/mr-fonts/telugu/Suranna-Regular.ttf',
|
|
132
|
+
timmana: '/mr-fonts/telugu/Timmana-Regular.ttf'
|
|
133
133
|
};
|
|
134
134
|
|
|
135
135
|
export const FONTS_ORIYA = {
|
|
136
|
-
baloo_bhaina2: '/
|
|
136
|
+
baloo_bhaina2: '/mr-fonts/oriya/BalooBhaina2-SemiBold.ttf'
|
|
137
137
|
};
|
|
@@ -340,14 +340,15 @@ export default class FabricHelper {
|
|
|
340
340
|
object.on('changed', () => {
|
|
341
341
|
// this.dispatch('setField', { field: 'copy', value: object.text });
|
|
342
342
|
// this.dispatch('setField', { field: 'boundingRect', value: object.getBoundingRect() });
|
|
343
|
-
if (/\n/g.test(object.text || '')) {
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
} else {
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
}
|
|
343
|
+
// if (/\n/g.test(object.text || '')) {
|
|
344
|
+
// this.discardActiveObjects();
|
|
345
|
+
// object.text = object.text.replace(/\n/g, '');
|
|
346
|
+
// this.dispatch('setField', { field: 'copy', value: object.text });
|
|
347
|
+
// } else {
|
|
348
|
+
// this.dispatch('setDeleteButtonPosition', object.oCoords.tr);
|
|
349
|
+
// // this.checkBoundingIntersection(object);
|
|
350
|
+
// }
|
|
351
|
+
this.dispatch('setDeleteButtonPosition', object.oCoords.tr);
|
|
351
352
|
});
|
|
352
353
|
}
|
|
353
354
|
/*
|
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
FONTS, FONTS_HEBREW, FONTS_HINDI, FONTS_BENGALI, FONTS_GUJARATI, FONTS_KANNADA, FONTS_MALYALAM,
|
|
4
4
|
FONTS_MARATHI, FONTS_TAMIL, FONTS_TELUGU, FONTS_ORIYA
|
|
5
5
|
} from './../constants/fonts';
|
|
6
|
+
import Vue from 'vue';
|
|
6
7
|
|
|
7
8
|
const fontsLoadList = {};
|
|
8
9
|
|
|
@@ -61,8 +62,9 @@ export const getFormattedFont = alias => {
|
|
|
61
62
|
};
|
|
62
63
|
|
|
63
64
|
export const getFontPath = alias => {
|
|
65
|
+
const { PROD_CDN_URL, DEV_CDN_URL, CDN_DOMAIN } = Vue.$env;
|
|
64
66
|
const { path } = getFont(alias) || {};
|
|
65
|
-
return path && staticLink(path);
|
|
67
|
+
return path && staticLink(`${CDN_DOMAIN || PROD_CDN_URL || DEV_CDN_URL || ''}${path}`);
|
|
66
68
|
};
|
|
67
69
|
|
|
68
70
|
export const loadFont = alias => new Promise((resolve, reject) => {
|
package/assets/js/utils/shop.js
CHANGED
|
@@ -12,6 +12,10 @@ export function getShopCountrySettings(shop, country) {
|
|
|
12
12
|
...shop.settings.depositInfo,
|
|
13
13
|
...settingsValues(countrySetting?.settings?.depositInfo)
|
|
14
14
|
},
|
|
15
|
+
order: {
|
|
16
|
+
...shop.settings.order,
|
|
17
|
+
...settingsValues(countrySetting?.settings?.order)
|
|
18
|
+
},
|
|
15
19
|
pricing: {
|
|
16
20
|
...shop.settings.pricing,
|
|
17
21
|
...settingsValues(countrySetting?.settings?.pricing)
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
@click="updatePaymentType(true)">
|
|
24
24
|
<checked-icon :checked="isDepositPayment" />
|
|
25
25
|
<span class="lc_regular12 lc__grey1 OrderPaymentInformation__checkbox-label">
|
|
26
|
-
|
|
26
|
+
Bank Transfer
|
|
27
27
|
</span>
|
|
28
28
|
</label>
|
|
29
29
|
</div>
|
|
@@ -110,6 +110,7 @@ export default {
|
|
|
110
110
|
};
|
|
111
111
|
},
|
|
112
112
|
computed: {
|
|
113
|
+
...mapGetters(['MESSAGES']),
|
|
113
114
|
...mapGetters(['country', 'currency']),
|
|
114
115
|
...mapGetters(['orderSettings']),
|
|
115
116
|
...mapGetters('order', ['card']),
|
|
@@ -189,7 +190,7 @@ export default {
|
|
|
189
190
|
this.$emit('next');
|
|
190
191
|
} else {
|
|
191
192
|
this.$nextTick(async () => {
|
|
192
|
-
const message = `Unfortunately our payment gateway has reported the following error: '${this.errorMessage}'. Please check your card number and try again. Alternatively you can proceed with a 'pay later' order and receive an email confirmation now and pay via credit card or
|
|
193
|
+
const message = `Unfortunately our payment gateway has reported the following error: '${this.errorMessage}'. Please check your card number and try again. Alternatively you can proceed with a 'pay later' order and receive an email confirmation now and pay via credit card or bank transfer`;
|
|
193
194
|
const options = { submitLabel: 'PAY LATER', cancelLabel: 'TRY AGAIN', warning: true };
|
|
194
195
|
const isSwitchToDeposit = await this.showConfirmationModal(message, options);
|
|
195
196
|
if (isSwitchToDeposit) {
|
|
@@ -16,133 +16,132 @@
|
|
|
16
16
|
class="form-label">
|
|
17
17
|
Write your text
|
|
18
18
|
</label>
|
|
19
|
-
<
|
|
19
|
+
<textarea
|
|
20
20
|
id="copy"
|
|
21
21
|
ref="copy"
|
|
22
22
|
v-model="copy"
|
|
23
23
|
type="text"
|
|
24
24
|
name="copy"
|
|
25
|
+
style="height: 100px;"
|
|
25
26
|
class="form-field bordered labelless"
|
|
26
27
|
placeholder="Your text here"
|
|
27
|
-
:class="{ filled: copy }"
|
|
28
|
+
:class="{ filled: copy }"></textarea>
|
|
28
29
|
</validation-provider>
|
|
29
|
-
<
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
30
|
+
<div
|
|
31
|
+
v-if="copy.includes('\n')"
|
|
32
|
+
class="form-row">
|
|
33
|
+
<div class="form-label">
|
|
34
|
+
Align text
|
|
35
|
+
</div>
|
|
36
|
+
<div class="EditorLayerFormText__align-options">
|
|
37
|
+
<div
|
|
38
|
+
class="EditorLayerFormText__align-option ripple"
|
|
39
|
+
:class="{ active: textAlign === 'left' }"
|
|
40
|
+
@click="textAlign = 'left'">
|
|
41
|
+
<i class="icon-align-left"></i>
|
|
35
42
|
</div>
|
|
36
|
-
<div
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
<i class="icon-align-left"></i>
|
|
42
|
-
</div>
|
|
43
|
-
<div
|
|
44
|
-
class="EditorLayerFormText__align-option ripple"
|
|
45
|
-
:class="{ active: textAlign === 'center' }"
|
|
46
|
-
@click="textAlign = 'center'">
|
|
47
|
-
<i class="icon-align-center"></i>
|
|
48
|
-
</div>
|
|
49
|
-
<div
|
|
50
|
-
class="EditorLayerFormText__align-option ripple"
|
|
51
|
-
:class="{ active: textAlign === 'right' }"
|
|
52
|
-
@click="textAlign = 'right'">
|
|
53
|
-
<i class="icon-align-right"></i>
|
|
54
|
-
</div>
|
|
43
|
+
<div
|
|
44
|
+
class="EditorLayerFormText__align-option ripple"
|
|
45
|
+
:class="{ active: textAlign === 'center' }"
|
|
46
|
+
@click="textAlign = 'center'">
|
|
47
|
+
<i class="icon-align-center"></i>
|
|
55
48
|
</div>
|
|
49
|
+
<div
|
|
50
|
+
class="EditorLayerFormText__align-option ripple"
|
|
51
|
+
:class="{ active: textAlign === 'right' }"
|
|
52
|
+
@click="textAlign = 'right'">
|
|
53
|
+
<i class="icon-align-right"></i>
|
|
54
|
+
</div>
|
|
55
|
+
</div>
|
|
56
|
+
</div>
|
|
57
|
+
<div class="form-row low-dense">
|
|
58
|
+
<font-family-select
|
|
59
|
+
v-model="fontFamily"
|
|
60
|
+
@input="selectFont"
|
|
61
|
+
@select="selectFont" />
|
|
62
|
+
<input
|
|
63
|
+
type="text"
|
|
64
|
+
:value="fontFamily"
|
|
65
|
+
:class="{ 'filled': fontFamily }"
|
|
66
|
+
class="form-hidden-validator form-field" />
|
|
67
|
+
</div>
|
|
68
|
+
<div class="form-row--cols low-dense">
|
|
69
|
+
<div class="form-col col-half">
|
|
70
|
+
<label class="form-label">
|
|
71
|
+
Text color
|
|
72
|
+
</label>
|
|
73
|
+
<color-picker v-model="fill" />
|
|
56
74
|
</div>
|
|
57
|
-
<div class="form-
|
|
58
|
-
<
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
75
|
+
<div class="form-col col-half">
|
|
76
|
+
<label
|
|
77
|
+
for="fontSize"
|
|
78
|
+
class="form-label">
|
|
79
|
+
Text size
|
|
80
|
+
</label>
|
|
81
|
+
<i
|
|
82
|
+
class="icon-minus form-icon-left EditorLayerFormText__field-action"
|
|
83
|
+
@click="decreaseFontSize">
|
|
84
|
+
</i>
|
|
62
85
|
<input
|
|
86
|
+
id="fontSize"
|
|
87
|
+
ref="fontSize"
|
|
88
|
+
v-model.number="fontSize"
|
|
89
|
+
name="fontSize"
|
|
63
90
|
type="text"
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
class="form-
|
|
91
|
+
class="form-field icon-inside-lr filled centered labelless" />
|
|
92
|
+
<i
|
|
93
|
+
class="icon-plus form-icon-right EditorLayerFormText__field-action"
|
|
94
|
+
@click="increaseFontSize">
|
|
95
|
+
</i>
|
|
67
96
|
</div>
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
class="form-label">
|
|
79
|
-
Text size
|
|
80
|
-
</label>
|
|
81
|
-
<i
|
|
82
|
-
class="icon-minus form-icon-left EditorLayerFormText__field-action"
|
|
83
|
-
@click="decreaseFontSize">
|
|
84
|
-
</i>
|
|
85
|
-
<input
|
|
86
|
-
id="fontSize"
|
|
87
|
-
ref="fontSize"
|
|
88
|
-
v-model.number="fontSize"
|
|
89
|
-
name="fontSize"
|
|
90
|
-
type="text"
|
|
91
|
-
class="form-field icon-inside-lr filled centered labelless" />
|
|
92
|
-
<i
|
|
93
|
-
class="icon-plus form-icon-right EditorLayerFormText__field-action"
|
|
94
|
-
@click="increaseFontSize">
|
|
95
|
-
</i>
|
|
96
|
-
</div>
|
|
97
|
-
</div>
|
|
98
|
-
<div class="form-row--cols low-dense">
|
|
99
|
-
<div class="form-col col-half">
|
|
100
|
-
<label class="form-label EditorLayerFormText__label-with-checkbox">
|
|
101
|
-
<span>
|
|
102
|
-
Outline color
|
|
103
|
-
</span>
|
|
104
|
-
<Checkbox v-model="enableOutline" />
|
|
105
|
-
</label>
|
|
106
|
-
<color-picker
|
|
107
|
-
v-if="enableOutline"
|
|
108
|
-
v-model="stroke">
|
|
109
|
-
</color-picker>
|
|
110
|
-
</div>
|
|
111
|
-
<div
|
|
97
|
+
</div>
|
|
98
|
+
<div class="form-row--cols low-dense">
|
|
99
|
+
<div class="form-col col-half">
|
|
100
|
+
<label class="form-label EditorLayerFormText__label-with-checkbox">
|
|
101
|
+
<span>
|
|
102
|
+
Outline color
|
|
103
|
+
</span>
|
|
104
|
+
<Checkbox v-model="enableOutline" />
|
|
105
|
+
</label>
|
|
106
|
+
<color-picker
|
|
112
107
|
v-if="enableOutline"
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
<
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
108
|
+
v-model="stroke">
|
|
109
|
+
</color-picker>
|
|
110
|
+
</div>
|
|
111
|
+
<div
|
|
112
|
+
v-if="enableOutline"
|
|
113
|
+
class="form-col col-half">
|
|
114
|
+
<label
|
|
115
|
+
for="fontSize"
|
|
116
|
+
class="form-label">
|
|
117
|
+
Outline weight
|
|
118
|
+
</label>
|
|
119
|
+
<i
|
|
120
|
+
class="icon-minus form-icon-left EditorLayerFormText__field-action"
|
|
121
|
+
@click="decreaseStrokeWidth">
|
|
122
|
+
</i>
|
|
123
|
+
<input
|
|
124
|
+
id="strokeWidth"
|
|
125
|
+
ref="strokeWidth"
|
|
126
|
+
v-model.number="strokeWidth"
|
|
127
|
+
name="strokeWidth"
|
|
128
|
+
type="text"
|
|
129
|
+
class="form-field icon-inside-lr filled centered labelless" />
|
|
130
|
+
<i
|
|
131
|
+
class="icon-plus form-icon-right EditorLayerFormText__field-action"
|
|
132
|
+
@click="increaseStrokeWidth">
|
|
133
|
+
</i>
|
|
134
|
+
</div>
|
|
135
|
+
<div
|
|
136
|
+
v-else
|
|
137
|
+
class="form-col col-half">
|
|
138
|
+
|
|
140
139
|
</div>
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
</
|
|
140
|
+
</div>
|
|
141
|
+
<editor-layer-common-fields
|
|
142
|
+
:layer="layer"
|
|
143
|
+
@set-layer-field="data => $emit('set-layer-field', data)">
|
|
144
|
+
</editor-layer-common-fields>
|
|
146
145
|
</div>
|
|
147
146
|
</validation-observer>
|
|
148
147
|
</div>
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
}">
|
|
92
92
|
<editor-print-area-options
|
|
93
93
|
v-if="productDetailsLoaded"
|
|
94
|
-
|
|
94
|
+
:key="editableSide.id"
|
|
95
95
|
:product="product"
|
|
96
96
|
:selected="editablePrintArea && editablePrintArea._id"
|
|
97
97
|
:side="editableSide.id"
|
|
@@ -159,6 +159,7 @@ export default {
|
|
|
159
159
|
]),
|
|
160
160
|
selectTab(value) {
|
|
161
161
|
if (this.editableSide.id !== value) {
|
|
162
|
+
this.setEditablePrintArea(null);
|
|
162
163
|
this.setEditableSide({ id: value });
|
|
163
164
|
}
|
|
164
165
|
},
|
|
@@ -237,7 +237,7 @@ export default {
|
|
|
237
237
|
document.removeEventListener('mousedown', this.onDocumentStartClick);
|
|
238
238
|
window.removeEventListener('resize', this.onResize);
|
|
239
239
|
},
|
|
240
|
-
|
|
240
|
+
onDocumentStartClick({ target }) {
|
|
241
241
|
// todo: replace by click outside plugin?
|
|
242
242
|
console.log('target: ', target);
|
|
243
243
|
const isCanvasElement = target.tagName === 'CANVAS';
|
|
@@ -23,6 +23,7 @@ export default {
|
|
|
23
23
|
};
|
|
24
24
|
},
|
|
25
25
|
computed: {
|
|
26
|
+
...mapGetters(['MESSAGES']),
|
|
26
27
|
...mapGetters('quote', ['quote', 'option', 'proceedOption', 'selectedOption', 'depositInfo', 'shopContacts', 'quoteAddress', 'quoteId', 'options', 'gstTax']),
|
|
27
28
|
...mapGetters(['shop', 'country', 'currency'])
|
|
28
29
|
},
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
<div>{{ quote.address.additionalInfo }}</div>
|
|
39
39
|
</td>
|
|
40
40
|
<td class="w-50">
|
|
41
|
-
<div><b>DIRECT DEPOSIT DETAILS</b></div>
|
|
41
|
+
<div><b>{{ MESSAGES.DIRECT_DEPOSIT_DETAILS || 'DIRECT DEPOSIT DETAILS'}}</b></div>
|
|
42
42
|
<div>Bank: {{ depositInfo.bank }}</div>
|
|
43
43
|
<div>Account name: {{ depositInfo.accountName }}</div>
|
|
44
44
|
<div>BSB: {{ depositInfo.BSB }}</div>
|
package/nuxt.config.js
CHANGED
|
@@ -83,6 +83,7 @@ module.exports = (config, axios, { raygunClient, publicPath } = {}) => ({
|
|
|
83
83
|
NODE_ENV: config.NODE_ENV || 'development'
|
|
84
84
|
},
|
|
85
85
|
publicRuntimeConfig: {
|
|
86
|
+
CDN_DOMAIN: process.env.CDN_DOMAIN,
|
|
86
87
|
PROD_CDN_URL: process.env.PROD_CDN_URL,
|
|
87
88
|
DEV_CDN_URL: process.env.DEV_CDN_URL,
|
|
88
89
|
PROD_S3_BUCKET: process.env.PROD_S3_BUCKET,
|
package/package.json
CHANGED
package/store/cart.js
CHANGED
|
@@ -45,7 +45,7 @@ const getInvalidStockQuantities = entities => {
|
|
|
45
45
|
};
|
|
46
46
|
|
|
47
47
|
const getPrintsQuantities = entities => {
|
|
48
|
-
const printTypes = entities.reduce((types, e) => [...types, ...e.prints.map(({ printType }) => ({ ...printType, guid: `${e.guid}-${printType
|
|
48
|
+
const printTypes = entities.reduce((types, e) => [...types, ...e.prints.map(({ printType }) => ({ ...printType, guid: `${e.guid}-${printType?._id}` }))], []);
|
|
49
49
|
const grouped = groupBy(printTypes, 'guid');
|
|
50
50
|
const quantities = Object.keys(grouped).map(guid => {
|
|
51
51
|
const [{ name, minQuantity }] = grouped[guid];
|
|
@@ -279,7 +279,7 @@ function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon
|
|
|
279
279
|
return {
|
|
280
280
|
_id: print._id,
|
|
281
281
|
guid: print.guid,
|
|
282
|
-
costType: print.printType
|
|
282
|
+
costType: print.printType?.costType,
|
|
283
283
|
setupCost,
|
|
284
284
|
printCost,
|
|
285
285
|
freeSetupOver,
|