4969 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	efbf2c7ffa	Display extended variant name in quick cart	2015-03-13 12:58:53 +11:00
Rob Harrington	44511b8b61	Only display shipping description if it exists	2015-03-12 16:18:30 +11:00
Rob Harrington	eb413ccc84	Committing schema changes	2015-03-12 16:18:07 +11:00
Rob Harrington	6cd6b751c8	Merge branch 'master' into order-confirmation	2015-03-12 15:34:49 +11:00
summerscope	ea96759306	Take styling out of template into SASS	2015-03-10 14:59:46 +11:00
summerscope	d967905b83	Tweaking copy styles and removing references to Open Sans which not using. Silly laura mixing up repos	2015-03-10 14:59:26 +11:00
summerscope	f698408d40	Logic for delivery vs collection - making template	2015-03-10 14:58:58 +11:00
summerscope	75b0b290ae	More WIP trying to work on the cart template logic with Rohan	2015-03-10 14:12:43 +11:00
summerscope	21b18a8cc5	WIP commit so i can see what i messed up.	2015-03-10 12:31:53 +11:00
summerscope	91bf588bcc	Order details page add in mini thumbnail for product image	2015-03-10 12:03:21 +11:00
summerscope	a8de4dc039	WIP checkout page and order confirmation page. Working on making these pages more consistent to each other, to email confirmation, and to shopping experience.	2015-03-10 11:35:53 +11:00
summerscope	c7cf9695bc	WIP on cart menu trying to add the master name back in where a product has variante	2015-03-10 11:35:35 +11:00
summerscope	b9a0579397	Add styling for image thumbnail - hide for small, show small thumbnail for big screens.	2015-03-10 11:35:03 +11:00
summerscope	de6abc3464	Turning off z-index this causes problems on shopping cart page. Needs testing to confirm does not break elsewhere.	2015-03-10 11:34:31 +11:00
summerscope	881313edf9	Changing the logic on Shipping accordion on checkout to try to show shipping price against option. Not working.	2015-03-06 16:05:42 +11:00
Rohan Mitchell	381bfd383b	Allow enterprise fee with no tax category	2015-03-06 12:12:33 +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
summerscope	c3c1573f54	Adding a comment	2015-03-05 23:22:31 +11:00
summerscope	a0af22350d	Order conf page WIP	2015-03-05 17:21:25 +11:00
summerscope	e3b660abb9	Shopping cart page update to simplify, improve and expose fees	2015-03-05 17:21:13 +11:00
summerscope	9a86e41942	Adding more helper classes	2015-03-05 17:20:02 +11:00
Rohan Mitchell	b5ce056d06	Fix tax calculations for determining tax included in an amount	2015-03-05 13:03:53 +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
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