Commit graph

2442 commits

Author SHA1 Message Date
FGU
1c6413a67e wip on demo day seeds
Some checks failed
continuous-integration/drone/push Build is failing
2023-02-24 15:34:55 +01:00
Philipp Rothmann
f4f61f02db this merge breaks alot
Some checks failed
continuous-integration/drone/push Build is failing
2023-02-23 18:21:40 +01:00
44f5d13920 update article category implemented
adapt tests

add translations

adapt test

fix bug
2023-02-23 13:29:29 +01:00
f62dfc918b include foodsoft-article-import
Some checks failed
continuous-integration/drone/push Build is failing
use filetypes for manual uploading bnn, odin, foodsoft file

use opts in .parse

adapt specs to include file format

add specs for odin, bnn, foodsoft files

adapt localize input to remove ',' separator and replace with '.'

remove depr foodsoftfile.rb and spreadsheet.rb

remove todo
2023-02-22 16:59:50 +01:00
Philipp Rothmann
a355399f8e fix: give docker user storge directory permissions for fileupload 2023-02-22 16:59:50 +01:00
Philipp Rothmann
8cf500dc42 fix: set RAILS_SERVE_STATIC_FILES for deployment 2023-02-22 16:59:50 +01:00
Philipp Rothmann
7694d0bdcf fix: assets precompile by using terser
importmaps broke precompiliation with uglifier
see: https://github.com/rails/importmap-rails/issues/5
2023-02-22 16:59:50 +01:00
Philipp Rothmann
3c17b3abea fix(messages): migrate message bodys to richtext 2023-02-22 16:59:50 +01:00
Philipp Rothmann
9ce8524b49 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-22 16:59:50 +01:00
Philipp Rothmann
ad62cbd086 feat(finance): show sum of ordergroup balances 2023-02-22 16:59:50 +01:00
Philipp Rothmann
a2c8c6e0e0 add: drone ci
fix: ci

fix: .drone docker rails version

add .drone caching

fix drone ci
2023-02-22 16:59:50 +01:00
91a38bc73b move BigDecimal.new to BigDecimal() 2023-02-17 13:16:28 +01:00
782194cd08 change .search to .ransack for updated ransack gem 2023-02-17 13:16:19 +01:00
Philipp Rothmann
78da4feafe fix: assets precompile by using terser
importmaps broke precompiliation with uglifier
see: https://github.com/rails/importmap-rails/issues/5
2023-02-10 13:07:02 +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
Philipp Rothmann
82d4ff0284 improve dockerfile caching 2023-02-09 17:22:38 +01:00
Philipp Rothmann
c487f0368a upgrade dockerfile to rails7 2023-02-09 17:21:05 +01:00
FGU
a7747c9e84 fix docker-compose 2023-02-02 10:14:26 +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
d7591d46b9 Add controller tests
Co-authored-by: viehlieb <pf@pragma-shift.net>
Co-authored-by: Tobias Kneuker <tk@pragma-shift.net>

seperate expects

refactor login user calls

add more articles to test sorting with

fix: fix test for rails upgrade
2023-01-17 16:09:52 +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
Philipp Rothmann
3f114af193 replace apivore with rswag 2023-01-17 16:07:54 +01:00
dependabot[bot]
1c2ca42dda
Bump rails-html-sanitizer from 1.4.3 to 1.4.4 (#975)
Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases)
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.3...v1.4.4)

---
updated-dependencies:
- dependency-name: rails-html-sanitizer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-20 18:59:26 +01:00
dependabot[bot]
460a3e4285
Bump loofah from 2.19.0 to 2.19.1 (#974)
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.19.0 to 2.19.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.19.0...v2.19.1)

