Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

This commit is contained in:
Yan
2017-10-12 10:16:00 +06:30
11 changed files with 188 additions and 41 deletions

View File

@@ -43,6 +43,9 @@ class Origami::AddordersController < BaseOrigamiController
end
end
def get_all_product()
@product = Product.all
end
def create
Rails.logger.debug "Order Source - " + params[:order_source].to_s
@@ -53,6 +56,7 @@ class Origami::AddordersController < BaseOrigamiController
items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}
items_arr.push(items)
}
# begin
@order = Order.new
@order.source = params[:order_source]