@lancom/shared 0.0.284 → 0.0.285

package/assets/scss/_common.scss

@@ -4,6 +4,11 @@ body {
   overflow-x: hidden;
 }
 
+.multiselect__spinner {
+  z-index: 2 !important;
+  top: 6px !important;
+}
+
 .content {
   width: 100%;
   margin-top: $navbar_height;

package/components/checkout/cart/cart.vue

@@ -26,15 +26,15 @@
             <postcode-select
               :suburb="suburb"
               :labelless="true"
-              placeholder="Postcode"
-              label-text="Enter postcode to calculate shipping"
+              :placeholder="postcodeLabel"
+              :label-text="postcodeInfoLabel"
               @select="handleSuburbChange" />
           </div>
           <div class="Cart__coupon-container">
             <coupon-select
               v-model="cartCoupon"
               :pricing="cartPricingCalculating ? null : cartPricing"
-              label-text="Enter coupon code" />
+              :label-text="couponLabel" />
           </div>
           <div class="Cart__quantity-errors">
             <cart-quantity-errors />
@@ -91,7 +91,17 @@ export default {
   filters: { price },
   mixins: [CartMixin],
   computed: {
+    ...mapGetters(['MESSAGES']),
     ...mapGetters('cart', ['isEmpty', 'cartPricingError', 'cartPricing', 'cartPricingCalculating', 'entities']),
+    postcodeLabel() {
+      return this.MESSAGES.CART_POSTCODE || 'Postcode';
+    },
+    postcodeInfoLabel() {
+      return this.MESSAGES.CART_POSTCODE_INFO || 'Enter postcode to calculate shipping';
+    },
+    couponLabel() {
+      return (this.MESSAGES.CART_COUPON || 'Coupon code').trim();
+    },
     cartCoupon: {
       get() {
         return this.coupon;

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

@@ -14,20 +14,4 @@
       }
     }
   }
-}
-
-.CustomerAddressForm {
-  &__toggle-address {
-    margin-bottom: 10px;
-    cursor: pointer;
-    display: inline-block;
-    color: $green;
-    border-bottom: 1px dashed $green;
-  }
-  &__section {
-    padding: 15px;
-    border: 1px solid #d7d7d7;
-    margin-bottom: 10px;
-    border-radius: 4px;
-  }
 }

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

@@ -1,6 +1,6 @@
 <template>
   <div class="CustomerAddressForm__wrapper">
-    <div class="CustomerAddressForm__form CustomerAddressForm__section">
+    <div class="CustomerAddressForm__form">
       <div class="form-row--cols">
         <validation-provider
           v-slot="{ errors }"
@@ -124,16 +124,74 @@
           </span>
         </validation-provider>
       </div>
-    </div>
-    <div class="CustomerAddressForm__section">
+      <validation-provider
+        v-slot="{ errors }"
+        tag="div"
+        name="Address line 1"
+        rules="required"
+        class="form-row">
+        <label
+          for="addressLine1"
+          class="form-label">
+          Address line 1
+        </label>
+        <input
+          id="addressLine1"
+          ref="addressLine1"
+          v-model="address.addressLine1"
+          name="addressLine1"
+          type="text"
+          class="form-field labelless"
+          placeholder="Address line 1"
+          :class="{
+            'is-danger': errors.length,
+            filled: address.addressLine1
+          }"
+          @input="validateAddress"
+          @keyup.enter="$refs.addressLine1.focus()" />
+        <span
+          v-if="errors.length"
+          class="form-help is-danger">
+          {{ errors[0] }}
+        </span>
+      </validation-provider>
+      <validation-provider
+        v-slot="{ errors }"
+        tag="div"
+        name="Address line 2"
+        class="form-row">
+        <label
+          for="addressLine2"
+          class="form-label">
+          Address line 2
+        </label>
+        <input
+          id="addressLine2"
+          ref="addressLine2"
+          v-model="address.addressLine2"
+          name="addressLine2"
+          type="text"
+          class="form-field labelless"
+          placeholder="Address line 2"
+          :class="{
+            'is-danger': errors.length,
+            filled: address.addressLine2
+          }"
+          @input="validateAddress"
+          @keyup.enter="$refs.addressLine2.focus()" />
+        <span
+          v-if="errors.length"
+          class="form-help is-danger">
+          {{ errors[0] }}
+        </span>
+      </validation-provider>
       <div class="form-row--cols">
         <postcode-select
-          v-if="!visibleFullAddress"
           class="form-col col-half"
           :suburb="suburb"
           :labelless="true"
           :required="true"
-          :placeholder="postcodeLabel"
+          placeholder="Suburb"
           @select="handleSuburbChange">
         </postcode-select>
         <div class="form-col col-half">
@@ -152,190 +210,36 @@
             disabled />
         </div>
       </div>
