@lancom/shared 0.0.149 → 0.0.151

package/assets/js/api/admin.js

@@ -4,6 +4,18 @@ import { sortSizes } from './../utils/sizes';
 import { sortByName } from './../utils/filters';
 
 export default {
+  fetchPostcodes() {
+    return _get('admin/postcodes');
+  },
+  fetchPostcodeById(id) {
+    return _get(`admin/postcode/${id}`);
+  },
+  savePostcode(postcode) {
+    return postcode._id ? _put(`admin/postcode/${postcode._id}`, postcode) : _post('admin/postcode', postcode);
+  },
+  removePostcode(id) {
+    return _delete(`admin/postcode/${id}`);
+  },
   fetchNews() {
     return _get('admin/news');
   },
@@ -67,8 +79,8 @@ export default {
   orderSubOrders(body) {
     return _post('admin/sub-orders/ordered', body);
   },
-  createOrderSubsequentInvoice(order, invoice) {
-    return _post(`admin/shop/${order.shop}/order/${order._id}/invoice`, invoice);
+  saveOrderSubsequentInvoice(order, invoice) {
+    return invoice._id ? _put(`admin/shop/${order.shop}/order/${order._id}/invoice/${invoice._id}`, invoice) : _post(`admin/shop/${order.shop}/order/${order._id}/invoice`, invoice);
   },
   sendOrderSubsequentInvoice(order, invoice) {
     return _post(`admin/shop/${order.shop}/order/${order._id}/invoice/${invoice}/send`);

package/components/product/gallery/gallery.vue

@@ -67,7 +67,7 @@
           @click="goToSlideAndChangeColor(index)"
           v-lazy:background-image="staticLink(image.small)">
           <div class="Gallery__small-printed">
-            {{ image.printType ? 'Printed' : (product.prePrint ? product.prePrintText : 'Blank') }}
+            {{ image.printType ? 'Printed' : (product.prePrint ? product.prePrintText : image.colorName || 'Blank') }}
           </div>
         </div>
       </vue-slick-carousel>
@@ -137,7 +137,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters('product', ['product', 'images', 'editableColor']),
+    ...mapGetters('product', ['product', 'images', 'editableColor', 'availableColors']),
     hasValidFilters() {
       return this.validFilters.length > 1;
     },
@@ -154,7 +154,8 @@ export default {
           name: printType.name,
           pricing
         };
-        return { ...image, print };
+        const color = this.availableColors.find(({ _id }) => _id === image.color);
+        return { ...image, print, colorName: color?.name };
       });
     }
   },

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

@@ -352,7 +352,8 @@ export default {
           fullName: '',
           email: '',
           phone: '',
-          suburb: null
+          suburb: null,
+          country: 'Australia'
         },
         expectedItemsQuantity: null,
         description: '',

package/components/quotes/quote_view/quote_product_color_simple_products/quote-product-color-simple-products.vue

@@ -48,14 +48,14 @@
               {{ group.amount }}
             </div>
           </div>
-          <div class="QuoteProductColorSimpleProducts__total mt-6">
+          <!-- <div class="QuoteProductColorSimpleProducts__total mt-6">
             <div class="lc_title-small">
               Total price:
             </div>
             <div class="lc_body-small">
               {{ group.productsTotal | price }}
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>

package/mixins/meta-info.js

@@ -26,6 +26,8 @@ const metaInfo = {
     }
   },
   head() {
+    const hasQueryParams = Object.keys(this.$route.query || {}).length > 0;
+
     const { title, short_text: shortText, image, meta = {} } = this.routeInfo || {};
     const pageItemMeta = this.pageItem?.meta || {};
 
@@ -37,6 +39,14 @@ const metaInfo = {
       content: pageTitle
     }];
 
+    if (hasQueryParams) {
+      metaTags.push({
+        hid: 'robots',
+        name: 'robots',
+        content: 'noindex'
+      });
+    }
+
     const pageDescription = this.fillWithItemData(pageItemMeta.description || meta.description || shortText);
     if (pageDescription) {
       metaTags.push({

package/nuxt.config.js

@@ -110,9 +110,11 @@ module.exports = (config, axios, { raygunClient } = {}) => ({
               const catalogFrontImages = (product.images || []).filter(i => (i.types || []).includes('catalog_front')).map(i => i.image);
               const image = spliceFirstImage(feedImages) || spliceFirstImage(frontImages) || spliceFirstImage(catalogFrontImages) || spliceFirstImage(backImages) || {};
               const images = getImages(backImages) || getImages(frontImages) || [];
-              const title = product.feedTitle 
-                ? product.feedTitle.replace('{colour}', sp.color.name).replace('{size}', sp.size.name).replace('{brand}', product.brand.name)
-                : `${product.name} ${sp.color.name}`;
+              const feedTitle = (product.feedTitle || '')
+                .replace(/{colour}/g, sp.color.name)
+                .replace(/{size}/g, sp.size.name)
+                .replace(/{brand}/g, product.brand.name)
+              const title = feedTitle || `${product.name} ${sp.color.name}`;
               const description = `${product.description || product.fabricInfoShort || product.name || ''}`
                 .replace(/ /g, ' ')
                 .replace(/·/, '·');

package/package.json

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