@lancom/shared 0.0.457 → 0.0.459

package/components/products/products_aside/products-aside.vue

@@ -37,12 +37,12 @@
           :has-selected-icon="hasSelectedIcon"
           :selected-icon-circle="selectedIconCircle" />
       </div>
-      <!-- <div class="ProductsAside__item">
-        <products-colors />
-      </div> -->
       <div class="ProductsAside__item">
         <products-color-groups />
       </div>
+      <div class="ProductsAside__item">
+        <products-colors />
+      </div>
       <div class="ProductsAside__item">
         <products-attributes
           :has-selected-icon="hasSelectedIcon" />
@@ -60,7 +60,7 @@ import { mapGetters } from 'vuex';
 import ProductsBrands from '@lancom/shared/components/products/products_brands/products-brands';
 import ProductsTags from '@lancom/shared/components/products/products_tags/products-tags';
 import ProductsAttributes from '@lancom/shared/components/products/products_attributes/products-attributes';
-// import ProductsColors from '@lancom/shared/components/products/products_colors/products-colors';
+import ProductsColors from '@lancom/shared/components/products/products_colors/products-colors';
 import ProductsColorGroups from '@lancom/shared/components/products/products_color_groups/products-color-groups';
 import ProductsProductionTime from '@lancom/shared/components/products/products_production_time/products-production-time';
 import ProductsMinimumQty from '@lancom/shared/components/products/products_minimum_qty/products-minimum-qty';
