484 Commits

Author	SHA1	Message	Date
Maikel Linke	159b33e2db	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit	2015-05-29 16:52:18 +10:00
Maikel Linke	0d3cdb9c69	Expand All button to show all variants in BPE	2015-05-29 16:51:55 +10:00
Rohan Mitchell	952353da8c	Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit ... Conflicts: spec/features/admin/bulk_product_update_spec.rb	2015-05-29 15:08:30 +10:00
Maikel Linke	5a43ed2046	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit	2015-05-22 18:17:20 +10:00
Rob Harrington	e931f4b31f	Merge branch 'master' into require_standard_variant	2015-05-22 12:22:54 +10:00
Maikel Linke	e6b6303f5e	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit	2015-05-21 18:03:11 +10:00
Rob Harrington	903ed7e507	Merge branch 'master' into variable_weights ... Conflicts: app/assets/javascripts/admin/bulk_order_management.js.coffee app/views/spree/admin/orders/bulk_management.html.haml app/views/spree/api/line_items/bulk_show.v1.rabl spec/features/admin/bulk_order_management_spec.rb	2015-05-21 17:31:33 +10:00
Maikel Linke	2ed519ef50	on_demand checkbox for variants	2015-05-21 12:37:10 +10:00
Maikel Linke	1936767084	BPE: new col for tax category	2015-05-21 11:06:08 +10:00
Maikel Linke	6953f61939	bulk product edit: new col "on demand"	2015-05-20 15:07:22 +10:00
Rob Harrington	0ad2978926	Removing old managed route from api orders controller and switching BOM over to use new controller action	2015-05-20 11:48:48 +10:00
Maikel Linke	0c46f963ce	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit	2015-05-20 10:19:03 +10:00
Lynne Davis	3179887842	Do not allow line_item.unit_value to be updated if the variant.unit_value is zero	2015-05-09 19:12:24 +01:00
Lynne Davis	54da7ae241	Adding additional logic for if the line_item unit_value is nil	2015-05-09 19:10:55 +01:00
Lynne Davis	2a991ad130	Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.	2015-05-09 19:10:55 +01:00
Rob Harrington	ed9bbe2c45	Sorting Hub and Producer filter selectors by name	2015-05-07 12:50:55 +10:00
Rob Harrington	b5c7607d67	Order cycle filter resets date filters on BOM	2015-05-07 12:50:55 +10:00
Rob Harrington	e640376d63	Don't load cancelled orders into bulk order management	2015-05-07 12:50:54 +10:00
Rob Harrington	9ab16d8cec	Allowing calls to Api::OrderCyclesController#accessible to specify :as => 'distributor' or 'producer'	2015-05-07 12:50:54 +10:00
Rob Harrington	89b153dc2c	Update AJAX request to use sells instead of deprecated is_distributor attribute	2015-05-07 12:50:54 +10:00
Maikel Linke	295da25dd2	insert clone after cloned product	2015-04-30 17:17:28 +10:00
Rob Harrington	992fb2347d	Merging master branch into require_standard_variant	2015-04-29 14:30:49 +10:00
Rob Harrington	ed7b763ecf	UnitsCtrl can interpret unit_value_with_description without a separating space	2015-04-24 12:15:35 +10:00
Rob Harrington	05c350b5ff	Refactoring unitsCtrl	2015-04-24 11:27:47 +10:00
Rob Harrington	0251d8962d	Adding sku to BPE	2015-04-22 21:02:07 +10:00
Rob Harrington	f610a709e1	Adding inherits_properties to BPE	2015-04-22 21:02:06 +10:00
Rob Harrington	4b182f9248	Can't delete final variant on a product from BPE	2015-04-17 11:25:18 +10:00
Rohan Mitchell	aef3fdf4b4	Merge branch 'group-pages'	2015-04-16 16:53:49 +10:00
Maikel Linke	548e3576b9	textAngular editor for group description	2015-04-15 17:13:10 +10:00
Rob Harrington	81a745420e	Only check editable status of variants when actually selecting	2015-04-09 15:24:45 +10:00
Rob Harrington	69004ac477	Select all box only selects variants I have permission to edit	2015-04-09 13:29:25 +10:00
Rob Harrington	ae1681b790	Not 1! Zero!	2015-04-06 23:29:15 +10:00
Rob Harrington	36c5cdf556	Only show enterprises with fees in order cycle edit page	2015-04-06 14:08:10 +10:00
Rob Harrington	d516795774	Fetching Enterprise Fees for order cycle, using new enterprisefee serializer	2015-04-06 13:06:21 +10:00
Rob Harrington	a4b80b1f33	Implement editable scope for variants on order cycles page	2015-04-06 09:15:14 +10:00
Rob Harrington	009b25a491	Adding an editable variants scope for incoming exchanges	2015-04-05 13:59:00 +10:00
Rob Harrington	3aa5f6e023	Adding properties tab to admin enterprise edit form	2015-04-02 11:30:32 +11:00
Rob Harrington	3817ef202c	Enterprises in simple OC create controller only load after OC initialises	2015-03-27 16:16:12 +11:00
Rob Harrington	aa170ef5f6	Order cycle simple create controller uses 'new' method on OC service to initialise	2015-03-27 16:16:12 +11:00
Rob Harrington	4d14acb64d	Don't send non-attributes of js order_cycle object to server	2015-03-27 16:16:12 +11:00
Rob Harrington	43d2eb4d22	Adding 'new' method to admin order cycle service, for loading data from serializer for new OCs	2015-03-27 16:16:12 +11:00
Rob Harrington	9430999540	Filtering exchange variants, for outgoing exchange variant count	2015-03-27 16:16:12 +11:00
Rob Harrington	5e015f0611	Rename visibleVariants filter to visibleProductVariants	2015-03-27 16:16:11 +11:00
Rob Harrington	681dada5df	Simple OC form loads coordinator into JS	2015-03-27 16:16:11 +11:00
Rob Harrington	99bd6244ed	Filtering the list of variants visible within each exchange based on permissions	2015-03-27 16:16:11 +11:00
Rob Harrington	45f6042d3d	Enterprises etched by for_order_cycle action now use permissions scoped using an order cycle or coordinator	2015-03-27 16:16:10 +11:00
Rob Harrington	8de6f983a2	User must set the coordinator first when creating an order cycle	2015-02-27 17:24:36 +11:00
Maikel Linke	1f7aec0c1d	group owner select box in own tab	2015-02-26 13:09:46 +11:00
Maikel Linke	346a4e71d0	side menu partial does not require showItem defined	2015-02-19 10:17:58 +11:00
Maikel Linke	9496987da6	Fix display of admin group side menu	2015-02-18 12:04:17 +11:00