From d0b14cf81b44e3bffbfdc97ee7439467d9ec04f1 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 4 May 2018 18:10:00 +0630 Subject: [PATCH 1/5] update access code in spereat view --- .../origami/addorders_controller.rb | 1 + .../origami/sale_edit_controller.rb | 2 + app/views/origami/home/show.html.erb | 2 +- app/views/origami/rooms/show.html.erb | 72 ++++++++++++++- .../origami/table_invoices/show.html.erb | 88 ++++++++++++++++++- 5 files changed, 159 insertions(+), 6 deletions(-) diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index a9820011..15d896e6 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -20,6 +20,7 @@ class Origami::AddordersController < BaseOrigamiController end @menus = Menu.all @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + @table_id = params[:id] @table = DiningFacility.find(@table_id) @booking = @table.get_booking diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index 1c5b5430..0b3b989d 100755 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -5,8 +5,10 @@ class Origami::SaleEditController < BaseOrigamiController sale_id = params[:sale_id] if params[:table_id] @table_id = params[:table_id] + @table_type = DiningFacility.find(@table_id).type else @table_id = nil + @table_type = nil end @cashier_type = params[:type] diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index a3e26d8d..8fa42403 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -1116,7 +1116,7 @@ if (result.status == true) { createAccessCode(code); if (type == "edit") { - var dining_id = "<%= @dining.id %>"; + var dining_id = "<%= @dining.id rescue "" %> "; var sale_id = "<%= @obj_sale.sale_id rescue "" %>"; window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit"; }else if(type == "void"){ diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index bf01647e..fb3d9a75 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -452,8 +452,13 @@ <% if current_login_employee.role != "waiter" %> + <% if current_login_employee.role == "cashier" %> + Edit + Void + <% else %> - " id="server_mode"> \ No newline at end of file diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 8fa42403..f7f51aa6 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -1010,7 +1010,27 @@ $('#add_order').on('click', function () { var dining_id = "<%= @dining.id %>"; - window.location.href = '/origami/addorders/' + dining_id; + var menus = JSON.parse(localStorage.getItem("menus")); + var menu_arr = []; + if (menus != null) { + for(var i in menus) { + var arr = {}; + arr.id = menus[i]["id"]; + arr.name = menus[i]["name"]; + menu_arr.push(arr); + } + } + menu_arr = JSON.stringify(menu_arr); + console.log(menu_arr) + $.ajax({ + type: 'POST', + data: {menus: menu_arr}, + url: '/origami/addorders/' + dining_id, + success: function(data) { + + } + }); + //window.location.href = '/origami/addorders/' + dining_id+'/'+data; }); /* check in process */ diff --git a/config/routes.rb b/config/routes.rb index 0f329c95..071f6aa1 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -97,6 +97,7 @@ scope "(:locale)", locale: /en|mm/ do post '/check_emp_access_code/:code' => 'home#check_emp_access_code', :defaults => { :format => 'json' } get "dashboard" => "dashboard#index" + get "get_all_menu" => "dashboard#get_all_menu" get "quick_service" => "quick_service#index" @@ -237,7 +238,7 @@ scope "(:locale)", locale: /en|mm/ do get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' } get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' } - get '/:addorders/:id' => "addorders#detail" + post '/:addorders/:id' => "addorders#detail", as: 'addorders_detail' post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' } From 42a15d302353dee09b689e9e76751f705ceafdea Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 8 May 2018 15:54:15 +0630 Subject: [PATCH 3/5] update cache menu --- .../origami/addorders_controller.rb | 15 +++---- app/views/origami/addorders/detail.html.erb | 8 ++-- app/views/origami/home/show.html.erb | 40 +++++++++---------- config/routes.rb | 2 +- 4 files changed, 30 insertions(+), 35 deletions(-) diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index e8f539c8..fd298fb3 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -19,14 +19,13 @@ class Origami::AddordersController < BaseOrigamiController @webview = true end - if params[:menus].present? - @menus = JSON.parse(params[:menus], object_class: OpenStruct) - puts @menus.to_json - @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') - else + # if params[:menus].present? + # @menus = JSON.parse(params[:menus], object_class: OpenStruct) + # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # else @menus = Menu.all @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') - end + # end @table_id = params[:id] @table = DiningFacility.find(@table_id) @@ -48,10 +47,6 @@ class Origami::AddordersController < BaseOrigamiController else @booking = nil end - - respond_to do |format| - format.html { redirect_to origami_addorders_detail_path } - end end def get_menu_category () diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 84c533ac..43ab6db0 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -60,18 +60,18 @@ <% else %> <% if @table.get_current_checkout_booking.nil? %> <% if !menu.code.include? "SPL" %> -
  • +
  • - <%= menu.name%> + <%= menu.name%>
    • <% end%> <% else %> -
  • +
  • - <%= menu.name%> + <%= menu.name%> diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index f7f51aa6..242b5fdd 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -1010,27 +1010,27 @@ $('#add_order').on('click', function () { var dining_id = "<%= @dining.id %>"; - var menus = JSON.parse(localStorage.getItem("menus")); - var menu_arr = []; - if (menus != null) { - for(var i in menus) { - var arr = {}; - arr.id = menus[i]["id"]; - arr.name = menus[i]["name"]; - menu_arr.push(arr); - } - } - menu_arr = JSON.stringify(menu_arr); - console.log(menu_arr) - $.ajax({ - type: 'POST', - data: {menus: menu_arr}, - url: '/origami/addorders/' + dining_id, - success: function(data) { + // var menus = JSON.parse(localStorage.getItem("menus")); + // var menu_arr = []; + // if (menus != null) { + // for(var i in menus) { + // var arr = {}; + // arr.id = menus[i]["id"]; + // arr.name = menus[i]["name"]; + // menu_arr.push(arr); + // } + // } + // menu_arr = JSON.stringify(menu_arr); + // console.log(menu_arr) + // $.ajax({ + // type: 'POST', + // data: {menus: menu_arr}, + // url: '/origami/addorders/' + dining_id, + // success: function(data) { - } - }); - //window.location.href = '/origami/addorders/' + dining_id+'/'+data; + // } + // }); + window.location.href = '/origami/addorders/' + dining_id; }); /* check in process */ diff --git a/config/routes.rb b/config/routes.rb index 071f6aa1..df4d4da0 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -238,7 +238,7 @@ scope "(:locale)", locale: /en|mm/ do get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' } get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' } - post '/:addorders/:id' => "addorders#detail", as: 'addorders_detail' + get '/:addorders/:id' => "addorders#detail" post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' } From 04f05d366f1c43ace1099190da0d07f56a60a9e9 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 8 May 2018 16:38:22 +0630 Subject: [PATCH 4/5] update addorder js --- app/assets/javascripts/addorder.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 3c221a1d..af36a6e3 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -1428,8 +1428,14 @@ show_menu_list(menu_items); if (menus != null) { for(var j in menus) { var categories = menus[j]["categories"]; + console.log("categories"); + console.log(categories); for(var ii in categories) { + console.log(menu_id); + console.log(categories[ii]["parent_id"]); if (menu_id == categories[ii]["parent_id"]) { + console.log("parrrrrrrrrrrrrrrrr"); + console.log(categories[ii]["parent_id"]); var sub_category_list = $('.sub_category_list'); sub_category_list.empty(); $(sub_category).removeClass('hidden'); From b9778d7b5b69fe99e566554afc8f6f4671e0830d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 8 May 2018 17:44:01 +0630 Subject: [PATCH 5/5] update addorder js --- app/assets/javascripts/addorder.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index af36a6e3..71cf182e 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -1421,23 +1421,19 @@ show_menu_list(menu_items); //show menu item list when click menu category function show_sub_category_list(url,sub_category,menu_id){ - var menu_list = $('.sub_category_list'); - menu_list.empty(); + var sub_category_list = $('.sub_category_list'); + sub_category_list.empty(); menus = JSON.parse(localStorage.getItem("menus")); if (menus != null) { for(var j in menus) { var categories = menus[j]["categories"]; - console.log("categories"); - console.log(categories); for(var ii in categories) { - console.log(menu_id); - console.log(categories[ii]["parent_id"]); if (menu_id == categories[ii]["parent_id"]) { console.log("parrrrrrrrrrrrrrrrr"); console.log(categories[ii]["parent_id"]); - var sub_category_list = $('.sub_category_list'); - sub_category_list.empty(); + console.log(menu_id); + $(sub_category).removeClass('hidden'); row = '
  • ' +''+ categories[ii].name+''