Commit Graph

34369 Commits

Author SHA1 Message Date
Rohan Mitchell
94d50f220f Display an error message to admin when there are hubs in order cycles that are not ready for checkout 2014-10-31 12:22:02 +11:00
Rohan Mitchell
9f43146e47 Payment methods need to be available, too 2014-10-31 12:22:02 +11:00
Rohan Mitchell
f0d3b987d4 Show hubs as unavailable when they do not have available payment and shipping methods 2014-10-31 12:22:02 +11:00
Rohan Mitchell
1d9a3f33e0 Order cycle distributors must have shipping and payment methods 2014-10-31 12:22:02 +11:00
Rohan Mitchell
fc1c3abb9f Remove duplicate data injection (duplicated in darkswarm layout) 2014-10-31 12:22:02 +11:00
Rohan Mitchell
433806aca8 Remove unused helpers and standardise naming 2014-10-31 12:22:02 +11:00
summerscope
34f47cedae Fix markup for better layout and getting column padding sitting where it should 2014-10-30 17:03:09 +11:00
summerscope
733b249b12 making tabs break down better for responsive and small devices 2014-10-30 17:03:09 +11:00
summerscope
d8933deee0 Styling shopfront tabs make things better and more responsive 2014-10-30 17:03:09 +11:00
summerscope
a27a805478 Tweak styling so the accordion hover colors dont fight the validation colors 2014-10-30 17:03:08 +11:00
summerscope
38e6575781 Move first and last name fields to top of shipping address accordion 2014-10-30 17:03:08 +11:00
summerscope
799c894bd3 Tweak logo embedding to use new version, and use srcset with src as a fallback 2014-10-30 17:03:08 +11:00
summerscope
32daa1745c Tweak logo for high density screens, make pretty and easier to read 2014-10-30 17:03:08 +11:00
summerscope
6329db23d7 Remove styling for capitalisation for shopfront page 2014-10-30 17:03:08 +11:00
Rob Harrington
6596e14e5d Use shared partial for errors on EnterpriseFeeSet 2014-10-30 13:02:16 +11:00
Rob Harrington
65d13e0490 Show error messages on enterprise index page 2014-10-30 13:02:16 +11:00
Rob Harrington
977c508833 Make enterprise limit error messages more specific 2014-10-30 13:02:16 +11:00
summerscope
fd8eecf745 Remove unnecessary partial import 2014-10-30 11:30:21 +11:00
summerscope
64f2d1b34e Remove unnecessary partial import 2014-10-30 11:30:03 +11:00
summerscope
f1e27a3ac3 No need to import typography into this file, add note for future devs 2014-10-30 11:29:42 +11:00
Rafael Schouten
2b0757e96f Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork 2014-10-25 20:23:25 +11:00
Rob Harrington
43d3955627 Change wording of trial option on change_type_form 0.7.0 2014-10-25 19:56:52 +11:00
Rafael Schouten
68073d7239 revome config sidebar from index 2014-10-25 19:03:56 +11:00
Rafael Schouten
095dd28505 Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork 2014-10-25 18:53:46 +11:00
Rafael Schouten
feff4fd46f fix reports taxons and specs 2014-10-25 18:51:03 +11:00
Rafael Schouten
6f1c90ea25 add toxons to prodcut reports 2014-10-25 17:09:23 +11:00
Rafael Schouten
098afacce3 Merge branch 'config' of https://github.com/openfoodfoundation/openfoodnetwork into config 2014-10-25 15:32:16 +11:00
Rafael Schouten
8395dbb3e9 Merge branch 'master' into config
Conflicts:
	.gitignore
	Gemfile
2014-10-25 15:29:53 +11:00
Rafael Schouten
33fc7e0fc9 Merge branch 'master' into checkout 2014-10-25 15:12:24 +11:00
Rob Harrington
6155600cb2 Set environment for payment methods unless admin 2014-10-24 18:15:48 +11:00
Rob Harrington
8385bff55e Make admins get multi enterprise dashboard 2014-10-24 17:59:58 +11:00
summerscope
928e5dc474 Make styling more specific to single enterprise dashboard user only 2014-10-24 16:39:59 +11:00
Rob Harrington
cc0e205f50 Merge master into onbaording 2014-10-24 15:36:59 +11:00
Rob Harrington
80b36992f9 Merge in remote branch 2014-10-24 15:28:40 +11:00
Rob Harrington
a157528974 Adding specs for single ent dash and remove product ability for profiles 2014-10-24 15:27:08 +11:00
Rob Harrington
8b819539e7 Fixing specs 2014-10-24 14:52:59 +11:00
summerscope
2eb152f63e Change class name for big button; change labels for submit buttons 2014-10-24 14:49:09 +11:00
summerscope
c733ca251e Styling for big button 2014-10-24 14:48:46 +11:00
summerscope
d388747a81 Make margine appear for small devices only 2014-10-24 14:48:29 +11:00
Rob Harrington
8ac367675f Adding big button class to CTA 2014-10-24 14:24:55 +11:00
Rob Harrington
96516a8ff3 User can switch between trialling a shopfront and not trialling a shopfront 2014-10-24 14:12:47 +11:00
Rob Harrington
3e002c6f82 Fiddle with text 2014-10-24 13:34:49 +11:00
Rob Harrington
20e2cb4ecc Set visibility to false for enterprises created through registration process 2014-10-24 13:31:20 +11:00
Rob Harrington
b0d8290dab Add alert for visibility to single ent dash 2014-10-24 13:28:25 +11:00
Rob Harrington
8603cf685e Merge remote-tracking branch 'origin/onboarding' into onboarding 2014-10-24 13:03:04 +11:00
Rob Harrington
b182c6afc8 Merge in remote changes 2014-10-24 13:02:26 +11:00
summerscope
0d73d8f043 Fix layout add required class 2014-10-24 13:01:56 +11:00
Rob Harrington
498b51cedb Switching out chevron on Change Type button 2014-10-24 12:54:21 +11:00
summerscope
01cb39a93f Error messages specific to use case 2014-10-24 12:54:06 +11:00
summerscope
b172c4fd4f Search query make empty string rather than undefined 2014-10-24 12:53:04 +11:00