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

1150 Commits

Author SHA1 Message Date
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
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 e1eb6031c8 load fr translation for datepicker 2013-10-17 16:48:34 +02: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 d64590a534 more robustness 2013-10-10 17:50:10 +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 6c17c17982 i18n simple_form move of fax pdf 2013-10-09 23:41:15 +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 762292ef8e small i18n move 2013-10-09 22:29:19 +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
Julius 28644dc334 Force update in Order#finish; rescue if error raised 2013-10-08 19:58:11 +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 dce92b9d7c i18n ordering javascript 2013-10-04 15:01:24 +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
Julius 26e207aeb1 Reuse some list.js standard template functions (thanks to wvengen https://gist.github.com/wvengen/6784056) 2013-10-03 16:10:18 +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 1946cd1ab3 make user creation possible again 2013-10-02 23:33:24 +02:00
wvengen bc5795b052 small model change 2013-10-02 23:29: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 1d8fefcfb7 small i18n update 2013-10-02 17:08:24 +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
Julius d36f2dd4ac Fix minor delivery bug 2013-09-30 11:04:55 +02:00
Julius c1ac95e440 list.unlist.js: Use jQuery's toggleClass instead of native if-else (just for briefness) 2013-09-25 20:58:53 +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
Julius 6ec81ace18 Always show article category headers (do not unlist them on list.js search) 2013-09-22 22:04:29 +02:00
Julius 891293af84 Add delay to list.js search 2013-09-22 21:50:59 +02:00
wvengen ea3db22306 user display changes in model and mailer 2013-09-22 14:38:56 +02:00
wvengen f6c2fd9a9d more user display changes 2013-09-22 02:15:35 +02:00
wvengen 6d3db7636a make search work without nickname usage 2013-09-20 23:18:06 +02:00
wvengen 17c1ee803f fix typo breaking invitation 2013-09-20 23:15:44 +02:00
wvengen e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
wvengen a77c3b59b1 allow to login with email instead of nick as well + tests 2013-09-20 22:39:19 +02:00
Benjamin Meichsner 2060261c89 Merge pull request #144 from foodcoop-adam/fix-closed-group_order-totals 
fix closed group_order totals
 2013-09-19 03:14:40 -07:00
Julius 14d4d2f12d Add list.js for filtering articles (another try for foodcoops#143) 2013-09-18 23:28:18 +02:00
wvengen c7f28a3b5c use plain Ruby memoization to fix deprecation (closes #121) 2013-09-18 22:46:58 +02:00
wvengen ebb22ccb53 Merge branch 'master' into fix-closed-group_order-totals 
Conflicts:
	db/schema.rb
 2013-09-18 18:14:07 +02:00
Benjamin Meichsner b015ceea0b Merge branch 'warn-uncheck-ordered-article' of https://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-warn-uncheck-ordered-article 2013-09-18 17:50:30 +02:00
Benjamin Meichsner 857eb64a45 Merge pull request #173 from foodcoop-adam/keep-member-order-on-orderarticle-deletion 
Keep member order on orderarticle deletion
 2013-09-18 08:32:33 -07:00
Benjamin Meichsner 7e659e2374 Merge branch 'order-display-improvements' of https://github.com/foodcoop-adam/foodsoft into foodcoop-adam-order-display-improvements 2013-09-18 17:16:04 +02:00
wvengen 0abb63279f Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
 2013-09-18 13:00:26 +02:00
Robert Waltemath 142de28ade Split up messages for stock/ supplier orders. 2013-09-18 10:50:56 +02:00
Robert Waltemath e728e76729 Merge branch 'master' into warn-uncheck-ordered-article 2013-09-17 17:10:56 +02:00
wvengen 6d4aa5ed40 Merge pull request #163 from foodcoop-rostock/order-tasks-alphabetically 
Order tasks with same date by name.
 2013-09-17 05:45:13 -07:00
wvengen f224735718 remember what member ordered when deleted in balancing screen 2013-09-17 14:19:46 +02:00
wvengen b11706f30a sort ordergroups in order screen and pdfs 2013-09-17 00:25:38 +02:00
wvengen 8ca95f396f make both ordered and received products visible in order screens and pdfs 2013-09-16 23:52:58 +02:00
wvengen 1bb257c41b remember member order when order article is deleted + test 2013-09-13 15:37:30 +02:00
wvengen b235592656 add total to order pdf, layout changes (closes foodcoops/foodsoft#138) 2013-09-10 11:59:32 +02:00
wvengen 39b3dee050 do not show empty fields on fax pdf (closes foodcoops/foodsoft#108) 2013-09-10 11:59:32 +02:00
wvengen e20898c5ee Merge branch 'tests-rspec' into master-spec 2013-09-10 11:37:05 +02:00
wvengen 12c0636941 fix i18n buglets (closes #167) 2013-09-10 10:27:13 +02:00
wvengen 7de57715f2 Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
 2013-09-07 01:11:24 +02:00
Benjamin Meichsner a0760ebfdb Fixed delivering emails to users. 
There was a bug in User#receive_email? Return values are now true or false, not '1' or '0'.
 2013-09-06 11:40:40 +02:00
Robert Waltemath 9f22615a25 Order tasks with same date by name. 2013-09-05 10:16:57 +02:00
Robert Waltemath 805071f3fb Added checkbox to ignore warnings. Added translations. 2013-09-04 10:52:14 +02:00
Robert Waltemath bb25bdc6eb Improved error data passing. 2013-09-03 17:37:49 +02:00
Robert Waltemath 1c9fad0a7b Added validation for removed but ordered articles. 2013-09-03 12:09:33 +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 37e5b0c25c add balancing integration spec 2013-07-26 18:34:03 +02:00
wvengen bb20e9abea Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-24 21:25:36 +02:00
wvengen b9599ce455 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
 2013-07-18 20:28:56 +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 c85a7fcc5c fixes User#receive_email? 2013-07-18 16:58:04 +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
wvengen 1fed9834b3 fix tooltip after bootstrap update 2013-07-17 11:31:27 +02:00
wvengen ccea97c2b3 update bootstrap assets 2013-07-17 11:31:12 +02:00
wvengen eef4626107 Merge branch 'master' into updated-gems 
Conflicts:
	Gemfile.lock
	app/views/deliveries/_form.html.haml
 2013-07-17 11:04:28 +02:00
wvengen b81472d91b Merge pull request #159 from foodcoop-rostock/improve-delivery-workflow-further-stupid 
Move client-side sorting into separate javascript file.
 2013-07-17 01:54:18 -07:00
wvengen ebe93e292b Merge pull request #141 from foodcoop-rostock/improve-delivery-workflow-further 
Improve delivery workflow
 2013-07-17 01:43:59 -07:00
Julius 9f464706b4 Undo senseless indentation correction 2 2013-07-16 22:04:44 +02:00
Julius 3b91b9f7c6 Undo senseless indentation correction 2013-07-16 22:03:47 +02:00
Julius 7fd8abf381 Replace 'own' js table sorting by stupidtable plugin 2013-07-16 22:01:56 +02:00
wvengen 9fb6597980 Merge branch 'master' into updated-gems 2013-07-16 00:00:55 +02:00
Julius 4fafdcb7ad Remove broken font-size fix which is no longer needed 2013-07-15 21:58:09 +02:00
wvengen db80fbd807 Merge branch 'master' into tests-rspec 2013-07-15 18:45:04 +02:00
wvengen 5e9a49b2c7 make uniqueness_of_name validations work again (closes foodcoops/foodsoft#157) 2013-07-15 18:03:02 +02:00
wvengen 3ed8e0bc84 allow longer supplier phone number 2013-07-15 17:57:00 +02:00
Julius 0e66414534 Allow creation of StockArticles also if there are no Articles for a supplier in delivery form 2013-07-14 22:00:38 +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 12506e54b8 Remove stock_changes_helper.rb 2013-07-13 09:34:19 +02: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
Julius e5eff07abd Move Select2 for stock_article_creation to tfoot of delivery form 2013-07-12 21:15:12 +02:00
wvengen f57038ff56 show quantity/tolerance in order screen when unit_quantity=1 2013-07-11 23:20:37 +02:00
wvengen db8a929f0b Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks 
Great!
 2013-07-11 12:48:41 -07: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 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
wvengen 2ef7e58b0b Merge pull request #146 from foodcoop-adam/add-only-undeleted-articles 
only add undeleted articles in balancing screen
 2013-07-10 13:05:50 -07:00
wvengen 33d3b9c466 merge branch minimum_balance into master (closes #133) 2013-07-10 22:03:57 +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 5ed2659bc6 Fix StockArticle update in Delivery form 2013-07-09 17:08:59 +02:00
Julius 164b3f7415 Replace deprecated $.fn.live in delivery form 2013-07-08 22:49:49 +02:00
wvengen 33b27d2fa7 proper usage of jQuery.on(), and update javascript in views as well 2013-07-08 22:41:06 +02:00
Julius f76b9da1e9 Separate columns for article price and unit in delivery form 2013-07-08 22:19:27 +02:00
Julius a6228bdcf2 Style bootstrap tooltip; show FC share in article price info 2013-07-08 22:10:36 +02:00
Julius bba70dc875 Change DOM sort style to match existing style 2013-07-08 21:51:15 +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
Julius 5fcc14a36d Fix trailing '*/' in application.css 2013-07-08 20:46:05 +02:00
wvengen e9e7135639 run bundle update and make it work again 2013-07-08 14:32:24 +02:00
wvengen 1eeec23c80 only add undeleted articles in balancing screen 2013-07-08 02:31:54 +02:00
Julius Rapp a5565b436f Resolve merge conflicts 2013-07-07 14:58:57 +02:00
Julius Rapp 1ebd4e3ce6 Use foodsoft button and table styles (no btn-group, no table-condensed) 2013-07-07 14:19:30 +02:00
Julius Rapp 4a208c83c0 Separate actions for new StockArticle 2013-07-07 14:14:32 +02:00
wvengen d397132f7b be safe even with locale string 2013-07-07 02:31:42 +02:00
wvengen 8080cd6b7e pass locale to datepicker, use gem for that 2013-07-07 01:47:22 +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 a6688b3b43 import manufacturer and origin too (closes #140) 2013-07-06 17:48:40 +02:00
wvengen 497c9e0cf1 fix closed group_order totals 2013-07-02 12:01:25 +02:00
wvengen d7540bdd20 fix i18n key 2013-06-30 13:08:13 +02:00
wvengen b807e9d059 beautify order mail 2013-06-29 02:54:00 +02:00
wvengen f11d10ff07 update order result mail (fixing html quoting of quotes) 2013-06-29 02:22:01 +02:00
wvengen 9d406bbc08 make resque worker function on non-multi-coop-installs too 2013-06-29 01:48:57 +02:00
wvengen 0978b84f4d set user language on login to override session 2013-06-28 13:30:26 +02:00
Robert Waltemath e5d790021c Add repeated symbol to task list. 2013-06-27 10:22:22 +02:00
Julius 69060a6da6 Fix ordering of stock_changes in delivery 2 2013-06-27 09:10:46 +02:00
Julius d0ccf07bc5 Merge latest changes in master of http://github.com/foodcoops/foodsoft 2013-06-26 20:23:11 +02:00
Julius a29d52dcae Fix ordering of stock_changes in delivery (case-insensitive ordering did not work properly for all database flavors) 2013-06-26 20:14:33 +02:00
Julius 8a79dfd167 Add tooltip for article prices 2013-06-26 20:06:38 +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
wvengen befe89d4ef fix tolerance display in group_order form 2013-06-26 01:36:44 +02:00
wvengen c31e864c73 internationalise currency in order screen 2013-06-26 01:17:04 +02:00
wvengen dddd11d8f0 do not autocapitalize or autocorrect on login fields to avoid login errors on iPad/iPhone 2013-06-26 00:42:09 +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 c27127c745 Added i18n strings. 2013-06-24 11:53:52 +02:00
Robert Waltemath 3d1faa9ed3 Skip save callback when migrating data. 2013-06-24 10:36:14 +02:00
Robert Waltemath d081a2c66b Validate done/weekly combination only on creation of task. 2013-06-24 09:49:06 +02:00
Robert Waltemath 577945e591 Add validation for task.done in combination with periodic task. 2013-06-22 18:56:17 +02:00
Robert Waltemath a7fd7a7936 Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00
Robert Waltemath ef329b5647 Added up and down migration for weekly task data. 2013-06-22 17:35:45 +02:00
Robert Waltemath 990397a7f0 Delete only the FOLLOWING tasks. 2013-06-21 22:04:36 +02:00
Robert Waltemath c52e482743 Exclude tasks from groups when changing attributes. 2013-06-21 20:54:24 +02:00
wvengen cab6ada8b8 small invoice i18n cleanup/refactoring 2013-06-21 14:24:05 +02:00
wvengen 906093b3ce small i18n fixes and clarifications 2013-06-21 13:49:34 +02:00
Robert Waltemath 6b62fc90d8 Now creating periodic task via button 2013-06-21 13:48:48 +02:00
wvengen 3cfd8b2d44 fix i18n key 2013-06-21 13:25:52 +02:00
wvengen 931b3bef5e fix touch event twice bug (complements ac62dcce9d) 2013-06-20 01:20:13 +02:00
Julius bf32e72414 Improve delivery form validation 2013-06-19 11:21:55 +02:00
wvengen c48ce138f3 cleanup of profile layout 2013-06-18 12:25:05 +02:00
Julius 04c9770e80 Complete I18n 2013-06-18 10:59:53 +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 cc5574f8b5 Revert ac62dcce9d 2013-06-18 09:10:31 +02:00
wvengen 1e984df3aa more beautiful ordergroup edit form 2013-06-18 01:35:12 +02:00
Julius 6e6cce1cb7 Add Select2 jQuery plugin 2013-06-17 16:15:19 +02:00
Julius 9502ca28dd Merge latest changes in master 2013-06-17 15:47:08 +02:00
Julius a9938df443 Clean up sort functionality; Remove title attributes due to hard I18n 2013-06-17 15:43:42 +02:00
Benjamin Meichsner eee5d4a896 Fixed indentation bug in sync template. 2013-06-16 15:10:50 +02:00
Benjamin Meichsner 8c4da55561 Merge branch 'show-percent-sign' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-show-percent-sign 2013-06-16 14:55:48 +02:00
wvengen 713c030213 i18n and translate missing entry 2013-06-15 18:43:42 +02:00
Manuel Wiedenmann 6569579c02 styles the preferences in user profile 2013-06-14 22:38:07 +02:00
Julius b5acd9b116 Merge master branch of base 2013-06-14 18:59:17 +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
wvengen ac62dcce9d make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104) 2013-06-14 01:42:47 +02:00
wvengen 8141ad0233 remove duplicate code 2013-06-14 01:39:30 +02:00
wvengen 13f2c128c6 do not use string values for integers (closes foodcoops/foodsoft#128) 2013-06-14 01:36:41 +02:00
Julius 3a48d1576f Remove broken sort-by-price; comment redundancy of stock_change template 2013-06-13 23:51:37 +02:00
Julius 65f61e09d5 Improve delivery workflow; introduce sortable tables; use js.erb for deliveries 2013-06-13 23:36:22 +02:00
wvengen 3d1847fabb small i18n and translation updates 2013-06-12 22:44:51 +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
Robert Waltemath 46b07a6136 Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks 
Conflicts:
	config/locales/de.yml
 2013-06-12 10:00:11 +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
wvengen b7f71f5859 fix reset password breakage by avoiding encoding ampersand in url (closes #123) 2013-06-11 00:01:57 +02:00
Julius 9753e6db00 Resolve merge conflicts with i18n 2013-06-10 20:05:47 +02:00
Robert Waltemath 6bdb7b35f0 Showing/allowing multiple suppliers per shared supplier in shared-supplier-listing. 2013-06-10 11:37:59 +02:00
Robert Waltemath b7416b2210 Fixed percent sign in sync-view. 2013-06-10 11:01:31 +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 241c5666ec Merge pull request #119 from balkansalat/rails3-improve-checkall-performance 
Improve performance of *check-all* checkbox
 2013-06-09 09:19:19 -07:00
Benjamin Meichsner fd091d9b89 Merge pull request #118 from balkansalat/rails3-order-delivery-articles 
Order articles for delivery selection by name only
 2013-06-09 09:15:20 -07:00
Benjamin Meichsner 7c4ee01ff2 Define autofill attributes when creating new supplier from shared_supplier. 2013-06-09 18:02:47 +02:00
Benjamin Meichsner 60afa85ece Merge pull request #116 from balkansalat/rails3-balancing-delete-article 
Update ordergroup prices in OrderArticles via Order.
 2013-06-09 08:26:38 -07:00
Julius 0ebe38b7a9 Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-improve-checkall-performance 2013-06-07 09:52:56 +02:00
Julius 966902ff55 Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-order-delivery-articles 2013-06-07 09:51:50 +02:00
Julius ff343933dd Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-show-percent-sign-in-views 2013-06-07 09:49:32 +02:00
Julius 0058e826b2 Reorder delivery articles 2013-06-07 09:35:22 +02:00
Julius 0f4614eb31 Add percent sign for tax in forms 2013-06-06 17:58:02 +02:00
Julius b8a23a396c Remove test variable 2013-06-06 17:09:22 +02:00
Julius 0d3c23f814 Improve performance of data-check-all 2013-06-06 17:06:05 +02:00
Manuel Wiedenmann 0061e45198 removes routes locale constrain and fixes some bugs 2013-06-06 04:29:53 +02:00
Manuel Wiedenmann 60c4c5510a adds a new user settings system + migration + rake task/worker updates 2013-06-06 03:40:15 +02:00
wvengen 8929f69dc4 add missing i18n text 2013-06-06 02:42:38 +02:00
wvengen c38ce28347 fix i18n bug 2013-06-06 02:13:40 +02:00
Robert Waltemath 82fb6d1dbe Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112. 2013-06-06 00:37:50 +02:00
wvengen 043fc6391c show header on fax PDF (closes bennibu#109) 2013-06-04 13:08:50 +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
Robert Waltemath 2a1176c31a Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112. 2013-05-30 10:54:22 +02:00
wvengen 3b7cbf71e0 fix i18n typos 2013-05-16 00:05:47 +02:00
wvengen 0c94ef5912 also translate mail subjects 2013-05-07 13:28:14 +02:00
wvengen 8b559269c9 add deliveries, pages, tasks translation in English 2013-05-06 12:43:57 +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 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
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 3e9ca336a8 Fixed loosing assignments when updating a task. 2013-04-10 10:55:43 +02:00
Benjamin Meichsner 93f4239db6 Fixed wrong articles total in group_order#show. 
Conflicts:

	app/views/group_orders/show.html.haml
 2013-04-10 10:54:56 +02:00
Benjamin Meichsner d4b9370541 Fixed setting all user setting to false in user profile. 2013-04-10 10:52:41 +02:00
Benjamin Meichsner 79d1c5a66d Allow article price equal to zero. Closes #111 2013-04-10 10:51:36 +02:00
Benjamin Meichsner 5b81c53a73 Fixed setting all user setting to false in user profile. 2013-04-08 15:08:57 +02:00
Benjamin Meichsner 20e439c2a7 Allow article price equal to zero. Closes #111 2013-04-08 14:40:02 +02:00
Benjamin Meichsner 4966aae0ad Fixed modal forms. Submit form when hitting enter. 2013-04-08 14:27:23 +02:00
Benjamin Meichsner 9c21a14c7e Update group results when editing order article in balancing. 2013-04-08 14:26:40 +02:00
Benjamin Meichsner 220343128c Fixed wrong articles total in group_order#show. 2013-04-08 13:39:02 +02:00
Benjamin Meichsner 03ea8e194e Fixed loosing assignments when updating a task. 2013-04-08 01:31:21 +02:00
Benjamin Meichsner 13e921a632 Fixed some errors in articles#sync. Show better error messages. 2013-04-08 01:00:49 +02:00
wvengen f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
wvengen 4aa40b387a finish article_categories controllers i18n + translation 2013-04-04 02:10:52 +02:00
wvengen 8c8778459e finish documents i18n 2013-04-04 02:04:31 +02:00
wvengen 24d04b25db fix some small i18n errors 2013-04-04 00:56:45 +02:00
wvengen ec1ef0289b finish i18n of article_categories + translation 2013-04-04 00:44:07 +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
wvengen e1f5969719 use short form plus title for unit quantity 2013-04-04 00:24:14 +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 f81e315d6f finish i18n of models without view 2013-03-22 01:21:44 +01:00
wvengen 75a1051668 finish articles i18n, controller+model 2013-03-22 00:59:42 +01:00
wvengen aabeb1a332 finish articles i18n 2013-03-22 00:20:37 +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 22550029b3 Added missing ajax support for messages index. Fixed #101 2013-03-20 23:31:13 +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 528295884e Allow deleting of category, when there are only deleted articles left. 2013-03-17 20:13:11 +01:00
Benjamin Meichsner 931bb1d7ca Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 2013-03-17 20:03:18 +01:00
Benjamin Meichsner 6745b79bb9 Allow importing articles again, when article was deleted before. 2013-03-17 20:02:14 +01:00
bennibu 28343fc124 Merge pull request #99 from balkansalat/rails3-fix-stock-ordering-2 
Prevent sold-out articles from being removed from stock order when editing
 2013-03-17 11:50:56 -07:00
bennibu 033d3459a0 Merge pull request #98 from balkansalat/rails3-stock-taking-article-name 
Prevent article name from being truncated in StockTaking form
 2013-03-17 11:41:32 -07:00
bennibu bd0c251313 Merge pull request #97 from balkansalat/rails3-stockit-increase 
Fix stockit increase formula in javascript
 2013-03-17 11:34:16 -07:00
Benjamin Meichsner 59de2e42a9 Fixed showing deleted articles when asking for available articles. 2013-03-17 18:36:34 +01:00
Benjamin Meichsner dd0bd0ad7e Fixed updating order article in stockit balancing. 2013-03-17 18:33:04 +01:00
Benjamin Meichsner f7e885de7e Fixed bug in fax template when there are missing supplier infos. 2013-03-17 18:10:48 +01:00
Benjamin Meichsner 3a9ec5a3dd Fixed wiki site-map, when there is no homepage. 2013-03-17 17:57:35 +01:00
Benjamin Meichsner 707f989768 Fixed routes in redirect after direct_close of orders. 2013-03-17 17:50:50 +01:00
Benjamin Meichsner 329c451774 Fixed articles sync view. 2013-03-17 17:47:37 +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
Robert Waltemath 981944b869 Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks 
Conflicts:
	Gemfile
	db/schema.rb
 2013-03-15 17:59:19 +01:00
Julius 6aa0e0b736 Rename and comment new functions for fixing stock ordering 2013-03-15 08:50:55 +01:00
Julius 396e220369 Prevent article names from being truncated in StockTaking form 2013-03-14 22:30:22 +01:00
Julius 3208321319 Fix stockit increase formula for present behavior 2013-03-14 21:55:10 +01:00
Julius 8d0761a6c8 Merge branch 'rails3-fix-stock-ordering' into rails3-fix-stock-ordering-2 2013-03-14 21:14:42 +01:00
Benjamin Meichsner 8bafb3f4b2 Show supplier name for articles in stockit order. 2013-03-12 19:08:18 +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
Benjamin Meichsner 40d9195eac Fixed broken group_orders after editing order. 
Caution, when using the model.association = models operator,
the after save callbacks are not triggerd! See Order#save_order_articles
 2013-03-12 11:26:14 +01:00
Benjamin Meichsner c18fb20115 Ensure to get also deleted entries in belongs_to assoc. 2013-03-10 19:39:59 +01:00