@lancom/shared 0.0.370 → 0.0.372

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

@@ -1,6 +1,5 @@
 import { mapGetters, mapActions, mapMutations } from 'vuex';
 import api from '@lancom/shared/assets/js/api';
-import gtm from '@lancom/shared/assets/js/utils/gtm';
 import gapis from '@lancom/shared/assets/js/utils/gapis';
 import { price, shortDate, tax } from '@lancom/shared/assets/js/utils/filters';
 import { convertQuoteToOrder } from '@lancom/shared/assets/js/utils/quote';
@@ -43,7 +42,7 @@ export default {
         this.processing = true;
         this.order = await this.createOrder({ ...option });
         this.setOrder(this.order);
-        gtm.purchase(this.order, this.currency);
+        // gtm.purchase(this.order, this.currency);
         gapis.surveyOptin(this.order, this.shop);
         this.clear();
       } catch (e) {

package/nuxt.config.js

@@ -68,7 +68,8 @@ module.exports = (config, axios, { raygunClient, publicPath, productUrlToEditor
   ],
   serverMiddleware: [
     '@/node_modules/@lancom/shared/plugins/headers',
-    '@/node_modules/@lancom/shared/server-middleware/robots'
+    '@/node_modules/@lancom/shared/server-middleware/robots',
+    '@/node_modules/@lancom/shared/server-middleware/leads'
   ],
   modules: [
     'nuxt-helmet',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.370",
+  "version": "0.0.372",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {
@@ -10,6 +10,7 @@
   "license": "ISC",
   "homepage": "https://bitbucket.org/simpletee/lancom-shared#readme",
   "dependencies": {
+    "basic-auth": "^2.0.1",
     "lodash.get": "^4.4.2",
     "vue2-hammer": "^2.1.2"
   },

package/server-middleware/leads.js

@@ -0,0 +1,69 @@
+const axios = require('axios');
+const basicAuth = require('basic-auth');
+
+const API_URL = process.client ? process.env.API_URL : process.env.LOCAL_API_URL;
+const HOST_NAME = process.env.HOST_NAME;
+
+const LEAD_ADMIN = 'ladmin';
+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;
+      return res.end('Authentication required.');
+    }
+
+    const leads = (await axios.get(`${API_URL}/shop/${HOST_NAME}/leads`)).data;
+    // console.log('leads: ', leads);
+
+    const csvHeaders = [
+      'conversion_action',
+      'conversion_event_time',
+      'gclid',
+      'hashed_email',
+      'hashed_phone_number',
+      'conversion_value',
+      'currency_code',
+      'transaction_id'
+    ];
+
+    const csvRows = leads
+      // .reduce((rows, lead) => {
+      //   if (lead.order) {
+      //     rows.push({ ...lead, type: 'converted_lead', code: lead.order.code });
+      //   }
+      //   if (lead.quote) {
+      //     rows.push({ ...lead, type: 'qualified_lead', code: lead.quote.code });
+      //   }
+      //   if ((lead.quote || lead.order) && lead.contact) {
+      //     rows.push({ ...lead, type: 'contact_form', code: lead.contact.code });
+      //   }
+      //   return rows;
+      // }, [])
+      .map(lead => [
+        lead.action,
+        (new Date(lead.createdAt)).toISOString().replace(/\.[0-9]*Z/, '+00:00').replace('Z', '+00:00'),
+        lead.googleClickId,
+        lead.hashedEmail,
+        lead.hashedPhoneNumber,
+        lead.conversionValue,
+        lead.conversion?.isoCode || 'AUD',
+        lead.code
+      ]);
+
+    const csvContent = [
+      csvHeaders.join(','),
+      ...csvRows.map(row => row.join(','))
+    ].join('\n');
+
+    res.setHeader('Content-Type', 'text/csv');
+    res.end(csvContent);
+    return;
+  }
+
+  next();
+}

package/store/index.js

@@ -120,8 +120,8 @@ export const actions = {
         dispatch('cart/calculateCartPrice', { shop, country });
       }
     }
-    if (state?.googleClickId || query.gclid) {
-      commit('setGoogleClickId', state?.googleClickId || query.gclid);
+    if (query.gclid || state?.googleClickId) {
+      commit('setGoogleClickId', query.gclid || state?.googleClickId);
     }
     const closedNotification = localStorage.getItem(CLOSED_NOTIFICATION);
     if (notificationBar?.text === closedNotification) {