@lancom/shared 0.0.369 → 0.0.371

package/assets/js/api/admin.js

@@ -350,6 +350,27 @@ export default {
   removeSubscribe(id) {
     return _delete(`admin/subscribe/${id}`);
   },
+  fetchContacts() {
+    return _get('admin/contact');
+  },
+  fetchContactById(id) {
+    return _get(`admin/contact/${id}`);
+  },
+  saveContact(contact) {
+    return contact._id ? _put(`admin/contact/${contact._id}`, contact) : _post('admin/contact', contact);
+  },
+  removeContact(id) {
+    return _delete(`admin/contact/${id}`);
+  },
+  fetchLeadById(id) {
+    return _get(`admin/lead/${id}`);
+  },
+  saveLead(lead) {
+    return lead._id ? _put(`admin/lead/${lead._id}`, lead) : _post('admin/lead', lead);
+  },
+  removeLead(id) {
+    return _delete(`admin/lead/${id}`);
+  },
   fetchCoupons() {
     return _get('admin/coupons');
   },

package/assets/js/utils/quote.js

@@ -27,6 +27,8 @@ export function convertQuoteToOrder(quote, option) {
     suppliersWithRates: option.suppliersWithRates,
     adminShippingTotal: option.adminShippingTotal,
     quote: quote._id,
+    contact: quote.contact,
+    googleClickId: quote.googleClickId,
     resources: files.map(f => ({
       status: 'pending approval',
       prints: [],

package/components/asides/contact_us/contact-us.vue

@@ -193,7 +193,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['contacts', 'shop']),
+    ...mapGetters(['contacts', 'shop', 'googleClickId']),
     phoneRules() {
       return this.requiredPhone ? 'required|phone' : 'phone';
     }
@@ -208,6 +208,7 @@ export default {
         const recaptchaToken = await this.getRecaptcha('contact_us');
         const body = {
           recaptchaToken,
+          googleClickId: this.googleClickId,
           ...this.form
         };
         const response = await api.contactUs(body, this.shop._id);

package/components/asides/offer_screen_printing/offer-screen-printing.vue

@@ -155,7 +155,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['contacts', 'shop']),
+    ...mapGetters(['contacts', 'shop', 'googleClickId']),
     ...mapGetters('layers', [
       'layerThumbnails'
     ]),
@@ -190,6 +190,7 @@ export default {
           address: this.form,
           ...this.form,
           options: [{ products, index: 0 }],
+          googleClickId: this.googleClickId,
           shop: this.shop._id
         };
         await api.saveQuoteRequest(body, this.shop._id);

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

@@ -125,7 +125,7 @@ export default {
   },
   computed: {
     ...mapGetters(['MESSAGES']),
-    ...mapGetters(['country', 'currency', 'app']),
+    ...mapGetters(['country', 'currency', 'app', 'googleClickId']),
     ...mapGetters(['orderSettings']),
     ...mapGetters('order', ['card']),
     ...mapGetters('cart', ['entities', 'notEmptySimpleProducts', 'cartPricing'])
@@ -163,6 +163,7 @@ export default {
             paymentStatus: paymentStatus || 'abandoned',
             recaptchaToken,
             products: this.entities,
+            googleClickId: this.googleClickId,
             pricing: this.cartPricing,
             shop: this.shop._id,
             currency: this.currency?._id,

package/components/checkout/order/order-review/order-review.vue

@@ -74,7 +74,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['country','currency']),
+    ...mapGetters(['shop', 'country','currency', 'googleClickId']),
     ...mapGetters('cart', ['entities', 'notEmptySimpleProducts', 'cartPricing']),
     isPaymentOrder() {
       return this.order.paymentMethod === ORDER_PAYMENT_METHOD.CARD;
@@ -99,6 +99,7 @@ export default {
             products: this.entities,
             pricing: this.cartPricing,
             shop: this.shop._id,
+            googleClickId: this.googleClickId,
             currency: this.currency?._id,
             country: this.country?._id
           });

package/components/modals/order_modal/order-modal.vue

@@ -292,7 +292,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop', 'country', 'currency']),
+    ...mapGetters(['shop', 'country', 'currency', 'googleClickId']),
     ...mapGetters('order', ['orderData']),
     ...mapGetters('cart', [
       'entities',
@@ -360,6 +360,7 @@ export default {
         await this.createOrder({
           recaptchaToken,
           currency: this.currency?._id,
+          googleClickId: this.googleClickId,
           country: this.country?._id,
           billingAddress: JSON.parse(JSON.stringify(this.form)),
           shippingAddress: this.form,

package/components/order/order_payment/order-payment.vue

@@ -77,7 +77,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop', 'country', 'currency', 'payment']),
+    ...mapGetters(['shop', 'country', 'currency', 'payment', 'googleClickId']),
     model() {
       return this.invoice || this.order;
     }
@@ -107,6 +107,7 @@ export default {
             shop: this.shop._id,
             country: this.country?._id,
             payment: this.payment,
+            googleClickId: this.googleClickId,
             currency: this.currency?.isoCode,
             recaptchaToken,
             path: window.location.pathname

package/components/product/product_reviews/add_review/add-review.vue

@@ -280,7 +280,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop'])
+    ...mapGetters(['shop', 'googleClickId'])
   },
   methods: {
     handleUploaded(file) {
@@ -302,7 +302,8 @@ export default {
           recaptchaToken,
           ...this.form,
           product: this.product._id,
-          targetShop: this.shop._id
+          targetShop: this.shop._id,
+          googleClickId: this.googleClickId
         };
         const review = await api.addReview(body, this.shop._id);
         this.$toastr.s('Your review will be processed within 24-48 hours. Thank You.');

package/components/quotes/quote_request/quote-request.vue

@@ -391,7 +391,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['shop', 'currency']),
+    ...mapGetters(['shop', 'currency', 'googleClickId']),
     ...mapGetters('cart', ['entities']),
   },
   methods: {
@@ -429,6 +429,7 @@ export default {
           ...this.quote,
           quoteTypes: Object.keys(this.selectedQuoteTypes),
           shop: this.shop._id,
+          googleClickId: this.googleClickId,
           referer: window.location.href,
           cartInfo: {
             entities: (this.entities || [])

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';
@@ -30,7 +29,7 @@ export default {
   computed: {
     ...mapGetters(['MESSAGES']),
     ...mapGetters('quote', ['quote', 'option', 'proceedOption', 'selectedOption', 'depositInfo', 'shopContacts', 'quoteAddress', 'quoteId', 'options', 'gstTax']),
-    ...mapGetters(['shop', 'country', 'currency'])
+    ...mapGetters(['shop', 'country', 'currency', 'googleClickId'])
   },
   methods: {
     ...mapActions('quote', ['selectOption', 'clear']),
@@ -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) {
@@ -57,6 +56,7 @@ export default {
       const recaptchaToken = await this.getRecaptcha('create_order');
       const orderData = {
         shop: this.shop._id,
+        googleClickId: this.googleClickId,
         country: this.country?._id,
         currency: this.currency?._id,
         ...convertQuoteToOrder(this.quote, option),

package/components/subscribe/subscribe.vue

@@ -103,7 +103,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop'])
+    ...mapGetters(['shop', 'googleClickId'])
   },
   // mounted() {
   //   this.preloadReCaptcha();
@@ -121,6 +121,7 @@ export default {
         const body = {
           recaptchaToken,
           shop: this.shop._id,
+          googleClickId: this.googleClickId,
           ...this.subscriber
         };
         await api.subscribe(body, this.shop._id);

package/layouts/error.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
+import { mapGetters, mapActions } from 'vuex';
 import Error404 from '@lancom/shared/components/errors/404.vue';
 import Error500 from '@lancom/shared/components/errors/500.vue';
 import { generateShopHeadScripts } from '@lancom/shared/utils/head';
@@ -34,6 +34,14 @@ export default {
       }
       return Error500;
     }
+  },
+  mounted() {
+    this.loadState(this.$route.query);
+  },
+  methods: {
+    ...mapActions([
+      'loadState'
+    ]),
   }
 };
 </script>

package/layouts/products.vue

@@ -214,7 +214,7 @@
       }
     },
     mounted() {
-      this.loadState();
+      this.loadState(this.$route.query);
       this.logGtm();
       // setTimeout(() => this.loadProducts(), 3000);
     },

package/mixins/add-to-cart.js

@@ -9,7 +9,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['shop', 'country', 'currency']),
+    ...mapGetters(['shop', 'country', 'currency', 'googleClickId']),
     ...mapGetters('product', [
       'product',
       'usedSimpleProducts',
@@ -61,7 +61,8 @@ export default {
           shop: this.shop,
           pricing: this.productPricing,
           country: this.country,
-          currency: this.currency
+          currency: this.currency,
+          googleClickId: this.googleClickId
         });
         this.$toastr.s('Products successfully added to cart');
   

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.369",
+  "version": "0.0.371",
   "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/plugins/save-state.js

@@ -2,6 +2,7 @@ import debounce from 'lodash.debounce';
 
 const STATE_STORAGE_KEY = 'lancom-state-2.1';
 const SAVE_STATE_MODULES = new Map([
+  ['setGoogleClickId', 'googleClickId'],
   ['cart/setId', 'cart.id'],
   ['cart/clearCart', 'cart.id'],
   ['cart/setCoupon', 'cart.coupon'],
@@ -33,7 +34,11 @@ export function saveState(store) {
       if (!stateToSave[key]) {
         stateToSave[key] = {};
       }
-      stateToSave[key][prop] = store.state[key] && store.state[key][prop];
+      if (prop) {
+        stateToSave[key][prop] = store.state[key] && store.state[key][prop];
+      } else {
+        stateToSave[key] = store.state[key];
+      }
     }
   });
   localStorage.setItem(STATE_STORAGE_KEY, JSON.stringify(stateToSave));

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.type,
+        (new Date(lead.createdAt)).getTime(),
+        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/cart.js

@@ -90,7 +90,7 @@ export const getters = {
 };
 
 export const actions = {
-  async addToCart({ state, commit }, { entities, shop, pricing, country, currency }) {
+  async addToCart({ state, commit }, { entities, shop, pricing, country, currency, googleClickId }) {
     const addingEntities = [...entities];
     const isSamePrints = (e, e2) => {
       const samePrints = (e.prints || []).filter(p => (e2.prints || []).some(p2 => p2.guid === p.guid));
@@ -119,6 +119,7 @@ export const actions = {
     const payload = {
       _id: state.id || undefined,
       currency: currency?._id,
+      googleClickId,
       entities: [...cartEntities, ...entities]
     };
     const cart = await api.saveCart(payload, shop._id);

package/store/index.js

@@ -7,6 +7,7 @@ const CLOSED_NOTIFICATION = 'lancom-closed-notification-1.0';
 import { getShopCountrySettings } from '@lancom/shared/assets/js/utils/shop';
 
 export const state = () => ({
+  googleClickId: null,
   stockCountry: null,
   country: null,
   currency: null,
@@ -31,6 +32,7 @@ export const getters = {
   currency: ({ currency }) => currency,
   currencies: ({ shop }) => (shop.countries || []).reduce((currencies, { country }) => [...currencies, country?.currency], []).filter(c => !!c),
   shop: ({ shop }) => shop || {},
+  googleClickId: ({ googleClickId }) => googleClickId,
   payment: ({ payment }) => payment || {},
   menus: ({ menus }) => menus || [],
   topMenu: ({ menus }) => (menus || []).find(({ type }) => type === 'top'),
@@ -97,7 +99,7 @@ export const actions = {
       }
     } catch (e) {}
   },
-  async loadState({ dispatch, commit, state: { shop, currency, country, notificationBar } }) {
+  async loadState({ dispatch, commit, state: { shop, currency, country, notificationBar } }, query) {
     const state = await loadState();
     if (state) {
       commit('setState', state);
@@ -118,6 +120,9 @@ export const actions = {
         dispatch('cart/calculateCartPrice', { shop, country });
       }
     }
+    if (query.gclid || state?.googleClickId) {
+      commit('setGoogleClickId', query.gclid || state?.googleClickId);
+    }
     const closedNotification = localStorage.getItem(CLOSED_NOTIFICATION);
     if (notificationBar?.text === closedNotification) {
       commit('setNotificationBar', { ...notificationBar, enabled: false });
@@ -149,6 +154,9 @@ export const mutations = {
   setCurrency(state, currency) {
     state.currency = currency;
   },
+  setGoogleClickId(state, googleClickId) {
+    state.googleClickId = googleClickId;
+  },
   setSettings(state, { contacts, notificationBar, discountPopup, order, depositInfo, pricing, app }) {
     state.app = app;
     state.contacts = contacts;

package/store/order.js

@@ -18,14 +18,14 @@ export const actions = {
     commit('setOrderData', response);
   },
   async createOrder({ commit }, data) {
-    const { shop, products, pricing, recaptchaToken } = data;
+    const { shop, products, pricing, recaptchaToken, googleClickId } = data;
     const order = generateOrderData(data, products, pricing);
-    const response = await api.createOrder({ ...order, recaptchaToken }, shop);
+    const response = await api.createOrder({ ...order, recaptchaToken, googleClickId }, shop);
     commit('setOrderData', response);
   },
-  async submitPayment({ commit, state: { orderData } }, { card, payment, country, shop, currency, recaptchaToken }) {
+  async submitPayment({ commit, state: { orderData } }, { card, payment, country, shop, currency, recaptchaToken, googleClickId }) {
     const { _id } = orderData || {};
-    const response = await api.createOrderPayment(_id, { card, shop, country, payment, currency, recaptchaToken });
+    const response = await api.createOrderPayment(_id, { card, shop, country, payment, currency, recaptchaToken, googleClickId });
     if (response.redirect_url) {
       window.location.href = response.redirect_url;
       return;