80 Commits

Author	SHA1	Message	Date
Rob Harrington	e67e22ee73	Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security ... Conflicts: lib/open_food_network/xero_invoices_report.rb	2015-12-17 14:22:16 +11:00
Rob Harrington	2bb85eb8e0	Revert "Add SKU to LettuceShare report" ... This reverts commit 15ea64b409.	2015-12-16 13:42:58 +11:00
Rob Harrington	5d28a7fdf8	Adding SKU to Products and Inventory reports (except lettuceshare)	2015-12-16 13:37:19 +11:00
Rob Harrington	befc558224	Pulling product_and_variant_name down into VariantAndLineItemNaming, renaming to product_and_full_name ... Also allowing this method to be used in reports (Xero), to reflect appropriate name for weight/volume adjusted line items	2015-12-16 11:55:24 +11:00
Continuous Integration	b7edf5e046	Auto-merge from CI [skip ci]	2015-12-16 10:58:03 +11:00
Em-AK	81f244025f	Update due_date in feature test ... due_date = invoice_date + 1 month	2015-12-13 18:42:27 +01:00
Maikel Linke	15ea64b409	Add SKU to LettuceShare report	2015-12-11 15:12:27 +11:00
Maikel Linke	6787709693	LettuceShare report: total in unit value column and total blank	2015-12-11 15:12:27 +11:00
Maikel Linke	cd7721a127	Using date and time of current timezone ... Using Time.zone.now and Date.current instead of Time.now and Date.today. This should make all specs timezone independent.	2015-12-10 11:38:41 +11:00
Rob Harrington	be8038e9d0	Merge branch 'master' into line_item_naming ... Conflicts: lib/open_food_network/order_cycle_management_report.rb lib/open_food_network/packing_report.rb	2015-11-12 14:40:11 +11:00
Rohan Mitchell	015f3eb9ac	Display summary rows for admin adjustments	2015-11-01 13:42:59 +11:00
Lynne Davis	7350dbb75e	Adding tweaks that have been missed from merges	2015-10-30 11:54:06 +11:00
Rob Harrington	1946bac8e4	Fixing report spec that cares about table title case	2015-10-28 13:07:31 +11:00
Rob Harrington	40972cc6ec	Updating reports to use naming information from line_items directly, rather than from the original variant	2015-10-28 13:07:31 +11:00
Rohan Mitchell	a766f007fc	Display xero report for account invoices	2015-10-15 11:57:51 +11:00
Rohan Mitchell	9c6264c4a0	On detailed xero report, do not show product totals (xero treats them as additional line items)	2015-09-25 13:52:51 +10:00
Rohan Mitchell	10bc3919ca	Add SKU to detailed xero report	2015-09-22 09:28:50 +10:00
Rohan Mitchell	b5bc4701fa	Detailed xero report	2015-09-22 09:15:55 +10:00
Rohan Mitchell	3e5028b6b9	Revise lettuceshare report - combine grower and cert cols, add column headings	2015-08-16 11:06:52 +08:00
Rohan Mitchell	6f4dc6943e	Add first cut of LettuceShare report	2015-08-07 10:37:59 +10:00
Lynne Davis	c168dec14b	Adding packing reports as required by the UK contingent	2015-07-15 14:44:49 +10:00
Maikel Linke	ffa960b02e	Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor	2015-06-05 13:48:24 +10:00
Rob Harrington	e931f4b31f	Merge branch 'master' into require_standard_variant	2015-05-22 12:22:54 +10:00
Rohan Mitchell	70b5ac4785	Add column for whether the order has been paid for	2015-05-15 16:55:52 +10:00
Rohan Mitchell	ca37efdd26	Display whether there is tax included in shipping	2015-05-15 12:44:48 +10:00
Rohan Mitchell	dc8270ed72	Display amounts on xero invoice report	2015-05-15 12:35:20 +10:00
Rohan Mitchell	c5b618b1f4	Admin can customise some fields on Xero invoices report ... Add require for xero invoices report spec	2015-05-15 12:35:14 +10:00
Rohan Mitchell	0a2f2e0fba	Output summary data without customisation ... Add route for xero invoices report Add require for reports controller decorator	2015-05-15 12:35:05 +10:00
Rob Harrington	f3f0766279	Adding a distributor to order cycle to fix broken feature spec	2015-05-07 12:50:57 +10:00
Rob Harrington	a75a76840d	Merging master into require_standard_variant	2015-04-17 21:18:24 +10:00
Rohan Mitchell	042e076b58	Fix tax-related spec failures	2015-04-17 14:46:32 +10:00
Rohan Mitchell	210c76eddc	Checkout won't load without payment and shipping methods; move spec to context where it can test the checkout	2015-04-17 13:39:09 +10:00
Rob Harrington	b9f19d5777	Fixing broken specs	2015-04-17 13:00:20 +10:00
Rohan Mitchell	84f3097217	Calculate total tax from the tax included in all the adjustments on the order	2015-03-25 16:27:29 +11:00
Rohan Mitchell	333a4ecf2f	Include enterprise fee tax on sales tax report	2015-03-25 16:27:29 +11:00
Rohan Mitchell	40b4edeca1	Replace zoned_order factory with zone_with_member. In practice, former had issues with circular dependencies.	2015-03-25 16:27:29 +11:00
Rohan Mitchell	69dc92dec1	Create factories zoned_order and taxed_product	2015-03-25 16:27:29 +11:00
Rohan Mitchell	d489e06009	Retrieve line item sales tax from included_tax rather than tax amount	2015-03-25 16:27:29 +11:00
Rohan Mitchell	daa30ed518	Retrieve the shipping tax on the order instead of calculating it from scratch	2015-03-25 16:27:29 +11:00
Rohan Mitchell	a5716cf2c2	Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2	2015-03-12 12:15:22 +11:00
Rohan Mitchell	ec22f4c09f	Sales tax report pulls sales tax from adjustments instead of recalculating it at report-time	2015-03-05 10:43:57 +11:00
Rohan Mitchell	54894fb222	Update spec with correct tax amounts	2015-03-05 10:43:56 +11:00
Rohan Mitchell	0b636c1d89	Combine spec cases for faster runtime	2015-03-05 10:43:54 +11:00
Rohan Mitchell	2b9fef6aec	Convert to Ruby 1.9 hash syntax	2015-03-05 10:43:53 +11:00
Rohan Mitchell	3aa30af199	Remove unneeded objects from spec setup	2015-03-05 10:43:53 +11:00
Rohan Mitchell	0212351d32	Tighten test	2015-03-05 10:43:53 +11:00
Rohan Mitchell	29653a5595	Fix spec infinite recursion issue	2015-03-05 10:43:52 +11:00
Matt-Yorkley	e6368af757	Update reports_spec.rb	2015-03-05 10:43:52 +11:00
Matt-Yorkley	2c80be7e9e	Update	2015-03-05 10:43:52 +11:00
Matt-Yorkley	3f61a5412c	Spec file attempt...	2015-03-05 10:43:51 +11:00