update queui chang
This commit is contained in:
@@ -31,30 +31,75 @@ $(document).on('turbolinks:load', function() {
|
|||||||
$(".oqs_append").addClass('hide')
|
$(".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").on("click", function(){
|
||||||
$(".oqs_click").removeClass('oqs_active');
|
oqs_id = $(this).val();
|
||||||
$(".queue_station").removeClass('queue_station_box');
|
var table_id = $('#table_id').val();
|
||||||
$("#completed").addClass('hide');
|
if (table_id){
|
||||||
$(".oqs_append").removeClass('hide');
|
var table = table_id
|
||||||
$(this).addClass('oqs_active');
|
}else{
|
||||||
$(".queue_station").addClass('queue_station_box');
|
var table = null
|
||||||
oqs_id = $(this).find(".oqs-id").text();
|
}
|
||||||
console.log(oqs_id);
|
|
||||||
var url = 'oqs/get_items/'+oqs_id;
|
if (oqs_id > 0) {
|
||||||
|
$(".oqs_click").removeClass('oqs_active');
|
||||||
show_details(url);
|
$(".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
|
}); //End Click
|
||||||
|
|
||||||
function show_details(url){
|
function show_details(url,table_id){
|
||||||
var oqs_append = $('.oqs_append');
|
var oqs_append = $('.oqs_append');
|
||||||
oqs_append.empty();
|
oqs_append.empty();
|
||||||
var filter = $('.filter').text();
|
var filter = $('.filter').text();
|
||||||
|
|
||||||
|
console.log(table_id)
|
||||||
//Start Ajax
|
//Start Ajax
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: "GET",
|
type: "GET",
|
||||||
url: url,
|
url: url,
|
||||||
data: {'filter':filter},
|
data: {'filter':filter,'table_id':table_id},
|
||||||
dataType: "json",
|
dataType: "json",
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
for(var field in data) {
|
for(var field in data) {
|
||||||
@@ -67,7 +112,8 @@ $(document).on('turbolinks:load', function() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
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.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_menu_items = data[field]["set_menu_items"];
|
||||||
var set_instance_items = "";
|
var set_instance_items = "";
|
||||||
if(set_menu_items!=null){
|
if(set_menu_items!=null){
|
||||||
@@ -100,7 +146,7 @@ $(document).on('turbolinks:load', function() {
|
|||||||
+set_instance_items
|
+set_instance_items
|
||||||
+'</p>'
|
+'</p>'
|
||||||
|
|
||||||
+'<br/><p class="card-text item-options">'+ options +'</p>'
|
+'<p class="card-text item-options">'+ options +'</p>'
|
||||||
|
|
||||||
+'<span class="card-text">'
|
+'<span class="card-text">'
|
||||||
+'<span class="text-muted">Order at - '
|
+'<span class="text-muted">Order at - '
|
||||||
|
|||||||
@@ -5,8 +5,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
|
|||||||
|
|
||||||
disconnected: function() {},
|
disconnected: function() {},
|
||||||
|
|
||||||
received: function(data) {
|
received: function(data) {
|
||||||
// console.log(data.order);
|
|
||||||
var oqs_id = $('.oqs_active').attr('data-id');
|
var oqs_id = $('.oqs_active').attr('data-id');
|
||||||
items = data.order;
|
items = data.order;
|
||||||
for(var field in items) {
|
for(var field in items) {
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ class Oqs::HomeController < BaseOqsController
|
|||||||
# @queue_items_details = queue_items_query(false)
|
# @queue_items_details = queue_items_query(false)
|
||||||
|
|
||||||
# Query for OQS with delivery status true
|
# Query for OQS with delivery status true
|
||||||
|
@tables = DiningFacility.all.active.order('status desc')
|
||||||
|
@rooms = Room.all.active.order('status desc')
|
||||||
|
|
||||||
@filter = params[:filter]
|
@filter = params[:filter]
|
||||||
|
|
||||||
@@ -113,7 +114,11 @@ class Oqs::HomeController < BaseOqsController
|
|||||||
def get_items_by_oqs
|
def get_items_by_oqs
|
||||||
oqs_id = params[:id]
|
oqs_id = params[:id]
|
||||||
filter = params[:filter]
|
filter = params[:filter]
|
||||||
items = queue_items_query(false,oqs_id,filter)
|
table_id = params[:table_id]
|
||||||
|
puts params
|
||||||
|
puts table_id
|
||||||
|
puts "sssssssssssss"
|
||||||
|
items = queue_items_query(false,oqs_id,filter,table_id)
|
||||||
if !items.empty?
|
if !items.empty?
|
||||||
items.each do |item|
|
items.each do |item|
|
||||||
if !item.set_menu_items.nil?
|
if !item.set_menu_items.nil?
|
||||||
@@ -151,13 +156,20 @@ class Oqs::HomeController < BaseOqsController
|
|||||||
|
|
||||||
|
|
||||||
# Query for OQS with delivery status
|
# Query for OQS with delivery status
|
||||||
def queue_items_query(status,oqs_id=nil,filter)
|
def queue_items_query(status,oqs_id=nil,filter,table_id)
|
||||||
if oqs_id == nil
|
if oqs_id == nil
|
||||||
oqs = ''
|
oqs = ''
|
||||||
else
|
else
|
||||||
oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
|
oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if table_id.to_i>0
|
||||||
|
table = "and df.id = '#{table_id}' "
|
||||||
|
|
||||||
|
else
|
||||||
|
table = ''
|
||||||
|
end
|
||||||
|
|
||||||
query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id,
|
query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id,
|
||||||
oqs.id as station_id, oqs.station_name,
|
oqs.id as station_id, oqs.station_name,
|
||||||
oqs.is_active, oqpz.zone_id,
|
oqs.is_active, oqpz.zone_id,
|
||||||
@@ -173,7 +185,7 @@ class Oqs::HomeController < BaseOqsController
|
|||||||
left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
|
left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
|
||||||
left join bookings as bk on bk.booking_id = bo.booking_id
|
left join bookings as bk on bk.booking_id = bo.booking_id
|
||||||
left join dining_facilities as df on df.id = bk.dining_facility_id")
|
left join dining_facilities as df on df.id = bk.dining_facility_id")
|
||||||
.where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} ")
|
.where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} #{table}")
|
||||||
query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
|
query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
|
||||||
.order("assigned_order_items.assigned_order_item_id desc")
|
.order("assigned_order_items.assigned_order_item_id desc")
|
||||||
.group("odt.order_items_id")
|
.group("odt.order_items_id")
|
||||||
|
|||||||
204
app/views/oqs/home/index.html.erb
Executable file → Normal file
204
app/views/oqs/home/index.html.erb
Executable file → Normal file
@@ -1,137 +1,115 @@
|
|||||||
<!-- Column One -->
|
<!-- Column One -->
|
||||||
<div class="row clearfix">
|
<div class="row clearfix" style="margin-top:-50px !important">
|
||||||
<div class="col-lg-8 col-md-8 col-sm-8">
|
<div class="col-lg-11 col-md-11 col-sm-11">
|
||||||
<div class="body p-l-10">
|
<div class="body p-l-10">
|
||||||
<%= form_tag oqs_root_path, :method => :get do %>
|
|
||||||
<div class="row clearfix">
|
<div class="row clearfix">
|
||||||
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
|
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
|
||||||
<input type="text" name="filter" class="form-control" placeholder="Search">
|
<span class="hidden" id="oqs_active"></span>
|
||||||
|
<select class="form-control select oqs_click" name="oqs_id" id="oqs_id">
|
||||||
|
<option value="0" data-id="0">Processed</option>
|
||||||
|
<% @queue_stations.each do |qsi| %>
|
||||||
|
<% if qsi.is_active != false %>
|
||||||
|
<p class="hidden oqs-id"><%= qsi.id %></p>
|
||||||
|
<option value="<%= qsi.id %>" data-id="<%= qsi.id %>" style="padding:5px 20px !important;"> <%= qsi.station_name %></option>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
|
<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">
|
||||||
<button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
|
<span class="hidden" id="table_id"></span>
|
||||||
|
<select class="form-control select tables" name="table_id" id="tables">
|
||||||
|
<option value="">Select Table</option>
|
||||||
|
<% @tables.each do |table| %>
|
||||||
|
|
||||||
|
<option value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></option>
|
||||||
|
|
||||||
|
<% end %>
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
<!--
|
||||||
|
<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">
|
||||||
|
<span class="hidden" id="room_id"></span>
|
||||||
|
<select class="form-control select rooms" name="table_id" id="rooms">
|
||||||
|
<option value="">Select Room</option>
|
||||||
|
<% @rooms.each do |table| %>
|
||||||
|
|
||||||
|
<option value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></option>
|
||||||
|
|
||||||
|
<% end %>
|
||||||
|
</select>
|
||||||
|
</div> -->
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Nav tabs -->
|
<p class="hidden filter"><%= @filter %></p>
|
||||||
<ul class="nav nav-tabs" role="tablist">
|
<div class="card">
|
||||||
<!-- <li class="nav-item nav-search <%= @filter.to_s.length > 0? " " : "hide"%>">
|
<div class="card-block">
|
||||||
<a class="nav-link <%= @filter.to_s.length > 0? "active" : " "%>" data-toggle="tab" href="#search" role="tab">Searching .. <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
|
<div class="tab-content" id="custom-slimscroll" style="">
|
||||||
</li> -->
|
|
||||||
<li class="nav-item nav-completed">
|
|
||||||
<a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed
|
|
||||||
<span class="badge bg-blue-grey" id="completed_count"><%= @queue_completed_item.length %></span></a>
|
|
||||||
</li>
|
|
||||||
<% # For Tab Disable for Station is inactive
|
|
||||||
status=""
|
|
||||||
i=0
|
|
||||||
@queue_stations.each do |qsi|
|
|
||||||
if qsi.is_active == false
|
|
||||||
status="disabled"
|
|
||||||
end %>
|
|
||||||
<li class="nav-item oqs_click" data-id="<%= qsi.id %>">
|
|
||||||
<p class="hidden oqs-id"><%= qsi.id %></p>
|
|
||||||
<a class="nav-link" data-id="<%= qsi.id %>" data-toggle="tab" href="" role="tab" <%= status %>>
|
|
||||||
<%= qsi.station_name %>
|
|
||||||
<% if @filter.nil? %>
|
|
||||||
<span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id %>" id="completed_count">
|
|
||||||
<!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id %>"> --> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>
|
|
||||||
</span>
|
|
||||||
<%else%>
|
|
||||||
<span class="label-count badge bg-blue-grey" data-id="<%= qsi.id %>">
|
|
||||||
<% @count.each do |c|%>
|
|
||||||
<% if qsi.id == c.station_id %>
|
|
||||||
<%= c.total %>
|
|
||||||
<%end %>
|
|
||||||
<%end %>
|
|
||||||
</span>
|
|
||||||
<%end%>
|
|
||||||
<% if qsi.auto_print %>
|
|
||||||
<span>(ap)</span>
|
|
||||||
<% end %>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<% i+=1%>
|
|
||||||
|
|
||||||
<% end %>
|
|
||||||
</ul>
|
|
||||||
<!-- Nav tabs - End -->
|
|
||||||
<p class="hidden filter"><%= @filter %></p>
|
|
||||||
|
|
||||||
<div class="tab-content" id="custom-slimscroll" style="">
|
|
||||||
<!--- Panel 0 - Completed -->
|
|
||||||
|
|
||||||
<div class="tab-pane in active" id="completed" role="tabpanel">
|
<div class="tab-pane in active" id="completed" role="tabpanel">
|
||||||
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
|
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;column-count: ;">
|
||||||
<%
|
<%
|
||||||
@queue_completed_item.each do |qid|
|
@queue_completed_item.each do |qid|
|
||||||
%>
|
%>
|
||||||
<div class="card queue_station" data-order-no="<%= qid.order_id %>">
|
<div class="card queue_station" data-order-no="<%= qid.order_id %>">
|
||||||
<div class="card-block">
|
<div class="card-block">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<%if qid.type.present?%>
|
<%if qid.type.present?%>
|
||||||
<span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
|
<span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
|
||||||
<%else%>
|
<%else%>
|
||||||
<span class="col-md-4 order-zone-type font-13"></span>
|
<span class="col-md-4 order-zone-type font-13"></span>
|
||||||
<%end%>
|
<%end%>
|
||||||
|
|
||||||
<span class="order-zone hidden font-13"><%= qid.zone %></span>
|
|
||||||
<span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
|
|
||||||
</div>
|
|
||||||
<p class="m-b--10">
|
|
||||||
<span class="order-item font-16">
|
|
||||||
<%= qid.item_name %>
|
|
||||||
</span> [x
|
|
||||||
<span class="order-qty">
|
|
||||||
<%= qid.qty %>
|
|
||||||
</span> ]
|
|
||||||
<% if !qid.set_menu_items.nil? %>
|
|
||||||
<% qid.set_menu_items.each do |item_instance|%>
|
|
||||||
<br><span class="font-12">
|
|
||||||
<%= item_instance %>
|
|
||||||
</span>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>
|
|
||||||
|
|
||||||
<span class="card-text">
|
<span class="order-zone hidden font-13"><%= qid.zone %></span>
|
||||||
<span class="text-muted">Order at -
|
<span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
|
||||||
<span class="order-at font-13">
|
</div>
|
||||||
<%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
|
<p class="m-b--10">
|
||||||
</span> <br>
|
<span class="order-item font-16">
|
||||||
Order By - <span class="order-by font-13">
|
<%= qid.item_name %>
|
||||||
<%= qid.item_order_by %>
|
</span> [x
|
||||||
</span>
|
<span class="order-qty">
|
||||||
|
<%= qid.qty %>
|
||||||
|
</span> ]
|
||||||
|
<% if !qid.set_menu_items.nil? %>
|
||||||
|
<% qid.set_menu_items.each do |item_instance|%>
|
||||||
|
<br><span class="font-12">
|
||||||
|
<%= item_instance %>
|
||||||
|
</span>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>
|
||||||
|
|
||||||
|
<span class="card-text">
|
||||||
|
<span class="text-muted">Order at -
|
||||||
|
<span class="order-at font-13">
|
||||||
|
<%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
|
||||||
|
</span> <br>
|
||||||
|
Order By - <span class="order-by font-13">
|
||||||
|
<%= qid.item_order_by %>
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
|
||||||
|
|
||||||
<p class="hidden order-status">completed</p>
|
<p class="hidden order-status">completed</p>
|
||||||
<p class="hidden order-customer"><%= qid.customer_name %></p>
|
<p class="hidden order-customer"><%= qid.customer_name %></p>
|
||||||
<p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>
|
<p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<%
|
<% end %>
|
||||||
end
|
|
||||||
%>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<!-- End Panel 0 - Completed -->
|
|
||||||
<!--- Order Items -->
|
|
||||||
<div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">
|
<div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">
|
||||||
</div>
|
</div>
|
||||||
<!--- end of Items-->
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Column Two -->
|
<!-- Column Two -->
|
||||||
<div class="col-lg-3 col-md-3 col-sm-3">
|
<!-- <div class="col-lg-3 col-md-3 col-sm-3">
|
||||||
<div class="card" >
|
<div class="card" >
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<div><strong id="order-title">ORDER DETAILS</strong></div>
|
<div><strong id="order-title">ORDER DETAILS</strong></div>
|
||||||
@@ -143,20 +121,18 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th style="width:33%; text-align:">Order By</th>
|
<th style="width:33%; text-align:">Order By</th>
|
||||||
<th style="width:33%; text-align:">Order At</th>
|
<th style="width:33%; text-align:">Order At</th>
|
||||||
<!-- <th style="width:33%; text-align:">Customer</th> -->
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td id="order-by" style="width:33%; text-align:"></td>
|
<td id="order-by" style="width:33%; text-align:"></td>
|
||||||
<td id="order-at" style="width:33%; text-align:"></td>
|
<td id="order-at" style="width:33%; text-align:"></td>
|
||||||
<!-- <td id="order-customer" style="width:33%; text-align:"></td> -->
|
</tr> -->
|
||||||
</tr>
|
<!-- <tr>
|
||||||
<tr>
|
|
||||||
<td><strong class="hidden cus_name">Customer</strong></td>
|
<td><strong class="hidden cus_name">Customer</strong></td>
|
||||||
<td id="order-customer" colspan="2"></td>
|
<td id="order-customer" colspan="2"></td>
|
||||||
</tr>
|
</tr> -->
|
||||||
</tbody>
|
<!-- </tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-text" id="order-detail-slimscroll" style="min-height:; max-height:; overflow:">
|
<div class="card-text" id="order-detail-slimscroll" style="min-height:; max-height:; overflow:">
|
||||||
@@ -168,17 +144,17 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<!-- Bind With JS -->
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
-->
|
||||||
<!-- Column Three -->
|
<!-- Column Three -->
|
||||||
<div class="col-lg-1 col-md-1 col-sm-1">
|
<div class="col-lg-1 col-md-1 col-sm-1">
|
||||||
<!-- OQS Buttons -->
|
<!-- OQS Buttons -->
|
||||||
|
<br>
|
||||||
<a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
|
<a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
|
||||||
<% if ENV["SERVER_MODE"] != "cloud" %>
|
<% if ENV["SERVER_MODE"] != "cloud" %>
|
||||||
<button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
|
<button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
|
||||||
|
|||||||
196
app/views/oqs/home/index_quechange_backup.html.erb
Executable file
196
app/views/oqs/home/index_quechange_backup.html.erb
Executable file
@@ -0,0 +1,196 @@
|
|||||||
|
<!-- Column One -->
|
||||||
|
<div class="row clearfix">
|
||||||
|
<div class="col-lg-8 col-md-8 col-sm-8">
|
||||||
|
<div class="body p-l-10">
|
||||||
|
<%= form_tag oqs_root_path, :method => :get do %>
|
||||||
|
<div class="row clearfix">
|
||||||
|
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
|
||||||
|
<input type="text" name="filter" class="form-control" placeholder="Search">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
|
||||||
|
<button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Nav tabs -->
|
||||||
|
<ul class="nav nav-tabs" role="tablist">
|
||||||
|
<!-- <li class="nav-item nav-search <%= @filter.to_s.length > 0? " " : "hide"%>">
|
||||||
|
<a class="nav-link <%= @filter.to_s.length > 0? "active" : " "%>" data-toggle="tab" href="#search" role="tab">Searching .. <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
|
||||||
|
</li> -->
|
||||||
|
<li class="nav-item nav-completed">
|
||||||
|
<a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed
|
||||||
|
<span class="badge bg-blue-grey" id="completed_count"><%= @queue_completed_item.length %></span></a>
|
||||||
|
</li>
|
||||||
|
<% # For Tab Disable for Station is inactive
|
||||||
|
status=""
|
||||||
|
i=0
|
||||||
|
@queue_stations.each do |qsi|
|
||||||
|
if qsi.is_active == false
|
||||||
|
status="disabled"
|
||||||
|
end %>
|
||||||
|
<li class="nav-item oqs_click" data-id="<%= qsi.id %>">
|
||||||
|
<p class="hidden oqs-id"><%= qsi.id %></p>
|
||||||
|
<a class="nav-link" data-id="<%= qsi.id %>" data-toggle="tab" href="" role="tab" <%= status %>>
|
||||||
|
<%= qsi.station_name %>
|
||||||
|
<% if @filter.nil? %>
|
||||||
|
<span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id %>" id="completed_count">
|
||||||
|
<!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id %>"> --> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>
|
||||||
|
</span>
|
||||||
|
<%else%>
|
||||||
|
<span class="label-count badge bg-blue-grey" data-id="<%= qsi.id %>">
|
||||||
|
<% @count.each do |c|%>
|
||||||
|
<% if qsi.id == c.station_id %>
|
||||||
|
<%= c.total %>
|
||||||
|
<%end %>
|
||||||
|
<%end %>
|
||||||
|
</span>
|
||||||
|
<%end%>
|
||||||
|
<% if qsi.auto_print %>
|
||||||
|
<span>(ap)</span>
|
||||||
|
<% end %>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<% i+=1%>
|
||||||
|
|
||||||
|
<% end %>
|
||||||
|
</ul>
|
||||||
|
<!-- Nav tabs - End -->
|
||||||
|
<p class="hidden filter"><%= @filter %></p>
|
||||||
|
|
||||||
|
<div class="tab-content" id="custom-slimscroll" style="">
|
||||||
|
<!--- Panel 0 - Completed -->
|
||||||
|
|
||||||
|
<div class="tab-pane in active" id="completed" role="tabpanel">
|
||||||
|
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
|
||||||
|
<%
|
||||||
|
@queue_completed_item.each do |qid|
|
||||||
|
%>
|
||||||
|
<div class="card queue_station" data-order-no="<%= qid.order_id %>">
|
||||||
|
<div class="card-block">
|
||||||
|
<div class="row">
|
||||||
|
<%if qid.type.present?%>
|
||||||
|
<span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
|
||||||
|
<%else%>
|
||||||
|
<span class="col-md-4 order-zone-type font-13"></span>
|
||||||
|
<%end%>
|
||||||
|
|
||||||
|
<span class="order-zone hidden font-13"><%= qid.zone %></span>
|
||||||
|
<span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
|
||||||
|
</div>
|
||||||
|
<p class="m-b--10">
|
||||||
|
<span class="order-item font-16">
|
||||||
|
<%= qid.item_name %>
|
||||||
|
</span> [x
|
||||||
|
<span class="order-qty">
|
||||||
|
<%= qid.qty %>
|
||||||
|
</span> ]
|
||||||
|
<% if !qid.set_menu_items.nil? %>
|
||||||
|
<% qid.set_menu_items.each do |item_instance|%>
|
||||||
|
<br><span class="font-12">
|
||||||
|
<%= item_instance %>
|
||||||
|
</span>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>
|
||||||
|
|
||||||
|
<span class="card-text">
|
||||||
|
<span class="text-muted">Order at -
|
||||||
|
<span class="order-at font-13">
|
||||||
|
<%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
|
||||||
|
</span> <br>
|
||||||
|
Order By - <span class="order-by font-13">
|
||||||
|
<%= qid.item_order_by %>
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<p class="hidden order-status">completed</p>
|
||||||
|
<p class="hidden order-customer"><%= qid.customer_name %></p>
|
||||||
|
<p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<%
|
||||||
|
end
|
||||||
|
%>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- End Panel 0 - Completed -->
|
||||||
|
<!--- Order Items -->
|
||||||
|
<div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">
|
||||||
|
</div>
|
||||||
|
<!--- end of Items-->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Column Two -->
|
||||||
|
<div class="col-lg-3 col-md-3 col-sm-3">
|
||||||
|
<div class="card" >
|
||||||
|
<div class="card-header">
|
||||||
|
<div><strong id="order-title">ORDER DETAILS</strong></div>
|
||||||
|
</div>
|
||||||
|
<div class="card-block">
|
||||||
|
<div class="card-title">
|
||||||
|
<table class="">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th style="width:33%; text-align:">Order By</th>
|
||||||
|
<th style="width:33%; text-align:">Order At</th>
|
||||||
|
<!-- <th style="width:33%; text-align:">Customer</th> -->
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td id="order-by" style="width:33%; text-align:"></td>
|
||||||
|
<td id="order-at" style="width:33%; text-align:"></td>
|
||||||
|
<!-- <td id="order-customer" style="width:33%; text-align:"></td> -->
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><strong class="hidden cus_name">Customer</strong></td>
|
||||||
|
<td id="order-customer" colspan="2"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div class="card-text" id="order-detail-slimscroll" style="min-height:; max-height:; overflow:">
|
||||||
|
<table class="table" id="oqs-order-details-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th style="width:80%; text-align:left">Items</th>
|
||||||
|
<th style="width:20%; text-align:right">QTY</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<!-- Bind With JS -->
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Column Three -->
|
||||||
|
<div class="col-lg-1 col-md-1 col-sm-1">
|
||||||
|
<!-- OQS Buttons -->
|
||||||
|
<a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
|
||||||
|
<% if ENV["SERVER_MODE"] != "cloud" %>
|
||||||
|
<button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
|
||||||
|
<button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
|
||||||
|
<%end%>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script type="text/javascript">
|
||||||
|
$(document).on('turbolinks:load', function() {
|
||||||
|
$('#back').on('click', function () {
|
||||||
|
window.location.href = '/dashboard';
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
Reference in New Issue
Block a user