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();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user