230 Commits

Author	SHA1	Message	Date
Rohan Mitchell	610a4c03fe	Merge branch 'master' into redesign ... Conflicts: app/controllers/home_controller.rb app/views/producers/index.html.haml app/views/shared/menu/_mobile_menu.html.haml app/views/shop/products/_form.html.haml config/routes.rb spec/controllers/shops_controller_spec.rb	2015-06-10 18:27:50 +10:00
Rob Harrington	439d122e93	Merge branch 'master' into customers ... Conflicts: app/assets/javascripts/admin/bulk_order_management.js.coffee app/assets/javascripts/admin/bulk_product_update.js.coffee app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee app/views/spree/admin/orders/bulk_management.html.haml db/schema.rb spec/javascripts/unit/bulk_order_management_spec.js.coffee	2015-06-03 15:19:40 +08:00
Rohan Mitchell	22230294ab	Merge branch 'master' into optimise-shopfront	2015-06-03 10:07:42 +10:00
Rohan Mitchell	fee854a3f8	Merge branch 'master' into redesign	2015-05-29 17:37:18 +10:00
Rohan Mitchell	31b726613d	Avoid loading enterprise injection data when it's not be needed due to caching	2015-05-27 15:44:01 +10:00
Rohan Mitchell	1a887df412	Pull taxon computation out of the serialization loop	2015-05-27 15:44:01 +10:00
Rohan Mitchell	3afd636577	Pull relatives computation out of the serialization loop	2015-05-27 15:44:01 +10:00
Rohan Mitchell	4a59c85b3e	Inject current hub from AMS rather than RABL	2015-05-27 15:44:01 +10:00
Rohan Mitchell	704955a185	Load active distributors where they're needed rather than in most controllers	2015-05-27 15:44:01 +10:00
Rohan Mitchell	ee8db23fd9	Pull shipping method service computations out of the serialization loop	2015-05-27 15:44:01 +10:00
Rohan Mitchell	f940984ca3	Pull earliest closing time computations out of the serialization loop	2015-05-27 15:44:01 +10:00
Maikel Linke	1936767084	BPE: new col for tax category	2015-05-21 11:06:08 +10:00
Rob Harrington	7a4f0e214c	Adding customers index view	2015-05-13 12:44:33 +10:00
Rohan Mitchell	f024f62970	Content-manage footer fields	2015-05-06 16:36:10 +10:00
Rob Harrington	5d6f265c0a	Moving spree namespaced serializers into admin	2015-04-22 21:02:06 +10:00
Rohan Mitchell	0d9ba4257d	Merge branch 'properties'	2015-04-17 15:25:51 +10:00
Rohan Mitchell	e75c6a8e1d	Add helper to display total tax on an order	2015-04-17 13:39:09 +10:00
Rob Harrington	f13b52411d	Merge branch master into properties	2015-04-17 13:23:33 +10:00
Rob Harrington	e3138c3cd2	Renaming order_cycle_enterprises_for as visible_enterprises	2015-04-11 22:25:23 +10:00
Rob Harrington	26d55baa35	Moving order cycle permissions to their own permissions class	2015-04-11 21:11:10 +10:00
Rob Harrington	133f7e4ec7	Add viewing_as_coodinator_of? helper method	2015-04-09 11:10:56 +10:00
Rob Harrington	104a8ddecf	Refactor order_cycle_enterpises_for permission method, now requires an order cycle	2015-04-08 13:00:17 +10:00
Rob Harrington	d115ef5f7e	Scoping old generalised order cycle helper methods to a specific order cycle	2015-03-27 16:16:10 +11:00
Rob Harrington	0b082c964b	Restricting which enterprises can coordinate an order cycle	2015-03-27 15:51:27 +11:00
Victor Nava	f90f7565fb	Allow admins to delete Order Cycles	2015-03-11 18:08:09 +11:00
Rob Harrington	06f10398da	Adding product property filter to shop page	2015-03-06 11:22:52 +11:00
Rob Harrington	c91699a11e	Using @order_cycle.coordinator instead of @coordinator	2015-02-27 17:24:37 +11:00
Rob Harrington	8d6c8791bb	Only hubs (sells any) are available for selection as outgoing enterprises	2015-02-27 17:24:36 +11:00
Rob Harrington	31054c7bf4	Split order_cycle_simple_view logic into index and form scopings	2015-02-27 17:24:36 +11:00
Rob Harrington	8de6f983a2	User must set the coordinator first when creating an order cycle	2015-02-27 17:24:36 +11:00
Rob Harrington	53594b3a0f	Cannot add unconfirmed enterprises to order cycles	2015-02-27 17:24:36 +11:00
Maikel Linke	718a5911a3	code style and cleanup	2015-02-19 10:48:39 +11:00
Maikel Linke	903bd21577	Merge remote-tracking branch 'origin/master' into group-pages-merge ... Conflicts: README.markdown db/schema.rb	2015-02-13 15:42:36 +11:00
Maikel Linke	edcef02017	link_to_service helper deals with nil	2015-02-07 19:40:59 +11:00
Maikel Linke	211e9c33a7	Fixing link to group website	2015-02-07 19:31:16 +11:00
Maikel Linke	30601b9203	tidy up group contact with helpers	2015-02-05 20:20:28 +11:00
Maikel Linke	504a053693	link_to_ext helper for group pages	2015-02-05 17:21:41 +11:00
Rohan Mitchell	ed4d78bca8	Decorators can't be in same file name as original file, otherwise the original file is ignored	2015-01-30 11:23:49 +11:00
Rohan Mitchell	7a5c56cbca	Do not show out of stock lines on order confirmation page	2015-01-29 13:19:04 +11:00
Rohan Mitchell	dcc04ea538	On enterprise edit page, do not show side menu links we don't have permission to	2015-01-15 13:43:39 +11:00
Rohan Mitchell	51b0d7e0eb	Move private method to helper	2015-01-08 10:48:02 +11:00
Rohan Mitchell	85882a73ff	Merge branch 'lin-d-hop-266reportsbranch'	2014-12-19 16:51:38 +11:00
Rob Harrington	f145a7ed65	Moving taxons into its own module, adding preferred shopfront taxon order to enterprise	2014-12-19 14:04:02 +11:00
Rob Harrington	b18163bfaf	Remove separate long description injection, use full enterprise serializer instead	2014-12-19 14:04:01 +11:00
Rob Harrington	d5df73c6a2	Duplicate create basic version of enterprise serializer for lists, make shopfront_message input use textangular	2014-12-19 14:04:01 +11:00
Rohan Mitchell	e9f04c3c15	Clean up whitespace	2014-12-19 10:01:21 +11:00
Rohan Mitchell	343af1f1e0	Rename report_shipping_options to report_shipping_method_options for symmetry with report_payment_method_options	2014-12-19 09:51:07 +11:00
Rohan Mitchell	4a30f27b3d	Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch ... Conflicts: app/controllers/spree/admin/reports_controller_decorator.rb spec/models/spree/order_spec.rb	2014-12-19 09:38:02 +11:00
Lynne Davis	eeae72352b	Renamed methods and vars to better fit naming conventions	2014-12-12 10:11:33 +00:00
Rohan Mitchell	efae9265c1	Inject variant overrides	2014-12-12 13:33:12 +11:00