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

1070 commits

Author SHA1 Message Date
wvengen
0e1cde9e2b more extensive database seeds (in two languages) (closes foodcoops#277) 2014-09-29 17:26:27 +02:00
Benjamin Meichsner
cc4e925c1a Fixed ensure_open_order filter on missing id params. 2014-09-23 10:39:10 +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
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
Benjamin Meichsner
0231df9d5b Delete memberships when deleting associated groups. 2014-09-21 12:47:58 +02:00
wvengen
418a8b5806 fix i18n issues + localeapp roundtrip 
thanks, i18n-tasks!
 2014-09-15 13:52:35 +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
a699f95903 fix fax documents for stock orders (closes foodcoops#79) 2014-09-02 15:47:01 +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
3fee071a10 specify timezone in configuration (closes foodcoops#282) 2014-09-02 14:21:33 +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
429e111db4 hide protected keys from config 2014-09-02 14:21:32 +02:00
wvengen
7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +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
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
16b78ba2a0 fix shared import paging without query 2014-09-02 12:58:31 +02:00
wvengen
d906a7342f workaround receive error with many articles 2014-09-02 12:35:57 +02:00
wvengen
63d52db91b more sensible mailer option defaults 
Conflicts:
	app/mailers/base_mailer.rb
	config/app_config.yml.SAMPLE
	spec/app_config.yml
 2014-09-02 12:35:57 +02:00
wvengen
ecf5601023 make missing_units get correct details for closed orders 2014-09-01 12:25:42 +02:00
wvengen
0b08d461fa remove html escaping from all text mails 2014-09-01 11:08:32 +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
e61c3c9267 order articles by number then name in fax+receive 
This makes it easier to enter the receive screen from an order pdf print
with received amounts.

Conflicts:
	app/documents/order_fax.rb
 2014-08-19 09:19:01 +02:00
wvengen
d8f4ac47dd handle ajax errors (closes foodcoops#300) 2014-07-02 13:55:05 +02:00
wvengen
fa725dbf38 fix csv download also when searching 2014-07-02 09:37:03 +02:00
wvengen
c80a9cd68b fix csv download (closes foodcoop-adam#129) 2014-07-01 11:14:35 +02:00
wvengen
59ab628e2f fix layout bug 2014-06-23 17:51:20 +02:00
wvengen
873e8d44a2 harmonize foodsoft capitalisation 2014-06-23 17:51:20 +02:00
wvengen
6466ea9653 revamp footer 2014-06-23 17:51:20 +02:00
wvengen
b112028935 fix invititation form 
(complements 9146e99bca2011c52e9a06f987251e2f5d72b11e)
 2014-06-23 17:51:19 +02:00
wvengen
4b6231129c only show undeleted articles in receive screen 2014-06-23 17:51:19 +02:00
wvengen
9e58a6f2b1 fix csv download + template optional parameters 
Conflicts:
	app/views/finance/financial_transactions/_transactions.html.haml
	app/views/home/ordergroup.html.haml
	app/views/login/_accept_invitation_form.html.haml
 2014-06-23 17:51:19 +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
fee0cfbdc7 make orders helpers clearer 2014-06-23 17:51:19 +02:00
wvengen
e7a476e6b6 remove unused season import fields 2014-06-23 17:51:19 +02:00
wvengen
2a6e0e0460 fix asset url in css (unbreaks heroku image 404) 2014-06-23 17:51:18 +02:00