4060 Commits

Author	SHA1	Message	Date
Maikel Linke	e4f93863fd	Finding unique permalink before validation.	2015-05-28 11:27:40 +10:00
Maikel Linke	aef128f2c9	permalink editable	2015-05-28 11:27:40 +10:00
Maikel Linke	19448a182e	Add permalink field to enterprise groups	2015-05-28 11:27:39 +10:00
Continuous Integration	5377af9cf9	Auto-merge from CI [skip ci]	2015-05-24 09:52:53 +10:00
Rick Giner	a5482c269f	#541 Fixed issue of showing negative 'more' numbers, and only working for current Hub	2015-05-24 09:52:34 +10:00
Rob Harrington	cd44d43b3e	Adding price to line_item serializer (oops, forgot to include when merging in master)	2015-05-21 17:48:35 +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
Rob Harrington	1aca4657d9	Oops, switch managed_products to editable_products for Api::ProductsController	2015-05-20 20:59:06 +10:00
Rob Harrington	05131de1ad	Use full_name on BOM instead of options_text	2015-05-20 14:11:31 +10:00
Rob Harrington	8d73b2f532	involving... order cycle scopes return distinct OCs	2015-05-20 13:47:01 +10:00
Rob Harrington	c56efabfbe	Removing obsolete rabl templates	2015-05-20 11:52:49 +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
Rob Harrington	fc55a000b8	Adding managed controller action which uses new order serializer to render json	2015-05-20 11:48:13 +10:00
Rob Harrington	823adf3272	Translating existing order-related rabl templates accross to AMS	2015-05-20 11:45:48 +10:00
Rob Harrington	312a6299a8	Making where clause unambiguous	2015-05-15 21:19:16 +10:00
Rohan Mitchell	924492ec5b	Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2	2015-05-15 10:37:34 +10:00
Continuous Integration	e3723da65a	Auto-merge from CI [skip ci]	2015-05-14 14:32:07 +10:00
Rohan Mitchell	b4755c37dc	Merge branch 'analytics' into combined/fix-delayed-job-loop-and-analytics	2015-05-14 11:03:27 +10:00
Rohan Mitchell	b86872095a	Add google analytics	2015-05-13 14:52:17 +10:00
Rohan Mitchell	3520127c41	Fix infinite job loop	2015-05-13 11:06:42 +10:00
Rick Giner	62ae38372e	#541 add "show more" link to producers lists in hub on home page	2015-05-11 20:31:24 +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	521834bd76	Populate the line item unit value, when line_item created and update old data in migration	2015-05-09 19:10:55 +01:00
Lynne Davis	662c7fe368	Removing notes to myself from this file	2015-05-09 19:10:55 +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
Lynne Davis	f7ade48e86	Update DB schema to store updatable weight on items sold	2015-05-09 19:10:55 +01:00
Continuous Integration	3d0880857a	Auto-merge from CI [skip ci]	2015-05-08 16:24:39 +10:00
Rob Harrington	f88fdac710	Adding module - doh!	2015-05-07 12:50:56 +10:00
Rob Harrington	a7019e7e78	Adding permissions method for order report enterprises	2015-05-07 12:50:56 +10:00
Rob Harrington	bd66091d75	Push logic for checking of user super admin status down into private method	2015-05-07 12:50:56 +10:00
Rob Harrington	7ffe0f042e	Moving accessible_by scope on Enterprise to permissions	2015-05-07 12:50:55 +10:00
Rob Harrington	f79fba52be	Hiding personal details of customers, where the user does not manage the distributor of the order or the coordinator of the order cycle	2015-05-07 12:50:55 +10:00
Rob Harrington	4259b466f5	Using new order and line item permissions to fetch items to display in Orders and Fullfillment reports	2015-05-07 12:50:55 +10:00
Rob Harrington	28bf7037db	Updating methods for retrieving allowed producers, distributors and order cycles for order and fulfillment reports	2015-05-07 12:50:55 +10: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	d8c23d37ac	Update accessible_by scope on enterprise, to read from permissions	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
Rohan Mitchell	d9404d3332	Merge branch 'master' into single-order-patches	2015-05-06 17:29:23 +10:00
Rohan Mitchell	e43d726b97	Merge branch 'master' into payments-report-fix	2015-05-06 14:55:10 +10:00
Rob Harrington	8788322492	Alllowing payments in payment reports to access soft-deleted payment methods	2015-05-06 11:10:50 +10:00
Rick Giner	368402f115	Changed selectors' ng-repeat. Using existing variable instead of method call	2015-05-03 15:24:16 +10:00
Rick Giner	9e70c80d1d	bind-once in product modal	2015-05-03 14:48:27 +10:00
Rick Giner	8fb11defdb	bind-once in groups home page	2015-05-03 14:41:34 +10:00
Rick Giner	9c26b3ebb2	bind-once in partials	2015-05-03 14:34:42 +10:00
Rick Giner	3fc616cdff	bind-once on hubs	2015-05-03 14:11:09 +10:00
Rick Giner	16e9f0545b	bind-once in products	2015-05-03 14:02:33 +10:00