Commit Graph

29 Commits

Author SHA1 Message Date
Will Marshall
9c655a855e Redirecting to the shop page when a distributor is selected 2014-03-13 11:47:55 +11:00
Will Marshall
71a5d84a1d Filtering the products to the current order cycle 2013-12-11 15:06:07 +11:00
Will Marshall
f525b7aea1 Adding the distributors controller 2013-12-04 15:58:25 +11:00
Rohan Mitchell
7a8bd16083 On enterprise page, do not display products outside of the outgoing exchange 2013-11-15 15:08:45 +11:00
Rohan Mitchell
094485bc2d Sort enterprises by name, display direct-from-the-farm links separately at top 2013-10-31 15:52:22 +11:00
Rohan Mitchell
758676c1ea When visiting supplier page without selecting a distributor, provide choice of distributors that distribute their products 2013-10-31 14:49:26 +11:00
Rohan Mitchell
741a81a427 Fix spec fails - do not redirect on Products#show when distributor not set 2013-09-23 14:00:33 +10:00
Rohan Mitchell
072ce67b78 Redirect if distributor not chosen 2013-09-23 13:39:13 +10:00
Rohan Mitchell
8a849b8e47 When selecting hub, auto-select order cycle if there is only one option available 2013-09-17 10:20:14 +10:00
Rohan Mitchell
d43df754d3 Load correct products on enterprise and product listing pages 2013-09-10 10:36:13 +10:00
alexs333
999bc2697a Implemented simlified shop flow. 2013-09-04 20:33:18 +10:00
Andrew Spinks
a8d4efd067 Add new 'shop' route that switches to the selected distributor and empties the cart if it has any line_items for a different distributor. 2013-08-16 17:08:19 +10:00
alexs
4e715f62a2 Moved limit into the model. 2013-08-16 09:53:40 +10:00
alexs
cfffced652 Fixed the bug in the enterprise geo search. 2013-08-15 16:33:41 +10:00
alexs
bdc8387346 Added base for shop front (enterprise). 2013-08-14 17:31:25 +10:00
alexs
6b760f3068 Added feedback info for search criteria. 2013-08-14 10:37:25 +10:00
alexs
f2f507c5c7 Suburb auto-complete functionality for the new landing page. 2013-08-12 17:34:56 +10:00
alexs
71262d3cb3 Base for enterprise search via suburb selector.. 2013-08-11 16:57:00 +10:00
alexs
b5cc2ab4cf Added postcode search that redirect to page with map view. 2013-08-09 13:20:22 +10:00
alexs
f45ed42bdb Skeleton for the search results. 2013-08-08 11:42:45 +10:00
Rohan Mitchell
7640eb497a Merge branch 'supplied-active-products-on-hand'
Conflicts:
	app/controllers/application_controller.rb
	app/models/enterprise.rb
	app/views/spree/products/_source_sidebar.html.haml
	spec/features/consumer/distributors_spec.rb
	spec/models/enterprises_spec.rb
2013-07-29 11:05:42 +10:00
Rob H
45309d6a75 WIP (Spree Update): Remove unrequired reference to AnalyticsHelper 2013-07-23 10:43:08 +10:00
David Cook
d95903a82d add html output format for all distributors 2013-06-21 10:44:16 +10:00
Rob H
a3746c6c59 Add analytics helper to Enterprises Controller 2013-02-14 12:10:31 +11:00
Rob H
612017f143 WIP Upgrade to Spree 1.3 2013-02-05 15:01:45 +11:00
Rob H
ef22168349 Move select_distributor and deselect_distributor actions from enterprises controller to orders controller 2012-11-28 10:54:11 +11:00
Rohan Mitchell
c2133d70ac Rename Enterprise is_supplier scope to is_primary_producer 2012-11-01 15:02:57 +11:00
Rohan Mitchell
6d84cf7613 Merge branch 'master' into enterprises
Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb
2012-11-01 11:02:02 +11:00
Rohan Mitchell
9d5c127f0d Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes. 2012-10-31 16:47:01 +11:00