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

1019 Commits

Author SHA1 Message Date
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 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 b2f032ac8e fix bootstrap menu on mobile [ci skip] 2014-01-13 14:45:48 +01:00
wvengen f0b65bd738 Merge pull request #247 from wvengen/feature-center_rows_vertically 
Center table rows vertically
 2014-01-13 03:22:20 -08:00
wvengen 8760d87a76 fix receive notice 2014-01-13 11:48:43 +01:00
wvengen 3b2d50b47d make receive delta work when unit_quantity changes 2014-01-13 11:37:18 +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 0b4cfde1b2 put footer below body, now that is allowed in html5 2014-01-09 14:47:05 +01:00
wvengen dcb17e04b5 do not show article hint in order view after all, since "old price" is 
actually the price of the current article, which will probably be
different in the future
 2014-01-09 13:24:40 +01:00
wvengen bea2706005 fix receive dynamic update (complements 90c81de872) 2014-01-09 13:19:27 +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 56bd527a8b keep white input background with package class [ci skip] 2014-01-09 10:51:54 +01:00
wvengen 5a7c9b817c fix receive js for document updates [ci skip] 2014-01-09 10:14:05 +01:00
wvengen b331d9a2a9 better css responsiveness [ci skip] 2014-01-08 19:58:51 +01:00
wvengen 65e79d7e1b small receive usability changes 2014-01-08 19:28:39 +01:00
wvengen d1c3c83ed7 use plural in table headings by default 2014-01-08 18:23:34 +01:00
wvengen bdb9499535 fix broken update password flow 2014-01-08 14:09:28 +01:00
wvengen 0e8e93204a Merge pull request #240 from foodcoop-rostock/fix-order-article-helper-undeleted 
Offer _undeleted_ StockArticles for new OrderArticle only
 2014-01-08 04:42:55 -08:00
wvengen ce17bf33e0 complete and improve receive i18n 2014-01-08 13:39:49 +01:00
wvengen 6e60f94484 small receive-related i18n updates 2014-01-08 12:52:29 +01:00
wvengen dcc3d21b4d center table rows vertically [ci skip] 2014-01-08 10:32:30 +01:00
Julius 563993fffa Complete I18n of current receive screen 2014-01-08 00:06:50 +01:00
Julius d7c771d10a Continue I18n of receive screen 2014-01-06 23:48:39 +01:00
wvengen 69a29b8296 Merge pull request #245 from fsmanuel/rss_feed + 1 2014-01-06 13:55:32 +01:00
Julius dc92de771e Comment on ArticlePrices without Article association 2014-01-04 21:39:11 +01:00
Julius f83f6971e8 Rename update_current_price to update_global_price to avoid confusion 2014-01-04 21:35:19 +01:00
Julius 3c88f572a4 When updating OrderArticle: save ArticlePrice association 2014-01-04 21:22:57 +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
Julius a8e604c196 When receiving: hide OrderArticle unit fields also after failed validation 2014-01-04 20:46:50 +01:00
wvengen aa57cee96f do not show units fields in receive edit order article screen 2014-01-04 20:46:13 +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
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