Skip to content

Commit

Permalink
Show receipt item categories even without current records
Browse files Browse the repository at this point in the history
  • Loading branch information
sachac committed Jun 16, 2015
1 parent 4c5e167 commit 132b280
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion app/controllers/receipt_item_categories_controller.rb
Expand Up @@ -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

Expand Down

0 comments on commit 132b280

Please sign in to comment.