@lancom/shared 0.0.236 → 0.0.238

package/assets/js/api/index.js

@@ -95,9 +95,9 @@ const api = {
   fetchOrderByToken(token, params) {
     return _get(`order/token/${token}`, params);
   },
-  createOrderPayment(id, { card, shop, country, invoice, payment }) {
+  createOrderPayment(id, { card, shop, country, invoice, payment, recaptchaToken }) {
     const url = invoice ? `shop/${shop}/order/${id}/invoice/${invoice}/payment` : `shop/${shop}/order/${id}/payment`;
-    return _post(url, { card, country, payment });
+    return _post(url, { card, country, payment, recaptchaToken });
   },
   addOrderTimeline(id, item) {
     return _post(`order/${id}/timeline`, item);

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

@@ -155,8 +155,10 @@ export default {
       try {
         this.creating = true;
         if (!this.orderData) {
+          const recaptchaToken = await this.getRecaptcha('create_order');
           await this.createOrder({
             ...this.order,
+            recaptchaToken,
             products: this.entities,
             pricing: this.cartPricing,
             shop: this.shop._id,

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

@@ -92,8 +92,10 @@ export default {
       try {
         this.processing = true;
         if (!this.orderData) {
+          const recaptchaToken = await this.getRecaptcha('create_order');
           await this.createOrder({
             ...this.order,
+            recaptchaToken,
             products: this.entities,
             pricing: this.cartPricing,
             shop: this.shop._id,

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

@@ -336,7 +336,9 @@ export default {
     async submit() {
       try {
         this.processing = true;
+        const recaptchaToken = await this.getRecaptcha('create_order');
         await this.createOrder({
+          recaptchaToken,
           currency: this.currency?._id,
           country: this.country?._id,
           billingAddress: this.form,

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

@@ -161,7 +161,13 @@ export default {
     },
     async proceedPayment(card) {
       try {
-        const data = { card, shop: this.shop._id, country: this.country?._id, payment: this.payment };
+        const data = {
+          card,
+          shop: this.shop._id,
+          country: this.country?._id,
+          payment: this.payment,
+          recaptchaToken: await this.getRecaptcha('order_payment')
+        };
         await this.submitPayment(data);
         this.clearCart();
         this.clearTemplate();

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

@@ -95,7 +95,8 @@ export default {
         const card = await this.$refs.paymentCart.tokenize();
         if (card) {
           const { _id: invoice } = this.invoice || {};
-          const payload = { invoice, card, shop: this.shop._id, country: this.country?._id, payment: this.payment };
+          const recaptchaToken = await this.getRecaptcha('order_payment');
+          const payload = { invoice, card, shop: this.shop._id, country: this.country?._id, payment: this.payment, recaptchaToken };
           const { paid } = await api.createOrderPayment(this.order._id, payload);
           this.model.paid = paid;
         }

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

@@ -35,7 +35,8 @@ export default {
     async convertToOrder(option) {
       try {
         this.processing = true;
-        this.order = await this.createOrder(option);
+        const recaptchaToken = await this.getRecaptcha('create_order');
+        this.order = await this.createOrder({ ...option, recaptchaToken });
         this.setOrder(this.order);
         gtm.purchase(this.order);
         gapis.surveyOptin(this.order, this.shop);
@@ -47,14 +48,16 @@ export default {
         this.processing = false;
       }
     },
-    createOrder(option) {
+    async createOrder(option) {
+      const recaptchaToken = await this.getRecaptcha('create_order');
       const orderData = {
+        recaptchaToken,
         shop: this.shop._id,
         country: this.country?._id,
         currency: this.currency?._id,
         ...convertQuoteToOrder(this.quote, option)
       };
-      return api.createOrder(orderData, this.shop._id);
+      return await api.createOrder(orderData, this.shop._id);
     }
   }
 };

package/mixins/payment.js

@@ -44,7 +44,13 @@ export default {
     async proceedPayment(card) {
       try {
         this.clearFailedCharge();
-        const data = { card, shop: this.shop._id, country: this.country, payment: this.payment };
+        const data = {
+          card,
+          shop: this.shop._id,
+          country: this.country,
+          payment: this.payment,
+          recaptchaToken: await this.getRecaptcha('order_payment')
+        };
         await this.submitPayment(data);
         this.onOrderSucces();
       } catch (e) {

package/package.json

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

package/store/order.js

@@ -14,15 +14,14 @@ export const getters = {
 
 export const actions = {
   async createOrder({ commit }, data) {
-    const { shop, products, pricing } = data;
+    const { shop, products, pricing, recaptchaToken } = data;
     const order = generateOrderData(data, products, pricing);
-    const response = await api.createOrder(order, shop);
+    const response = await api.createOrder({ ...order, recaptchaToken }, shop);
     commit('setOrderData', response);
   },
-  async submitPayment({ commit, state: { orderData } }, { card, payment, country, shop }) {
+  async submitPayment({ commit, state: { orderData } }, { card, payment, country, shop, recaptchaToken }) {
     const { _id } = orderData || {};
-    debugger;
-    const response = await api.createOrderPayment(_id, { card, shop, country, payment });
+    const response = await api.createOrderPayment(_id, { card, shop, country, payment, recaptchaToken });
     commit('setOrderData', response);
     return {};
   },