-      <div
-        @click="visibleFullAddress = !visibleFullAddress"
-        class="CustomerAddressForm__toggle-address">
-        {{ visibleFullAddress ? 'Find a Different Address' : 'Enter Address Manually' }}
-      </div>
-      <div v-if="visibleFullAddress">
-        <validation-provider
-          v-slot="{ errors }"
-          tag="div"
-          name="Address line 1"
-          rules="required"
-          class="form-row">
-          <label
-            for="addressLine1"
-            class="form-label">
-            Address line 1
-          </label>
-          <input
-            id="addressLine1"
-            ref="addressLine1"
-            v-model="address.addressLine1"
-            name="addressLine1"
-            type="text"
-            class="form-field labelless"
-            placeholder="Address line 1"
-            :class="{
-              'is-danger': errors.length,
-              filled: address.addressLine1
-            }"
-            @input="validateAddress"
-            @keyup.enter="$refs.addressLine1.focus()" />
-          <span
-            v-if="errors.length"
-            class="form-help is-danger">
-            {{ errors[0] }}
-          </span>
-        </validation-provider>
-        <validation-provider
-          v-slot="{ errors }"
-          tag="div"
-          name="Address line 2"
-          class="form-row">
-          <label
-            for="addressLine2"
-            class="form-label">
-            Address line 2
-          </label>
-          <input
-            id="addressLine2"
-            ref="addressLine2"
-            v-model="address.addressLine2"
-            name="addressLine2"
-            type="text"
-            class="form-field labelless"
-            placeholder="Address line 2"
-            :class="{
-              'is-danger': errors.length,
-              filled: address.addressLine2
-            }"
-            @input="validateAddress"
-            @keyup.enter="$refs.addressLine2.focus()" />
-          <span
-            v-if="errors.length"
-            class="form-help is-danger">
-            {{ errors[0] }}
-          </span>
-        </validation-provider>
-        <validation-provider
-          v-if="!withoutAdditionalInfo"
-          v-slot="{ errors }"
-          tag="div"
+      <validation-provider
+        v-if="!withoutAdditionalInfo"
+        v-slot="{ errors }"
+        tag="div"
+        name="additionalInfo"
+        class="form-row">
+        <label
+          for="additionalInfo"
+          class="form-label">
+          Additional Info
+        </label>
+        <input
+          id="additionalInfo"
+          ref="additionalInfo"
+          v-model="address.additionalInfo"
           name="additionalInfo"
-          class="form-row">
-          <label
-            for="additionalInfo"
-            class="form-label">
-            Additional Info
-          </label>
-          <input
-            id="additionalInfo"
-            ref="additionalInfo"
-            v-model="address.additionalInfo"
-            name="additionalInfo"
-            placeholder="Additional Info"
-            type="text"
-            class="form-field labelless"
-            :class="{
-              'is-danger': errors.length,
-              filled: address.additionalInfo
-            }"
-            @keyup.enter="$refs.additionalInfo.focus()" />
-          <span
-            v-if="errors.length"
-            class="form-help is-danger">
-            {{ errors[0] }}
-          </span>
-        </validation-provider>
-        <div class="form-row--cols">
-          <validation-provider
-            v-slot="{ errors }"
-            tag="div"
-            name="postcode"
-            class="form-col">
-            <label
-              for="postcode"
-              class="form-label">
-              Postcode
-            </label>
-            <input
-              id="postcode"
-              ref="postcode"
-              v-model="address.postcode"
-              name="postcode"
-              placeholder="Postcode"
-              type="text"
-              class="form-field labelless"
-              :class="{
-                'is-danger': errors.length,
-                filled: address.postcode
-              }" />
-            <span
-              v-if="errors.length"
-              class="form-help is-danger">
-              {{ errors[0] }}
-            </span>
-          </validation-provider>
-          <validation-provider
-            v-slot="{ errors }"
-            tag="div"
-            :name="localityLabel"
-            class="form-col">
-            <label
-              for="locality"
-              class="form-label">
-              {{ localityLabel }}
-            </label>
-            <input
-              id="locality"
-              ref="locality"
-              v-model="address.city"
-              name="locality"
-              :placeholder="localityLabel"
-              type="text"
-              class="form-field labelless"
-              :class="{
-                'is-danger': errors.length,
-                filled: address.city
-              }" />
-            <span
-              v-if="errors.length"
-              class="form-help is-danger">
-              {{ errors[0] }}
-            </span>
-          </validation-provider>
-          <validation-provider
-            v-slot="{ errors }"
-            tag="div"
-            :name="stateLabel"
-            class="form-col">
-            <label
-              for="state"
-              class="form-label">
-              {{ stateLabel }}
-            </label>
-            <input
-              id="state"
-              ref="state"
-              v-model="address.state"
-              name="state"
-              :placeholder="stateLabel"
-              type="text"
-              class="form-field labelless"
-              :class="{
-                'is-danger': errors.length,
-                filled: address.state
-              }" />
-            <span
-              v-if="errors.length"
-              class="form-help is-danger">
-              {{ errors[0] }}
-            </span>
-          </validation-provider>
-        </div>
-      </div>
+          placeholder="Additional Info"
+          type="text"
+          class="form-field labelless"
+          :class="{
+            'is-danger': errors.length,
+            filled: address.additionalInfo
+          }"
+          @keyup.enter="$refs.additionalInfo.focus()" />
+        <span
+          v-if="errors.length"
+          class="form-help is-danger">
+          {{ errors[0] }}
+        </span>
+      </validation-provider>
     </div>
   </div>
 </template>
