From 132b2802f17e5ce5f706790aa875317e6f5ca666 Mon Sep 17 00:00:00 2001 From: Sacha Chua Date: Tue, 16 Jun 2015 15:09:57 +0000 Subject: [PATCH] Show receipt item categories even without current records --- app/controllers/receipt_item_categories_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/receipt_item_categories_controller.rb b/app/controllers/receipt_item_categories_controller.rb index b434d28..2ae38fe 100644 --- a/app/controllers/receipt_item_categories_controller.rb +++ b/app/controllers/receipt_item_categories_controller.rb @@ -19,7 +19,10 @@ def index params[:start] = (Time.zone.now - 30.days).to_s if params[:start].blank? and current_account.receipt_items.size > 0 params[:end] ||= (Time.zone.now + 1.day).midnight.to_s prepare_filters [:date_range] - @receipt_item_categories = current_account.receipt_item_categories.joins('LEFT JOIN receipt_item_types j ON (receipt_item_categories.id=j.receipt_item_category_id) LEFT JOIN receipt_items i ON (j.id=i.receipt_item_type_id)').where('i.date IS NULL OR i.date BETWEEN ? AND ?', Time.zone.parse(params[:start]), Time.zone.parse(params[:end])).select('receipt_item_categories.id, receipt_item_categories.name, SUM(i.total) AS total').group('receipt_item_categories.id, receipt_item_categories.name').order(order) + start_time = Time.zone.parse(params[:start]) + end_time = Time.zone.parse(params[:end]) + @receipt_item_categories = current_account.receipt_item_categories.joins('LEFT JOIN receipt_item_types j ON (receipt_item_categories.id=j.receipt_item_category_id) LEFT JOIN receipt_items i ON (j.id=i.receipt_item_type_id AND i.date BETWEEN ' + ActiveRecord::Base.sanitize(start_time) + ' AND ' + ActiveRecord::Base.sanitize(end_time) + ')').select('receipt_item_categories.id, receipt_item_categories.name, SUM(i.total) AS total').group('receipt_item_categories.id, receipt_item_categories.name').order(order) + respond_with @receipt_item_categories end