diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index bab72a06..c4a81194 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -719,14 +719,22 @@ $(function() {
instance = "("+data.attr('data-instance')+")";
}
+ d_option = data.attr('data-options');
+ if (d_option){
+ option_name = "-"+data.attr('data-options');
+ }else{
+ option_name = '';
+ }
+
var rowCount = $('.summary-items tbody tr').length+1;
var item_row = $('.summary-items tbody tr');
$(item_row).each(function(i){
item_code = $(item_row[i]).attr('data-code');
instance_code = $(item_row[i]).attr('data-instance-code');
+ r_option = $(item_row[i]).attr('data-options');
- if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')) {
+ 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;
}else{
@@ -752,7 +760,7 @@ $(function() {
+data.attr('data-attributes')+"' data-options ='"
+data.attr('data-options')+"' data-row ='"+rowCount+ "'>"
+'
'+rowCount+' | '
- +'' + data.attr('data-name')+ ' ' + instance +' | '
+ +'' + data.attr('data-name')+ ' ' + instance +' ' + option_name +' | '
+'' + qty + ' | '
+''
+ parseFloat(price).toFixed(2)
diff --git a/app/assets/javascripts/channels/second_display_view.js b/app/assets/javascripts/channels/second_display_view.js
index 1666c3c8..5a5c8c8e 100644
--- a/app/assets/javascripts/channels/second_display_view.js
+++ b/app/assets/javascripts/channels/second_display_view.js
@@ -27,14 +27,21 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
instance = "("+items[i].instance+")";
}
+ d_option = items[i].options;
+ if (d_option){
+ option_name = "-"+items[i].options;
+ }else{
+ option_name = '';
+ }
+
var rowCount = $('.second_display_items tbody tr').length+1;
var item_row = $('.second_display_items tbody tr');
$(item_row).each(function(j){
var item_code = $(item_row[j]).attr('data-code');
var instance_code = $(item_row[j]).attr('data-instance-code');
-
- if (item_code == items[i].item_code && instance_code == items[i].instance_code) {
+ var r_option = $(item_row[j]).attr('data-options');
+ if (item_code == items[i].item_code && instance_code == items[i].instance_code && r_option==d_option) {
if (qty > 1) {
qty = parseInt($(item_row[j]).children('#item_qty').text()) + qty;
}else{
@@ -60,7 +67,7 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
+items[i].attributes+"' data-options ='"
+items[i].options+"' data-row ='"+rowCount+ "'>"
+' | '+rowCount+' | '
- +'' + items[i].name+ ' ' + instance +' | '
+ +'' + items[i].name+ ' ' + instance + ' ' + option_name +' | '
+'' + qty + ' | '
+''
+ parseFloat(price).toFixed(2)
|