@lancom/shared 0.0.132 → 0.0.135

package/assets/js/api/admin.js

@@ -16,6 +16,18 @@ export default {
   removeNews(id) {
     return _delete(`admin/news/${id}`);
   },
+  fetchNewsTags() {
+    return _get('admin/news-tag');
+  },
+  fetchNewsTagById(id) {
+    return _get(`admin/news-tag/${id}`);
+  },
+  saveNewsTag(newsTag) {
+    return newsTag._id ? _put(`admin/news-tag/${newsTag._id}`, newsTag) : _post('admin/news-tag', newsTag);
+  },
+  removeNewsTag(id) {
+    return _delete(`admin/news-tag/${id}`);
+  },
   fetchShops() {
     return _get('admin/shops');
   },

package/assets/js/api/index.js

@@ -63,6 +63,12 @@ const api = {
   fetchSingleNews(shop, alias, preview = false) {
     return _get(`shop/${shop}/news/${alias}?preview=${preview}`);
   },
+  fetchNewsTags(shop, params) {
+    return _get(`shop/${shop}/news-tag`, params);
+  },
+  fetchNewsTag(shop, alias) {
+    return _get(`shop/${shop}/news-tag/${alias}`);
+  },
   fetchProductDetails(shop, alias) {
     return _get(`shop/${shop}/products/${alias}/simple-products`);
   },

package/assets/js/utils/quote.js

@@ -1,4 +1,5 @@
 export function convertQuoteToOrder(quote, option) {
+  const files = [quote.file, ...(quote.files || [])].filter(f => !!f);
   return {
     paymentMethod: option.paymentMethod || 'deposit',
     billingAddress: quote.address,
@@ -15,14 +16,14 @@ export function convertQuoteToOrder(quote, option) {
     shippingTotal: option.shippingTotal,
     adminShippingTotal: option.adminShippingTotal,
     quote: quote._id,
-    resources: quote.file ? [{
+    resources: files.map(f => ({
       status: 'pending approval',
       prints: [],
       revision: null,
       note: null,
       type: 'Artwork Files',
-      file: quote.file
-    }] : []
+      file: f.file
+    }))
   };
 }
 

package/components/checkout/cart/cart_entity/cart-entity.mixin.js

@@ -26,16 +26,19 @@ export default {
     hasPrints() {
       return this.sumPrints > 0;
     },
+    cartEntityPricing() {
+      return this.cartProductsPricing[this.entity.guid] || {};
+    },
     totalPrice() {
-      const { totalPriceWithoutTax = 0 } = this.cartProductsPricing[this.entity.guid] || {};
+      const { totalPriceWithoutTax = 0 } = this.cartEntityPricing;
       return totalPriceWithoutTax;
     },
     printsTotalPrice() {
-      const { prints = {} } = this.cartProductsPricing[this.product.guid] || {};
+      const { prints = {} } = this.cartEntityPricing;
       return prints.totalPriceWithoutTax || 0;
     },
     productsTotalPrice() {
-      const { product = {} } = this.cartProductsPricing[this.entity.guid] || {};
+      const { product = {} } = this.cartEntityPricing;
       return product.totalPriceWithoutTax || 0;
     },
     simpleProductsWithAmount() {
@@ -46,6 +49,19 @@ export default {
     },
     groupedSimpleProducts() {
       return groupSimpleProducts(this.entity, true, true);
+    },
+    isSameUnitPrices() {
+      const { products } = this.cartEntityPricing;
+      const uniquePrices = (products?.products || []).reduce((prices, product) => {
+        prices.add(product.priceWithoutTax);
+        return prices;
+      }, new Set());
+      return uniquePrices.size === 1;
+    },
+    unitPrice() {
+      const { products } = this.cartEntityPricing;
+      const product = (products?.products || [])[0];
+      return product ? product.priceWithoutTax : null;
     }
   },
   methods: {

package/components/checkout/cart/cart_entity/cart-entity.vue

@@ -33,9 +33,15 @@
           :entity="entity"
           :group="group"
           :default-preview="false"
+          :display-unit-price="!isSameUnitPrices"
           class="CartEntity__item"
           @remove="removeSimpleProducts" />
       </div>
+      <div
+        v-if="isSameUnitPrices"
+        class="lc_title-small mt-8">
+        Price Per Unit: {{ unitPrice | price }}
+      </div>
       <div
         v-if="hasPrints"
         class="CartEntity__decorations">

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart-entity-color-simple-products.mixin.js

@@ -17,6 +17,10 @@ export default {
       type: Boolean,
       default: true
     },
+    displayUnitPrice: {
+      type: Boolean,
+      default: false
+    },
     defaultPreview: {
       type: Boolean,
       default: true

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart-entity-color-simple-products.vue

@@ -34,11 +34,19 @@
             <div class="lc_title-small mt-8">
               Qty:
             </div>
+            <div
+              v-if="displayUnitPrice && cartProductsPricing"
+              class="lc_title-small mt-8">
+              &nbsp;
+            </div>
+            
           </div>
           <cart-entity-color-simple-product
             v-for="simpleProduct in group.simpleProducts"
             :key="simpleProduct._id"
-            :simple-product="simpleProduct" />
+            :simple-product="simpleProduct"
+            :entity="entity"
+            :display-unit-price="displayUnitPrice" />
         </div>
         <div class="CartEntityColorSimpleProducts__totals">
           <div class="CartEntityColorSimpleProducts__total">

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart_entity_color_simple_product/cart-entity-color-simple-product.scss

@@ -48,6 +48,14 @@
       color: #B0B0BA;
     }
   }
+  &__price {
+    width: 32px;
+    height: 28px;
+    font-size: 9px;
+    text-align: center;
+    color: #A2A2A2;
+    padding-top: 5px;
+  }
   &__controls {
     display: flex;
     flex-direction: column;

package/components/checkout/cart/cart_entity/cart_entity_color_simple_products/cart_entity_color_simple_product/cart-entity-color-simple-product.vue

@@ -38,6 +38,13 @@
       class="centered CartColorSimpleProduct__field">
       {{ model }}
     </div>
+    <div
+      v-if="displayUnitPrice"
+      class="centered CartColorSimpleProduct__price">
+      <span v-if="model > 0">
+        {{ unitPrice | price }}
+      </span>
+    </div>
   </div>
 </template>
 
@@ -45,12 +52,19 @@
 import debounce from 'lodash.debounce';
 import { mapGetters, mapActions } from 'vuex';
 import confirm from '@lancom/shared/mixins/confirm';
-import { inRange } from '@lancom/shared/assets/js/utils/filters';
+import { inRange, price } from '@lancom/shared/assets/js/utils/filters';
 
 export default {
   name: 'CartColorSimpleProduct',
   mixins: [confirm],
+  filters: {
+    price
+  },
   props: {
+    entity: {
+      type: Object,
+      required: true
+    },
     simpleProduct: {
       type: Object,
       required: true
@@ -62,6 +76,10 @@ export default {
     editable: {
       type: Boolean,
       default: true
+    },
+    displayUnitPrice: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -72,7 +90,7 @@ export default {
   },
   computed: {
     ...mapGetters(['shop']),
-    ...mapGetters('cart', ['simpleProducts']),
+    ...mapGetters('cart', ['simpleProducts', 'cartProductsPricing']),
     model: {
       get() {
         return (this.simpleProducts.find(sp => sp.guid === this.simpleProduct.guid) || {}).amount || this.defaultValue;
@@ -88,6 +106,11 @@ export default {
           shop: this.shop
         });
       }
+    },
+    unitPrice() {
+      const { products } = this.cartProductsPricing[this.entity.guid] || {};
+      const product = (products || {})[this.simpleProduct.guid];
+      return product ? product.priceWithoutTax : null;
     }
   },
   methods: {

package/components/common/checkbox.vue

@@ -13,6 +13,7 @@
       @change="$emit('change', model)" />
     <label
       class="Checkbox__label"
+      :class="{ dark }"
       :for="id"
       @click.stop>
       <i class="icon-ok Checkbox__icon"></i>
@@ -35,6 +36,9 @@ export default {
     disabled: {
       default: false
     },
+    dark: {
+      default: false
+    },
     uncheckedValue: {
       default: false
     },
@@ -128,6 +132,12 @@ html[dir=rtl] {
         transform: translateY(-50%);
       }
 
+      &.dark {
+        &:before {
+          border: 1px solid $grey_1;
+        }
+      }
+
       &:after {
         content: '';
         position: absolute;

package/components/common/pricing_discounts_table/pricing-discounts-table.vue

@@ -16,7 +16,12 @@
           active: amount >= range.min && ((range.max && amount <= range.max) || !range.max)
         }">
         <td>{{ (range.max >= 9999 || !range.max) ? `${range.min}+` : `${range.min}-${range.max}` }}</td>
-        <td>{{ range.price | priceWithTax(pricingSettings) }}</td>
+        <td v-if="withGst">
+          {{ range.price | priceWithTax(pricingSettings) }}
+        </td>
+        <td v-else>
+          {{ range.price | price }}
+        </td>
       </tr>
     </tbody>
   </table>
@@ -24,12 +29,13 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { priceWithTax } from '@lancom/shared/assets/js/utils/filters';
+import { priceWithTax, price } from '@lancom/shared/assets/js/utils/filters';
 
 export default {
   name: 'PricingDiscountsTable',
   filters: {
-    priceWithTax
+    priceWithTax,
+    price
   },
   props: {
     prices: {
@@ -47,6 +53,10 @@ export default {
     striped: {
       type: Boolean,
       default: false
+    },
+    withGst: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {

package/components/common/tabs.vue

@@ -5,7 +5,10 @@
         v-for="tab in tabs"
         :key="tab.value"
         class="tab ripple"
-        :class="{ active: currentTab === tab.value }"
+        :class="{
+          active: currentTab === tab.value,
+          shadow: btnsShadow
+        }"
         @click="select(tab)">
         <div class="lc_medium18 tab-label">
           <i
@@ -53,6 +56,10 @@ export default {
       type: Boolean,
       default: false
     },
+    btnsShadow: {
+      type: Boolean,
+      default: false
+    },
     fullWidth: {
       type: Boolean,
       default: true
@@ -132,7 +139,6 @@ export default {
   &s {
     display: flex;
     border-radius: 4px 4px 0 0;
-    overflow: hidden;
     &--secondary,
     &--primary,
     &--large {
@@ -161,12 +167,19 @@ export default {
     background-color: #FFFFFF;
     color: $grey_1;
   }
+  &:hover {
+    background-color: #FFFFFF;
+    color: $grey_1;
+  }
   &s--large &.active,
   &s--primary &.active,
   &s--secondary &.active {
     background-color: $grey_4;
     color: $black;
   }
+  &.shadow {
+    box-shadow: 1px 1px 2px rgb(214, 214, 214);
+  }
 }
 .fullWidth .tab {
   flex-grow: 1;

package/components/news/news_list/news-list.scss

@@ -4,6 +4,7 @@
   &__wrapper {
     display: flex;
     flex-wrap: wrap;
+    margin-bottom: 20px;
   }
   &__item {
     width: calc(50% - 30px);
@@ -21,4 +22,47 @@
       }
     }
   }
+}
+
+
+.VuePagination {
+  &__pagination {
+    display: flex;
+    justify-content: center;
+    &-item {
+      font-size: 16px;
+      line-height: 170%;
+      color: $black;
+      width: 50px;
+      height: 50px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border: 1px solid $grey_3;
+      border-radius: 4px;
+      margin: 0 3px;
+      a {
+        display: block;
+        width: 100%;
+        height: 100%;
+        text-align: center;
+        padding-top: 11px;
+        cursor: pointer;
+        &:hover {
+          background-color: $grey_3;
+        }
+      }
+      &.active {
+        background-color: $black;
+        color: white;
+      }
+      &.disabled {
+        pointer-events: none;
+        opacity: .5;
+      }
+    }
+  }
+  &__count {
+    display: none;
+  }
 }

package/components/news/news_list/news-list.vue

@@ -1,38 +1,74 @@
 <template>
-  <div class="NewsList__wrapper">
-    <div
-      v-for="(item, index) in news"
-      :key="item._id"
-      :class="{
-        'NewsList__item--large': (index + 1) % 3 === 0
-      }"
-      class="NewsList__item">
-      <transition
-        :name="(index + 1) % 3 ? 'from-right-to-left' : 'from-left-to-right'"
-        appear>
-        <news-list-item :item="item" class="elevation2" />
-      </transition>
+  <div>
+    <div class="NewsList__wrapper">
+      <div
+        v-for="(item, index) in news"
+        :key="item._id"
+        :class="{
+          'NewsList__item--large': (index + 1) % 3 === 0
+        }"
+        class="NewsList__item">
+        <transition
+          :name="(index + 1) % 3 ? 'from-right-to-left' : 'from-left-to-right'"
+          appear>
+          <news-list-item :item="item" class="elevation2" />
+        </transition>
+      </div>
     </div>
+    <pagination
+      v-if="perPage > 0"
+      v-model="currentPage"
+      :records="count"
+      :per-page="perPage"
+      :options="{ chunk: 3 }" />
   </div>
 </template>
 
 <script>
+import Pagination from 'vue-pagination-2';
 import NewsListItem from '../news_list_item/news-list-item';
 
 export default {
   name: 'NewsList',
   components: {
-    NewsListItem
+    NewsListItem,
+    Pagination
   },
   props: {
     news: {
       type: Array,
       required: true
+    },
+    count: {
+      type: Number
+    },
+    perPage: {
+      type: Number
+    },
+    page: {
+      type: Number
+    }
+  },
+  computed: {
+    currentPage: {
+      get() {
+        return this.page;
+      },
+      set(page) {
+        const params = [];
+        if (page > 1) {
+          params.push(`page=${page}`);
+        }
+        const link = `${this.$route.path}${params.length ? `?${params.join('&')}` : ''}`;
+        window.location = link;
+        // this.$router.push(link);
+        // window.scrollTo(0, 0);
+      }
     }
   }
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 @import 'news-list';
 </style>

package/components/order/order_view/order-view.vue

@@ -17,7 +17,7 @@
         </h4>
       </div>
       <h1 class="text-secondary lc_h1">
-        {{ model.paymentMethod === 'deposit' ? 'Proforma Invoice' : 'Tax invoice' }}
+        Tax invoice
       </h1>
     </div>
     <div class="OrderView__info">
@@ -144,6 +144,9 @@
           <div class="lc_regular16">
             Total inc GST: <b>{{ model.totalGST | price }}</b>
           </div>
+          <div class="lc_regular16">
+            Pending Payment: <b>{{ model.totalGST | price }}</b>
+          </div>
         </div>
       </div>
     </div>

package/components/product/gallery/gallery.vue

@@ -171,6 +171,12 @@ export default {
       this.skipUpdateGallery = false;
     }
   },
+  mounted() {
+    const index = this.filteredImages.findIndex(i => i.color === this.editableColor?._id);
+    if (index > -1) {
+      this.goToSlide(index, true);
+    }
+  },
   methods: {
     ...mapActions('product', ['selectColor']),
     staticLink,

package/components/product/product_info_tabs/product-info-tabs.vue

@@ -3,6 +3,7 @@
     <tabs
       :tabs="tabs"
       :selected="selectedTab"
+      :btns-shadow="true"
       @select="selectedTab = $event">
       <template #default="{ currentTab }">
         <component

package/components/product/product_prints_price_info/product-prints-price-info.scss

@@ -32,6 +32,9 @@
 }
 
 .ProductPrintsPriceInfo {
+  &__wrapper {
+    position: relative;
+  }
   &__print-pricing {
     margin-top: 30px;
   }
@@ -60,4 +63,11 @@
     justify-content: flex-end;
     padding: 0 0 10px 0;
   }
+  &__content {
+    opacity: 1;
+    transition: opacity 500ms;
+    &--hidden {
+      opacity: 0;
+    }
+  }
 }

package/components/product/product_prints_price_info/product-prints-price-info.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="ProductPrintsPriceInfo__wrapper">
     <div class="ProductPrintsPriceInfo__toggle-gst">
-      <checkbox v-model="inclGST">
+      <checkbox
+        v-model="inclGST"
+        :dark="true"
+        @change="onChangeInclGST">
         <div class="ml-5">Inc. GST</div>
       </checkbox>
     </div>
@@ -9,22 +12,29 @@
       v-if="avilableTabs.length > 0"
       :tabs="avilableTabs"
       :selected="selectedTab"
+      :btns-shadow="true"
       type="secondary"
       @select="selectedTab = $event">
       <template #default="{ currentTab }">
-        <product-screen-print-price-info
-          v-if="currentTab === 'screen print'"
-          :product="product"
-          :with-gst="inclGST" />
-        <product-print-price-info
-          v-else-if="currentTab"
-          :product="product"
-          :type="currentTab"
-          :with-gst="inclGST" />
         <div
-          v-if="currentPrintTypeMessage"
-          class="ProductPrintsPriceInfo__print-description"
-          v-html="currentPrintTypeMessage"></div>
+          class="ProductPrintsPriceInfo__content"
+          :class="{
+            'ProductPrintsPriceInfo__content--hidden': inclGSTSpinner
+          }">
+          <product-screen-print-price-info
+            v-if="currentTab === 'screen print'"
+            :product="product"
+            :with-gst="inclGSTFinal" />
+          <product-print-price-info
+            v-else-if="currentTab"
+            :product="product"
+            :type="currentTab"
+            :with-gst="inclGSTFinal" />
+          <div
+            v-if="currentPrintTypeMessage"
+            class="ProductPrintsPriceInfo__print-description"
+            v-html="currentPrintTypeMessage"></div>
+        </div>
       </template>
     </tabs>
     <div
@@ -59,6 +69,9 @@ export default {
   data() {
     return {
       inclGST: false,
+      inclGSTFinal: false,
+      inclGSTSpinner: false,
+      inclGSTSpinnerTimer: null,
       orderPrintTypes: PRINT_TYPES_LIST,
       tabs: [{
         label: 'Black',
@@ -107,8 +120,19 @@ export default {
       group: 'garment-print-price-details'
     });
   },
+  destroyed() {
+    clearTimeout(this.inclGSTSpinnerTimer);
+  },
   methods: {
-    ...mapActions(['loadHelpMessages'])
+    ...mapActions(['loadHelpMessages']),
+    onChangeInclGST() {
+      clearTimeout(this.inclGSTSpinnerTimer);
+      this.inclGSTSpinner = true;
+      this.inclGSTSpinnerTimer = setTimeout(() => {
+        this.inclGSTSpinner = false;
+        this.inclGSTFinal = this.inclGST;
+      }, 500);
+    }
   }
 };
 </script>

package/components/quotes/quote_request/quote-request.vue

@@ -94,7 +94,7 @@
                 Upload your logo/artwork
               </div>
               <file-uploader
-                :multiple="false"
+                :multiple="true"
                 :url="`image/editor/${shop._id}/undefined`"
                 :has-conversion-error-modal="false"
                 :show-error-message="false"
@@ -135,14 +135,14 @@
                 {{ uploadError }}
               </div>
               <div
-                v-if="quote.file"
-                class="QuoteRequest__upload-file">
-                <span @click="quote.file = null">x</span>
-                Logo:
+                v-for="file in quote.files"
+                :key="file._id"
+                class="QuoteRequest__upload-file mt-5">
+                <span @click="quote.files.splice(quote.files.indexOf(file), 1)">x</span>
                 <a
-                  :href="quote.file.origin"
+                  :href="file.origin"
                   target="_blank">
-                  {{ quote.file.fileName }}
+                  {{ file.fileName }}
                 </a>
               </div>
             </div>
@@ -357,7 +357,7 @@ export default {
         quoteTypes: [],
         needToPrint: null,
         needItBy: null,
-        file: null
+        files: []
       }
     };
   },
@@ -366,15 +366,15 @@ export default {
   },
   methods: {
     handleUploaded(file) {
-      this.quote.file = file;
+      this.quote.files.push(file);
     },
     handleUploadError(e) {
       const { error, data } = e?.response?.data || {};
       if (data) {
-        this.quote.file = {
+        this.quote.files.push({
           fileName: data.fileName,
           origin: data.source
-        };
+        });
       } else {
         this.uploadError = error;
       }

package/nuxt.config.js

@@ -1,4 +1,4 @@
-module.exports = (config, axios) => ({
+module.exports = (config, axios, { raygunClient } = {}) => ({
   mode: 'universal',
   head: {
     title: config.npm_package_name || '',
@@ -79,6 +79,15 @@ module.exports = (config, axios) => ({
       }
     }
   },
+  hooks: {
+    render: {
+      errorMiddleware(app) {
+        if (raygunClient) {
+          app.use(raygunClient.expressHandler);
+        }
+      }
+    },
+  },
   feed: [{
     path: '/google-shopping.xml',
     async get() {

package/package.json

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