100 Commits

Author	SHA1	Message	Date
Will Marshall	c9c1b4709b	Basic but hacky way to get events out of map	2014-06-06 14:04:46 +10:00
Will Marshall	82ab14a33e	Starting on on the map	2014-06-06 14:04:45 +10:00
Will Marshall	e44853346e	Dropping current producers, switching to suppliers and using Angular	2014-05-29 16:12:58 +10:00
Rohan Mitchell	9b15c213d1	When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges	2014-05-23 11:28:00 +10:00
Will Marshall	272cb0469f	Setting up after_login redirects	2014-05-22 12:40:46 +10:00
Will Marshall	4e463e7087	Showing admin for enterprise or admin user	2014-05-20 15:16:52 +10:00
Will Marshall	eab9c28d2e	Adding groups to this branch, also tidying up the shop stuff for Laura	2014-05-16 14:00:33 +10:00
Will Marshall	5f712a8984	Removing code	2014-05-14 15:16:29 +10:00
Will Marshall	b907616749	Renaming our partials	2014-05-02 14:47:12 +10:00
Will Marshall	f3e30d10ba	Starting some bones for Laura	2014-04-18 16:10:19 +10:00
Will Marshall	a5a3f9fe43	Fixing up some minor spec bugs	2014-04-17 17:22:30 +10:00
Will Marshall	d83367486b	Adding icons to checkout, focusing on first input in each panel when selected	2014-04-16 16:07:19 +10:00
Will Marshall	00f5d09d65	Moving our inputs to magical helpers	2014-04-10 14:48:22 +10:00
Will Marshall	e203d811b9	Adding some links to account sidebar	2014-04-01 12:31:02 +11:00
Will Marshall	bda1ef5513	Adding a cart icon with count	2014-03-28 17:09:16 +11:00
Will Marshall	6f50c45bba	Adding the last checkout distributor to the account link	2014-03-28 16:02:32 +11:00
Rohan Mitchell	93db813b3a	Make current_producers helper more resilient	2014-03-27 10:25:05 +11:00
Rohan Mitchell	20745825bf	Fix finding producers for shopfront, moving to SQL-land in the process. Woo.	2014-03-26 12:56:58 +11:00
Will Marshall	74fb266748	Adding some requirement filters to the Orders controller	2014-03-21 15:18:27 +11:00
Will Marshall	dc8418cb4c	Removing the taxonomy spec, with a comment about some possibly redundant spree overrides	2014-03-19 14:29:46 +11:00
Will Marshall	0cc108206b	Reworking the top details so it works in all pages	2014-03-14 17:06:03 +11:00
Rohan Mitchell	f7d8d866eb	Show two linebreaks for end of block level tags, strip whitespace from end of string	2014-03-12 13:52:13 +11:00
Rohan Mitchell	011668c0b6	Display line breaks in order confirmation email distributor info	2014-03-12 13:34:34 +11:00
Will Marshall	3db601f362	Merge branch 'master' into checkout	2014-02-27 16:29:21 +11:00
Rohan Mitchell	3196e28d88	Admin can assign units to a product	2014-02-27 11:29:39 +11:00
Will Marshall	a0abd9c95a	Merge branch 'master' into checkout	2014-02-26 15:52:37 +11:00
Will Marshall	b6b5c2889e	Reworking checkout to use f_form_for, show validation, better controller layout	2014-02-21 14:31:03 +11:00
Rohan Mitchell	3f9f24157c	Do not show unit value or description when product does not have a unit-related option type	2014-02-19 12:07:53 +11:00
Rohan Mitchell	7b80518621	On admin variant edit page, do not show option values for unit-related option types	2014-02-19 11:29:26 +11:00
Will Marshall	cec0ad8a83	Adding ze boilerplate	2014-02-07 13:55:25 +11:00
Will Marshall	c4c5f3a8c7	Merging from master	2013-12-17 14:18:21 +11:00
Rohan Mitchell	124b6df75d	Show undated order cycles on index page	2013-12-13 14:51:43 +11:00
Will Marshall	ec72e9137a	We can now hit the index page	2013-12-05 15:07:46 +11:00
Will Marshall	4543e08872	Renaming everything to Shop	2013-12-05 13:40:05 +11:00
Will Marshall	f525b7aea1	Adding the distributors controller	2013-12-04 15:58:25 +11:00
Rohan Mitchell	94c33e5f45	Colour order cycle rows based on their status	2013-11-22 11:31:04 +11:00
Will Marshall	317b2f1ced	Helperizing some of the order cycles stuff	2013-11-08 15:19:27 +11:00
Will Marshall	f0d335a454	Fixing up the failing spec for distributor changes, reworking a method to SharedHelper	2013-11-07 11:47:05 +11:00
Will Marshall	406f8033fe	Partialising the _distributor render	2013-11-06 15:36:39 +11:00
Will Marshall	b8fcfbd72b	Test and implementation: dropping inclusion of product_distributions from active Distributors on front page - BugHerd#125	2013-11-01 14:48:23 +11:00
Rohan Mitchell	32889715f0	Grey out hubs that have no products available for distribution and are not in an order cycle	2013-10-30 16:09:18 +11:00
Rohan Mitchell	57f7d489ff	Rename OpenFoodWeb namespace to OpenFoodNetwork	2013-10-18 17:29:55 +11:00
Rohan Mitchell	de8d7bd66e	Clean up payment methods form	2013-10-17 11:08:25 +11:00
Rohan Mitchell	30bc45370b	When order cycle expires mid-order, clear the order cycle and display a message	2013-09-30 16:56:11 +10:00
Rohan Mitchell	19349c805f	Destroy supplied products when a supplier is destroyed	2013-09-23 14:58:26 +10:00
Rohan Mitchell	803594b4d7	Confirm change hub when it would empty cart	2013-09-23 10:07:25 +10:00
Rohan Mitchell	a929312979	Add scope: OrderCycle.with_distributor	2013-09-17 09:54:21 +10:00
Rohan Mitchell	64a3a309f5	Change 'pick-up date' to 'available on', provide absolute dates in options	2013-09-10 09:16:23 +10:00
Rohan Mitchell	7b5eca3a50	Fix error when generating checkout email when distributor_info is nil	2013-08-20 09:19:23 +10:00
Rohan Mitchell	0458f7a6bb	Summarise distribution fees in checkout after cart page	2013-08-19 17:02:02 +10:00