@lancom/shared 0.0.125 → 0.0.128

package/assets/js/api/admin.js

@@ -278,6 +278,18 @@ export default {
   removeSupplier(id) {
     return _delete(`admin/suppliers/${id}`);
   },
+  async fetchDecorators(params) {
+    return sortByName(await _get('admin/decorators', params));
+  },
+  fetchDecoratorById(id) {
+    return _get(`admin/decorators/${id}`);
+  },
+  saveDecorator(decorator) {
+    return decorator._id ? _put(`admin/decorators/${decorator._id}`, decorator) : _post('admin/decorators', decorator);
+  },
+  removeDecorator(id) {
+    return _delete(`admin/decorators/${id}`);
+  },
   async fetchWarehouses(params) {
     return sortByName(await _get('admin/warehouse', params));
   },

package/assets/js/api/helpers.js

@@ -27,6 +27,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, { headers: prepareHeaders() }).then(response => response.data);
-export const _patch = (url, data) => axiosApiInstance.patch(buildPath(url), data, { headers: prepareHeaders() }).then(response => response.data);
+export const _put = (url, data) => axiosApiInstance.put(buildPath(url), { ...data, __v: undefined }, { 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/assets/js/utils/gtm.js

@@ -1,19 +1,7 @@
 const gtm = {
-  push({
-    id,
-    total,
-    tax,
-    shipping,
-    products
-  }) {
+  push(data) {
     window.dataLayer = window.dataLayer || [];
-    window.dataLayer.push({
-      transactionId: id,
-      transactionTotal: total,
-      transactionTax: tax,
-      transactionShipping: shipping,
-      transactionProducts: products
-    });
+    window.dataLayer.push(data);
   }
 };
 

package/assets/js/utils/quote.js

@@ -14,7 +14,15 @@ export function convertQuoteToOrder(quote, option) {
     printsTotal: option.printsTotal,
     shippingTotal: option.shippingTotal,
     adminShippingTotal: option.adminShippingTotal,
-    quote: quote._id
+    quote: quote._id,
+    resources: quote.file ? [{
+      status: 'pending approval',
+      prints: [],
+      revision: null,
+      note: null,
+      type: 'Artwork Files',
+      file: quote.file
+    }] : []
   };
 }
 

package/components/checkout/order/order-checkout-method/order-checkout-method.scss

@@ -1,10 +1,18 @@
+@import "@/assets/scss/variables";
+
 .OrderCheckoutMethod {
   &__controls {
     display: flex;
     width: 100%;
+    @media (max-width: $bp-small-max) {
+      flex-direction: column;
+    }
     > div {
       flex-grow: 1;
       margin: 0 5px;
+      @media (max-width: $bp-small-max) {
+        margin: 0 5px 20px 5px;
+      }
     }
   }
 }

package/components/checkout/order/order-checkout-method/order-checkout-method.vue

@@ -10,13 +10,6 @@
               :btn-block="true"
               @onclick="isRegister = false" />
           </div>
-          <div>
-            <btn
-              :btn-class="isRegister ? 'green' : 'white'"
-              btn-label="REGISTER"
-              :btn-block="true"
-              @onclick="isRegister = true" />
-          </div>
           <div style="margin-top: -10px">
             <progress-steps-controls
               next-btn-class="white"
@@ -24,6 +17,13 @@
               label-next="Checkout as Guest"
               @next="$emit('next')" />
           </div>
+          <div>
+            <btn
+              :btn-class="isRegister ? 'green' : 'white'"
+              btn-label="REGISTER"
+              :btn-block="true"
+              @onclick="isRegister = true" />
+          </div>
         </div>
       </div>
     </div>

package/components/common/postcode_select/postcode-select.vue

@@ -27,7 +27,7 @@
         :allow-empty="false"
         :option-height="35"
         :loading="isLoading"
-        track-by="value"
+        track-by="_id"
         @search-change="handleSearchWithDebounce">
         <div
           slot="singleLabel"

package/components/products/products_autocomplete/products-autocomplete.scss

@@ -28,6 +28,17 @@
         text-decoration: none;
       }
     }
+    &-all {
+      padding: 10px;
+      text-align: center;
+      display: block;
+      background-color: $white;
+      border-bottom: 1px solid $gray_main;
+      &:hover {
+        background-color: $black;
+        color: $white;
+      }
+    }
   }
   &__input {
     input {

package/components/products/products_autocomplete/products-autocomplete.vue

@@ -34,6 +34,13 @@
           :product="product"
           class="ProductsAutocomplete__result-item"
           @select="$emit('select', product)" />
+        <div class="ProductsAutocomplete__result-item">
+          <nuxt-link
+            class="ProductsAutocomplete__result-item-all"
+            :to="fullSearchLink">
+            click to see all results
+          </nuxt-link>
+        </div>
       </div>
     </div>
   </div>
@@ -70,11 +77,14 @@ export default {
     ...mapGetters(['shop']),
     hasProducts() {
       return this.products.length > 0;
+    },
+    fullSearchLink() {
+      return `/products?text=${this.text}`;
     }
   },
   methods: {
     goToSearch() {
-      this.$router.push(`/products?text=${this.text}`);
+      this.$router.push(this.fullSearchLink);
     },
     showResults() {
       clearTimeout(this.hideTimer);

package/mixins/payment.js

@@ -63,17 +63,11 @@ export default {
       }
     },
     sendConversionData() {
-      if (process.env.IS_PROD) {
+      if (!process.env.IS_LOCAL) {
         gtm.push({
-          id: this.orderData._id,
-          total: this.orderData.total,
-          shipping: this.orderData.shippingAddress.postcode,
-          products: this.orderData.products.map(product => ({
-            sku: product.SKU,
-            name: product.name,
-            category: product.brand,
-            quantity: product.amount
-          }))
+          event: 'OrderCheckout',
+          code: this.orderData.code,
+          value: this.orderData.total
         });
       }
     },

package/package.json

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