From 25229500196401db05ca6486ad30f0422f67a261 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 25 Aug 2017 18:55:34 +0630 Subject: [PATCH] update create order function --- app/controllers/api/orders_controller.rb | 2 +- .../origami/addorders_controller.rb | 1 + app/views/origami/addorders/show.html.erb | 633 ++++++++++-------- 3 files changed, 362 insertions(+), 274 deletions(-) diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 8c7d7396..fe5d1d90 100644 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -1,5 +1,5 @@ class Api::OrdersController < Api::ApiController - + skip_before_action :authenticate #Description # This API show current order details # Input Params - order_id diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index e65b24b7..3a95dc6c 100644 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -11,6 +11,7 @@ class Origami::AddordersController < BaseOrigamiController def show @menu = MenuCategory.all @table_id = params[:id] + @table_type = DiningFacility.find(@table_id).type end private diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb index 8f9b1c08..1cc58af9 100644 --- a/app/views/origami/addorders/show.html.erb +++ b/app/views/origami/addorders/show.html.erb @@ -20,6 +20,8 @@
ORDER DETAILS | Table <%=@table_id%> + +
@@ -111,6 +113,11 @@

Total

+ + + + +
@@ -134,309 +141,389 @@