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

update oqs and add to extisting

Browse Source
This commit is contained in:
Aung Myo
2018-09-11 15:30:43 +06:30
parent a51f927f4c
commit 1dee84d733
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,7 +177,7 @@ puts items.to_json
else
table = ''
end
query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id,
oqs.id as station_id, oqs.station_name,
oqs.is_active, oqpz.zone_id,
@@ -215,8 +215,8 @@ puts items.to_json
.where("assigned_order_items.delivery_status = true AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_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("assigned_order_items.order_id")
.limit(20)
.order("assigned_order_items.created_at")
.limit(50)
.order("assigned_order_items.created_at desc")
# completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
@@ -236,7 +236,7 @@ puts items.to_json
.where("assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_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("odt.order_items_id")
.order("assigned_order_items.created_at")
.order("assigned_order_items.created_at desc")
# completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');