Reorder methods

This commit is contained in:
Rohan Mitchell
2015-10-15 12:00:40 +11:00
parent a766f007fc
commit 13fc36bad6

View File

@@ -30,10 +30,6 @@ module OpenFoodNetwork
private
def invoice_number_for(order, i)
@opts[:initial_invoice_number] ? @opts[:initial_invoice_number].to_i+i : order.number
end
def detail_rows_for_order(order, invoice_number, opts)
rows = []
@@ -46,30 +42,6 @@ module OpenFoodNetwork
rows
end
def summary_rows_for_order(order, invoice_number, opts)
rows = []
rows += produce_summary_rows(order, invoice_number, opts) unless detail?
rows += fee_summary_rows(order, invoice_number, opts) unless detail? && order.account_invoice?
rows += shipping_summary_rows(order, invoice_number, opts)
rows
end
def produce_summary_rows(order, invoice_number, opts)
[summary_row(order, 'Total untaxable produce (no tax)', total_untaxable_products(order), invoice_number, 'GST Free Income', opts),
summary_row(order, 'Total taxable produce (tax inclusive)', total_taxable_products(order), invoice_number, 'GST on Income', opts)]
end
def fee_summary_rows(order, invoice_number, opts)
[summary_row(order, 'Total untaxable fees (no tax)', total_untaxable_fees(order), invoice_number, 'GST Free Income', opts),
summary_row(order, 'Total taxable fees (tax inclusive)', total_taxable_fees(order), invoice_number, 'GST on Income', opts)]
end
def shipping_summary_rows(order, invoice_number, opts)
[summary_row(order, 'Delivery Shipping Cost (tax inclusive)', total_shipping(order), invoice_number, tax_on_shipping_s(order), opts)]
end
def line_item_detail_rows(order, invoice_number, opts)
order.line_items.map do |line_item|
line_item_detail_row(line_item, invoice_number, opts)
@@ -104,6 +76,29 @@ module OpenFoodNetwork
opts)
end
def summary_rows_for_order(order, invoice_number, opts)
rows = []
rows += produce_summary_rows(order, invoice_number, opts) unless detail?
rows += fee_summary_rows(order, invoice_number, opts) unless detail? && order.account_invoice?
rows += shipping_summary_rows(order, invoice_number, opts)
rows
end
def produce_summary_rows(order, invoice_number, opts)
[summary_row(order, 'Total untaxable produce (no tax)', total_untaxable_products(order), invoice_number, 'GST Free Income', opts),
summary_row(order, 'Total taxable produce (tax inclusive)', total_taxable_products(order), invoice_number, 'GST on Income', opts)]
end
def fee_summary_rows(order, invoice_number, opts)
[summary_row(order, 'Total untaxable fees (no tax)', total_untaxable_fees(order), invoice_number, 'GST Free Income', opts),
summary_row(order, 'Total taxable fees (tax inclusive)', total_taxable_fees(order), invoice_number, 'GST on Income', opts)]
end
def shipping_summary_rows(order, invoice_number, opts)
[summary_row(order, 'Delivery Shipping Cost (tax inclusive)', total_shipping(order), invoice_number, tax_on_shipping_s(order), opts)]
end
def summary_row(order, description, amount, invoice_number, tax_type, opts={})
row order, '', description, '1', amount, invoice_number, tax_type, opts
@@ -149,6 +144,10 @@ module OpenFoodNetwork
select { |a| a.source.present? }
end
def invoice_number_for(order, i)
@opts[:initial_invoice_number] ? @opts[:initial_invoice_number].to_i+i : order.number
end
def total_untaxable_products(order)
order.line_items.without_tax.sum &:amount
end