From ea914ec860fe68490612fb30079c68bcbc97f442 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 14 May 2018 10:24:30 +0630 Subject: [PATCH 1/6] update addorder menu --- .../origami/addorders_controller.rb | 2 + app/views/origami/addorders/detail.html.erb | 70 ++++++++++++++++--- config/initializers/action_controller.rb | 10 +-- 3 files changed, 66 insertions(+), 16 deletions(-) diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index b7c9b1b6..63cb8736 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -67,6 +67,8 @@ class Origami::AddordersController < BaseOrigamiController end def get_menu() + puts "sssssssssssssss" +puts params[:id] if (params[:id]) #Pull this menu @menu = Menu.find_by_id(params[:id]) diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 62bbf3a4..391ba83b 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -650,11 +650,58 @@ $(document).on('click', '.menu_click', function(event){ var menu_id = $(this).attr("data-id"); var name = $(this).attr("data-name"); - var url = "get_menu/"+menu_id; - show_menu_cat_list(name, url); + var menus = JSON.parse(localStorage.getItem("menus")); + if (menus != null) { + menu_click_cache_append(name,menus,menu_id); + }else{ + var url = "get_menu/"+menu_id; + show_menu_cat_list(name, url); + } }); //End menu category Click + function menu_click_cache_append(name,menus,menu_id) { + var menu_list = $('.menu_items_list'); + menu_list.empty(); + + var menu_cat = $('.category_list'); + menu_cat.empty(); + + $(".main_menu").text(name); + for(var i in menus) { + console.log(menus) + console.log(menus[i]["id"]); + console.log(menus[i]["is_active"]); + console.log(menu_id); + if (menu_id == menus[i]["id"] && menus[i]["is_active"] == true) { + // menu_list_template(menus[i]); + var category = menus[i]["categories"]; + + for(var ii in category) { + if (category[ii]["is_available"]== true){ + if (category[ii]["valid_time"]== true){ + if (category[ii]["parent_id"] == null ){ + if(type){ + if (category[ii]["code"].includes("SPL") != true) { + category_list_template(category[ii]); + } + }else{ + if ($("#table_get_current").text()) { + if (category[ii]["code"].includes("SPL") != true) { + category_list_template(category[ii]); + }else { + category_list_template(category[ii]); + } + } + } + } + } + } + } + } + } + } + //show menu item list when click menu category function show_menu_cat_list(name, url_item){ var menu_list = $('.menu_items_list'); @@ -663,15 +710,18 @@ var menu_cat = $('.category_list'); menu_cat.empty(); - $(".main_menu").text(name) - if (modify_order=="true" && type =="true") { + $(".main_menu").text(name); + cashier_type = window.location.href.indexOf("quick_service"); + modify_order = window.location.href.indexOf("modify_order"); + if (cashier_type != -1 && modify_order != -1) { url_item = '../../../addorders/'+url_item; - }if(modify_order=="false" && type =="true"){ - url_item = 'addorders/'+url_item - }else{ - url_item = url_item; } - + if(modify_order == -1 && cashier_type != -1){ + url_item = 'addorders/'+url_item + } + if (cashier_type ==-1 && modify_order == -1){ + url_item = url_item; + } //Start Ajax $.ajax({ type: "GET", @@ -679,10 +729,8 @@ data: {}, dataType: "json", success: function(data) { - for(var i in data) { if (data[i].is_available == true) { - row = '
' +'
' +'

'+ data[i].name +'

' diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index e0eb7455..b84bca54 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -20,11 +20,11 @@ class ActionController::Base end else #check for license file - if check_license - current_license(ENV["SX_PROVISION_URL"]) - else - redirect_to activate_path - end + # if check_license + # current_license(ENV["SX_PROVISION_URL"]) + # else + # redirect_to activate_path + # end end end From 4baff5918cc642883d0f6782d1030f9a90ef54ff Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 14 May 2018 10:50:04 +0630 Subject: [PATCH 2/6] update addorder sale item xls --- app/views/reports/saleitem/index.xls.erb | 23 ++++++++++++++++------- config/initializers/action_controller.rb | 10 +++++----- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/views/reports/saleitem/index.xls.erb b/app/views/reports/saleitem/index.xls.erb index 85c666a5..82b11aef 100755 --- a/app/views/reports/saleitem/index.xls.erb +++ b/app/views/reports/saleitem/index.xls.erb @@ -59,16 +59,18 @@ <% unless @sale_data.blank? %> <% @sale_data.each do |sale| %> - + <% if sale.status_type == "Discount" + total_qty += sale.total_item*(-1) + end %> - + <% if !acc_arr.include?(sale.account_id) %> <%= sale.account_name %> @@ -103,7 +105,12 @@ <% end %> <%= sale.item_code rescue '-' %> <%= sale.product_name rescue '-' %> - <%= sale.total_item rescue '-' %> + <% if sale.status_type != "Discount" %> + <%= sale.total_item rescue '-' %> + <%else%> + <%= sale.total_item*(-1) rescue '-' %> + <% end %> + <%= number_with_precision(sale.unit_price , precision:precision.to_i,delimiter:delimiter) rescue '-'%> <%= number_with_precision(sale.grand_total , precision:precision.to_i,delimiter:delimiter) rescue '-'%> @@ -114,10 +121,12 @@ <% count = count + 1 %> <% sub_total += sale.grand_total %> <% #sub_qty += sale.total_item %> - <% if sale.status_type!="Discount" && (!sale.product_name.include? "FOC") + <% if sale.status_type !="Discount" && (!sale.product_name.include? "FOC") sub_qty += sale.total_item end %> - + <% if sale.status_type =="Discount" + sub_qty += sale.total_item*(-1) + end %> <% if count == value %>   diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index b84bca54..e0eb7455 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -20,11 +20,11 @@ class ActionController::Base end else #check for license file - # if check_license - # current_license(ENV["SX_PROVISION_URL"]) - # else - # redirect_to activate_path - # end + if check_license + current_license(ENV["SX_PROVISION_URL"]) + else + redirect_to activate_path + end end end From 3c1ed265f5a1b6812474005e103292b8651eefb7 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 May 2018 11:47:06 +0630 Subject: [PATCH 3/6] update menu import export --- app/models/menu.rb | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/app/models/menu.rb b/app/models/menu.rb index 60200aeb..a9b88a85 100755 --- a/app/models/menu.rb +++ b/app/models/menu.rb @@ -155,24 +155,28 @@ class Menu < ApplicationRecord # Menu Item Attributes item_attrs = [] - attributes = row["Attributes"].split(',') - attributes.each do |attr| - attribute = MenuItemAttribute.find_by_name(attr) - if attribute.nil? - attribute = MenuItemAttribute.create({ attribute_type:"any", name: attr.capitalize, value: attr.downcase }) + if !row["Attributes"].nil? + attributes = row["Attributes"].split(',') + attributes.each do |attr| + attribute = MenuItemAttribute.find_by_name(attr) + if attribute.nil? + attribute = MenuItemAttribute.create({ attribute_type:"any", name: attr.capitalize, value: attr.downcase }) + end + item_attrs.push(attribute.id) end - item_attrs.push(attribute.id) end # Menu Item Options item_opts = [] + if !row["Options"].nil? options = row["Options"].split(',') - options.each do |opt| - option = MenuItemOption.find_by_name(opt) - if option.nil? - option = MenuItemOption.create({ option_type:"any", name: opt.capitalize, value: opt.downcase }) + options.each do |opt| + option = MenuItemOption.find_by_name(opt) + if option.nil? + option = MenuItemOption.create({ option_type:"any", name: opt.capitalize, value: opt.downcase }) + end + item_opts.push(option.id) end - item_opts.push(option.id) end menu_itm = MenuItem.find_by_item_code(row["Item Code"]) @@ -189,7 +193,11 @@ class Menu < ApplicationRecord menu_inst = MenuItemInstance.find_by_item_instance_code(row["Instance Code"]) if !menu_inst - imported_instance = MenuItemInstance.create(menu_item_id: menu_itm.id, item_instance_code: row["Instance Code"], item_instance_name: row["Instance Name"], item_attributes: [], price: row["Price"], is_on_promotion: false, promotion_price: 0, is_available: true, is_default: row["Is Default"]) + instance_name = '' + if !row["Instance Name"].nil? + instance_name = row["Instance Name"] + end + imported_instance = MenuItemInstance.create(menu_item_id: menu_itm.id, item_instance_code: row["Instance Code"], item_instance_name: instance_name, item_attributes: [], price: row["Price"], is_on_promotion: false, promotion_price: 0, is_available: true, is_default: row["Is Default"]) # else # status = status + "Instance Code already exists for " + row["Instance Name"] + "." end From 0b104b021b3513d7ec2857a5344829e0508079d2 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 14 May 2018 13:34:14 +0630 Subject: [PATCH 4/6] update add ordr --- app/views/origami/addorders/detail.html.erb | 2 +- app/views/origami/dashboard/index.html.erb | 4 ++-- app/views/origami/home/show.html.erb | 8 +++++++- config/environments/development.rb | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 391ba83b..65ea665b 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -17,7 +17,7 @@ <%if @menu.present? %> - <%=menu[0].name%> + <%=@menus[0].name%> <% end%> diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb index 4712a481..66f21ec2 100644 --- a/app/views/origami/dashboard/index.html.erb +++ b/app/views/origami/dashboard/index.html.erb @@ -222,9 +222,9 @@ $(function() { }); $(".qs_view").on('click', function() { - if ($('#server_mode').val() != "cloud") { + if ($('#server_mode').val() != "cloud") { document.getElementById('second_view').click(); - } + } window.location.href = '/origami/quick_service'; }); diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 2915d3ca..e1b88f85 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -1010,7 +1010,13 @@ $('#add_order').on('click', function () { var dining_id = "<%= @dining.id %>"; - + var menus = JSON.parse(localStorage.getItem("menus")); + // if (menus != null) { + // console.log("menu"); + // menu_cache_append(menus); + // }else{ + // $("#menu_data").removeClass("hidden"); + // } window.location.href = '/origami/addorders/' + dining_id; }); diff --git a/config/environments/development.rb b/config/environments/development.rb index 2eda7ecf..d1fddff2 100755 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -55,5 +55,5 @@ Rails.application.configure do config.file_watcher = ActiveSupport::EventedFileUpdateChecker # Set Cable URL - config.action_cable.url = "ws://192.168.1.196:3002/cable" + # config.action_cable.url = "ws://192.168.1.196:3002/cable" end From 57c9cd4d6fa0480a90a6867ac1775385d872404f Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 14 May 2018 14:49:21 +0630 Subject: [PATCH 5/6] updaate loading menu cache --- app/views/origami/dashboard/index.html.erb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb index 66f21ec2..a0b0dc51 100644 --- a/app/views/origami/dashboard/index.html.erb +++ b/app/views/origami/dashboard/index.html.erb @@ -1,4 +1,7 @@

+

<%= t :date_time %> : <%= Time.zone.now.utc.getlocal.strftime("%Y-%m-%d %I:%M %p") %>

@@ -208,14 +211,23 @@ " id="server_mode">