From 80c497f72362c72983db4fdcac14c8ba6f8729a8 Mon Sep 17 00:00:00 2001
From: pkarw <pkarwatka@divante.pl>
Date: Thu, 22 Nov 2018 00:16:22 +0100
Subject: [PATCH] @NataliaTepluhina please add this to docs:

Starting from Vue Storefront v1.6 now we have a special switch in `vue-storefront-api`: `config.orders.useServerQueue` which is set to `false` by default. With this option disabled the `order_2_magento` process is no longer needed as the incoming orders are directly send to Magento2. If it's set to `true` then - the old behavior of server-based Redis queued used to stack the orders first is being used
---
 src/api/order.js               | 3 +--
 src/platform/magento2/o2m.js   | 3 +--
 src/platform/magento2/order.js | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/api/order.js b/src/api/order.js
index f89eece3..7b4e10da 100755
--- a/src/api/order.js
+++ b/src/api/order.js
@@ -76,8 +76,7 @@ export default ({ config, db }) => resource({
 			orderProxy.create(req.body).then((result) => {
 				apiStatus(res, result, 200);
 			}).catch(err => {
-				console.error(err)
-				apiStatus(res, err, 500);
+				apiStatus(res, err.toString(), 500);
 			})
 		}
 	},
diff --git a/src/platform/magento2/o2m.js b/src/platform/magento2/o2m.js
index 86683cce..11c64f33 100644
--- a/src/platform/magento2/o2m.js
+++ b/src/platform/magento2/o2m.js
@@ -30,7 +30,6 @@ function isNumeric(val) {
  * @param {Function} done callback - @example done(new Error()) - to acknowledge problems
  */
 function processSingleOrder(orderData, config, job, done, logger = console) {
-
   const TOTAL_STEPS = 4;
   const THREAD_ID = 'ORD:' + (job ? job.id : 1) + ' - '; // job id
   let currentStep = 1;
@@ -228,7 +227,7 @@ function processSingleOrder(orderData, config, job, done, logger = console) {
                 redisClient.set("order$$totals$$" + orderData.order_id, JSON.stringify(result[1]));
 
                 if(job) job.progress(currentStep++, TOTAL_STEPS);
-                return done(null, { magentoOrderId: result, transferedAt: new Date() });
+                return done(null, { magentoOrderId: result, backendOrderId: result, transferedAt: new Date() });
               }).catch(err => {
                 logger.error('Error placing an order', err, typeof err)
                 if (job) job.attempts(6).backoff({ delay: 30*1000, type:'fixed' }).save()
diff --git a/src/platform/magento2/order.js b/src/platform/magento2/order.js
index 6a586f6a..1752d3b6 100644
--- a/src/platform/magento2/order.js
+++ b/src/platform/magento2/order.js
@@ -15,6 +15,7 @@ class OrderProxy extends AbstractOrderProxy {
       return new Promise ((resolve, reject) => {
         try {
             processSingleOrder(orderData, inst.config, null, (error, result) => {
+                console.log(error)
                 if (error) reject (error)
                 resolve (result)
             })