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

update options for addorder

Browse Source
This commit is contained in:
Aung Myo
2018-03-12 16:03:44 +06:30
parent 6e9ecd342b
commit 68f20a5535
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -719,14 +719,22 @@ $(function() {
instance = "("+data.attr('data-instance')+")"; 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 rowCount = $('.summary-items tbody tr').length+1;
var item_row = $('.summary-items tbody tr'); var item_row = $('.summary-items tbody tr');
$(item_row).each(function(i){ $(item_row).each(function(i){
item_code = $(item_row[i]).attr('data-code'); item_code = $(item_row[i]).attr('data-code');
instance_code = $(item_row[i]).attr('data-instance-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) { if (qty > 1) {
qty = parseInt($(item_row[i]).children('#item_qty').text()) + qty; qty = parseInt($(item_row[i]).children('#item_qty').text()) + qty;
}else{ }else{
@@ -752,7 +760,7 @@ $(function() {
+data.attr('data-attributes')+"' data-options ='" +data.attr('data-attributes')+"' data-options ='"
+data.attr('data-options')+"' data-row ='"+rowCount+ "'>" +data.attr('data-options')+"' data-row ='"+rowCount+ "'>"
+'<td class="item-cell-no">'+rowCount+'</td>' +'<td class="item-cell-no">'+rowCount+'</td>'
+'<td class="item-cell-name" id="item_name" >' + data.attr('data-name')+ ' ' + instance +'</td>' +'<td class="item-cell-name" id="item_name" >' + data.attr('data-name')+ ' ' + instance +' ' + option_name +'</td>'
+'<td class="item-cell-qty" id="item_qty">' + qty + '</td>' +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+'<td class="item-cell-price" id="item_price">' +'<td class="item-cell-price" id="item_price">'
+ parseFloat(price).toFixed(2) + parseFloat(price).toFixed(2)

13
app/assets/javascripts/channels/second_display_view.js
View File

@@ -27,14 +27,21 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
instance = "("+items[i].instance+")"; 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 rowCount = $('.second_display_items tbody tr').length+1;
var item_row = $('.second_display_items tbody tr'); var item_row = $('.second_display_items tbody tr');
$(item_row).each(function(j){ $(item_row).each(function(j){
var item_code = $(item_row[j]).attr('data-code'); var item_code = $(item_row[j]).attr('data-code');
var instance_code = $(item_row[j]).attr('data-instance-code'); var instance_code = $(item_row[j]).attr('data-instance-code');
var r_option = $(item_row[j]).attr('data-options');
if (item_code == items[i].item_code && instance_code == items[i].instance_code) { if (item_code == items[i].item_code && instance_code == items[i].instance_code && r_option==d_option) {
if (qty > 1) { if (qty > 1) {
qty = parseInt($(item_row[j]).children('#item_qty').text()) + qty; qty = parseInt($(item_row[j]).children('#item_qty').text()) + qty;
}else{ }else{
@@ -60,7 +67,7 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
+items[i].attributes+"' data-options ='" +items[i].attributes+"' data-options ='"
+items[i].options+"' data-row ='"+rowCount+ "'>" +items[i].options+"' data-row ='"+rowCount+ "'>"
+'<td class="item-cell-no">'+rowCount+'</td>' +'<td class="item-cell-no">'+rowCount+'</td>'
+'<td class="item-cell-name" id="item_name" >' + items[i].name+ ' ' + instance +'</td>' +'<td class="item-cell-name" id="item_name" >' + items[i].name+ ' ' + instance + ' ' + option_name +'</td>'
+'<td class="item-cell-qty" id="item_qty">' + qty + '</td>' +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+'<td class="item-cell-price" id="item_price">' +'<td class="item-cell-price" id="item_price">'
+ parseFloat(price).toFixed(2) + parseFloat(price).toFixed(2)