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

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-11-22 18:40:38 +06:30
parent f8e6291d1b fafd6df5e1
commit 06582d755e
11 changed files with 73 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,6 @@ $(function() {
var menu_items_list = $('.menu_items_list');
menu_items_list.empty();
menu_items = data.menu_items;
console.log(menu_items);
for(var field in menu_items) {
if (menu_items[field].is_sub_item == false) {
@@ -194,6 +193,7 @@ $(function() {
$(document).on('click', '.set_item_box', function(event){
$(".instance-list").empty();
$(".options-list").empty();
$('.set_change_qty').val(1);
change_qty_plus_minus("set_count","set_plus","set_minus");
data = $(this).parent().children().children('.add_icon');
@@ -373,6 +373,8 @@ $(function() {
$('.add_to_order').removeAttr('data-attributes');
$('.add_to_order').removeAttr('data-options');
$('.change_qty').val(1);
change_qty_plus_minus("count","plus","minus");
data = $(this).parent().children().children('.add_icon');
@@ -513,7 +515,6 @@ $(function() {
// click select option icon for add
$(document).on('click', '.option_btn', function(event){
active =$(this).hasClass('selected-option');
console.log(active);
value = $(this).data('value');
type = $(this).data('type');
group = $(this).data('group');
@@ -558,8 +559,23 @@ $(function() {
if (item_row.length>0) {
var instances = jQuery.parseJSON(item_row.attr('data-instances'));
for(var field in instances) {
if (JSON.stringify(attribute_arr) === JSON.stringify(instances[field].values)) {
for(var field in instances) {
attrbu = JSON.stringify(attribute_arr);
instan = JSON.stringify(instances[field].values);
var newarr = new Set(instan);
result = false;
for(var i in attrbu) {
if (newarr.has(attrbu[i])) {
result = true;
break;
}
}
if (JSON.stringify(attribute_arr) === JSON.stringify(instances[field].values) || result) {
$('.add_to_order').attr('data-instance-code',instances[field].code);
$('.add_to_order').attr('data-instance',instances[field].name);
$('.add_to_order').attr('data-price',instances[field].price);
@@ -872,7 +888,7 @@ $(function() {
id = $(this).attr('id');
value = $(this).val();
$('#count').attr('value',value);
$('.change_qty').attr('value',value);
if (id=="count") {
price = $("#unit_price").text();
$("#total_price").text(value*price);
@@ -880,7 +896,7 @@ $(function() {
var item_row = $('.selected-instance');
price = $("#set_unit_price").text();
set_total_price = $("#set_total_price").text();
$("#set_count").val(value);
$(".set_change_qty").val(value);
if (item_row.length > 1) {
total = 0 ;
$(item_row).each(function(i){