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

Admin can customise some fields on Xero invoices report

Browse Source 
Add require for xero invoices report spec
This commit is contained in:
Rohan Mitchell
2015-05-14 12:25:48 +10:00
parent 0737ac8da0
commit c5b618b1f4
5 changed files with 115 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -683,7 +683,7 @@ Spree::Admin::ReportsController.class_eval do
def xero_invoices
@search = Spree::Order.complete.managed_by(spree_current_user).search(params[:q])
orders = @search.result
@report = OpenFoodNetwork::XeroInvoicesReport.new orders
@report = OpenFoodNetwork::XeroInvoicesReport.new orders, params
render_report(@report.header, @report.table, params[:csv], "xero_invoices_#{timestamp}.csv")
end
@@ -725,7 +725,9 @@ Spree::Admin::ReportsController.class_eval do
:sales_total => { :name => "Sales Total", :description => "Sales Total For All Orders" },
:users_and_enterprises => { :name => "Users & Enterprises", :description => "Enterprise Ownership & Status" },
:order_cycle_management => {:name => "Order Cycle Management", :description => ''},
:sales_tax => { :name => "Sales Tax", :description => "Sales Tax For Orders" }
:sales_tax => { :name => "Sales Tax", :description => "Sales Tax For Orders" },
:xero_invoices => { :name => "Xero Invoices", :description => 'Invoices for import into Xero' }
}
# Return only reports the user is authorized to view.
reports.select { |action| can? action, :report }

33
app/views/spree/admin/reports/xero_invoices.html.haml Normal file
View File

@@ -0,0 +1,33 @@
= form_tag spree.xero_invoices_admin_reports_path do
.row
.four.columns.alpha= label_tag :initial_invoice_number, "Initial invoice number:"
.twelve.columns.omega= text_field_tag :initial_invoice_number
.row
.four.columns.alpha= label_tag :invoice_date, "Invoice date:"
.twelve.columns.omega= text_field_tag :invoice_date, '', class: 'datetimepicker'
.row
.four.columns.alpha= label_tag :due_date, "Due date:"
.twelve.columns.omega= text_field_tag :due_date, '', class: 'datetimepicker'
.row
.four.columns.alpha= label_tag :account_code, "Account code:"
.twelve.columns.omega= text_field_tag :account_code
.row
.four.columns.alpha= label_tag :csv, "Download as CSV:"
.twelve.columns.omega= check_box_tag :csv
.row
.four.columns.alpha= button t(:search)
%table#listing_invoices.index
%thead
%tr
- @report.header.each do |header|
%th= header
%tbody
- @report.table.each do |row|
%tr
- row.each do |column|
%td= column
- if @report.table.empty?
%tr
%td{:colspan => "2"}= t(:none)

32
lib/open_food_network/xero_invoices_report.rb
View File

