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

Merge branch 'r-1902001-01' into r-1902001-01-dev

Browse Source
This commit is contained in:
NyanLinHtut
2019-06-03 11:16:16 +06:30
parent 90141e33a0 2e342d7859
commit 80d2bc4f13
69 changed files with 2292 additions and 1409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
app/assets/javascripts/OQS.js
View File

@@ -37,7 +37,7 @@ $(document).on('turbolinks:load', function() {
// oqs_id = $(this).find(".oqs-id").text();
$("#oqs_active").attr('data-id',$('.oqs_click').val());
var url = 'oqs/get_items/'+$('.oqs_click').val();
show_details(url,null);
}
@@ -49,11 +49,11 @@ $(document).on('turbolinks:load', function() {
$(".tables").on("click", function(){
active = $(this).hasClass('selected-table');
if (active) {
if (active) {
$(this).removeClass('bg-blue');
$(this).addClass('green');
$(this).removeClass('selected-table');
}else{
}else{
$(this).removeClass('green');
$(this).addClass('bg-blue');
$(this).addClass('selected-table');
@@ -63,7 +63,7 @@ $(document).on('turbolinks:load', function() {
var table_id =[];
for (i = 0; i < list.length; i++) {
table_id.push(list[i].value);
}
}
console.log(table_id)
$('#table').val(table_id);
@@ -75,7 +75,7 @@ $(document).on('turbolinks:load', function() {
}else{
var table = null
}
if (oqs_id > 0 || status != "All" || table != null) {
$(".oqs_click").removeClass('oqs_active');
$(".queue_station").removeClass('queue_station_box');
@@ -86,7 +86,7 @@ $(document).on('turbolinks:load', function() {
// oqs_id = $(this).find(".oqs-id").text();
$("#oqs_active").attr('data-id',oqs_id);
var url = 'oqs/get_items/'+oqs_id;
show_details(url,table,status);
}else{
$("#completed").removeClass('hide')
@@ -95,7 +95,7 @@ $(document).on('turbolinks:load', function() {
});
// $(".oqs_click").on("click", function(){
$(document).on('change', '.oqs_click', function(event){
$(document).on('change', '.oqs_click', function(event){
oqs_id = $(this).val();
status = $("#status").val();
var table_id = $('#table_id').val();
@@ -104,7 +104,7 @@ $(document).on('turbolinks:load', function() {
}else{
var table = null
}
if (oqs_id > 0 || status != "All" || table_id != null) {
$(".oqs_click").removeClass('oqs_active');
$(".queue_station").removeClass('queue_station_box');
@@ -115,7 +115,7 @@ $(document).on('turbolinks:load', function() {
// oqs_id = $(this).find(".oqs-id").text();
$("#oqs_active").attr('data-id',oqs_id);
var url = 'oqs/get_items/'+oqs_id;
show_details(url,table,status);
}else{
$("#completed").removeClass('hide')
@@ -124,7 +124,7 @@ $(document).on('turbolinks:load', function() {
}); //End Click
// $(".status_click").on("click", function(){
$(document).on('change', '.status_click', function(event){
$(document).on('change', '.status_click', function(event){
oqs_id = $("#oqs_id").val();
status = $(this).val();
var table_id = $('#table_id').val();
@@ -144,7 +144,7 @@ $(document).on('turbolinks:load', function() {
// oqs_id = $(this).find(".oqs-id").text();
$("#oqs_active").attr('data-id',oqs_id);
var url = 'oqs/get_items/'+oqs_id;
show_details(url,table,status);
}else{
$("#completed").removeClass('hide')
@@ -152,17 +152,17 @@ $(document).on('turbolinks:load', function() {
}
}); //End Click
function show_details(url,table_id,status){
function show_details(url,table_id,status){
console.log(table_id)
var oqs_append = $('.oqs_append');
oqs_append.empty();
var filter = $('.filter').text();
//Start Ajax
$.ajax({
type: "GET",
url: url,
$.ajax({
type: "GET",
url: url,
data: {'filter':filter,'table_id':table_id,'status':status},
dataType: "json",
success: function(data) {
@@ -175,7 +175,7 @@ $(document).on('turbolinks:load', function() {
var options = data[field]["options"];
}
var date = new Date(data[field]["created_at"]);
var date = new Date(data[field]["created_at"]);
// var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes();
var show_date =date.getHours()+ ':' + date.getMinutes() +' '+(date.getHours() >= 12 ? 'PM' : 'AM');
var set_menu_items = data[field]["set_menu_items"];
@@ -193,7 +193,7 @@ $(document).on('turbolinks:load', function() {
table_type = data[field]["table_type"] +'-'+data[field]["zone"]
}else{
table_type = "No Table"
}
var delivery_status = ''
if (data[field]["delivery_status"] == true) {
@@ -235,24 +235,24 @@ $(document).on('turbolinks:load', function() {
+'</span>'
+'</div>'
+'</div>';
+'</div>';
$('.oqs_append').append(row);
}
}
}
});
//end Ajax
//end Ajax
}
$(document).on('click', '.queue_station', function(event){
$(document).on('click', '.queue_station', function(event){
$('#print_order_item').removeAttr("disabled","");
$('#print_order_summary').removeAttr("disabled","");
var orderNo = $(this).attr('data-order-no');
var orderNo = $(this).attr('data-order-no');
var orderZone=$(this).children().children().children('.order-zone').text().trim();
var orderZoneType=$(this).children().children().children('.order-zone-type').text().trim();
// var orderItem=$(this).children().children().children('.order-item').text();
var assigned_item_id = $(this).children().find(".assigned-order-item").text();
var orderQty = $(this).children().children().children('.order-qty').text();
var orderQty = $(this).children().children().children('.order-qty').text();
var orderBy = $(this).children().children().children().children('.order-by').text();
var orderAt = $(this).children().children().children().children('.order-at').text();
var orderCustomer = $(this).children().children('.order-customer').text();
@@ -272,10 +272,10 @@ $(document).on('turbolinks:load', function() {
data: { 'status' : order_status },
success: function(res){
// console.log(res);
for (i = 0; i < res["items"].length; i++) {
var data = JSON.stringify(res["items"][i]);
var parse_data = JSON.parse(data);
var assigned_order_items = [];
for (i = 0; i < res["items"].length; i++) {
var data = JSON.stringify(res["items"][i]);
var parse_data = JSON.parse(data);
var assigned_order_items = [];
var assigned_order_item_id = '';
if(res["assigned_order_items"]!= undefined && res["assigned_order_items"]!=''){
assigned_order_items = JSON.parse(JSON.stringify(res["assigned_order_items"]));
@@ -286,7 +286,7 @@ $(document).on('turbolinks:load', function() {
});
}
// console.log(assigned_order_item_id);
var set_menu_items = parse_data.set_menu_items;
var set_instance_items = "";
if(set_menu_items!=null){
@@ -309,16 +309,16 @@ $(document).on('turbolinks:load', function() {
"<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
"</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);
}
}
}
})
@@ -329,21 +329,21 @@ $(document).on('turbolinks:load', function() {
$(this).addClass('selected-item');
});
$(document).on('click', '.order-item-edit', function(event){
$(document).on('click', '.order-item-edit', function(event){
var _self = $(this); // To know in ajax return
var assigned_item_id=$(this).attr('id').substr(5);
window.location.href = '/oqs/'+ assigned_item_id + "/edit/oqs";
});
// complete for queue item
$(document).on('click', '.order-complete', function(event){
$(document).on('click', '.order-complete', function(event){
//e.preventDefault();
var _self = $(this); // To know in ajax return
var assigned_item_id=$(this).attr('id').substr(15);
var params = { 'id':assigned_item_id };
// Call update_delivery_status() for changed delivery and move to delivery
// Call update_delivery_status() for changed delivery and move to delivery
$.ajax({
type: 'POST',
url: '/oqs/update_delivery',
@@ -383,7 +383,7 @@ $(document).on('turbolinks:load', function() {
}
else {
window.location.href = "/origami/room/" + table_id
}
}
});
// Page reload
location.reload();
@@ -392,7 +392,7 @@ $(document).on('turbolinks:load', function() {
});
// Print Order Item
$(document).on('click', '#print_order_item', function(event){
$(document).on('click', '#print_order_item', function(event){
$(this).attr("disabled","disabled");
var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text();
var options = $('.selected-item').children('.card-block').find('.item-options').text();