476 Commits

Author	SHA1	Message	Date
Rob Harrington	b9f6cb8800	Adding translations for all column names	2016-05-25 08:10:20 +10:00
Rob Harrington	1d8719b474	Default column visibility can be set per user using ColumnPreferences model	2016-05-25 08:10:20 +10:00
Rob Harrington	533a94267a	Refactoring save-bar	2016-05-25 08:10:20 +10:00
Rob Harrington	8838a89ecc	Don't typecast product and variant on_hand from DOM when it is 'On demand'	2016-05-25 08:10:20 +10:00
Rob Harrington	6a610ff7a4	Merge remote-tracking branch 'origin/master' into uk/trial-length	2016-05-20 12:22:47 +10:00
Bing Xie	f8ec0d316a	Save bar can support cancel button	2016-05-12 11:04:40 +10:00
Bing Xie	78b4a35d12	Keep the action with save button	2016-05-12 10:45:41 +10:00
Bing Xie	2214c83ec7	Use save_bar on order cycle update form	2016-05-12 10:45:41 +10:00
Lynne Davis	51629cd0c0	Adding translations for shop front trials	2016-04-15 16:55:06 +01:00
elf Pavlik	f15e948085	small i18n fixes #878	2016-04-14 16:10:21 -05:00
elf Pavlik	6d0dc438a7	i18n fixes after @sstead feedback in #799	2016-03-21 16:55:57 -06:00
Maikel Linke	2546603a67	Remove what_is_this from locale ... It got replaced by admin.whats_this. Changed views to use the new key.	2016-03-11 17:08:13 +11:00
Maikel Linke	5225686d8f	Re-merge bulk order view	2016-03-11 12:23:12 +11:00
Maikel Linke	3e5f53b082	Rename i18n key what_is_this	2016-03-11 12:13:17 +11:00
Maikel Linke	02cc5adf78	Revert false HAML indent	2016-03-09 19:04:37 +11:00
Maikel Linke	02cbad2697	Remove duplicate lines from merging	2016-03-09 18:49:35 +11:00
elf Pavlik	68db9b9926	fixing faling tests	2016-02-28 19:58:03 +00:00
Nicolas Blanc	cb33ede9dc	Revert "elf-pavlik@ee52f1d" ... This reverts commit a8d7732a39.	2016-02-28 19:54:44 +00:00
Nicolas Blanc	a8d7732a39	elf-pavlik@ee52f1d	2016-02-28 19:23:26 +00:00
Nicolas Blanc	4621f625a0	new validation6 02/25/2016	2016-02-25 12:36:21 +00:00
Nicolas Blanc	5e71790cd1	new validation5 02/25/2016	2016-02-25 11:04:21 +00:00
Rohan Mitchell	258e84fc0a	Replace with-tip with ofn-with-tip: misc	2016-02-24 11:26:37 +11:00
Rohan Mitchell	d699f8321a	Replace with-tip with ofn-with-tip: dashboard	2016-02-24 11:26:37 +11:00
Nicolas Blanc	52d5b8936e	new validation4 02/22/2016	2016-02-22 14:54:31 +00:00
Nicolas Blanc	1738db9e1f	new validation 02/22/2016	2016-02-22 13:00:27 +00:00
Nicolas Blanc	614f83799e	new test 2016/02/20	2016-02-20 19:23:22 +00:00
Nicolas Blanc	2be005d344	i18n from berlin hackathon	2016-01-31 12:16:33 +00:00
Rob Harrington	cc4dc068ab	Adding variant SKU field to BPE	2016-01-13 18:49:34 +11:00
Rob Harrington	cab6871de3	Pulling bulk actions dropdown out into partial	2016-01-13 18:49:33 +11:00
Rob Harrington	7cd8f35ac8	Tidying up styling and use of skeleton columns on index pages	2016-01-13 18:49:33 +11:00
Rob Harrington	9eaec6061e	Pulling columns dropdown out into a shared partial	2016-01-13 18:49:32 +11:00
Rob Harrington	54e7677888	Integrating StatusMessages into save-bar, adding to variant overrides index	2016-01-13 18:49:32 +11:00
elf Pavlik	2a4f3f9ae4	making test pass	2015-12-21 10:11:08 +01:00
elf Pavlik	8a390dd237	fixing test failing after i18n changes	2015-12-21 10:11:07 +01:00
julienFR88	5290d0be6b	add translation in /cache/code/ofn/openfoodnetwork/app/views/spree/admin	2015-12-21 10:11:07 +01:00
Edem	6cd7fbb455	all string translated in admin bulk orders management	2015-12-21 10:11:07 +01:00
Edem	8ccf527e01	all strings in app/views/spree/admin/overview/* translated!	2015-12-21 10:11:06 +01:00
Rob Harrington	7a23f671a2	Restricting access to orders within Sales Tax Report ... Managers of suppliers should not be able to generate sales tax reports for orders they only supply products for	2015-12-17 14:21:30 +11:00
Rob Harrington	d115eb816e	Restricting access to orders within Xero Invoices Report ... Managers of suppliers should not be able to generate xero invoices for orders they supply products for	2015-12-17 14:21:30 +11:00
Rob Harrington	b004060679	Printing invoices doesn't fail when order has no order cycle	2015-12-17 11:33:18 +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	ae0ad73b4a	Printable Invoices Improvements for Food Connect ... Adding cusotmer instructions, hiding tax column when not present, order cycle name appears at top of invoice and items are sorted by product name	2015-12-16 11:55:23 +11:00
Rohan Mitchell	76d4fbccf9	Use select2 for order cycle selection	2015-12-11 13:06:58 +11:00
Rohan Mitchell	932ac45ea5	Do not show form until distribution has been chosen	2015-12-11 13:06:57 +11:00
Rohan Mitchell	cbaf2a0cb3	Angularise edit order form	2015-12-11 13:06:57 +11:00
Rohan Mitchell	6e7b6b5dfc	Tidy render partial calls and hash syntax	2015-12-11 13:06:57 +11:00
Rohan Mitchell	815694de31	Move orders/edit template from Spree	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	eb07680f1f	Inject shops and order cycles	2015-12-11 13:06:57 +11:00
Rohan Mitchell	47c23c986a	Move distribution fields from override to partial	2015-12-11 13:06:56 +11:00