Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
1,326 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

81 Commits

Author SHA1 Message Date
wvengen 4c9e84ecc6 change layout of receive unlock 2014-01-03 12:40:43 +01:00
wvengen 014a62aa11 use disabled property for input and fix style 2014-01-03 10:59:42 +01:00
wvengen f1ae2724c6 fix unit quantity display after ajax update 2014-01-03 10:45:15 +01:00
wvengen 5ead0fb441 show correct price 2014-01-03 10:44:57 +01:00
Julius f230d39055 Merge price columns in receive form into one 
Conflicts:
	app/views/orders/_edit_amount.html.haml
 2014-01-03 10:36:57 +01:00
Julius 2ec3d38238 Set readonly property with javascript by .prop instead of .attr 2014-01-03 10:33:23 +01:00
wvengen 98f59a3de3 Readonly receive input if GroupOrderArticle result has manually been changed 
Conflicts:
	app/helpers/orders_helper.rb
	app/views/orders/_edit_amount.html.haml
 2014-01-03 10:33:09 +01:00
wvengen a439f26b67 ui design update 2014-01-02 22:30:04 +01:00
Julius 8e52fca304 Do not set quantity of newly created OrderArticles to 1 2014-01-02 19:17:46 +01:00
Julius 033aa90698 Use OrderArticle#create in receive form instead of Order#add_article 2014-01-02 19:16:09 +01:00
Julius baa5f16cfc Free order_article resource from finance namespace; also unlock for role_orders 2014-01-02 19:14:41 +01:00
Julius 9ed906f425 Correct haml comment from '#' to '-#' 2014-01-02 19:14:37 +01:00
Julius cf1e68f11d Allow to edit OrderArticle in Order#receive form 2014-01-02 19:14:33 +01:00
wvengen 41ea9ed66e hide receive screen for stock orders 2013-12-21 17:36:25 +01:00
wvengen aa6041d337 show all articles in receive screen (not just of this order) 2013-12-21 17:33:06 +01:00
wvengen bb331f99a7 fix units_to_order display [ci skip] 2013-12-19 00:45:39 +01:00
wvengen 68c4affb02 better disabled button 2013-12-18 22:22:34 +01:00
wvengen 7f813f2c0f fix order add_article 2013-12-18 22:16:19 +01:00
wvengen 84fe791078 update balancing screen 2013-12-18 22:10:38 +01:00
wvengen 873a1ff108 update texts 2013-12-18 21:58:15 +01:00
wvengen 4fede30a19 hide invoice columns until implemented 2013-12-18 21:53:31 +01:00
wvengen 82d1c41e9f update show order 2013-12-18 21:46:34 +01:00
wvengen d299fa4870 move receive screen to orders 2013-12-18 21:08:58 +01:00
wvengen 94b4454a1b add receive to order screen, and distinguish between finished and closed orders to put it in nicely 2013-12-18 19:21:39 +01:00
wvengen a0c6cf8afe fix warning without text 2013-12-18 16:04:30 +01:00
wvengen 135e938d3d i18n cleanups (affects #137) 2013-11-23 12:05:29 +01:00
wvengen 66ac3be81f Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
 2013-11-18 11:42:49 +01:00
wvengen de948d7692 fix and cleanup routing (closes foodcoops#190) 2013-10-30 02:27:04 +01:00
wvengen e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
Robert Waltemath 805071f3fb Added checkbox to ignore warnings. Added translations. 2013-09-04 10:52:14 +02:00
Robert Waltemath bb25bdc6eb Improved error data passing. 2013-09-03 17:37:49 +02:00
Robert Waltemath 1c9fad0a7b Added validation for removed but ordered articles. 2013-09-03 12:09:33 +02:00
wvengen f57038ff56 show quantity/tolerance in order screen when unit_quantity=1 2013-07-11 23:20:37 +02:00
wvengen f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
wvengen 7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/admin/ordergroups_controller.rb
	app/controllers/finance/balancing_controller.rb
	app/controllers/suppliers_controller.rb
	app/views/articles/_article.html.haml
	app/views/finance/balancing/_summary.haml
	app/views/finance/balancing/new.html.haml
	app/views/group_orders/_form.html.haml
	app/views/home/_apple_bar.html.haml
	app/views/suppliers/index.haml
 2013-03-21 22:08:09 +01:00
Benjamin Meichsner 07581b7ecf Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
wvengen 20533a5163 fix orders i18n 2013-02-11 15:34:31 +01:00
Manuel Wiedenmann 2d58054d1c added order for interpolation 2013-02-10 15:05:31 +07:00
wvengen e06524ca37 finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01:00
benni 0dff5ea784 Fixed some bugs in tasks, apple feature: 
* Update ordergroup stats when task is destroyed.
* Removed assigned caching attribute in task object.
* A lot of eager loading for tasks controller.
 2012-12-16 19:07:45 +01:00
benni 0edd29dfd4 Merge branch 'master' into master-to-rails3 
Conflicts:
	Gemfile
	README_DEVEL
	app/controllers/articles_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/tasks_controller.rb
	app/models/task.rb
	app/views/articles/_import_search_results.haml
	app/views/articles/index.haml
	app/views/messages/new.haml
	app/views/ordering/_order_head.haml
	app/views/ordering/my_order_result.haml
	app/views/orders/show.haml
	app/views/stockit/new.html.haml
	db/schema.rb
 2012-12-14 18:10:46 +01:00
Julius c17ff281c3 Save and display creator of Order 2012-11-12 14:24:49 +01:00
benni f4f10b1e4c Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
benni 0236fb5a60 Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
benni 16de9124fe Fixes orders. 2012-10-30 00:20:47 +01:00
benni f30e57dd49 Fixed articles views. 2012-10-19 01:12:47 +02:00
benni 552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
benni 92649d3053 Removed acts_as_ordered. Fixed bug in group_orders archive. 2012-10-03 20:08:54 +02:00
benni eb532babd6 Refactored pdf generation with newest prawn. 2012-10-02 02:50:48 +02:00
benni ec2e761e7f Fixed multi coop routing and changed config accessors. 2012-08-24 19:52:38 +02:00