3014 Commits

Author	SHA1	Message	Date
Maikel Linke	c4fb4a8510	Removing Suburbs from the code ... Suburbs are not used any more. Removing the last code bits should avoid confusion and save a tiny bit of test time.	2015-12-04 10:37:55 +11:00
Rohan Mitchell	d320b2e7d4	Merge branch 'fix-delayed-job' into combined/producer-emails-simplify_fix-delayed-job	2015-12-02 15:06:38 +11:00
Rohan Mitchell	bd854bf2dd	Remove receival_time from exchange, just use receival_instructions	2015-12-02 15:05:49 +11:00
Rohan Mitchell	10edb2b056	Fix delayed job startup - prevent error caused by double load	2015-12-02 10:48:50 +11:00
Rob H	86f1afae92	derp	2015-11-29 18:10:49 +11:00
Rob H	1cffd35968	Fixing up specs pertaining to full_name generation for line_items	2015-11-29 17:52:01 +11:00
Rob Harrington	b341c1ef8a	Ensure that dates in BOM AJAX requests have timezones	2015-11-25 15:06:15 +11:00
Rob Harrington	7e6b43266f	Making sure that price and final_weight_volume can be updated (by distributor or coordinator)	2015-11-25 14:23:55 +11:00
Rob Harrington	4bdc1bc418	LineItem final_weight_volume is updated whenever quantity is changed, though can be set directly	2015-11-18 16:22:36 +11:00
Rob Harrington	33454a7090	Adding server validation errors messages to BOM interface	2015-11-18 14:32:29 +11:00
Rob Harrington	6268b7cc7e	Printing/sending an invoice uses the same template for generating a pdf	2015-11-18 10:02:51 +11:00
Rob Harrington	75846a4d1f	Merge branch 'master' into line_item_naming	2015-11-16 10:38:42 +11:00
Rob Harrington	c199e22190	Make a few BOM specs more robust	2015-11-16 10:31:41 +11:00
Rob Harrington	767671c3b4	New pattern: blank Options for index drop down filters are added within service ... Rather than in the controller after data is loaded	2015-11-16 10:30:44 +11:00
Rob Harrington	ae7fb91a9a	Only reloading line_items and orders on BOM, $timeout for adding blankOption ... $timeout required for adding a blank option to lists of suppliers, distributors and orderCycles to prevent spec failures related to the use of select2	2015-11-13 15:59:33 +11:00
Maikel Linke	229070a76b	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n	2015-11-13 15:20:58 +11:00
Rohan Mitchell	b6f3e6eca6	Fix broken spec	2015-11-13 14:03:07 +11:00
Rohan Mitchell	178e5f59e6	Update cart by applying differences rather than clear-and-readd every time	2015-11-13 14:03:07 +11:00
Rohan Mitchell	7fffa03d8d	Fix bug: set difference comparison of string with number	2015-11-13 14:03:07 +11:00
Rohan Mitchell	888e4d80ef	Add reliable way to check if cart is dirty. Previous way returned true when cart empty.	2015-11-13 14:03:07 +11:00
Rohan Mitchell	d3c7c46800	Add method to remove a variant from an order	2015-11-13 14:03:07 +11:00
Rohan Mitchell	c432ed9e08	Build list of variants removed from the cart when overwriting	2015-11-13 14:03:07 +11:00
Rohan Mitchell	e175149e76	Add method to check whether a passed-in cart value varies from the cart	2015-11-13 14:03:07 +11:00
Rohan Mitchell	2f4b5bad26	Make benchmark more realistic	2015-11-13 14:03:07 +11:00
Rohan Mitchell	64e8927ae9	Add benchmark: add to cart	2015-11-13 14:03:07 +11:00
Rohan Mitchell	c932d20ef5	Extract multi-sample benchmarking into a helper method	2015-11-13 14:03:07 +11:00
Maikel Linke	5d5fda3a25	Merge remote-tracking branch 'origin/master' into i18n ... Conflicts: config/locales/en.yml	2015-11-13 10:07:29 +11:00
Rob Harrington	a96cdd5ee7	Merge branch 'master' into line_item_naming ... Conflicts: app/views/admin/order_cycles/edit.html.haml	2015-11-13 09:54:26 +11:00
Rob Harrington	4191e2b6f0	Changing the way select filters are reset on BOM to try and fix specs	2015-11-13 09:44:57 +11:00
Rob Harrington	88fd9f72e6	Retry uncooperative BOM feature spec	2015-11-13 09:14:20 +11:00
Rob Harrington	6966fbba7c	Present date limits being set in line items controller .js unless orderCycleFilter has actually been set	2015-11-12 17:40:35 +11:00
Rob Harrington	27a5791e26	Fixing Angular Specs for line items controller	2015-11-12 17:33:12 +11:00
Rob Harrington	be8038e9d0	Merge branch 'master' into line_item_naming ... Conflicts: lib/open_food_network/order_cycle_management_report.rb lib/open_food_network/packing_report.rb	2015-11-12 14:40:11 +11:00
Rob Harrington	6e8d807408	Fixing spec using text-angular broken by upgrade of poltergeist	2015-11-12 11:35:22 +11:00
Rob Harrington	2719c699d7	Updating line items index spec	2015-11-12 10:06:41 +11:00
Rohan Mitchell	e20d8d3e95	Merge branch 'master' into folklabs-producer-emails	2015-11-11 14:20:25 +11:00
Rohan Mitchell	f499dd627a	with_tax_included_in_price handles exceptions gracefully	2015-11-11 11:53:04 +11:00
Rohan Mitchell	8e1bade355	Move adjustment specs to their own spec file	2015-11-11 11:53:04 +11:00
Rohan Mitchell	5a29311137	Choose a more sensible default tax rate: one that calculates to the same amount as the current adjustment tax	2015-11-11 11:53:04 +11:00
Rohan Mitchell	3e7a12cca1	Rename spec support method for faster tab completion on save_and_open_page	2015-11-11 11:53:04 +11:00
Rohan Mitchell	81a6e07d5c	Admin can remove tax on an adjustment	2015-11-11 11:53:04 +11:00
Rohan Mitchell	727ecae62b	Admin can modify a taxed adjustment on an order	2015-11-11 11:53:04 +11:00
Rohan Mitchell	83c0093665	Admin can include tax when creating an adjustment	2015-11-11 11:53:04 +11:00
Rohan Mitchell	46a9304ae1	Extract compute_tax from EnterpriseFeeApplicator to Spree::TaxRate model	2015-11-11 11:53:04 +11:00
Rohan Mitchell	6476ce6ba9	Make spec more resilient	2015-11-10 15:05:45 +11:00
Rob Harrington	b1bac703ed	WIP: BOM Refactor, delete line_items using ngResource, updating data requests in line_items_controller	2015-11-05 17:50:18 +11:00
Rob Harrington	6769c2c729	Can pass params for order or line items into LineItemsController#index	2015-11-05 17:07:47 +11:00
Rob Harrington	afef9e3211	WIP: BOM Refactor, building order_cycle fetch and update logic with ngResource	2015-11-05 15:13:19 +11:00
Rob Harrington	a9e5f2912f	WIP: Fixing Orders service specs	2015-11-05 14:48:26 +11:00
Rob Harrington	66d1e4297e	WIP: Renaming admin.order_cycles to admin.orderCycles for consistency	2015-11-05 14:40:42 +11:00