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-09 14:05:39 +06:30
parent 798bf8d4a8 8ce14f8c99
commit 1f4ea558c6
5 changed files with 364 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,30 +31,75 @@ $(document).on('turbolinks:load', function() {
$(".oqs_append").addClass('hide')
});
$(".tables").on("click", function(){
var table_id = $(this).val();
$('#table_id').val(table_id);
oqs_id = $("#oqs_id").val();
if (table_id){
var table = table_id
}else{
var table = null
}
if (oqs_id > 0) {
$(".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);
}else{
$("#completed").removeClass('hide')
$(".oqs_append").addClass('hide')
}
});
$(".oqs_click").on("click", function(){
$(".oqs_click").removeClass('oqs_active');
$(".queue_station").removeClass('queue_station_box');
$("#completed").addClass('hide');
$(".oqs_append").removeClass('hide');
$(this).addClass('oqs_active');
$(".queue_station").addClass('queue_station_box');
oqs_id = $(this).find(".oqs-id").text();
console.log(oqs_id);
var url = 'oqs/get_items/'+oqs_id;
show_details(url);
oqs_id = $(this).val();
var table_id = $('#table_id').val();
if (table_id){
var table = table_id
}else{
var table = null
}
if (oqs_id > 0) {
$(".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);
}else{
$("#completed").removeClass('hide')
$(".oqs_append").addClass('hide')
}
}); //End Click
function show_details(url){
function show_details(url,table_id){
var oqs_append = $('.oqs_append');
oqs_append.empty();
var filter = $('.filter').text();
console.log(table_id)
//Start Ajax
$.ajax({
type: "GET",
url: url,
data: {'filter':filter},
data: {'filter':filter,'table_id':table_id},
dataType: "json",
success: function(data) {
for(var field in data) {
@@ -67,7 +112,8 @@ $(document).on('turbolinks:load', function() {
}
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.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"];
var set_instance_items = "";
if(set_menu_items!=null){
@@ -100,7 +146,7 @@ $(document).on('turbolinks:load', function() {
+set_instance_items
+'</p>'
+'<br/><p class="card-text item-options">'+ options +'</p>'
+'<p class="card-text item-options">'+ options +'</p>'
+'<span class="card-text">'
+'<span class="text-muted">Order at - '

3
app/assets/javascripts/channels/order_queue_station.js
View File

@@ -5,8 +5,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
disconnected: function() {},
received: function(data) {
// console.log(data.order);
received: function(data) {
var oqs_id = $('.oqs_active').attr('data-id');
items = data.order;
for(var field in items) {