This commit is contained in:
phyusin
2018-02-23 10:15:55 +06:30
parent 06abf1c744
commit ed12897986

View File

@@ -78,12 +78,15 @@ $(document).on('turbolinks:load', function() {
} }
} }
var table_type = '';
if (data[field]["table_type"]=null) { if (data[field]["table_type"]=null) {
table_type = data[field]["table_type"] +'-'+data[field]["zone"] table_type = data[field]["table_type"] +'-'+data[field]["zone"]
}else{ }else{
table_type = "No Table" table_type = "No Table"
} }
row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">' row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
+'<div class="card-block">' +'<div class="card-block">'
+'<div class="row">' +'<div class="row">'
@@ -155,7 +158,7 @@ $(document).on('turbolinks:load', function() {
for (i = 0; i < res["items"].length; i++) { for (i = 0; i < res["items"].length; i++) {
var data = JSON.stringify(res["items"][i]); var data = JSON.stringify(res["items"][i]);
var parse_data = JSON.parse(data); var parse_data = JSON.parse(data);
var assigned_order_items = {}; var assigned_order_items = [];
var assigned_order_item_id = ''; var assigned_order_item_id = '';
if(res["assigned_order_items"]!= undefined && res["assigned_order_items"]!=''){ if(res["assigned_order_items"]!= undefined && res["assigned_order_items"]!=''){
assigned_order_items = JSON.parse(JSON.stringify(res["assigned_order_items"])); assigned_order_items = JSON.parse(JSON.stringify(res["assigned_order_items"]));
@@ -178,6 +181,7 @@ $(document).on('turbolinks:load', function() {
} }
if (oqs_id > 0){ if (oqs_id > 0){
if(assigned_order_item_id != ''){
var order_item_row = "<tr id='edit_"+assigned_order_item_id+"' class='order-item-edit'>" + var order_item_row = "<tr id='edit_"+assigned_order_item_id+"' class='order-item-edit'>" +
"<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" + "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
"<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" + "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
@@ -189,6 +193,13 @@ $(document).on('turbolinks:load', function() {
"</tr>"; "</tr>";
} }
}else{
var order_item_row = "<tr>" +
"<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
"<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
"</tr>";
}
$("#oqs-order-details-table").children("tbody").append(order_item_row); $("#oqs-order-details-table").children("tbody").append(order_item_row);
} }
} }