1903 Commits

Author	SHA1	Message	Date
Rob Harrington	d2e8b23dd4	Creating association between enterprise and customers	2015-05-13 12:44:37 +10:00
Rob Harrington	5b3c9842e4	Adding acts_as_taggable to customer model	2015-05-13 12:44:36 +10:00
Rob Harrington	2afd501af3	Wiring up update action for customers controller	2015-05-13 12:44:34 +10:00
Rob Harrington	37ff61d663	Adding basic routing to display customer index page	2015-05-13 12:44:32 +10:00
Rohan Mitchell	3520127c41	Fix infinite job loop	2015-05-13 11:06:42 +10:00
Rohan Mitchell	eac22df200	Merge branch 'master' into redesign ... Conflicts: app/assets/javascripts/templates/product_modal.html.haml	2015-05-13 09:53:20 +10:00
Paul Mackay	955f41633a	Merge remote-tracking branch 'refs/remotes/origin/master' into producer-emails	2015-05-11 08:36:09 +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	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
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
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
Rob Harrington	7ffe0f042e	Moving accessible_by scope on Enterprise to permissions	2015-05-07 12:50:55 +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
Rohan Mitchell	d9404d3332	Merge branch 'master' into single-order-patches	2015-05-06 17:29:23 +10:00
Rohan Mitchell	f024f62970	Content-manage footer fields	2015-05-06 16:36:10 +10:00
Rohan Mitchell	bf435a8f3d	Make home page what's happening text and about URL configurable	2015-05-06 15:17:28 +10:00
Rohan Mitchell	b5a6f9c1bc	Add infrastructure so admin can configure content. Make homepage tagline CTA configurable.	2015-05-06 14:54:16 +10:00
Maikel Linke	11acb3ba59	Allow to remove adjustments ... Managers of an order cycle and the distributor of an order are allowed to remove an adjustment from the order.	2015-05-01 15:59:46 +10:00
Rohan Mitchell	e91de69d5a	Merge branch 'master' into pin-refunds	2015-05-01 14:58:19 +10:00
Maikel Linke	e6e063670c	Allow managers to remove line items from order ... Managers of an order cycle and the distributor of an order are allowed to remove a line item from the order.	2015-05-01 14:49:34 +10:00
Maikel Linke	af78859db6	Merge remote-tracking branch 'origin/master' into single-order-patches	2015-04-30 17:18:02 +10:00
Rohan Mitchell	b498c28632	Payments can be refunded	2015-04-30 15:49:48 +10:00
Rohan Mitchell	8184a7c7b2	Pin payments can't void or credit, but they can refund	2015-04-30 15:49:48 +10:00
Rohan Mitchell	a207f50aeb	Merge branch 'master' into delay-devise-emails ... Conflicts: script/run_tests.sh	2015-04-30 12:29:06 +10:00
Rob Harrington	992fb2347d	Merging master branch into require_standard_variant	2015-04-29 14:30:49 +10:00
Maikel Linke	f6d87eee87	Merge remote-tracking branch 'origin/master' into single-order-patches	2015-04-29 13:20:44 +10:00
Maikel Linke	1268108877	handle ship event on order	2015-04-29 12:03:11 +10:00
Maikel Linke	2b0f867ed8	new order method ready_to_ship?	2015-04-29 11:42:35 +10:00
Lynne Davis	6bbd3f7c13	Added auth for order_cycle_management_report. This report was breaking supplier enterprises reports due to incorrect authorization.	2015-04-26 11:02:06 +01:00
Rob Harrington	7b83438b5e	Pulling property values into the shopfront	2015-04-23 13:51:49 +10:00
Maikel Linke	f1a8011e13	Documentation of Variant.full_name ... The code was confusing for all developers here. Maybe a bit of doco helps.	2015-04-23 10:02:32 +10:00
Rob Harrington	0251d8962d	Adding sku to BPE	2015-04-22 21:02:07 +10:00
Rob Harrington	e546388784	Rename properties_h to properties_including_inherited	2015-04-22 21:02:07 +10:00
Rob Harrington	976c24cf4c	properties_h uses inherit_properties flag, and returns property id rather than presentation	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	a4a41ae26a	Refactor properties_h	2015-04-22 21:02:06 +10:00
Rohan Mitchell	700cb73b8f	Send enterprise confirmation emails asynchronously	2015-04-21 16:19:02 +10:00
Rohan Mitchell	9d225142c8	Send password reset instructions asynchronously	2015-04-21 16:10:40 +10:00
Rob Harrington	a75a76840d	Merging master into require_standard_variant	2015-04-17 21:18:24 +10:00
Rob Harrington	ff2e6d9ca4	Test deletion rather than destruction on variant model spec	2015-04-17 17:25:13 +10:00
Rohan Mitchell	0d9ba4257d	Merge branch 'properties'	2015-04-17 15:25:51 +10:00
Rob Harrington	c43eb9ef72	Merge branch 'email_user' into properties	2015-04-17 15:17:37 +10:00
Rohan Mitchell	81324f3cc4	Do not charge tax on shipments when distributor does not charge sales tax	2015-04-17 13:41:38 +10:00
Rohan Mitchell	0b8a619274	When the order does not have a hub, all tax rates apply	2015-04-17 13:41:38 +10:00
Rohan Mitchell	3e8801b12b	Do not charge sales tax on items or on enterprise fees when the distributor of the order does not charge sales tax	2015-04-17 13:41:38 +10:00
Rohan Mitchell	9bbc151cae	Admin can set enterprises to charge or not charge sales tax	2015-04-17 13:41:38 +10:00
Rob Harrington	b9f19d5777	Fixing broken specs	2015-04-17 13:00:20 +10:00