@lancom/shared 0.0.162 → 0.0.164

package/assets/js/utils/gtm.js

@@ -46,6 +46,34 @@ const gtm = {
         quantity: amount
       }))
     });
+  },
+  purchase(order) {
+    const event = {
+      event: 'purchase',
+      transaction_id: order.code,
+      value: order.total,
+      currency: 'AUD',
+      coupon: order.couponCode,
+      shipping: order.shippingTotal,
+      tax: +(order.totalGST - order.total).toFixed(2),
+      items: order.products.reduce((products, { product, simpleProducts }) => {
+        return [
+          ...products,
+          ...simpleProducts
+            .filter(({ amount }) => amount > 0)
+            .map(({ SKU, productCost, amount, color, size }) => ({
+              item_id: SKU,
+              item_name: `${product.name} ${color?.name || ''} ${size?.name || ''}`.trim(),
+              item_brand: product.brand.name,
+              price: productCost,
+              currency: 'AUD',
+              quantity: amount
+            }))
+        ];
+      }, [])
+    };
+    console.log('purchase: ', event);
+    gtm.push(event);
   }
 };
 

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

@@ -54,6 +54,7 @@
           {{ errorMessage }}
         </div>
         <payment-cart
+          v-if="cartPricing"
           ref="paymentCart"
           :amount="cartPricing.totalPrice"
           :payment-data="order.shippingAddress">

package/components/modals/payment_modal/payment-modal.vue

@@ -252,21 +252,7 @@ export default {
       }
     },
     sendConversionData() {
-      if (process.env.IS_PROD) {
-        gtm.push({
-          id: this.orderData._id,
-          total: this.orderData.price.totalPrice,
-          tax: this.orderData.price.tax.totalPrice,
-          shipping: this.orderData.postcode,
-          products: this.orderData.products.map(product => ({
-            sku: product.SKU,
-            name: product.name,
-            category: product.brand,
-            price: product.pricing[0].price,
-            quantity: product.amount
-          }))
-        });
-      }
+      gtm.purchase(this.orderData);
     },
     back() {
       /*

package/components/quotes/quote_view/quote-view.mixin.js

@@ -1,4 +1,4 @@
-import { mapGetters, mapActions } from 'vuex';
+import { mapGetters, mapActions, mapMutations } from 'vuex';
 import api from '@lancom/shared/assets/js/api';
 import { price, shortDate, tax } from '@lancom/shared/assets/js/utils/filters';
 import { convertQuoteToOrder } from '@lancom/shared/assets/js/utils/quote';
@@ -26,6 +26,7 @@ export default {
   },
   methods: {
     ...mapActions('quote', ['selectOption', 'clear']),
+    ...mapMutations('quote', ['setOrder']),
     optionGst(option) {
       return tax(option.total, this.gstTax) - option.total;
     },
@@ -33,6 +34,7 @@ export default {
       try {
         this.processing = true;
         this.order = await this.createOrder(option);
+        this.setOrder(this.order);
         this.clear();
       } catch (e) {
         const { message } = (e.response && e.response.data) || e;

package/mixins/payment.js

@@ -63,31 +63,7 @@ export default {
       }
     },
     sendConversionData() {
-      const event = {
-        event: 'purchase',
-        transaction_id: this.orderData.code,
-        value: this.orderData.total,
-        currency: 'AUD',
-        coupon: this.orderData.couponCode,
-        shipping: this.orderData.shippingTotal,
-        tax: this.orderData.totalGST - this.orderData.total,
-        items: this.orderData.products.reduce((products, { product, simpleProducts }) => {
-          return [
-            ...products,
-            ...simpleProducts
-              .filter(({ amount }) => amount > 0)
-              .map(({ SKU, productCost, amount }) => ({
-                item_id: SKU,
-                item_name: product.name,
-                item_brand: product.brand.name,
-                price: productCost,
-                currency: 'AUD',
-                quantity: amount
-              }))
-          ];
-        }, [])
-      };
-      gtm.push(event);
+      gtm.purchase(this.orderData);
     },
     clearFailedCharge() {
       this.errorMessage = null;

package/package.json

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

package/store/quote.js

@@ -65,6 +65,9 @@ export const mutations = {
   setQuote(state, quote) {
     state.quote = quote;
   },
+  setOrder(state, order) {
+    state.quote.order = order;
+  },
   setOption(state, option) {
     state.option = option;
   },