33 Commits

Author	SHA1	Message	Date
Pau Perez	96e31235da	Replace hardcoded strings with i18n keys	2017-09-14 17:31:52 +10:00
Matt-Yorkley	fa5ed529cb	Added OC form validation	2017-04-21 09:32:49 +10:00
François Turbelin	88dea0f2b8	Adding i18n keys on Admin side (Rails views)	2017-01-11 10:00:06 +11:00
Rob Harrington	533a94267a	Refactoring save-bar	2016-05-25 08:10:20 +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
Bing Xie	38efa218d0	Use save bar on order cycle form	2016-05-12 10:45:41 +10:00
Maikel Linke	2a3b3b6dd2	Merge remote-tracking branch 'origin/master' into i18n-hackathon ... Conflicts: app/assets/javascripts/admin/enterprise_fees.js app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee app/views/admin/shared/_columns_dropdown.html.haml app/views/admin/variant_overrides/_header.html.haml app/views/admin/variant_overrides/_products.html.haml spec/features/admin/bulk_order_management_spec.rb spec/features/admin/variant_overrides_spec.rb	2016-03-11 15:38:28 +11:00
Rob Harrington	77e74c5642	OC Coordinators can opt to restrict products in an order cycle to those in their inventory only	2016-03-02 12:10:22 +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	614f83799e	new test 2016/02/20	2016-02-20 19:23:22 +00:00
elf Pavlik	8a390dd237	fixing test failing after i18n changes	2015-12-21 10:11:07 +01:00
apprenti	b58306aad8	my first translations	2015-12-21 09:47:18 +01:00
Rohan Mitchell	8f917817b8	Fix broken styles	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	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	66d1e4297e	WIP: Renaming admin.order_cycles to admin.orderCycles for consistency	2015-11-05 14:40:42 +11:00
Paul Mackay	2f05fc3824	#275: Insert receival time and instructions into email.	2015-05-24 10:38:49 +01:00
Paul Mackay	fd37324359	#536: Add permissions checking for Notify producers action.	2015-05-09 11:02:25 +01:00
Rohan Mitchell	6b1c125b03	Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails ... Conflicts: Gemfile.lock app/controllers/admin/order_cycles_controller.rb app/views/admin/order_cycles/edit.html.haml app/views/admin/order_cycles/show.rep db/schema.rb spec/controllers/admin/order_cycles_controller_spec.rb	2015-04-29 14:42:17 +10:00
Paul Mackay	99709b53ed	Change controller action to 'notify_producers'. ... Add flash message on completion. Simplify job variables. Improve mailer query. Spec for job.	2015-04-11 13:19:48 +01:00
Paul Mackay	ca665dc6bc	Merge master into producer-emails.	2015-03-04 19:09:43 +00:00
Rob Harrington	31054c7bf4	Split order_cycle_simple_view logic into index and form scopings	2015-02-27 17:24:36 +11:00
Rob Harrington	d7ea81e821	Prevent default form action from submitting ordercycle forms	2015-01-22 10:19:47 +11:00
Paul Mackay	67b17de695	#275: Add receival time and instructions to order cycle for incoming exchanges. Fix issues from feedback.	2014-12-30 11:33:13 +00:00
Paul Mackay	05437e2a56	#275: start on producer email.	2014-11-09 11:17:46 +00:00
Rohan Mitchell	f7c1340f99	Admin can view an order cycle in the simple edit form	2014-10-23 11:08:27 +11:00
Rohan Mitchell	f060da9c8d	Rename angular app order_cycle -> admin.order_cycles	2014-10-17 14:13:27 +11:00
Rohan Mitchell	25a2732253	Add basic styling to order cycle edit page	2012-12-02 15:14:31 +11:00
Rohan Mitchell	31735d3d10	Add edit order cycle controller, load basic data	2012-11-30 15:44:07 +11:00