679 Commits

Author	SHA1	Message	Date
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
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
Rohan Mitchell	83c0093665	Admin can include tax when creating an adjustment	2015-11-11 11:53:04 +11:00
Rohan Mitchell	6476ce6ba9	Make spec more resilient	2015-11-10 15:05:45 +11:00
Maikel Linke	8b29612614	Merge remote-tracking branch 'origin/master' into i18n	2015-11-05 11:54:06 +11:00
Rohan Mitchell	a3d638df67	Merge branch 'master' into folklabs-producer-emails	2015-11-04 11:15:01 +11:00
Rohan Mitchell	015f3eb9ac	Display summary rows for admin adjustments	2015-11-01 13:42:59 +11:00
Lynne Davis	7350dbb75e	Adding tweaks that have been missed from merges	2015-10-30 11:54:06 +11:00
Rohan Mitchell	94e1264aef	Add rspec-retry for inconsistently failing spec	2015-10-29 16:01:39 +11:00
Maikel Linke	aec3980a93	Merge remote-tracking branch 'origin/master' into i18n	2015-10-29 14:56:17 +11:00
Rob Harrington	ab7bfd10c5	Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module" ... This reverts commit e86e08b72e939fee61eddd41d56081395666a877. Conflicts: lib/open_food_network/order_and_distributor_report.rb spec/features/admin/variants_spec.rb spec/lib/open_food_network/order_and_distributor_report_spec.rb	2015-10-28 13:08:50 +11:00
Rob Harrington	eba13a0dd7	Line items inherit units from variants upon creation	2015-10-28 13:07:31 +11:00
Rob Harrington	1946bac8e4	Fixing report spec that cares about table title case	2015-10-28 13:07:31 +11:00
Rob Harrington	40972cc6ec	Updating reports to use naming information from line_items directly, rather than from the original variant	2015-10-28 13:07:31 +11:00
Rob Harrington	795830d94d	Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module	2015-10-28 13:07:31 +11:00
Maikel Linke	0fd29dd32e	use expect in bulk_order_management_spec	2015-10-22 13:43:15 +11:00
Maikel Linke	2053fbecda	Merge branch 'i18n-replace-strings-in-js' into i18n ... Conflicts: .travis.yml app/views/spree/order_mailer/confirm_email_for_customer.html.haml config/locales/en.yml	2015-10-21 14:09:43 +11:00
Rohan Mitchell	a766f007fc	Display xero report for account invoices	2015-10-15 11:57:51 +11:00
Maikel Linke	91fae79be4	Update tests for new label "Login"	2015-10-07 14:06:34 +11:00
Rohan Mitchell	9c6264c4a0	On detailed xero report, do not show product totals (xero treats them as additional line items)	2015-09-25 13:52:51 +10:00
Rohan Mitchell	10bc3919ca	Add SKU to detailed xero report	2015-09-22 09:28:50 +10:00