Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
571 commits 22 branches 1 tag 31 MiB
Commit graph

454 commits

Author SHA1 Message Date
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
Benjamin Meichsner
b0e12d177e Fixed editing an order and take care of group_orders. 2013-03-10 19:22:26 +01:00
Benjamin Meichsner
762d529894 Added info link for apple restriction feature. 2013-03-09 18:14:53 +01:00
Benjamin Meichsner
50873addf8 Fixed deleting of articles. Added missing id. 2013-03-09 16:46:33 +01:00
Julius
467b53c009 Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3-ajaxArticleDelete 2013-02-25 11:14:48 +01:00
Julius
0e1bd5c75e Improve (AJAX) deletion of StockArticles 2013-02-25 11:12:28 +01:00
Julius
5dc3fc30ad Revert 099e2b9b06 2013-02-25 10:29:47 +01:00
Julius
8f15cfb446 Revert 396a47b6af 2013-02-25 10:13:44 +01:00
Julius
ccf0d010b4 Apply AJAX for deleting a StockArticle 2013-02-25 10:02:21 +01:00
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
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