Commit graph

2243 commits

Author SHA1 Message Date
wvengen
93ece7fb05 Merge pull request #312 from aboutsource/fix_out_of_range_amount_input
Avoid out of range error when using big numbers in financial transactions
2014-09-22 14:30:38 +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
9b03ac9a7c Do not fail over missing user, when building rss feed. 2014-09-22 11:02:45 +02:00
wvengen
71324ce5db be more robust showing config list 2014-09-22 09:38:23 +02:00
wvengen
668ba1e5d6 add webstats_tracking_code to configuration screen (closes foodcoops#311) 2014-09-22 09:36:36 +02:00
Benjamin Meichsner
81d22e6077 Allow adding tracking code for webstatistics service. E.g. piwik. 2014-09-22 09:15:47 +02:00
wvengen
459b2826d3 Merge pull request #310 from aboutsource/fix_deleting_memberships_on_workgroup_destroy
Fix deleting memberships on workgroup destroy
2014-09-22 09:06:25 +02:00
wvengen
de3a755f3a Merge pull request #308 from aboutsource/fix_rspec_type_deprecation_warning
Fixed rspec deprecation warning concerning spec type.
2014-09-22 08:53:34 +02:00
wvengen
e816d78770 Merge pull request #309 from aboutsource/update_selenium_webdriver
Updated selenium-webdriver to 2.43.0.
2014-09-22 08:48:57 +02:00
Benjamin Meichsner
c750416b9e Remove all memberships where belonging group was deleted. 2014-09-21 12:54:01 +02:00
Benjamin Meichsner
0231df9d5b Delete memberships when deleting associated groups. 2014-09-21 12:47:58 +02:00
Benjamin Meichsner
4718255015 Updated selecium-webdriver to 2.43.0.
Works now with recent firefox/ubuntu.
2014-09-21 12:37:47 +02:00
Benjamin Meichsner
d2a218c9fa Fixed rspec deprecation warning concerning spec type. 2014-09-21 12:28:00 +02:00
wvengen
418a8b5806 fix i18n issues + localeapp roundtrip
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
wvengen
8b83787252 simplify config loading 2014-09-11 16:40:21 +02:00
wvengen
92b6e6e28e fix encoding issue (for Ruby 1.9) 2014-09-11 14:46:50 +02:00
wvengen
cf360335ee fix articles with zero quantity showing
complements 8913ad615c
2014-09-11 13:47:03 +02:00
wvengen
ee1874a15f fix upload error 2014-09-10 14:42:44 +02:00
wvengen
f18cc367ae workaround for CVE-2014-4920 2014-09-10 13:27:45 +02:00
wvengen
3f3d7c4e3b export + encoding fix (ruby 1.9.3)
Conflicts:
	lib/order_csv.rb
2014-09-03 17:42:59 +02:00
wvengen
03b307d359 fix more sensible mailer option defaults 2014-09-03 11:43:15 +02:00
wvengen
1c878c3c13 fix config issue with nested hash 2014-09-02 16:19:08 +02:00
wvengen
7a9dd4edec bundle update 2014-09-02 15:49:50 +02:00
wvengen
a699f95903 fix fax documents for stock orders (closes foodcoops#79) 2014-09-02 15:47:01 +02:00
wvengen
da2b5b54d0 fix pdf generation after last bundle update (complements 61a1efdfcf) 2014-09-02 15:41:43 +02:00
wvengen
1dad9c034c Merge pull request #298 from wvengen/feature-config_db
Allow foodcoops to configure their settings
2014-09-02 15:19:48 +02:00
wvengen
10a193add3 make nested properties work better 2014-09-02 15:02:26 +02:00
wvengen
1a3b690757 add custom css to config screen 2014-09-02 15:02:26 +02:00
wvengen
cf680d3410 add page break to config screen 2014-09-02 15:02:26 +02:00
wvengen
0f7dc37015 fix config value override
Conflicts:
	app/helpers/admin/configs_helper.rb
2014-09-02 15:02:25 +02:00
wvengen
68ccc19c70 allow to configure currency (closes foodcoops#258) 2014-09-02 15:02:25 +02:00
wvengen
f09ef892dc add foodsoft_config protection whitelisting 2014-09-02 15:02:25 +02:00
wvengen
3fee071a10 specify timezone in configuration (closes foodcoops#282) 2014-09-02 14:21:33 +02:00
wvengen
daae87f6d5 fix deprecation warning 2014-09-02 14:21:32 +02:00
wvengen
6115979bae allow protected keys to be set/unset + config_db tests 2014-09-02 14:21:32 +02:00
wvengen
9beaac2627 allow to specify (un)checked values for config boolean
Conflicts:
	app/helpers/admin/configs_helper.rb
2014-09-02 14:21:32 +02:00
wvengen
34e8901d04 let plugins define their own foodcoop-config defaults 2014-09-02 14:21:32 +02:00
wvengen
429e111db4 hide protected keys from config 2014-09-02 14:21:32 +02:00
wvengen
90f60595e6 don't fail in foodsoft_config without database,
and use proper config defaults so that configuration editing has
sensible default values
2014-09-02 14:21:32 +02:00
wvengen
7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +02:00
wvengen
dd3ac0971c allow to put foodcoop config in database 2014-09-02 14:21:32 +02:00
wvengen
a39c56fdf1 update strings from localeapp 2014-09-02 14:21:15 +02:00
wvengen
b5ddbcae21 make custom css more robust 2014-09-02 14:15:59 +02:00
wvengen
97dc090e4d Merge pull request #306 from wvengen/feature-styling
allow foodcoops to add custom css
2014-09-02 13:59:18 +02:00
wvengen
19630e8607 allow foodcoops to add custom css 2014-09-02 13:35:45 +02:00
wvengen
9343b965a0 Merge pull request #287 from wvengen/feature-sync_all
Allow to synchronise all articles + category matching
2014-09-02 13:11:08 +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