16379 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Harrington	24b40182b5	clearAll for product page also clears any text search filter	2015-03-05 15:34:27 +11:00
Rob Harrington	ed94cf57d3	Adding the 'more' box for single-line-selectors	2015-03-05 15:10:42 +11:00
Rohan Mitchell	b5ce056d06	Fix tax calculations for determining tax included in an amount	2015-03-05 13:03:53 +11:00
Rob Harrington	5bddada013	Removing unnecessary setter	2015-03-05 12:18:34 +11:00
Rob Harrington	4afef8215a	Basic implementation of single line selectors	2015-03-05 12:12:36 +11:00
summerscope	574a215525	Order Confirmation Page WIP	2015-03-05 11:26:29 +11:00
summerscope	2cdab7af25	More label tweaks and logic tweaks to templates	2015-03-05 11:26:15 +11:00
summerscope	235bb009e8	Tweaking styling for order confirmation page	2015-03-05 11:25:57 +11:00
Victor Nava	4e1eb33ff5	Redirect users to proper login page when they type /login	2015-03-05 11:25:35 +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
Paul Mackay	ca665dc6bc	Merge master into producer-emails.	2015-03-04 19:09:43 +00:00
summerscope	e6591be55c	More tweaking for email templates for use case of Collection from hub. Need to tweak logic on Order confiramtion page.	2015-03-04 17:34:24 +11:00
summerscope	5b6bff1691	Removing bad nasty overrides which are confusing and bad. and nasty.	2015-03-04 17:20:05 +11:00
summerscope	db2e5e7558	Add an extra class helper	2015-03-04 17:19:57 +11:00
summerscope	4867f45ee1	Add an extra style	2015-03-04 17:19:37 +11:00
summerscope	47b08269d6	Order confirmation page changes for responsive layout, adding in more content from the checkout page to match the emails.	2015-03-04 17:19:24 +11:00
summerscope	76f234ee4d	Order confirmation top page working on header label	2015-03-04 17:18:55 +11:00
summerscope	163035dcad	Tweaking email template to be more like order confirmation	2015-03-04 17:18:37 +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
summerscope	b097a62c7a	WIP adding variant name logic to the email templates	2015-03-04 12:37:57 +11:00
Lynne Davis	cfa281478a	Adding ability to edit ShippingCategory.temperature_controlled from admin interface	2015-03-04 12:02:07 +11:00
summerscope	f64684dc48	Tweak responsive heading columns now that container is a bit smaller	2015-03-04 11:14:29 +11:00