2668 Commits

Author	SHA1	Message	Date
Rob Harrington	37ff61d663	Adding basic routing to display customer index page	2015-05-13 12:44:32 +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	d8c23d37ac	Update accessible_by scope on enterprise, to read from permissions	2015-05-07 12:50:54 +10:00
Rohan Mitchell	63ec0d7dcf	Merge branch 'master' into folklabs-producer-emails	2015-05-05 11:48:31 +10:00
Rohan Mitchell	e91de69d5a	Merge branch 'master' into pin-refunds	2015-05-01 14:58:19 +10:00
Rohan Mitchell	91ca5f0213	Fix specs for receival_time / instructions	2015-05-01 10:08:24 +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	b09ae550c8	Add spec for payment actions	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	2b0f867ed8	new order method ready_to_ship?	2015-04-29 11:42:35 +10:00
Rob Harrington	c66a7e44b6	Updating product model specs to reflect changes to properties	2015-04-23 15:37:41 +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
Rohan Mitchell	700cb73b8f	Send enterprise confirmation emails asynchronously	2015-04-21 16:19:02 +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
Rob Harrington	72d553ef0c	Test actual deletion of variants	2015-04-17 16:51:02 +10:00
Rohan Mitchell	9e8483348f	Fix spec - enterprise needs to charge sales tax for tax to be charged	2015-04-17 13:41:38 +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
Rob Harrington	b9f19d5777	Fixing broken specs	2015-04-17 13:00:20 +10:00
Rob Harrington	9ee25c4e42	Making spec better	2015-04-17 11:25:18 +10:00
Rob Harrington	2d7fb3fd67	Updating name of spec	2015-04-17 11:25:18 +10:00
Rob Harrington	2b47c9145a	Cannot delete last variant of product	2015-04-17 11:25:17 +10:00
Rob Harrington	fcb3bc894b	Cleanup	2015-04-17 11:25:17 +10:00
Rob Harrington	a223a2d662	Cannot remove all variants from a product	2015-04-17 11:25:17 +10:00
Rob Harrington	5e2fe56c22	Cleanup	2015-04-17 11:25:17 +10:00
Rob Harrington	89afbc80a6	Set initial on_hand to 0	2015-04-17 11:25:17 +10:00
Rob Harrington	971723964e	Update outdated spec	2015-04-17 11:25:17 +10:00
Rob Harrington	28486f9e76	Only adds standard variant on create	2015-04-17 11:25:17 +10:00
Rob Harrington	869551a17c	Adding a standard variant again	2015-04-17 11:25:17 +10:00
Rob Harrington	13a910c372	Replace validates_associated on master with current spree method for error reporting master saves	2015-04-17 11:25:17 +10:00
Rob Harrington	0a7b01ff07	Product requires variant_unit and master requires unit_value and/or unit_desc	2015-04-17 11:25:16 +10:00
Rob Harrington	dfb513cce7	Use after_create callback to duplicate master variant	2015-04-17 11:25:16 +10:00
Rob Harrington	3f01a459ac	Adding a standard variant upon initialisation of a new instance of Spree::Product	2015-04-17 11:25:16 +10:00
Rohan Mitchell	e9fbd74e88	Send emails via jobs instead of synchronously	2015-04-16 16:54:43 +10:00
Rohan Mitchell	7f6c02ca29	Add User#customer_of to look up customers	2015-04-16 10:59:15 +10:00
Rohan Mitchell	34d1841d22	Make Variant#full_name resilient to regex chars	2015-04-16 10:59:15 +10:00
Rohan Mitchell	e570352a1b	Grant fewer permissions on enterprise creation	2015-04-16 10:59:15 +10:00
Rob Harrington	7448d41b27	Adding abilities for new for_order_cycle action	2015-04-06 10:23:39 +10:00
Rob Harrington	2310a6a7db	Splitting out order cycle abilities from general order management abilities	2015-03-27 16:07:37 +11:00
Rob Harrington	85e4b3970c	Adding an 'involved' scope to exchanges	2015-03-27 15:56:07 +11:00
Rohan Mitchell	89d4a59e9d	Extract order total tax calculations to model	2015-03-25 16:27:29 +11:00
Rohan Mitchell	40b4edeca1	Replace zoned_order factory with zone_with_member. In practice, former had issues with circular dependencies.	2015-03-25 16:27:29 +11:00