From 3640a71ab8e7b5a7c7dab1bfa8016f5faa981e7e Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 15 May 2015 15:05:18 +1000
Subject: [PATCH] Reorder methods

---
 lib/open_food_network/xero_invoices_report.rb | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/lib/open_food_network/xero_invoices_report.rb b/lib/open_food_network/xero_invoices_report.rb
index 504bf03349..9a316e08ed 100644
--- a/lib/open_food_network/xero_invoices_report.rb
+++ b/lib/open_food_network/xero_invoices_report.rb
@@ -25,6 +25,10 @@ module OpenFoodNetwork
 
     private
 
+    def invoice_number_for(order, i)
+      @opts[:initial_invoice_number] ? @opts[:initial_invoice_number].to_i+i : order.number
+    end
+
     def rows_for_order(order, invoice_number, opts)
       [
         summary_row(order, 'Total untaxable produce (no tax)',       total_untaxable_products(order), invoice_number, 'GST Free Income',        opts),
@@ -35,36 +39,6 @@ module OpenFoodNetwork
       ]
     end
 
-
-    def total_untaxable_products(order)
-      order.line_items.without_tax.sum &:amount
-    end
-
-    def total_taxable_products(order)
-      order.line_items.with_tax.sum &:amount
-    end
-
-    def total_untaxable_fees(order)
-      order.adjustments.enterprise_fee.without_tax.sum &:amount
-    end
-
-    def total_taxable_fees(order)
-      order.adjustments.enterprise_fee.with_tax.sum &:amount
-    end
-
-    def total_shipping(order)
-      order.adjustments.shipping.sum &:amount
-    end
-
-    def tax_on_shipping_s(order)
-      tax_on_shipping = order.adjustments.shipping.sum(&:included_tax) > 0
-      tax_on_shipping ? 'GST on Income' : 'GST Free Income'
-    end
-
-    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,
@@ -96,5 +70,29 @@ module OpenFoodNetwork
       ]
     end
 
+    def total_untaxable_products(order)
+      order.line_items.without_tax.sum &:amount
+    end
+
+    def total_taxable_products(order)
+      order.line_items.with_tax.sum &:amount
+    end
+
+    def total_untaxable_fees(order)
+      order.adjustments.enterprise_fee.without_tax.sum &:amount
+    end
+
+    def total_taxable_fees(order)
+      order.adjustments.enterprise_fee.with_tax.sum &:amount
+    end
+
+    def total_shipping(order)
+      order.adjustments.shipping.sum &:amount
+    end
+
+    def tax_on_shipping_s(order)
+      tax_on_shipping = order.adjustments.shipping.sum(&:included_tax) > 0
+      tax_on_shipping ? 'GST on Income' : 'GST Free Income'
+    end
   end
 end