@lancom/shared 0.0.424 → 0.0.426

package/assets/js/api/admin.js

@@ -3,12 +3,6 @@ import { _get, _post, _delete, _put } from './helpers';
 import { sortSizes } from './../utils/sizes';
 import { sortByName } from './../utils/filters';
 
-const CACHE = {
-  PRINT_AREAS: 'print-areas',
-  PACKAGES: 'packages'
-};
-const promiseCache = new Map();
-
 export default {
   updateInventoryFromLink(link, warehouse) {
     const url = `admin/products/inventory/link${warehouse ? `?warehouse=${warehouse}` : ''}`;
@@ -116,9 +110,6 @@ export default {
   saveOrder(order) {
     return order._id ? _put(`admin/order/${order._id}`, order) : _post('admin/order', order);
   },
-  validateOrderDate(order, field) {
-    return _post(`admin/order/${order._id}/validate-date`, { [field]: order[field] });
-  },
   fetchPurchaseOrders(params) {
     return _get(`admin/purchase-orders`, params);
   },
@@ -224,13 +215,8 @@ export default {
   removeCategory(id) {
     return _delete(`admin/categories/${id}`);
   },
-  dropPackagesCache() {
-    promiseCache.delete(CACHE.PACKAGES);
-  },
   fetchPackages() {
-    const promise = promiseCache.get(CACHE.PACKAGES) || _get('admin/packages');
-    promiseCache.set(CACHE.PACKAGES, promise);
-    return promise;
+    return _get('admin/packages');
   },
   fetchPackageById(id) {
     return _get(`admin/packages/${id}`);
@@ -674,16 +660,8 @@ export default {
   removePrintType(id) {
     return _delete(`admin/print-types/${id}`);
   },
-  dropPrintAreasCache() {
-    promiseCache.delete(CACHE.PRINT_AREAS);
-  },
-  fetchPrintAreas(params) {
-    if (params) {
-      return _get('admin/print-areas', params);
-    }
-    const promise = promiseCache.get(CACHE.PRINT_AREAS) || _get('admin/print-areas');
-    promiseCache.set(CACHE.PRINT_AREAS, promise);
-    return promise;
+  fetchPrintAreas() {
+    return _get('admin/print-areas');
   },
   fetchPrintAreaById(id) {
     return _get(`admin/print-areas/${id}`);
@@ -694,8 +672,8 @@ export default {
   removePrintArea(id) {
     return _delete(`admin/print-areas/${id}`);
   },
-  fetchPrintSizes(params) {
-    return _get('admin/print-sizes', params);
+  fetchPrintSizes() {
+    return _get('admin/print-sizes');
   },
   fetchPrintSizeById(id) {
     return _get(`admin/print-sizes/${id}`);
@@ -826,11 +804,7 @@ export default {
   findResources(query) {
     return _get(`admin/order/resources?search=${query || ''}`);
   },
-  approveMockupRequest(order, resource) {
-    const shopId = order.shop?._id || order.shop;
-    return _post(`admin/shop/${shopId}/order/${order._id}/resources/${resource._id}/approve-request`, {});
-  },
   getReOrderReport(params) {
-    return _get('admin/reports/re-order', params);
-  }
+    return _get(`admin/reports/re-order`, params);
+  },
 };

package/assets/js/api/index.js

@@ -1,15 +1,10 @@
+
 import { _get, _post, _put, _delete, _patch } from './helpers';
 import adminApi from './admin';
 import { unminifySimpleProducts } from './utils/simple-products';
 import { unminifyProduct } from './utils/product';
-import { getSharePromise } from './../utils/share-promises';
-
-const shareRequestsPromises = getSharePromise(5 * 60 * 1000);
 
 const api = {
-  clearAllSharePromises() {
-    return _post('clear-share-promises');
-  },
   fetchClientSettings(shop, params) {
     return _get(`shop/${shop}/client-settings`, params);
   },
@@ -25,9 +20,6 @@ const api = {
   saveCustomer(customer, shop) {
     return customer._id ? _patch(`shop/${shop}/customer/${customer.accessToken}`, customer) : _post(`shop/${shop}/customer`, customer);
   },
-  fetchCustomer(accessToken, shop) {
-    return _get(`shop/${shop}/customer/${accessToken}`);
-  },
   authCustomer(customer, shop) {
     return _post(`shop/${shop}/customer/login`, customer);
   },
@@ -77,8 +69,7 @@ const api = {
     return _get(`shop/${shop}/menus`);
   },
   fetchBanners(shop, params) {
-    const KEY = `shop/${shop}/banners_${JSON.stringify(params || {})}`;
-    return shareRequestsPromises.share(KEY, () => _get(`shop/${shop}/banners`, params));
+    return _get(`shop/${shop}/banners`, params);
   },
   fetchProductsKits(shop, params) {
     return _get(`shop/${shop}/products-kit`, params);
@@ -93,8 +84,7 @@ const api = {
     return _get(`shop/${shop}/news/${alias}?preview=${preview}`);
   },
   fetchNewsTags(shop, params) {
-    const KEY = `shop/${shop}/news-tag_${JSON.stringify(params || {})}`
-    return shareRequestsPromises.share(KEY, () => _get(`shop/${shop}/news-tag`, params));
+    return _get(`shop/${shop}/news-tag`, params);
   },
   fetchNewsTag(shop, alias) {
     return _get(`shop/${shop}/news-tag/${alias}`);
@@ -132,10 +122,6 @@ const api = {
   addOrderTimeline(id, item) {
     return _post(`order/${id}/timeline`, item);
   },
-  approveOrderMockup(order, resource) {
-    const shopId = order.shop?._id || order.shop;
-    return _post(`shop/${shopId}/order/${order._id}/resources/${resource._id}/approve`, resource);
-  },
   generateApprovalPDFs(token) {
     return _post(`order/${token}/approval-pdfs`);
   },

package/components/common/coupon_select/coupon-select.vue

@@ -74,7 +74,7 @@
       <div
         v-else
         class="lc_caption form-help is-danger">
-        Invalid coupon: Min Order for Coupon: {{ minOrderValue | price(currency) }}
+        Invalid coupon: Min Order for Coupon: {{ value.minOrderValue | price(currency) }}
       </div>
       <div v-if="hasQualifyingProducts" class="lc_caption mb-10">
         <div v-if="noQualifyingProductsInCart">
@@ -129,18 +129,8 @@ export default {
     hasQualifyingProductsInCart() {
       return this.sumQualifyingProductsInCart > 0;
     },
-    minOrderValue() {
-      const value = [
-        this.value,
-        ...(this.value?.values || [])
-      ]
-      .filter(v => v?.minOrderValue > 0)
-      .sort((a, b) => a.minOrderValue - b.minOrderValue)[0];
-
-      return value?.minOrderValue || 0;
-    },
     isValidPricing() {
-      return !this.minOrderValue || this.pricing.coupon;
+      return !this.value?.minOrderValue || this.pricing.coupon;
     },
     model: {
       get() {

package/components/common/phone_input/phone-input.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-    <div :class="containerClassname">
+    <div class="form-row">
       <label
         v-if="labelless"
-        :class="labelClassname"
+        class="form-label"
         @click="$refs.phone.$el.focus()">
         {{ displayLabelText }}
       </label>
@@ -31,8 +31,8 @@
               :disabled="disabled"
               :name="'phone' + uniqueKey"
               type="text"
+              class="form-field"
               :class="{
-                [inputClassname]: true,
                 'is-danger': errors.length,
                 filled: model,
                 labelless
@@ -115,18 +115,6 @@ export default {
     namePrefix: {
       type: String,
       default: ''
-    },
-    containerClassname: {
-      type: String,
-      default: 'form-row'
-    },
-    labelClassname: {
-      type: String,
-      default: 'form-label'
-    },
-    inputClassname: {
-      type: String,
-      default: 'form-field'
     }
   },
   data() {

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

@@ -177,9 +177,7 @@ export default {
     if (this.suburb) {
       const option = this.createOptionFromSuburb(this.suburb);
       this.selected = option;
-      if (this.selected.value) {
-        await this.handleSearch(this.selected.value.trim());
-      }
+      await this.handleSearch(this.selected.value.trim())
     }
   },
   methods: {

package/components/customer/customer_navigation_menu/customer-navigation-menu.vue

@@ -15,12 +15,6 @@
 <script>
 export default {
   name: 'CustomerMenu',
-  props: {
-    activeMenuItem: {
-      type: String,
-      required: true
-    }
-  },
   data() {
     return {
       menuItems: [{
@@ -35,12 +29,14 @@ export default {
         label: 'Coupons',
         key: 'coupons',
         url: '/customer/coupons'
-      }, {
-        label: 'Preferences',
-        key: 'preferences',
-        url: '/customer/preferences'
       }]
     };
+  },
+  props: {
+    activeMenuItem: {
+      type: String,
+      required: true
+    }
   }
 };
 </script>
@@ -72,5 +68,5 @@ export default {
       background-color: $green;
     }
   }
-}
+} 
 </style>

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

@@ -176,7 +176,6 @@ export default {
       backgroundImageUrl: null,
       backgroundImageLoaded: false,
       deleteButtonPos: null,
-      offsetWarningVisible: false,
       drawingInProcess: false,
       breakpoints: new Breakpoints()
     };
@@ -192,7 +191,10 @@ export default {
       'selectedLayer',
       'selectedLayerCopy',
       'editorSize',
-      'editModeSelectedLayer'
+      'editModeSelectedLayer',
+      'offsetWarningVisible',
+      'showRecommendationToUseLargerImage',
+      'showErrorAboutSmallImage'
     ]),
     editableLayersCount() {
       return this.editableLayers?.length;
@@ -240,21 +242,6 @@ export default {
         height: `${height * ratio}px`,
       };
     },
-    showRecommendationToUseLargerImage() {
-      return (
-        this.selectedLayer &&
-        this.selectedLayer.type === 'art' &&
-        this.selectedLayer.dpi >= 75 &&
-        this.selectedLayer.dpi <= 100
-      );
-    },
-    showErrorAboutSmallImage() {
-      return (
-        this.selectedLayer &&
-        this.selectedLayer.type === 'art' &&
-        this.selectedLayer.dpi < 75
-      );
-    },
     printAreaIsSmall() {
       const code = this.printAreaSize?.alias || this.printAreaSize;
       return code === 'rect10';
@@ -315,7 +302,8 @@ export default {
       'setSelectedLayerField',
       'setEditModeSelectedLayer',
       'setSelectedLayer',
-      'removeTemplateLayer'
+      'removeTemplateLayer',
+      'setOffsetWarningVisible'
     ]),
     ...mapMutations('layers', [
       'setLayersThumbnail'
@@ -480,7 +468,7 @@ export default {
       this.deleteButtonPos = pos;
     },
     setOffsetWarningVisibility(visible) {
-      this.offsetWarningVisible = visible;
+      this.setOffsetWarningVisible(visible);
     },
     toogleBoundBox(state, option) {
       if (!this.fabricHelper || ['mini', 'xs'].includes(this.breakpoints.is)) {

package/components/product/editor_pricing/editor-pricing.vue

@@ -64,7 +64,7 @@
         v-else-if="isValidOrderQuantity"
         class="EditorPricing__main-alert">
         <img src="~static/images/smile.svg" />
-        All good to go!
+        {{ hasPrintIssues ? 'Proceed with order, Will be in touch regarding print issue' : 'All good to go!' }}
       </div>
 
       <div
@@ -108,7 +108,6 @@ import addToCartMixin from '@lancom/shared/mixins/add-to-cart';
 
 export default {
   name: 'EditorPricing',
-  mixins: [addToCartMixin],
   filters: {
     price,
     tax,
@@ -119,13 +118,7 @@ export default {
     EditorPricingDetails,
     AddToCartBtn
   },
-  data() {
-    return {
-      price: null,
-      showDetails: false,
-      calculatePriceWithDebounce: debounce(() => this.calculateProductPrice({ shop: this.shop, country: this.country, currency: this.currency }), 500)
-    };
-  },
+  mixins: [addToCartMixin],
   props: {
     hasCartBtn: {
       type: Boolean,
@@ -136,6 +129,13 @@ export default {
       default: true
     }
   },
+  data() {
+    return {
+      price: null,
+      showDetails: false,
+      calculatePriceWithDebounce: debounce(() => this.calculateProductPrice({ shop: this.shop, country: this.country, currency: this.currency }), 500)
+    };
+  },
   computed: {
     ...mapGetters(['shop', 'country', 'currency']),
     ...mapGetters('product', [
@@ -149,8 +149,14 @@ export default {
       'isPrintPricing',
       'minimumOrderQuantity',
       'priceIncludeGST',
-      'multipack'
+      'multipack',
+      'offsetWarningVisible',
+      'showRecommendationToUseLargerImage',
+      'showErrorAboutSmallImage'
     ]),
+    hasPrintIssues() {
+      return this.offsetWarningVisible || this.showRecommendationToUseLargerImage || this.showErrorAboutSmallImage;
+    },
     hasUsedSimpleProducts() {
       return this.usedSimpleProducts.length > 0;
     },

package/components/product/product.vue

@@ -32,6 +32,12 @@
         <section class="Product__section">
           <wizard-editor />
         </section>
+        <!-- <section class="Product__section">
+          <product-colors-selector v-if="productDetails" />
+        </section> -->
+        <!-- <section class="Product__section">
+          <product-tier-prices :product="product" />
+        </section> -->
         <section class="Product__section">
           <product-fabric-and-size-info :product="product" />
         </section>
@@ -53,17 +59,23 @@ import RelatedProducts from '@lancom/shared/components/product/related_products/
 import Gallery from '@lancom/shared/components/product/gallery/gallery';
 import { generateProductLink } from '@lancom/shared/assets/js/utils/product';
 import ProductMainInfo from './layouts/product_main_info/product-main-info';
+import ProductColorsSelector from './product_colors_selector/product-colors-selector';
+import ProductTierPrices from './layouts/product_tier_prices/product-tier-prices';
 import ProductFabricAndSizeInfo from './layouts/product_fabric_and_size_info/product-fabric-and-size-info';
 import ProductPackaging from './layouts/product_packaging/product-packaging';
 import ProductModelMeasurements from './layouts/product_model_measurements/product-model-measurements';
 import ProductSizeTable from './layouts/product_size_table/product-size-table';
 import WizardEditor from './wizard-editor/wizard-editor.vue';
 
+    
+// import ProductLabelsCustomization from './layouts/product_labels_customization/product-labels-customization';
 
 export default {
   name: 'Product',
   components: {
     ProductMainInfo,
+    ProductColorsSelector,
+    ProductTierPrices,
     ProductFabricAndSizeInfo,
     ProductPackaging,
     ProductModelMeasurements,

package/components/product/product_reviews/product-reviews.vue

@@ -41,12 +41,6 @@ export default {
     ProductReview
   },
   mixins: [],
-  props: {
-    product: {
-      type: Object,
-      required: true
-    }
-  },
   data() {
     const reviews = this.product.reviews || [];
     const [, mainReviewId] = (this.$route.hash || '').match(/review-([a-z0-9]+)/i) || [];
@@ -62,6 +56,12 @@ export default {
       ].filter(review => !!review)
     };
   },
+  props: {
+    product: {
+      type: Object,
+      required: true
+    }
+  },
   computed: {
     currentReview() {
       return this.reviews[this.activeIndex];

package/components/product/related_products/related-products.vue

@@ -36,15 +36,15 @@ export default {
       products: []
     };
   },
-  async fetch() {
-    const { products } = await api.fetchRelatedProducts(this.shop._id, this.product.alias, { needShuffle: true });
-    this.products = products.splice(0, 6);
-  },
   computed: {
     ...mapGetters(['shop']),
     hasProducts() {
       return this.products.length > 0;
     }
+  },
+  async fetch() {
+    const { products } = await api.fetchRelatedProducts(this.shop._id, this.product.alias, { needShuffle: true });
+    this.products = products.splice(0, 6);
   }
 };
 </script>

package/package.json

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

package/routes/index.js

@@ -87,11 +87,6 @@ module.exports = function(routes, resolve, config) {
     path: '/order/:token/payment',
     component: resolve('@lancom/shared/pages/order/_token/payment/index.vue'),
     chunkName: 'pages/order/payment'
-  }, {
-    name: 'order-resource',
-    path: '/order/:token/resource/:resource',
-    component: resolve('@lancom/shared/pages/order/_token/resource/_resource.vue'),
-    chunkName: 'pages/order/resource'
   }, {
     name: 'order-payment-invoice',
     path: '/order/:token/payment/invoice/:invoice',
@@ -147,11 +142,6 @@ module.exports = function(routes, resolve, config) {
     path: '/customer/password/:token',
     component: resolve('@lancom/shared/pages/customer/password/_token.vue'),
     chunkName: 'pages/customer/password/reset'
-  }, {
-    name: 'customer-preferences',
-    path: '/customer/preferences',
-    component: resolve('@lancom/shared/pages/customer/preferences.vue'),
-    chunkName: 'pages/customer/preferences'
   }, {
     name: 'checkout-cart',
     path: '/checkout/cart',

package/store/auth.js

@@ -18,7 +18,6 @@ export const getters = {
   isGuestUser: state => !state.token,
   isAdmin: state => checkRoles(state.user, ['admin']),
   isContentEditor: state => checkRoles(state.user, ['admin', 'content-editor']),
-  isDesigner: state => checkRoles(state.user, ['admin', 'designer']),
   isWarehouse: state => checkRoles(state.user, ['admin', 'warehouse']),
   user: state => state.user,
   userWarehouse: state => state.user?.warehouse,

package/store/index.js

@@ -4,13 +4,9 @@ import { getAuthToken } from '@lancom/shared/assets/js/utils/auth';
 import { getShopCountrySettings } from '@lancom/shared/assets/js/utils/shop';
 import { MESSAGES, COUNTRIES_MESSAGES } from '@/messages';
 import { SETTINGS, COUNTRIES_SETTINGS } from '@/settings';
-import { getSharePromise, clearAllSharePromises } from '@lancom/shared/assets/js/utils/share-promises';
-
 const cookieparser = process.server ? require('cookieparser') : undefined;
 const CLOSED_NOTIFICATION = 'lancom-closed-notification-1.0';
 
-const shareShopInfo = getSharePromise(60 * 1000);
-
 export const state = () => ({
   googleClickId: null,
   stockCountry: null,
@@ -73,14 +69,9 @@ export const actions = {
       await commit('setShop', shop);
     }
   },
-  async nuxtServerInit({ commit }, { req, query }) {
-    if (query?.cache === 'false') {
-      clearAllSharePromises();
-      await api.clearAllSharePromises();
-    }
-
-    const shop = await shareShopInfo.share(process.env.HOST_NAME, () => api.fetchShopByUrl(process.env.HOST_NAME));
-    const menus = await shareShopInfo.share(`menus_${shop._id}`, () => api.fetchMenus(shop._id));
+  async nuxtServerInit({ commit }, { req }) {
+    const shop = await api.fetchShopByUrl(process.env.HOST_NAME);
+    const menus = await api.fetchMenus(shop._id);
     commit('setMenus', menus);
     commit('setShop', shop);
     // if (req.headers.cookie) {

package/store/product.js

@@ -45,6 +45,7 @@ export const state = () => ({
   selectedPrintUnderbases: {},
   selectedPrintUnderbase: false,
   editModeSelectedLayer: false,
+  offsetWarningVisible: false,
   selectedPrintAreas: {},
   productPricing: null,
   selectedTab: null,
@@ -77,7 +78,7 @@ export const getters = {
   usedBigSizeSimpleProductsQuantity: (state, { usedSimpleProducts }) => filterBigSize(usedSimpleProducts).reduce((sum, { amount }) => sum + amount, 0),
   defaultSimpleProduct: ({ productDetails, editableColor }) => {
     return editableColor && (
-      productDetails.simpleProducts.find(({ color, size }) => color._id === editableColor._id && size?.alias === 'small')
+      productDetails.simpleProducts.find(({ color, size }) => color._id === editableColor._id && size.alias === 'small')
       || productDetails.simpleProducts.find(({ color }) => color._id === editableColor._id)
     );
   },
@@ -162,6 +163,22 @@ export const getters = {
     const price = pricing?.prints?.prints?.reduce((sum , print) => sum + (+print.priceWithoutTax || 0), 0) || maxPrintsPrice;
     return price;
   },
+  offsetWarningVisible: ({ offsetWarningVisible }) => offsetWarningVisible,
+  showRecommendationToUseLargerImage: ({ selectedLayer }) => {
+    return (
+      selectedLayer &&
+      selectedLayer.type === 'art' &&
+      selectedLayer.dpi >= 75 &&
+      selectedLayer.dpi <= 100
+    );
+  },
+  showErrorAboutSmallImage: ({ selectedLayer }) => {
+    return (
+      selectedLayer &&
+      selectedLayer.type === 'art' &&
+      selectedLayer.dpi < 75
+    );
+  }
 };
 
 export const actions = {
@@ -319,6 +336,9 @@ export const mutations = {
   setPriceIncludeGST(state, priceIncludeGST) {
     state.priceIncludeGST = priceIncludeGST;
   },
+  setOffsetWarningVisible(state, offsetWarningVisible) {
+    state.offsetWarningVisible = offsetWarningVisible;
+  },
   setLoadError(state, error) {
     state.loadError = error;
   },

package/assets/js/utils/share-promises/index.js

@@ -1,76 +0,0 @@
-const MAX_PROMISES_COUNT = 1000;
-const DEFAULT_SHARE_LIFETIME = 10 * 1000;
-
-export class SharePromises {
-  constructor(clearSharesTimeoutDelay) {
-    this.promises = new Map();
-    this.clearSharesTimeout = null;
-    this.clearSharesTimeoutDelay = clearSharesTimeoutDelay || DEFAULT_SHARE_LIFETIME;
-  }
-
-  startClearTimeout(key) {
-    const promise = this.promises.get(key);
-    if (promise) {
-      clearTimeout(promise.timeout);
-      promise.timeout = setTimeout(() => {
-        this.promises.delete(key);
-      }, this.clearSharesTimeoutDelay);
-    }
-  }
-
-  share(keyObj, promiseFactory) {
-    const key = `${keyObj}`;
-    let promise = this.promises.get(key);
-    if (!promise) {
-      this.checkMaxPromisesCount();
-
-      promise = {
-        promise: promiseFactory(),
-        timeout: null
-      };
-
-      this.promises.set(key, promise);
-
-      this.startClearTimeout(key);
-    }
-
-    promise.promise = promise.promise.then((result) => result);
-
-    return promise.promise;
-  }
-
-  checkMaxPromisesCount() {
-    if (this.promises.size >= MAX_PROMISES_COUNT) {
-      this.clear();
-    }
-  }
-
-  clear() {
-    this.promises.forEach(promise => {
-      clearTimeout(promise.timeout);
-    });
-    this.promises.clear();
-  }
-
-  clearPromise(keyObj) {
-    const key = `${keyObj}`;
-    let promise = this.promises.get(key);
-    if (promise) {
-      clearTimeout(promise.timeout);
-      this.promises.delete(key);
-    }
-  }
-}
-
-const allSharePromises = [];
-export function getSharePromise(timeout) {
-  const sharePromise = new SharePromises(timeout);
-  allSharePromises.push(sharePromise);
-  return sharePromise;
-}
-
-export function clearAllSharePromises() {
-  for (const sharePromise of allSharePromises) {
-    sharePromise.clear();
-  }
-}

package/components/customer/customer_preferences_form/customer-preferences-form.scss

@@ -1,12 +0,0 @@
-@import "@/assets/scss/variables";
-
-.CustomerPreferencesForm {
-  &__error {
-    font-weight: bold;
-    font-size: 14px;
-    padding: 18px 10px;
-    text-align: center;
-    color: $white;
-    background: #EA3434;
-  }
-}