@lancom/shared 0.0.422 → 0.0.424

package/components/resource/resource_view/resource_view_prints/resource_view_print/resource_view_print_products/resource-view-print-products.vue

@@ -0,0 +1,45 @@
+<template>
+  <div class="ResourceViewPrintProducts__wrapper">
+    <resource-view-print-product
+      v-for="(product, index) in products"
+      :key="product.guid || index"
+      :order="order"
+      :resource="resource"
+      :print="print"
+      :product="product" />
+  </div>
+</template>
+
+<script>
+import ResourceViewPrintProduct from './resource_view_print_product/resource-view-print-product';
+
+export default {
+  name: 'LancomResourceViewPrintProducts',
+  components: {
+    ResourceViewPrintProduct
+  },
+  props: {
+    order: {
+      type: Object,
+      required: true
+    },
+    resource: {
+      type: Object,
+      required: true
+    },
+    print: {
+      type: Object,
+      required: true
+    }
+  },
+  computed: {
+    products() {
+      return this.order.products;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import 'resource-view-print-products.scss';
+</style>

package/components/resource/resource_view/resource_view_prints/resource_view_print/resource_view_print_products/resource_view_print_product/resource-view-print-product.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="ResourceViewPrintProduct__wrapper">
+    <div
+      v-for="simpleProduct in simpleProducts"
+      :key="simpleProduct.guid"
+      class="lc_regular14">
+      {{ simpleProduct.SKU }} x {{ simpleProduct.amount }}
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'LancomResourceViewPrintProduct',
+  props: {
+    order: {
+      type: Object,
+      required: true
+    },
+    resource: {
+      type: Object,
+      required: true
+    },
+    print: {
+      type: Object,
+      required: true
+    },
+    product: {
+      type: Object,
+      required: true
+    }
+  },
+  computed: {
+    simpleProducts() {
+      const simpleProducts = this.product.simpleProducts || [];
+      return simpleProducts.filter(sp => sp.amount > 0);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import 'resource-view-print-product.scss';
+</style>

package/layouts/products.vue

@@ -20,16 +20,12 @@
             <h1 class="Products__name">
               {{ routeName }}
             </h1>
-            <div
-              v-if="!visiblChildrenCategories"
-              class="Products__filters">
+            <div class="Products__filters">
               <products-filters @open="openAside" />
             </div>
           </div>
           <div class="Products__content">
-            <div
-              v-if="!visiblChildrenCategories"
-              class="Products__aside">
+            <div class="Products__aside">
               <breakpoint
                 name="md"
                 mode="up">
@@ -37,10 +33,8 @@
               </breakpoint>
             </div>
             <div class="Products__list">
-              <children-categories v-if="visiblChildrenCategories" />
-              <products-catalog
-                v-else
-                class="Products__catalog" />
+              <children-categories v-if="hasChildrenCategories" />
+              <products-catalog class="Products__catalog" />
             </div>
           </div>
           <div
@@ -103,7 +97,7 @@
     async fetch() {
       await this.loadProducts();
 
-      if (this.page === 1 && this.products.length === 0) {
+      if (this.page === 1) {
         await this.fetchChildrenCategories(this.currentCategory);
       }
 
@@ -115,8 +109,8 @@
       ...mapGetters('page', ['routeInfo']),
       ...mapGetters(['notificationBar', 'shop', 'country', 'currency']),
       ...mapGetters('products', ['category', 'childrenCategories', 'categories', 'brands', 'types', 'tags', 'loadError', 'count', 'products', 'minPrice', 'maxPrice', 'page']),
-      visiblChildrenCategories() {
-        return false; // this.page === 1 && this.products.length === 0 && this.childrenCategories.length > 0;
+      hasChildrenCategories() {
+        return this.childrenCategories.length > 0;
       },
       pageItemCanonical() {
         const page = +this.$route.query.page;

package/package.json

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

package/pages/customer/preferences.vue

@@ -0,0 +1,33 @@
+<template>
+  <div
+    :data-aos="aosFadeLeft"
+    class="CustomerPreferencesPage__wrapper">
+    <customer-preferences />
+  </div>
+</template>
+
+<script>
+import metaInfo from '@lancom/shared/mixins/meta-info';
+
+export default {
+  name: 'CustomerPreferencesPage',
+  components: {
+    CustomerPreferences: () => import('@lancom/shared/components/pages/customer/preferences/preferences')
+  },
+  mixins: [metaInfo]
+};
+</script>
+
+<style lang="scss" scoped>
+  @import "@/assets/scss/variables";
+
+  .CustomerPreferencesPage {
+    &__wrapper {
+      margin: 100px auto;
+      width: 500px;
+      @media (max-width: $bp-extra-small-max) {
+        width: auto;
+      }
+    }
+  }
+</style>

package/pages/order/_token/resource/_resource.vue

@@ -0,0 +1,53 @@
+<template>
+  <div class="ResourceViewPage__wrapper">
+    <div :class="isFullScreen ? '' : 'content-inner'">
+      <resource-view
+        :order="order"
+        :resource="resource"
+        :responsive="!isFullScreen" />
+    </div>
+  </div>
+</template>
+
+<script>
+import metaInfo from '@lancom/shared/mixins/meta-info';
+import api from '@lancom/shared/assets/js/api';
+
+export default {
+  name: 'OrderResourceViewPage',
+  components: {
+    ResourceView: () => import('@lancom/shared/components/resource/resource_view/resource-view')
+  },
+  mixins: [metaInfo],
+  async asyncData({ params, error }) {
+    try {
+      const order = await api.fetchOrderByToken(params.token, { invoiceProducts: true });
+      const resource = order.resources.find(i => [i._id, i.guid].includes(params.resource));
+      if (!resource) {
+        return error({
+          statusCode: 404,
+          error: 'Resource not found'
+        });
+      }
+      return { order, resource };
+    } catch (e) {
+      const { status, data } = e?.response || {};
+      const statusCode = status || 500;
+      error({
+        statusCode,
+        error: data?.error || 'Resource not found'
+      });
+    }
+  },
+  data() {
+    return {
+      order: null,
+      invoice: null,
+      isFullScreen: this.$route.query.print
+    };
+  }
+};
+</script>
+
+<style lang="scss">
+</style>

package/routes/index.js

@@ -87,6 +87,11 @@ 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',
@@ -142,6 +147,11 @@ 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,6 +18,7 @@ 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,9 +4,13 @@ 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,
@@ -69,9 +73,14 @@ export const actions = {
       await commit('setShop', shop);
     }
   },
-  async nuxtServerInit({ commit }, { req }) {
-    const shop = await api.fetchShopByUrl(process.env.HOST_NAME);
-    const menus = await api.fetchMenus(shop._id);
+  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));
     commit('setMenus', menus);
     commit('setShop', shop);
     // if (req.headers.cookie) {

package/store/product.js

@@ -56,6 +56,7 @@ export const getters = {
   productDetailsKey: ({ productDetailsKey }) => productDetailsKey,
   loadingProductDetails: ({ loadingProductDetails }) => loadingProductDetails,
   multipack: ({ multipack }) => multipack,
+  commonProductsMultipacks: ({ product }) => product?.multipacks?.filter(p => !p.SKU) || [],
   calculatingPrice: ({ calculatingPrice }) => calculatingPrice,
   product: ({ product }) => product,
   preSetPrints: ({ preSetPrints }) => preSetPrints,
@@ -76,7 +77,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)
     );
   },