@lancom/shared 0.0.397 → 0.0.399

package/assets/js/api/admin.js

@@ -395,6 +395,9 @@ export default {
   removeCoupon(id) {
     return _delete(`admin/coupons/${id}`);
   },
+  removeCoupons(ids) {
+    return _post('admin/coupons/delete', { ids });
+  },
   fetchReviews() {
     return _get('admin/reviews');
   },

package/assets/js/api/helpers.js

@@ -1,13 +1,12 @@
 import axios from 'axios';
-const Cookie = process.client ? require('js-cookie') : undefined;
+import { getAuthToken, removeAuthToken } from '@lancom/shared/assets/js/utils/auth';
 
 const axiosApiInstance = axios.create();
 
 if (process.client) {
-  console.log('error: ');
   axiosApiInstance.interceptors.request.use(
     config => {
-      const auth = Cookie.get('auth');
+      const auth = getAuthToken();
       config.headers = {
         Authorization: `Bearer ${auth}`
       };
@@ -16,16 +15,19 @@ if (process.client) {
     error => {
       return Promise.reject(error);
     });
-    axiosApiInstance.interceptors.response.use(
-      response => response,
-      error => {
-        if (error.response.status === 401) {
-          Cookie.remove('auth');
-          window.location ='/';
-          return;
+  axiosApiInstance.interceptors.response.use(
+    response => response,
+    error => {
+      if (error.response.status === 401) {
+        removeAuthToken();
+        const currentPath = window.location.pathname;
+        if (currentPath && currentPath !== '/') {
+          window.location = '/';
         }
-        return Promise.reject(error);
-      });
+        return;
+      }
+      return Promise.reject(error);
+    });
 }
 
 const API_URL = process.client ? process.env.API_URL : process.env.LOCAL_API_URL;

package/assets/js/utils/auth.js

@@ -0,0 +1,13 @@
+const AUTH_KEY = 'LANCOM_AUTH';
+
+export function getAuthToken() {
+  return localStorage?.getItem(AUTH_KEY);
+}
+
+export function setAuthToken(token) {
+  return localStorage?.setItem(AUTH_KEY, token);
+}
+
+export function removeAuthToken() {
+  return localStorage?.removeItem(AUTH_KEY);
+}

package/assets/js/utils/coupon.js

@@ -0,0 +1,13 @@
+export function getCouponFreeProducts(coupon, product) {
+  const freeProducts = coupon?.qualifyingProducts?.reduce((products, qualifyingProduct) => {
+    if (qualifyingProduct.products.includes(product?._id || product)) {
+      return [
+        ...products,
+        ...qualifyingProduct.freeProducts
+      ];
+    }
+    return products;
+  }, []);
+
+  return freeProducts || [];
+}

package/assets/js/utils/gtm.js

@@ -156,14 +156,16 @@ const gtm = {
 };
 
 function getOrderItems(order) {
-  return order.products.reduce((products, { product, simpleProducts }) => {
-    return [
-      ...products,
-      ...simpleProducts
-        .filter(({ amount }) => amount > 0)
-        .map(sp => getOrderItem(product, sp))
-    ];
-  }, [])
+  return order.products
+    .filter(p => !p.isFree)
+    .reduce((products, { product, simpleProducts }) => {
+      return [
+        ...products,
+        ...simpleProducts
+          .filter(({ amount }) => amount > 0)
+          .map(sp => getOrderItem(product, sp))
+      ];
+    }, [])
 }
 
 function getOrderItem(product, simpleProduct, currency) {
@@ -173,7 +175,7 @@ function getOrderItem(product, simpleProduct, currency) {
     item_id: SKU,
     item_variant: `${product.name} ${color?.name || ''}-${size?.shortName || ''}`.trim(),
     item_name: product.name.trim(),
-    item_brand: product.brand.name,
+    item_brand: product.brand?.name,
     price: productCost,
     currency: currency?.isoCode || 'AUD',
     quantity: amount,

package/assets/js/utils/order.js

@@ -39,20 +39,21 @@ export function populateProductsFields(products, pricing) {
     product.designId = designId;
 
     product.colors = (product.simpleProducts || []).reduce((colors, sp) => {
-      if (!colors.includes(sp.color._id)) {
-        colors.push(sp.color._id);
+      const _id = sp.color._id || sp.color;
+      if (!colors.includes(_id)) {
+        colors.push(_id);
       }
       return colors;
     }, []);
 
     if (pricing) {
       const productPricing = pricing.products[product.guid] || pricing.products[product?.product._id];
-      product.totalPrice = productPricing.totalPriceWithoutTax;
-      product.printsTotalPrice = productPricing.prints.totalPriceWithoutTax;
-      product.productsTotalPrice = productPricing.products.totalPriceWithoutTax;
+      product.totalPrice = productPricing?.totalPriceWithoutTax;
+      product.printsTotalPrice = productPricing?.prints.totalPriceWithoutTax;
+      product.productsTotalPrice = productPricing?.products.totalPriceWithoutTax;
 
       (product.simpleProducts || []).forEach(sp => {
-        const spPricing = productPricing.products[sp.guid] || productPricing.products[sp._id];
+        const spPricing = productPricing?.products[sp.guid] || productPricing?.products[sp._id];
         if (spPricing) {
           sp.totalPrice = spPricing.totalPriceWithoutTax;
           sp.productCost = spPricing.priceWithoutTax;
@@ -60,7 +61,7 @@ export function populateProductsFields(products, pricing) {
       });
 
       (product.prints || []).forEach(p => {
-        const pPricing = productPricing.prints[p.printArea?._id];
+        const pPricing = productPricing?.prints[p.printArea?._id];
         if (pPricing) {
           p.totalPrice = pPricing.totalPriceWithoutTax;
           p.printCost = pPricing.priceWithoutTax;
@@ -92,6 +93,7 @@ export function populatePrints(products) {
 }
 
 export function generateOrderData(data, cartEntities, pricing) {
+  console.log('generateOrderData:cartEntities: ', cartEntities);
   const order = {
     ...data,
     products: populateProductsFields(cartEntities, pricing),

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

@@ -19,6 +19,7 @@ export default {
       'needToPickup',
       'needToPickupWithoutErrors',
       'entities',
+      'entitiesWithoutFreeProducts',
       'cartPricing',
       'simpleProducts',
       'simpleProductsQuantity',
@@ -35,7 +36,7 @@ export default {
       return this.isNotValidProductsQuantity || this.isNotValidStockQuantity || this.isNotValidPrintsQuantity || this.isNotValidPrintsBigSizeQuantity;
     },
     isNotValidShipping() {
-      return this.needToPickup ? (this.notValidProductsPickup.length > 0 && !this.suburb) : !this.suburb; 
+      return this.needToPickup ? (this.notValidProductsPickup.length > 0 && !this.suburb) : !this.suburb;
     },
     isNotValidProductsQuantity() {
       return this.notValidProductsQuantities.length > 0;
@@ -51,7 +52,7 @@ export default {
     }
   },
   watch: {
-    entities() {
+    entitiesWithoutFreeProducts() {
       this.calculateCartPriceWithDebounce({ shop: this.shop, country: this.country, currency: this.currency });
     }
   },

package/components/checkout/cart/cart.vue

@@ -32,7 +32,7 @@
             <cart-price-info @loaded="loadedPricing($event)" />
           </div>
           <div class="Cart__postcode-container">
-            
+
           </div>
           <div class="Cart__coupon-container">
             <coupon-select
@@ -99,12 +99,12 @@ export default {
   mixins: [CartMixin],
   computed: {
     ...mapGetters(['MESSAGES', 'SETTINGS', 'currency', 'country']),
-    ...mapGetters('cart', ['isEmpty','cartPricingError', 'cartPricing', 'cartPricingCalculating', 'entities']),
+    ...mapGetters('cart', ['isEmpty','cartPricingError', 'cartPricing', 'cartPricingCalculating', 'entities', 'entitiesWithoutFreeProducts']),
     productsEntities() {
-      return this.entities.filter(e => !e.productsKit)
+      return this.entitiesWithoutFreeProducts.filter(e => !e.productsKit)
     },
     productsKitsEntities() {
-      const entities = this.entities.filter(e => !!e.productsKit);
+      const entities = this.entitiesWithoutFreeProducts.filter(e => !!e.productsKit);
       const groupedEntities = entities.reduce((acc, entity) => {
         const { productsKitGuid, productsKit } = entity;
         if (!acc[productsKitGuid]) {
@@ -132,7 +132,7 @@ export default {
   },
   methods: {
     loadedPricing() {
-      gtm.viewCart(this.entities, this.cartPricing, this.currency);
+      gtm.viewCart(this.entitiesWithoutFreeProducts, this.cartPricing, this.currency);
     }
   }
 };

package/components/checkout/cart/cart_entity/cart-entity.mixin.js

@@ -1,6 +1,7 @@
 import { mapGetters } from 'vuex';
 import { groupSimpleProducts } from '@lancom/shared/assets/js/utils/cart';
 import { generateProductLink } from '@lancom/shared/assets/js/utils/product';
+import { getCouponFreeProducts } from '@lancom/shared/assets/js/utils/coupon';
 
 export default {
   props: {
@@ -17,8 +18,15 @@ export default {
     ...mapGetters(['SETTINGS']),
     ...mapGetters('cart', [
       'cartPricing',
-      'cartProductsPricing'
+      'cartProductsPricing',
+      'coupon'
     ]),
+    hasCouponFreeProducts() {
+      return this.couponFreeProducts.length > 0;
+    },
+    couponFreeProducts() {
+      return getCouponFreeProducts(this.coupon, this.product);
+    },
     product() {
       return this.entity.product;
     },

package/components/checkout/cart/cart_entity/cart-entity.scss

@@ -50,6 +50,9 @@
   &__decorations {
     margin-top: 14px;
   }
+  &__free-products {
+    margin-top: 14px;
+  }
   &__subtotal {
     text-align: right;
     margin-top: 24px;

package/components/checkout/cart/cart_entity/cart-entity.vue

@@ -73,6 +73,13 @@
         class="CartEntity__decorations">
         <cart-entity-prints :entity="entity" />
       </div>
+      <div
+        v-if="hasCouponFreeProducts"
+        class="CartEntity__free-products">
+        <cart-coupon-free-products
+          :free-products="couponFreeProducts"
+          :entity="entity" />
+      </div>
       <div class="CartEntity__subtotal lc_title">
         Subtotal: {{ totalPrice | price(currency) }}
       </div>
@@ -87,6 +94,7 @@
 <script>
 import { price } from '@lancom/shared/assets/js/utils/filters';
 import CartEntityPrints from './cart_entity_prints/cart-entity-prints';
+import CartCouponFreeProducts from './cart_coupon_free_products/cart-coupon-free-products';
 import CartEntityColorSimpleProducts from './cart_entity_color_simple_products/cart-entity-color-simple-products';
 import CartEntity from './cart-entity.mixin';
 
@@ -97,7 +105,8 @@ export default {
   },
   components: {
     CartEntityPrints,
-    CartEntityColorSimpleProducts
+    CartEntityColorSimpleProducts,
+    CartCouponFreeProducts
   },
   mixins: [
     CartEntity

package/components/checkout/cart/cart_entity/cart_coupon_free_products/cart-coupon-free-products.scss

@@ -0,0 +1,11 @@
+@import "@/assets/scss/variables";
+
+.CartCouponFreeProducts {
+  &__label {
+    font-size: 12px;
+    font-weight: bold;
+  }
+  &__product {
+    margin-top: 5px;
+  }
+}

package/components/checkout/cart/cart_entity/cart_coupon_free_products/cart-coupon-free-products.vue

@@ -0,0 +1,38 @@
+<template>
+  <div class="CartCouponFreeProducts__wrapper">
+    <div class="CartCouponFreeProducts__label">
+      Free products
+    </div>
+    <cart-coupon-free-product
+      v-for="freeProduct in freeProducts"
+      :key="freeProduct._id"
+      :free-product="freeProduct"
+      :entity="entity"
+      class="CartCouponFreeProducts__product" />
+  </div>
+</template>
+
+<script>
+import CartCouponFreeProduct from './cart_coupon_free_product/cart-coupon-free-product';
+
+export default {
+  name: 'CartCouponFreeProducts',
+  components: {
+    CartCouponFreeProduct
+  },
+  props: {
+    freeProducts: {
+      type: Array,
+      required: true
+    },
+    entity: {
+      type: Object,
+      required: true
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import 'cart-coupon-free-products.scss';
+</style>

package/components/checkout/cart/cart_entity/cart_coupon_free_products/cart_coupon_free_product/cart-coupon-free-product.scss

@@ -0,0 +1,7 @@
+@import "@/assets/scss/variables";
+
+.CartCouponFreeProduct {
+  &__wrapper {
+    font-size: 14px;
+  }
+}

package/components/checkout/cart/cart_entity/cart_coupon_free_products/cart_coupon_free_product/cart-coupon-free-product.vue

@@ -0,0 +1,30 @@
+<template>
+  <div class="CartCouponFreeProduct__wrapper">
+    {{ freeProduct.name }} x {{ qty }}
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'CartCouponFreeProduct',
+  props: {
+    freeProduct: {
+      type: Object,
+      required: true
+    },
+    entity: {
+      type: Object,
+      required: true
+    }
+  },
+  computed: {
+    qty() {
+      return this.entity.simpleProducts?.reduce((qty, sp) => qty + (sp.amount || 0), 0) || 0;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import 'cart-coupon-free-product.scss';
+</style>

package/components/common/phone_input/phone-input.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-    <div>{{ item }}</div>
     <div class="form-row">
       <label
         v-if="labelless"

package/components/customer/customer_coupons/customer-coupons.scss

@@ -1,33 +1,40 @@
 @import "@/assets/scss/variables";
 
-.CustomerCoupons__wrapper {
-  .VueTables {
-    &__table {
-      width: 100%;
-      border-collapse: collapse;
-      th, td {
-        padding: 10px;
-        text-align: left;
-        border-bottom: 1px solid $grey_2;
-        font-size: 14px;
-        &:nth-child(-n+3) {
-          width: 220px;
+.CustomerCoupons {
+  &__wrapper {
+    .VueTables {
+      &__table {
+        width: 100%;
+        border-collapse: collapse;
+        th, td {
+          padding: 10px;
+          text-align: left;
+          border-bottom: 1px solid $grey_2;
+          font-size: 14px;
+          &:nth-child(-n+3) {
+            width: 220px;
+          }
         }
-      }
-      th {
-        background-color: $grey_3;
-        font-weight: bold;
-      }
-      a {
-        color: $black;
-        text-decoration: none;
-        transition: color 0.2s ease;
-        
-        &:hover {
-          color: darken($black, 10%);
-          text-decoration: underline;
+        th {
+          background-color: $grey_3;
+          font-weight: bold;
+        }
+        a {
+          color: $black;
+          text-decoration: none;
+          transition: color 0.2s ease;
+
+          &:hover {
+            color: darken($black, 10%);
+            text-decoration: underline;
+          }
         }
       }
     }
   }
-}
+  &__expired {
+    font-size: 11px;
+    color: grey;
+    margin-top: 5px;
+  }
+}

package/components/customer/customer_coupons/customer-coupons.vue

@@ -6,6 +6,16 @@
         ref="table"
         :columns="columns"
         :options="options">
+        <template #name="{ row }">
+          <div>
+            <div>{{ row.name }}</div>
+            <div
+              v-if="row.expiredAt"
+              class="CustomerCoupons__expired">
+              <span>Expired:</span> {{ row.expiredAt | shortDate }}
+            </div>
+          </div>
+        </template>
         <template #value="{ row }">
           <div v-if="row.percentValue || row.value">
             {{ row.percentValue ? `${row.percentValue}%` : price(row.value)  }}
@@ -33,21 +43,24 @@
     </client-only>
   </div>
 </template>
-  
+
 <script>
 import { mapGetters } from 'vuex';
 import Vue from 'vue';
 import { ServerTable } from 'vue-tables-2';
+import { _get } from '@lancom/shared/assets/js/api/helpers';
+import { price, shortDate } from '@lancom/shared/assets/js/utils/filters';
 import CustomerCouponApply from './customer_coupon_apply/customer-coupon-apply';
 import CustomerCouponPrints from './customer_coupon_prints/customer-coupon-prints';
 import CustomerCouponProducts from './customer_coupon_products/customer-coupon-products';
-import { _get } from '@lancom/shared/assets/js/api/helpers';
-import { price } from '@lancom/shared/assets/js/utils/filters';
 
 Vue.use(ServerTable);
 
 export default {
   name: 'CustomerCoupons',
+  filters: {
+    shortDate
+  },
   components: {
     CustomerCouponApply,
     CustomerCouponPrints,
@@ -96,8 +109,7 @@ export default {
   }
 };
 </script>
-  
+
 <style lang="scss">
 @import 'customer-coupons';
 </style>
-  

package/mixins/authenticated.js

@@ -0,0 +1,7 @@
+export default {
+  mounted() {
+    if (process.client && !this.$store.state.auth.token) {
+      this.$router.push('/customer/signin');
+    }
+  }
+};

package/mixins/meta-info.js

@@ -64,6 +64,12 @@ const metaInfo = {
       href: `https://${process.env.HOST_NAME}${canonical}`
     }];
 
+    metaTags.push({
+      hid: 'og:url',
+      property: 'og:url',
+      content: `https://${process.env.HOST_NAME}${canonical}`
+    });
+
     if (hasQueryParams) {
       metaTags.push({
         hid: 'robots',
@@ -105,7 +111,7 @@ const metaInfo = {
           property: 'og:image',
           content: pageImageUrl
         });
-        
+
         link.push({
           hid: 'preloadImage',
           rel: 'preload',

package/mixins/notAuthenticated.js

@@ -0,0 +1,7 @@
+export default {
+  mounted() {
+    if (process.client && this.$store.state.auth.token) {
+      this.$router.push('/');
+    }
+  }
+};

package/nuxt.config.js

@@ -78,7 +78,8 @@ module.exports = (config, axios, { raygunClient, publicPath, productUrlToEditor
     '@nuxtjs/axios',
     '@nuxtjs/dotenv',
     '@nuxtjs/sitemap',
-    '@/node_modules/@lancom/feed/lib/module'
+    '@/node_modules/@lancom/feed/lib/module',
+    'nuxt-client-init-module'
   ],
   axios: {
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.397",
+  "version": "0.0.399",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {
@@ -12,6 +12,7 @@
   "dependencies": {
     "basic-auth": "^2.0.1",
     "lodash.get": "^4.4.2",
+    "nuxt-client-init-module": "^0.3.0",
     "vue2-hammer": "^2.1.2"
   },
   "devDependencies": {

package/pages/checkout/order.vue

@@ -43,7 +43,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('cart', ['entities', 'coupon', 'cartPricing'])
+    ...mapGetters('cart', ['entitiesWithoutFreeProducts', 'entities', 'coupon', 'cartPricing'])
   },
   methods: {
     loadedPricing() {
@@ -52,7 +52,7 @@ export default {
         value: this.cartPricing.totalPriceWithoutTax,
         currency: 'AUD',
         coupon: this.cartPricing.coupon?.code,
-        items: this.entities.reduce((products, { guid: productGuid, product, simpleProducts }) => {
+        items: this.entitiesWithoutFreeProducts.reduce((products, { guid: productGuid, product, simpleProducts }) => {
           return [
             ...products,
             ...simpleProducts

package/pages/contact.vue

@@ -17,18 +17,30 @@
           </iframe>
         </div>
       </div>
+      <div
+        v-if="routeInfo && routeInfo.text"
+        class="Products__text">
+        <LazyHydrate never>
+          <static-page
+            :visible-title="false"
+            :item="routeInfo" />
+        </LazyHydrate>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
+import LazyHydrate from 'vue-lazy-hydration';
 import metaInfo from '@lancom/shared/mixins/meta-info';
 
 export default {
   name: 'ContactPage',
   components: {
+    LazyHydrate,
     Breadcrumbs: () => import('@lancom/shared/components/common/breadcrumbs/breadcrumbs'),
+    StaticPage: () => import( '@lancom/shared/components/static_page/static-page'),
     ContactUs: () => import('@lancom/shared/components/asides/contact_us/contact-us')
   },
   mixins: [metaInfo],

package/pages/customer/coupons.vue

@@ -2,23 +2,25 @@
   <div
     :data-aos="aosFadeRight"
     class="CustomerCouponsPage__wrapper">
-    <customer-menu active-menu-item="coupons" />
-    <customer-coupons :customer="user" />
+    <client-only>
+      <customer-menu active-menu-item="coupons" />
+      <customer-coupons :customer="user" />
+    </client-only>
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
 import metaInfo from '@lancom/shared/mixins/meta-info';
+import authenticated from '@lancom/shared/mixins/authenticated';
 
 export default {
   name: 'CustomerCouponsPage',
-  middleware: 'authenticated',
   components: {
     CustomerCoupons: () => import('@lancom/shared/components/customer/customer_coupons/customer-coupons'),
     CustomerMenu: () => import('@lancom/shared/components/customer/customer_navigation_menu/customer-navigation-menu')
   },
-  mixins: [metaInfo],
+  mixins: [metaInfo, authenticated],
   computed: {
     ...mapGetters('auth', ['user'])
   }

package/pages/customer/orders.vue

@@ -2,23 +2,25 @@
   <div
     :data-aos="aosFadeRight"
     class="CustomerOrdersPage__wrapper">
-    <customer-navigation-menu active-menu-item="orders" />
-    <customer-orders :customer="user" />
+    <client-only>
+      <customer-navigation-menu active-menu-item="orders" />
+      <customer-orders :customer="user" />
+    </client-only>
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
 import metaInfo from '@lancom/shared/mixins/meta-info';
+import authenticated from '@lancom/shared/mixins/authenticated';
 
 export default {
   name: 'CustomerOrdersPage',
-  middleware: 'authenticated',
   components: {
     CustomerOrders: () => import('@lancom/shared/components/customer/customer_orders/customer-orders'),
     CustomerNavigationMenu: () => import('@lancom/shared/components/customer/customer_navigation_menu/customer-navigation-menu')
   },
-  mixins: [metaInfo],
+  mixins: [metaInfo, authenticated],
   computed: {
     ...mapGetters('auth', ['user'])
   }

package/pages/customer/settings.vue

@@ -2,22 +2,24 @@
   <div
     :data-aos="aosFadeRight"
     class="CustomerSettingsPage__wrapper">
-    <customer-navigation-menu active-menu-item="settings" />
-    <customer-settings />
+    <client-only>
+      <customer-navigation-menu active-menu-item="settings" />
+      <customer-settings />
+    </client-only>
   </div>
 </template>
 
 <script>
 import metaInfo from '@lancom/shared/mixins/meta-info';
+import authenticated from '@lancom/shared/mixins/authenticated';
 
 export default {
   name: 'CustomerCreatePage',
-  middleware: 'authenticated',
   components: {
     CustomerNavigationMenu: () => import('@lancom/shared/components/customer/customer_navigation_menu/customer-navigation-menu'),
     CustomerSettings: () => import('@lancom/shared/components/pages/customer/settings/settings')
   },
-  mixins: [metaInfo]
+  mixins: [metaInfo, authenticated]
 };
 </script>
 

package/plugins/cache-headers.js

@@ -3,15 +3,13 @@ module.exports = function (req, res, next) {
     return next();
   }
 
-  if (!/auth\=/.test(req.headers?.cookie || '')) {
-    const routes = [
-      /^\/quotes\//,
-      /\.xml$/
-    ];
-    const value = routes.some(route => route.test(`${req.url}`)) ? 'no-cache' : `max-age=${31536000}`;
-    res?.setHeader('Cache-Control', value);
-  } else {
-    res?.setHeader('Cache-Control', 'no-cache');
-  }
+  const routes = [
+    /^\/quotes\//,
+    /\.xml$/,
+    /\.csv$/
+  ];
+  const value = routes.some(route => route.test(`${req.url}`)) ? 'no-cache' : `max-age=${31536000}`;
+  res?.setHeader('Cache-Control', value);
+
   next();
 };

package/server-middleware/leads.js

@@ -10,7 +10,7 @@ const LEAD_ADMIN_PASS = 'ladmin2sad$S';
 module.exports = async function (req, res, next) {
   if (req.url === '/lead/leads.csv') {
     const credentials = basicAuth(req);
-  
+
     if (!credentials || credentials.name !== LEAD_ADMIN || credentials.pass !== LEAD_ADMIN_PASS) {
       res.setHeader('WWW-Authenticate', 'Basic realm="Access restricted"');
       res.statusCode = 401;
@@ -46,7 +46,7 @@ module.exports = async function (req, res, next) {
       // }, [])
       .map(lead => [
         lead.action,
-        (new Date(lead.createdAt)).toISOString().replace(/\.[0-9]*Z/, '+00:00').replace('Z', '+00:00'),
+        lead.createdAt,
         lead.googleClickId,
         lead.hashedEmail,
         lead.hashedPhoneNumber,

package/store/auth.js

@@ -1,6 +1,6 @@
 import decode from 'jwt-decode';
 import api from '@lancom/shared/assets/js/api';
-const Cookie = process.client ? require('js-cookie') : undefined;
+import { setAuthToken, removeAuthToken } from '@lancom/shared/assets/js/utils/auth';
 
 export const state = () => ({
   token: null,
@@ -30,22 +30,22 @@ export const actions = {
     const request = customer ? api.authCustomer(customer, shop._id) : api.admin.authUser(user);
     try {
       const { token, user, customer } = await request;
-      Cookie.set('auth', token, { expires: 365 });
+      setAuthToken(token);
       this.$axios.defaults.headers.authorization = token;
       commit('AUTH_SUCCESS', token, customer || user);
       return customer || user;
     } catch (err) {
       commit('AUTH_ERROR', err);
-      Cookie.remove('auth');
+      removeAuthToken();
     }
   },
   auth_logout({ commit }) {
     commit('AUTH_LOGOUT');
-    Cookie.remove('auth');
+    removeAuthToken();
     window.location.href = '/';
   },
   update_user({ commit }, { token, user }) {
-    Cookie.set('auth', token, { expires: 365 });
+    setAuthToken(token);
     this.$axios.defaults.headers.authorization = token;
     commit('AUTH_SUCCESS', token, user);
   }

package/store/cart.js

@@ -3,6 +3,7 @@ import api from '@lancom/shared/assets/js/api';
 import gtm from '@lancom/shared/assets/js/utils/gtm';
 import { getPrintTypeSizePricing } from '@lancom/shared/assets/js/utils/prints';
 import { filterBigSize } from '@lancom/shared/assets/js/utils/product';
+import { getCouponFreeProducts } from '@lancom/shared/assets/js/utils/coupon';
 
 const SUPPLIERS_WITH_RATES_KEY = 'suppliers-with-rates';
 
@@ -73,7 +74,27 @@ const getPrintsQuantities = entities => {
 };
 
 export const getters = {
-  entities: ({ entities }) => entities,
+  entitiesWithoutFreeProducts: ({ entities }) => entities,
+  entities: ({ entities, coupon }) => {
+    return entities.reduce((list, entity) => {
+      const amount = entity.simpleProducts?.reduce((count, sp) => count + +(sp.amount || 0), 0) || 0;
+      const freeProducts = getCouponFreeProducts(coupon, entity.product);
+      return [
+        ...list,
+        entity,
+        ...freeProducts
+          .filter(p => !!p.simpleProducts?.[0])
+          .map(product => ({
+            isFree: true,
+            designId: entity.designId,
+            product,
+            colors: [product.simpleProducts[0].color],
+            prints: [],
+            simpleProducts: [{ ...product.simpleProducts[0], amount }]
+          }))
+      ];
+    }, []);
+  },
   coupon: ({ coupon }) => coupon,
   needToPickup: ({ needToPickup }) => needToPickup,
   needToPickupWithoutErrors: (state, { notValidProductsPickup }) => state.needToPickup && notValidProductsPickup?.length === 0,
@@ -170,7 +191,7 @@ export const actions = {
     })).filter(({ simpleProducts }) => simpleProducts.length > 0);
     const payload = {
       _id: state.id,
-      entities, 
+      entities,
       currency: currency?._id
     };
     await api.saveCart(payload, shop._id);
@@ -235,7 +256,6 @@ export const actions = {
     localStorage.removeItem(SUPPLIERS_WITH_RATES_KEY);
     commit('setSuburb', suburb);
     commit('setCartPricing', null);
-    
   },
   async selectRate({ state: { cartPricing, entities, suburb, coupon }, commit }, { supplier, rate, shop, country, currency }) {
     const suppliersWithRates = cartPricing.shipping.suppliersWithRates

package/store/index.js

@@ -1,10 +1,11 @@
 import api from '@lancom/shared/assets/js/api';
 import { saveStatePlugin, loadState } from '@lancom/shared/plugins/save-state';
+import { getAuthToken } from '@lancom/shared/assets/js/utils/auth';
+import { getShopCountrySettings } from '@lancom/shared/assets/js/utils/shop';
 import { MESSAGES, COUNTRIES_MESSAGES } from '@/messages';
 import { SETTINGS, COUNTRIES_SETTINGS } from '@/settings';
 const cookieparser = process.server ? require('cookieparser') : undefined;
 const CLOSED_NOTIFICATION = 'lancom-closed-notification-1.0';
-import { getShopCountrySettings } from '@lancom/shared/assets/js/utils/shop';
 
 export const state = () => ({
   googleClickId: null,
@@ -53,6 +54,16 @@ export const getters = {
 };
 
 export const actions = {
+  async nuxtClientInit({ commit }, context) {
+    try {
+      const auth = getAuthToken();
+      if (auth) {
+        await commit('auth/AUTH_SUCCESS', auth);
+      }
+    } catch (e) {
+      console.log('nuxtClientInit: ', e);
+    }
+  },
   async nuxtServerInit({ commit }, { req }) {
     const shop = await api.fetchShopByUrl(process.env.HOST_NAME);
     const menus = await api.fetchMenus(shop._id);
@@ -88,16 +99,6 @@ export const actions = {
         });
       }
     }
-
-    // }
-    try {
-      if (req.headers.cookie) {
-        const { auth } = cookieparser.parse(req.headers.cookie);
-        if (auth) {
-          commit('auth/AUTH_SUCCESS', auth);
-        }
-      }
-    } catch (e) {}
   },
   async loadState({ dispatch, commit, state: { shop, currency, country, notificationBar } }, query) {
     const state = await loadState();

package/middleware/authenticated.js

@@ -1,5 +0,0 @@
-export default function ({ store, redirect }) {
-  if (!store.state.auth.token) {
-    return redirect('/customer/signin');
-  }
-}

package/middleware/notAuthenticated.js

@@ -1,5 +0,0 @@
-export default function ({ store, redirect }) {
-  if (store.state.auth.token) {
-    return redirect('/');
-  }
-}