fixed conflict

2017-06-06 09:43:16 +06:30
parent faca7295f7 d9f7b391ec
commit 0cc378f318
50 changed files with 331 additions and 106 deletions
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -28,7 +28,7 @@ class Api::OrdersController <  Api::ApiController
    @order = Order.new
    @order.source = params[:order_source]
    @order.order_type = params[:order_type]
-    @order.customer_id = params[:customer_id]
+    @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
    @order.items = params[:order_items]
    @order.guest = params[:guest_info]
    @order.table_id = params[:table_id]