Commit Graph

16 Commits

Author SHA1 Message Date
Will Marshall
d7ff1cd4af Merge branch 'laura_and_will' into new_cart
Conflicts:
	app/views/checkout/_payment.html.haml
	app/views/checkout/_shipping.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml
2014-07-24 10:39:36 +10:00
summerscope
a40b5689a9 Checkout page design tweaks and improvements to make accordion more usable 2014-07-23 16:57:38 +10:00
Will Marshall
67922f38df Fixing some regressions to data submission 2014-07-17 14:46:46 +10:00
Will Marshall
541fe9ec37 Switching Checkout service to use CurrentOrder 2014-07-17 14:26:54 +10:00
Will Marshall
158bdd145f All the new serializers and some specs 2014-07-17 14:23:09 +10:00
Will Marshall
547d9f9f5c Moving payment methods and shipping methods into their own services 2014-07-17 14:19:39 +10:00
Will Marshall
57102f714e Switching to ng-if so CC fields aren't validated when hidden 2014-06-06 14:04:48 +10:00
summerscope
15cde6c372 Merge branch 'laura_and_will' into icon_font
Conflicts:
	app/views/groups/index.html.haml
	app/views/modals/_producers.html.haml
2014-05-30 12:12:07 +10:00
Will Marshall
db131af5e7 Patching a class hook 2014-05-30 12:00:28 +10:00
summerscope
9cae581cda Add class right to icons 2014-05-30 11:57:06 +10:00
summerscope
cbc28f6da7 Adding in icons to checkout partial 2014-05-30 11:48:59 +10:00
summerscope
3d2d6fa33c Styling for checkout page and the hubs heading above shopping section 2014-05-09 14:34:42 +10:00
summerscope
e8a5a4984b Styling work on the checkout page WIP 2014-05-09 14:34:42 +10:00
summerscope
d227fb24fe Styling checkout page 2014-05-08 17:36:17 +10:00
Will Marshall
5fa0d845a4 Reworking the checkout 2014-05-08 16:38:21 +10:00
Will Marshall
b907616749 Renaming our partials 2014-05-02 14:47:12 +10:00