Hotfix for order.order_id not being set

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Invalid Discount code error handled by theme - @grimasod (#3385)
+- Hotfix - `order.order_id` was not assigned in the `orders.directBackendSync` mode - @pkarw (#3398)
 
 ## [1.10.0] - 2019.08.10
 

core/modules/order/store/actions.ts

@@ -23,6 +23,7 @@ const actions: ActionTree<OrderState, RootState> = {
     const currentOrderHash = sha3_224(JSON.stringify(order))
     const isAlreadyProcessed = getters.getSessionOrderHashes.includes(currentOrderHash)
     if (isAlreadyProcessed) return
+    commit(types.ORDER_ADD_SESSION_STAMPS, order)
     commit(types.ORDER_ADD_SESSION_ORDER_HASH, currentOrderHash)
 
     const storeView = currentStoreView()

core/modules/order/store/mutation-types.ts

@@ -4,3 +4,4 @@ export const ORDER_PROCESS_QUEUE = SN_ORDER + '/PROCESS_QUEUE'
 export const ORDER_LAST_ORDER_WITH_CONFIRMATION = SN_ORDER + '/LAST_ORDER_CONFIRMATION'
 export const ORDER_ADD_SESSION_ORDER_HASH = SN_ORDER + '/ADD_SESSION_ORDER_HASH'
 export const ORDER_REMOVE_SESSION_ORDER_HASH = SN_ORDER + '/REMOVE_SESSION_ORDER_HASH'
+export const ORDER_ADD_SESSION_STAMPS = SN_ORDER + '/ADD_SESSION_STAMPS'

core/modules/order/store/mutations.ts

@@ -3,6 +3,7 @@ import { MutationTree } from 'vuex'
 import * as types from './mutation-types'
 import * as entities from '@vue-storefront/core/store/lib/entities'
 import OrderState from '../types/OrderState'
+import { Order } from '../types/Order'
 import config from 'config'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
@@ -13,12 +14,8 @@ const mutations: MutationTree<OrderState> = {
    */
   [types.ORDER_PLACE_ORDER] (state, order) {
     const ordersCollection = Vue.prototype.$db.ordersCollection
-    const orderId = entities.uniqueEntityId(order) // timestamp as a order id is not the best we can do but it's enough
-    order.order_id = orderId.toString()
-    order.created_at = new Date()
-    order.updated_at = new Date()
-
-    ordersCollection.setItem(orderId.toString(), order, (err, resp) => {
+    const orderId = order.order_id ? order.order_id : entities.uniqueEntityId(order).toString()
+    ordersCollection.setItem(orderId, order, (err, resp) => {
       if (err) Logger.error(err, 'order')()
       if (!order.transmited) {
         Vue.prototype.$bus.$emit('order/PROCESS_QUEUE', { config: config }) // process checkout queue
@@ -31,6 +28,12 @@ const mutations: MutationTree<OrderState> = {
   [types.ORDER_LAST_ORDER_WITH_CONFIRMATION] (state, payload) {
     state.last_order_confirmation = payload
   },
+  [types.ORDER_ADD_SESSION_STAMPS] (state, order: Order) {
+    const orderId = entities.uniqueEntityId(order) // timestamp as a order id is not the best we can do but it's enough
+    order.order_id = orderId.toString()
+    order.created_at = new Date().toString()
+    order.updated_at = new Date().toString()
+  },
   [types.ORDER_ADD_SESSION_ORDER_HASH] (state, hash: string) {
     state.session_order_hashes.push(hash)
   },