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

222 Commits

Author SHA1 Message Date
wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
wvengen f8fca4d630 fix order article add + test 2014-02-24 11:37:06 +01:00
wvengen a4dca6ae11 show more info in add article dialog 2014-02-15 00:18:49 +01:00
wvengen 60826ceedc allow to edit GroupOrderArticle result from orders screen 
Conflicts:
	app/assets/javascripts/application.js
 2014-02-10 16:03:08 +01:00
wvengen f9d2c20aaa cleanup articles sorted in groups 2014-02-10 15:58:58 +01:00
wvengen 84e02b795c proper history line 2014-01-31 17:53:10 +01:00
wvengen 5e7925366d allow to view stock orders too 2014-01-31 13:12:29 +01:00
wvengen 5aef8e445e add html units history line 2014-01-31 13:08:20 +01:00
wvengen 65041c78c5 allow to preselect order view 2014-01-17 15:04:03 +01:00
wvengen 5b6d1a66a6 complete show order i18n 
Conflicts:
	app/helpers/orders_helper.rb
 2014-01-17 14:25:57 +01:00
wvengen 42d622d1b2 cleanup orders and add search 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/views/orders/_articles.html.haml
	app/views/orders/show.html.haml
 2014-01-17 13:41:38 +01:00
wvengen 3b2d50b47d make receive delta work when unit_quantity changes 2014-01-13 11:37:18 +01:00
wvengen 124341c7d6 receive helper and i18n cleanup 2014-01-09 13:01:10 +01:00
wvengen 90c81de872 update receive delta column + responsive css 2014-01-09 12:20:54 +01:00
wvengen d1c3c83ed7 use plural in table headings by default 2014-01-08 18:23:34 +01:00
wvengen ce17bf33e0 complete and improve receive i18n 2014-01-08 13:39:49 +01:00
Julius 563993fffa Complete I18n of current receive screen 2014-01-08 00:06:50 +01:00
Julius 8479678530 Improve unlock button for receiving OrderArticles manually adjusted 
Conflicts:
	app/views/orders/_edit_amount.html.haml
 2014-01-04 20:51:42 +01:00
wvengen 133429720c old price display tweaks 2014-01-03 14:11:50 +01:00
wvengen 438de97464 fix non-closed order display 2014-01-03 13:00:14 +01:00
wvengen 9219d099c8 ui update for packages display 2014-01-03 12:42:36 +01:00
wvengen 014a62aa11 use disabled property for input and fix style 2014-01-03 10:59:42 +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
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 5349ee142e Offer _undeleted_ StockArticles for new OrderArticle only 2014-01-02 19:14:50 +01:00
Julius baa5f16cfc Free order_article resource from finance namespace; also unlock for role_orders 2014-01-02 19:14:41 +01:00
wvengen 27a73be68f Merge remote-tracking branch 'foodcoops/master' into feature-receive 2014-01-02 18:57:59 +01:00
wvengen 45ad8e6524 move helper to new module 2013-12-23 11:48:17 +01:00
Julius ed228c4bd7 Allow control of password autocomplete by flag 2013-12-22 23:21:14 +01:00
wvengen 54e98474b1 remove unused helper [ci skip] 2013-12-18 22:35:01 +01:00
wvengen 84fe791078 update balancing screen 2013-12-18 22:10:38 +01:00
wvengen 1ab09b41bd fix articles_for_select2 helper 2013-12-18 17:34:45 +01:00
wvengen 2b511ee559 Merge branch 'master' into fresh-flow 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2013-12-18 17:03:26 +01:00
wvengen 5af82eb55c Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch 
Publish/subscribe pattern for DOM updates after AJAX database manipulation
 2013-12-17 06:28:25 -08:00