@@ -73,7 +73,7 @@ export default {
     ProductsBrands,
     ProductsTags,
     ProductsAttributes,
-    // ProductsColors,
+    ProductsColors,
     ProductsColorGroups,
     ProductsProductionTime,
     ProductsMinimumQty

package/components/products/products_colors/products-colors.vue

@@ -1,5 +1,7 @@
 <template>
-  <div class="ProductsColors__wrapper">
+  <div
+    v-if="visibleColors.length > 0"
+    class="ProductsColors__wrapper">
     <toggle-content label="Colours">
       <div class="ProductsColors__selected">
         <div
@@ -68,7 +70,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters('products', ['colors']),
+    ...mapGetters('products', ['colors', 'colorGroups']),
     colorsCount() {
       return this.colors.length;
     },
@@ -76,8 +78,13 @@ export default {
       const colors = (this.$route.query.colors || '').split(',');
       return this.colors.filter(color => colors.includes(color.alias));
     },
+    slectedGroupsColors() {
+      const colorGroupsAliases = (this.$route.query.colorGroups || '').split(',');
+      const colorGroups = this.colorGroups.filter(colorGroup => colorGroupsAliases.includes(colorGroup.alias));
+      return this.colors.filter(color => colorGroups.some(g => color.colorGroups?.includes(g._id)));
+    },
     visibleColors() {
-      return this.displayAllColors ? this.colors : this.colors.slice(0, this.shortListColorsLimit);
+      return this.displayAllColors ? this.slectedGroupsColors : this.slectedGroupsColors.slice(0, this.shortListColorsLimit);
     }
   },
   mounted() {

package/components/quotes/quote_view/quote-view.scss

@@ -1,29 +1,83 @@
+@import "@/assets/scss/variables";
+
 .QuoteView {
   &__wrapper {
-    margin-top: 50px;
+    display: flex;
   }
-  &__option {
-    border: 1px solid #dee2e6;
-    padding: 30px;
-    margin-bottom: 50px;
+  &__header {
+    position: sticky;
+    top: 0;
+    z-index: 2;
+    background-color: $white;
+  }
+  &__sidebar {
+    width: 250px;
+    flex-shrink: 0;
+    &-content {
+      position: sticky;
+      top: 30px;
+    }
+  }
+  &__content {
+    border-left: 2px solid $gray;
+    position: relative;
+    flex-grow: 1;
+    @media (max-width: $bp-small-max) {
+      border-left: none;
+      width: 100%;
+    }
   }
   &__info {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 10px;
-  }
-  &__logo {
-    margin-bottom: 20px;
-  }
-  &__table {
-    margin-top: 20px;
-    margin-bottom: 10px;
-    td {
-      width: 50%;
-      padding: 20px;
+    margin-top: 32px;
+    padding-left: 25px;
+  }
+  &__info-alert {
+    margin: 20px 0;
+    padding: 25px;
+    text-align: center;
+    border: 1px solid $orange;
+    color: $orange;
+    font-size: 18px;
+    line-height: 29px;
+    a {
+      color: $orange;
+    }
+  }
+  &__text {
+    margin-top: 110px;
+    font-weight: 800;
+    font-size: 22px;
+    line-height: 35px;
+    @media (max-width: $bp-small-max) {
+      margin-top: 50px;
+      font-size: 17px;
+      line-height: 25px;
     }
+    a {
+      color: $black;
+    }
+  }
+  &__message {
+    margin-top: 120px;
+    @media (max-width: $bp-small-max) {
+      margin-top: 50px;
+    }
+  }
+  &__element {
+    padding-left: 86px;
+    @media (max-width: $bp-small-max) {
+      padding-left: 0px;
+    }
+  }
+  &__options {
+   margin-top: 40px; 
+  }
+  &__option {
+   margin-bottom: 120px; 
+  }
+  &__accept {
+    position: sticky;
+    bottom: 0px;
+    margin-top: 120px;
   }
-}
-.uppercase {
-    text-transform: uppercase;
-}
+}

package/components/quotes/quote_view/quote-view.vue

@@ -1,117 +1,105 @@
 <template>
   <div class="QuoteView__wrapper">
     <div
-      v-if="quote.shop.logo"
-      class="QuoteView__logo">
-      <img :src="quote.shop.logo.small" />
-    </div>
-    <div class="QuoteView__info">
-      <div>
-        <h2 class="lc_h2"> {{ quote.shop.name }} </h2>
-        <h4 v-if="shopContacts" class="lc_h4"> ABN: {{ shopContacts.abn }} </h4>
+      :data-aos="aosFadeLeft"
+      class="QuoteView__sidebar hidden-sm-and-down">
+      <div class="QuoteView__sidebar-content">
+        <quote-view-info class="QuoteView__info" />
+        <quote-view-menu />
       </div>
-      <h1 class="text-secondary lc_h1">
-        QUOTE
-      </h1>
     </div>
-    <div class="QuoteView__info">
-      <div v-if="shopContacts">
-        <div class="lc_regular16">
-          {{ shopContacts.company }}
+    <div
+      :data-aos="aosFadeRight"
+      class="QuoteView__content">
+      <quote-view-header class="QuoteView__element QuoteView__header" />
+      <quote-view-banner class="QuoteView__banner" />
+      <div v-if="checkPayment || (!isExpiredQuote && !isOrdered)">
+        <quote-view-message
+          id="quote-intro"
+          class="QuoteView__element QuoteView__message" />
+        <div class="QuoteView__element QuoteView__text">
+          As always, if you have any questions about this quote, please reach out to us on 02 8880 3731 or email <email-link :email="['team','workdepot.com.au']" />
         </div>
-        <div class="lc_regular16">
-          {{ shopContacts.address }}
+        <div class="QuoteView__element QuoteView__options">
+          <div
+            v-for="o in options"
+            :key="o._id"
+            class="QuoteView__option">
+            <quote-option-view
+              :option="o"
+              :quote="quote" />
+          </div>
         </div>
-        <div class="lc_regular16">
-          {{ shopContacts.phone }}
+        <div class="QuoteView__element QuoteView__question">
+          <quote-view-question />
+          <quote-view-questions />
         </div>
+        <quote-view-accept class="QuoteView__element QuoteView__accept" />
       </div>
-      <div>
-        <div class="lc_regular16">
-          DATE: {{ quote.createdAt | shortDate }}
-        </div>
-        <div class="lc_regular16">
-          QUOTE ID: {{ quoteId }}
+      <div v-else>
+        <div class="QuoteView__info-alert">
+          <p>
+            This proposal is already in progress, has been finalised or has expired
+          </p>
+          <p v-if="isGuestUser">
+            You can <a href="/customer/signin">login</a> to your account to see the progress of this order, or request a new quote
+          </p>
         </div>
       </div>
     </div>
-
-    <table class="QuoteView__table mt-4 lc_table bordered">
-      <tr>
-        <td>
-          <div><b>QUOTE</b></div>
-          <div v-if="quote.address">
-            <div class="lc_regular16">
-              {{ quote.address.fullName }}
-            </div>
-            <div v-if="quote.address.company" class="lc_regular16">
-              {{ quote.address.company }}
-            </div>
-            <div v-if="quote.address.phone" class="lc_regular16">
-              {{ quote.address.phone }}
-            </div>
-            <div class="lc_regular16">
-              {{ quote.address.email }}
-            </div>
-            <div class="lc_regular16">
-              {{ quoteAddress }}
-            </div>
-            <div class="lc_regular16">
-              {{ quote.address.additionalInfo }}
-            </div>
-          </div>
-        </td>
-        <td class="w-50">
-          <div class="lc_regular16">
-            <b>{{ MESSAGES.DIRECT_DEPOSIT_DETAILS || 'DIRECT DEPOSIT DETAILS' }}</b>
-          </div>
-          <div class="lc_regular16">
-            Bank: {{ depositInfo.bank }}
-          </div>
-          <div class="lc_regular16">
-            Account name: {{ depositInfo.accountName }}
-          </div>
-          <div class="lc_regular16">
-            {{ bsbLabel }}: {{ depositInfo.BSB }}
-          </div>
-          <div class="lc_regular16">
-            Account: {{ depositInfo.account }}
-          </div>
-        </td>
-      </tr>
-    </table>
-    <div class="mt-3">
-      <quote-option-view
-        v-for="(optionItem, index) of options"
-        :key="`option-${index}`"
-        :option="optionItem"
-        :quote="quote"
-        class="QuoteView__option" />
-    </div>
-    <h6
-      v-if="quote.expiredAt"
-      class="mt-3 lc_title mb-5 lc_h3">
-      THIS QUOTE IS VALID UNTIL {{ quote.expiredAt | shortDate }}
-    </h6>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
-import QuoteViewMixin from './quote-view.mixin';
+import { mapGetters, mapActions } from 'vuex';
+import { saveViewedOptions } from '@lancom/shared/assets/js/utils/quote';
+import QuoteViewMixin from '@lancom/shared/components/quotes/quote_view_preview/quote-view.mixin';
+import EmailLink from '@lancom/shared/components/email_link/email-link';
+import QuoteViewInfo from './quote_view_info/quote-view-info';
+import QuoteViewMenu from './quote_view_menu/quote-view-menu';
+import QuoteViewHeader from './quote_view_header/quote-view-header';
+import QuoteViewBanner from './quote_view_banner/quote-view-banner';
+import QuoteViewMessage from './quote_view_message/quote-view-message';
+import QuoteViewQuestion from './quote_view_question/quote-view-question';
+import QuoteViewQuestions from './quote_view_questions/quote-view-questions';
+import QuoteViewAccept from './quote_view_accept/quote-view-accept';
 import QuoteOptionView from './quote_option_view/quote-option-view';
 
 export default {
-  name: 'LancomQuoteView',
+  name: 'QuoteView',
   components: {
-    QuoteOptionView
+    QuoteOptionView,
+    QuoteViewInfo,
+    QuoteViewMenu,
+    QuoteViewHeader,
+    QuoteViewBanner,
+    QuoteViewMessage,
+    QuoteViewQuestion,
+    QuoteViewQuestions,
+    QuoteViewAccept,
+    EmailLink
+  },
+  data() {
+    return {
+      checkPayment: !!this.$route.query.checkPayment
+    };
   },
   mixins: [QuoteViewMixin],
   computed: {
-    ...mapGetters(['MESSAGES']),
-    bsbLabel() {
-      return this.MESSAGES.DIRECT_DEPOSIT_BSB || 'BSB';
-    },
+    ...mapGetters(['contacts']),
+    ...mapGetters('auth', ['isGuestUser']),
+    ...mapGetters('quote', ['quote', 'options', 'isExpiredQuote', 'isOrdered'])
+  },
+  created() {
+    if (process.client) {
+      this.fetchViewedOptions({ quote: this.quote });
+
+      const options = this.options.map(({ _id }) => _id);
+      saveViewedOptions(this.quote, options);
+    }
+  },
+  methods: {
+    ...mapActions('quote', ['fetchViewedOptions'])
   }
 };
 </script>

package/components/quotes/quote_view/quote_option_view/quote-option-view.scss

@@ -1,10 +1,109 @@
+@import "@/assets/scss/variables";
+
 .QuoteOptionView {
-  &__totals {
-    margin-top: 60px;
+  &__wrapper {
+    &.light {
+      opacity: 0.3;
+    }
+  }
+  &__header {
+    padding: 22px;
+    background-color: $black;
+    color: $white;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    cursor: pointer;
+    @media (max-width: $bp-extra-small-max) {
+      flex-direction: column;
+      justify-content: flex-start;
+      align-items: flex-start;
+    }
+    &.disabled {
+      opacity: 0.7;
+      pointer-events: none !important;
+    }
+  }
+  &__title {
+    font-weight: 800;
+    font-size: 18px;
+    line-height: 25px;
+    text-transform: uppercase;
+    span {
+      background: #F38320;
+      padding: 1px 7px;
+      font-weight: bold;
+      font-size: 16.25px;
+      line-height: 22px;
+      color: $white;
+      text-decoration: none;
+      display: inline-block;
+      margin-left: 9px;
+    }
+  }
+  &__proceed {
+    position: relative;
+    display: flex;
+    @media (max-width: $bp-extra-small-max) {
+      margin-top: 20px;
+    }
+    &-message {
+      font-weight: bold;
+      font-size: 16px;
+      line-height: 22px;
+      text-transform: uppercase;
+      color: $white;
+      cursor: pointer;
+      margin-left: 10px;
+    }
+  }
+  &__table {
+    border: 1px solid #dee2e6;
+    padding: 30px;
   }
   &__product {
-    padding-bottom: 30px;
-    margin-bottom: 30px;
+    padding-bottom: 20px;
+    margin-bottom: 20px;
     border-bottom: 1px solid #dee2e6;
   }
+  &__subtotal {
+    padding: 24px;
+    background-color: $gray;
+    display: flex;
+    justify-content: space-between;
+    font-weight: 800;
+    font-size: 16px;
+    line-height: 22px;
+    text-transform: uppercase;
+    @media (max-width: $bp-extra-small-max) {
+      flex-direction: column;
+    }
+    &-item {
+      @media (max-width: $bp-extra-small-max) {
+        display: flex;
+        margin: 5px 0;
+      }
+    }
+    &-label {
+      color: $gray_main;
+    }
+    &-value {
+      color: $black;
+      margin-left: 10px;
+    }
+    &.selected {
+      background-color: $green;
+    }
+  }
+  &__message {
+    margin-top: 30px;
+    font-weight: 600;
+    font-size: 20px;
+    line-height: 27px;
+    color: $gray_main;
+    @media (max-width: $bp-extra-small-max) {
+      font-size: 15px;
+      line-height: 19px;
+    }
+  }
 }