Commit Graph

2449 Commits

Author SHA1 Message Date
Philipp Rothmann 8cb86b2f88 update readme 2023-02-24 18:55:12 +01:00
viehlieb 3d71d266e3 add bnn for demo day 2023-02-24 18:55:12 +01:00
FGU ee03a2a9af wip on demos seeds 2023-02-24 18:55:12 +01:00
Philipp Rothmann 237ef5d38b fix: article_spec login twice to fix flaky test 2023-02-24 18:55:12 +01:00
Philipp Rothmann dfe8beae2c fix: article category remove option from list 2023-02-24 18:55:12 +01:00
Philipp Rothmann 75bb400d0d feat: improve usability of group order
remove group order panel close buttons

things shouldn't just disapear

order article disabled button should be gray

roup order swap plus and minus buttons

because it's more naturally intuitive like this

group order make order details collapse

group order pull search to the right

group order make 'current orders' more obvious

fix switch menu

rework group order edit form

* make switch order a menu list
* table more slim
* alert when balance negative instead of making everything red
* search to the right

wip: rework group order details

tried to reduce the amount of informations shown. but needs some user feedback, what information are actually relevant

rework group order show view

dashboard make show edit current order action more precise

group order package indication uses  more color-blind friendly color

group order fix dancing quantity buttons

group order switch menu use show view

group order show window with some explanations

group order edit title more clear

grou order edit show less infos

group order switch view next iteration

grou order index narrower tables

move order details to show again

remove unused stuff
2023-02-24 18:55:11 +01:00
viehlieb 6f2a3b4f5f fix behavior - when link is provided in article details not clickable due to hover property
solve hover problem for ordering articles
2023-02-24 18:54:33 +01:00
viehlieb d81ae10dc8 feat(order): export order to custom csv file
add custom_csv_collection to orders helper

add rute and controller method to orders controller

add custom csv to download dropdown

add functionality to choose column headers + order for custom csv and append order.sum gross&net to custom csv
2023-02-24 18:54:33 +01:00
viehlieb 4b5775e107 include foodsoft-article-import
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-24 18:54:33 +01:00
Philipp Rothmann 936c1ba878 fix: give docker user storge directory permissions for fileupload 2023-02-24 18:54:33 +01:00
Philipp Rothmann b3571515b0 fix: set RAILS_SERVE_STATIC_FILES for deployment 2023-02-24 18:54:33 +01:00
Philipp Rothmann 28c851823a fix: assets precompile by using terser
importmaps broke precompiliation with uglifier
see: https://github.com/rails/importmap-rails/issues/5
2023-02-24 18:54:33 +01:00
Philipp Rothmann 25d4efa71a fix(messages): migrate message bodys to richtext 2023-02-24 18:54:33 +01:00
Philipp Rothmann 49a04b226c 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-24 18:54:33 +01:00
Philipp Rothmann 69c80eba3e feat(finance): show sum of ordergroup balances 2023-02-24 18:54:32 +01:00
Philipp Rothmann e6e2cdc2c6 add: drone ci
fix: ci

fix: .drone docker rails version

add .drone caching

fix drone ci
2023-02-24 18:54:32 +01:00
viehlieb 4bb724495d downgrade haml to make deface work 2023-02-24 18:54:32 +01:00
viehlieb 0bd04fba41 move BigDecimal.new to BigDecimal() 2023-02-24 18:54:32 +01:00
viehlieb 46e3794a4e change .search to .ransack for updated ransack gem 2023-02-24 18:54:32 +01:00
viehlieb 5c04a43f61 update article category implemented
adapt tests

add translations

adapt test

fix bug
2023-02-24 18:54:32 +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
viehlieb 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
viehlieb 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