wvengen b53cb36714 give proper block to link_to_ordering (closes #201) 2013-12-11 22:58:50 +01:00
wvengen e25570d870 Merge remote-tracking branch 'tg-x/master' 
Conflicts:
	app/views/shared/_open_orders.html.haml
 2013-12-11 22:39:37 +01:00
wvengen e42e27957d improve task i18n (affects foodcoops#137) 2013-12-10 17:58:32 +01:00
Julius bceabfec5c Apply publish/subscribe pattern to stock_article manipulation in delivery form 2013-12-07 16:42:25 +01:00
Julius Rapp 11117738ce Resolve merge conflicts 2013-12-07 11:50:37 +01:00
Julius Rapp dd08e277c7 AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates 2013-12-07 11:20:44 +01:00
wvengen 111c061efa more i18n cleanup (affects foodcoops#137) 2013-12-06 22:53:59 +01:00
wvengen 2d99141229 only allow to add articles not already present in receive 2013-11-26 13:31:07 +01:00
wvengen bd1b932775 add receive screen, quantities for model, redistribution 2013-11-25 14:17:31 +01:00
wvengen 1f08ee4759 Merge remote-tracking branch 'foodcoops/master' into feature-link_to_group_order 
Conflicts:
	app/views/shared/_open_orders.html.haml
 2013-11-25 10:11:56 +01:00
wvengen 810656a53b small link_to_ordering refactoring 2013-11-25 10:04:44 +01:00
wvengen 20bd86fe65 make heading_helper work with empty _short translation 2013-11-24 01:59:44 +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
tg(x) de9453fa24 dashboard: link to view order page 2013-11-13 16:42:32 +01:00
wvengen bb5a67033d Merge pull request #194 from foodcoop-adam/plugin-move 
Better support for plugins (engines) + move wiki to plugin
 2013-11-12 03:46:15 -08:00
wvengen 13c8af3642 use abbr instead of acronym for heading helper 2013-11-01 12:49:21 +01:00
wvengen 70c12b7c1f move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
wvengen c37ed74942 Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/foodcoop/users/_users.html.haml
 2013-10-29 19:15:52 +01:00
wvengen 9ba425aafa fallback for when nick is nil 2013-10-29 19:05:24 +01:00
wvengen 78c81b194c i18n simple_form move of foodcoop 2013-10-09 23:00:07 +02:00
wvengen bbcad49831 start moving from simple_form i18n to activerecord 2013-10-03 16:03:13 +02:00
wvengen f6c2fd9a9d more user display changes 2013-09-22 02:15:35 +02:00
wvengen e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
Benjamin Meichsner 71e02ab569 Merge branch 'rails3' into rails3-to-master 
Conflicts:
	app/views/suppliers/shared_suppliers.haml
 2013-09-02 13:31:40 +02:00
Julius b303b48853 Merge branch 'master' into improve-delivery-workflow-further 2013-07-13 21:08:50 +02:00
Julius 12506e54b8 Remove stock_changes_helper.rb 2013-07-13 09:34:19 +02:00
Julius 469abb753d Merge branch 'master' into improve-delivery-workflow-further 2013-07-11 19:24:37 +02:00
Julius 620686fa46 Merge branch 'master' into stock_article_quantity_history 2013-07-11 19:23:52 +02:00
Julius 7c27017306 Link delivery/stock_taking/order in stock_changes index 2013-07-11 18:37:55 +02:00
Julius ef62a18ac9 Add StockChanges index 2013-07-09 21:46:04 +02:00
Julius ff1317b17b Add hint to copy stock_article if price change desired in delivery process 2013-07-08 21:02:43 +02:00
wvengen 1eeec23c80 only add undeleted articles in balancing screen 2013-07-08 02:31:54 +02:00
Julius 69060a6da6 Fix ordering of stock_changes in delivery 2 2013-06-27 09:10:46 +02:00
Julius 2ee7f716ae Improve delivery validation: StockArticles must not be associated more than once 2013-06-26 17:58:55 +02:00
Julius dd70b84ef0 Linearize and clean up delivery form 2013-06-26 15:16:52 +02:00
Julius cc1a839246 Allow to create stock_article as copy of article in delivery form 2013-06-18 10:48:19 +02:00
Julius 65f61e09d5 Improve delivery workflow; introduce sortable tables; use js.erb for deliveries 2013-06-13 23:36:22 +02:00
Benjamin Meichsner f4a0e29297 Fixed bug in with new shared multiple suppliers feature. 2013-06-12 10:47:54 +02:00
Manuel Wiedenmann 7a63394dac Merge remote-tracking branch 'origin/rails3' 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-06-10 01:53:31 +02:00
Julius 0058e826b2 Reorder delivery articles 2013-06-07 09:35:22 +02:00
wvengen 3b7cbf71e0 fix i18n typos 2013-05-16 00:05:47 +02:00
wvengen 6c65799025 use more beautiful close mark 2013-04-10 17:34:24 +02:00
wvengen a501fac76f helpers i18n 2013-04-10 17:29:06 +02:00
Benjamin Meichsner da72d3a61c Only show undeleted articles in delivery/stock_taking forms. 
Fixed 100.
 2013-03-23 18:25:54 +01:00
Benjamin Meichsner 8b2b70f8bf Fixed saving user for new orders. 2013-01-26 16:24:45 +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 9919183cb0 Fixed missing group_order_article in group_order show. 
Also add eager loading for associated objects.
 2012-12-16 16:50:09 +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 0236fb5a60 Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
benni 8f7e21b918 Fixed stockit. 2012-10-29 18:28:17 +01:00
benni fc1c173718 Fixed articles module. 2012-10-28 18:03:50 +01:00
benni f30e57dd49 Fixed articles views. 2012-10-19 01:12:47 +02:00
benni 9af26e1da6 Fixed deliveries. 2012-10-17 20:45:52 +02:00
benni 552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
benni 699fb9b233 Fixed wiki pages. 2012-10-09 02:31:10 +02:00
benni acdb331e36 Improved tasks. 2012-10-08 21:52:03 +02:00
benni ab81ef09d5 Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
benni 1708df3f6c Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
benni eb532babd6 Refactored pdf generation with newest prawn. 2012-10-02 02:50:48 +02:00
benni 5fb0bc2444 Big feactoring and bug fixing, Mailer, Tasks, GroupOrders 2012-08-24 11:11:40 +02:00
benni af3c07f031 Simplifiying balancing view part 2. Lets call it finished. 2012-07-27 18:03:46 +02:00
benni 467874a8a5 Simplify balancing view. Part 1 of ... 2012-06-21 17:19:00 +02:00
benni c49edb79a2 Fixed edit_not in balancing. 2012-05-12 10:55:20 +02:00