@lancom/shared 0.0.290 → 0.0.292

package/assets/js/utils/fabric-helper.js

@@ -338,8 +338,9 @@ export default class FabricHelper {
         }
       });
       object.on('changed', () => {
-        // this.dispatch('setField', { field: 'copy', value: object.text });
-        // this.dispatch('setField', { field: 'boundingRect', value: object.getBoundingRect() });
+        this.dispatch('setField', { field: 'copy', value: object.text });
+        this.dispatch('setField', { field: 'boundingRect', value: object.getBoundingRect() });
+        this.dispatch('setDeleteButtonPosition', object.oCoords.tr);
         // if (/\n/g.test(object.text || '')) {
         //   this.discardActiveObjects();
         //   object.text = object.text.replace(/\n/g, '');
@@ -348,7 +349,6 @@ export default class FabricHelper {
         //   this.dispatch('setDeleteButtonPosition', object.oCoords.tr);
         //   // this.checkBoundingIntersection(object);
         // }
-        this.dispatch('setDeleteButtonPosition', object.oCoords.tr);
       });
     }
     /*

package/assets/js/utils/fonts-helper.js

@@ -6,6 +6,7 @@ import {
 import Vue from 'vue';
 
 const fontsLoadList = {};
+export const fontsLoadedList = {};
 
 export const FONTS_LANGS = {
   ENG: 'eng',
@@ -82,6 +83,7 @@ export const loadFont = alias => new Promise((resolve, reject) => {
 
   fontsLoadList[font.name].then(loadedFace => {
     document.fonts.add(loadedFace);
+    Vue.set(fontsLoadedList, font.name, true);
     resolve(getFormattedFont(alias));
   }).catch(error => console.warn(error));
 });

package/components/checkout/cart/cart.vue

@@ -26,7 +26,7 @@
             <postcode-select
               :suburb="suburb"
               :labelless="true"
-              :only-postcode="true"
+              :only-postcode="onlyPostcode"
               :placeholder="postcodeLabel"
               :label-text="postcodeInfoLabel"
               @select="handleSuburbChange" />
@@ -92,8 +92,11 @@ export default {
   filters: { price },
   mixins: [CartMixin],
   computed: {
-    ...mapGetters(['MESSAGES']),
+    ...mapGetters(['MESSAGES', 'SETTINGS']),
     ...mapGetters('cart', ['isEmpty', 'cartPricingError', 'cartPricing', 'cartPricingCalculating', 'entities']),
+    onlyPostcode() {
+      return !!this.SETTINGS.CART_ONLY_POSTCODE;
+    },
     postcodeLabel() {
       return this.MESSAGES.CART_POSTCODE || 'Postcode';
     },

package/components/editor/editor_layers/editor_layer_forms/editor_layer_form_text/editor-layer-form-text.vue

@@ -27,121 +27,123 @@
             placeholder="Your text here"
             :class="{ filled: copy }"></textarea>
         </validation-provider>
-        <div
-          v-if="copy.includes('\n')"
-          class="form-row">
-          <div class="form-label">
-            Align text
-          </div>
-          <div class="EditorLayerFormText__align-options">
-            <div
-              class="EditorLayerFormText__align-option ripple"
-              :class="{ active: textAlign === 'left' }"
-              @click="textAlign = 'left'">
-              <i class="icon-align-left"></i>
-            </div>
-            <div
-              class="EditorLayerFormText__align-option ripple"
-              :class="{ active: textAlign === 'center' }"
-              @click="textAlign = 'center'">
-              <i class="icon-align-center"></i>
+        <div>
+          <div
+            v-if="copy.includes('\n')"
+            class="form-row">
+            <div class="form-label">
+              Align text
             </div>
-            <div
-              class="EditorLayerFormText__align-option ripple"
-              :class="{ active: textAlign === 'right' }"
-              @click="textAlign = 'right'">
-              <i class="icon-align-right"></i>
+            <div class="EditorLayerFormText__align-options">
+              <div
+                class="EditorLayerFormText__align-option ripple"
+                :class="{ active: textAlign === 'left' }"
+                @click="textAlign = 'left'">
+                <i class="icon-align-left"></i>
+              </div>
+              <div
+                class="EditorLayerFormText__align-option ripple"
+                :class="{ active: textAlign === 'center' }"
+                @click="textAlign = 'center'">
+                <i class="icon-align-center"></i>
+              </div>
+              <div
+                class="EditorLayerFormText__align-option ripple"
+                :class="{ active: textAlign === 'right' }"
+                @click="textAlign = 'right'">
+                <i class="icon-align-right"></i>
+              </div>
             </div>
           </div>
-        </div>
-        <div class="form-row low-dense">
-          <font-family-select
-            v-model="fontFamily"
-            @input="selectFont"
-            @select="selectFont" />
-          <input
-            type="text"
-            :value="fontFamily"
-            :class="{ 'filled': fontFamily }"
-            class="form-hidden-validator form-field" />
-        </div>
-        <div class="form-row--cols low-dense">
-          <div class="form-col col-half">
-            <label class="form-label">
-              Text color
-            </label>
-            <color-picker v-model="fill" />
-          </div>
-          <div class="form-col col-half">
-            <label
-              for="fontSize"
-              class="form-label">
-              Text size
-            </label>
-            <i
-              class="icon-minus form-icon-left  EditorLayerFormText__field-action"
-              @click="decreaseFontSize">
-            </i>
+          <div class="form-row low-dense">
+            <font-family-select
+              v-model="fontFamily"
+              @input="selectFont"
+              @select="selectFont" />
             <input
-              id="fontSize"
-              ref="fontSize"
-              v-model.number="fontSize"
-              name="fontSize"
               type="text"
-              class="form-field icon-inside-lr filled centered labelless" />
-            <i
-              class="icon-plus form-icon-right EditorLayerFormText__field-action"
-              @click="increaseFontSize">
-            </i>
-          </div>
-        </div>
-        <div class="form-row--cols low-dense">
-          <div class="form-col col-half">
-            <label class="form-label EditorLayerFormText__label-with-checkbox">
-              <span>
-                Outline color
-              </span>
-              <Checkbox v-model="enableOutline" />
-            </label>
-            <color-picker
-              v-if="enableOutline"
-              v-model="stroke">
-            </color-picker>
+              :value="fontFamily"
+              :class="{ 'filled': fontFamily }"
+              class="form-hidden-validator form-field" />
           </div>
-          <div
-            v-if="enableOutline"
-            class="form-col col-half">
-            <label
-              for="fontSize"
-              class="form-label">
-              Outline weight
-            </label>
-            <i
-              class="icon-minus form-icon-left  EditorLayerFormText__field-action"
-              @click="decreaseStrokeWidth">
-            </i>
-            <input
-              id="strokeWidth"
-              ref="strokeWidth"
-              v-model.number="strokeWidth"
-              name="strokeWidth"
-              type="text"
-              class="form-field icon-inside-lr filled centered labelless" />
-            <i
-              class="icon-plus form-icon-right EditorLayerFormText__field-action"
-              @click="increaseStrokeWidth">
-            </i>
+          <div class="form-row--cols low-dense">
+            <div class="form-col col-half">
+              <label class="form-label">
+                Text color
+              </label>
+              <color-picker v-model="fill" />
+            </div>
+            <div class="form-col col-half">
+              <label
+                for="fontSize"
+                class="form-label">
+                Text size
+              </label>
+              <i
+                class="icon-minus form-icon-left  EditorLayerFormText__field-action"
+                @click="decreaseFontSize">
+              </i>
+              <input
+                id="fontSize"
+                ref="fontSize"
+                v-model.number="fontSize"
+                name="fontSize"
+                type="text"
+                class="form-field icon-inside-lr filled centered labelless" />
+              <i
+                class="icon-plus form-icon-right EditorLayerFormText__field-action"
+                @click="increaseFontSize">
+              </i>
+            </div>
           </div>
-          <div
-            v-else
-            class="form-col col-half">
-            &nbsp;
+          <div class="form-row--cols low-dense">
+            <div class="form-col col-half">
+              <label class="form-label EditorLayerFormText__label-with-checkbox">
+                <span>
+                  Outline color
+                </span>
+                <Checkbox v-model="enableOutline" />
+              </label>
+              <color-picker
+                v-if="enableOutline"
+                v-model="stroke">
+              </color-picker>
+            </div>
+            <div
+              v-if="enableOutline"
+              class="form-col col-half">
+              <label
+                for="fontSize"
+                class="form-label">
+                Outline weight
+              </label>
+              <i
+                class="icon-minus form-icon-left  EditorLayerFormText__field-action"
+                @click="decreaseStrokeWidth">
+              </i>
+              <input
+                id="strokeWidth"
+                ref="strokeWidth"
+                v-model.number="strokeWidth"
+                name="strokeWidth"
+                type="text"
+                class="form-field icon-inside-lr filled centered labelless" />
+              <i
+                class="icon-plus form-icon-right EditorLayerFormText__field-action"
+                @click="increaseStrokeWidth">
+              </i>
+            </div>
+            <div
+              v-else
+              class="form-col col-half">
+              &nbsp;
+            </div>
           </div>
+          <editor-layer-common-fields
+            :layer="layer"
+            @set-layer-field="data => $emit('set-layer-field', data)">
+          </editor-layer-common-fields>
         </div>
-        <editor-layer-common-fields
-          :layer="layer"
-          @set-layer-field="data => $emit('set-layer-field', data)">
-        </editor-layer-common-fields>
       </div>
     </validation-observer>
   </div>

package/components/editor/editor_layers/editor_layer_forms/editor_layer_form_text/font-family_select/font-family-select.vue

@@ -36,7 +36,7 @@
           :style="{
             fontFamily: props.option.label
           }">
-          {{ props.option | selectedFontLabel }}
+          <spinner v-if="!isLoadedFont" /> {{ props.option | selectedFontLabel }}
         </span>
       </multiselect>
     </div>
@@ -45,7 +45,7 @@
 
 <script>
 import Multiselect from 'vue-multiselect';
-import { availableFonts, FONTS_LANGS, FONTS_LANGS_LIST, loadFont } from '@lancom/shared/assets/js/utils/fonts-helper';
+import { availableFonts, FONTS_LANGS, FONTS_LANGS_LIST, loadFont, fontsLoadedList } from '@lancom/shared/assets/js/utils/fonts-helper';
 
 export default {
   name: 'FontFamilySelect',
@@ -72,6 +72,7 @@ export default {
   },
   data() {
     return {
+      fontsLoadedList,
       currentValue: null,
       isSelected: false,
       isOpen: false,
@@ -80,6 +81,9 @@ export default {
     };
   },
   computed: {
+    isLoadedFont() {
+      return !this.model || !!this.fontsLoadedList[this.model.label];
+    },
     model: {
       get() {
         return this.value;

package/components/editor/editor_product_details/editor-product-details.vue

@@ -12,7 +12,7 @@
       <div class="EditorProductDetails__header-info">
         <div class="EditorProductDetails__header-row">
           <span
-            v-if="defaultSimpleProduct && defaultSimpleProduct.pricing[0]"
+            v-if="defaultSimpleProductPricing"
             class="lc_regular16 lc_grey1">
             From {{ currency.isoCode }}
             <v-popover
@@ -22,10 +22,10 @@
               popover-class="tooltip popover white"
               class="EditorProductDetails__discounts-table">
               <span class="lc_semibold22 lc_black EditorProductDetails__dashed-underline">
-                {{ defaultSimpleProduct.pricing[0].price | priceWithTax(pricingSettings, currency) }}
+                {{ defaultSimpleProductPricing[0].price | priceWithTax(pricingSettings, currency) }}
               </span>
               <template slot="popover">
-                <pricing-discounts-table :prices="defaultSimpleProduct.pricing" />
+                <pricing-discounts-table :prices="defaultSimpleProductPricing" />
               </template>
             </v-popover>
           </span>
@@ -118,6 +118,9 @@ export default {
       'pricingSettings',
       'country'
     ]),
+    defaultSimpleProductPricing() {
+      return (this.isPrintPricing ? this.defaultSimpleProduct?.pricing : this.defaultSimpleProduct?.unprintedPricing);
+    },
     productAvailableInCurrentCountry() {
       const { countries } = this.product;
       return !(countries || []).length || countries.includes(this.country._id);

package/components/editor/editor_workspace/editor_workspace_side/editor-workspace-side.vue

@@ -230,11 +230,11 @@ export default {
       this.fabricHelper.scaleWorkspace({ width: size, height: size });
     },
     initEventsListeners() {
-      document.addEventListener('mousedown', this.onDocumentStartClick);
+      // document.addEventListener('mousedown', this.onDocumentStartClick);
       window.addEventListener('resize', this.onResize);
     },
     clearEventsListeners() {
-      document.removeEventListener('mousedown', this.onDocumentStartClick);
+      // document.removeEventListener('mousedown', this.onDocumentStartClick);
       window.removeEventListener('resize', this.onResize);
     },
     onDocumentStartClick({ target }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.290",
+  "version": "0.0.292",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {

package/store/index.js

@@ -1,6 +1,7 @@
 import api from '@lancom/shared/assets/js/api';
 import { saveStatePlugin, loadState } from '@lancom/shared/plugins/save-state';
 import { MESSAGES, COUNTRIES_MESSAGES } from '@/messages';
+import { SETTINGS, COUNTRIES_SETTINGS } from '@/settings';
 const cookieparser = process.server ? require('cookieparser') : undefined;
 const CLOSED_NOTIFICATION = 'lancom-closed-notification-1.0';
 import { getShopCountrySettings } from '@lancom/shared/assets/js/utils/shop';
@@ -41,7 +42,8 @@ export const getters = {
   displayPricingWithTax: ({ pricing }) => !!pricing?.displayPricingWithTax,
   screenPrintsPrices: ({ pricing }) => pricing?.screenPrintsPrices || {},
   depositInfo: ({ depositInfo }) => depositInfo || {},
-  MESSAGES: ({ country }) => ({ ...MESSAGES, ...(COUNTRIES_MESSAGES[country?.isoCode] || {}) })
+  MESSAGES: ({ country }) => ({ ...MESSAGES, ...(COUNTRIES_MESSAGES[country?.isoCode] || {}) }),
+  SETTINGS: ({ country }) => ({ ...SETTINGS, ...(COUNTRIES_SETTINGS[country?.isoCode] || {}) })
 };
 
 export const actions = {