Patrick Gansterer
700eed27b8
Add last user login and activity
2015-03-03 14:55:30 +01:00
wvengen
c59ee3a6a7
Show wikipage on login screen when present
2015-02-28 14:50:25 +01:00
wvengen
1447b38bb3
Use foodsoft expansion variables in footer
2015-02-28 14:50:25 +01:00
Patrick Gansterer
124f77f2ab
Add messaging to order ( closes #327 )
2015-02-19 00:53:57 +01:00
wvengen
1b48882c0e
Refactor orders index
2015-02-18 23:46:50 +01:00
wvengen
27fe8a4d42
Merge pull request #347 from foodcoop1040/suppliers_with_articles
...
Show only suppliers with articles in the dropdown-menu for new orders
2015-02-18 23:42:37 +01:00
Patrick Gansterer
5b309d3d51
Show only suppliers with articles in the dropdown-menu for new orders
...
When there are many suppliers to be able to select them for invoices,
the menu for creating new orders gets unclear.
2015-02-18 22:35:38 +01:00
Patrick Gansterer
e57fd500fc
Add possibility to copy an order
...
If a supplier has a long list of articles, which are all available, but
the order should contain only a subset of them, selecting them for every
order can take a long time. Starting with a copy of an existing order
can safe a lot of time.
2015-02-18 22:09:37 +01:00
wvengen
65c7673a41
Allow updating profile without ordergroup
2015-01-16 20:25:58 +01:00
Benjamin Meichsner
65dee49cdb
Fixed broken eager loading in orders#edit.
2015-01-16 15:57:11 +01:00
wvengen
7e0aa66936
Use more boolean comparators where it makes sense
2015-01-14 22:56:32 +01:00
wvengen
118886344a
Use boolean comparators where it makes sense
2015-01-14 21:17:00 +01:00
wvengen
2687da357a
Fix mailer warnings
2015-01-13 18:02:30 +01:00
wvengen
d1ece157c6
Get rid of last empty page in PDFs
2015-01-03 00:24:33 +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
1c0db4374f
Merge pull request #332 from foodcoops/feature/edit-address
...
Allow to edit address from user profile
2014-12-23 21:00:20 +01:00
wvengen
bf6a31a032
Cleanup groups view on profile page
2014-12-16 21:14:20 +01:00
wvengen
86eee94249
Add hint for ordergroup address in user form
2014-12-16 20:53:38 +01:00
wvengen
12bf2198e5
fix simple_form deprecations
2014-12-10 22:04:32 +01:00
wvengen
56f6efa590
Allow to edit address from user profile
2014-12-10 21:27:53 +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
5c78bdde7e
Cleanup old task-related i18n
2014-11-23 01:42:15 +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
6188567931
hide message preferences when messages are disabled
2014-11-20 23:11:04 +01:00
wvengen
68d54e7e25
add sudo functionality
2014-10-18 17:58:31 +02:00
wvengen
7826d2f674
move login and logout to separate methods
...
Conflicts:
app/controllers/sessions_controller.rb
Conflicts:
app/controllers/application_controller.rb
app/controllers/sessions_controller.rb
2014-10-18 17:57:07 +02:00
wvengen
c585f53f54
Merge pull request #315 from wvengen/feature/db_seeds
...
more extensive database seeds (in two languages)
2014-10-16 20:43:11 +02:00
wvengen
9e7b2321cd
Merge pull request #316 from wvengen/feature/disable_config_validation
...
disable config validation (closes foodcoops#313)
2014-10-09 09:45:53 +02:00
wvengen
9a7b3378c3
Make invalid login message depend on use_nick (closes foodcoops#321)
2014-10-09 09:42:13 +02:00
wvengen
a594dffed2
disable config validation (closes foodcoops#313)
2014-09-30 15:09:47 +02:00
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
wvengen
86a5576dc3
fix delete order confirmation
2014-06-23 17:51:18 +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
ef0888f38d
add view for all transactions + csv
2014-06-23 17:51:17 +02:00
wvengen
b5b4ccd922
make data-submit-onchange work with datepicker
2014-06-23 17:51:17 +02:00
wvengen
7b51f7aabe
fix negative balance email
2014-05-30 10:22:47 +02:00
wvengen
71a922a034
use locale in mails
...
Conflicts:
app/workers/supplier_notifier.rb
app/workers/user_notifier.rb
2014-05-13 17:01:28 +02:00
wvengen
5d9c9856d1
show proper error when all articles are deselected in order edit
2014-05-13 17:01:27 +02:00
wvengen
4c1e5e2b00
fix default textarea height
2014-05-13 17:01:27 +02:00
wvengen
3a41e9530f
fix order bug
2014-05-13 17:01:27 +02:00
wvengen
3953c21ae2
use capture instead of layout-hack to allow deface overrides
2014-05-13 17:01:27 +02:00
wvengen
64bb8e043d
enable/disable plugins by config option
2014-05-13 17:01:26 +02:00
wvengen
852f3484ad
make settle directly less dangerous
...
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
wvengen
ea8e4ee560
add pdf configuration options
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
fe0b17cdb0
cleanup email footer
2014-05-13 17:01:25 +02:00