raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +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')

4
lib/open_food_network/xero_invoices_report.rb
View File

@@ -6,8 +6,8 @@ module OpenFoodNetwork
@opts = opts.
reject { |k, v| v.blank? }.
reverse_merge({report_type: 'summary',
invoice_date: Date.current,
due_date: 2.weeks.from_now.to_date,
invoice_date: Time.zone.today,
due_date: Time.zone.today + 1.month,
account_code: 'food sales'})
end

2
spec/features/admin/reports_spec.rb
View File

@@ -533,7 +533,7 @@ feature %q{
end
def xero_invoice_row(sku, description, amount, quantity, tax_type, opts={})
opts.reverse_merge!({customer_name: 'Customer Name', address1: 'customer l1', city: 'customer city', state: 'Victoria', zipcode: '1234', country: country.name, invoice_number: order1.number, order_number: order1.number, invoice_date: '2015-04-26', due_date: '2015-05-10', account_code: 'food sales'})
opts.reverse_merge!({customer_name: 'Customer Name', address1: 'customer l1', city: 'customer city', state: 'Victoria', zipcode: '1234', country: country.name, invoice_number: order1.number, order_number: order1.number, invoice_date: '2015-04-26', due_date: '2015-05-26', account_code: 'food sales'})
[opts[:customer_name], 'customer@email.com', opts[:address1], '', '', '', opts[:city], opts[:state], opts[:zipcode], opts[:country], opts[:invoice_number], opts[:order_number], opts[:invoice_date], opts[:due_date],

2
spec/lib/open_food_network/xero_invoices_report_spec.rb
View File

@@ -13,7 +13,7 @@ module OpenFoodNetwork
it "uses defaults when blank params are passed" do
report.instance_variable_get(:@opts).should == {invoice_date: Date.civil(2015, 5, 5),
due_date: Date.civil(2015, 5, 19),
due_date: Date.civil(2015, 6, 5),
account_code: 'food sales',
report_type: 'summary'}
end