oqs item count fixed

This commit is contained in:
Yan
2017-06-03 13:25:23 +06:30
parent 03ae60d2e6
commit aa36c679ab
2 changed files with 19 additions and 28 deletions

View File

@@ -1,23 +1,22 @@
class Oqs::HomeController < BaseOqsController
def index
@queue_stations=OrderQueueStation.all
queue_stations=OrderQueueStation.all
@queue_items_details = queue_items_query('false')
@queue_items_details = queue_items_query(0)
@queue_completed_item = queue_items_query('true')
@queue_completed_item = queue_items_query(1)
@queue_stations_items=Array.new
# Calculate Count for each station tab
@queue_stations.each do |que|
queue_stations.each do |que|
i=0
@queue_items_details.each do |qid|
if qid.station_name == que.station_name
i+=1
@queue_stations_items.push({:station_name => que.station_name ,:item_count => i })
break
if qid.station_name == que.station_name
i=i+1
end
end
end
@queue_stations_items.push({:station_name => que.station_name, :is_active => que.is_active ,:item_count => i })
end
@queue_stations_items
@@ -43,8 +42,8 @@ class Oqs::HomeController < BaseOqsController
left join orders as od ON od.id = assigned_order_items.order_id
left join order_items as odt ON odt.item_code = assigned_order_items.item_code
left join customers as cus ON cus.id = od.customer_id")
.where('assigned_order_items.delivery_status=' + status)
.group('assigned_order_items.id')
.where("assigned_order_items.delivery_status = #{status}")
.group("assigned_order_items.id")
.order("odt.item_name DESC")
end
end