Commit graph

1475 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
Philipp Rothmann
666e7934a6 introduce importmaps
This commit introduces importmaps. They allow to use modern javacript ESM within rails without webpack, yarn etc.
see https://github.com/rails/importmap-rails for more details.

Co-authored-by: Philipp Rothmann <philipprothmann@posteo.de>
Co-authored-by: FGU <fgu@pragma-shift.net>
2023-02-10 12:24:42 +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
Philipp Rothmann
d16aa19300 Add home controller test
Co-authored-by: viehlieb <pf@pragma-shift.net>
Co-authored-by: Tobias Kneuker <tk@pragma-shift.net>
2023-01-17 16:09:27 +01:00
Florian Lentsch
ec6d69c27f Allow entering decimals (#830, PR #868) 2022-12-14 10:17:40 +01:00
3ffdb424d5 replace deprecated update_attributes with update 2022-10-26 13:19:27 +02:00
b6854bc416 add authentication to group_order_invoices controller 2022-09-06 23:41:19 +02:00
0539edce82 remove unneccessary files in app/view/group_order_invoices 2022-09-06 23:39:23 +02:00
Patrick Gansterer
bc5bc2d5ac Refactor LocalizeInput to reuse parse functionality 2022-05-27 17:24:57 +02:00
Patrick Gansterer
6a3636d8cb Move code from localize_input gem into Foodsoft 2022-05-27 17:24:57 +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
59fd8dadb1 remove footer on group order invoices showing time.now 2022-04-11 09:25:13 +02:00
f3914f3dd9 solve hover problem for ordering articles 2022-04-07 13:32:52 +02:00
aab1dcaff2 fix behavior - when link is provided in article details not clickable due to hover property 2022-04-05 13:20:06 +02:00
d37a75262d Merge branch 'master' of github.com:foodcoops/foodsoft into feature/tw_automatic_group_order_invoice_generation 2022-04-05 13:03:10 +02:00
5a817a9acb add datefield default values max value cannot be blank 2022-03-30 15:49:53 +02:00
368375818e wip on generating invoices with date 2022-03-30 11:45:40 +02:00
76be8fdf1a wip on entering individual date for invoices 2022-03-29 13:17:36 +02:00
Harald Reingruber
15e715c9f3
Fix filtering of active ordergroups 2022-03-08 00:11:06 +01:00
b2882d8592 Merge branch 'feature/tw_automatic_group_order_invoice_generation' 2022-03-01 13:31:29 +01:00
mariandl
708f85a839
Add admin UI for SupplierCategories 2022-02-20 16:43:20 +01:00
Patrick Gansterer
7e8c1d041d Auto correct rubocop style issues 2022-02-20 16:28:54 +01:00
twothreenine
f3493b3242 charge transport cost as well when accounting order (fix #861 after f7c7b56) 2022-02-18 13:27:09 +01:00
Patrick Gansterer
052d297bff Add expected_amount to Invoice
expected_amount returns the sum of all associated orders together with
the transport costs.
2022-02-18 13:12:27 +01:00
Patrick Gansterer
093313f0f3 Add small improvements for BankTransactions 2022-02-18 12:55:02 +01:00
Patrick Gansterer
6d71bd2c2f Fix active ordergroup 2022-02-18 12:54:07 +01:00
Patrick Gansterer
cdc9e91d26 Add supplier_categories to BankAccount 2022-02-18 12:47:09 +01:00
Patrick Gansterer
8f92915818 Allow minimal password length of 5 characters 2022-02-18 12:47:09 +01:00
Patrick Gansterer
79fdb4dafb Add admin UI for BankGateway 2022-02-18 10:09:15 +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
kidhab
64ab699047
Allow longer passwords (#923) 2022-02-16 18:13:08 +01:00
bb3e049630 accept changesfrom upstream and resolve merge conflict ~ automatic go invoices 2022-02-03 12:15:21 +01:00
81a5194023 add vat exempt option in payment_tab ~ refs #automatic_go_invoices
add option vor vat_exempt inoices ~ refs automatic go invoices

fix order.ordergroup nil pointer error ~ automatic go invoices

fix nil pointer~ refs automatic go invoice

rubocop styling ~ refs automatic go invoice
2022-02-03 11:37:30 +01:00
kidhab
7574f4eb07
Add validation of more article fields (PR #917)
If one adds a some text  that is longer than 255 characters into these articles fields the browser shows an unspecific error messages. With this validation an understandable message will be shown.
2022-01-26 09:22:41 +01:00
kidhab
4306389f93
Enable to configure feedback recipient address (PR #901) 2021-12-28 19:40:26 +01:00
Viehlieb
bafa163ce5 fix rubocop errors 2021-12-24 13:35:26 +01:00
Viehlieb
f428450516 left over todo for naming od pdf file 2021-12-24 13:31:10 +01:00
Viehlieb
f592b27f92 fix tiny issue where flash alert not shown 2021-12-24 13:17:45 +01:00
Viehlieb
06eb56acf4 add tax_number, payment_method and automatic invoice options to be editable in admin configs 2021-12-23 01:57:23 +01:00
Viehlieb
50017fefa8 add functionality in views and controllers for generation of group order invoices 2021-12-23 01:51:44 +01:00
Viehlieb
817c680c28 add mailer relevant files, add pdf relevant files and confgurations for invoice generation and sending 2021-12-23 01:50:06 +01:00
Viehlieb
0fa696cfdd add groupo order invoice and relation to group order 2021-12-23 01:48:06 +01:00
twothreenine
b2a6c198ac
Improve invoice and supplier show views (#840) 2021-03-24 21:29:44 +01:00
Patrick Gansterer
d48320f9e0 Add CSV download for User 2021-03-08 17:28:08 +01:00
Patrick Gansterer
47d9c79617 Use ActiveJob instead of Resque directly
This allows us to directly pass entities to the job.
2021-03-08 12:30:58 +01:00
Patrick Gansterer
4b7cbf111f Fix small issues after 401c8f5 and 67ad202 2021-03-05 14:14:56 +01:00