@@ -349,11 +253,6 @@ export default {
   components: {
     PostcodeSelect
   },
-  data() {
-    return {
-      visibleFullAddress: false
-    };
-  },
   props: {
     address: {
       type: Object,
@@ -365,22 +264,13 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['shop', 'country', 'currency', 'MESSAGES']),
+    ...mapGetters(['shop', 'country']),
     ...mapGetters('cart', [
       'suburb'
     ]),
     ...mapGetters('auth', [
       'user'
-    ]),
-    postcodeLabel() {
-      return this.MESSAGES?.POSTCODES_LABEL || 'Suburb';
-    },
-    localityLabel() {
-      return this.MESSAGES?.LOCALITY || 'Locality';
-    },
-    stateLabel() {
-      return this.MESSAGES?.STATE || 'State';
-    }
+    ])
   },
   created() {
     if (!this.address.suburb && !this.suburb &&  this.user?.suburb) {
@@ -407,19 +297,12 @@ export default {
         this.$set(this.address, 'postcode', suburb.postcode);
         this.$set(this.address, 'city', suburb.locality);
         this.$set(this.address, 'country', suburb.country);
-        if (suburb.addressLine1) {
-          this.$set(this.address, 'addressLine1', suburb.addressLine1);
-        }
-        if (suburb.addressLine2) {
-          this.$set(this.address, 'addressLine2', suburb.addressLine2);
-        }
       }
     },
     handleSuburbChange(suburb) {
-      this.visibleFullAddress = true;
       this.setAddressSuburb(suburb);
       this.setSuburb(suburb);
-      this.calculateCartPrice({ shop: this.shop, country: this.country, currency: this.currency });
+      this.calculateCartPrice({ shop: this.shop, country: this.country });
     }
   }
 };
@@ -427,4 +310,4 @@ export default {
 
 <style lang="scss" scoped>
 @import 'address-form.scss';
-</style>
+</style>

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

@@ -29,7 +29,7 @@ import gtm from '@lancom/shared/assets/js/utils/gtm';
 import { generateOrderData } from '@lancom/shared/assets/js/utils/order';
 import CartQuantityErrors from '@lancom/shared/components/checkout/cart/cart_quantity_errors/cart-quantity-errors';
 import CartMixin from '@lancom/shared/components/checkout/cart/cart.mixin';
-import AddressForm from '@lancom/shared/components/checkout/order/address-form/address-form';
+import AddressForm from '@/components/checkout/order/address-form/address-form';
 import ProgressStepsControls from '@lancom/shared/components/common/progress_steps/progress_steps_controls/progress-steps-controls';
 
 export default {

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

@@ -19,7 +19,7 @@
 
 <script>
 import { mapMutations } from 'vuex';
-import AddressForm from '@lancom/shared/components/checkout/order/address-form/address-form';
+import AddressForm from '@/components/checkout/order/address-form/address-form';
 import ProgressStepsControls from '@lancom/shared/components/common/progress_steps/progress_steps_controls/progress-steps-controls';
 
 export default {

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

@@ -1,33 +1,37 @@
 <template>
-  <div class="CouponSelect__wrapper form-row">
+  <div class="CouponSelect__wrapper">
     <validation-provider
       tag="div"
       name="coupon"
       class="form-col col-half">
-      <label
-        for="coupon"
-        class="form-label">
-        {{ labelText }}
-      </label>
       <div class="row">
         <div class="col-7">
-          <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
-            }"
-            @keydown.enter="validateCoupon" />
-          <span
-            v-if="value"
-            class="CouponSelect__clear"
-            @click="clearCoupon()">remove coupon</span>
+          <div class="form-row">
+            <input
+              id="coupon"
+              ref="coupon"
+              v-model="code"
+              placeholder="Coupon"
+              name="coupon"
+              type="text"
+              class="form-field"
+              :class="{
+                'is-danger': code && notValidCoupon,
+                filled: code
+              }"
+              @keydown.enter="validateCoupon" />
+            <label
+              v-if="labelText"
+              for="coupon"
+              class="form-label label-inner"
+              style="color: #999 !important;">
+              {{ labelText }}
+            </label>
+            <span
+              v-if="value"
+              class="CouponSelect__clear"
+              @click="clearCoupon()">remove coupon</span>
+          </div>
         </div>
         <div class="col-5">
           <btn

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="PostcodeSelect">
+  <div class="PostcodeSelect form-row">
     <validation-provider
       v-slot="{ errors }"
       tag="div"
@@ -151,7 +151,7 @@ export default {
   },
   methods: {
     async handleSearch(query) {
-      if (query.trim().length > 2) {
+      if (query.trim().length > 1) {
         this.isLoading = true;
         const country = this.codeCountry || this.country;
         const countryName = country ? (country.isoCode === 'GB' ? 'England' : (country.name || country)) : 'Australia';

package/package.json

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