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

Merge branch 'adminbsb_material_ui'

Browse Source
This commit is contained in:
Aung Myo
2018-03-12 17:26:56 +06:30
parent 92401ab4f9 428b9a4b64
commit b65849a11a
2 changed files with 126 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -368,8 +368,7 @@ $(function() {
if (items.length >= min_qty) { if (items.length >= min_qty) {
item = get_set_item(items); item = get_set_item(items);
console.log(item) customer_display_view(item,"set_add");
// customer_display_view(item,"add");
attribute_arr = [] attribute_arr = []
option_arr = [] option_arr = []
@@ -405,6 +404,7 @@ $(function() {
price = $(items[i]).attr('data-price'); price = $(items[i]).attr('data-price');
option = $(items[i]).attr('data-options'); option = $(items[i]).attr('data-options');
sub_item = $(items[i]).attr('data-sub-item'); sub_item = $(items[i]).attr('data-sub-item');
option = $(items[i]).attr('data-options');
total = qty * price ; total = qty * price ;
option_arr.push(option); option_arr.push(option);
row ="<tr class='item_box' data-price ='" row ="<tr class='item_box' data-price ='"
@@ -690,7 +690,6 @@ $(function() {
$('.add_to_order').attr('data-options',JSON.stringify(option_arr)); $('.add_to_order').attr('data-options',JSON.stringify(option_arr));
var item_data = $(this); var item_data = $(this);
item = get_item(item_data); item = get_item(item_data);
console.log(item)
customer_display_view(item,"add"); customer_display_view(item,"add");
show_item_detail(item_data); show_item_detail(item_data);
calculate_sub_total(); calculate_sub_total();
@@ -719,14 +718,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 +759,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)
@@ -1182,22 +1189,28 @@ $(function() {
/* Get Item rows */ /* Get Item rows */
function get_set_item(items){ function get_set_item(items){
var sale_items = []; var sale_items = [];
var item = {};
item.code = $('.set-item').attr('data-code');
item.name = $('.set-item').attr('data-name');
item.item_name = $('#set_name').text();
item.qty = parseInt($('#set_count').val());
item.item_code = $('#set_item_code').text();
item.price = $('.set-item').attr('data-price');
item.option = $('.set-item').attr('data-options');
item.parent = $('.set-item').attr('data-parent');
var sale_item = {}; sale_items.push(item);
sale_item.code = $('.set-item').attr('data-code');
sale_item.name = $('.set-item').attr('data-name');
sale_item.price = $('.set-item').attr('data-price');
sale_item.option = $('.set-item').attr('data-options');
sale_item.parent = $('.set-item').attr('data-parent');
sale_items.push(sale_item);
$(items).each(function(i){ $(items).each(function(i){
sale_item,code = $(items[i]).attr('data-code'); var sale_item = {};
sale_item,name = $(items[i]).attr('data-name'); sale_item.code = $(items[i]).attr('data-code');
sale_item,price = $(items[i]).attr('data-price'); sale_item.name = $(items[i]).attr('data-name');
sale_item,option = $(items[i]).attr('data-options'); sale_item.item_name = $('#set_name').text();
sale_item,sub_item = $(items[i]).attr('data-sub-item'); sale_item.qty = parseInt($('#set_count').val());
sale_item.item_code = $('#set_item_code').text();
sale_item.price = $(items[i]).attr('data-price');
sale_item.option = $(items[i]).attr('data-options');
sale_item.sub_item = $(items[i]).attr('data-sub-item');
sale_items.push(sale_item); sale_items.push(sale_item);
}); });

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

@@ -15,59 +15,103 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
$('#second_display_slider').addClass("hidden") $('#second_display_slider').addClass("hidden")
$('#second_display_items').removeClass("hidden") $('#second_display_items').removeClass("hidden")
// append items // append items
for(var i in items) { if (status == "add") {
qty = parseInt(items[i].qty); for(var i in items) {
append = 0; qty = parseInt(items[i].qty);
price = items[i].price; append = 0;
price = items[i].price;
instance_name = items[i].instance; instance_name = items[i].instance;
if (instance_name == "undefined"){ if (instance_name == "undefined"){
instance = ''; instance = '';
}else{
instance = "("+items[i].instance+")";
}
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) {
if (qty > 1) {
qty = parseInt($(item_row[j]).children('#item_qty').text()) + qty;
}else{
qty = parseInt($(item_row[j]).children('#item_qty').text()) + 1;
}
$(item_row[j]).children('#item_qty').text(qty);
parseFloat($(item_row[j]).children('#item_price').text(parseFloat(price*qty).toFixed(2)));
append =1;
}else{ }else{
if (qty > 1) { instance = "("+items[i].instance+")";
qty = qty; }
}else{
qty = 1; d_option = items[i].options;
} if (d_option){
} option_name = "-"+items[i].options;
}); }else{
if (append===0) { option_name = '';
row ="<tr class='item_box' data-price ='" }
+price+ "' 'data-instance ='"
+instance+ "' data-code='"+items[i].item_code+"' data-instance-code='" var rowCount = $('.second_display_items tbody tr').length+1;
+items[i].instance_code+"' data-attributes='" var item_row = $('.second_display_items tbody tr');
+items[i].attributes+"' data-options ='"
+items[i].options+"' data-row ='"+rowCount+ "'>" $(item_row).each(function(j){
+'<td class="item-cell-no">'+rowCount+'</td>' var item_code = $(item_row[j]).attr('data-code');
+'<td class="item-cell-name" id="item_name" >' + items[i].name+ ' ' + instance +'</td>' var instance_code = $(item_row[j]).attr('data-instance-code');
+'<td class="item-cell-qty" id="item_qty">' + qty + '</td>' var r_option = $(item_row[j]).attr('data-options');
+'<td class="item-cell-price" id="item_price">' if (item_code == items[i].item_code && instance_code == items[i].instance_code && r_option==d_option) {
+ parseFloat(price).toFixed(2) if (qty > 1) {
+'</td>' qty = parseInt($(item_row[j]).children('#item_qty').text()) + qty;
+'</tr>'; }else{
$(".second_display_items tbody").append(row); qty = parseInt($(item_row[j]).children('#item_qty').text()) + 1;
}
$(item_row[j]).children('#item_qty').text(qty);
parseFloat($(item_row[j]).children('#item_price').text(parseFloat(price*qty).toFixed(2)));
append =1;
}else{
if (qty > 1) {
qty = qty;
}else{
qty = 1;
}
}
});
if (append===0) {
row ="<tr class='item_box' data-price ='"
+price+ "' 'data-instance ='"
+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+ "'>"
+'<td class="item-cell-no">'+rowCount+'</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-price" id="item_price">'
+ parseFloat(price).toFixed(2)
+'</td>'
+'</tr>';
$(".second_display_items tbody").append(row);
}
}
}
if (status == "set_add") {
// var option_arr = [];
var attribute_arr = [];
var rowCount = $('.second_display_items tbody tr').length+1;
for(var i in items) {
code = items[i].code;
item_code = items[i].item_code;
name = items[i].name;
item_name = items[i].item_name;
qty = items[i].qty;
price = items[i].price;
option = items[i].option;
sub_item = items[i].sub_item;
total = qty * price ;
// option_arr.push(option);
row ="<tr class='item_box' data-price ='"
+price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
+name+ "' data-code='"+item_code+"' data-instance-code='"
+code+"' data-attributes='"
+attribute_arr+"' data-options ='"
+option+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>"
+'<td class="item-cell-no">'+rowCount+'</td>'
+'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name + ''+option+'</td>'
+'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+'<td class="item-cell-price" id="item_price">'
+ parseFloat(total).toFixed(2)
+'</td>'
+'</tr>';
$(".second_display_items tbody").append(row);
rowCount = rowCount + 1;
} }
} }
//end apend items //end apend items