42 Commits

Author	SHA1	Message	Date
Rob H	1a0a8ec160	Merge branch 'master' into working	2014-06-20 13:54:52 +10:00
Will Marshall	8bb5f75ea0	Temporary fix to get staging working	2014-06-20 13:51:21 +10:00
Rob H	3d1927d545	Merge branch 'master' into working	2014-06-20 12:29:47 +10:00
Will Marshall	ba842be5b8	Loading enterprises per-view again	2014-06-20 12:03:51 +10:00
Rob H	df660ff536	Adding shipping method description to checkout	2014-06-19 16:34:28 +10:00
Rob H	9135a8f27b	Change 'ready on' to 'ready for'	2014-06-19 16:28:16 +10:00
Rohan Mitchell	f068cb3cd7	Show shipping method via angular only (don't show spree's adjustment)	2014-06-06 17:05:50 +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	3ae1eb863d	Update behaviour on Place Order Now button so it is disabled but not hidden when unavailable	2014-06-05 16:20:14 +10:00
summerscope	7b1756fc98	Fix column layout issue for checkout page making content expand beyond page boundaries	2014-06-05 16:19:35 +10:00
Will Marshall	fc02e7857a	Merge branch 'master' into laura_and_will ... Conflicts: app/views/shopping_shared/_contact.html.haml	2014-06-04 17:24:30 +10:00
Will Marshall	a6a4d28072	Fixing up bugs in the Checkout form	2014-06-04 17:13:18 +10:00
Rohan Mitchell	fc3402bbd0	Determine whether to send card field attributes by payment method type	2014-06-04 16:55:27 +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
summerscope	43cc77c88b	Adding icon into button	2014-05-30 12:01:57 +10:00
Will Marshall	db131af5e7	Patching a class hook	2014-05-30 12:00:28 +10:00
summerscope	3fca8640fd	Add class right to icons	2014-05-30 11:57:19 +10:00
summerscope	9cae581cda	Add class right to icons	2014-05-30 11:57:06 +10:00
summerscope	34c4fc8aa1	Add class right to icons	2014-05-30 11:56:52 +10:00
summerscope	474581211b	Add class right to icons	2014-05-30 11:56:41 +10:00
summerscope	cca6a39476	Adding in icons to checkout partial	2014-05-30 11:49:14 +10:00
summerscope	cbc28f6da7	Adding in icons to checkout partial	2014-05-30 11:48:59 +10:00
summerscope	b4f14197fa	Adding in icons to checkout partial	2014-05-30 11:48:47 +10:00
summerscope	4893679d12	Adding in icons to checkout partial	2014-05-30 11:48:32 +10:00
Will Marshall	924128098b	Restricting shipping methods	2014-05-16 10:20:32 +10:00
summerscope	8238cbe0ee	Merge changes	2014-05-14 15:55:18 +10:00
Will Marshall	1c98f10c20	Adding indexing by user id	2014-05-14 11:08:21 +10:00
Will Marshall	5b2e9e9c30	Final set of regression issues	2014-05-09 16:43:57 +10:00
Will Marshall	573d479e08	Fixing test regressions	2014-05-09 16:43:57 +10:00
Will Marshall	f25617dde7	Tweaks for laura, reworking authentication workflow, tidying up checkout	2014-05-09 16:42:51 +10:00
summerscope	7bf969ca1b	Removing empty containers and adding classes for padding required	2014-05-09 16:27:28 +10:00
summerscope	a3e12ae1f3	Tweak label and order of fields	2014-05-09 15:05:51 +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
Will Marshall	860dcf8e11	Adding dirty class	2014-05-09 11:35:27 +10:00
Will Marshall	1e6783148d	Merging	2014-05-09 10:16:26 +10:00
Will Marshall	3b1fcca39b	Splitting out the accordion stuff for checkout	2014-05-09 09:56:54 +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	998fb07330	Splitting out the accordion stuff for checkout	2014-05-08 16:07:56 +10:00
Will Marshall	1756479c85	Patching a regression bug with login on checkout	2014-05-06 18:28:20 +10:00
Will Marshall	b907616749	Renaming our partials	2014-05-02 14:47:12 +10:00