@lancom/shared 0.0.397 → 0.0.398

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/package.json

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

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/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