---
updated-dependencies:
- dependency-name: loofah
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-14 10:21:36 +01:00
Florian Lentsch
ec6d69c27f Allow entering decimals (#830, PR #868) 2022-12-14 10:17:40 +01:00
dependabot[bot]
d0110a767c
Bump nokogiri from 1.13.9 to 1.13.10 (#973)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.9 to 1.13.10.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.9...v1.13.10)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-12 15:24:21 +01:00
kidhab
e8a04e61ca
Update link to forum (PR #963)
* Update link to forum
* Replace link to mailinglist with link to forum
2022-12-12 15:15:54 +01:00
dependabot[bot]
ecaa14dfd2
Bump sinatra from 3.0.2 to 3.0.4 (#971)
Bumps [sinatra](https://github.com/sinatra/sinatra) from 3.0.2 to 3.0.4.
- [Release notes](https://github.com/sinatra/sinatra/releases)
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sinatra/sinatra/compare/v3.0.2...v3.0.4)

---
updated-dependencies:
- dependency-name: sinatra
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-12 15:15:02 +01:00
wvengen
095ff8ef0e Fix typo in i18n source string 2022-12-06 18:05:36 +01:00
Philipp Rothmann
c6560e0cea Add additional model and integration tests
This commit adds new tests for a better coverage.

integration/
  * home
  * supplier

models/
  * article
  * delivery
  * group_order_article
  * supplier

also adds a new factory for delivery

Co-authored-by: viehlieb <pf@pragma-shift.net>
Co-authored-by: Tobias Kneuker <tk@pragma-shift.net>
2022-11-27 12:39:57 +01:00
wvengen
9a46640d3b Update Crowdin settings
So that it works with the Crowdin CLI.
Also remove now broken update script.
Use instead: crowdin pull -b master
2022-11-14 21:38:52 +01:00
kidhab
427561e5ae Add sd_notify. Puma supports systemd's Type=notify and watchdog service 2022-10-26 20:06:41 +02:00
3ffdb424d5 replace deprecated update_attributes with update 2022-10-26 13:19:27 +02:00
dependabot[bot]
eb45a2bf21
Bump nokogiri from 1.13.8 to 1.13.9 (#958)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.8 to 1.13.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.8...v1.13.9)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-22 20:31:22 +02:00
Philipp Rothmann
0c5ff5b41d Add test to delete article 2022-10-09 13:24:29 +02:00
Patrick Gansterer
3a388596ea Bundle update 2022-10-09 13:24:14 +02:00
Patrick Gansterer
a81bb25512 Bundle update rubocop and auto correct style issues 2022-10-08 16:03:19 +02:00
Harald Reingruber
f7f8774c43 [Readme.md] Fix Gitpod link pointing to original repo
The "Open in Gitpod" link in the Readme.md was pointing to a fork, so that the .gitpod.yml is picked up when opening the link.
Now that it's merged to master (#916), it should of course point to the main repo.
2022-05-29 11:07:15 +02:00
Patrick Gansterer
0db3452f97 Bundle update 2022-05-27 23:10:07 +02:00
Patrick Gansterer
9c9ebdf557 Bundle update rubocop and auto correct style issues 2022-05-27 23:10:07 +02:00
Patrick Gansterer
22fd814193 Add a script to read all databases with a prefix from the database server
When passing a value via the FOODSOFT_DB_PREFIX environment variable the
FOODSOFT_FOODCOOPS environment variable will be overwritten with a list
of databases starting with the given prefix.

This can be used to dynamically generate the app_config.yml in a multicoop
installation and avoid listing all instances manually.
2022-05-27 23:10:07 +02:00
Patrick Gansterer
a40934dd5a Fix missing I18n in messages plugin 2022-05-27 23:10:07 +02:00
Patrick Gansterer
f7311d25f6 Remove deprecated test_files attributes from gemspec files 2022-05-27 22:41:18 +02:00
Patrick Gansterer
754099999e Add requeue action for printer jobs 2022-05-27 22:41:18 +02:00
Patrick Gansterer
3a25a50d8d Small improvements and style fixes in BankAccountInformationImporter 2022-05-27 22:41:08 +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
Patrick Gansterer
c59715381e Configure base_controller of Doorkeeper 2022-05-27 17:20:13 +02:00
Mob-Programming Meetup Austria
c32bcc8dcb
One-click development environment via Gitpod.io (browser-based VSCode with cloud backend) 2022-05-27 17:18:17 +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