From ee5abb65f846e6070aa258e9c9be67d1c6ca002d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 6 Feb 2018 16:21:47 +0630 Subject: [PATCH 1/2] update home for order --- app/controllers/origami/home_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index c00b39bf..0dda31f5 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -6,7 +6,7 @@ class Origami::HomeController < BaseOrigamiController @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) - @orders = Order.all.order('date desc') + @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') @shop = Shop::ShopDetail # @shift = ShiftSale.current_open_shift(current_user.id) @@ -17,7 +17,7 @@ class Origami::HomeController < BaseOrigamiController @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) - @orders = Order.all.order('date desc') + @orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') @status_order = "" @status_sale = "" From 6503ca9a484ab028589df037716f657dfac6bbbe Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 6 Feb 2018 16:24:00 +0630 Subject: [PATCH 2/2] update home for oqs --- app/controllers/oqs/home_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 3ee71e8d..ebe737d7 100755 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -28,9 +28,9 @@ class Oqs::HomeController < BaseOqsController if !@filter.nil? @count = queue_items_count_query(false,@filter) - @count.each do |count| + # @count.each do |count| - end + # end end # @queue_stations_items=Array.new