@lancom/shared 0.0.208 → 0.0.209

package/assets/js/api/admin.js

@@ -428,8 +428,17 @@ export default {
   fetchWarehouseLocations(params) {
     return _get('admin/warehouse-locations', params);
   },
-  fetchWarehouseAllocations(warehouse, params) {
-    return _get(`admin/warehouse/${warehouse}/allocations`, params);
+  fetchWarehouseAllocations(warehouse) {
+    return _get('admin/allocations', { warehouse });
+  },
+  createWarehouseAllocation(allocation) {
+    return _post(`admin/allocations`, allocation);
+  },
+  updateWarehouseAllocation(allocation) {
+    return _put(`admin/allocations/${allocation._id}`, allocation);
+  },
+  removeWarehouseAllocation(allocation) {
+    return _delete(`admin/allocations/${allocation._id}`, allocation);
   },
   fetchWarehouseLocationById(id) {
     return _get(`admin/warehouse-locations/${id}`);
@@ -443,6 +452,9 @@ export default {
   moveToWarehouseLocation(move) {
     return _post(`admin/warehouse-locations/move`, move);
   },
+  moveToWarehouseLocations(move) {
+    return _post(`admin/warehouse-locations/move/bulk`, move);
+  },
   async fetchBanners(params) {
     return sortByName(await _get('admin/banners', params));
   },

package/assets/js/utils/cart.js

@@ -15,7 +15,8 @@ export function groupSimpleProducts(entity, isGroupByColor, isPopulateEmptyProdu
         simpleProducts: [],
         unitCosts: [],
         amount: 0,
-        productsTotal: 0
+        productsTotal: 0,
+        name: simpleProduct.color?.name || simpleProduct.SKU
       };
       const group = groups.get(key) || defaultGroup;
 

package/assets/js/utils/gapis.js

@@ -0,0 +1,61 @@
+function surveyOptin(order, shop) {
+  if (!window.renderOptIn) {
+    const tag = document.createElement('script');
+    tag.src = "https://apis.google.com/js/platform.js?onload=renderOptIn";
+    tag.defer = true;
+    tag.async = true;
+    const firstScriptTag = document.getElementsByTagName('script')[0];
+    firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
+
+    window.renderOptIn = () => {
+      surveyoptinRender(order, shop);
+    }
+  } else {
+    surveyoptinLoad(order, shop);
+  }
+}
+
+function surveyoptinLoad(order, shop) {
+  const { enabledSurveyoptin, MERCHANT_ID } = shop.settings.gapis || {};
+  if (enabledSurveyoptin && MERCHANT_ID) {
+    if (!window.gapi.surveyoptin.render) {
+      window.gapi.load('surveyoptin', function() {
+        surveyoptinRender(order, shop);
+      });
+    } else {
+      surveyoptinRender(order, shop);
+    }
+  }
+}
+
+function surveyoptinRender(order, shop) {
+  const { MERCHANT_ID } = shop.settings.gapis || {};
+  const products = order.products.reduce((gtins, { simpleProducts, product }) => {
+    return [
+      ...gtins,
+      ...(simpleProducts || [])
+        .filter(({ amount }) => amount > 0)
+        .map(({ SKU }) => {
+          const simpleProduct = (product?.simpleProducts || []).find(sp => sp.SKU === SKU);
+          return simpleProduct?.gtin;
+        })
+        .filter(gtin => !!gtin)
+    ];
+  }, []);
+  const estimated_delivery_date = "2023-11-28";
+  const data = {
+    merchant_id: MERCHANT_ID,
+    order_id: order.code,
+    email: order.shippingAddress.email,
+    delivery_country: order.shippingAddress.country,
+    estimated_delivery_date,
+    products,
+    opt_in_style: "BOTTOM_RIGHT_DIALOG"
+  };
+  console.log('surveyoptinRender: ', data);
+  window.gapi.surveyoptin.render(data);
+}
+
+export default {
+  surveyOptin
+};

package/components/checkout/cart/cart_entities_group/cart_entities_group_size_cell/cart-entities-group-size-cell.scss

@@ -13,7 +13,7 @@
     height: 36px;
     padding: 2px !important;
     &.empty {
-      color: #B0B0BA;
+      color: #8b8b8b;
     }
   }
   &__label {

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

@@ -45,7 +45,7 @@
       -moz-appearance: textfield;
     }
     &.empty {
-      color: #B0B0BA;
+      color: #8b8b8b;
     }
   }
   &__price {

package/components/modals/payment_modal/payment-modal.vue

@@ -117,6 +117,7 @@
 import { mapGetters, mapActions, mapMutations } from 'vuex';
 import { price } from '@lancom/shared/assets/js/utils/filters';
 import gtm from '@lancom/shared/assets/js/utils/gtm';
+import gapis from '@lancom/shared/assets/js/utils/gapis';
 import PaymentSuccess from '@lancom/shared/components/checkout/payment/payment_success/payment-success';
 import PaymentFailed from '@lancom/shared/components/checkout/payment/payment_failed/payment-failed';
 
@@ -253,6 +254,7 @@ export default {
     },
     sendConversionData() {
       gtm.purchase(this.orderData);
+      gapis.surveyOptin(this.orderData, this.shop);
     },
     back() {
       /*

package/components/news/news_list_item/news-list-item.vue

@@ -4,14 +4,16 @@
     :style="{ backgroundImage }">
     <nuxt-link
       class="NewsListItem__overlay"
-      :to="{ path: linkToNews }"></nuxt-link>
+      :to="{ path: linkToNews }"
+      :title="item.title"></nuxt-link>
     <div class="NewsListItem__info">
       <template v-if="!item.isHiddenThumbLink">
         <h1>
           <nuxt-link
             :to="{ path: linkToNews }"
             class="NewsListItem__link"
-            :style="{ color: item.color }">
+            :style="{ color: item.color }"
+            :title="item.title">
             {{ item.title }}
           </nuxt-link>
         </h1>
@@ -29,7 +31,8 @@
     </div>
     <nuxt-link
       :to="{ path: linkToNews }"
-      class="NewsListItem__more">
+      class="NewsListItem__more"
+      :title="item.title">
       <span>Read More</span>
     </nuxt-link>
   </article>

package/components/product/gallery/gallery.scss

@@ -54,6 +54,7 @@
   &__small {
     overflow: hidden;
     position: relative;
+    margin: 20px 0;
   }
   &__zoom {
     position: absolute;
@@ -68,6 +69,7 @@
     justify-content: center;
     cursor: pointer;
     display: flex;
+    display: none !important;
     border: 1px solid grey;
   }
   &__big-image,
@@ -79,10 +81,27 @@
     background-size: contain;
     touch-action: auto !important;
     -ms-touch-action: auto !important;
-    &::after {
-      content: ' ';
-      display: block;
-      padding-top: 100%;
+    // &::after {
+    //   content: ' ';
+    //   display: block;
+    //   padding-top: 100%;
+    // }
+  }
+  &__small-image {
+    height: 75px;
+    padding: 5px 0;
+    &-src {
+      max-width: 65px;
+      max-height: 65px;
+      margin: auto;
+    }
+  }
+  &__big-image {
+    height: 400px;
+    &-src {
+      max-width: 400px;
+      max-height: 400px;
+      margin: auto;
     }
   }
   &__big {

package/components/product/gallery/gallery.vue

@@ -19,16 +19,21 @@
           v-hammer:pressup="onPanend"
           v-hammer:panend="onPanend"
           class="Gallery__big-image"
+          style="width: 300px; height: 300px;"
           :style="{
-            'background-image': `url(${staticLink(image.large)}`,
-            'background-size': backgroundSize,
-            'background-position': backgroundPosition,
+            // 'background-image': `url(${staticLink(image.large)}`,
+            // 'background-size': backgroundSize,
+            // 'background-position': backgroundPosition,
             'touch-action': zoomEnable ? 'none' : 'auto'
           }"
           @mousedown="onMouseDown"
           @mouseenter="onMouseEnter"
           @mouseleave="onMouseLeave"
           @mousemove="onMouseMove">
+          <img
+            :src="staticLink(image.large)"
+            class="Gallery__big-image-src"
+             />
           <div
             v-if="image.print"
             class="Gallery__big-print">
@@ -71,8 +76,12 @@
           }"
           @click="goToSlideAndChangeColor(index)"
           :style="{
-            'background-image': `url(${staticLink(image.small)}` 
+            // 'background-image': `url(${staticLink(image.small)}` 
           }">
+          <img
+            :src="staticLink(image.small)"
+            class="Gallery__small-image-src"
+             />
           <div class="Gallery__small-printed">
             {{ image.printType ? 'Printed' : (product.prePrint ? product.prePrintText : image.colorName || 'Blank') }}
           </div>

package/components/product/product_reviews/add_review/add-review.vue

@@ -9,160 +9,168 @@
         tag="form"
         class="AddReview__form">
         <div class="row">
-          <div class="col-sm-7 col-12">
-            <validation-provider
-              v-slot="{ errors }"
-              tag="div"
-              name="Name"
-              rules="required"
-              class="form-row">
-              <input
-                id="add-review-name"
-                ref="name"
-                v-model="form.name"
-                name="name"
-                type="text"
-                class="form-field"
-                :class="{
-                  'is-danger': errors.length,
-                  filled: form.name
-                }"
-                @keyup.enter="$refs.email.focus()" />
-              <label
-                for="add-review-name"
-                class="form-label label-inner">
-                Name
-              </label>
-              <span
-                v-if="errors.length"
-                class="form-help is-danger">
-                {{ errors[0] }}
-              </span>
-            </validation-provider>
-          </div>
-          <div class="col-sm-5 col-12">
-            <validation-provider
-              v-slot="{ errors }"
-              tag="div"
-              name="Email"
-              rules="required|email"
-              class="form-row">
-              <input
-                id="add-review-email"
-                ref="email"
-                v-model="form.email"
-                name="email"
-                type="text"
-                class="form-field"
-                :class="{
-                  'is-danger': errors.length,
-                  filled: form.email
-                }"
-                @keyup.enter="$refs.text.focus()" />
-              <label
-                for="add-review-email"
-                class="form-label label-inner">
-                Email (Not published)
-              </label>
-              <span
-                v-if="errors.length"
-                class="form-help is-danger">
-                {{ errors[0] }}
-              </span>
-            </validation-provider>
-          </div>
-        </div>
-        <div
-          class="row"
-          style="margin-top: -20px;">
-          <div class="col-sm-7 col-12">
-            <validation-provider
-              v-slot="{ errors }"
-              tag="div"
-              name="Review"
-              rules="required|max:1024"
-              class="form-row">
-              <textarea
-                id="add-review-body"
-                ref="body"
-                v-model="form.text"
-                name="body"
-                class="form-textarea--size3"
-                :class="{
-                  'is-danger': errors.length,
-                  filled: form.text
-                }">
-              </textarea>
-              <label
-                for="add-review-body"
-                class="form-label label-inner">
-                Your review...
-              </label>
-              <span
-                v-if="errors.length"
-                class="form-help is-danger">
-                {{ errors[0] }}
-              </span>
-            </validation-provider>
-          </div>
-          <div class="col-sm-5 col-12">
-            <div>
-              <validation-provider
-                v-slot="{ errors }"
-                tag="div"
-                name="Pro"
-                class="form-row">
-                <input
-                  id="add-review-pro"
-                  ref="pro"
-                  v-model="form.pro"
-                  name="pro"
-                  type="text"
-                  class="form-field"
-                  :class="{
-                    'is-danger': errors.length,
-                    filled: form.pro
-                  }" />
-                <label
-                  for="add-review-pro"
-                  class="form-label label-inner">
-                  Pro
-                </label>
-                <span
-                  v-if="errors.length"
-                  class="form-help is-danger">
-                  {{ errors[0] }}
-                </span>
-              </validation-provider>
+          <div class="col-7">
+            <div class="row">
+              <div class="col-12">
+                <validation-provider
+                  v-slot="{ errors }"
+                  tag="div"
+                  name="Name"
+                  rules="required"
+                  class="form-row">
+                  <input
+                    id="add-review-name"
+                    ref="name"
+                    v-model="form.name"
+                    name="name"
+                    type="text"
+                    class="form-field"
+                    :class="{
+                      'is-danger': errors.length,
+                      filled: form.name
+                    }"
+                    @keyup.enter="$refs.email.focus()" />
+                  <label
+                    for="add-review-name"
+                    class="form-label label-inner">
+                    Name
+                  </label>
+                  <span
+                    v-if="errors.length"
+                    class="form-help is-danger">
+                    {{ errors[0] }}
+                  </span>
+                </validation-provider>
+              </div>
+              <div
+                class="col-12"
+                style="margin-top: -20px">
+                <validation-provider
+                  v-slot="{ errors }"
+                  tag="div"
+                  name="Email"
+                  rules="required|email"
+                  class="form-row">
+                  <input
+                    id="add-review-email"
+                    ref="email"
+                    v-model="form.email"
+                    name="email"
+                    type="text"
+                    class="form-field"
+                    :class="{
+                      'is-danger': errors.length,
+                      filled: form.email
+                    }"
+                    @keyup.enter="$refs.text.focus()" />
+                  <label
+                    for="add-review-email"
+                    class="form-label label-inner">
+                    Email (Not published)
+                  </label>
+                  <span
+                    v-if="errors.length"
+                    class="form-help is-danger">
+                    {{ errors[0] }}
+                  </span>
+                </validation-provider>
+              </div>
+              <div
+                class="col-12"
+                style="margin-top: -20px">
+                <validation-provider
+                  v-slot="{ errors }"
+                  tag="div"
+                  name="Review"
+                  rules="required|max:1024"
+                  class="form-row">
+                  <textarea
+                    id="add-review-body"
+                    ref="body"
+                    v-model="form.text"
+                    name="body"
+                    class="form-textarea--size3"
+                    :class="{
+                      'is-danger': errors.length,
+                      filled: form.text
+                    }">
+                  </textarea>
+                  <label
+                    for="add-review-body"
+                    class="form-label label-inner">
+                    Your review...
+                  </label>
+                  <span
+                    v-if="errors.length"
+                    class="form-help is-danger">
+                    {{ errors[0] }}
+                  </span>
+                </validation-provider>
+              </div>
             </div>
-            <div class="mt-10">
-              <validation-provider
-                v-slot="{ errors }"
-                tag="div"
-                name="Cons"
-                class="form-row">
-                <input
-                  id="add-review-cons"
-                  ref="cons"
-                  v-model="form.cons"
-                  name="cons"
-                  type="text"
-                  class="form-field"
-                  :class="{
-                    'is-danger': errors.length,
-                    filled: form.cons
-                  }" />
-                <label
-                  for="add-review-cons"
-                  class="form-label label-inner">
-                  Cons
-                </label>
-                <span
-                  v-if="errors.length"
-                  class="form-help is-danger">
-                  {{ errors[0] }}
-                </span>
-              </validation-provider>
+          </div>
+          <div class="col-5">
+            <div class="row">
+              <div class="col-12">
+                <div>
+                  <validation-provider
+                    v-slot="{ errors }"
+                    tag="div"
+                    name="Pro"
+                    class="form-row">
+                    <textarea
+                      id="add-review-pro"
+                      ref="pro"
+                      v-model="form.pro"
+                      name="pro"
+                      class="form-field"
+                      style="height: 125px;"
+                      :class="{
+                        'is-danger': errors.length,
+                        filled: form.pro
+                      }"></textarea>
+                    <label
+                      for="add-review-pro"
+                      class="form-label label-inner">
+                      Pro
+                    </label>
+                    <span
+                      v-if="errors.length"
+                      class="form-help is-danger">
+                      {{ errors[0] }}
+                    </span>
+                  </validation-provider>
+                </div>
+                <div class="mt-10">
+                  <validation-provider
+                    v-slot="{ errors }"
+                    tag="div"
+                    name="Cons"
+                    class="form-row">
+                    <textarea
+                      id="add-review-cons"
+                      ref="cons"
+                      v-model="form.cons"
+                      name="cons"
+                      class="form-field"
+                      style="height: 125px;"
+                      :class="{
+                        'is-danger': errors.length,
+                        filled: form.cons
+                      }"></textarea>
+                    <label
+                      for="add-review-cons"
+                      class="form-label label-inner">
+                      Cons
+                    </label>
+                    <span
+                      v-if="errors.length"
+                      class="form-help is-danger">
+                      {{ errors[0] }}
+                    </span>
+                  </validation-provider>
+                </div>
+              </div>
             </div>
           </div>
         </div>

package/components/product/product_size_selector/product_size_selector_color/product_size_selector_color_cell/product-size-selector-color-cell.scss

@@ -18,6 +18,9 @@
       }
     }
   }
+  &__lable {
+    display: none;
+  }
   &__field {
     position: relative;
     width: 100%;
@@ -31,7 +34,7 @@
         opacity: .3;
       }
       &.empty {
-        color: $grey_2;
+        color: #8b8b8b;
       }
     }
   }

package/components/product/product_size_selector/product_size_selector_color/product_size_selector_color_cell/product-size-selector-color-cell.vue

@@ -12,13 +12,20 @@
         @click="model -= step">
         <span> - </span>
       </div>
+      <label
+        :for="uniqueFieldId"
+        class="ProductSizeSelectorColorCell__lable">
+        {{ size.name }}
+      </label>
       <input
+        :id="uniqueFieldId"
         v-model.number="model"
         type="number"
         min="0"
         max="9999"
         class="form-field"
         :class="{ invalidate: disabled, empty: !model }"
+        :aria-labelledby="size.name"
         :disabled="disabled"
         @focus="onFocus()"
         @blur="onBlur()" />
@@ -76,6 +83,7 @@ export default {
   },
   data() {
     return {
+      uniqueFieldId: `size-selector-${this.color._id}-${this.size._id}`,
       defaultValue: 0
     };
   },

package/components/quotes/quote_view/quote-view.mixin.js

@@ -1,6 +1,7 @@
 import { mapGetters, mapActions, mapMutations } from 'vuex';
 import api from '@lancom/shared/assets/js/api';
 import gtm from '@lancom/shared/assets/js/utils/gtm';
+import gapis from '@lancom/shared/assets/js/utils/gapis';
 import { price, shortDate, tax } from '@lancom/shared/assets/js/utils/filters';
 import { convertQuoteToOrder } from '@lancom/shared/assets/js/utils/quote';
 
@@ -37,6 +38,7 @@ export default {
         this.order = await this.createOrder(option);
         this.setOrder(this.order);
         gtm.purchase(this.order);
+        gapis.surveyOptin(this.order, this.shop);
         this.clear();
       } catch (e) {
         const { message } = (e.response && e.response.data) || e;

package/mixins/payment.js

@@ -1,5 +1,6 @@
 import { mapGetters, mapActions, mapMutations } from 'vuex';
 import gtm from '@lancom/shared/assets/js/utils/gtm';
+import gapis from '@lancom/shared/assets/js/utils/gapis';
 import { ORDER_PAYMENT_METHOD } from '@lancom/shared/assets/js/constants/order';
 
 export default {
@@ -64,6 +65,7 @@ export default {
     },
     sendConversionData() {
       gtm.purchase(this.orderData);
+      gapis.surveyOptin(this.orderData, this.shop);
     },
     clearFailedCharge() {
       this.errorMessage = null;

package/nuxt.config.js

@@ -65,6 +65,9 @@ module.exports = (config, axios, { raygunClient, publicPath } = {}) => ({
     { src: '@/node_modules/@lancom/shared/plugins/vue-recaptcha', ssr: false },
     // { src: '@/node_modules/@lancom/shared/plugins/vue-tables-2', ssr: false }
   ],
+  serverMiddleware: [
+    '@/node_modules/@lancom/shared/plugins/headers'
+  ],
   modules: [
     'nuxt-helmet',
     '@nuxtjs/axios',
@@ -146,6 +149,7 @@ module.exports = (config, axios, { raygunClient, publicPath } = {}) => ({
                       }
                     },
                     review_timestamp: { _text: review.createdAt },
+                    title: { _text: product.name },
                     content: { _text: review.text },
                     review_url: {
                       _attributes: {
@@ -165,27 +169,34 @@ module.exports = (config, axios, { raygunClient, publicPath } = {}) => ({
                     products: {
                       product: {
                         product_ids: {
-                          // gtins: {
-                          //   gtin: { _text: '541710238425' }
-                          // },
+                          brands: {
+                            brand: { _text: product.brand.name }
+                          },
                           // mpns: {
                           //   mpn: { _text: '60101-10000' }
                           // },
-                          skus: {
-                            sku: { _text: review.product.SKU }
-                          },
-                          brands: {
-                            brand: { _text: review.product.brand.name }
-                          },
                           // asins: {
                           //   asin: { _text: 'B07YMJ57MB' }
                           // }
                         },
-                        product_name: { _text: review.product.name },
+                        product_name: { _text: product.name },
                         product_url: { _text: productUrl }
                       }
                     }
                   };
+
+                  if (product.simpleProduct?.gtin) {
+                    item.products.product.product_ids.gtins = {
+                      gtin: { _text: product.simpleProduct?.gtin }
+                    };
+                  }
+
+                  if (product.simpleProduct?.SKU) {
+                    item.products.product.product_ids.skus = {
+                      sku: { _text: product.simpleProduct?.SKU }
+                    };
+                  }
+
                   if (review.pro) {
                     item.pros = {
                       pro: [{ _text: review.pro }]

package/package.json

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

package/plugins/directives.js

@@ -1,5 +1,7 @@
 import Vue from 'vue';
 
+Vue.config.productionTip = false;
+
 Vue.directive('focus', {
   inserted: (el, binding) => {
     const delay = binding.value || 500;

package/plugins/headers.js

@@ -0,0 +1,4 @@
+module.exports = function (req, res, next) {
+  res.removeHeader('Expect-CT');
+  next();
+};