15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rafael Schouten	69614d6cf1	fix accordion jumps	2014-10-22 17:23:06 +11:00
Rohan Mitchell	28352be729	Save pickup time and instructions	2014-10-22 17:17:05 +11:00
Rohan Mitchell	549ef4b79d	When saving an OC from the simple interface, include outgoing variants	2014-10-22 17:08:16 +11:00
Rohan Mitchell	8fb95769bf	Fix tested values in spec	2014-10-22 17:07:45 +11:00
Rob Harrington	7113875a45	Adding welcome page to overview controller	2014-10-22 16:49:32 +11:00
Rob Harrington	8120023094	Fixing indentation	2014-10-22 16:33:43 +11:00
Rob Harrington	82d33332ab	Adding shop_trial_start_date column to enterprises	2014-10-22 16:11:51 +11:00
Rob Harrington	ecaa2e6a51	Pull out override of 'visible' flag in enterprise serialiser	2014-10-22 15:53:25 +11:00
Rob Harrington	45ed3a4cff	Only pushes activated enterprises through to the frontend	2014-10-22 15:39:49 +11:00
Rafael Schouten	2b86647281	Merge branch 'master' into bugfix	2014-10-22 15:35:00 +11:00
Rafael Schouten	96ff387d1f	fix navigation check on submission	2014-10-22 15:34:31 +11:00
Rob Harrington	565d6739b3	Add 'activated' scope to enterprises	2014-10-22 15:13:52 +11:00
Rafael Schouten	a53cbb677d	fix report typos	2014-10-22 14:55:01 +11:00
Rafael Schouten	afa6119ec1	better coverage for enterprise abilities, hide products from non producers	2014-10-22 14:53:20 +11:00
Rafael Schouten	175e430a2b	uss oop for nav check	2014-10-22 14:51:17 +11:00
Rob Harrington	6798d394bb	Use unspecified rather than unconfirmed	2014-10-22 14:50:22 +11:00
Rob Harrington	7ff4306991	Adding 'unspecified' option to 'sells' on Enterprise	2014-10-22 13:13:21 +11:00
Rob Harrington	3d938b3450	Shifting dashboard rendering from partials to templates	2014-10-22 12:30:07 +11:00
Rob Harrington	8bf472e970	Split dashboard into single and multiple enterprise views	2014-10-22 12:21:25 +11:00
Rohan Mitchell	b75af8d9ff	Fix sells column coming out all 'none'	2014-10-22 10:49:23 +11:00
Rohan Mitchell	4308f7d09c	Revert "use sql for migration" ... This reverts commit fec8f08966.	2014-10-22 09:43:10 +11:00
Rafael Schouten	89ce4ba632	Merge branch 'master' into bugfix ... Conflicts: app/models/enterprise.rb	2014-10-21 08:51:23 +11:00
Rafael Schouten	fec8f08966	use sql for migration	2014-10-18 16:17:29 +11:00
Rafael Schouten	78b0e02ffe	Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork	2014-10-18 16:03:04 +11:00
Rafael Schouten	9e0f8100d9	only producers have product permissions	2014-10-18 08:28:08 +11:00
Rafael Schouten	08cd273be3	Merge branch 'migrate_ent_types' into bugfix ... Conflicts: app/models/spree/ability_decorator.rb	2014-10-18 07:37:41 +11:00
Rafael Schouten	2a7dd8b8f1	update ability specs for reports	2014-10-18 06:53:38 +11:00
Rafael Schouten	b71a40ae6d	show all permitted enterprises in order cycle summery	2014-10-18 03:26:57 +11:00
Rafael Schouten	87cc1d6217	create db/backup folder if it dosnt exist	2014-10-18 01:43:19 +11:00
Rafael Schouten	577cb06371	make navCallback actually versatile	2014-10-18 01:42:29 +11:00
Rob Harrington	361116a9ec	Explicitly set confirmed_at for unconfirmed enterprise	2014-10-17 18:31:35 +11:00
Rob Harrington	cae8d566df	Explicit confirmed_at to ensure that confirmation emails are sent	2014-10-17 17:49:18 +11:00
Rob Harrington	f499cc375b	Adding confirmed_at to enterprise factory	2014-10-17 17:32:27 +11:00
Rob Harrington	338ba74652	Only show enterprise partial when no enterprises exist	2014-10-17 17:15:49 +11:00
Rob Harrington	5b3ff9160d	Fix Registration spec	2014-10-17 17:15:16 +11:00
Rohan Mitchell	deedafde9a	WIP: Simple order cycle form loads and displays correct info	2014-10-17 16:55:55 +11:00
Rohan Mitchell	d8b648d531	Extract name and timing form from order cycles	2014-10-17 16:51:03 +11:00
Rohan Mitchell	078d2bac11	Extract factories from order cycles admin angular	2014-10-17 16:50:16 +11:00
Rob Harrington	e24a774d54	Adding schema	2014-10-17 16:16:17 +11:00
Rob Harrington	4d078feea2	Add default scope to devise to stop it from checking other devise enabled models (in this case :enterprise)	2014-10-17 16:12:51 +11:00
Rohan Mitchell	f060da9c8d	Rename angular app order_cycle -> admin.order_cycles	2014-10-17 14:13:27 +11:00
Rob Harrington	b2565991e6	Merge branch 'master' into reg_and_ent_types	2014-10-17 12:33:21 +11:00
Rob Harrington	eda0b16a5f	Make state abbreviations upper case	2014-10-17 12:29:51 +11:00
Rob Harrington	e9a3f8ce91	Require user to choose producer or not	2014-10-17 12:29:51 +11:00
Rob Harrington	a6bc9e66f6	Only send one enterprise creation confirmation email	2014-10-17 12:29:51 +11:00
summerscope	b671543a95	Style and make pretty the finished step of profile creation	2014-10-17 12:25:04 +11:00
summerscope	4abc59f66d	Change styling on the enterprise name because we dont know what type it is yet	2014-10-17 12:02:21 +11:00
summerscope	4aa2aa5aee	Tweaking layout, text, styling for registration box	2014-10-17 11:56:25 +11:00
summerscope	2c5208ce6b	Change ent type page, simplify!	2014-10-17 11:17:53 +11:00
Rob Harrington	81715aaf5d	Remove unrequired store registration action	2014-10-17 11:01:39 +11:00