3682 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob H	32ee8afdce	logic for producer shop icon in list view	2014-09-05 14:46:04 +10:00
summerscope	7b9ff9b6dd	Merge branch 'ent_types_frontend' of github.com:openfoodfoundation/openfoodnetwork into ent_types_frontend ... Conflicts: app/views/home/_skinny.html.haml	2014-09-05 12:48:05 +10:00
summerscope	658c27408e	Styling for hub listing page and tweaks to markup to accomodate new icons and styling	2014-09-05 12:32:45 +10:00
Rob H	8f6d04a129	Adding properties to enterprise serialiser to allow differentiation between profile, shopfront and aggregators	2014-09-05 12:30:52 +10:00
summerscope	b487c9848b	Add checkbox for show / hide profiles	2014-09-05 12:15:14 +10:00
summerscope	94fbb624f5	Make CTA links separate from hub link styling	2014-09-05 12:14:55 +10:00
summerscope	ed0f2de2f3	More styling for CTA links on modals	2014-09-05 11:56:21 +10:00
summerscope	c64ef39e22	Ran a DB:micrate, this is a change to the order	2014-09-05 11:39:43 +10:00
summerscope	0138fded17	Styling for modals	2014-09-05 11:39:04 +10:00
summerscope	116eb6a2c6	template updates for modals - links not buttons	2014-09-05 11:38:19 +10:00
summerscope	a4aa949499	Applying new icons for map view	2014-08-29 18:04:06 +10:00
summerscope	ae442769b5	New version of icon font for OFN system	2014-08-29 18:03:47 +10:00
summerscope	a31e8ff82f	New map icons	2014-08-29 18:03:15 +10:00
summerscope	4efe3fdf88	Remove old map icons	2014-08-29 18:01:54 +10:00
Rob H	ba3f97ca1f	Fixing enterprise relationships spec	2014-08-28 14:45:24 +10:00
Rob H	5ede8d169f	Revert a4be0ff..7b89e6a for deployment	2014-08-28 14:32:57 +10:00
Rob H	bfd9ffd84a	Adding missing data-bindings for country/state	2014-08-28 14:25:21 +10:00
Rohan Mitchell	7b89e6aa80	Revert "Comment out ERPs which have confusing names, use old 'permits'" ... This reverts commit a4be0ff55a.	2014-08-28 10:12:06 +10:00
Rohan Mitchell	1871d42e68	Switch to correct grammatical ordering of child/parent enterprise on enterprise relationships page	2014-08-28 10:09:50 +10:00
Rohan Mitchell	a5debc19dc	Permit edits to exchanges involving enterprises permitted via E2E relationships	2014-08-28 10:09:50 +10:00
Rohan Mitchell	628d87b69a	Add to OC permission allows adding distributors to order cycle	2014-08-28 10:09:50 +10:00
Rohan Mitchell	5ef13d3c5a	Change 'add products to OC' permission into the more general 'add enterprise to OC'	2014-08-28 10:09:50 +10:00
Rohan Mitchell	099a5b0b7b	Show E2E related enterprise exchanges in OC	2014-08-28 10:09:50 +10:00
Rohan Mitchell	34602244ca	Show permitted suppliers in order cycle add supplier select box	2014-08-28 10:09:50 +10:00
Rohan Mitchell	b9e5821497	Add EnterpriseRelationship scopes permitting and with_permission	2014-08-28 10:09:50 +10:00
Rohan Mitchell	8548a1a67e	Determine producer options on order cycle screen through OpenFoodNetwork::Permissions class	2014-08-28 10:09:50 +10:00
Rohan Mitchell	a7689973be	Semantically name enterprises in spec	2014-08-28 10:09:50 +10:00
Rohan Mitchell	5e8bdce67d	Refactor spec	2014-08-28 10:09:50 +10:00
Rob H	a4be0ff55a	Comment out ERPs which have confusing names, use old 'permits'	2014-08-27 17:07:30 +10:00
Rob H	7124dc57fd	Requiring a state in checkout	2014-08-27 16:59:26 +10:00
Rob H	400f2ea9b9	Don't add payment forms to checkout DOM unless required	2014-08-27 15:09:41 +10:00
Rohan Mitchell	0462b3e55d	Prevent duplicate enterprise roles	2014-08-26 14:40:34 +10:00
Rob H	435819acc4	Removing unit text from total units column	2014-08-25 20:29:24 +10:00
Rob H	310d1b3726	Zeus server does not crash when editing controllers	2014-08-25 20:29:24 +10:00
Rob H	0d9e07d484	Make restore script compatible with OSX	2014-08-25 20:29:23 +10:00
Rohan Mitchell	45a44844ca	Remove old rabl spec	2014-08-25 16:38:17 +10:00
Rohan Mitchell	1a995aedda	Simplify enterprise_relationship factory - leverage permissions_list= model method	2014-08-25 15:20:46 +10:00
Rohan Mitchell	c3224ce668	Style permission list items, order perms consistently by name	2014-08-25 15:05:49 +10:00
Rohan Mitchell	3932884dba	Admin can create enterprise relationships with permissions	2014-08-25 14:59:10 +10:00
Rohan Mitchell	057ad9c6d3	Set enterprise relationship permissions from a list	2014-08-25 14:54:52 +10:00
Rohan Mitchell	50c559964c	Display enterprise relationship permissions	2014-08-25 13:28:02 +10:00
Rohan Mitchell	b4e89ad2c0	Convert enterprise relationship permission to string presentation	2014-08-25 13:27:01 +10:00
Rohan Mitchell	70feef1256	Add EnterpriseRelationshipPermission model	2014-08-25 13:26:23 +10:00
Rohan Mitchell	cb615ba994	Render enterprise relationships JSON with AMS instead of rabl	2014-08-25 13:07:31 +10:00
Rohan Mitchell	3524e658f8	Error when creating product and master is invalid, instead of creating a product without a master	2014-08-25 11:52:15 +10:00
Rohan Mitchell	4ceaec0ef5	Do not error when checking out with a pre-loaded shipping/billing address	2014-08-22 17:34:42 +10:00
Rohan Mitchell	dd42b0c239	Split out opening payments into own context	2014-08-22 14:38:44 +10:00
Rohan Mitchell	e173c69ee3	Fix arrow position	2014-08-19 16:53:23 +10:00
Rohan Mitchell	b35c5e902f	Fix broken JS specs	2014-08-19 16:47:51 +10:00
Rohan Mitchell	e3b4f6efc1	When profile admin only, do not show payment methods, shipping methods or enterprise fees when editing profile	2014-08-19 16:43:18 +10:00