Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
2075 commits 22 branches 1 tag 31 MiB
Commit graph

465 commits

Author SHA1 Message Date
wvengen
f71b78665e allow 500 items per page 2014-05-13 17:01:24 +02:00
wvengen
0fa9bebac9 show supplier user-interface update 2014-05-13 17:01:24 +02:00
wvengen
0014435663 improved shared database import ui 2014-05-13 17:01:24 +02:00
wvengen
8853b3efdb fix sort order 2014-03-08 17:15:09 +01:00
wvengen
d9326dd984 allow plugins to override login redirection when authentication failed 2014-02-25 10:18:14 +01:00
wvengen
7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +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
2de4a2a3a0 Merge pull request #256 from wvengen/feature-partial_shared_sync 
Small change to allow non-shared articles with shared suppliers
 2014-02-07 11:24:33 +01:00
wvengen
3e79304c5a typo 2014-01-27 14:58:39 +01:00
wvengen
d08f120b27 show message when ignoring articles due to missing order number 2014-01-24 22:20:29 +01:00
wvengen
8db516c5f0 Merge branch 'master' into feature-cleaner_order_details 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2014-01-20 13:36:46 +01:00
wvengen
9308096e96 Merge pull request #252 from wvengen/feature-fix_redirect_with_suburi 
fix root redirect when using suburi
 2014-01-20 03:13:25 -08:00
wvengen
65041c78c5 allow to preselect order view 2014-01-17 15:04:03 +01:00
wvengen
151f851799 do not require authentication for root redirect 2014-01-15 16:33:13 +01:00
wvengen
ecb2f2a015 fix root redirect when using suburi 2014-01-15 15:43:29 +01:00
wvengen
bab28d2770 i18n update 2014-01-13 23:23:37 +01:00
wvengen
8760d87a76 fix receive notice 2014-01-13 11:48:43 +01:00
wvengen
b30b424540 Merge branch 'master' into feature-receive 
Conflicts:
	app/helpers/finance/order_articles_helper.rb
 2014-01-09 18:42:29 +01:00
