4944 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	eccd97fc28	Merge branch 'master' into reduce-supplier-list-in-order-cycles	2015-03-12 11:55:14 +11:00
Rohan Mitchell	c4d4d10873	Reuse supplier/distributor list	2015-03-12 11:53:13 +11:00
Rohan Mitchell	1e5e009735	Spree init works when database has not been created, remove duplicate FK from db/schema.rb	2015-03-12 11:29:01 +11:00
Rohan Mitchell	381bfd383b	Allow enterprise fee with no tax category	2015-03-06 12:12:33 +11:00
Liv Galendez	266d6ef834	Fixed handling of distributors field	2015-03-06 11:55:35 +11:00
Rohan Mitchell	1e18f773f5	Switch context -> describe, clarify test grammar	2015-03-06 11:15:07 +11:00
Rohan Mitchell	41792395aa	Record the tax included in per-item EnterpriseFees	2015-03-06 11:13:47 +11:00
Rohan Mitchell	98ff895f5f	Record the tax included in per-order EnterpriseFees	2015-03-06 10:38:55 +11:00
Rohan Mitchell	b5ce056d06	Fix tax calculations for determining tax included in an amount	2015-03-05 13:03:53 +11:00
Rohan Mitchell	dfb855bd14	Record the tax included in shipping.	2015-03-05 10:44:27 +11:00
Rohan Mitchell	9395f6c808	Record the tax included in adjustments. TaxRate adjustments consist of 100% tax.	2015-03-05 10:44:26 +11:00
Rohan Mitchell	53fa71d1f3	Admin can set enterprise fee's tax category	2015-03-05 10:44:25 +11:00
Rohan Mitchell	61c08997a1	EnterpriseFee has a TaxCategory	2015-03-05 10:44:22 +11:00
Rohan Mitchell	dd61034908	Fix fractional cents appearing on sales tax report totals	2015-03-05 10:43:57 +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	11f59c9f59	Add spec for calculating shipping tax. Fix incorrect formula.	2015-03-05 10:43:56 +11:00
Rohan Mitchell	27a730ef6c	Add spec for sales tax report totals calcs	2015-03-05 10:43:56 +11:00
Rohan Mitchell	10e5d09416	Use ReportsHelper for currency_symbol	2015-03-05 10:43:56 +11:00
Rohan Mitchell	3b4d73760b	Break up sales tax report into methods	2015-03-05 10:43:55 +11:00
Rohan Mitchell	89199ef30a	Use map instead of each and var	2015-03-05 10:43:55 +11:00
Rohan Mitchell	67c77cea81	Tidy up haml	2015-03-05 10:43:54 +11:00
Rohan Mitchell	cc7d6cde1d	Shorter syntax	2015-03-05 10:43:54 +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	d194e74eda	Rohan's suggested changes	2015-03-05 10:43:51 +11:00
Matt-Yorkley	3f61a5412c	Spec file attempt...	2015-03-05 10:43:51 +11:00
Matt-Yorkley	0f3723a923	Added currency symbols to sales tax report	2015-03-05 10:43:51 +11:00
Matt-Yorkley	bbca674937	Update reports_spec.rb	2015-03-05 10:43:51 +11:00
Matt-Yorkley	623882a2a1	Config option for tax rate on shipping	2015-03-05 10:43:50 +11:00
Matt-Yorkley	371f966f63	sales tax view	2015-03-05 10:43:50 +11:00
Matt-Yorkley	be55f461d0	Report: sales tax on orders	2015-03-05 10:43:50 +11:00
Rohan Mitchell	503bd8f5dd	Merge pull request #400 from victornava/admin-account-link ... Change admin account link to point to account page instead of edit user.	2015-03-04 16:08:26 +11:00
Victor Nava	6e800341c3	Fixes issue #362 Change admin account link to point to account page instead of edit user.	2015-03-04 16:00:46 +11:00
Liv Galendez	c940a34ec9	Created order_cycle_permitted_in helper	2015-03-03 21:03:01 +11:00
Liv Galendez	fc63d8719c	Used order_cycle_permitted_enterprises helper in order cycles row	2015-03-03 20:53:39 +11:00
Liv Galendez	7ba366e2a6	Added select for coordinator since there are 2 now	2015-03-03 20:46:25 +11:00
Rob Harrington	85b8adb1aa	call to order_cycle_hub_enterprises has no arguments	2015-03-01 15:33:16 +11:00
Rob Harrington	e8818c5191	Adding a ship address to order in spec	2015-03-01 12:22:06 +11:00
Rob Harrington	c91699a11e	Using @order_cycle.coordinator instead of @coordinator	2015-02-27 17:24:37 +11:00
Rob Harrington	8d6c8791bb	Only hubs (sells any) are available for selection as outgoing enterprises	2015-02-27 17:24:36 +11:00
Rob Harrington	31054c7bf4	Split order_cycle_simple_view logic into index and form scopings	2015-02-27 17:24:36 +11:00
Rob Harrington	5563d23beb	Rename set_coordinator method to require_coordinator	2015-02-27 17:24:36 +11:00
Rob Harrington	8de6f983a2	User must set the coordinator first when creating an order cycle	2015-02-27 17:24:36 +11:00
Rob Harrington	53594b3a0f	Cannot add unconfirmed enterprises to order cycles	2015-02-27 17:24:36 +11:00