554be093b9
API v1 navigation endpoint
2018-10-13 20:41:47 +02:00
9c5a5d9492
API v1 config endpoint
2018-10-13 20:41:47 +02:00
110c7cc3e9
API v1 user endpoint
2018-10-13 20:41:47 +02:00
fd96b6ccc1
Prepare for API v1 (PR #570 )
2018-10-13 20:16:35 +02:00
903086ab97
Add import route for bank_transactions
2018-10-12 15:47:02 +02:00
0bb0536903
Add short name to FinancialTransactionType
2018-10-12 13:33:41 +02:00
707501e3f8
Add edit functionality for financial links
2018-10-12 13:18:23 +02:00
f0a55fb951
Add model and views for bank accounts
2018-10-11 22:29:15 +02:00
ac11ba1cc1
Add pickups role
2018-01-25 18:09:29 +01:00
209ad615b4
Add view to sort orders by pickup day
2017-12-09 12:56:34 +01:00
bd49a64cd7
Make the download button of orders reusable
2017-12-09 12:25:29 +01:00
3e156bbbf3
Rewrite OrderPdfs to support multiple orders at once
2017-12-09 12:22:37 +01:00
80899afcb0
Add English and German translations for financial transaction types
2017-12-09 11:51:23 +01:00
dae4d075fe
Add UI to manage the financial transaction types and classes
2017-12-09 11:51:23 +01:00
e7657b987f
Update model to support financial transactions #367
...
This change introduces two new data types to group the financial
transactions. Now every transaction has a "type", which itself belongs
to a "class".
Types should be used add structured information to an transaction, instead
of writing it into the notice textfield. E.g. this could be used to have
different types depending on the source of money (cash vs. bank transfer).
Classes are shown as different columns in the tables and will be uses to
group transactions of specific types. They should be used if not the whole
amount of ordergroup should be used to order food. E.g. if there is a
deposit or membership fee, which is independent of the normal credit.
This will allow us to implement additional features based on classes in
the future. E.g. the sum of transactions in the "membership fee" class
must be positive to allow food orders or show a big warning if it is bellow
a certain value.
2017-12-09 11:51:23 +01:00
dc94e98138
Add folders to the documents plugin
2017-11-21 10:12:13 +01:00
33aa1c4b4a
Localeapp roundtrip
2017-11-10 17:06:20 +01:00
816f699f69
Switch license to AGPL ( fixes #496 , PR #513 )
2017-11-10 17:02:35 +01:00
3b18dc7532
Add translations for Spanish
2017-11-06 20:12:03 +01:00
f77f2fcbfd
Localeapp roundtrip
2017-10-29 01:17:49 +02:00
9f2e5bb992
Add missing German translations
2017-10-28 21:34:15 +02:00
53bb096046
Add FinancialLinks
...
For now this is only usefull for plugins, since there is no UI.
2017-10-28 20:17:16 +02:00
75deec9f06
Add custom fields to invoice, odergroup, supplier and user
2017-10-28 20:16:47 +02:00
72b5a5ca82
Add option to show account balance instead of available funds
...
Some foodcoops do not use the accounting feature of the foodsoft, which
results in wrong calculation of the available credit. To avoid
confusions show the current account balance instead.
2017-10-28 20:16:25 +02:00
f5bea41ccf
Remove Capistrano ( #491 , PR #521 )
2017-10-28 19:50:02 +02:00
b49bfb0d8c
Localeapp roundtrip + fixes
...
This includes an overdue synchronization of plugin locales. To make
translation easier for non-developers, we keep the strings at localeapp,
which puts everything in one file. All plugins enabled by default are
therefore included in Foodsoft's locales.
2017-10-27 22:37:32 +02:00
6989e2f4f7
Add view for unpaid invoices
2017-10-26 21:27:26 +02:00
564492afe4
Add an option to automatically finish an order
2017-10-12 21:14:29 +02:00
f509f85327
Save the timestamp of the last mail to supplier and confirm resending it
2017-10-11 23:48:27 +02:00
f27bbc2ffa
Add a button to send the order to the supplier
2017-10-10 23:45:37 +02:00
9cd3c800bd
Use ExceptionNotification via generator generated code
...
Ensure that FoodsoftConfig is loaded before running the initalizers.
This also enables notifaction for Resque.
2017-10-09 10:32:32 +02:00
463e448351
Clean up the German mail bodies and fix some typos
2017-10-02 19:34:35 +02:00
287cce2e92
Make "via Foodsoft" in mail From-header translateable
2017-10-02 16:08:16 +02:00
578e929e0d
Add handling for bounce mails
2017-10-02 16:02:39 +02:00
97abcabffa
Log mail delivery errors to database and add an UI for it
2017-10-02 16:02:39 +02:00
0363f2dadc
Improve Docker setup (PR #497 )
2017-10-01 13:57:36 +02:00
a10aa75f49
Improve user interface for creating new messages in messages plugin
2017-10-01 00:12:10 +02:00
add281c738
Remove email from subject of feedback mail
...
The mail address of the user sending the feedback is now set in the
Reply-To header of the mail already.
2017-09-30 12:14:16 +02:00
ba052efe5e
Set the path of the _foodsoft_session cookie to the slug
...
This allows the usage of different foodcoops at the same time.
2017-09-29 00:47:00 +02:00
6185e18cc5
Notify users also about tasks which are not on sundays (PR #494 )
...
notify_users_of_weekly_task notifies workgroups about tasks with and due
date of 7 days in the future. Call it every day to notify users of all tasks.
2017-08-21 16:01:36 +02:00
251681bb66
Add option to configure SMTP server via environment variables in production.rb
2017-08-08 23:27:28 +02:00
d6325de35c
Add support for RAILS_SERVE_STATIC_FILES to production.rb an use it with Docker
2017-08-08 23:27:28 +02:00
e73bf9c7cb
Localeapp roundtrip
2017-04-14 12:34:02 +02:00
897d31e340
Install all dependencies in an authenticated way (https)
...
git:// is unauthenticated!!!
2017-04-10 09:26:33 +02:00
4f30248a49
Allow to run without Redis in development
2017-04-01 19:11:52 +02:00
c8999333a6
Localeapp roundtrip
2017-04-01 16:51:05 +02:00
0779ccd193
Add missing confirm translation ( fixes #467 , PR #469 )
2017-03-21 16:22:36 +01:00
eb2fc56fc8
Fix translations of messages plugin
...
We need to copy the locales of overrides into the main locales files
to work properly. Also add the missing German translations.
2017-02-03 20:25:00 +01:00
c6731b4e4f
Add IBAN field to supplier and user model
2017-01-21 22:43:48 +01:00
e742958c0c
Add missing German translations
2017-01-21 22:41:18 +01:00
0d309af5f6
Update translations from localeapp
2016-06-28 20:43:53 +02:00
c6a625e5ed
Localeapp update
2016-06-11 19:19:30 +02:00
749791bb7a
Add possibility to add an attachment to an invoice #345
2016-05-06 15:04:58 +02:00
8d5467ab7c
Merge pull request #355 from foodcoop1040/expeted_delivery_date
...
Add expected delivery date
2016-05-04 17:42:29 +02:00
f286dd6053
Add pickup date
...
This additional date helps users to find the correct order if the time
between end and pickup varies a lot.
2016-04-29 15:28:05 +02:00
42eb6c8509
Make ordergroup break fields a bit nicer
2016-03-11 13:56:02 +01:00
b067808937
Merge pull request #404 from foodcoop1040/ordergroup_break
...
Add break to ordergroup
2016-03-11 13:48:57 +01:00
4433a665e4
Merge pull request #421 from foodcoop1040/edit_links
...
Add page to edit deliveries and orders linked to an invoice
2016-03-11 13:39:27 +01:00
efb929e64f
Allow editing of linked deliveries and orders at invoice
2016-03-11 13:23:13 +01:00
9c4d9d5c20
Add stock group order
...
This allows us to add additional items to an order, which do not belong
a specific user, but will be put into stock. The benefit of this change
is that we use the same order for ordergroups and stock.
2016-03-11 13:15:16 +01:00
253512eb51
Add break to ordergroup
...
In some foodcoops it is possible that ordergroups make a break. During that
they e.g. pay reduced or no membership fees and do not need to do work for
the foodcoop. This new fields make this visible to all members.
2016-03-08 04:38:13 +01:00
14e2fd179e
Merge pull request #403 from foodcoops/feature/402-messagegroups
...
Add messagegroups
2016-03-07 22:36:37 +01:00
5d9e1845b7
Fix i18n key typo
2016-03-07 21:06:49 +01:00
d358278333
Merge pull request #416 from foodcoop1040/invite_config
...
Add config option to disable the invites
2016-03-07 19:47:00 +01:00
0b70ce39a8
Merge pull request #414 from foodcoop1040/ftc
...
Add a button to add all ordergroups to a new finanacial transaction c…
2016-03-07 19:45:45 +01:00
cb8205e4de
Merge pull request #413 from foodcoop1040/error_translations
...
Add missing German translations for error messages
2016-03-07 19:44:29 +01:00
b4e2ddf66d
Merge pull request #412 from foodcoop1040/confirm
...
Get rid of duplicated confirm_delete translations
2016-03-07 19:44:06 +01:00
7aacc7fef6
Fix German ui.* translations
2016-03-07 15:21:03 +01:00
e16a0fb336
Add config option to disable the invites
...
Some foodcoops require that an admin adds all users to have more control
over the users.
2016-03-06 13:56:33 +01:00
a5d0c5ccab
Add a button to add all ordergroups to a new finanacial transaction collection
...
This function can be used if we need to add the same financial transaction
to all ordergroups at the same time. E.g. the monthly membership fee.
2016-03-06 11:53:31 +01:00
f24a18371e
Add missing German translations for error messages
2016-03-04 23:23:56 +01:00
c62104a388
Get rid of duplicated confirm_delete translations
2016-03-04 23:13:28 +01:00
5e744453f8
Add more infos to the invoice page
...
When a foodcoop does not use the balancing feature the invoice page is
the main page for informations. Add all related information to it, so
people do not need to open the balancing page.
2016-03-04 22:26:55 +01:00
0fc80a1ef5
Rename translation "admin.confirm" to "ui.confirm_delete"
2016-03-04 20:10:11 +01:00
b05ac2ab64
Add deleted_at for User
...
Do not remove the user from the database. Mark as deleted instead.
2016-03-04 19:03:52 +01:00
4e35e2d58e
Add handling for message reply via email
...
If the reply_email_domain configuration is set the messages plugin will
use unique Reply-To addresses for every email. They contain enough
information to reconstruct the message context and a hash to avoid
user forgery and spam.
A mail transfer agent must be configured to call the new rake task
foodsoft:parse_reply_email for incoming mails. The rake task requires
the receipt of the mail in the RECIPIENT variable and the raw message
via standard input. An example invocation would look like:
rake foodsoft:parse_reply_email RECIPIENT=f.1.1.HASH < test.eml
2016-03-04 18:11:27 +01:00
72ef31c0ec
Make unassigned tasks more prominent in the dashboard
...
Show all unassigned task in the dashboard to make it more interesting
for members to pick tasks. Some members do not (want to) click on the
task list very often it is not clear if there are new tasks if we show
the number of unassigned tasks only.
2016-03-04 17:15:45 +01:00
6015d16cab
Add link for creating invoice at an order
2016-03-04 17:12:46 +01:00
8b8693df5a
Show last activity of ordergroups
2016-03-04 16:16:09 +01:00
1315103a7d
Add role_invoices
...
This new role allows users to create invoices without role_finance. Users
can then only modify their own created invoices until somebody with the
role_finance sets the paid_on value.
2016-03-04 16:06:02 +01:00
460cf1e82c
Change relationship of invoices #390
...
This change will allow us to have invoices for more than one order/delivery
in the future. There are no UI changes for now.
2016-03-04 15:55:39 +01:00
3d6f908102
Add created_by to invoice and show it
2016-02-24 00:39:07 +01:00
227ca0dd84
Merge pull request #387 from foodcoops/feature/boxfills
...
Add optional boxfill phase to orders (+ bootstrap buttons)
2015-11-20 14:25:41 +01:00
496dd34cc3
Avoid Rails 4.2 deprecation warning
2015-11-14 18:23:33 +01:00
bc0c1f1bbe
Localeapp roundtrip
2015-11-14 16:38:35 +01:00
8b69ac35a8
Add comment to app config
2015-11-14 16:28:01 +01:00
a03789e048
Add optional boxfill phase to orders
2015-11-13 18:10:46 +01:00
77ee8ee2f1
Disable error page for development
2015-09-05 15:04:56 +02:00
4a9cf862be
Merge pull request #373 from foodcoops/feature/current-orders-plugin
...
Add current_orders plugin
2015-08-07 19:36:05 +02:00
dc731ee40d
Make current_orders plugin configurable
2015-07-21 00:13:15 +02:00
9efa9d5d43
Handle errors using Gaffe
2015-07-21 00:08:17 +02:00
58df186a2a
Make sharedlists optional (and disabled by default)
2015-07-20 22:33:28 +02:00
13768285e4
localeapp roundtrip
2015-05-15 14:26:08 +02:00
ec03d579d0
Merge branch 'feature/edit-recurring-task'
...
Conflicts:
config/locales/en.yml
2015-05-08 20:10:23 +02:00
a00e7c94be
Rework user-interface for editing recurring tasks
2015-05-08 17:39:20 +02:00
c388b4e410
Merge branch 'dockerization'
2015-05-08 13:06:15 +02:00
5e2ff4158e
Make mailcatcher & redis work with both Docker and local development
2015-05-08 13:05:48 +02:00
beee5a1245
Localeapp roundtrip
2015-05-02 15:27:06 +02:00
83dd18eaa7
Added Dockersupport. See README_DOCKER.md for further instructions.
2015-04-26 15:20:05 +02:00
d953ee6242
Silence Prawn PDF UTF-8 warning
2015-04-25 18:18:11 +02:00
5d47171b76
Improve upload error handling
2015-04-17 18:44:38 +02:00
c30ec67548
Allow synchronising units when uploading
2015-04-11 02:52:57 +02:00
4d1e102f47
Checkbox to remove articles not in upload
2015-04-11 02:52:57 +02:00
d5a7f6a074
Move file import logic to model
2015-04-11 02:52:57 +02:00
0d92007274
Improve upload form
2015-04-11 02:52:57 +02:00
16e9210035
Fix title of new upload screen
2015-04-11 02:52:57 +02:00
08c8d25a9d
New message form and checkbox papercuts
2015-04-11 02:32:30 +02:00
07311aa032
Merge pull request #357 from foodcoop1040/user_activity
...
Add last user login and activity
2015-04-03 16:01:18 +02:00
15ac566ece
Add help page for Foodsoft variables
2015-03-20 16:32:58 +01:00
a6f02a24d4
Improve wiki edit documentation
2015-03-20 15:50:49 +01:00
700eed27b8
Add last user login and activity
2015-03-03 14:55:30 +01:00
55e8ff481c
Add reply_to and group_id to messages schema
2015-02-27 17:30:26 +01:00
26c364bf4b
Merge pull request #354 from foodcoop1040/recipients
...
Show recipients of messages
2015-02-18 23:28:29 +01:00
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
23f0a1613a
Show recipients of messages
2015-02-18 17:45:20 +01:00
cfdfe5f23e
Improve header+footer in PDFs
2015-01-03 00:24:33 +01:00
7bc9d0ede6
Upgrade to rails 4.2
2015-01-02 17:43:44 +01:00
8777830029
Add unit: bag
2015-01-02 17:11:02 +01:00
6272816358
Localeapp roundtrip
2014-12-31 13:11:39 +01:00
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
86eee94249
Add hint for ordergroup address in user form
2014-12-16 20:53:38 +01:00
0aa098e75b
localeapp roundtrip
2014-12-15 21:11:41 +01:00
12bf2198e5
fix simple_form deprecations
2014-12-10 22:04:32 +01:00
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
68d54e7e25
add sudo functionality
2014-10-18 17:58:31 +02:00
e9dcaadb06
localeapp roundtrip
2014-10-14 18:39:05 +02:00
9a7b3378c3
Make invalid login message depend on use_nick (closes foodcoops#321)
2014-10-09 09:42:13 +02:00
575928d8a3
fix use_messages heading in config screen (closes foodcoops#319)
2014-10-07 01:07:11 +02:00
b961037fff
Fixed broken login#update_password route.
2014-10-05 20:35:28 +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
418a8b5806
fix i18n issues + localeapp roundtrip
...
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
03b307d359
fix more sensible mailer option defaults
2014-09-03 11:43:15 +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
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
7b000c39eb
add foodcoop configuration screen
2014-09-02 14:21:32 +02:00
a39c56fdf1
update strings from localeapp
2014-09-02 14:21:15 +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
647b7f0430
allow to synchronize all articles of a shared supplier
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
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
790a6b1972
allow to set page break options for each document
2014-08-29 12:01:21 +02:00
wvengen
wvengen
Patrick Gansterer
acracia
Robin Schneider
Tom Carchrae
Benjamin Meichsner
wvengen