258 Commits

Author	SHA1	Message	Date
Rohan Mitchell	7cc2bc4fde	Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.	2015-06-18 13:11:11 +10:00
Rob Harrington	795b2700b4	Merge branch 'master' into enterprise-index-revamp	2015-06-12 12:47:58 +08:00
Rohan Mitchell	2b763271a7	Merge branch 'master' into optimise-shopfront	2015-06-12 12:15:20 +10:00
Rohan Mitchell	4f311543ae	Merge branch 'master' into enterprise-index-revamp	2015-06-12 10:26:11 +10:00
Rob Harrington	1b52564d58	Rerouting welcome page to be an enterprise action, updates to copy for package selection	2015-06-12 01:49:38 +08:00
Rohan Mitchell	bfeb63c8d7	Ensure that changes to Spree::Config.products_require_tax_category do not leak out of the relevant spec	2015-06-11 14:16:18 +10:00
Rohan Mitchell	7412e92665	Merge branch 'master' into optimise-shopfront	2015-06-10 16:39:02 +10:00
Maikel Linke	ffa960b02e	Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor	2015-06-05 13:48:24 +10:00
Rohan Mitchell	f09fad464e	Merge branch 'master' into optimise-shopfront	2015-06-05 07:28:05 +10:00
Rohan Mitchell	27bc28ffa4	Index variants by id	2015-06-04 12:09:34 +10:00
Rob Harrington	439d122e93	Merge branch 'master' into customers ... Conflicts: app/assets/javascripts/admin/bulk_order_management.js.coffee app/assets/javascripts/admin/bulk_product_update.js.coffee app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee app/views/spree/admin/orders/bulk_management.html.haml db/schema.rb spec/javascripts/unit/bulk_order_management_spec.js.coffee	2015-06-03 15:19:40 +08:00
Rohan Mitchell	22230294ab	Merge branch 'master' into optimise-shopfront	2015-06-03 10:07:42 +10:00
Rohan Mitchell	7486daa2a3	Merge branch 'master' into require_standard_variant ... Conflicts: spec/controllers/spree/admin/variants_controller_spec.rb spec/lib/open_food_network/permissions_spec.rb spec/lib/open_food_network/products_and_inventory_report_spec.rb spec/models/enterprise_spec.rb	2015-05-28 15:08:13 +10:00
Rohan Mitchell	97e49c2bdb	Replace 'array.sort.should == expected.sort' pattern with match_array	2015-05-28 10:46:08 +10:00
Rohan Mitchell	2c92b5a751	Find all supplied and distributed taxons	2015-05-27 15:44:01 +10:00
Rohan Mitchell	f0e909c92b	Look up the shipping services (pickup, delivery) that different hubs provide	2015-05-27 15:44:01 +10:00
Rob Harrington	5b65f67737	Amending spec expect after_create when we want after_save	2015-05-22 15:02:49 +10:00
Rob Harrington	e931f4b31f	Merge branch 'master' into require_standard_variant	2015-05-22 12:22:54 +10:00
Rohan Mitchell	f1899a7558	Merge branch 'master' into xero-report	2015-05-15 16:57:11 +10:00
Rohan Mitchell	0dcd8eb8cc	Find adjustments with and without tax	2015-05-15 12:35:19 +10:00
Rohan Mitchell	ca1d88d8b1	Find line items with and without tax	2015-05-15 12:35:19 +10:00
Rohan Mitchell	ef064819f9	Add spec for order_cycle_management report access	2015-05-15 10:41:29 +10:00
Rob Harrington	34f5cfb6b5	Completed orders require a customer, add association logic	2015-05-13 12:44:38 +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	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	e91de69d5a	Merge branch 'master' into pin-refunds	2015-05-01 14:58:19 +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
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
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	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