Commit Graph

767 Commits

Author SHA1 Message Date
wvengen f963bfee92 Don't dump schema in production 2019-05-03 10:35:29 +02:00
wvengen e9be38b3e9 Add OAuth scopes
https://github.com/foodcoops/foodsoft/issues/582#issuecomment-442513237
2019-04-03 17:20:44 +00:00
wvengen e6e060cab9 Fix mailcatcher 2019-04-03 17:06:23 +00:00
Tom Carchrae 99052fa3a7 Don't allow changes to settled orders (PR #614) 2019-03-26 19:14:39 +00:00
Tom Carchrae a524dd0325 use a sensible default if no redis. 2019-03-26 18:59:34 +00:00
wvengen 5fa61912c9 Slightly improve app config 2019-03-24 22:01:28 +01:00
Tom Carchrae 567e27d99a take note 2019-02-20 22:26:51 +01:00
Tom Carchrae fcf958981d use original label 2019-02-20 22:26:51 +01:00
Tom Carchrae 02328eba2b fix missing translation 2019-02-20 22:26:51 +01:00
Patrick Gansterer 226192f7cb Allow changing the visibitly (public/privat) of messages (fixes #625) 2019-02-11 16:54:30 +01:00
Patrick Gansterer c955a6ee40 Add a printer job queue via the printer plugin 2019-02-05 23:32:20 +01:00
Patrick Gansterer a2188cb6b8 Add financial_transaction_type to CSV (fixes #578) 2019-01-15 05:27:45 +01:00
Patrick Gansterer f8507655df Show associated group when sending messages (fixes #559) 2019-01-15 05:20:06 +01:00
Patrick Gansterer 389f205a6b Add set_balance to FinancialTransactions#new_collection (fixes #438)
A new checkbox will allow user to set the balance to a given ABSOLUTE value
in addition to changing it by a RELATIVE value. This can be used if the
balance is tracked outside of foodsoft and should be syncroniced or for
setting the balance to zero for multiple ordergroups.
2019-01-15 04:44:16 +01:00
Tom Carchrae 31689dfb75 allow override of default limit (<200) on articles on shared suppliers (#609) 2019-01-15 02:55:12 +01:00
wvengen 554be093b9 API v1 navigation endpoint 2018-10-13 20:41:47 +02:00
wvengen 9c5a5d9492 API v1 config endpoint 2018-10-13 20:41:47 +02:00
wvengen 110c7cc3e9 API v1 user endpoint 2018-10-13 20:41:47 +02:00
wvengen fd96b6ccc1
Prepare for API v1 (PR #570) 2018-10-13 20:16:35 +02:00
Patrick Gansterer 903086ab97 Add import route for bank_transactions 2018-10-12 15:47:02 +02:00
Patrick Gansterer 0bb0536903 Add short name to FinancialTransactionType 2018-10-12 13:33:41 +02:00
Patrick Gansterer 707501e3f8 Add edit functionality for financial links 2018-10-12 13:18:23 +02:00
Patrick Gansterer f0a55fb951 Add model and views for bank accounts 2018-10-11 22:29:15 +02:00
Patrick Gansterer ac11ba1cc1 Add pickups role 2018-01-25 18:09:29 +01:00
Patrick Gansterer 209ad615b4 Add view to sort orders by pickup day 2017-12-09 12:56:34 +01:00
Patrick Gansterer bd49a64cd7 Make the download button of orders reusable 2017-12-09 12:25:29 +01:00
Patrick Gansterer 3e156bbbf3 Rewrite OrderPdfs to support multiple orders at once 2017-12-09 12:22:37 +01:00
Patrick Gansterer 80899afcb0 Add English and German translations for financial transaction types 2017-12-09 11:51:23 +01:00
Patrick Gansterer dae4d075fe Add UI to manage the financial transaction types and classes 2017-12-09 11:51:23 +01:00
Patrick Gansterer 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
Patrick Gansterer dc94e98138 Add folders to the documents plugin 2017-11-21 10:12:13 +01:00
wvengen 33aa1c4b4a Localeapp roundtrip 2017-11-10 17:06:20 +01:00
Patrick Gansterer 816f699f69 Switch license to AGPL (fixes #496, PR #513) 2017-11-10 17:02:35 +01:00
acracia 3b18dc7532 Add translations for Spanish 2017-11-06 20:12:03 +01:00
Patrick Gansterer f77f2fcbfd Localeapp roundtrip 2017-10-29 01:17:49 +02:00
Patrick Gansterer 9f2e5bb992 Add missing German translations 2017-10-28 21:34:15 +02:00
Patrick Gansterer 53bb096046 Add FinancialLinks
For now this is only usefull for plugins, since there is no UI.
2017-10-28 20:17:16 +02:00
Patrick Gansterer 75deec9f06 Add custom fields to invoice, odergroup, supplier and user 2017-10-28 20:16:47 +02:00
Patrick Gansterer 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
wvengen f5bea41ccf
Remove Capistrano (#491, PR #521) 2017-10-28 19:50:02 +02:00
wvengen 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
Patrick Gansterer 6989e2f4f7 Add view for unpaid invoices 2017-10-26 21:27:26 +02:00
Patrick Gansterer 564492afe4 Add an option to automatically finish an order 2017-10-12 21:14:29 +02:00
Patrick Gansterer f509f85327 Save the timestamp of the last mail to supplier and confirm resending it 2017-10-11 23:48:27 +02:00
Patrick Gansterer f27bbc2ffa Add a button to send the order to the supplier 2017-10-10 23:45:37 +02:00
Patrick Gansterer 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
Patrick Gansterer 463e448351 Clean up the German mail bodies and fix some typos 2017-10-02 19:34:35 +02:00
Patrick Gansterer 287cce2e92 Make "via Foodsoft" in mail From-header translateable 2017-10-02 16:08:16 +02:00
Patrick Gansterer 578e929e0d Add handling for bounce mails 2017-10-02 16:02:39 +02:00
Patrick Gansterer 97abcabffa Log mail delivery errors to database and add an UI for it 2017-10-02 16:02:39 +02:00
wvengen 0363f2dadc Improve Docker setup (PR #497) 2017-10-01 13:57:36 +02:00
Patrick Gansterer a10aa75f49 Improve user interface for creating new messages in messages plugin 2017-10-01 00:12:10 +02:00
Patrick Gansterer 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
Patrick Gansterer 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
Patrick Gansterer 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
Patrick Gansterer 251681bb66 Add option to configure SMTP server via environment variables in production.rb 2017-08-08 23:27:28 +02:00
Patrick Gansterer d6325de35c Add support for RAILS_SERVE_STATIC_FILES to production.rb an use it with Docker 2017-08-08 23:27:28 +02:00
wvengen e73bf9c7cb Localeapp roundtrip 2017-04-14 12:34:02 +02:00
Robin Schneider 897d31e340 Install all dependencies in an authenticated way (https)
git:// is unauthenticated!!!
2017-04-10 09:26:33 +02:00
wvengen 4f30248a49 Allow to run without Redis in development 2017-04-01 19:11:52 +02:00
wvengen c8999333a6 Localeapp roundtrip 2017-04-01 16:51:05 +02:00
Tom Carchrae 0779ccd193 Add missing confirm translation (fixes #467, PR #469) 2017-03-21 16:22:36 +01:00
Patrick Gansterer 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
Patrick Gansterer c6731b4e4f Add IBAN field to supplier and user model 2017-01-21 22:43:48 +01:00
Patrick Gansterer e742958c0c Add missing German translations 2017-01-21 22:41:18 +01:00
wvengen 0d309af5f6 Update translations from localeapp 2016-06-28 20:43:53 +02:00
wvengen c6a625e5ed Localeapp update 2016-06-11 19:19:30 +02:00
Patrick Gansterer 749791bb7a Add possibility to add an attachment to an invoice #345 2016-05-06 15:04:58 +02:00
wvengen 8d5467ab7c Merge pull request #355 from foodcoop1040/expeted_delivery_date
Add expected delivery date
2016-05-04 17:42:29 +02:00
Patrick Gansterer 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
wvengen 42eb6c8509 Make ordergroup break fields a bit nicer 2016-03-11 13:56:02 +01:00
wvengen b067808937 Merge pull request #404 from foodcoop1040/ordergroup_break
Add break to ordergroup
2016-03-11 13:48:57 +01:00
wvengen 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
Patrick Gansterer efb929e64f Allow editing of linked deliveries and orders at invoice 2016-03-11 13:23:13 +01:00
Patrick Gansterer 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
Patrick Gansterer 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
wvengen 14e2fd179e Merge pull request #403 from foodcoops/feature/402-messagegroups
Add messagegroups
2016-03-07 22:36:37 +01:00
wvengen 5d9e1845b7 Fix i18n key typo 2016-03-07 21:06:49 +01:00
wvengen d358278333 Merge pull request #416 from foodcoop1040/invite_config
Add config option to disable the invites
2016-03-07 19:47:00 +01:00
wvengen 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
wvengen cb8205e4de Merge pull request #413 from foodcoop1040/error_translations
Add missing German translations for error messages
2016-03-07 19:44:29 +01:00
wvengen b4e2ddf66d Merge pull request #412 from foodcoop1040/confirm
Get rid of duplicated confirm_delete translations
2016-03-07 19:44:06 +01:00
Patrick Gansterer 7aacc7fef6 Fix German ui.* translations 2016-03-07 15:21:03 +01:00
Patrick Gansterer 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
Patrick Gansterer 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
Patrick Gansterer f24a18371e Add missing German translations for error messages 2016-03-04 23:23:56 +01:00
Patrick Gansterer c62104a388 Get rid of duplicated confirm_delete translations 2016-03-04 23:13:28 +01:00
Patrick Gansterer 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
Patrick Gansterer 0fc80a1ef5 Rename translation "admin.confirm" to "ui.confirm_delete" 2016-03-04 20:10:11 +01:00
Patrick Gansterer 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
Patrick Gansterer 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
Patrick Gansterer 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
Patrick Gansterer 6015d16cab Add link for creating invoice at an order 2016-03-04 17:12:46 +01:00
Patrick Gansterer 8b8693df5a Show last activity of ordergroups 2016-03-04 16:16:09 +01:00
Patrick Gansterer 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
Patrick Gansterer 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
Patrick Gansterer 3d6f908102 Add created_by to invoice and show it 2016-02-24 00:39:07 +01:00
wvengen 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
wvengen 496dd34cc3 Avoid Rails 4.2 deprecation warning 2015-11-14 18:23:33 +01:00
wvengen bc0c1f1bbe Localeapp roundtrip 2015-11-14 16:38:35 +01:00