Commit Graph

19 Commits

Author SHA1 Message Date
Will Marshall
406f8033fe Partialising the _distributor render 2013-11-06 15:36:39 +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
eb997c94a2 Mark inactive distributors on supplier distributors list 2013-10-31 14:59:47 +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
a136161dd6 When showing enterprise, do not show enterprise name when we're in this enterprise - fix duplicate name in header 2013-09-10 12:57:35 +10:00
alexs333
999bc2697a Implemented simlified shop flow. 2013-09-04 20:33:18 +10:00
alexs
cfffced652 Fixed the bug in the enterprise geo search. 2013-08-15 16:33:41 +10:00
alexs
0705c7af36 Added vertical separators for search results. 2013-08-15 11:37:50 +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
779befe3cf Links to the enterpise pages. 2013-08-13 11:40:35 +10:00
alexs
f2f507c5c7 Suburb auto-complete functionality for the new landing page. 2013-08-12 17:34:56 +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
David Cook
7121860416 new view to display all distributors 2013-06-21 10:53:24 +10:00
Rohan Mitchell
63768df3d7 Replace distributor info box on product details and checkout pages with rich text field 2013-04-26 13:30:21 +10: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