cee2ac8f9f
Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
...
Configure upfront tasks
2014-12-06 14:35:22 +01:00
5c78bdde7e
Cleanup old task-related i18n
2014-11-23 01:42:15 +01:00
f6c008c79c
Allow configuration of task periods
2014-11-23 01:34:51 +01:00
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
6e990fed4c
Upgrade to rails 4.1
2014-11-21 14:37:56 +01:00
6188567931
hide message preferences when messages are disabled
2014-11-20 23:11:04 +01:00
68d54e7e25
add sudo functionality
2014-10-18 17:58:31 +02:00
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
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
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
9a7b3378c3
Make invalid login message depend on use_nick (closes foodcoops#321)
2014-10-09 09:42:13 +02:00
a594dffed2
disable config validation (closes foodcoops#313)
2014-09-30 15:09:47 +02:00
0e1cde9e2b
more extensive database seeds (in two languages) (closes foodcoops#277)
2014-09-29 17:26:27 +02:00
cc4e925c1a
Fixed ensure_open_order filter on missing id params.
2014-09-23 10:39:10 +02:00
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
71324ce5db
be more robust showing config list
2014-09-22 09:38:23 +02:00
668ba1e5d6
add webstats_tracking_code to configuration screen (closes foodcoops#311)
2014-09-22 09:36:36 +02:00
81d22e6077
Allow adding tracking code for webstatistics service. E.g. piwik.
2014-09-22 09:15:47 +02:00
0231df9d5b
Delete memberships when deleting associated groups.
2014-09-21 12:47:58 +02:00
418a8b5806
fix i18n issues + localeapp roundtrip
...
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
cf360335ee
fix articles with zero quantity showing
...
complements 8913ad615c
2014-09-11 13:47:03 +02:00
ee1874a15f
fix upload error
2014-09-10 14:42:44 +02:00
f18cc367ae
workaround for CVE-2014-4920
2014-09-10 13:27:45 +02:00
a699f95903
fix fax documents for stock orders (closes foodcoops#79)
2014-09-02 15:47:01 +02:00
1a3b690757
add custom css to config screen
2014-09-02 15:02:26 +02:00
cf680d3410
add page break to config screen
2014-09-02 15:02:26 +02:00
0f7dc37015
fix config value override
...
Conflicts:
app/helpers/admin/configs_helper.rb
2014-09-02 15:02:25 +02:00
68ccc19c70
allow to configure currency (closes foodcoops#258)
2014-09-02 15:02:25 +02:00
3fee071a10
specify timezone in configuration (closes foodcoops#282)
2014-09-02 14:21:33 +02:00
6115979bae
allow protected keys to be set/unset + config_db tests
2014-09-02 14:21:32 +02:00
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
429e111db4
hide protected keys from config
2014-09-02 14:21:32 +02:00
7b000c39eb
add foodcoop configuration screen
2014-09-02 14:21:32 +02:00
b5ddbcae21
make custom css more robust
2014-09-02 14:15:59 +02:00
97dc090e4d
Merge pull request #306 from wvengen/feature-styling
...
allow foodcoops to add custom css
2014-09-02 13:59:18 +02:00
19630e8607
allow foodcoops to add custom css
2014-09-02 13:35:45 +02:00
8473f16091
query performance improvements
2014-09-02 12:58:32 +02:00
647b7f0430
allow to synchronize all articles of a shared supplier
2014-09-02 12:58:31 +02:00
3918e22214
synchronize price on two decimal places only
2014-09-02 12:58:31 +02:00
d9c61b2db3
allow to match category names on import/sync
2014-09-02 12:58:31 +02:00
16b78ba2a0
fix shared import paging without query
2014-09-02 12:58:31 +02:00
d906a7342f
workaround receive error with many articles
2014-09-02 12:35:57 +02:00
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
ecf5601023
make missing_units get correct details for closed orders
2014-09-01 12:25:42 +02:00
0b08d461fa
remove html escaping from all text mails
2014-09-01 11:08:32 +02:00
8913ad615c
show articles ordered by members but not by foodcoop dimmed in receive
2014-08-29 12:23:23 +02:00
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
d8f4ac47dd
handle ajax errors (closes foodcoops#300)
2014-07-02 13:55:05 +02:00
fa725dbf38
fix csv download also when searching
2014-07-02 09:37:03 +02:00
c80a9cd68b
fix csv download (closes foodcoop-adam#129)
2014-07-01 11:14:35 +02:00
59ab628e2f
fix layout bug
2014-06-23 17:51:20 +02:00
873e8d44a2
harmonize foodsoft capitalisation
2014-06-23 17:51:20 +02:00
6466ea9653
revamp footer
2014-06-23 17:51:20 +02:00
b112028935
fix invititation form
...
(complements 9146e99bca2011c52e9a06f987251e2f5d72b11e)
2014-06-23 17:51:19 +02:00
4b6231129c
only show undeleted articles in receive screen
2014-06-23 17:51:19 +02:00
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
a43020463d
normalize article and category attributes (closes foodcoops#294)
2014-06-23 17:51:19 +02:00
7c2ecd8658
add some model api docs
2014-06-23 17:51:19 +02:00
2bf13dbefa
give partially unused order articles a distinct colour
2014-06-23 17:51:19 +02:00
fee0cfbdc7
make orders helpers clearer
2014-06-23 17:51:19 +02:00
e7a476e6b6
remove unused season import fields
2014-06-23 17:51:19 +02:00
2a6e0e0460
fix asset url in css (unbreaks heroku image 404)
2014-06-23 17:51:18 +02:00
86a5576dc3
fix delete order confirmation
2014-06-23 17:51:18 +02:00
c64a7ba3cd
validate date and time inputs
2014-06-23 17:51:18 +02:00
8c0df3b4e8
edit order user-interface update
...
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
ef0888f38d
add view for all transactions + csv
2014-06-23 17:51:17 +02:00
b5b4ccd922
make data-submit-onchange work with datepicker
2014-06-23 17:51:17 +02:00
7b51f7aabe
fix negative balance email
2014-05-30 10:22:47 +02:00
71a922a034
use locale in mails
...
Conflicts:
app/workers/supplier_notifier.rb
app/workers/user_notifier.rb
2014-05-13 17:01:28 +02:00
5d9c9856d1
show proper error when all articles are deselected in order edit
2014-05-13 17:01:27 +02:00
4c1e5e2b00
fix default textarea height
2014-05-13 17:01:27 +02:00
3a41e9530f
fix order bug
2014-05-13 17:01:27 +02:00
3953c21ae2
use capture instead of layout-hack to allow deface overrides
2014-05-13 17:01:27 +02:00
64bb8e043d
enable/disable plugins by config option
2014-05-13 17:01:26 +02:00
852f3484ad
make settle directly less dangerous
...
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
ea8e4ee560
add pdf configuration options
2014-05-13 17:01:26 +02:00
25854f2de7
do not store GroupOrderArticles with zero quantity and tolerance
2014-05-13 17:01:26 +02:00
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +02:00
fe0b17cdb0
cleanup email footer
2014-05-13 17:01:25 +02:00
c25d4d3f4f
use ruby-units for unit parsing ( closes foodcoops/foodsoft#200 )
...
Conflicts:
Gemfile
Gemfile.lock
2014-05-13 17:01:25 +02:00
48e9a3e4f5
add fax csv
2014-05-13 17:01:25 +02:00
3f032e5dd9
make apple points optional
...
a next step would be to move this to a plugin
2014-05-13 17:01:25 +02:00
f71b78665e
allow 500 items per page
2014-05-13 17:01:24 +02:00
0fa9bebac9
show supplier user-interface update
2014-05-13 17:01:24 +02:00
0014435663
improved shared database import ui
2014-05-13 17:01:24 +02:00
950480941a
expanded data-ignore-onchange support
2014-05-13 17:01:24 +02:00
8853b3efdb
fix sort order
2014-03-08 17:15:09 +01:00
d9326dd984
allow plugins to override login redirection when authentication failed
2014-02-25 10:18:14 +01:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
f8fca4d630
fix order article add + test
2014-02-24 11:37:06 +01:00
8fba40eba6
fix submit-onchange
2014-02-19 11:41:10 +01:00
a4dca6ae11
show more info in add article dialog
2014-02-15 00:18:49 +01:00
2c85618284
fix balancing and matrix since receive
2014-02-13 16:06:45 +01:00
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
f9d2c20aaa
cleanup articles sorted in groups
2014-02-10 15:58:58 +01:00
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
c322545f85
fix i18n buglet
2014-02-06 10:15:20 +01:00
6e0489b25f
Merge pull request #257 from wvengen/feature-touchclick
...
Better workaround for touch devices
2014-02-03 06:33:27 -08:00
4bfd7fa6f8
fix database sync when value is nil
2014-02-03 15:32:53 +01:00
84e02b795c
proper history line
2014-01-31 17:53:10 +01:00
5e7925366d
allow to view stock orders too
2014-01-31 13:12:29 +01:00
5aef8e445e
add html units history line
2014-01-31 13:08:20 +01:00
3e79304c5a
typo
2014-01-27 14:58:39 +01:00
7ebb2459e0
make click work better on touch devices (closes foodcoops#104)
2014-01-25 15:19:50 +01:00
23ee2ef0fb
Revert "make touch device events work on buttons ( closes foodcoop-rostock/foodsoft#34 , closes foodcoops/foodsoft#104 )"
...
This reverts commit add4afd172
2014-01-25 15:15:42 +01:00
d08f120b27
show message when ignoring articles due to missing order number
2014-01-24 22:20:29 +01:00
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
8db516c5f0
Merge branch 'master' into feature-cleaner_order_details
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
2014-01-20 13:36:46 +01:00
9308096e96
Merge pull request #252 from wvengen/feature-fix_redirect_with_suburi
...
fix root redirect when using suburi
2014-01-20 03:13:25 -08:00
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
8b4c292ea0
Merge pull request #222 from wvengen/feature-receive
...
New receive screen
2014-01-20 03:02:27 -08:00
65041c78c5
allow to preselect order view
2014-01-17 15:04:03 +01:00
1129cf4094
include comments link
2014-01-17 14:32:12 +01:00
5b6d1a66a6
complete show order i18n
...
Conflicts:
app/helpers/orders_helper.rb
2014-01-17 14:25:57 +01:00
42d622d1b2
cleanup orders and add search
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/views/orders/_articles.html.haml
app/views/orders/show.html.haml
2014-01-17 13:41:38 +01:00
151f851799
do not require authentication for root redirect
2014-01-15 16:33:13 +01:00
ecb2f2a015
fix root redirect when using suburi
2014-01-15 15:43:29 +01:00
bab28d2770
i18n update
2014-01-13 23:23:37 +01:00
b2f032ac8e
fix bootstrap menu on mobile [ci skip]
2014-01-13 14:45:48 +01:00
f0b65bd738
Merge pull request #247 from wvengen/feature-center_rows_vertically
...
Center table rows vertically
2014-01-13 03:22:20 -08:00
8760d87a76
fix receive notice
2014-01-13 11:48:43 +01:00
3b2d50b47d
make receive delta work when unit_quantity changes
2014-01-13 11:37:18 +01:00
b30b424540
Merge branch 'master' into feature-receive
...
Conflicts:
app/helpers/finance/order_articles_helper.rb
2014-01-09 18:42:29 +01:00
0b4cfde1b2
put footer below body, now that is allowed in html5
2014-01-09 14:47:05 +01:00
dcb17e04b5
do not show article hint in order view after all, since "old price" is
...
actually the price of the current article, which will probably be
different in the future
2014-01-09 13:24:40 +01:00
bea2706005
fix receive dynamic update (complements 90c81de872)
2014-01-09 13:19:27 +01:00
124341c7d6
receive helper and i18n cleanup
2014-01-09 13:01:10 +01:00
90c81de872
update receive delta column + responsive css
2014-01-09 12:20:54 +01:00
56bd527a8b
keep white input background with package class [ci skip]
2014-01-09 10:51:54 +01:00
5a7c9b817c
fix receive js for document updates [ci skip]
2014-01-09 10:14:05 +01:00
b331d9a2a9
better css responsiveness [ci skip]
2014-01-08 19:58:51 +01:00
65e79d7e1b
small receive usability changes
2014-01-08 19:28:39 +01:00
d1c3c83ed7
use plural in table headings by default
2014-01-08 18:23:34 +01:00
bdb9499535
fix broken update password flow
2014-01-08 14:09:28 +01:00
0e8e93204a
Merge pull request #240 from foodcoop-rostock/fix-order-article-helper-undeleted
...
Offer _undeleted_ StockArticles for new OrderArticle only
2014-01-08 04:42:55 -08:00
ce17bf33e0
complete and improve receive i18n
2014-01-08 13:39:49 +01:00
6e60f94484
small receive-related i18n updates
2014-01-08 12:52:29 +01:00
dcc3d21b4d
center table rows vertically [ci skip]
2014-01-08 10:32:30 +01:00
563993fffa
Complete I18n of current receive screen
2014-01-08 00:06:50 +01:00
d7c771d10a
Continue I18n of receive screen
2014-01-06 23:48:39 +01:00
69a29b8296
Merge pull request #245 from fsmanuel/rss_feed + 1
2014-01-06 13:55:32 +01:00
dc92de771e
Comment on ArticlePrices without Article association
2014-01-04 21:39:11 +01:00
f83f6971e8
Rename update_current_price to update_global_price to avoid confusion
2014-01-04 21:35:19 +01:00
3c88f572a4
When updating OrderArticle: save ArticlePrice association
2014-01-04 21:22:57 +01:00
8479678530
Improve unlock button for receiving OrderArticles manually adjusted
...
Conflicts:
app/views/orders/_edit_amount.html.haml
2014-01-04 20:51:42 +01:00
a8e604c196
When receiving: hide OrderArticle unit fields also after failed validation
2014-01-04 20:46:50 +01:00
aa57cee96f
do not show units fields in receive edit order article screen
2014-01-04 20:46:13 +01:00
0d0ff90a64
adds an RSS feed for pages/all
2014-01-04 20:12:01 +01:00
a0f55ba812
Clear return_to URL in session when signing out.
2014-01-03 19:42:08 +01:00
933f4fe67a
Merge pull request #243 from foodcoop-rostock/fix-access-denied-cycle
...
Redirect to home page on denied access (fixes #237 ).
2014-01-03 06:59:43 -08:00
2f02f89089
Allow login through link in message (and remember requested page).
2014-01-03 15:27:15 +01:00
b800da9b9b
use helper in ajax update too
2014-01-03 14:52:44 +01:00
436ebc0190
Merge pull request #234 from foodcoop-adam/article-dialog
...
introduce new layout in balancing article screen as well
2014-01-03 05:16:03 -08:00
133429720c
old price display tweaks
2014-01-03 14:11:50 +01:00
03f61668aa
Redirect to home page on denied access ( fixes #237 ).
2014-01-03 13:51:00 +01:00
1a5dc3ebe4
consider group_order_article without result not manually changed
2014-01-03 13:03:28 +01:00
438de97464
fix non-closed order display
2014-01-03 13:00:14 +01:00
9219d099c8
ui update for packages display
2014-01-03 12:42:36 +01:00
4c9e84ecc6
change layout of receive unlock
2014-01-03 12:40:43 +01:00
014a62aa11
use disabled property for input and fix style
2014-01-03 10:59:42 +01:00
f1ae2724c6
fix unit quantity display after ajax update
2014-01-03 10:45:15 +01:00
5ead0fb441
show correct price
2014-01-03 10:44:57 +01:00
f230d39055
Merge price columns in receive form into one
...
Conflicts:
app/views/orders/_edit_amount.html.haml
2014-01-03 10:36:57 +01:00
0af8a065a1
Fix calculation of OrderArticle.total_price and .total_gross_price
2014-01-03 10:33:31 +01:00
2ec3d38238
Set readonly property with javascript by .prop instead of .attr
2014-01-03 10:33:23 +01:00
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
a439f26b67
ui design update
2014-01-02 22:30:04 +01:00
dd138da1a6
Change comment according to 9d61e2e61569159489098eda1bd6c30d7322ce76
2014-01-02 19:17:51 +01:00
8e52fca304
Do not set quantity of newly created OrderArticles to 1
2014-01-02 19:17:46 +01:00
a384532619
Revert some changes of 20adce8a4e2d32548e7d7016dace250dd3e2eb9b
2014-01-02 19:17:41 +01:00
033aa90698
Use OrderArticle#create in receive form instead of Order#add_article
2014-01-02 19:16:09 +01:00
59c118a171
Apply publish/subscribe for OrderArticle#create
2014-01-02 19:16:03 +01:00
5349ee142e
Offer _undeleted_ StockArticles for new OrderArticle only
2014-01-02 19:14:50 +01:00
01264bc0ac
Clean up OrderArticle#new form and related stuff
2014-01-02 19:14:46 +01:00
baa5f16cfc
Free order_article resource from finance namespace; also unlock for role_orders
2014-01-02 19:14:41 +01:00
9ed906f425
Correct haml comment from '#' to '-#'
2014-01-02 19:14:37 +01:00
cf1e68f11d
Allow to edit OrderArticle in Order#receive form
2014-01-02 19:14:33 +01:00
81dfe8110c
Apply publish/subscribe for OrderArticle#update
2014-01-02 19:14:07 +01:00
27a73be68f
Merge remote-tracking branch 'foodcoops/master' into feature-receive
2014-01-02 18:57:59 +01:00
3819fa012e
Offer _undeleted_ StockArticles for new OrderArticle only
2013-12-31 12:35:30 +01:00
b22677eced
Change order link from invoice form to avoid access problems
2013-12-30 11:26:10 +01:00
4f80fd0e8c
Merge pull request #231 from wvengen/feature-autocomplete-fixes-2
...
fix user form field order and autocompletion
2013-12-30 02:03:48 -08:00
19f583381d
Merge pull request #232 from wvengen/feature-remove_unused_redirect_to
...
Security improvements
2013-12-30 01:46:28 -08:00
699be6a6d9
introduce new layout in balancing article screen as well
2013-12-23 16:11:14 +01:00
f5bd7a43e4
update balancing order article edit screen to support received units
2013-12-23 15:25:45 +01:00
03bb83ecc0
show different warning signs for mismatch with ordered and received
2013-12-23 12:35:09 +01:00
5d8f71f834
move javascript a little
2013-12-23 11:51:38 +01:00
45ad8e6524
move helper to new module
2013-12-23 11:48:17 +01:00
ed228c4bd7
Allow control of password autocomplete by flag
2013-12-22 23:21:14 +01:00
d071c5bba8
fix user search
2013-12-22 23:21:02 +01:00
53e611c1c0
Allow browser to store new password after change
2013-12-22 18:26:28 +01:00
7ef6832ab3
fix invite authentication
2013-12-22 14:20:25 +01:00
cee96915f9
remove unused redirect_to functionality
2013-12-22 13:59:16 +01:00
3e1d561a5e
fix user form field order and autocompletion
2013-12-22 13:28:33 +01:00
df9cff0eee
Do not escape mailing list wiki link in the message form (foodcoops#227)
2013-12-22 01:59:33 +01:00
537ac52f4e
Merge pull request #227 from foodcoop-rostock/fix-escape-new-message-hint
...
Do not escape mailing list links in message form
2013-12-21 16:14:20 -08:00
3099e740ca
Do not escape mailing list links in message form
2013-12-21 22:52:39 +01:00
a28c6031a4
fix receive exception when input is set to nil
2013-12-21 17:39:20 +01:00
41ea9ed66e
hide receive screen for stock orders
2013-12-21 17:36:25 +01:00
aa6041d337
show all articles in receive screen (not just of this order)
2013-12-21 17:33:06 +01:00
wvengen
wvengen
Benjamin Meichsner
Robert Waltemath
Julius
Manuel Wiedenmann