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

528 Commits

Author SHA1 Message Date
Benjamin Meichsner 6685012a3e Fixed bad syntax (from already dropped meta_where gem). 
Thanks to wvengen, closed #91
 2013-02-24 23:56:56 +01:00
Benjamin Meichsner 82178161fa Show usefull error message for uniqueness_of_name with acts_as_paranoid. 
Fixed #88
 2013-02-24 23:26:16 +01:00
wvengen 569cdce2db finish finance controller i18n 2013-02-22 00:44:39 +01:00
wvengen 8043fd2164 finish foodcoop i18n + controller + model 2013-02-22 00:19:22 +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 734179a2bd clarify group_orders i18n 2013-02-12 00:06:23 +01:00
wvengen cb2c724abd fix typo 2013-02-11 23:37:52 +01:00
wvengen 20533a5163 fix orders i18n 2013-02-11 15:34:31 +01:00
wvengen a0a974b9ce finish stockit i18n + controllers + model 2013-02-11 11:19:26 +01:00
Manuel Wiedenmann 0065c44b74 i18n finance ordergroups 2013-02-11 10:21:39 +07:00
Manuel Wiedenmann d2cd5b2b02 i18n group order articles 2013-02-11 10:21:39 +07: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
Manuel Wiedenmann 2d58054d1c added order for interpolation 2013-02-10 15:05:31 +07:00
wvengen 22b3f3a491 fix bug in javascript i18n 2013-02-09 10:19:48 +01: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
wvengen 8d899581bd finish group_orders i18n + controller 2013-02-09 02:01:31 +01:00
wvengen 28c66642f5 finish shared i18n 2013-02-08 19:16:06 +01:00
wvengen e06524ca37 finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01:00
wvengen d818ea5d53 finish suppliers controller I18n 2013-02-08 00:31:09 +01:00
wvengen eb1e02015e finish suppliers i18n 2013-02-08 00:11:58 +01:00
wvengen de730808e7 finish mailer i18n 2013-02-06 00:50:59 +01:00
wvengen b12a906a74 finish login i18n + controller 2013-02-05 12:54:55 +01:00
wvengen c5de69bfc5 typo 2013-02-05 12:30:44 +01:00
wvengen 39812bef99 finish layouts i18n, use help url from config, use html language from locale 2013-02-05 12:11:29 +01:00
wvengen 5b53749fe6 fix small format bug in template 2013-02-04 13:13:04 +01:00
wvengen ecce8041a1 invites controller i18n 2013-02-04 13:01:06 +01:00
wvengen 034f6a8f5c finish invites i18n 2013-02-04 12:59:04 +01:00
wvengen 9138f0da03 also internationalize home controller 2013-02-04 02:12:24 +01:00
wvengen 1860e1c4cc also internationalize sessions controller 2013-02-04 02:00:27 +01:00
wvengen 0c09696b2c finish sessions i18n 2013-02-04 01:46:07 +01:00
wvengen 2b11549d33 finished home i18n 2013-02-04 00:46:22 +01:00
Manuel Wiedenmann 64b3d7e17d finished admin/users i18n + dry the admin i18n 2013-02-04 01:38:18 +07:00
Manuel Wiedenmann 75c9338fd9 finished admin/workgroups i18n 2013-02-04 00:36:03 +07:00
Manuel Wiedenmann e949257912 finished admin/ordergroups i18n 2013-02-04 00:10:11 +07:00
Manuel Wiedenmann 42c97520a1 started with admin views 2013-02-03 23:16:42 +07:00
wvengen e0b781fca6 split locales into directory, and load from there 2013-02-01 17:56:34 +01:00
Julius a511da9ae3 Prevent stock_articles from appearing in supplier article index 2013-01-30 21:21:49 +01:00
Julius 2c9fdcd79e Show customer number in fax pdf 2013-01-30 19:46:18 +01:00
Julius 8c7a4f0331 Fix empty dd in horizontal dl 2013-01-29 17:52:44 +01:00
Julius 396a47b6af Improve stock_article_selections 2013-01-28 20:46:35 +01:00
Julius 524819b86f Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3 
Conflicts:
	app/helpers/application_helper.rb
 2013-01-27 22:01:53 +01:00
Benjamin Meichsner 8b2b70f8bf Fixed saving user for new orders. 2013-01-26 16:24:45 +01:00
Benjamin Meichsner 04b611a080 Temporairly deactivated helper in new delivery form. 2013-01-26 15:57:29 +01:00
Benjamin Meichsner 310a97912c Fixed disabling submit_button in group order form. 2013-01-26 15:41:46 +01:00
Benjamin Meichsner 3ab3ff2bc4 Minor speed improvements for group order load. 2013-01-26 15:18:35 +01:00
Benjamin Meichsner 2a66d37c3a Fixed wrong start balance in new group order. 2013-01-26 15:17:56 +01:00
Julius ce0300df43 Fix order.created_by 2013-01-12 16:24:13 +01:00
Julius 099e2b9b06 Add stock_article_selection (deleting multiple stock articles at once) 2013-01-12 16:14:06 +01:00
benni 0364562273 Fixed return_to when authorization gets lost. 2012-12-30 16:34:01 +01:00
benni f6ff422405 Fixed missing line breaks in haml email templates. 2012-12-30 16:24:36 +01:00
benni 349cadd5e9 Renabled mail delivering in invites and login contrller. 2012-12-30 16:11:35 +01:00
benni 28aec7e4d6 Replace ordergroup.account_updated with non database attr. 2012-12-30 15:31:37 +01:00
benni a489079334 Fixed wrong request method in deny_access. 2012-12-30 15:13:50 +01:00
benni ba75a6e328 Fixed accidently switching to english locale in production. 2012-12-29 17:48:14 +01:00
benni cd583cc9b2 Set host infos for urls in emails via app_config. 2012-12-28 13:55:18 +01:00
benni db07b28b1c Fixed bug in accessing foodsoft config. 2012-12-28 13:28:03 +01:00
benni 2c0fe08be6 Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +01:00
benni b9138efa79 Fixed floating error in group_order new. 2012-12-22 14:42:19 +01:00
benni d954279d6a Show accept/reject button in task show view. 2012-12-22 14:29:59 +01:00
benni 807d476e44 Fixed missing scoping by ordergroup in financial index. 2012-12-22 14:23:58 +01:00
benni 1298af8377 Small improvement for update price. Removed delayed job. 
Attention, every delayed job has to know its Foodcoop scope. Otherwise
every task will be executed in the default database. See email delivery.
 2012-12-16 21:46:24 +01:00
