973 Commits

Author	SHA1	Message	Date
Rohan Mitchell	952353da8c	Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit ... Conflicts: spec/features/admin/bulk_product_update_spec.rb	2015-05-29 15:08:30 +10:00
Rohan Mitchell	835b56b222	Attempt to fix intermittent failures in spec/features/consumer/authentication_spec.rb	2015-05-29 09:44:57 +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
Maikel Linke	5a43ed2046	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit	2015-05-22 18:17:20 +10:00
Rob Harrington	e931f4b31f	Merge branch 'master' into require_standard_variant	2015-05-22 12:22:54 +10:00
Maikel Linke	e6b6303f5e	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit	2015-05-21 18:03:11 +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	79a59e2e81	Add order_with_distributor factory	2015-05-21 13:34:32 +10:00
Maikel Linke	0c46f963ce	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit	2015-05-20 10:19:03 +10:00
Lynne Davis	2f463474fb	Adding specs for variable weight adjustment via builk order management	2015-05-09 19:10:55 +01: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	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	68b4cb59be	Fixing bulk management specs broken by making order_cycles filter update dates	2015-05-07 12:50:57 +10:00
Rohan Mitchell	7b4130972b	Fix first feature spec sometimes timing out	2015-05-06 18:12:17 +10:00
Maikel Linke	baabb5c07f	fixing BPE feature spec	2015-05-01 11:30:26 +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
Rob Harrington	0251d8962d	Adding sku to BPE	2015-04-22 21:02:07 +10:00
Rob Harrington	f610a709e1	Adding inherits_properties to BPE	2015-04-22 21:02:06 +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	63353ebace	Don't try and delete the only variant, that will never work!	2015-04-17 16:49:14 +10:00
Rohan Mitchell	0d9ba4257d	Merge branch 'properties'	2015-04-17 15:25:51 +10:00
Rohan Mitchell	042e076b58	Fix tax-related spec failures	2015-04-17 14:46:32 +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	0bdb8f7241	User can set whether an enterprise charges sales tax when registering	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
Rohan Mitchell	a93633a626	Show tax on order confirmation emails	2015-04-17 13:41:14 +10:00
Rohan Mitchell	3ce2c5b84f	Show tax on order confirmation page	2015-04-17 13:40:08 +10:00
Rohan Mitchell	6bb926f811	Do not show tax in checkout	2015-04-17 13:39:09 +10:00
Rohan Mitchell	beec910445	Display tax in cart	2015-04-17 13:39:09 +10:00
Rohan Mitchell	68f0e51c02	Change add_product_to_cart spec helper to use OrderPopulator, reducing inconsistencies in order adjustments, tax etc.	2015-04-17 13:39:09 +10:00
Rohan Mitchell	210c76eddc	Checkout won't load without payment and shipping methods; move spec to context where it can test the checkout	2015-04-17 13:39:09 +10:00
Rob Harrington	f13b52411d	Merge branch master into properties	2015-04-17 13:23:33 +10:00
Rob Harrington	b9f19d5777	Fixing broken specs	2015-04-17 13:00:20 +10:00
Rohan Mitchell	ccc1f3df40	Feature specs test email sending through delayed jobs	2015-04-16 16:54:43 +10:00
Rohan Mitchell	768cfab591	Change field text at checkout	2015-04-16 10:59:15 +10:00
Rob Harrington	adc1b639bc	Merge remote-tracking branch 'origin/master' into complex_oc	2015-04-08 14:38:27 +10:00
Rob Harrington	f6e635466b	Rearranging elements on the order cycle form a little bit	2015-04-08 14:31:18 +10:00
Rob Harrington	a4b80b1f33	Implement editable scope for variants on order cycles page	2015-04-06 09:15:14 +10:00
Rob Harrington	009b25a491	Adding an editable variants scope for incoming exchanges	2015-04-05 13:59:00 +10:00
Rob Harrington	bf87394a76	Fixing order cycle feature spec	2015-04-05 10:58:06 +10:00
Rob Harrington	5d7659aa3c	Fixing product spec, using have_select2 instead of have_field	2015-04-02 14:36:19 +11:00
Rob Harrington	76648b97b0	Update spec, properties must exist for enterprise users before they can be assigned	2015-04-02 14:15:00 +11:00
Rob Harrington	2d5118290b	Fixing broken order cycle feature specs	2015-03-27 16:19:52 +11:00
Rohan Mitchell	84f3097217	Calculate total tax from the tax included in all the adjustments on the order	2015-03-25 16:27:29 +11:00
Rohan Mitchell	333a4ecf2f	Include enterprise fee tax on sales tax report	2015-03-25 16:27:29 +11:00