@lancom/shared 0.0.285 → 0.0.286

package/assets/js/api/index.js

@@ -160,8 +160,8 @@ const api = {
   fetchAddressInfo(id, shop) {
     return _get(`shop/${shop || '-1'}/postcodes/address/${id}`);
   },
-  fetchProductPrintTemplates() {
-    return _get('print-templates');
+  fetchProductPrintTemplates(shop) {
+    return _get(`shop/${shop || '-1'}/print-templates`);
   },
   fetchPrintTypes(shop) {
     return _get(`shop/${shop}/print-types`);

package/assets/js/models/product-layers.js

@@ -64,7 +64,7 @@ export class TextLayer extends Layer {
 
 export class ArtLayer extends Layer {
   url = null;
-  fileName = 'default';
+  fileName = '';
   editableDetails = true;
   scaleX = 1;
   scaleY = 1;

package/assets/scss/variables/_theme.scss

@@ -8,6 +8,9 @@ $mobile_notification_bar_height: 40px !default;
 // Scrollbar
 $scrollbar_width: 6px;
 
+$orange: #e76d00 !default;
+$orange_light: #ff9940 !default;
+
 // Colors
 $black_high_emphasis: #000000;
 $black_medium_emphasis: rgba(0, 0, 0, .66);

package/components/common/postcode_select/postcode-select.vue

@@ -96,8 +96,7 @@ export default {
       type: String
     },
     labelText: {
-      type: String,
-      default: 'Suburb'
+      type: String
     },
     placeholder: {
       type: String,
@@ -131,7 +130,7 @@ export default {
   computed: {
     ...mapGetters(['shop', 'MESSAGES']),
     displayLabelText() {
-      return this.MESSAGES.POSTCODES_LABEL || this.labelText;
+      return this.labelText || this.MESSAGES.POSTCODES_LABEL || 'Suburb';
     },
     model: {
       get() {

package/components/common/products_list_dropdown/products-list-dropdown.vue

@@ -48,7 +48,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop'])
+    ...mapGetters(['shop', 'country'])
   },
   methods: {
     select(product) {
@@ -58,7 +58,7 @@ export default {
     async loadProducts(text) {
       try {
         this.loading = true;
-        this.products = (await api.fetchProducts(this.shop._id, { text })).products;
+        this.products = (await api.fetchProducts(this.shop._id, { text, country: this.country?._id })).products;
       } catch (e) {
       } finally {
         this.loading = false;

package/components/editor/editor_layers/editor-layers.vue

@@ -121,7 +121,7 @@ export default {
       const printAreas = getAllPrintAreas(this.product);
       const groups = new Map();
       this.editableLayers.forEach(layer => {
-        const printArea = printAreas.find(pa => pa._id === layer.printArea);
+        const printArea = printAreas.find(pa => pa._id === layer.printArea) || { _id: null, name: 'Layers'};
         if (printArea) {
           const defaultGroup = { layers: [], printArea };
           const group = groups.get(printArea._id) || defaultGroup;

package/components/editor/editor_layers/editor_layers_layer/editor-layers-layer.vue

@@ -107,13 +107,13 @@ export default {
       }
       let quality;
       switch (true) {
-        case this.layer.dpi < 100:
+        case this.layer.dpi < 75:
           quality = 'too small';
           break;
-        case this.layer.dpi >= 100 && this.layer.dpi < 150:
+        case this.layer.dpi >= 75 && this.layer.dpi < 100:
           quality = 'low quality';
           break;
-        case this.layer.dpi >= 150:
+        case this.layer.dpi >= 100:
           quality = 'good quality';
           break;
       }

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

@@ -29,7 +29,9 @@
               </template>
             </v-popover>
           </span>
-          <span class="lc_regular16 lc_grey1 ml-6">
+          <span
+            v-if="isPrintPricing"
+            class="lc_regular16 lc_grey1 ml-6">
             +
             <v-popover
               ref="popover"
@@ -108,7 +110,8 @@ export default {
       'product',
       'productDetailsLoaded',
       'defaultSimpleProduct',
-      'selectedPrintType'
+      'selectedPrintType',
+      'isPrintPricing'
     ]),
     ...mapGetters('layers', [
       'layerThumbnails'

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

@@ -122,7 +122,7 @@ export default {
       'editModeSelectedLayer'
     ]),
     printAreaLayers() {
-      return this.editableLayers.filter(l => l.printArea === this.printArea._id);
+      return this.editableLayers.filter(l => !this.printArea || l.printArea === this.printArea._id);
     },
     deleteButtonPosition() {
       return this.deleteButtonPos ? {
@@ -230,15 +230,16 @@ export default {
       this.fabricHelper.scaleWorkspace({ width: size, height: size });
     },
     initEventsListeners() {
-      document.addEventListener('click', this.onDocumentClick);
+      document.addEventListener('mousedown', this.onDocumentStartClick);
       window.addEventListener('resize', this.onResize);
     },
     clearEventsListeners() {
-      document.removeEventListener('click', this.onDocumentClick);
+      document.removeEventListener('mousedown', this.onDocumentStartClick);
       window.removeEventListener('resize', this.onResize);
     },
     onDocumentClick({ target }) {
       // todo: replace by click outside plugin?
+      console.log('target: ', target);
       const isCanvasElement = target.tagName === 'CANVAS';
       const isIgnoreClick = !!findParentByPredicate(target, element => element.hasAttribute('ignore-document-click'));
       if (!isCanvasElement && !isIgnoreClick) {

package/components/modals/editor_layers_templates/editor-layers-templates.vue

@@ -28,11 +28,9 @@
 </template>
 
 <script>
-import { createNamespacedHelpers } from 'vuex';
+import { mapMutations, mapActions, mapGetters } from 'vuex';
 import api from '@lancom/shared/assets/js/api';
 
-const { mapMutations, mapActions, mapGetters } = createNamespacedHelpers('product');
-
 export default {
   name: 'EditorLayersTemplates',
   data() {
@@ -42,16 +40,17 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['printArea', 'editableLayers'])
+    ...mapGetters(['shop']),
+    ...mapGetters('product', ['printArea', 'editableLayers'])
   },
   async mounted() {
     this.loading = true;
-    this.layerTemplates = await api.fetchProductPrintTemplates();
+    this.layerTemplates = await api.fetchProductPrintTemplates(this.shop._id);
     this.loading = false;
   },
   methods: {
-    ...mapActions(['createLayer']),
-    ...mapMutations(['updateTemplateLayer', 'setSelectedLayer']),
+    ...mapActions('product', ['createLayer']),
+    ...mapMutations('product', ['updateTemplateLayer', 'setSelectedLayer']),
     async applyLayerTemplate(template) {
       this.loading = true;
       const printArea = this.printArea;

package/components/products/product_list_product/product-list-product.scss

@@ -14,6 +14,34 @@
       }
     }
   }
+  &__tag {
+    position: absolute;
+    top: 14px;
+    right: 14px;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    z-index: 3;
+    &-icon {
+      margin-bottom: 4px;
+      font-size: 12px;
+      color: $orange
+    }
+    &-item  {
+      margin-bottom: 2px;
+      span {
+        display: inline-block;
+        padding: 4px 5px;
+        background: $orange_light;
+        font-weight: 800;
+        font-size: 10px;
+        line-height: 14px;
+        letter-spacing: -0.02em;
+        text-transform: uppercase;
+        color: $black;
+      }
+    }
+  }
   &__colors {
     display: flex;
     flex-wrap: wrap;

package/components/products/product_list_product/product-list-product.vue

@@ -38,6 +38,23 @@
       <!-- <div class="ProductListProduct__gender">
         <span>{{ product.gender }}</span>
       </div> -->
+      <div
+        v-if="hasTags"
+        class="ProductListProduct__tag">
+        <div
+          v-for="tag in tags"
+          :key="`${tag._id}-${product._id}`"
+          class="ProductListProduct__tag-item">
+          <span
+            :style="{
+              'background-color': tag.backgroundColor,
+              'color': tag.textColor,
+              'font-size': tag.fontSize
+            }">
+            {{ tag.name }}
+          </span>
+        </div>
+      </div>
     </a>
     <div class="ProductListProduct__info">
       <div class="ProductListProduct__info-item">

package/layouts/products.vue

@@ -334,7 +334,7 @@
       }
     }
     &__aside {
-      width: 230px;
+      width: 215px;
       flex-grow: 1;
       flex-shrink: 0;
       @media (max-width: $bp-small-max) {

package/mixins/product-view.js

@@ -30,8 +30,8 @@ export default (IS_PRODUCT_PRESET_PRINT_PRICING) => ({
       await store.dispatch('product/fetchProduct', data);
       await store.dispatch('product/fetchProductDetails', data);
 
-      if (IS_PRODUCT_PRESET_PRINT_PRICING) {
-        const product = store.getters['product/product'];
+      const product = store.getters['product/product'];
+      if (IS_PRODUCT_PRESET_PRINT_PRICING && product.printOnly) {
         const printType = product.printTypes[0];
         store.commit('product/setSelectedPrintType', printType);
         store.commit('product/setIsPrintPricing', true);

package/package.json

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

package/store/product.js

@@ -363,6 +363,11 @@ export const mutations = {
       layer
     ];
     Vue.set(state.template, 'layers', layers);
+    if (layers.length === 1 && !state.product.printOnly) {
+        const printType = state.product.printTypes[0];
+        state.selectedPrintType = printType;
+        state.isPrintPricing = true;
+    }
   },
   removeTemplateLayer(state, layer) {
     const index = state.template.layers.findIndex(({ createdAt }) => createdAt === layer.createdAt);
@@ -370,6 +375,10 @@ export const mutations = {
     if (state.selectedLayer && state.selectedLayer.createdAt === layer.createdAt) {
       state.selectedLayer = null;
     }
+    if (state.template.layers.length === 0 && !state.product.printOnly) {
+      state.selectedPrintType = null;
+      state.isPrintPricing = false;
+    }
   },
   updateTemplateLayer(state, layer) {
     const index = state.template.layers.findIndex(({ createdAt, _id }) => createdAt === layer.createdAt || (_id && _id === layer._id));