@lancom/shared 0.0.288 → 0.0.289

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

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

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

@@ -3,6 +3,7 @@ import {
   FONTS, FONTS_HEBREW, FONTS_HINDI, FONTS_BENGALI, FONTS_GUJARATI, FONTS_KANNADA, FONTS_MALYALAM,
   FONTS_MARATHI, FONTS_TAMIL, FONTS_TELUGU, FONTS_ORIYA
 } from './../constants/fonts';
+import Vue from 'vue';
 
 const fontsLoadList = {};
 
@@ -61,8 +62,9 @@ export const getFormattedFont = alias => {
 };
 
 export const getFontPath = alias => {
+  const { PROD_CDN_URL, DEV_CDN_URL } = Vue.$env;
   const { path } = getFont(alias) || {};
-  return path && staticLink(path);
+  return path && staticLink(`${PROD_CDN_URL || DEV_CDN_URL || ''}${path}`);
 };
 
 export const loadFont = alias => new Promise((resolve, reject) => {

package/assets/js/utils/shop.js

@@ -12,6 +12,10 @@ export function getShopCountrySettings(shop, country) {
       ...shop.settings.depositInfo,
       ...settingsValues(countrySetting?.settings?.depositInfo)
     },
+    order: {
+      ...shop.settings.order,
+      ...settingsValues(countrySetting?.settings?.order)
+    },
     pricing: {
       ...shop.settings.pricing,
       ...settingsValues(countrySetting?.settings?.pricing)

package/components/checkout/order/order-payment-information/order-payment-information.vue

@@ -23,7 +23,7 @@
           @click="updatePaymentType(true)">
           <checked-icon :checked="isDepositPayment" />
           <span class="lc_regular12 lc__grey1 OrderPaymentInformation__checkbox-label">
-            Direct Deposit
+            Bank Transfer
           </span>
         </label>
       </div>
@@ -110,6 +110,7 @@ export default {
     };
   },
   computed: {
+    ...mapGetters(['MESSAGES']),
     ...mapGetters(['country', 'currency']),
     ...mapGetters(['orderSettings']),
     ...mapGetters('order', ['card']),
@@ -189,7 +190,7 @@ export default {
             this.$emit('next');
           } else {
             this.$nextTick(async () => {
-              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 direct deposit`;
+              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`;
               const options = { submitLabel: 'PAY LATER', cancelLabel: 'TRY AGAIN', warning: true };
               const isSwitchToDeposit = await this.showConfirmationModal(message, options);
               if (isSwitchToDeposit) {

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

@@ -16,133 +16,132 @@
             class="form-label">
             Write your text
           </label>
-          <input
+          <textarea
             id="copy"
             ref="copy"
             v-model="copy"
             type="text"
             name="copy"
+            style="height: 100px;"
             class="form-field bordered labelless"
             placeholder="Your text here"
-            :class="{ filled: copy }" />
+            :class="{ filled: copy }"></textarea>
         </validation-provider>
-        <fragment>
-          <div
-            v-if="copy.includes('\n')"
-            class="form-row">
-            <div class="form-label">
-              Align text
+        <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-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
+              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 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-row low-dense">
-            <font-family-select
-              v-model="fontFamily"
-              @input="selectFont"
-              @select="selectFont" />
+          <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"
-              :value="fontFamily"
-              :class="{ 'filled': fontFamily }"
-              class="form-hidden-validator form-field" />
+              class="form-field icon-inside-lr filled centered labelless" />
+            <i
+              class="icon-plus form-icon-right EditorLayerFormText__field-action"
+              @click="increaseFontSize">
+            </i>
           </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>
-              <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>
-            </div>
-            <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"
-              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>
+              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>
-          <editor-layer-common-fields
-            :layer="layer"
-            @set-layer-field="data => $emit('set-layer-field', data)">
-          </editor-layer-common-fields>
-        </fragment>
+        </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_workspace/editor-workspace.vue

@@ -91,7 +91,7 @@
       }">
       <editor-print-area-options
         v-if="productDetailsLoaded"
-        ref="areaOptions"
+        :key="editableSide.id"
         :product="product"
         :selected="editablePrintArea && editablePrintArea._id"
         :side="editableSide.id"
@@ -159,6 +159,7 @@ export default {
     ]),
     selectTab(value) {
       if (this.editableSide.id !== value) {
+        this.setEditablePrintArea(null);
         this.setEditableSide({ id: value });
       }
     },

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

@@ -237,7 +237,7 @@ export default {
       document.removeEventListener('mousedown', this.onDocumentStartClick);
       window.removeEventListener('resize', this.onResize);
     },
-    onDocumentClick({ target }) {
+    onDocumentStartClick({ target }) {
       // todo: replace by click outside plugin?
       console.log('target: ', target);
       const isCanvasElement = target.tagName === 'CANVAS';

package/components/quotes/quote_view/quote-view.mixin.js

@@ -23,6 +23,7 @@ export default {
     };
   },
   computed: {
+    ...mapGetters(['MESSAGES']),
     ...mapGetters('quote', ['quote', 'option', 'proceedOption', 'selectedOption', 'depositInfo', 'shopContacts', 'quoteAddress', 'quoteId', 'options', 'gstTax']),
     ...mapGetters(['shop', 'country', 'currency'])
   },

package/components/quotes/quote_view/quote-view.vue

@@ -38,7 +38,7 @@
           <div>{{ quote.address.additionalInfo }}</div>
         </td>
         <td class="w-50">
-          <div><b>DIRECT DEPOSIT DETAILS</b></div>
+          <div><b>{{ MESSAGES.DIRECT_DEPOSIT_DETAILS || 'DIRECT DEPOSIT DETAILS'}}</b></div>
           <div>Bank: {{ depositInfo.bank }}</div>
           <div>Account name: {{ depositInfo.accountName }}</div>
           <div>BSB: {{ depositInfo.BSB }}</div>

package/package.json

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

package/store/cart.js

@@ -45,7 +45,7 @@ const getInvalidStockQuantities = entities => {
 };
 
 const getPrintsQuantities = entities => {
-  const printTypes = entities.reduce((types, e) => [...types, ...e.prints.map(({ printType }) => ({ ...printType, guid: `${e.guid}-${printType._id}` }))], []);
+  const printTypes = entities.reduce((types, e) => [...types, ...e.prints.map(({ printType }) => ({ ...printType, guid: `${e.guid}-${printType?._id}` }))], []);
   const grouped = groupBy(printTypes, 'guid');
   const quantities = Object.keys(grouped).map(guid => {
     const [{ name, minQuantity }] = grouped[guid];
@@ -279,7 +279,7 @@ function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon
         return {
           _id: print._id,
           guid: print.guid,
-          costType: print.printType.costType,
+          costType: print.printType?.costType,
           setupCost,
           printCost,
           freeSetupOver,