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

760 Commits

Author SHA1 Message Date
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 f83f6971e8 Rename update_current_price to update_global_price to avoid confusion 2014-01-04 21:35:19 +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
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 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 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 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 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 b22677eced Change order link from invoice form to avoid access problems 2013-12-30 11:26:10 +01: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
Julius ed228c4bd7 Allow control of password autocomplete by flag 2013-12-22 23:21:14 +01:00
Julius 53e611c1c0 Allow browser to store new password after change 2013-12-22 18:26:28 +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 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 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 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 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 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 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 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 9cb9bf6c1a focus newly added input in receive 2013-11-26 13:00:34 +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 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 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
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 891b9a21c0 fix and improve i18n of "My Ordergroup" 2013-11-09 14:19:54 +01:00
wvengen a535fbc517 allow large product lists in member order 2013-11-05 10:55:28 +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 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
wvengen 51e6a7aeb0 Merge pull request #149 from foodcoop-adam/updated-gems 
run bundle update and make it work again
 2013-10-18 03:12:59 -07:00
wvengen 4e61e764df fix haml indentation errors 2013-10-17 16:35:50 +02:00
wvengen 389b45a505 fix stockit i18n reference 2013-10-10 19:23:37 +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 67e29620f4 i18n simple_form move of invoices 2013-10-09 23:37:08 +02:00
wvengen 6ba971fe15 i18n simple_form move of deliveries 2013-10-09 23:19:40 +02:00
wvengen c3d22e883d i18n simple_form move of suppliers 2013-10-09 23:12:26 +02:00
wvengen 78c81b194c i18n simple_form move of foodcoop 2013-10-09 23:00:07 +02:00
wvengen 552af7925d i18n simple_form move of tasks 2013-10-09 22:41:23 +02:00
wvengen b8ff431634 clean up price tooltips javascript 2013-10-09 10:43:41 +02:00
wvengen bdce1b5872 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-10-09 10:37:02 +02:00
wvengen a32a3757d2 Merge pull request #180 from foodcoop-rostock/search-article-list-modified 
Search articles in group_orders form
 2013-10-08 02:21:35 -07:00
Julius 10d1615cd8 Prepare tooltip for next bootstrap version (as in 1fed9834b3) 2013-10-05 22:28:04 +02:00
Julius 3a948e9b73 Move list.js extensions to plugins 2013-10-04 18:28:45 +02:00
wvengen 64a597c689 use i18n-js 2013-10-04 15:01:10 +02:00
wvengen a9dff7f1df add missing i18n 2013-10-04 10:25:53 +02:00
Julius ac1341d5b0 Merge branch 'master' of http://github.com/foodcoops/foodsoft into article-price-tooltip 2013-10-03 23:22:31 +02:00
Julius 9a9a782bc4 Complete StockArticle#show view 2013-10-03 23:21:53 +02:00
Julius fef8c6d99f Move StockArticle#history to StockArticle#show 2013-10-03 22:24:21 +02:00
Julius a3e82f5304 Add article price tooltip to StockTaking form 2013-10-03 22:14:41 +02:00
wvengen bbcad49831 start moving from simple_form i18n to activerecord 2013-10-03 16:03:13 +02:00
wvengen 1674dcf851 fix i18n of article sync 2013-10-03 14:36:53 +02:00
wvengen 1870276cd2 show user name with use_nick is false 2013-10-02 23:43:09 +02:00
wvengen 1d8fefcfb7 small i18n update 2013-10-02 17:08:24 +02:00
Julius d36f2dd4ac Fix minor delivery bug 2013-09-30 11:04:55 +02:00
Julius a87ced2646 Hide article category if no article matches the search 2013-09-24 21:21:08 +02:00
Julius 9f083dd4d0 Add button to clear article search (list.js customization) 2013-09-23 21:31:54 +02:00
Julius 3c8f56b24f Add dismiss button to sidebars in group_order form (idea stolen from foodcoops#143) 2013-09-22 22:07:34 +02:00