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-09-10 18:39:58 +06:30
parent b60584c6d7 8d1ca45f30
commit a51f927f4c
3 changed files with 129 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,13 +67,15 @@ $(document).on('turbolinks:load', function() {
$('#table_id').val(table_id);
oqs_id = $("#oqs_id").val();
if (table_id){
status = $("#status").val();
if (table_id.length>0){
var table = table_id
}else{
var table = null
}
if (oqs_id > 0) {
if (oqs_id > 0 || status != "All" || table != null) {
$(".oqs_click").removeClass('oqs_active');
$(".queue_station").removeClass('queue_station_box');
$("#completed").addClass('hide');
@@ -83,8 +85,8 @@ $(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);
console.log(table)
show_details(url,table,status);
}else{
$("#completed").removeClass('hide')
$(".oqs_append").addClass('hide')
@@ -94,6 +96,7 @@ $(document).on('turbolinks:load', function() {
// $(".oqs_click").on("click", function(){
$(document).on('click', '.oqs_click', function(event){
oqs_id = $(this).val();
status = $("#status").val();
var table_id = $('#table_id').val();
if (table_id){
var table = table_id
@@ -101,7 +104,7 @@ $(document).on('turbolinks:load', function() {
var table = null
}
if (oqs_id > 0) {
if (oqs_id > 0 || status != "All" || table_id != null) {
$(".oqs_click").removeClass('oqs_active');
$(".queue_station").removeClass('queue_station_box');
$("#completed").addClass('hide');
@@ -112,16 +115,45 @@ $(document).on('turbolinks:load', function() {
$("#oqs_active").attr('data-id',oqs_id);
var url = 'oqs/get_items/'+oqs_id;
show_details(url,table);
show_details(url,table,status);
}else{
$("#completed").removeClass('hide')
$(".oqs_append").addClass('hide')
}
}); //End Click
// $(".oqs_click").on("click", function(){
$(document).on('click', '.status_click', function(event){
oqs_id = $("#oqs_id").val();
status = $(this).val();
var table_id = $('#table_id').val();
if (table_id){
var table = table_id
}else{
var table = null
}
if (oqs_id > 0 || status != "All" || table != null) {
$(".oqs_click").removeClass('oqs_active');
$(".queue_station").removeClass('queue_station_box');
$("#completed").addClass('hide');
$(".oqs_append").removeClass('hide');
$("#oqs_active").addClass('oqs_active');
$(".queue_station").addClass('queue_station_box');
// 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')
$(".oqs_append").addClass('hide')
}
}); //End Click
function show_details(url,table_id){
function show_details(url,table_id,status){
console.log(table_id)
var oqs_append = $('.oqs_append');
oqs_append.empty();
var filter = $('.filter').text();
@@ -130,7 +162,7 @@ $(document).on('turbolinks:load', function() {
$.ajax({
type: "GET",
url: url,
data: {'filter':filter,'table_id':table_id},
data: {'filter':filter,'table_id':table_id,'status':status},
dataType: "json",
success: function(data) {
for(var field in data) {
@@ -162,6 +194,10 @@ $(document).on('turbolinks:load', function() {
table_type = "No Table"
}
var delivery_status = ''
if (data[field]["delivery_status"] == true) {
delivery_status = "hidden"
}
row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
+'<div class="card-block">'
@@ -191,9 +227,11 @@ $(document).on('turbolinks:load', function() {
+'<p class="hidden assigned-order-item">'+ data[field]["assigned_order_item_id"] +'</p> '
+'</div>'
+'<div class="card-footer">'
+'<div class="card-footer ">'
+'<span class="'+delivery_status+'">'
+'<button id="edit_'+ data[field]["assigned_order_item_id"] + '" data-no-turbolink="true" class="btn btn-warning order-item order-item-edit">EDIT</button>'
+' <button id="assigned_queue_' + data[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
+'</span>'
+'</div>'
+'</div>';