raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security

Browse Source 
Conflicts:
	lib/open_food_network/xero_invoices_report.rb
This commit is contained in:
Rob Harrington
2015-12-17 14:22:16 +11:00
parent 7a23f671a2 81f244025f
commit e67e22ee73
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/spree/admin/reports_controller_decorator.rb
View File

@@ -255,7 +255,9 @@ Spree::Admin::ReportsController.class_eval do
def xero_invoices
if request.get?
params[:q] ||= {}
params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month
params[:q][:completed_at_gt] = Time.zone.today.beginning_of_month
params[:invoice_date] = Time.zone.today
params[:due_date] = Time.zone.today + 1.month
end
@distributors = Enterprise.is_distributor.managed_by(spree_current_user)
@order_cycles = OrderCycle.active_or_complete.accessible_by(spree_current_user).order('orders_close_at DESC')