update conflict with addorderjs
This commit is contained in:
Aung Myo
@@ -3,6 +3,7 @@ $(function() {
|
||||
localStorage.removeItem("menus")
|
||||
type = window.location.href.indexOf("quick_service");
|
||||
modify_order = window.location.href.indexOf("modify_order");
|
||||
|
||||
//click menu sidebar menu category
|
||||
$(".product").on("click", function(){
|
||||
var url = $(this).attr('data-ref');
|
||||
@@ -63,8 +64,8 @@ $(function() {
|
||||
+JSON.stringify(item_attributes)+"' data-id = '"
|
||||
+JSON.stringify(item_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(product[field].options)+"'data-opt = '"
|
||||
+JSON.stringify(product[field].options)+"' data-item-sets = '"
|
||||
+JSON.stringify(item_attributes)+"' data-image='"+image_path+"' data-toggle='modal' data-target='.sx_item_detailModal'>"
|
||||
+"<i class='fa fa-bars material-icons'>"
|
||||
+'view_list</i>'
|
||||
@@ -77,8 +78,8 @@ $(function() {
|
||||
+ product[field].unit_price +"' data-instance-code = '"+ product[field].item_code +"' data-instance = '"
|
||||
+ product[field].name +"' data-promotion-price = '"+ 1 +"' 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+"'>"
|
||||
+ JSON.stringify(product[field].options) +"' data-opt = '"
|
||||
+ JSON.stringify(product[field].options) +"' data-image='"+image_path+"'>"
|
||||
|
||||
// +"<div class='card-block custom-card-block'>"
|
||||
// +"<img id='logo' height='125px' src='"+image_path+"'>"
|
||||
@@ -97,8 +98,8 @@ $(function() {
|
||||
}
|
||||
//end show list function
|
||||
//click menu sidebar menu category
|
||||
$('.menu_category').on("click", function(){
|
||||
// event.preventDefault();
|
||||
$(document).on('click', '.menu_category', function(e){
|
||||
e.preventDefault();
|
||||
$('.sub_category_list').addClass("hidden");
|
||||
var menu_id = $(this).attr("data-id");
|
||||
var url = "get_menu_category/"+menu_id;
|
||||
@@ -106,7 +107,7 @@ $(function() {
|
||||
var sub_id = $(this).attr("data-sub-id");
|
||||
if (sub_id == "true") {
|
||||
var sub_url = "get_menu_sub_category/"+menu_id;
|
||||
sub_category = $(this).find('.sub_category_list');
|
||||
sub_category = $(this).siblings('.sub_category_list');
|
||||
show_sub_category_list(sub_url,sub_category,menu_id);
|
||||
}
|
||||
});
|
||||
@@ -114,9 +115,11 @@ $(function() {
|
||||
|
||||
//click menu sidebar menu category
|
||||
$(document).on('click', '.menu_sub_category', function(event){
|
||||
event.preventDefault();
|
||||
// event.preventDefault();
|
||||
// $(".menu_sub_category").on("click", function(){
|
||||
$('.sub_category_list').addClass("hidden");
|
||||
var menu_id = $(this).attr("data-id");
|
||||
console.log(menu_id);
|
||||
var url = "get_menu_category/"+menu_id;
|
||||
show_menu_item_list(url,menu_id);
|
||||
});
|
||||
@@ -134,117 +137,6 @@ $(function() {
|
||||
for(var ii in categories) {
|
||||
if (categories[ii]["id"] == menu_id) {
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -273,118 +165,7 @@ $(function() {
|
||||
var menu_items_list = $('.menu_items_list');
|
||||
menu_items_list.empty();
|
||||
menu_items = data.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
|
||||
// }
|
||||
show_menu_list(menu_items);
|
||||
}
|
||||
});
|
||||
//end Ajax
|
||||
@@ -410,22 +191,26 @@ show_menu_list(menu_items);
|
||||
$('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]);
|
||||
|
||||
value = item_sets[field]["instances"];
|
||||
$(value).each(function(i){
|
||||
|
||||
$(value).each(function(i){
|
||||
menus = JSON.parse(localStorage.getItem("menus"));
|
||||
if (menus != null) {
|
||||
for(var i in menus) {
|
||||
var categories = menus[i]["categories"];
|
||||
for(var j in menus) {
|
||||
var categories = menus[j]["categories"];
|
||||
for(var ii in categories) {
|
||||
var items = categories[ii]["items"];
|
||||
for(var iii in items) {
|
||||
var result = items[iii]["instances"];
|
||||
for(var iv in result) {
|
||||
if (value[i]["id"] == result[iv]["id"]) {
|
||||
for(var v in result) {
|
||||
|
||||
if (value[i]["id"] == result[v]["id"]) {
|
||||
|
||||
console.log("ssssssss")
|
||||
|
||||
row = '<div class="col-md-4 " >'
|
||||
+"<div class='card custom-card instance_box' data-name='"+result[iv]["name"]
|
||||
+"' data-code='"+result[iv]["code"]
|
||||
+"' data-price='"+result[iv]["price"]
|
||||
+"<div class='card custom-card instance_box' data-name='"+result[v]["name"]
|
||||
+"' data-code='"+result[v]["code"]
|
||||
+"' data-price='"+result[v]["price"]
|
||||
+"' data-option='"+JSON.stringify(items[iii]["options"])
|
||||
+"' data-min-qty='"+item_sets[field]["min_selectable_qty"]
|
||||
+"' data-max-qty='"+item_sets[field]["max_selectable_qty"]
|
||||
@@ -434,14 +219,14 @@ show_menu_list(menu_items);
|
||||
+"' data-sub-item='true"
|
||||
+"'>"
|
||||
+'<div class="custom-card-head card-head" style="line-height:14px;">'
|
||||
+'<span class="">'+result[iv]["name"]+'</span>'
|
||||
+'<span class="">'+result[v]["name"]+'</span>'
|
||||
+'</div>'
|
||||
+'<div class="card-block custom-card-block">'
|
||||
+'<img id="" src="/image/logo.png" height="40px">'
|
||||
+' <small style="float:" id="instance_option"></small>'
|
||||
+'</div>'
|
||||
+'<div class="card-footer custom-card-footer">'
|
||||
+' <span>'+result[iv]["price"]+'</span>'
|
||||
+' <span>'+result[v]["price"]+'</span>'
|
||||
// +' <small style="float:right" id="instance_option"></small>'
|
||||
+'</div>'
|
||||
+'</div>'
|
||||
@@ -1379,7 +1164,6 @@ show_menu_list(menu_items);
|
||||
|
||||
$(".keypress_qty").on('keyup change', function (){
|
||||
// $('.keypress_qty').keyup(function(e){
|
||||
|
||||
id = $(this).attr('id');
|
||||
value = $(this).val();
|
||||
|
||||
|
||||
@@ -18,14 +18,17 @@ class Origami::AddordersController < BaseOrigamiController
|
||||
if check_mobile
|
||||
@webview = true
|
||||
end
|
||||
|
||||
# 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
|
||||
puts params[:menu]
|
||||
puts "sssssssssssssssssssssssssss"
|
||||
if params[:menus].present?
|
||||
@menus = JSON.parse(params[:menus], object_class: OpenStruct)
|
||||
@menu = JSON.parse(params[:category], object_class: OpenStruct)
|
||||
puts @menus.to_json
|
||||
puts @menu.to_json
|
||||
else
|
||||
@menus = Menu.all
|
||||
@menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
|
||||
end
|
||||
|
||||
@table_id = params[:id]
|
||||
@table = DiningFacility.find(@table_id)
|
||||
|
||||
@@ -5,29 +5,16 @@
|
||||
<% type = request.path_info.include?('quick_service')%>
|
||||
<% 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"></div>
|
||||
</div>
|
||||
<input type="hidden" name="type" id="role" value="<%= current_user.role%>">
|
||||
<div class="row m-t--20">
|
||||
<div class="col-lg-2 col-md-2 col-sm-2">
|
||||
<!-- <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">
|
||||
<div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data">
|
||||
<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" ><%= @menus[0].name %></span>
|
||||
<!-- <i class="material-icons material-icons m-l-50 p-r-30">arrow_drop_down</i> -->
|
||||
</a>
|
||||
<ul class="ml-menu menu_list aria-hidden " style="border-top: 1px solid #fff">
|
||||
<% @menus.each do |menu| %>
|
||||
@@ -35,106 +22,126 @@
|
||||
<a class="nav-link" data-toggle="tab" href="" role="tab" style="text-transform: lowercase;"><%=menu.name%></a>
|
||||
</li>
|
||||
<%end%>
|
||||
</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? %>
|
||||
</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%>
|
||||
</a>
|
||||
<ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list">
|
||||
</ul>
|
||||
</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%>
|
||||
</a>
|
||||
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
|
||||
</ul>
|
||||
</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%>
|
||||
</a>
|
||||
<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="card">
|
||||
<div class="card-block" style="">
|
||||
<div class="card-text" id="custom-slimscroll">
|
||||
<div class="card-columns custom-card-columns menu_items_list" style="column-gap: 0.5rem;">
|
||||
<!-- append data -->
|
||||
<% @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" %>
|
||||
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
|
||||
<div class='card-block custom-card-block'>
|
||||
<p><%=menu.name%> <p>
|
||||
<p><%=menu.code%> <p>
|
||||
</div>
|
||||
</div>
|
||||
<% end%>
|
||||
<!-- else quick_service or cashier for table -->
|
||||
<% else %>
|
||||
<% if @table.get_current_checkout_booking.nil? %>
|
||||
<% if !menu.code.include? "SPL" %>
|
||||
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
|
||||
<div class='card-block custom-card-block'>
|
||||
<p><%=menu.name%> <p>
|
||||
<p><%=menu.code%> <p>
|
||||
</div>
|
||||
</div>
|
||||
<% end%>
|
||||
<% else %>
|
||||
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
|
||||
<div class='card-block custom-card-block'>
|
||||
<p><%=menu.name%> <p>
|
||||
<p><%=menu.code%> <p>
|
||||
</div>
|
||||
</div>
|
||||
<% end%>
|
||||
<!-- end quick_service or cashier for table -->
|
||||
<% end %>
|
||||
<% end%>
|
||||
<% end %>
|
||||
<%end %>
|
||||
</ul>
|
||||
</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 menu_cache_name" id="main_menu menu_cache_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 category_cache_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>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
|
||||
<div class="card">
|
||||
<div class="card-block" style="">
|
||||
<div class="card-text" id="custom-slimscroll">
|
||||
<div class="card-columns custom-card-columns menu_items_list" style="column-gap: 0.5rem;">
|
||||
<!-- append data -->
|
||||
<% @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" %>
|
||||
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
|
||||
<div class='card-block custom-card-block'>
|
||||
<p><%=menu.name%> <p>
|
||||
<p><%=menu.code%> <p>
|
||||
</div>
|
||||
</div>
|
||||
<% end%>
|
||||
<!-- else quick_service or cashier for table -->
|
||||
<% else %>
|
||||
<% if @table.get_current_checkout_booking.nil? %>
|
||||
<% if !menu.code.include? "SPL" %>
|
||||
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
|
||||
<div class='card-block custom-card-block'>
|
||||
<p><%=menu.name%> <p>
|
||||
<p><%=menu.code%> <p>
|
||||
</div>
|
||||
</div>
|
||||
<% end%>
|
||||
<% else %>
|
||||
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
|
||||
<div class='card-block custom-card-block'>
|
||||
<p><%=menu.name%> <p>
|
||||
<p><%=menu.code%> <p>
|
||||
</div>
|
||||
</div>
|
||||
<% end%>
|
||||
<!-- end quick_service or cashier for table -->
|
||||
<% end %>
|
||||
<% end%>
|
||||
<% end %>
|
||||
<% end%>
|
||||
<% end %>
|
||||
<%end %>
|
||||
</div>
|
||||
<%end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
|
||||
<div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
|
||||
|
||||
<% if type && modify_order%>
|
||||
<button type="button" class="btn btn-lg btn-default waves-effect col-md-4" id='back'>
|
||||
@@ -165,43 +172,43 @@
|
||||
<br>
|
||||
<div class="card-header" style="padding: 0.12rem 0.25rem">
|
||||
<% if type %>
|
||||
<div class="row clearfix">
|
||||
<div class="col-md-6 col-lg-6 col-sm-12">
|
||||
<strong id="order-title" class="font-13">ORDER DETAILS </strong>
|
||||
</div>
|
||||
<div class="row clearfix">
|
||||
<div class="col-md-6 col-lg-6 col-sm-12">
|
||||
<strong id="order-title" class="font-13">ORDER DETAILS </strong>
|
||||
</div>
|
||||
|
||||
<% if modify_order %>
|
||||
<% if @table.nil? %>
|
||||
<div class="col-md-5 col-lg-5 col-sm-5">Table : </div>
|
||||
<p class="hidden" id="table_id"><%=@table_id%></p>
|
||||
<p class="hidden" id="table_type"></p>
|
||||
<% else%>
|
||||
<div class="col-md-5 col-lg-5 col-sm-5">Table : <%=@table.name%></div>
|
||||
<p class="hidden" id="table_id"><%=@table_id%></p>
|
||||
<p class="hidden" id="table_type"><%=@table.type%></p>
|
||||
<% end%>
|
||||
<% if modify_order %>
|
||||
<% if @table.nil? %>
|
||||
<div class="col-md-5 col-lg-5 col-sm-5">Table : </div>
|
||||
<p class="hidden" id="table_id"><%=@table_id%></p>
|
||||
<p class="hidden" id="table_type"></p>
|
||||
<p class="hidden" id="table_get_current"></p>
|
||||
<% else%>
|
||||
<div class="col-md-5 col-lg-5 col-sm-5">Table : <%=@table.name%></div>
|
||||
<p class="hidden" id="table_id"><%=@table_id%></p>
|
||||
<p class="hidden" id="table_type"><%=@table.type%></p>
|
||||
<p class="hidden" id="table_get_current"><%=@table.get_current_checkout_booking%></p>
|
||||
<% end%>
|
||||
|
||||
<p class="hidden" id="booking_id"><%=@booking_id%></p>
|
||||
<p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : '---'%></p>
|
||||
<p class="hidden" id="sale_id"><%=@sale_id%></p>
|
||||
<p class="hidden" id="booking_id"><%=@booking_id%></p>
|
||||
<p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : '---'%></p>
|
||||
<p class="hidden" id="sale_id"><%=@sale_id%></p>
|
||||
|
||||
<div class="col-md-1 col-lg-1 col-sm-1">
|
||||
<button type="button" class="btn btn-xs btn-danger waves-effect float-left" id='clear_all'> Clear
|
||||
</button>
|
||||
</div>
|
||||
<% else%>
|
||||
<p class="hidden" id="table_type"></p>
|
||||
<div class="col-md-2 col-lg-2 col-sm-2">
|
||||
<div class="col-md-1 col-lg-1 col-sm-1">
|
||||
<button type="button" class="btn btn-xs btn-danger waves-effect float-left" id='clear_all'> Clear
|
||||
</button>
|
||||
</div>
|
||||
<% else%>
|
||||
<p class="hidden" id="table_type"></p>
|
||||
<div class="col-md-2 col-lg-2 col-sm-2">
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 col-lg-3 col-sm-3">
|
||||
<button type="button" class="btn btn-xs btn-danger waves-effect float-left" id='clear_all'> Clear
|
||||
</button>
|
||||
</div>
|
||||
<% end%>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3 col-lg-3 col-sm-3">
|
||||
<button type="button" class="btn btn-xs btn-danger waves-effect float-left" id='clear_all'> Clear
|
||||
</button>
|
||||
</div>
|
||||
<% end%>
|
||||
</div>
|
||||
<% else %>
|
||||
<div class="row ">
|
||||
<div class="col-md-9 col-lg-9 col-sm-9 ">
|
||||
@@ -212,6 +219,7 @@
|
||||
<p class="hidden" id="table_type"><%=@table.type%></p>
|
||||
<p class="hidden" id="booking_id"><%=@booking_id%></p>
|
||||
<p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
|
||||
<p class="hidden" id="table_get_current"><%=@table.get_current_checkout_booking%></p>
|
||||
</div>
|
||||
<div class="col-md-3 col-lg-3 col-sm-3">
|
||||
<button type="button" class="btn btn-xs btn-danger waves-effect" id='clear_all'>Clear
|
||||
@@ -527,12 +535,74 @@
|
||||
-webkit-animation-duration: 350ms !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script>
|
||||
|
||||
jQuery(function(){
|
||||
id = "<%=@menu[0].id%>";
|
||||
jQuery('.first_'+id).click();
|
||||
});
|
||||
|
||||
$(document).ready(function () {
|
||||
var menus = JSON.parse(localStorage.getItem("menus"));
|
||||
if (menus != null) {
|
||||
$("#menu_cache").removeClass("hidden");
|
||||
$(".menu_cache_name").text(menus[0]["name"])
|
||||
for(var i in menus) {
|
||||
menu_list_template(menus[i]);
|
||||
}
|
||||
var category = menus[0]["categories"];
|
||||
|
||||
for(var ii in category) {
|
||||
// <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>
|
||||
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]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
$("#menu_data").removeClass("hidden");
|
||||
}
|
||||
|
||||
function category_list_template(menu) {
|
||||
row = '<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.sub_category+'">'+menu.name+''
|
||||
+'</a>'
|
||||
+'<ul class="sub_category_list hidden fadeInTop animated" '
|
||||
+'id="sub_category_list">'
|
||||
+'</ul>'
|
||||
|
||||
+' </li>';
|
||||
$(".category_cache_list").append(row);
|
||||
}
|
||||
|
||||
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').css('background-color','');
|
||||
$('.tables').removeClass('purple')
|
||||
@@ -545,6 +615,7 @@
|
||||
$('.confirm_table').attr("data-name",name)
|
||||
$('.confirm_table').attr("data-type",type)
|
||||
});
|
||||
|
||||
$(".confirm_table").on('click', function () {
|
||||
var dining_id = $(this).attr("data-id");
|
||||
var name = $(this).attr("data-name");
|
||||
@@ -560,10 +631,10 @@
|
||||
});
|
||||
|
||||
$(document).on('click', '.menu_click', function(event){
|
||||
var menu_id = $(this).attr("data-id");
|
||||
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);
|
||||
show_menu_cat_list(name, url);
|
||||
});
|
||||
//End menu category Click
|
||||
|
||||
@@ -641,7 +712,6 @@
|
||||
$('#modal-qty').attr('data-value',input_value);
|
||||
// update_total_amount();
|
||||
}else{
|
||||
console.log("aaaaaaaaaa")
|
||||
$('#modal-qty').val(original_qty + input_value);
|
||||
$('#modal-qty').attr('data-value',original_qty + input_value);
|
||||
// update_total_amount();
|
||||
|
||||
@@ -6,6 +6,16 @@ json.valid_time_to menu.valid_time_to.strftime("%H:%M")
|
||||
|
||||
if (menu.menu_categories)
|
||||
json.categories menu.menu_categories do |category|
|
||||
|
||||
menu_category = MenuCategory.find_by_menu_category_id(category.id)
|
||||
if !menu_category.nil?
|
||||
json.sub_category "true"
|
||||
else
|
||||
json.sub_category "false"
|
||||
end
|
||||
valid_time = category.valid_time
|
||||
json.valid_time valid_time
|
||||
|
||||
json.id category.id
|
||||
json.code category.code
|
||||
json.order_by category.order_by
|
||||
@@ -15,6 +25,8 @@ if (menu.menu_categories)
|
||||
json.parent_id category.menu_category_id
|
||||
json.is_available category.is_available
|
||||
|
||||
|
||||
|
||||
if category.menu_items
|
||||
json.items category.menu_items do |item|
|
||||
json.partial! 'origami/addorders/menu_item', item: item
|
||||
|
||||
@@ -208,7 +208,6 @@
|
||||
<input type="hidden" name="server_mode" value="<%=ENV["SERVER_MODE"]%>" id="server_mode">
|
||||
<script>
|
||||
$(function() {
|
||||
localStorage.removeItem("menus");
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: 'get_all_menu',
|
||||
|
||||
@@ -142,7 +142,6 @@ $(document).ready(function(){
|
||||
var webview = <%= @webview %>;
|
||||
|
||||
showHideNavbar(webview,"index");
|
||||
|
||||
$(".tables").on('click', function(){
|
||||
var dining_id = $(this).attr("data-id");
|
||||
window.location.href = '/origami/table/' + dining_id;
|
||||
|
||||
@@ -1010,27 +1010,7 @@
|
||||
|
||||
$('#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) {
|
||||
|
||||
// }
|
||||
// });
|
||||
window.location.href = '/origami/addorders/' + dining_id;
|
||||
window.location.href = '/origami/addorders/' + dining_id;
|
||||
});
|
||||
|
||||
/* check in process */
|
||||
|
||||
@@ -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' }
|
||||
|
||||
get '/:addorders/:id' => "addorders#detail"
|
||||
match '/:addorders/:id' => "addorders#detail", via: [:post, :get]
|
||||
post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' }
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user