benni 0dff5ea784 Fixed some bugs in tasks, apple feature: 
* Update ordergroup stats when task is destroyed.
* Removed assigned caching attribute in task object.
* A lot of eager loading for tasks controller.
 2012-12-16 19:07:45 +01:00
benni 9919183cb0 Fixed missing group_order_article in group_order show. 
Also add eager loading for associated objects.
 2012-12-16 16:50:09 +01:00
benni 0fcd5abb3a Fixed strange RecordReadOnly exception in task done. 2012-12-16 14:13:54 +01:00
benni cabcd201a6 Improvements for Ordergroup.avg_jobs_per_euro. 
Tip #2, Avoid initializing hole activerecord object whenever possible.
Use Class.pluck(:attribute) instead of Class.all.map(&:attribute)!
 2012-12-16 13:56:47 +01:00
benni b86172bc62 Performance improvements for ordergroup.update_stats! 
As I have learned today. Let mysql do the counting, calculation stuff.
In most of the cases, it will be much faster!
 2012-12-16 13:48:15 +01:00
benni 0edd29dfd4 Merge branch 'master' into master-to-rails3 
Conflicts:
	Gemfile
	README_DEVEL
	app/controllers/articles_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/tasks_controller.rb
	app/models/task.rb
	app/views/articles/_import_search_results.haml
	app/views/articles/index.haml
	app/views/messages/new.haml
	app/views/ordering/_order_head.haml
	app/views/ordering/my_order_result.haml
	app/views/orders/show.haml
	app/views/stockit/new.html.haml
	db/schema.rb
 2012-12-14 18:10:46 +01:00
benni d9681eaf30 Added validation for article_price. Avoid unit_quantity of 0. 2012-12-11 10:59:50 +01:00
benni bae09624b7 Avoid deleting categories which still have articles. 2012-12-11 10:53:01 +01:00
benni 620ec946f1 Merge branch 'master' into master-rails3-merging 
Conflicts:
	.gitignore
	.rbenv-version
	app/controllers/finance/balancing_controller.rb
	app/views/finance/balancing/_order_article_form.html.haml

Fixed updating current price in finance balancing.
 2012-12-11 10:32:59 +01:00
benni ddcb4a9b2d Moved acts_as_configurable to gemfile. 2012-11-24 16:49:19 +01:00
benni 7e6ac8c924 Moved acts_as_tree to gemfile. 2012-11-24 16:41:34 +01:00
benni 7fc0462fc4 Upgrade to rails 3.2.9. Moved acts_as_versioned to gem. 2012-11-24 16:36:40 +01:00
benni 7c9d666909 Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 
Conflicts:
	Gemfile
 2012-11-24 15:27:48 +01:00
benni ecc31641aa Changed header to copy old foodsoft style. 2012-11-24 15:23:12 +01:00
benni e1cb866935 Remove html5 support for IE Browsers. 2012-11-24 13:53:19 +01:00
Robert Waltemath 2bd52b9270 Corrected config hash index to ':mailing_list_subscribe' 2012-11-13 10:18:40 +01:00
Robert Waltemath c032fdca6e Merge remote-tracking branch 'upstream/master' 2012-11-13 08:55:50 +01:00
Julius d086fe7cc7 Fix task validation again #16; mark assignment validation TODO 2012-11-12 21:31:04 +01:00
Julius e561ddb064 Fix task validation #16 2012-11-12 20:14:06 +01:00
Julius 95efe554fc Add another option for mailing list subscription tip 2012-11-12 18:08:47 +01:00
Julius c17ff281c3 Save and display creator of Order 2012-11-12 14:24:49 +01:00
benni f4f10b1e4c Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
benni 1d9815731c Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
benni dce79802e0 Fixed feedback. 2012-11-10 17:05:43 +01:00
benni 181695d1bd Small fixes for article_categories. 2012-11-10 16:51:30 +01:00
benni 0236fb5a60 Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
benni 16de9124fe Fixes orders. 2012-10-30 00:20:47 +01:00
benni 8f7e21b918 Fixed stockit. 2012-10-29 18:28:17 +01:00
benni 27c719d8da Fixed article categories. 2012-10-29 17:35:50 +01:00
benni fc1c173718 Fixed articles module. 2012-10-28 18:03:50 +01:00
benni ee3da51ad3 Fixed bug in new stockit article form. 2012-10-24 12:19:53 +02:00
benni f30e57dd49 Fixed articles views. 2012-10-19 01:12:47 +02:00
benni fd361090b4 Nice breadcrumb 2012-10-18 23:43:31 +02:00
benni 9af26e1da6 Fixed deliveries. 2012-10-17 20:45:52 +02:00
benni 552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00