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

403 commits

Author SHA1 Message Date
wvengen
1b48882c0e Refactor orders index 2015-02-18 23:46:50 +01:00
wvengen
118886344a Use boolean comparators where it makes sense 2015-01-14 21:17:00 +01:00
wvengen
1b9b81fa75 Make sync work when unit has no name 
(closes foodcoops#337)

Conflicts:
	app/models/article.rb
 2015-01-02 23:20:36 +01:00
wvengen
f340b127dc Fix fast test failing 2015-01-02 18:08:38 +01:00
wvengen
cee2ac8f9f Merge pull request #331 from foodcoops/feature/configure-upfront-tasks 
Configure upfront tasks
 2014-12-06 14:35:22 +01:00
wvengen
f6c008c79c Allow configuration of task periods 2014-11-23 01:34:51 +01:00
wvengen
219eb71bc9 Allow to specify an order schedule for new orders. 2014-11-23 00:38:13 +01:00
wvengen
6e990fed4c Upgrade to rails 4.1 2014-11-21 14:37:56 +01:00
wvengen
0e1cde9e2b more extensive database seeds (in two languages) (closes foodcoops#277) 2014-09-29 17:26:27 +02:00
Benjamin Meichsner
91bcf0c580 Avoid out of range error when using big numbers in financial transactions. 
The database schema allows numbers up (+/-) 999_999.99. But as we are also adding the amount to the Ordergroup#account_balance, we use lower barriers to avoid running in errors when updating the account balance.

So, technically the user has to make 10 times the maximum input to raise an account balance error. This should be sufficient, I hope.
 2014-09-22 11:36:10 +02:00
Benjamin Meichsner
0231df9d5b Delete memberships when deleting associated groups. 2014-09-21 12:47:58 +02:00
wvengen
cf360335ee fix articles with zero quantity showing 
complements 8913ad615c
 2014-09-11 13:47:03 +02:00
wvengen
8473f16091 query performance improvements 2014-09-02 12:58:32 +02:00
wvengen
647b7f0430 allow to synchronize all articles of a shared supplier 2014-09-02 12:58:31 +02:00
wvengen
3918e22214 synchronize price on two decimal places only 2014-09-02 12:58:31 +02:00
wvengen
d9c61b2db3 allow to match category names on import/sync 2014-09-02 12:58:31 +02:00
wvengen
ecf5601023 make missing_units get correct details for closed orders 2014-09-01 12:25:42 +02:00
wvengen
8913ad615c show articles ordered by members but not by foodcoop dimmed in receive 2014-08-29 12:23:23 +02:00
wvengen
a43020463d normalize article and category attributes (closes foodcoops#294) 2014-06-23 17:51:19 +02:00
wvengen
7c2ecd8658 add some model api docs 2014-06-23 17:51:19 +02:00
wvengen
2bf13dbefa give partially unused order articles a distinct colour 2014-06-23 17:51:19 +02:00
wvengen
c64a7ba3cd validate date and time inputs 2014-06-23 17:51:18 +02:00
wvengen
8c0df3b4e8 edit order user-interface update 
also closes foodcoops#145
 2014-06-23 17:51:18 +02:00
wvengen
3a41e9530f fix order bug 2014-05-13 17:01:27 +02:00
wvengen
852f3484ad make settle directly less dangerous 
(closes foodcoops#275)
 2014-05-13 17:01:26 +02:00
wvengen
25854f2de7 do not store GroupOrderArticles with zero quantity and tolerance 2014-05-13 17:01:26 +02:00
Robert Waltemath
7556c753d0 Extract message system to plugin. 2014-05-13 17:01:25 +02:00
wvengen
c25d4d3f4f use ruby-units for unit parsing (closes foodcoops/foodsoft#200) 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-05-13 17:01:25 +02:00
wvengen
3f032e5dd9 make apple points optional 
a next step would be to move this to a plugin
 2014-05-13 17:01:25 +02:00
wvengen
0fa9bebac9 show supplier user-interface update 2014-05-13 17:01:24 +02:00
wvengen
7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
wvengen
f8fca4d630 fix order article add + test 2014-02-24 11:37:06 +01:00
wvengen
2c85618284 fix balancing and matrix since receive 2014-02-13 16:06:45 +01:00
wvengen
2de4a2a3a0 Merge pull request #256 from wvengen/feature-partial_shared_sync 
Small change to allow non-shared articles with shared suppliers
 2014-02-07 11:24:33 +01:00
wvengen
4bfd7fa6f8 fix database sync when value is nil 2014-02-03 15:32:53 +01:00
wvengen
49e563af89 allow non-shared articles to be part of a shared supplier using a blank order number 2014-01-24 22:10:00 +01:00
wvengen
6c0de3dc74 Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update' 
Conflicts:
	config/locales/de.yml
	config/locales/en.yml
 2014-01-20 12:12:00 +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
wvengen
1a5dc3ebe4 consider group_order_article without result not manually changed 2014-01-03 13:03:28 +01:00
Julius
0af8a065a1 Fix calculation of OrderArticle.total_price and .total_gross_price 2014-01-03 10:33:31 +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
Julius
8e52fca304 Do not set quantity of newly created OrderArticles to 1 2014-01-02 19:17:46 +01:00
Julius
01264bc0ac Clean up OrderArticle#new form and related stuff 2014-01-02 19:14:46 +01:00
wvengen
27a73be68f Merge remote-tracking branch 'foodcoops/master' into feature-receive 2014-01-02 18:57:59 +01:00
wvengen
03bb83ecc0 show different warning signs for mismatch with ordered and received 2013-12-23 12:35:09 +01:00
wvengen
d071c5bba8 fix user search 2013-12-22 23:21:02 +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
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
b26b124b0c Merge pull request #211 from foodcoop-adam/group_order-cleanup 
make order result calculation a bit cleaner
 2013-12-17 06:29:15 -08:00
wvengen
46ab4dcc01 proper i18n of last ordergroup order (thanks @JuliusR) 2013-12-14 13:15:47 +01:00
wvengen
a475a27f79 i18n cleanup (affects foodcoops#137) 2013-12-06 22:43:36 +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
beabe22a01 simplify model 2013-11-26 13:22:44 +01:00
wvengen
bd1b932775 add receive screen, quantities for model, redistribution 2013-11-25 14:17:31 +01:00
wvengen
ed9a6cca39 make result calculation a bit cleaner 2013-11-22 23:40:44 +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
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
ce3b89c910 make authentication methods more readable (thanks @fsmanuel) 2013-11-11 16:23:20 +01:00
wvengen
f4e4d11bae workaround for integration test problem 2013-11-01 20:27:53 +01:00
wvengen
6e9954c86f remove user referencing page as it is not being used anyway 2013-10-30 11:04:22 +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
d64590a534 more robustness 2013-10-10 17:50:10 +02:00
Julius
28644dc334 Force update in Order#finish; rescue if error raised 2013-10-08 19:58:11 +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
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
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
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
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
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
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
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
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
bb20e9abea Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-24 21:25:36 +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
wvengen
ebe93e292b Merge pull request #141 from foodcoop-rostock/improve-delivery-workflow-further 
Improve delivery workflow
 2013-07-17 01:43:59 -07:00
wvengen
db80fbd807 Merge branch 'master' into tests-rspec 2013-07-15 18:45:04 +02:00