@lancom/shared 0.0.101 → 0.0.105

package/assets/js/api/admin.js

@@ -151,14 +151,26 @@ export default {
   removeProductType(id) {
     return _delete(`admin/product-types/${id}`);
   },
+  fetchCoupons() {
+    return _get('admin/coupons');
+  },
+  fetchCouponById(id) {
+    return _get(`admin/coupons/${id}`);
+  },
+  saveCoupon(coupon) {
+    return coupon._id ? _put(`admin/coupons/${coupon._id}`, coupon) : _post('admin/coupons', coupon);
+  },
+  removeCoupon(id) {
+    return _delete(`admin/coupons/${id}`);
+  },
   fetchReviews() {
     return _get('admin/reviews');
   },
   fetchReviewById(id) {
     return _get(`admin/reviews/${id}`);
   },
-  saveReview(quote) {
-    return quote._id ? _put(`admin/reviews/${quote._id}`, quote) : _post('admin/quotes', quote);
+  saveReview(review) {
+    return review._id ? _put(`admin/reviews/${review._id}`, review) : _post('admin/reviews', review);
   },
   removeReview(id) {
     return _delete(`admin/reviews/${id}`);
@@ -194,6 +206,9 @@ export default {
   async fetchSuppliers(params) {
     return sortByName(await _get('admin/suppliers', params));
   },
+  validateSuppliers() {
+    return _get('admin/suppliers/validate');
+  },
   fetchSupplierById(id) {
     return _get(`admin/suppliers/${id}`);
   },
@@ -400,5 +415,8 @@ export default {
   },
   sendToPrinter(job) {
     return _post('admin/printers/job', job);
+  },
+  findResources(query) {
+    return _get(`admin/order/resources?search=${query || ''}`);
   }
 };

package/assets/js/api/index.js

@@ -48,6 +48,9 @@ const api = {
   fetchProduct(shop, alias, print) {
     return _get(`shop/${shop}/products/${alias}?print=${print || ''}`);
   },
+  fetchCouponByCode(shop, code) {
+    return _get(`shop/${shop}/coupons/${code}`);
+  },
   fetchMenus(shop) {
     return _get(`shop/${shop}/menus`);
   },

package/components/checkout/cart/cart.mixin.js

@@ -11,6 +11,7 @@ export default {
     ...mapGetters('cart', [
       'entities',
       'simpleProducts',
+      'coupon',
       'suburb',
       'quantities',
       'notValidProductsQuantities',
@@ -39,7 +40,8 @@ export default {
   },
   methods: {
     ...mapMutations('cart', [
-      'setSuburb'
+      'setSuburb',
+      'setCoupon'
     ]),
     ...mapActions('cart', [
       'removeSimpleProductsFromCart',
@@ -49,6 +51,10 @@ export default {
       this.setSuburb(suburb);
       this.calculateCartPrice({ shop: this.shop });
     },
+    handleCouponChange(coupon) {
+      this.setCoupon(coupon);
+      this.calculateCartPrice({ shop: this.shop });
+    },
     async removeSimpleProducts(simpleProducts) {
       const message = 'This will delete all items in this row, Press OK to continue or Cancel';
       const confirmed = await this.showConfirmationModal(message);

package/components/checkout/order/address-form/address-form.vue

@@ -188,6 +188,7 @@
           class="form-col col-half"
           :suburb="suburb"
           :labelless="true"
+          :required="true"
           placeholder="Suburb"
           @select="handleSuburbChange">
         </postcode-select>

package/components/checkout/order/order-billing-information/order-billing-information.vue

@@ -5,6 +5,7 @@
     </div>
     <div class="OrderBillingInformation__form">
       <validation-observer
+        v-slot="{ invalid }"
         ref="form">
         <div class="OrderBillingInformation__content">
           <address-form
@@ -12,7 +13,7 @@
             :without-additional-info="true" />
         </div>
         <progress-steps-controls
-          :disabled-next="!isValid"
+          :disabled-next="isSubmit && invalid"
           @prev="$emit('prev')"
           @next="submit" />
       </validation-observer>
@@ -23,7 +24,6 @@
 <script>
 import AddressForm from '@lancom/shared/components/checkout/order/address-form/address-form';
 import ProgressStepsControls from '@lancom/shared/components/common/progress_steps/progress_steps_controls/progress-steps-controls';
-import { ORDER_STEPS } from '@lancom/shared/assets/js/constants/order';
 
 export default {
   name: 'OrderBillingInformation',
@@ -40,13 +40,15 @@ export default {
   data() {
     return {
       copyToShippingAddress: true,
-      isValid: true
+      isSubmit: false
     };
   },
   methods: {
     async submit() {
-      this.isValid = await this.$refs.form.validate() && !!this.order.shippingAddress.postcode;
-      if (!this.isValid) {
+      this.isSubmit = true;
+
+      const isValid = await this.$refs.form.validate() && !!this.order.shippingAddress.postcode;
+      if (!isValid) {
         return;
       }
 

package/components/common/coupon_select/coupon-select.vue

@@ -0,0 +1,111 @@
+<template>
+  <div class="CouponSelect__wrapper form-row">
+    <validation-provider
+      tag="div"
+      name="coupon"
+      class="form-col col-half">
+      <label
+        for="coupon"
+        class="form-label">
+        {{ labelText }}
+      </label>
+      <input
+        id="coupon"
+        ref="coupon"
+        v-model="code"
+        placeholder="Coupon"
+        name="coupon"
+        type="text"
+        class="form-field labelless"
+        :class="{
+          'is-danger': code && notValidCoupon,
+          filled: code
+        }"
+        @change="validateCoupon" />
+      <span
+        v-if="code && notValidCoupon"
+        class="form-help is-danger">
+        Not valid coupon
+      </span>
+    </validation-provider>
+    <div v-if="value">
+      <div class="mt-10 lc_h4">
+        {{ value.value | price }} OFF
+      </div>
+      <div
+        v-if="value.minOrderValue"
+        class="mt-10 lc_caption">
+        Min Order For Coupon: {{ value.minOrderValue | price }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import api from '@lancom/shared/assets/js/api';
+import { price } from '@lancom/shared/assets/js/utils/filters';
+import { mapGetters } from 'vuex';
+
+export default {
+  name: 'CouponSelect',
+  filters: {
+    price
+  },
+  props: {
+    value: {
+      type: Object
+    },
+    labelText: {
+      type: String,
+      default: 'Coupon'
+    }
+  },
+  data() {
+    return {
+      isLoading: false,
+      notValidCoupon: false,
+      code: null
+    };
+  },
+  computed: {
+    ...mapGetters(['shop']),
+    model: {
+      get() {
+        return this.value?.code;
+      },
+      set(coupon) {
+        this.$emit('input', coupon);
+      }
+    }
+  },
+  created() {
+    if (this.model) {
+      this.code = this.model;
+    }
+  },
+  methods: {
+    async validateCoupon() {
+      this.notValidCoupon = false;
+      if (this.code) {
+        this.isLoading = true;
+        try {
+          const coupon = await api.fetchCouponByCode(this.shop._id, this.code);
+          this.$emit('input', coupon);
+          this.code = coupon.code;
+        } catch (e) {
+          this.notValidCoupon = true;
+          this.$emit('input', null);
+        } finally {
+          this.isLoading = false;
+        }
+      } else {
+        this.$emit('input', null);
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+@import 'coupon-select';
+</style>

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

@@ -1,61 +1,75 @@
 <template>
   <div class="PostcodeSelect form-row">
-    <label
-      v-if="labelless"
-      class="form-label"
-      @click="$refs.suburb.$el.focus()">
-      {{ labelText }}
-    </label>
-    <multiselect
-      ref="suburb"
-      v-model="model"
-      class="limited-height"
-      :class="{ labelless }"
-      :options="options"
-      :placeholder="placeholder"
-      :searchable="true"
-      :internal-search="false"
-      :clear-on-select="false"
-      :allow-empty="false"
-      :option-height="35"
-      :loading="isLoading"
-      track-by="value"
-      @search-change="handleSearchWithDebounce">
-      <div
-        slot="singleLabel"
-        slot-scope="{ option }"
-        class="PostcodeSelect__option">
-        {{ option.label }}
-      </div>
-      <div
-        slot="option"
-        slot-scope="{ option, search }"
-        class="lc_caption PostcodeSelect__option"
-        v-html="$options.filters.highlight(option.label, search)">
-      </div>
-      <div
-        slot="noOptions"
-        class="ub_caption">
-        Start typing.
-      </div>
-      <div
-        slot="noResult"
-        class="ub_caption">
-        Not result.
-      </div>
-    </multiselect>
-    <input
-      type="text"
-      :value="value"
-      :class="{ 'filled': value || selected }"
-      class="form-hidden-validator form-field" />
-    <label
-      v-if="!labelless"
-      class="form-label label-inner"
-      @click="$refs.suburb.$el.focus()">
-      {{ labelText }}
-    </label>
-    <slot></slot>
+    <validation-provider
+      v-slot="{ errors }"
+      tag="div"
+      :rules="required ? 'required' : ''"
+      name="Postcode"
+      class="form-group form-row">
+      <label
+        v-if="labelless"
+        class="form-label"
+        @click="$refs.suburb.$el.focus()">
+        {{ labelText }}
+      </label>
+      <multiselect
+        ref="suburb"
+        v-model="model"
+        class="limited-height"
+        :class="{ labelless }"
+        :options="options"
+        :placeholder="placeholder"
+        :searchable="true"
+        :disabled="disabled"
+        :required="required"
+        :internal-search="false"
+        :clear-on-select="false"
+        :allow-empty="false"
+        :option-height="35"
+        :loading="isLoading"
+        track-by="value"
+        @search-change="handleSearchWithDebounce">
+        <div
+          slot="singleLabel"
+          slot-scope="{ option }"
+          class="PostcodeSelect__option">
+          {{ option.label }}
+        </div>
+        <div
+          slot="option"
+          slot-scope="{ option, search }"
+          class="lc_caption PostcodeSelect__option"
+          v-html="$options.filters.highlight(option.label, search)">
+        </div>
+        <div
+          slot="noOptions"
+          class="ub_caption">
+          Start typing.
+        </div>
+        <div
+          slot="noResult"
+          class="ub_caption">
+          Not result.
+        </div>
+      </multiselect>
+      <input
+        type="text"
+        :value="value"
+        :class="{ 'filled': value || selected }"
+        class="form-hidden-validator form-field" />
+      <label
+        v-if="!labelless"
+        class="form-label label-inner"
+        @click="$refs.suburb.$el.focus()">
+        {{ labelText }}
+      </label>
+      <slot></slot>
+      <span
+        v-if="errors.length"
+        class="form-help is-danger">
+        {{ errors[0] }}
+      </span>
+    </validation-provider>
   </div>
 </template>
 
@@ -83,6 +97,14 @@ export default {
       type: Boolean,
       default: false
     },
+    required: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     suburb: {
       type: Object
     }
@@ -126,9 +148,9 @@ export default {
         this.options = [];
       }
     },
-    createOptionFromSuburb({ locality, state, postcode }) {
+    createOptionFromSuburb({ locality, state, postcode, city }) {
       return {
-        label: `${locality}, ${state}, ${postcode}`,
+        label: [locality || city, state, postcode].filter(i => !!i).join(', '),
         value: postcode
       };
     }

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

@@ -118,7 +118,7 @@
     }
   }
   &__description {
-    height: 140px;
+    height: 200px;
     width: 100%;
     padding: 15px;
     outline: none;

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

@@ -39,6 +39,7 @@
               v-slot="{ errors }"
               tag="div"
               name="Phone"
+              rules="required|phone"
               class="form-row">
               <label
                 for="quote-request-name"
@@ -203,6 +204,13 @@
                 {{ errors[0] }}
               </span>
             </validation-provider>
+            <postcode-select
+              :suburb="quote.address.suburb"
+              :labelless="true"
+              :required="true"
+              placeholder="Postcode"
+              label-text="Postcode"
+              @select="handleChangeSuburb" />
             <validation-provider
               v-slot="{ errors }"
               tag="div"
@@ -292,12 +300,14 @@ import api from '@lancom/shared/assets/js/api';
 import { mapGetters } from 'vuex';
 import CheckedIcon from '@lancom/shared/components/common/checked-icon';
 import FileUploader from '@lancom/shared/components/common/file_uploader';
+import PostcodeSelect from '@lancom/shared/components/common/postcode_select/postcode-select';
 
 export default {
   name: 'QuoteRequest',
   components: {
     CheckedIcon,
-    FileUploader
+    FileUploader,
+    PostcodeSelect
   },
   data() {
     return {
@@ -339,7 +349,8 @@ export default {
         address: {
           fullName: '',
           email: '',
-          phone: ''
+          phone: '',
+          suburb: null
         },
         expectedItemsQuantity: null,
         description: '',
@@ -372,6 +383,14 @@ export default {
       this.uploadError = null;
       this.quote.file = null;
     },
+    handleChangeSuburb(suburb) {
+      this.quote.address = {
+        ...this.quote.address,
+        ...suburb,
+        city: suburb?.locality,
+        suburb
+      };
+    },
     async submit() {
       try {
         this.processing = true;

package/components/subscribe/subscribe.vue

@@ -13,7 +13,7 @@
       </div>
     </slot>
     <div v-if="isSubscribed">
-      <div class="Subscribe__success lc_h3 mt-5">
+      <div class="Subscribe__success lc_h5 mt-5">
         Subscribed successfully
       </div>
     </div>
@@ -32,10 +32,10 @@
               rules="required"
               class="form-row">
               <input
-                id="email"
+                :id="'email' + uniqueKey"
                 ref="email"
                 v-model="subscriber.email"
-                name="email"
+                :name="'email' + uniqueKey"
                 type="text"
                 class="form-field"
                 :class="{
@@ -43,7 +43,7 @@
                   filled: subscriber.email
                 }" />
               <label
-                for="email"
+                :for="'email' + uniqueKey"
                 class="form-label label-inner">
                 Your email address
               </label>
@@ -53,6 +53,7 @@
                 {{ errors[0] }}
               </span>
             </validation-provider>
+            <slot :subscriber="subscriber" name="fields"></slot>
           </div>
           <div class="form__footer">
             <div class="form-actions">
@@ -87,10 +88,13 @@ export default {
   data() {
     return {
       subscriber: {
-        email: null
+        email: null,
+        userType: null,
+        printType: null
       },
       isSubscribed: false,
-      processing: false
+      processing: false,
+      uniqueKey: Math.random()
     };
   },
   computed: {
@@ -98,6 +102,11 @@ export default {
   },
   methods: {
     async submit() {
+      const isValid = await this.$refs.form.validate();
+      if (!isValid) {
+        return;
+      }
+
       try {
         this.processing = true;
         const recaptchaToken = await this.getRecaptcha('subscribe');

package/nuxt.config.js

@@ -122,11 +122,23 @@ module.exports = (config, axios) => ({
                 'g:product_type': { _text: `Home > Products > ${product.productType.name}`, },
                 'g:is_bundle': { _text: product.prePrint ? 'yes' : 'no' },
                 'g:identifier_exists': sp.gtin ? 'yes' : 'no',
-                'g:product_weight': { _text: `${product.weight} kg` }
+                'g:product_weight': { _text: `${product.weight} kg` },
+                'g:shipping_weight': { _text: `${((product.weight || 0) + (product.weight || 0) * 0.05).toFixed(3)} kg` }
               };
               if (sp.gtin) {
                 info['g:gtin'] = { _text: sp.gtin || '' };
               }
+              if (product.volume) {
+                if (product.volume.length) {
+                  info['g:shipping_length'] = { _text: `${product.volume.length} cm` };
+                }
+                if (product.volume.width) {
+                  info['g:shipping_width'] = { _text: `${product.volume.width} cm` };
+                }
+                if (product.volume.height) {
+                  info['g:shipping_height'] = { _text: `${product.volume.height} cm` };
+                }
+              }
               return info;
             })
           ];

package/package.json

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

package/plugins/save-state.js

@@ -3,7 +3,9 @@ import debounce from 'lodash.debounce';
 const STATE_STORAGE_KEY = 'lancom-state-2.1';
 const SAVE_STATE_MODULES = new Map([
   ['cart/setId', 'cart.id'],
-  ['cart/clearCart', 'cart.id']
+  ['cart/clearCart', 'cart.id'],
+  ['cart/setCoupon', 'cart.coupon'],
+  ['cart/clearCart', 'cart.coupon']
 ]);
 
 export function saveStatePlugin(store) {

package/store/cart.js

@@ -6,6 +6,7 @@ export const state = () => ({
   id: null,
   entities: [],
   suburb: null,
+  coupon: null,
   cartPricing: null,
   cartPricingError: null
 });
@@ -40,6 +41,7 @@ const getPrintsQuantities = entities => {
 
 export const getters = {
   entities: ({ entities }) => entities,
+  coupon: ({ coupon }) => coupon,
   simpleProducts: ({ entities }) => entities.reduce((simpleProducts, entity) => [...simpleProducts, ...(entity.simpleProducts || [])], []),
   notEmptySimpleProducts: (state, { simpleProducts }) => simpleProducts.filter(e => e.amount > 0),
   simpleProductsQuantity: (state, { notEmptySimpleProducts }) => notEmptySimpleProducts.reduce((quantity, sp) => quantity + sp.amount, 0),
@@ -105,8 +107,8 @@ export const actions = {
     await api.saveCart(payload, shop._id);
     commit('setEntities', entities);
   },
-  async calculateCartPrice({ state: { suburb, entities }, commit }, { shop }) {
-    const payload = generateCalculatePriceData(entities, suburb);
+  async calculateCartPrice({ state: { suburb, entities, coupon }, commit }, { shop }) {
+    const payload = generateCalculatePriceData(entities, suburb, null, coupon);
     try {
       const response = await api.calculateProductPrice(payload, shop._id);
       commit('setCartPricing', response);
@@ -132,7 +134,7 @@ export const actions = {
   clearCart({ commit }) {
     commit('clearCart');
   },
-  async selectRate({ state: { cartPricing, entities, suburb }, commit }, { supplier, rate, shop }) {
+  async selectRate({ state: { cartPricing, entities, suburb, coupon }, commit }, { supplier, rate, shop }) {
     const suppliersWithRates = cartPricing.shipping.suppliersWithRates
       .map(supplierWithRates => ({
         ...(
@@ -143,7 +145,7 @@ export const actions = {
               })
             : supplierWithRates)
       }));
-    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates);
+    const payload = generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon);
     try {
       const response = await api.calculateProductPrice(payload, shop._id);
       commit('setCartPricing', response);
@@ -170,6 +172,9 @@ export const mutations = {
   setSuburb(state, suburb) {
     state.suburb = suburb;
   },
+  setCoupon(state, coupon) {
+    state.coupon = coupon;
+  },
   setCartPricing(state, price) {
     state.cartPricing = price;
   },
@@ -184,12 +189,12 @@ export const mutations = {
     state.entities = [];
     state.cartPricing = null;
     state.suburb = null;
+    state.coupon = null;
     state.cartPricingError = null;
   }
 };
 
-function generateCalculatePriceData(entities, suburb, suppliersWithRates) {
-  console.log('suburb: ', suburb);
+function generateCalculatePriceData(entities, suburb, suppliersWithRates, coupon) {
   const getSimpleObj = i => i && ({ _id: i._id, name: i.name });
   return {
     entities: entities.map(({ _id, guid, prints, simpleProducts, product }) => ({
@@ -220,6 +225,7 @@ function generateCalculatePriceData(entities, suburb, suppliersWithRates) {
     })),
     postcode: suburb && suburb.postcode,
     address: suburb ? [suburb.locality, suburb.state, suburb.postcode].filter(i => !!i).join(', ') : null,
+    coupon,
     suppliersWithRates
   };
 }

package/store/index.js

@@ -106,3 +106,5 @@ export const mutations = {
 };
 
 export const plugins = process.browser ? [saveStatePlugin] : [];
+
+export const strict = false;

package/store/order.js

@@ -19,6 +19,8 @@ export const actions = {
     if (pricing) {
       order.totalGST = pricing.totalPrice;
       order.total = pricing.totalPriceWithoutTax;
+      order.couponTotal = pricing.coupon?.totalPrice || 0;
+      order.couponCode = pricing.coupon?.code || 0;
       order.productsTotal = pricing.products?.products?.totalPriceWithoutTax || 0;
       order.printsTotal = pricing.products?.prints?.totalPriceWithoutTax || 0;
       order.shippingTotal = pricing.shipping?.totalPriceWithoutTax || 0;