Commit graph

165 commits

Author SHA1 Message Date
Philipp Rothmann
390e0d9819 merge demo
Some checks failed
continuous-integration/drone/push Build is failing
2023-02-10 14:55:31 +01:00
Philipp Rothmann
8eda266340 feat(messages): add html formatting to messages
This commit allows users to use the trix editor to send
messages with basic formatting and attachements.

* add active storage
* add actiontext
* add richtext field to messages
* add imageprocessing for message attachements
* add html email layout and adjust translations to use html urls
2023-02-10 12:28:40 +01:00
a92c439418 adjust db to use invoices
Some checks failed
continuous-integration/drone/push Build is failing
2023-01-17 17:43:53 +01:00
Philipp Rothmann
f519f2af1d merge
Some checks failed
continuous-integration/drone/push Build is failing
2023-01-17 17:02:10 +01:00
fb8ccfea4a rails up to 7.0and ruby to 2.7.2
mv lib to app/lib due to upgrade

removing concerns from autoload path

resolve zeitwerk issues

make foodsoft run for dev on rails 7 and ruby 2.7

fix mail file permission bug

fix database_config

fix articles controller test ActiveModell::Error

bump Gemfile.lock
2023-01-17 16:35:04 +01:00
3ffdb424d5 replace deprecated update_attributes with update 2022-10-26 13:19:27 +02:00
Harald Reingruber
0a6345c60b
Make columns of user and ordergroup lists sortable
This commit implements the sort functionality for the user lists (by name, email, last_activity) and ordergroup lists (by name).
It is a first attempt addressing issue #560.
2022-05-27 17:06:25 +02:00
b2882d8592 Merge branch 'feature/tw_automatic_group_order_invoice_generation' 2022-03-01 13:31:29 +01:00
Patrick Gansterer
7e8c1d041d Auto correct rubocop style issues 2022-02-20 16:28:54 +01:00
Patrick Gansterer
1798aad5e2 Use decimal to store number of billed/received units 2022-02-18 12:46:31 +01:00
Patrick Gansterer
87fe9ccdb1 Add model for BankGateway 2022-02-18 10:09:15 +01:00
Patrick Gansterer
7e60ce6ce2 Add BankAccount to SupplierCategory 2022-02-18 10:09:15 +01:00
bb3e049630 accept changesfrom upstream and resolve merge conflict ~ automatic go invoices 2022-02-03 12:15:21 +01:00
Patrick Gansterer
19efd68c5f
Add support for ActiveStorage (PR #852) 2022-01-31 08:44:53 +01:00
Viehlieb
72fa7c1123 add finally schema.rb 2021-12-23 01:57:04 +01:00
Viehlieb
0fa696cfdd add groupo order invoice and relation to group order 2021-12-23 01:48:06 +01:00
Patrick Gansterer
38193e43a9 Add missing migration file and translations after 7d5155b 2021-03-05 11:31:57 +01:00
Patrick Gansterer
ea2862fdef Run rubocop --fix-layout and remove encoding comments 2021-03-02 09:12:19 +01:00
Patrick Gansterer
7d5155bef6 Add option to ignore financial transaction when calculating the balance 2021-02-17 14:07:03 +01:00
Florian Lentsch
8e12b15c88 On #805: Turn bigint IDs back into normal integers
see https://stackoverflow.com/questions/44390225/how-to-turn-off-bigint-primary-keys-in-rails-5-1
and https://edgeguides.rubyonrails.org/5_1_release_notes.html#active-record-notable-changes
2021-02-07 13:03:27 +01:00
Florian Lentsch
a96dbd563b Migrations for new received order state (s. #779) 2021-02-05 12:05:23 +01:00
Florian Lentsch
64113ab7f6 Closes #805 - updated db/schema.rb to Rails 5.2 dump 2021-02-05 11:30:19 +01:00
JuliusR
661fab0e0c fix small.{en,nl}.seeds.rb
this handles problems unveiled by 18ed8934d916962b3271645eec6f5f8965f6722e
2020-10-14 19:08:45 +02:00
JuliusR
a1bf2a36ad prefer exception-raising methods in database seeds 2020-10-14 19:08:45 +02:00
JuliusR
9a01cd67a6 fix SupplierCategory seed from minimal.seeds.rb (#774) 2020-10-14 19:08:45 +02:00
wvengen
3752c5c680 Fix small database seeds 2020-09-11 14:19:00 +02:00
Patrick Gansterer
00bb10d14a Fix CreateStockEvents migration for DBs without Delivery and/or StockTaking 2020-09-07 13:55:48 +02:00
Patrick Gansterer
74531f90c7 Add Rails release to ActiveRecord::Migration 2020-09-05 14:40:11 +02:00
Patrick Gansterer
785313ac23 Make StockEvent a base class for Delivery and StockTaking
This helps to share code between the two entities and allows easier
extensions in the future.
2020-09-05 13:52:18 +02:00
Patrick Gansterer
a5582e9542 Rename Delivery.delivered_on to date
This aligns it with column names of StockTaking and us to use inheritance
in a next step to share common code between the entities.
2020-09-05 13:52:18 +02:00
Patrick Gansterer
3a6276aece Ensure that the article_id is set for every article_price
This addresses the TODO from dc92de771e.
2020-09-04 12:29:17 +02:00
Patrick Gansterer
5f60844a13 Change supplier_id of stock orders to NULL 2020-09-04 12:26:19 +02:00
Patrick Gansterer
4c567fece1 Add transport costs to Order 2020-08-07 00:52:43 +02:00
Patrick Gansterer
8cb70d819e Change ordergroup default in FinancialTransaction to NULL
The AllowEmtpyOrdergroupInFinancialTransaction migration only changed the
possibility to store NULL values, but did not set the default to NULL.
2020-08-07 00:36:46 +02:00
Patrick Gansterer
d52315287d Use the correct Unicode character in MarkAsDeletedWithName 2020-07-31 21:44:46 +02:00
Patrick Gansterer
6b400b4f96 Increase choices size for polls
MariaDB/MySQL stores the array as serialized string, so the current
limit of 255 is too small to store all choices.
2020-07-31 21:43:56 +02:00
Patrick Gansterer
d90d188dbf Add SupplierCategory
This allows the categorization of suppliers. For a better reporting
it is necessary to split the expenses of the invoices.
E.g. we want to be able to generate independent sums of general cost
like the rent or electricity and the cost of the bought articles.
2020-07-30 17:46:07 +02:00
Patrick Gansterer
fc22a97f52 Nullify deliveries and orders depending on an invoice (#718) 2020-07-29 15:12:48 +02:00
Patrick Gansterer
1a49bee42d Adopt model to allow FinancialTransaction without an ordergroup
This will allow us to add accounting for the foodcoop itself, to support
listing for spendings independent of the order (e.g. rent, electricity).
2020-07-29 11:43:31 +02:00
Patrick Gansterer
7657b05787 Add links plugin
This can be used to link to external services related to the foodcoop.
With the indirect mode it is possible to implement a secure login to other
services. In that case Foodsoft will send a HTTP GET request and redirect
the user to the returned Location header. This allows the generation of
a one-time login URL.
A typical use-case would be that a workgroup, which is responsible for
the email account, does not need to share the login credentials and can
use a link within the Foodsoft instead.
2020-07-29 11:25:04 +02:00
Patrick Gansterer
e16f03eebf Add reference_calculator 2020-07-29 11:02:58 +02:00
wvengen
8c8b42c2b2 Fix schema issue 2020-07-25 15:57:53 +02:00
Patrick Gansterer
b6f5295267 Add created_by user to Task 2020-04-11 00:04:49 +02:00
Patrick Gansterer
17059a8104 Adopt model to reference GroupOrder in generated FinancialTransaction 2020-03-17 09:38:44 +01:00
Patrick Gansterer
d476993321 Add polls plugin 2020-02-24 14:27:22 +01:00
Patrick Gansterer
5b04b65cd8 Run db:schema:dump with MariaDB
Most of the recent schema changes have been made with SQLite. Since we
recommend MariaDB for production use, our schema should match the database.
2019-11-13 11:40:17 +01:00
Patrick Gansterer
ff76fa60c0 Allow deletion of financial transactions 2019-11-01 20:56:00 +01:00
Patrick Gansterer
f8148e7d30 Store message receivers in a new table instead of in a serializied value 2019-10-29 13:40:11 +01:00
wvengen
99ecb75c83 Add required column for Doorkeeper 5 2019-04-03 17:08:38 +00:00
Patrick Gansterer
c955a6ee40 Add a printer job queue via the printer plugin 2019-02-05 23:32:20 +01:00