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

Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-08-14 14:38:14 +06:30
parent a614ec6ae7 069ad16733
commit 0df8264de7
3 changed files with 84 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,8 +31,9 @@ $(document).ready(function(){
$(".oqs_click").on("click", function(){ $(".oqs_click").on("click", function(){
$("#completed").addClass('hide') $("#completed").addClass('hide')
$(".oqs_append").removeClass('hide') $(".oqs_append").removeClass('hide')
var oqs_id = $(this).find(".oqs-id").text(); var oqs_id = $(this).find(".oqs-id").text();
var url = 'oqs/get_items/'+oqs_id; var url = 'oqs/get_items/'+oqs_id;
show_details(url); show_details(url);
}); //End Click }); //End Click
@@ -40,15 +41,14 @@ $(document).ready(function(){
function show_details(url){ function show_details(url){
var oqs_append = $('.oqs_append'); var oqs_append = $('.oqs_append');
oqs_append.empty(); oqs_append.empty();
var filter = $('.filter').text();
//Start Ajax //Start Ajax
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: url, url: url,
data: {}, data: {'filter':filter},
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
for(var field in data) { for(var field in data) {
var price = parseFloat(data[field].price).toFixed(2); var price = parseFloat(data[field].price).toFixed(2);

49
app/controllers/oqs/home_controller.rb
View File

@@ -7,7 +7,17 @@ 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
@queue_completed_item = completed_order
@filter = params[:filter]
@queue_completed_item = completed_order(@filter)
if !@filter.nil?
@count = queue_items_count_query(false,@filter)
@count.each do |count|
end
end
# @queue_stations_items=Array.new # @queue_stations_items=Array.new
@@ -71,7 +81,8 @@ class Oqs::HomeController < BaseOqsController
def get_items_by_oqs def get_items_by_oqs
oqs_id = params[:id] oqs_id = params[:id]
items = queue_items_query(false,oqs_id) filter = params[:filter]
items = queue_items_query(false,oqs_id,filter)
render :json => items.to_json render :json => items.to_json
end end
@@ -96,13 +107,14 @@ class Oqs::HomeController < BaseOqsController
# Query for OQS with delivery status # Query for OQS with delivery status
def queue_items_query(status,oqs_id=nil) def queue_items_query(status,oqs_id=nil,filter)
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
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,
df.name as zone, df.type as table_type, df.name as zone, df.type as table_type,
@@ -117,14 +129,15 @@ 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 odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs}") .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} ")
query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
.group("assigned_order_items.assigned_order_item_id") .group("assigned_order_items.assigned_order_item_id")
end end
# Completed Order # Completed Order
def completed_order def completed_order(filter)
AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at") query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at")
.joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
left join orders as od ON od.order_id = assigned_order_items.order_id left join orders as od ON od.order_id = assigned_order_items.order_id
@@ -134,12 +147,28 @@ class Oqs::HomeController < BaseOqsController
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 = true AND odt.price <> 0 AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'") .where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'")
.group("assigned_order_items.order_id") query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
.limit(20) .group("assigned_order_items.order_id")
.order("assigned_order_items.created_at") .limit(20)
.order("assigned_order_items.created_at")
# completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true'); # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
end end
def queue_items_count_query(status,filter)
query = AssignedOrderItem.select("count(odt.item_code) as total,oqs.id as station_id")
.joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
left join orders as od ON od.order_id = assigned_order_items.order_id
left join order_items as odt ON odt.item_code = assigned_order_items.item_code AND odt.order_id = assigned_order_items.order_id
left join customers as cus ON cus.customer_id = od.customer_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 dining_facilities as df on df.id = bk.dining_facility_id")
.where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0 AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' ")
query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
.group("oqs.id")
end
end end

50
app/views/oqs/home/index.html.erb
View File

@@ -1,10 +1,26 @@
<div class="row"> <div class="row">
<!-- Column One --> <div class="col-md-6">
<%= form_tag oqs_root_path, :method => :get do %>
<div class="form-group col-md-4">
<input type="text" name="filter" class="form-control input-sm" placeholder="" style="margin-right: 10px">
</div>
<div class="form-group col-md-1">
<input type="submit" value="Search" class='btn btn-primary btn-sm'>
</div>
<% end %>
</div>
</div>
<!-- Column One -->
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-8"> <div class="col-lg-8 col-md-8 col-sm-8">
<!-- Nav tabs --> <!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist"> <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"> <li class="nav-item nav-completed">
<a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a> <a class="nav-link" data-toggle="tab" href="#completed" role="tab">Processed <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
</li> </li>
<% # For Tab Disable for Station is inactive <% # For Tab Disable for Station is inactive
@@ -14,22 +30,34 @@
status="disabled" status="disabled"
end %> end %>
<li class="nav-item oqs_click" > <li class="nav-item oqs_click" >
<p class="hidden oqs-id"><%= qsi.id %></p> <p class="hidden oqs-id"><%= qsi.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab" <%= status %>> <a class="nav-link" data-toggle="tab" href="" role="tab" <%= status %>>
<%= qsi.station_name %> <%= qsi.station_name %>
<span class="badge badge-pill badge-default" id=""> <%= qsi.assigned_order_items.where("delivery_status=0").count %> <% if @filter.nil? %>
</span> <span class="badge badge-pill badge-default" id=""> <%= qsi.assigned_order_items.where("delivery_status=0").count %>
</span>
<%else%>
<span class="badge badge-pill badge-default" id="">
<% @count.each do |c|%>
<% if qsi.id == c.station_id %>
<%= c.total %>
<%end %>
<%end %>
</span>
<%end%>
<% if qsi.auto_print %> <% if qsi.auto_print %>
<span>(ap)</span> <span>(ap)</span>
<% end %> <% end %>
</a> </a>
</li> </li>
<% end %> <% end %>
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<p class="hidden filter"><%= @filter %></p>
<div class="tab-content" style="max-height:670px; overflow:auto"> <div class="tab-content" style="max-height:670px; overflow:auto">
<!--- Panel 0 - Completed --> <!--- Panel 0 - Completed -->
<div class="tab-pane active" id="completed" role="tabpanel"> <div class="tab-pane 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;">
<% <%
@@ -73,13 +101,12 @@
%> %>
</div> </div>
</div> </div>
<!-- End Panel 0 - Completed -->
<!-- Order Item for Queue Station -->
<!-- End Panel 0 - Completed -->
<!--- Order Items --> <!--- Order Items -->
<div class="card-columns oqs_append" style="padding-top:10px; column-gap: 1.2rem;"> <div class="card-columns oqs_append" style="padding-top:10px; column-gap: 1.2rem;">
</div> </div>
<!--- end of Items--> <!--- end of Items-->
</div> </div>
@@ -142,3 +169,6 @@
</div> </div>
</div> </div>
<script type="text/javascript">
</script>