diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index d3723026..50b1a150 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -700,7 +700,7 @@ $(function() { $('.add_to_order').attr('data-attributes',JSON.stringify(attribute_arr)); $('.add_to_order').attr('data-options',JSON.stringify(option_arr)); var item_data = $(this); - item = get_item(item_data); + item = get_item(item_data,"add_to_order"); customer_display_view(item,"add"); show_item_detail(item_data,"add_to_order"); calculate_sub_total(); @@ -710,7 +710,7 @@ $(function() { // click plus icon for add $(document).on('click', '.add_icon', function(event){ var item_data = $(this); - item = get_item(item_data); + item = get_item(item_data,"add_icon"); customer_display_view(item,"add"); show_item_detail(item_data,"add_icon"); calculate_sub_total(); @@ -745,8 +745,6 @@ $(function() { item_code = $(item_row[i]).attr('data-code'); instance_code = $(item_row[i]).attr('data-instance-code'); r_option = $(item_row[i]).attr('data-opt'); -console.log(r_option) -console.log(d_option) if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option == d_option) { if (qty > 1) { qty = parseInt($(item_row[i]).children('#item_qty').text()) + qty; @@ -1195,7 +1193,7 @@ console.log(d_option) } /* Get Item rows */ - function get_item(data){ + function get_item(data,click_type){ var sale_items = []; var sale_item = {}; @@ -1206,6 +1204,8 @@ console.log(d_option) sale_item.instance_code = data.attr('data-instance-code') sale_item.attributes = data.attr('data-attributes') sale_item.options = data.attr('data-options') + sale_item.opt = data.attr('data-opt') + sale_item.click_type = click_type sale_item.instance = data.attr('data-instance') sale_items.push(sale_item); diff --git a/app/assets/javascripts/channels/second_display_view.js b/app/assets/javascripts/channels/second_display_view.js index c6ac124c..1a1cba86 100644 --- a/app/assets/javascripts/channels/second_display_view.js +++ b/app/assets/javascripts/channels/second_display_view.js @@ -30,11 +30,20 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', { instance = "("+items[i].instance+")"; } - d_option = items[i].options; - if (d_option){ - option_name = "-"+items[i].options; + // d_option = items[i].options; + // if (d_option){ + // option_name = "-"+items[i].options; + // }else{ + // option_name = ''; + // } + + d_option = items[i].opt; + if (items[i].click_type != "add_icon"){ + option_name = "-"+items[i].options; + data_option = items[i].options ; }else{ - option_name = ''; + option_name = ' '; + data_option = '[]'; } var rowCount = $('.second_display_items tbody tr').length+1; @@ -68,7 +77,8 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', { +instance+ "' data-code='"+items[i].item_code+"' data-instance-code='" +items[i].instance_code+"' data-attributes='" +items[i].attributes+"' data-options ='" - +items[i].options+"' data-row ='"+rowCount+ "'>" + +data_option+"' data-opt ='" + +items[i].options+"' data-row ='"+rowCount+ "'>" +''+rowCount+'' +'' + items[i].name+ ' ' + instance + ' ' + option_name +'' +'' + qty + ''