git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

menu cache for menu category

Browse Source
This commit is contained in:
Aung Myo
2018-05-09 13:56:37 +06:30
parent b9778d7b5b
commit 2cdb18d338
6 changed files with 201 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

231
app/assets/javascripts/addorder.js
View File

@@ -2,6 +2,7 @@ $(function() {
var role = $('#role').val(); var role = $('#role').val();
type = window.location.href.indexOf("quick_service"); type = window.location.href.indexOf("quick_service");
modify_order = window.location.href.indexOf("modify_order"); modify_order = window.location.href.indexOf("modify_order");
//click menu sidebar menu category //click menu sidebar menu category
$(".product").on("click", function(){ $(".product").on("click", function(){
var url = $(this).attr('data-ref'); var url = $(this).attr('data-ref');
@@ -101,6 +102,7 @@ $(function() {
$('.sub_category_list').addClass("hidden"); $('.sub_category_list').addClass("hidden");
var menu_id = $(this).attr("data-id"); var menu_id = $(this).attr("data-id");
var url = "get_menu_category/"+menu_id; var url = "get_menu_category/"+menu_id;
console.log(menu_id);
show_menu_item_list(url,menu_id); show_menu_item_list(url,menu_id);
var sub_id = $(this).attr("data-sub-id"); var sub_id = $(this).attr("data-sub-id");
if (sub_id == "true") { if (sub_id == "true") {
@@ -133,117 +135,6 @@ $(function() {
for(var ii in categories) { for(var ii in categories) {
if (categories[ii]["id"] == menu_id) { if (categories[ii]["id"] == menu_id) {
var menu_items = categories[ii]["items"]; var menu_items = categories[ii]["items"];
// for(var field in menu_items) {
// if (menu_items[field].is_sub_item == false) {
// instances = menu_items[field].instances ;
// if (!instances.length > 0) {
// swal("Hello Please Check!","Does not have instance item in this menu items ("+ menu_items[field].name+")","warning");
// }
// if (instances.length > 0) {
// qty = 1;
// options = [];
// price = 0;
// if (JSON.stringify(menu_items[field].item_sets)!='[]') {
// fa_plus = '';
// add = '';
// menu_item_box = 'add_icon';
// data_target = 'sx_item_set_detailModal';
// data_modal = 'modal'
// add_icon = "set_item_box"
// code = menu_items[field].code;
// name = menu_items[field].name;
// instances = menu_items[field].instances;
// $(instances).each(function(i){
// if (instances[i].is_default == true) {
// price = parseFloat(instances[i].price).toFixed(2);
// }else{
// price = 0;
// }
// });
// is_available = menu_items[field].is_available ;
// is_on_promotion = 0;
// item_attributes = menu_items[field].attributes;
// promotion_price = menu_items[field].promotion_price;
// }else{
// fa_plus = 'material-icons';
// add = 'view_list'
// menu_item_box = 'menu_item_box';
// data_target = 'sx_item_detailModal';
// data_modal = ''
// add_icon = "add_icon"
// $(instances).each(function(i){
// if (instances[i].is_default === true) {
// code = instances[i].code;
// name = instances[i].name;
// price = parseFloat(instances[i].price).toFixed(2);
// is_available = instances[i].is_available ;
// is_on_promotion = instances[i].is_on_promotion;
// item_attributes = instances[i].values;
// promotion_price = instances[i].promotion_price;
// code = instances[i].code;
// }
// });
// }
// if (menu_items[field].image) {
// if (modify_order) {
// image_path = "../../"+menu_items[field].image;
// }else{
// image_path = menu_items[field].image;
// }
// }else{
// if (modify_order) {
// image_path = "../../image/logo.png";
// }else{
// image_path = "image/logo.png";
// }
// }
// row = '<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
// +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
// +'<div class="col-md-9">'+ menu_items[field].name +'</div>'
// +"<div class='col-md-3 "+menu_item_box+"' data-item-code='"
// + menu_items[field].code +"' data-instance = '"
// +JSON.stringify(menu_items[field].instances)+"' data-id = '"
// +JSON.stringify(menu_items[field].attributes)+"' data-item = '"
// +JSON.stringify(item_attributes)+"' data-option = '"
// +JSON.stringify(menu_items[field].options)+"'data-opt = '"
// +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
// +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' >"
// +"<i class='fa "+fa_plus+" '>"
// +add+ '</i>'
// +'</div>'
// +'</div>'
// +"<div class='"+add_icon+" p-t-65 m-r-' data-item-code='"
// + menu_items[field].code +"' data-name='"
// + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
// + price +"' data-instance-code = '"+ code +"' data-instance = '"
// + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
// + JSON.stringify(item_attributes) +"' data-options = '"
// + JSON.stringify(menu_items[field].options) +"' data-opt = '"
// + JSON.stringify(menu_items[field].options) +"' data-image='"+image_path+"' data-toggle='"
// +data_modal+"' data-target='."+data_target+"' data-item-sets = '"
// +JSON.stringify(menu_items[field].item_sets)+"'data-instances = '"
// +JSON.stringify(menu_items[field].instances)+"'>"
// // +"<div class='card-block custom-card-block'>"
// // +"<img id='logo' height='' src='"+image_path+"'>"
// // +"</div>"
// +'<div class="card-footer custom-card-footer" style="opacity:0.7">'
// +'<span>'+ price +'</span>'
// +'</div>'
// +'</div>';
// $('.menu_items_list').append(row);
// }
// //end instances in menu-items alest 1 instance
// }
// //end is_sub_item false
// }
show_menu_list(menu_items); show_menu_list(menu_items);
} }
} }
@@ -273,117 +164,6 @@ $(function() {
menu_items_list.empty(); menu_items_list.empty();
menu_items = data.menu_items; menu_items = data.menu_items;
show_menu_list(menu_items); show_menu_list(menu_items);
// for(var field in menu_items) {
// if (menu_items[field].is_sub_item == false) {
// instances = menu_items[field].instances ;
// if (!instances.length > 0) {
// swal("Hello Please Check!","Does not have instance item in this menu items ("+ menu_items[field].name+")","warning");
// }
// if (instances.length > 0) {
// qty = 1;
// options = [];
// price = 0;
// if (JSON.stringify(menu_items[field].item_sets)!='[]') {
// fa_plus = '';
// add = '';
// menu_item_box = 'add_icon';
// data_target = 'sx_item_set_detailModal';
// data_modal = 'modal'
// add_icon = "set_item_box"
// code = menu_items[field].code;
// name = menu_items[field].name;
// instances = menu_items[field].instances;
// $(instances).each(function(i){
// if (instances[i].is_default == true) {
// price = parseFloat(instances[i].price).toFixed(2);
// }else{
// price = 0;
// }
// });
// is_available = menu_items[field].is_available ;
// is_on_promotion = 0;
// item_attributes = menu_items[field].attributes;
// promotion_price = menu_items[field].promotion_price;
// }else{
// fa_plus = 'material-icons';
// add = 'view_list'
// menu_item_box = 'menu_item_box';
// data_target = 'sx_item_detailModal';
// data_modal = ''
// add_icon = "add_icon"
// $(instances).each(function(i){
// if (instances[i].is_default === true) {
// code = instances[i].code;
// name = instances[i].name;
// price = parseFloat(instances[i].price).toFixed(2);
// is_available = instances[i].is_available ;
// is_on_promotion = instances[i].is_on_promotion;
// item_attributes = instances[i].values;
// promotion_price = instances[i].promotion_price;
// code = instances[i].code;
// }
// });
// }
// if (menu_items[field].image) {
// if (modify_order) {
// image_path = "../../"+menu_items[field].image;
// }else{
// image_path = menu_items[field].image;
// }
// }else{
// if (modify_order) {
// image_path = "../../image/logo.png";
// }else{
// image_path = "image/logo.png";
// }
// }
// row = '<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
// +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
// +'<div class="col-md-9">'+ menu_items[field].name +'</div>'
// +"<div class='col-md-3 "+menu_item_box+"' data-item-code='"
// + menu_items[field].code +"' data-instance = '"
// +JSON.stringify(menu_items[field].instances)+"' data-id = '"
// +JSON.stringify(menu_items[field].attributes)+"' data-item = '"
// +JSON.stringify(item_attributes)+"' data-option = '"
// +JSON.stringify(menu_items[field].options)+"'data-opt = '"
// +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
// +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' >"
// +"<i class='fa "+fa_plus+" '>"
// +add+ '</i>'
// +'</div>'
// +'</div>'
// +"<div class='"+add_icon+" p-t-65 m-r-' data-item-code='"
// + menu_items[field].code +"' data-name='"
// + menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
// + price +"' data-instance-code = '"+ code +"' data-instance = '"
// + name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
// + JSON.stringify(item_attributes) +"' data-options = '"
// + JSON.stringify(menu_items[field].options) +"' data-opt = '"
// + JSON.stringify(menu_items[field].options) +"' data-image='"+image_path+"' data-toggle='"
// +data_modal+"' data-target='."+data_target+"' data-item-sets = '"
// +JSON.stringify(menu_items[field].item_sets)+"'data-instances = '"
// +JSON.stringify(menu_items[field].instances)+"'>"
// // +"<div class='card-block custom-card-block'>"
// // +"<img id='logo' height='' src='"+image_path+"'>"
// // +"</div>"
// +'<div class="card-footer custom-card-footer" style="opacity:0.7">'
// +'<span>'+ price +'</span>'
// +'</div>'
// +'</div>';
// $('.menu_items_list').append(row);
// }
// //end instances in menu-items alest 1 instance
// }
// //end is_sub_item false
// }
} }
}); });
//end Ajax //end Ajax
@@ -1376,7 +1156,6 @@ show_menu_list(menu_items);
$(".keypress_qty").on('keyup change', function (){ $(".keypress_qty").on('keyup change', function (){
// $('.keypress_qty').keyup(function(e){ // $('.keypress_qty').keyup(function(e){
id = $(this).attr('id'); id = $(this).attr('id');
value = $(this).val(); value = $(this).val();
@@ -1430,10 +1209,6 @@ show_menu_list(menu_items);
var categories = menus[j]["categories"]; var categories = menus[j]["categories"];
for(var ii in categories) { for(var ii in categories) {
if (menu_id == categories[ii]["parent_id"]) { if (menu_id == categories[ii]["parent_id"]) {
console.log("parrrrrrrrrrrrrrrrr");
console.log(categories[ii]["parent_id"]);
console.log(menu_id);
$(sub_category).removeClass('hidden'); $(sub_category).removeClass('hidden');
row = '<li class="menu_sub_category fadeInTop" data-id="'+categories[ii].id+'">' row = '<li class="menu_sub_category fadeInTop" data-id="'+categories[ii].id+'">'
+'<a class="nav-link" data-toggle="tab" href="" role="tab">'+ categories[ii].name+'</a>' +'<a class="nav-link" data-toggle="tab" href="" role="tab">'+ categories[ii].name+'</a>'
@@ -1469,7 +1244,7 @@ show_menu_list(menu_items);
// } // }
for(var i in data) { for(var i in data) {
row = '<li class="menu_category fadeInTop" data-id="'+data[i].id+'">' row = '<li class="menu_sub_category fadeInTop" data-id="'+data[i].id+'">'
+'<a class="nav-link" data-toggle="tab" href="" role="tab">'+ data[i].name+'</a>' +'<a class="nav-link" data-toggle="tab" href="" role="tab">'+ data[i].name+'</a>'
+'</li>' ; +'</li>' ;
$(sub_category).append(row); $(sub_category).append(row);

15
app/controllers/origami/addorders_controller.rb
View File

@@ -18,14 +18,17 @@ class Origami::AddordersController < BaseOrigamiController
if check_mobile if check_mobile
@webview = true @webview = true
end end
puts params[:menu]
# if params[:menus].present? puts "sssssssssssssssssssssssssss"
# @menus = JSON.parse(params[:menus], object_class: OpenStruct) if params[:menus].present?
# @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') @menus = JSON.parse(params[:menus], object_class: OpenStruct)
# else @menu = JSON.parse(params[:category], object_class: OpenStruct)
puts @menus.to_json
puts @menu.to_json
else
@menus = Menu.all @menus = Menu.all
@menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
# end end
@table_id = params[:id] @table_id = params[:id]
@table = DiningFacility.find(@table_id) @table = DiningFacility.find(@table_id)

113
app/views/origami/addorders/detail.html.erb
View File

@@ -5,29 +5,16 @@
<% type = request.path_info.include?('quick_service')%> <% type = request.path_info.include?('quick_service')%>
<% modify_order = request.path_info.include?('modify_order')%> <% modify_order = request.path_info.include?('modify_order')%>
<div class="container-fluid " style="padding:"> <div class="container-fluid ">
<div id="oqs_loading_wrapper" style="display:none;"> <div id="oqs_loading_wrapper" style="display:none;">
<div id="oqs_loading"></div> <div id="oqs_loading"></div>
</div> </div>
<input type="hidden" name="type" id="role" value="<%= current_user.role%>"> <input type="hidden" name="type" id="role" value="<%= current_user.role%>">
<div class="row m-t--20"> <div class="row m-t--20">
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data">
<!-- <a href="javascript:void(0);" class="dropdown-toggle waves-block p-t-15 p-l-15 p-b-15" data-toggle="dropdown" aria-haspopup="" aria-expanded="true" style="background-color: #eeeeee;border-bottom: .214rem solid #fff;border-left: 1px solid #54A5AF;
border-right: 1px solid #54A5AF;">
<span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
</a>
<ul class="dropdown-menu menu_list" style="width:90%">
<% @menus.each do |menu| %>
<li class="nav-item menu_click" data-name="<%=menu.name%>" data-id="<%=menu.id%>">
<a class="nav-link" data-toggle="tab" href="" role="tab"><%=menu.name%></a>
</li>
<%end%>
</ul> -->
<li class="list-menu"> <li class="list-menu">
<a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style=""> <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
<span class="main_menu" id="main_menu" ><%= @menus[0].name %></span> <span class="main_menu" id="main_menu" ><%= @menus[0].name %></span>
<!-- <i class="material-icons material-icons m-l-50 p-r-30">arrow_drop_down</i> -->
</a> </a>
<ul class="ml-menu menu_list aria-hidden " style="border-top: 1px solid #fff"> <ul class="ml-menu menu_list aria-hidden " style="border-top: 1px solid #fff">
<% @menus.each do |menu| %> <% @menus.each do |menu| %>
@@ -85,6 +72,66 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_cache">
<li class="list-menu">
<a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
<span class="main_menu" id="main_menu menu_cache_name" ><%= @menus[0].name %></span>
</a>
<ul class="ml-menu menu_list aria-hidden menu_cache_list" style="border-top: 1px solid #fff">
</ul>
</li>
<div id="menu-slimscroll" data-height="0">
<ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
<li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
</li>
<% @menu.each do |menu| %>
<% if !menu.valid_time.nil? %>
<% if menu.menu_category_id.nil? %>
<!--if type quick_service or cashier for table -->
<% if type %>
<% if !menu.code.include? "SPL" %>
<li class="nav-item">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link menu_category sub_click first_<%=menu.id%>" data-toggle="tab" href="" role="tab" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>"> <%= menu.name%>
<ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul>
</a>
</li>
<% end%>
<!-- else quick_service or cashier for table -->
<% else %>
<% if @table.get_current_checkout_booking.nil? %>
<% if !menu.code.include? "SPL" %>
<li class="nav-item ">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link menu_category sub_click first_<%=menu.id%>" data-toggle="tab" href="" role="tab" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>"> <%= menu.name%>
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul>
</a>
</li>
<% end%>
<% else %>
<li class="nav-item ">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link menu_category sub_click first_<%=menu.id%>" data-toggle="tab" href="" role="tab" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>"> <%= menu.name%>
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul>
</a>
</li>
<% end%>
<!-- end quick_service or cashier for table -->
<% end %>
<% end%>
<% end %>
<%end %>
</ul>
</div>
</div>
<div class="col-md-7 col-lg-7 col-sm-7 m-t-10" > <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
<div class="card"> <div class="card">
<div class="card-block" style=""> <div class="card-block" style="">
@@ -527,12 +574,46 @@
-webkit-animation-duration: 350ms !important; -webkit-animation-duration: 350ms !important;
} }
</style> </style>
<script> <script>
jQuery(function(){ jQuery(function(){
id = "<%=@menu[0].id%>"; id = "<%=@menu[0].id%>";
jQuery('.first_'+id).click(); jQuery('.first_'+id).click();
}); });
$(document).ready(function () { $(document).ready(function () {
var menus = JSON.parse(localStorage.getItem("menus"));
var menu_arr = [];
var category_arr = [];
if (menus != null) {
$("#menu_cache").removeClass("hidden");
$("#menu_cache_name").text(menus[0]["name"])
for(var i in menus) {
console.log(menus[i])
menu_list_template(menus[i]);
}
var category = menus[0]["categories"];
for(var ii in category) {
}
}
function menu_list_template(menu) {
row = '<li class="nav-item menu_click" data-name="<%=menu.name%>" '
+' data-id="<%=menu.id%>" style="">'
+' <a class="nav-link" data-toggle="tab" href="" role="tab"'
+' style="text-transform: lowercase;">'+menu.name+'</a>'
+'</li>';
$("#menu_cache_list").append(row);
}
$(".tables").on('click', function () { $(".tables").on('click', function () {
$('.tables').css('background-color',''); $('.tables').css('background-color','');
$('.tables').removeClass('purple') $('.tables').removeClass('purple')
@@ -545,6 +626,7 @@
$('.confirm_table').attr("data-name",name) $('.confirm_table').attr("data-name",name)
$('.confirm_table').attr("data-type",type) $('.confirm_table').attr("data-type",type)
}); });
$(".confirm_table").on('click', function () { $(".confirm_table").on('click', function () {
var dining_id = $(this).attr("data-id"); var dining_id = $(this).attr("data-id");
var name = $(this).attr("data-name"); var name = $(this).attr("data-name");
@@ -641,7 +723,6 @@
$('#modal-qty').attr('data-value',input_value); $('#modal-qty').attr('data-value',input_value);
// update_total_amount(); // update_total_amount();
}else{ }else{
console.log("aaaaaaaaaa")
$('#modal-qty').val(original_qty + input_value); $('#modal-qty').val(original_qty + input_value);
$('#modal-qty').attr('data-value',original_qty + input_value); $('#modal-qty').attr('data-value',original_qty + input_value);
// update_total_amount(); // update_total_amount();

1
app/views/origami/home/index.html.erb
View File

@@ -142,7 +142,6 @@ $(document).ready(function(){
var webview = <%= @webview %>; var webview = <%= @webview %>;
showHideNavbar(webview,"index"); showHideNavbar(webview,"index");
$(".tables").on('click', function(){ $(".tables").on('click', function(){
var dining_id = $(this).attr("data-id"); var dining_id = $(this).attr("data-id");
window.location.href = '/origami/table/' + dining_id; window.location.href = '/origami/table/' + dining_id;

20
app/views/origami/home/show.html.erb
View File

@@ -1010,26 +1010,6 @@
$('#add_order').on('click', function () { $('#add_order').on('click', function () {
var dining_id = "<%= @dining.id %>"; 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) {
// }
// });
window.location.href = '/origami/addorders/' + dining_id; window.location.href = '/origami/addorders/' + dining_id;
}); });

2
config/routes.rb
View File

@@ -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/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/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }
get '/:addorders/:id' => "addorders#detail" match '/:addorders/:id' => "addorders#detail", via: [:post, :get]
post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' } post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' }