@lancom/shared 0.0.182 → 0.0.184

package/assets/js/api/admin.js

@@ -85,8 +85,8 @@ export default {
   savePurchaseOrder(purchaseOrder) {
     return purchaseOrder._id ? _put(`admin/purchase-order/${purchaseOrder._id}`, purchaseOrder) : _post('admin/purchase-order', purchaseOrder);
   },
-  savePurchaseOrderShipment(purchaseOrder, shipment) {
-    return _put(`admin/purchase-order/${purchaseOrder._id}/shipments/${shipment._id}`, shipment);
+  savePurchaseOrderShipment(purchaseOrder, shipment, params) {
+    return _put(`admin/purchase-order/${purchaseOrder._id}/shipments/${shipment._id}`, shipment, params);
   },
   fetchPurchaseOrderWoTasks(purchaseOrderId) {
     return _get(`admin/purchase-order/${purchaseOrderId}/wo-tasks`);
@@ -365,9 +365,9 @@ export default {
   async fetchWarehouses(params) {
     return sortByName(await _get('admin/warehouse', params));
   },
-  fetchWarehouseLocations(params) {
-    return _get('admin/warehouse/locations', params);
-  },
+  // fetchWarehouseLocations(params) {
+  //   return _get('admin/warehouse/locations', params);
+  // },
   fetchWarehouseById(id) {
     return _get(`admin/warehouse/${id}`);
   },
@@ -386,6 +386,21 @@ export default {
   removeWarehouseTask(id) {
     return _delete(`admin/warehouse-task/${id}`);
   },
+  fetchWarehouseLocations(params) {
+    return _get('admin/warehouse-locations', params);
+  },
+  fetchWarehouseLocationById(id) {
+    return _get(`admin/warehouse-locations/${id}`);
+  },
+  saveWarehouseLocation(item) {
+    return item._id ? _put(`admin/warehouse-locations/${item._id}`, item) : _post('admin/warehouse-locations', item);
+  },
+  removeWarehouseLocation(id) {
+    return _delete(`admin/warehouse-locations/${id}`);
+  },
+  moveToWarehouseLocation(move) {
+    return _post(`admin/warehouse-locations/move`, move);
+  },
   async fetchBanners(params) {
     return sortByName(await _get('admin/banners', params));
   },

package/assets/js/api/helpers.js

@@ -38,6 +38,6 @@ export const prepareHeaders = method => {
 
 export const _post = (url, data, config) => axiosApiInstance.post(buildPath(url), data, { ...config, headers: prepareHeaders() }).then(response => response.data);
 export const _get = (url, params) => axiosApiInstance.get(buildPath(url), { params, headers: prepareHeaders('get') }).then(response => response.data);
-export const _put = (url, data) => axiosApiInstance.put(buildPath(url), { ...data, __v: undefined }, { headers: prepareHeaders() }).then(response => response.data);
+export const _put = (url, data, params) => axiosApiInstance.put(buildPath(url), { ...data, __v: undefined }, { params, headers: prepareHeaders() }).then(response => response.data);
 export const _patch = (url, data) => axiosApiInstance.patch(buildPath(url), { ...data, __v: undefined }, { headers: prepareHeaders() }).then(response => response.data);
 export const _delete = (url, data) => axiosApiInstance.delete(buildPath(url), { data, headers: prepareHeaders() }).then(response => response.data);

package/components/faq/faq.vue

@@ -31,39 +31,31 @@
                 class="icon-cancel FAQ__group-caret"
                 :class="{ active: openedGroup === group.type }"></i>
             </div>
-            <transition
-              name="fade"
-              appear>
+            <div
+              v-show="openedGroup === group.type"
+              class="FAQ__group-content view-transition">
               <div
-                v-if="openedGroup === group.type"
-                class="FAQ__group-content view-transition">
+                v-for="entity in group.entities"
+                :key="entity._id"
+                :ref="entity._id"
+                class="FAQ__entity">
                 <div
-                  v-for="entity in group.entities"
-                  :key="entity._id"
-                  :ref="entity._id"
-                  class="FAQ__entity">
-                  <div
-                    class="FAQ__entity-header"
-                    @click="toggleEntity(entity)">
-                    <div class="FAQ__entity-title">
-                      {{ entity.question }}
-                    </div>
-                    <i
-                      class="icon-angle-down FAQ__entity-header-caret"
-                      :class="{ active: openedEntities.includes(entity._id) }"></i>
+                  class="FAQ__entity-header"
+                  @click="toggleEntity(entity)">
+                  <div class="FAQ__entity-title">
+                    {{ entity.question }}
                   </div>
-                  <transition
-                    name="fade"
-                    appear>
-                    <div
-                      v-if="openedEntities.includes(entity._id)"
-                      class="FAQ__entity-body view-transition"
-                      v-html="entity.answer">
-                    </div>
-                  </transition>
+                  <i
+                    class="icon-angle-down FAQ__entity-header-caret"
+                    :class="{ active: openedEntities.includes(entity._id) }"></i>
+                </div>
+                <div
+                  v-show="openedEntities.includes(entity._id)"
+                  class="FAQ__entity-body view-transition"
+                  v-html="entity.answer">
                 </div>
               </div>
-            </transition>
+            </div>
           </div>
         </div>
       </div>

package/components/product/gallery/gallery.vue

@@ -7,6 +7,7 @@
         :key="updateCarouselTime"
         :arrows="true"
         :dots="true"
+        :infinite="false"
         :swipe="false"
         :speed="800"
         @beforeChange="onChange">
@@ -55,6 +56,7 @@
         :key="updateCarouselTime"
         :slides-per-row="slidesPerRow"
         :arrows="true"
+        :infinite="false"
         :dots="true"
         :speed="800">
         <div

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

@@ -8,6 +8,7 @@
       class="ProductReviews__carousel">
       <vue-slick-carousel
         :arrows="true"
+        :infinite="false"
         :speed="800">
         <product-review
           v-for="review in reviews"

package/mixins/meta-info.js

@@ -9,7 +9,12 @@ const metaInfo = {
   },
   computed: {
     ...mapGetters('page', ['routeInfo']),
-    ...mapGetters(['shop'])
+    ...mapGetters(['shop']),
+    pageTitle() {
+      const { title, meta = {} } = this.routeInfo || {};
+      const pageItemMeta = this.pageItem?.meta || {};
+      return this.fillWithItemData(pageItemMeta.title || meta.title || title || this.generateTitleFromRoute());
+    }
   },
   methods: {
     generateTitleFromRoute() {
@@ -30,10 +35,10 @@ const metaInfo = {
   head() {
     const hasQueryParams = Object.keys(this.$route.query || {}).length > 0;
 
-    const { title, short_text: shortText, image, meta = {} } = this.routeInfo || {};
+    const { short_text: shortText, image, meta = {} } = this.routeInfo || {};
     const pageItemMeta = this.pageItem?.meta || {};
 
-    const pageTitle = this.fillWithItemData(pageItemMeta.title || meta.title || title || this.generateTitleFromRoute());
+    const pageTitle = this.pageTitle;
 
     const metaTags = [{
       hid: 'og:title',

package/nuxt.config.js

@@ -42,6 +42,7 @@ module.exports = (config, axios, { raygunClient } = {}) => ({
     '@/node_modules/@lancom/shared/plugins/global-components',
     '@/node_modules/@lancom/shared/plugins/directives',
     '@/node_modules/@lancom/shared/plugins/vue-js-modal',
+    '@/node_modules/@lancom/shared/plugins/v-style',
     '@/node_modules/@lancom/shared/plugins/vee-validate',
     { src: '@/node_modules/@lancom/shared/plugins/vue-toastr', ssr: false },
     { src: '@/node_modules/@lancom/shared/plugins/vue-hummer', ssr: false },

package/package.json

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

package/plugins/v-style.js

@@ -0,0 +1,7 @@
+import Vue from 'vue';
+
+Vue.component('v-style', {
+  render: function (createElement) {
+    return createElement('style', this.$slots.default)
+  }
+});

package/store/product.js

@@ -120,7 +120,26 @@ export const getters = {
       ...printTypesMinQuantity
     );
   },
-  images: ({ images }) => images,
+  images: ({ images, product }) => {
+    const productImages = images.map((image, index) => {
+      const types = (image.types || []).filter(t => ['front', 'back', 'model'].includes(t));
+      return {
+        ...image,
+        alt: [
+          product.name,
+          product.brand?.name,
+          (types[0] || '').toUpperCase(),
+          types[0] && images.reduce((id, img, i) => {
+            if (i <= index && (img.types || []).includes(types[0])) {
+              id++;
+            }
+            return id;
+          }, 0)
+        ].filter(n => !!n).join(' ')
+      }
+    });
+    return productImages;
+  },
   editableSide: ({ editableSide }) => editableSide,
   priceIncludeGST: ({ priceIncludeGST }) => priceIncludeGST,
   hasUnprintedPrice: ({ product }) => product.minUnprintedPrice || product.maxUnprintedPrice

package/store/products.js

@@ -5,6 +5,8 @@ export const state = () => ({
   page: 1,
   count: 500,
   perPage: 2,
+  minPrice: 0,
+  maxPrice: 0,
   types: [],
   colors: [],
   brands: [],
@@ -23,6 +25,8 @@ export const getters = {
   attributes: ({ attributes }) => attributes || [],
   page: ({ page }) => page,
   count: ({ count }) => count,
+  minPrice: ({ minPrice }) => minPrice,
+  maxPrice: ({ maxPrice }) => maxPrice,
   perPage: ({ perPage }) => perPage,
   loadError: ({ loadError }) => loadError,
   placeholder: ({ placeholder }) => placeholder
@@ -33,7 +37,8 @@ export const actions = {
     try {
       commit('setLoadError', null);
       const {
-        products, count, page, perPage, productTypes, colors, brands, tags, attributes
+        products, count, page, perPage, productTypes, colors, brands, tags, attributes,
+        minPrice, maxPrice
       } = await api.fetchProducts(shop, params);
       commit('setProducts', products);
       commit('setPage', page);
@@ -44,6 +49,8 @@ export const actions = {
       commit('setBrands', brands);
       commit('setTags', tags);
       commit('setAttributes', attributes);
+      commit('setMinPrice', minPrice);
+      commit('setMaxPrice', maxPrice);
     } catch (e) {
       const { status, data } = e?.response || {};
       const statusCode = status || 500;
@@ -78,6 +85,12 @@ export const mutations = {
   setColors(state, colors) {
     state.colors = colors;
   },
+  setMinPrice(state, minPrice) {
+    state.minPrice = minPrice;
+  },
+  setMaxPrice(state, maxPrice) {
+    state.maxPrice = maxPrice;
+  },
   setBrands(state, brands) {
     state.brands = brands;
   },