@@ -1,7 +1,10 @@
module OpenFoodNetwork
class XeroInvoicesReport
def initialize(orders)
def initialize(orders, opts={})
@orders = orders
@opts = opts.reverse_merge({invoice_date: Date.today,
due_date: 2.weeks.from_now.to_date,
account_code: 'food sales'})
end
def header
@@ -11,12 +14,13 @@ module OpenFoodNetwork
def table
rows = []
@orders.each do |order|
rows << summary_row(order, 'Total untaxable produce (no tax)', 0, 'GST Free Income')
rows << summary_row(order, 'Total taxable produce (tax inclusive)', 0, 'GST on Income')
rows << summary_row(order, 'Total untaxable fees (no tax)', 0, 'GST Free Income')
rows << summary_row(order, 'Total taxable fees (tax inclusive)', 0, 'GST on Income')
rows << summary_row(order, 'Delivery Shipping Cost (tax inclusive)', 0, 'Tax or No Tax - depending on enterprise setting')
@orders.each_with_index do |order, i|
invoice_number = invoice_number_for(order, i)
rows << summary_row(order, 'Total untaxable produce (no tax)', 0, invoice_number, 'GST Free Income', @opts)
rows << summary_row(order, 'Total taxable produce (tax inclusive)', 0, invoice_number, 'GST on Income', @opts)
rows << summary_row(order, 'Total untaxable fees (no tax)', 0, invoice_number, 'GST Free Income', @opts)
rows << summary_row(order, 'Total taxable fees (tax inclusive)', 0, invoice_number, 'GST on Income', @opts)
rows << summary_row(order, 'Delivery Shipping Cost (tax inclusive)', 0, invoice_number, 'Tax or No Tax - depending on enterprise setting', @opts)
end
rows
@@ -25,7 +29,11 @@ module OpenFoodNetwork
private
def summary_row(order, description, amount, tax_type)
def invoice_number_for(order, i)
@opts[:initial_invoice_number] ? @opts[:initial_invoice_number].to_i+i : order.number
end
def summary_row(order, description, amount, invoice_number, tax_type, opts={})
[order.bill_address.full_name,
order.email,
order.bill_address.address1,
@@ -36,16 +44,16 @@ module OpenFoodNetwork
order.bill_address.state,
order.bill_address.zipcode,
order.bill_address.country.andand.name,
order.number, # To customise
invoice_number,
order.number,
Date.today, # To customise
2.weeks.from_now.to_date, # To customise
opts[:invoice_date],
opts[:due_date],
'',
description,
'1',
amount,
'',
'food sales', # To customise
opts[:account_code],
tax_type,
'',
'',

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

@@ -327,7 +327,7 @@ feature %q{
login_to_admin_section
click_link 'Reports'
click_link 'Xero invoices'
click_link 'Xero Invoices'
end
around do |example|
@@ -337,10 +337,7 @@ feature %q{
end
it "shows Xero invoices report" do
rows = find("table#listing_invoices").all("tr")
table = rows.map { |r| r.all("th,td").map { |c| c.text.strip } }
table.should == [
xero_invoice_table.should match_table [
%w(*ContactName EmailAddress POAddressLine1 POAddressLine2 POAddressLine3 POAddressLine4 POCity PORegion POPostalCode POCountry *InvoiceNumber Reference *InvoiceDate *DueDate InventoryItemCode *Description *Quantity *UnitAmount Discount *AccountCode *TaxType TrackingName1 TrackingOption1 TrackingName2 TrackingOption2 Currency BrandingTheme),
xero_invoice_row('Total untaxable produce (no tax)', 0, 'GST Free Income'),
xero_invoice_row('Total taxable produce (tax inclusive)', 0, 'GST on Income'),
@@ -350,11 +347,40 @@ feature %q{
]
end
it "can customise a number of fields" do
fill_in 'initial_invoice_number', with: '5'
fill_in 'invoice_date', with: '2015-02-12'
fill_in 'due_date', with: '2015-03-12'
fill_in 'account_code', with: 'abc123'
click_button 'Search'
opts = {invoice_number: '5', invoice_date: '2015-02-12', due_date: '2015-03-12', account_code: 'abc123'}
xero_invoice_table.should match_table [
%w(*ContactName EmailAddress POAddressLine1 POAddressLine2 POAddressLine3 POAddressLine4 POCity PORegion POPostalCode POCountry *InvoiceNumber Reference *InvoiceDate *DueDate InventoryItemCode *Description *Quantity *UnitAmount Discount *AccountCode *TaxType TrackingName1 TrackingOption1 TrackingName2 TrackingOption2 Currency BrandingTheme),
xero_invoice_row('Total untaxable produce (no tax)', 0, 'GST Free Income', opts),
xero_invoice_row('Total taxable produce (tax inclusive)', 0, 'GST on Income', opts),
xero_invoice_row('Total untaxable fees (no tax)', 0, 'GST Free Income', opts),
xero_invoice_row('Total taxable fees (tax inclusive)', 0, 'GST on Income', opts),
xero_invoice_row('Delivery Shipping Cost (tax inclusive)', 0, 'Tax or No Tax - depending on enterprise setting', opts)
]
# TODO:
# - Amounts
# - Tax specification for shipping
end
private
def xero_invoice_row(description, amount, tax_type)
['Customer Name', 'customer@email.com', 'customer l1', '', '', '', 'customer city', 'Victoria', '1234', country.name, order1.number, order1.number, '2015-04-26', '2015-05-10', '', description, '1', amount.to_s, '', 'food sales', tax_type, '', '', '', '', Spree::Config.currency, '']
def xero_invoice_table
find("table#listing_invoices")
end
def xero_invoice_row(description, amount, tax_type, opts={})
opts.reverse_merge!({invoice_number: order1.number, invoice_date: '2015-04-26', due_date: '2015-05-10', account_code: 'food sales'})
['Customer Name', 'customer@email.com', 'customer l1', '', '', '', 'customer city', 'Victoria', '1234', country.name, opts[:invoice_number], order1.number, opts[:invoice_date], opts[:due_date], '', description, '1', amount.to_s, '', opts[:account_code], tax_type, '', '', '', '', Spree::Config.currency, '']
end
end

25
spec/lib/open_food_network/xero_invoices_report_spec.rb Normal file
View File

@@ -0,0 +1,25 @@
require 'open_food_network/xero_invoices_report'
module OpenFoodNetwork
describe XeroInvoicesReport do
subject { XeroInvoicesReport.new [] }
describe "generating invoice numbers" do
let(:order) { double(:order, number: 'R731032860') }
describe "when no initial invoice number is given" do
it "returns the order number" do
subject.send(:invoice_number_for, order, 123).should == 'R731032860'
end
end
describe "when an initial invoice number is given" do
subject { XeroInvoicesReport.new [], {initial_invoice_number: '123'} }
it "increments the number by the index" do
subject.send(:invoice_number_for, order, 456).should == 579
end
end
end
end
end