updated oqs ui

This commit is contained in:
Yan
2017-06-02 13:58:35 +06:30
parent 95fd260c76
commit 17206001c4
3 changed files with 27 additions and 14 deletions

View File

@@ -28,15 +28,10 @@ class Oqs::HomeController < BaseOqsController
# update delivery status when complete click
def update_delivery_status
puts "WWWW" + params[:id]
assigned_item_id = params[:id]
assigned_item=AssignedOrderItem.find(assigned_item_id)
assigned_item.delivery_status=true
assigned_item.save
# respond_to do |format|
# format.json { render json: "updated" }
# end
flash[:success] = "updated!"
assigned_item.save
end
# Query for OQS with status
@@ -49,7 +44,7 @@ class Oqs::HomeController < BaseOqsController
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('oqs.station_name')
.group('assigned_order_items.id')
.order("odt.item_name DESC")
end
end