wvengen
ce17bf33e0 complete and improve receive i18n 2014-01-08 13:39:49 +01:00
wvengen
69a29b8296 Merge pull request #245 from fsmanuel/rss_feed + 1 2014-01-06 13:55:32 +01:00
Manuel Wiedenmann
0d0ff90a64 adds an RSS feed for pages/all 2014-01-04 20:12:01 +01:00
Robert Waltemath
a0f55ba812 Clear return_to URL in session when signing out. 2014-01-03 19:42:08 +01:00
Robert Waltemath
2f02f89089 Allow login through link in message (and remember requested page). 2014-01-03 15:27:15 +01:00
Robert Waltemath
03f61668aa Redirect to home page on denied access (fixes #237). 2014-01-03 13:51:00 +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
Julius
dd138da1a6 Change comment according to 9d61e2e61569159489098eda1bd6c30d7322ce76 2014-01-02 19:17:51 +01:00
Julius
8e52fca304 Do not set quantity of newly created OrderArticles to 1 2014-01-02 19:17:46 +01:00
Julius
a384532619 Revert some changes of 20adce8a4e2d32548e7d7016dace250dd3e2eb9b 2014-01-02 19:17:41 +01:00
Julius
033aa90698 Use OrderArticle#create in receive form instead of Order#add_article 2014-01-02 19:16:09 +01:00
Julius
59c118a171 Apply publish/subscribe for OrderArticle#create 2014-01-02 19:16:03 +01:00
Julius
01264bc0ac Clean up OrderArticle#new form and related stuff 2014-01-02 19:14:46 +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
cf1e68f11d Allow to edit OrderArticle in Order#receive form 2014-01-02 19:14:33 +01:00
Julius
81dfe8110c Apply publish/subscribe for OrderArticle#update 2014-01-02 19:14:07 +01:00
wvengen
27a73be68f Merge remote-tracking branch 'foodcoops/master' into feature-receive 2014-01-02 18:57:59 +01:00
wvengen
7ef6832ab3 fix invite authentication 2013-12-22 14:20:25 +01:00
wvengen
cee96915f9 remove unused redirect_to functionality 2013-12-22 13:59:16 +01:00
wvengen
a28c6031a4 fix receive exception when input is set to nil 2013-12-21 17:39:20 +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
2b511ee559 Merge branch 'master' into fresh-flow 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2013-12-18 17:03:26 +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
dd08e277c7 AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates 2013-12-07 11:20:44 +01:00
wvengen
c900cf4988 make product redistribution work! 2013-11-27 00:06:25 +01:00
wvengen
9990e059d4 fix i18n 2013-11-25 15:24:20 +01:00
wvengen
bd1b932775 add receive screen, quantities for model, redistribution 2013-11-25 14:17:31 +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
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
768796407f Merge pull request #192 from foodcoop-adam/cleanup-stale 
Cleanup unused views&controllers
 2013-11-11 09:05:19 -08:00
wvengen
ec85c1de44 doc update [ci skip] 2013-11-07 20:46:05 +01:00
wvengen
5ead67f88c remove unused memberships controller/view 2013-10-30 20:46:59 +01:00
wvengen
de948d7692 fix and cleanup routing (closes foodcoops#190) 2013-10-30 02:27:04 +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
e968919cce beautify map invocations of users 2013-10-29 18:46:55 +01:00
wvengen
98e7189d31 Merge branch 'master' into i18n 
Conflicts:
	app/assets/javascripts/application.js
 2013-10-18 12:30:34 +02:00
wvengen
23b38b5a46 fix category heading 2013-10-10 19:22:43 +02:00
wvengen
34a4951e28 Merge branch 'master' into i18n 
Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
 2013-10-09 23:57:43 +02:00
wvengen
762292ef8e small i18n move 2013-10-09 22:29:19 +02:00
Julius
28644dc334 Force update in Order#finish; rescue if error raised 2013-10-08 19:58:11 +02:00
wvengen
a9dff7f1df add missing i18n 2013-10-04 10:25:53 +02:00
Julius
fef8c6d99f Move StockArticle#history to StockArticle#show 2013-10-03 22:24:21 +02:00
wvengen
17bbb0705b fix i18n 2013-10-02 17:23:49 +02:00
wvengen
a8ace3bc79 add missing i18n 2013-10-02 17:13:49 +02:00
wvengen
6cfaa4979a show lines with zero units but with member orders in balancing screen (closes foodcoops/foodsoft#179) 2013-10-02 16:32:29 +02:00
wvengen
6d3db7636a make search work without nickname usage 2013-09-20 23:18:06 +02:00
wvengen
f224735718 remember what member ordered when deleted in balancing screen 2013-09-17 14:19:46 +02:00
wvengen
1bb257c41b remember member order when order article is deleted + test 2013-09-13 15:37:30 +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
wvengen
74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master. 
Updated migration date to today.

Conflicts:
	db/schema.rb
 2013-07-18 18:48:49 +02:00
Manuel Wiedenmann
dfe1cee4cd german i18n + mini fix 2013-07-18 16:23:29 +02:00
Manuel Wiedenmann
0401572580 Merge pull request #1 from foodcoop-adam/extended-i18n 
cleanup of profile layout + set session on login
 2013-07-18 07:19:20 -07:00
Manuel Wiedenmann
206709aa61 sets session[:locale] = user.locale after login 2013-07-18 16:09:32 +02:00
Julius
b303b48853 Merge branch 'master' into improve-delivery-workflow-further 2013-07-13 21:08:50 +02:00
wvengen
126f7e7459 Merge pull request #150 from foodcoop-rostock/stock_article_quantity_history 
Show StockChanges index
 2013-07-13 03:16:31 -07:00
Julius
730dc7cf2a Move StockChanges#index to StockArticles#history 2013-07-13 09:32:27 +02:00
Julius
edaf91b029 Inline before_filter of stock_changes_controller 2013-07-12 22:19:11 +02:00
wvengen
db8a929f0b Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks 
Great!
 2013-07-11 12:48:41 -07:00
Julius
ffcb9490c9 Make stock_changes readonly in index view 2013-07-11 18:20:24 +02:00
Robert Waltemath
65c0b555c2 Added warning/ hint when updating periodic task. 2013-07-11 10:30:55 +02:00
Julius
de9541a0df Ask how to fetch readonly associations 2013-07-09 21:49:39 +02:00
Julius
ef62a18ac9 Add StockChanges index 2013-07-09 21:46:04 +02:00
Julius Rapp
a5565b436f Resolve merge conflicts 2013-07-07 14:58:57 +02:00
Julius Rapp
4a208c83c0 Separate actions for new StockArticle 2013-07-07 14:14:32 +02:00
wvengen
76645ebd12 add default tax percentage to app_config 2013-07-06 23:11:50 +02:00
wvengen
3da27734c7 allow import of files with categories that do not exist (map to no category) 2013-07-06 17:49:10 +02:00
wvengen
d7540bdd20 fix i18n key 2013-06-30 13:08:13 +02:00
wvengen
0978b84f4d set user language on login to override session 2013-06-28 13:30:26 +02:00
Julius
d0ccf07bc5 Merge latest changes in master of http://github.com/foodcoops/foodsoft 2013-06-26 20:23:11 +02:00
Julius
dd70b84ef0 Linearize and clean up delivery form 2013-06-26 15:16:52 +02:00
wvengen
7dbe1363ed fix adding article balancing failing with 'already taken' (closes foodcoops/foodsoft#125) 2013-06-24 13:32:07 +02:00
Robert Waltemath
990397a7f0 Delete only the FOLLOWING tasks. 2013-06-21 22:04:36 +02:00
Robert Waltemath
6b62fc90d8 Now creating periodic task via button 2013-06-21 13:48:48 +02:00
Julius
cc1a839246 Allow to create stock_article as copy of article in delivery form 2013-06-18 10:48:19 +02:00
Manuel Wiedenmann
2c1d9aeb9c finishes i18n set_locale with user settings 2013-06-14 02:39:25 +02:00
Manuel Wiedenmann
5b7ec86ed6 Merge branch master into i18n 2013-06-14 02:02:57 +02:00
Julius
65f61e09d5 Improve delivery workflow; introduce sortable tables; use js.erb for deliveries 2013-06-13 23:36:22 +02:00
Robert Waltemath
4037ef12da Users may delete all tasks of a group, i.e. delete the whole group. 2013-06-12 12:02:13 +02:00
Benjamin Meichsner
f4a0e29297 Fixed bug in with new shared multiple suppliers feature. 2013-06-12 10:47:54 +02:00
Benjamin Meichsner
25fbb47320 Merge branch 'rails3-allow-multiple-suppliers' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-rails3-allow-multiple-suppliers 2013-06-12 10:40:20 +02:00
Julius
49cfa9aded Cleanup StockArticle creation during delivery 2013-06-11 15:05:19 +02:00
Julius
e28f3eda65 Fix StockArticle creation during delivery; small cleanups 2013-06-11 13:10:18 +02:00
Manuel Wiedenmann
7a63394dac Merge remote-tracking branch 'origin/rails3' 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-06-10 01:53:31 +02:00
Benjamin Meichsner
7c4ee01ff2 Define autofill attributes when creating new supplier from shared_supplier. 2013-06-09 18:02:47 +02:00
wvengen
c38ce28347 fix i18n bug 2013-06-06 02:13:40 +02:00
Robert Waltemath
c194d2545f Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107. 2013-06-04 11:28:25 +02:00
Manuel Wiedenmann
c2c1961bd0 adds i18n support to routes and application controller; default_locale is set to :en 2013-05-31 18:42:28 +02:00
wvengen
53d5eabf79 fix login i18n 2013-04-26 21:35:23 +02:00
wvengen
5e2a3fb3f0 fix articles controller i18n 
Conflicts:

	app/controllers/articles_controller.rb
 2013-04-12 16:17:12 +02:00
wvengen
f6ba21832d Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/_form.html.haml
	app/views/articles/sync.html.haml
	app/views/finance/balancing/_edit_note.html.haml
	app/views/finance/group_order_articles/_form.html.haml
	app/views/finance/order_articles/_edit.html.haml
	app/views/finance/order_articles/_new.html.haml
	app/views/group_orders/show.html.haml
	app/views/invites/_modal_form.html.haml
 2013-04-12 15:45:24 +02:00
wvengen
70542c1ad7 update en translation 2013-04-12 01:30:02 +02:00
wvengen
368d44e26b fix tasks error reference 2013-04-12 01:08:35 +02:00
wvengen
692c70d324 finish pages i18n 2013-04-12 00:59:45 +02:00
wvengen
1a8c8537a4 finish tasks i18n 2013-04-12 00:00:02 +02:00
wvengen
3f82138d84 finish deliveries i18n 2013-04-10 17:02:16 +02:00
wvengen
ee5f7ff1b8 small i18n/translation fixes 2013-04-10 14:07:59 +02:00
Benjamin Meichsner
13e921a632 Fixed some errors in articles#sync. Show better error messages. 2013-04-08 01:00:49 +02:00
wvengen
4aa40b387a finish article_categories controllers i18n + translation 2013-04-04 02:10:52 +02:00
wvengen
24d04b25db fix some small i18n errors 2013-04-04 00:56:45 +02:00
wvengen
0bb080526a Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/login_controller.rb
	app/models/message.rb
	app/views/sessions/new.html.haml
 2013-04-04 00:29:50 +02:00
Benjamin Meichsner
53518039f1 Fixed error message, when using GET for password reset actions. 2013-03-27 22:20:54 +01:00
Benjamin Meichsner
915e1b9e79 Fixed bug in reset password error handling. 2013-03-27 22:12:46 +01:00
Benjamin Meichsner
18f6cadca2 Ensure mail privacy in message reply and show view. 
Thanks to @JuliusR for reporting.
 2013-03-24 01:37:58 +01: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
80b203a8da Fixed missing templates in accept invitation action. 2013-03-23 17:51:33 +01:00
wvengen
75a1051668 finish articles i18n, controller+model 2013-03-22 00:59:42 +01: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
e275403cdd Do not destroy articles in supplier sync. Mark them as deleted. 2013-03-18 19:05:11 +01:00
Benjamin Meichsner
dd0bd0ad7e Fixed updating order article in stockit balancing. 2013-03-17 18:33:04 +01:00
Benjamin Meichsner
707f989768 Fixed routes in redirect after direct_close of orders. 2013-03-17 17:50:50 +01:00
Benjamin Meichsner
c05b3e0e19 Balancing: Do not update oder summary automaticly when changing group orders. 2013-03-17 15:47:50 +01:00
Benjamin Meichsner
9cc98b4662 Added some more eager loading for balancing view. 2013-03-17 15:12:14 +01:00
Benjamin Meichsner
07581b7ecf Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
Benjamin Meichsner
0d3564492b Fixed bug in sorting articles in balancing view. 2013-03-12 18:54:51 +01:00
Benjamin Meichsner
c4376f35bf Removed article from includes in as it does not work with acts_as_paranoid. 
See also https://github.com/goncalossilva/rails3_acts_as_paranoid/issues/62.
Better we remove acts_as_paranoid and filter manually?
 2013-03-12 12:50:56 +01:00
Benjamin Meichsner
6196bdae41 Added some eager loading for balancing new. 2013-03-12 12:38:08 +01:00
wvengen
2d382df1f1 Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/controllers/stockit_controller.rb
	app/models/ordergroup.rb
	app/models/workgroup.rb
	app/views/stockit/index.html.haml
 2013-03-06 01:01:12 +01:00
Julius
0e1bd5c75e Improve (AJAX) deletion of StockArticles 2013-02-25 11:12:28 +01:00
Julius
5dc3fc30ad Revert 099e2b9b06 2013-02-25 10:29:47 +01:00
Julius
8f15cfb446 Revert 396a47b6af 2013-02-25 10:13:44 +01:00
Julius
ccf0d010b4 Apply AJAX for deleting a StockArticle 2013-02-25 10:02:21 +01:00
wvengen
569cdce2db finish finance controller i18n 2013-02-22 00:44:39 +01:00
wvengen
c693f697ff workgroups i18n 2013-02-13 01:34:58 +01:00
wvengen
02f04be6e8 finish stock_takings i18n + controller 2013-02-13 01:20:20 +01:00
wvengen
a0a974b9ce finish stockit i18n + controllers + model 2013-02-11 11:19:26 +01:00
Manuel Wiedenmann
640e9799aa i18n financial_transactions + controller 2013-02-11 10:21:39 +07:00
Manuel Wiedenmann
8be93c33f8 i18n finance + controller 2013-02-10 15:05:31 +07:00
wvengen
36b18bcfbd finish messages i18n + controller + model 2013-02-09 10:18:52 +01:00
Manuel Wiedenmann
5941bbbf4f i18n feedback + controller 2013-02-09 13:01:44 +07:00
Manuel Wiedenmann
6a564f0a25 admin controllers 2013-02-09 12:47:21 +07:00