Commit graph

1035 commits

Author SHA1 Message Date
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
wvengen
933f4fe67a Merge pull request #243 from foodcoop-rostock/fix-access-denied-cycle
Redirect to home page on denied access (fixes #237).
2014-01-03 06:59:43 -08:00
Robert Waltemath
2f02f89089 Allow login through link in message (and remember requested page). 2014-01-03 15:27:15 +01:00
wvengen
b800da9b9b use helper in ajax update too 2014-01-03 14:52:44 +01:00
wvengen
436ebc0190 Merge pull request #234 from foodcoop-adam/article-dialog
introduce new layout in balancing article screen as well
2014-01-03 05:16:03 -08:00
wvengen
133429720c old price display tweaks 2014-01-03 14:11:50 +01:00
Robert Waltemath
03f61668aa Redirect to home page on denied access (fixes #237). 2014-01-03 13:51:00 +01:00
wvengen
1a5dc3ebe4 consider group_order_article without result not manually changed 2014-01-03 13:03:28 +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
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
0af8a065a1 Fix calculation of OrderArticle.total_price and .total_gross_price 2014-01-03 10:33:31 +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
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
5349ee142e Offer _undeleted_ StockArticles for new OrderArticle only 2014-01-02 19:14:50 +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
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
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
Julius
3819fa012e Offer _undeleted_ StockArticles for new OrderArticle only 2013-12-31 12:35:30 +01:00
Julius
b22677eced Change order link from invoice form to avoid access problems 2013-12-30 11:26:10 +01:00
wvengen
4f80fd0e8c Merge pull request #231 from wvengen/feature-autocomplete-fixes-2
fix user form field order and autocompletion
2013-12-30 02:03:48 -08:00
wvengen
19f583381d Merge pull request #232 from wvengen/feature-remove_unused_redirect_to
Security improvements
2013-12-30 01:46:28 -08:00
wvengen
699be6a6d9 introduce new layout in balancing article screen as well 2013-12-23 16:11:14 +01:00
wvengen
f5bd7a43e4 update balancing order article edit screen to support received units 2013-12-23 15:25:45 +01:00
wvengen
03bb83ecc0 show different warning signs for mismatch with ordered and received 2013-12-23 12:35:09 +01:00
wvengen
5d8f71f834 move javascript a little 2013-12-23 11:51:38 +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
d071c5bba8 fix user search 2013-12-22 23:21:02 +01:00
Julius
53e611c1c0 Allow browser to store new password after change 2013-12-22 18:26:28 +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
3e1d561a5e fix user form field order and autocompletion 2013-12-22 13:28:33 +01:00
wvengen
df9cff0eee Do not escape mailing list wiki link in the message form (foodcoops#227) 2013-12-22 01:59:33 +01:00
wvengen
537ac52f4e Merge pull request #227 from foodcoop-rostock/fix-escape-new-message-hint
Do not escape mailing list links in message form
2013-12-21 16:14:20 -08:00
Julius
3099e740ca Do not escape mailing list links in message form 2013-12-21 22:52:39 +01:00
wvengen
a28c6031a4 fix receive exception when input is set to nil 2013-12-21 17:39:20 +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
54e98474b1 remove unused helper [ci skip] 2013-12-18 22:35:01 +01:00
wvengen
68c4affb02 better disabled button 2013-12-18 22:22:34 +01:00
wvengen
3d511ea2fb only show receive in finance when access to ordering 2013-12-18 22:19:36 +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
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
a0c6cf8afe fix warning without text 2013-12-18 16:04:30 +01:00
wvengen
94b2c8eac3 Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup
Conflicts:
	app/views/deliveries/_stock_article_form.html.haml
	config/locales/de.yml
	config/locales/en.yml
2013-12-17 15:58:47 +01:00
wvengen
b26b124b0c Merge pull request #211 from foodcoop-adam/group_order-cleanup
make order result calculation a bit cleaner
2013-12-17 06:29:15 -08:00
wvengen
c5b1236f21 Merge pull request #218 from foodcoop-adam/article-dialog
Edit article user-interface update
2013-12-17 06:29:04 -08: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
452db61af8 i18n fix (thanks @JuliusR) 2013-12-14 23:52:59 +01:00
Julius
9b92d6ff10 Mark two i18n issues 2013-12-14 14:48:58 +01:00
wvengen
142e8a0473 i18n fixes 2013-12-14 13:34:58 +01:00
wvengen
4e54388b83 Merge remote-tracking branch 'foodcoop-rostock/question-form-i18n' into feature-i18n-cleanup 2013-12-14 13:20:03 +01:00
wvengen
46ab4dcc01 proper i18n of last ordergroup order (thanks @JuliusR) 2013-12-14 13:15:47 +01:00
wvengen
d67a0083f1 fix price hint escaping (thanks @JuliusR) 2013-12-14 13:15:16 +01:00
Julius
40e9e82295 Mark two i18n issues 2013-12-14 10:03:32 +01:00
wvengen
d448707b1a i18n cleanup (affects foodcoops#137) 2013-12-12 00:13:19 +01: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
3f497e9274 allow more than two columns in horizontal form 2013-12-10 23:41:45 +01:00
wvengen
675f0e6d16 fix workgroup link task list 2013-12-10 19:12:29 +01:00
wvengen
e42e27957d improve task i18n (affects foodcoops#137) 2013-12-10 17:58:32 +01:00
wvengen
da737793e8 workaround help block margin issue [ci skip] 2013-12-10 16:50:04 +01:00
wvengen
85b6ff908b make new article dialog more responsive 2013-12-10 16:41:26 +01:00
wvengen
58de1a231b update price during editing as well 2013-12-10 13:30:15 +01:00
Julius
30b35cdd11 Improve usability of supplier selection for stock_articles in delivery form 2013-12-09 00:03:07 +01:00
Julius
cdb87a8389 Highlight created/updated stock_article in StockArticle#index view 2013-12-07 17:10:40 +01:00
Julius
012327dd7c Slightly cleanup delivery form 2013-12-07 16:57:53 +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
112fa3be23 fix forgotten i18n string (affects foodcoops#137) 2013-12-06 23:08:28 +01:00
wvengen
111c061efa more i18n cleanup (affects foodcoops#137) 2013-12-06 22:53:59 +01:00
wvengen
a475a27f79 i18n cleanup (affects foodcoops#137) 2013-12-06 22:43:36 +01:00
Julius Rapp
e99752e483 disable escape of html from local (one place) 2013-12-06 18:33:35 +01:00
wvengen
62ca3cb634 small layout cleanup [ci skip] 2013-12-06 14:49:13 +01:00
wvengen
2f10210c76 remove unimplemented unit_divide box 2013-12-06 14:38:28 +01:00
wvengen
c99aa7aab6 add availability to article edit dialog 2013-12-06 14:33:51 +01:00
wvengen
923b579bd1 Merge branch 'master' into article-dialog
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-06 14:26:50 +01:00
wvengen
3937400683 fix modal dialog margin [ci skip] 2013-12-06 14:26:04 +01:00
wvengen
1c4b9591a2 fix edit article dialog title 2013-12-06 12:34:14 +01:00
wvengen
05b934e79f update fc price dynamically in article edit form 2013-12-06 12:19:13 +01:00
wvengen
b1e81dc1d7 make simple_form see that first_name is required 2013-12-03 22:04:22 +01:00
wvengen
c900cf4988 make product redistribution work! 2013-11-27 00:06:25 +01:00
wvengen
2d99141229 only allow to add articles not already present in receive 2013-11-26 13:31:07 +01:00
wvengen
beabe22a01 simplify model 2013-11-26 13:22:44 +01:00
wvengen
9cb9bf6c1a focus newly added input in receive 2013-11-26 13:00:34 +01:00
wvengen
853e8ba9d2 add package images [ci skip] 2013-11-25 15:25:13 +01:00
wvengen
9990e059d4 fix i18n 2013-11-25 15:24:20 +01:00
wvengen
9c340ec08e more clarity whether a number is number units or boxes 2013-11-25 15:13:54 +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
9a0100e382 Merge pull request #207 from sjmulder/bug/130
Remove apple-touch-icon link
2013-11-25 00:39:52 -08:00
wvengen
935fdedd66 hide row when information not present 2013-11-24 02:16:15 +01:00
wvengen
20bd86fe65 make heading_helper work with empty _short translation 2013-11-24 01:59:44 +01:00
wvengen
e5471b9f73 more i18n cleanup 2013-11-24 01:47:34 +01:00
wvengen
652a392b37 simplify i18n and fix some small ui issues 2013-11-23 17:49:43 +01:00
wvengen
135e938d3d i18n cleanups (affects #137) 2013-11-23 12:05:29 +01:00
wvengen
ed9a6cca39 make result calculation a bit cleaner 2013-11-22 23:40:44 +01:00
wvengen
84191ddcd0 first shot on improving edit article form
(see also foodcoops#209)
2013-11-20 23:46:11 +01:00
Sijmen Mulder
630aa383cb Remove apple-touch-icon links
Safari will fall back to request the default touch icons if the href of the
link 404s, so having them point at nothing generates 4 404s for nothing.
2013-11-19 22:57:55 +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
9b47e5d6c4 use dynamic conditional in validation, to enable different foodcoops having different use_nick configuration values 2013-11-18 11:31:30 +01:00
wvengen
588898d7b0 do not error when calling shared_article on non-shared article 2013-11-13 23:20:48 +01:00
tg(x)
de9453fa24 dashboard: link to view order page 2013-11-13 16:42:32 +01:00
wvengen
a5a29aff5c Merge pull request #195 from foodcoop-adam/grouporder-many-products
Allow large product lists in member order
2013-11-12 08:41:48 -08: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
ce3b89c910 make authentication methods more readable (thanks @fsmanuel) 2013-11-11 16:23:20 +01:00
wvengen
891b9a21c0 fix and improve i18n of "My Ordergroup" 2013-11-09 14:19:54 +01:00
wvengen
ec85c1de44 doc update [ci skip] 2013-11-07 20:46:05 +01:00
wvengen
a535fbc517 allow large product lists in member order 2013-11-05 10:55:28 +01:00
wvengen
f4e4d11bae workaround for integration test problem 2013-11-01 20:27:53 +01:00
wvengen
13c8af3642 use abbr instead of acronym for heading helper 2013-11-01 12:49:21 +01:00
wvengen
f7a0103553 clearer login field name 2013-10-30 21:28:35 +01:00
wvengen
3588962329 remove unused layout 2013-10-30 20:53:01 +01:00
wvengen
fef17604c5 remove unused autocomplete templates 2013-10-30 20:50:56 +01:00
wvengen
5ead67f88c remove unused memberships controller/view 2013-10-30 20:46:59 +01:00
wvengen
6e9954c86f remove user referencing page as it is not being used anyway 2013-10-30 11:04:22 +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
e13ca74df3 fix new user form 2013-10-29 19:11:33 +01:00
wvengen
9ba425aafa fallback for when nick is nil 2013-10-29 19:05:24 +01:00
wvengen
e968919cce beautify map invocations of users 2013-10-29 18:46:55 +01:00
wvengen
3275e9ba31 small i18n bug 2013-10-22 00:09:11 +02:00
wvengen
98e7189d31 Merge branch 'master' into i18n
Conflicts:
	app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00