15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lynne Davis	4d025ee7a9	Updating the spec based on @Robs suggestions, hoping for his insights. Still doesn't work.	2015-05-09 19:10:55 +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	2f463474fb	Adding specs for variable weight adjustment via builk order management	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
Paul Mackay	fd37324359	#536: Add permissions checking for Notify producers action.	2015-05-09 11:02:25 +01:00
Continuous Integration	3d0880857a	Auto-merge from CI [skip ci]	2015-05-08 16:24:39 +10:00
Rohan Mitchell	8cb8aacefe	Switch logo for white menu	2015-05-08 16:07:59 +10:00
Rohan Mitchell	6fc9789477	Invert colours on top menu	2015-05-08 15:11:54 +10:00
Rohan Mitchell	6322fdc1f0	Disable top alert	2015-05-08 15:03:37 +10:00
Continuous Integration	df14c10608	Auto-merge from CI [skip ci]	2015-05-08 13:45:56 +10:00
Rohan Mitchell	1531c476e3	Merge branch 'master' into require_standard_variant ... Conflicts: spec/controllers/spree/admin/variants_controller_spec.rb	2015-05-08 13:45:31 +10:00
Rohan Mitchell	e8c8d8885c	Merge branch 'master' into single-order-patches	2015-05-08 12:42:56 +10:00
Rohan Mitchell	768c9f24a2	Make topbar height configurable	2015-05-08 11:22:55 +10:00
Rohan Mitchell	a450d3af81	Variables can now be used to override foundation vars	2015-05-08 11:15:27 +10:00
Rohan Mitchell	f6c1be97a8	WIP: Fix apostrophes, add TODO	2015-05-07 15:03:27 +10:00
Rohan Mitchell	6fb3fa55a1	Allow extended time for all parts of this spec to fix intermittent fails	2015-05-07 14:23:58 +10:00
Rob Harrington	f3f0766279	Adding a distributor to order cycle to fix broken feature spec	2015-05-07 12:50:57 +10:00
Rob Harrington	0d5ce5ff57	Fixing issues with reports controller spec	2015-05-07 12:50:57 +10:00
Rob Harrington	68b4cb59be	Fixing bulk management specs broken by making order_cycles filter update dates	2015-05-07 12:50:57 +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	d8f5669fbb	Renaming granted > related_enterprises_granted	2015-05-07 12:50:56 +10:00
Rob Harrington	5806f50a84	Renaming granting > related_enterprises_granting	2015-05-07 12:50:56 +10:00
Rob Harrington	5cd528a87d	Removing obsolete related_enterprises_with permission method	2015-05-07 12:50:56 +10:00
Rob Harrington	f0f7e0ee2f	Making permissions method managed_and_related_enterprise_with method more specific	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	0a03483e36	Adding permissions methods for visible and editable orders and line_items	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	bd6bac8874	Display deployment output in real time ... This reverts commit 485eee4bdd.	2015-05-06 20:02:22 +10:00
Rohan Mitchell	50d2ddc05f	Add progress comments	2015-05-06 20:00:50 +10:00
Rohan Mitchell	10b7a86745	Add debugging to merge script	2015-05-06 19:50:06 +10:00
Rohan Mitchell	6d33dc5070	Add script to merge master into the current branch if required before running specs	2015-05-06 19:41:36 +10:00
Rohan Mitchell	d109e898d2	Preserve newlines when displaying deploy script output	2015-05-06 19:38:20 +10:00
Rohan Mitchell	3dee29cd12	Remove build badge - master branch is always green	2015-05-06 19:37:21 +10:00
Rohan Mitchell	0921cd2dfa	Merge branch 'master' into single-order-patches	2015-05-06 18:13:55 +10:00
Rohan Mitchell	7b4130972b	Fix first feature spec sometimes timing out	2015-05-06 18:12:17 +10:00
Rohan Mitchell	485eee4bdd	Deploy scripts display their output	2015-05-06 18:07:50 +10:00
Rohan Mitchell	f84e704d99	Retry simple push-to-master script	2015-05-06 17:59:36 +10:00