698 Commits

Author	SHA1	Message	Date
Rob Harrington	e67e22ee73	Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security ... Conflicts: lib/open_food_network/xero_invoices_report.rb	2015-12-17 14:22:16 +11:00
Rob Harrington	f49722ba90	Fixing broken BMC specs	2015-12-16 19:18:58 +11:00
Rob Harrington	ca3c464fda	Reorganising busines model config settings, moving account invoice tax rate in busines model config settings	2015-12-16 19:18:57 +11:00
Rob Harrington	da325780b1	Adding BMC link to configurations menu	2015-12-16 19:18:57 +11:00
Rob Harrington	a40a03905f	Reorganising BMC edit view	2015-12-16 19:18:57 +11:00
Rob Harrington	2bb85eb8e0	Revert "Add SKU to LettuceShare report" ... This reverts commit 15ea64b409.	2015-12-16 13:42:58 +11:00
Rob Harrington	5d28a7fdf8	Adding SKU to Products and Inventory reports (except lettuceshare)	2015-12-16 13:37:19 +11:00
Rob Harrington	befc558224	Pulling product_and_variant_name down into VariantAndLineItemNaming, renaming to product_and_full_name ... Also allowing this method to be used in reports (Xero), to reflect appropriate name for weight/volume adjusted line items	2015-12-16 11:55:24 +11:00
Rob Harrington	c91f1301f0	Adding preferences to enterprises for sorting of order cycles in shopfront list	2015-12-16 11:55:23 +11:00
Rob Harrington	e6a51bb49d	Adding actions dropdown to admin order view/pages	2015-12-16 11:55:23 +11:00
Continuous Integration	b7edf5e046	Auto-merge from CI [skip ci]	2015-12-16 10:58:03 +11:00
Em-AK	81f244025f	Update due_date in feature test ... due_date = invoice_date + 1 month	2015-12-13 18:42:27 +01:00
Maikel Linke	15ea64b409	Add SKU to LettuceShare report	2015-12-11 15:12:27 +11:00
Maikel Linke	6787709693	LettuceShare report: total in unit value column and total blank	2015-12-11 15:12:27 +11:00
Rohan Mitchell	3f8d470d23	When admin associates user with an order, look up last used address	2015-12-11 13:06:59 +11:00
Rohan Mitchell	ae3061df80	All orders specs use JS	2015-12-11 13:06:59 +11:00
Rohan Mitchell	e33ede0ec2	Include order cycle status in new order form	2015-12-11 13:06:58 +11:00
Rohan Mitchell	76d4fbccf9	Use select2 for order cycle selection	2015-12-11 13:06:58 +11:00
Rohan Mitchell	222b390b31	Fix error display	2015-12-11 13:06:57 +11:00
Rohan Mitchell	3419198635	Disable distributors that do not have an order cycle	2015-12-11 13:06:57 +11:00
Rohan Mitchell	1026b81d0c	Do not show order cycle choice until distributor is chosen	2015-12-11 13:06:57 +11:00
Rohan Mitchell	c74463404d	Only show order cycle options that include the chosen distributor	2015-12-11 13:06:57 +11:00
Rohan Mitchell	2081744cf6	Fix spec	2015-12-11 13:06:57 +11:00
Rohan Mitchell	2daceb1111	Angularise new order form	2015-12-11 13:06:57 +11:00
Continuous Integration	ae945ace9d	Auto-merge from CI [skip ci]	2015-12-11 11:09:54 +11:00
Maikel Linke	cd7721a127	Using date and time of current timezone ... Using Time.zone.now and Date.current instead of Time.now and Date.today. This should make all specs timezone independent.	2015-12-10 11:38:41 +11:00
Rohan Mitchell	8d270e919f	Sort exchanges for display when editing an order cycle	2015-12-10 09:17:25 +11:00
Rohan Mitchell	ccb23cd186	Do not allow re-adding exchange	2015-12-10 09:17:25 +11:00
Rohan Mitchell	d4ee20455e	Remove enterprise options from list when added	2015-12-10 09:17:25 +11:00
Rohan Mitchell	1a4448c6d2	Do not allow adding blank enterprises	2015-12-10 09:17:25 +11:00
Rohan Mitchell	9fef0a9909	When order cycle is updated, display message instead of reloading the page	2015-12-10 09:17:24 +11:00
Rohan Mitchell	29bfac5f54	Order cycle interface may update or update and close	2015-12-10 09:17:24 +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	33454a7090	Adding server validation errors messages to BOM interface	2015-11-18 14:32:29 +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	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	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	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	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	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