Commit graph

2382 commits

Author SHA1 Message Date
bb3e049630 accept changesfrom upstream and resolve merge conflict ~ automatic go invoices 2022-02-03 12:15:21 +01:00
07b058a799 Merge branch 'feature/tw_automatic_group_order_invoice_generation' of github.com:Viehlieb/foodsoft into feature/tw_automatic_group_order_invoice_generation 2022-02-03 11:43:02 +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
bb69c3581a rubocop styling ~ refs automatic go invoice 2022-02-03 11:33:16 +01:00
81daddfb10 fix nil pointer~ refs automatic go invoice 2022-02-03 10:56:43 +01:00
Patrick Gansterer
19efd68c5f
Add support for ActiveStorage (PR #852) 2022-01-31 08:44:53 +01:00
1fc582319f fix order.ordergroup nil pointer error ~ automatic go invoices 2022-01-28 13:39:17 +01:00
bddaebe1a9 add option vor vat_exempt inoices ~ refs automatic go invoices 2022-01-27 16:42:22 +01:00
1de377c13a add vat exempt option in payment_tab ~ refs #automatic_go_invoices 2022-01-27 12:42:29 +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
e9f94fb33d
Rename Piwik to Matomo (PR #911) 2022-01-21 15:14:29 +01:00
kidhab
75d31c3f7c
Update links (PR #914)
to website of hosting platform and mailing list
2022-01-21 15:12:59 +01:00
kidhab
039f93dc35
Update link to mailing list (PR #915) 2022-01-21 15:12:44 +01:00
kidhab
eacbabbfdb
Add default time_zone (PR #912, #908)
There is no default time zone setting in newly created Foodsoft instances.
2022-01-21 15:12:22 +01:00
Tom Carchrae
0c2e3331dc
apple icons to stop 404s (#130, PR #889) 2022-01-12 17:19:38 +01:00
kidhab
7c6c8bcebd
Change instructions to rbenv (PR #910, fixes #899)
Co-authored-by: 1resu <1resu@solidaris.me>
2022-01-12 17:16:31 +01:00
kidhab
8289886355
Update to recent Ruby version (PR #905) 2021-12-30 10:47:05 +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
09679812af configure rubocop_todo to prevent errors 2021-12-24 13:35:08 +01:00
Viehlieb
303f9029d3 locales for prev commits 2021-12-24 13:31:46 +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
72fa7c1123 add finally schema.rb 2021-12-23 01:57:04 +01:00
Viehlieb
298a476061 add tests (integration + model) 2021-12-23 01:52:37 +01:00
Viehlieb
eadfbd5969 add locales 2021-12-23 01:52:04 +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
dependabot[bot]
1f6598c144
Bump addressable from 2.7.0 to 2.8.0 (#885)
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/sporkmonger/addressable/releases)
- [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.7.0...addressable-2.8.0)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-15 13:59:13 +01:00
dependabot[bot]
33ec295539
Bump puma from 5.3.2 to 5.5.2 (#904)
Bumps [puma](https://github.com/puma/puma) from 5.3.2 to 5.5.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.3.2...v5.5.2)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-15 13:58:04 +01:00
1resu
600e6a3c9a
Updated profile command (#895) 2021-12-14 17:27:06 +01:00
dependabot[bot]
d0f69f8480
Bump nokogiri from 1.11.7 to 1.12.5 (#890)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.7 to 1.12.5.
- [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.11.7...v1.12.5)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-14 17:24:31 +01:00
wvengen
6115cf58a1
Bundle update rails nokogiri (PR #880)
CVE-2021-22904
2021-06-05 11:48:58 +02:00
dependabot[bot]
13897c0571
Bump puma from 5.2.1 to 5.3.2 (PR #879)
Bumps [puma](https://github.com/puma/puma) from 5.2.1 to 5.3.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.2.1...v5.3.2)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-04 17:53:02 +02:00
decentral1se
51359ee571
Use v2 since extends is still supported there (PR #876)
See https://github.com/docker/compose/issues/4315.
2021-06-04 17:49:19 +02:00
dependabot[bot]
6526b29ef8
Bump nokogiri from 1.11.1 to 1.11.4 (PR #872)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.1 to 1.11.4.
- [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.11.1...v1.11.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-04 17:43:58 +02:00
dependabot[bot]
a4ddf73967
Bump rexml from 3.2.4 to 3.2.5 (PR #869)
Bumps [rexml](https://github.com/ruby/rexml) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.2.4...v3.2.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-04 17:43:33 +02:00
mjavurek
9d9b8a51dc
Aufgaben "Verantwortliche" (PR #866)
"Verantwortlichen" should be grammatically correct "Verantwortliche". It is used as a label for a list of persons.
2021-06-04 17:40:33 +02:00
lentschi
a9ca093eda
Fixes #864 (PR #865)
This is the result of running `bundle update --conservative mimemagic`
as suggested by https://github.com/rails/rails/issues/41750#issuecomment-810808957
2021-04-09 16:26:31 +02:00
twothreenine
b2a6c198ac
Improve invoice and supplier show views (#840) 2021-03-24 21:29:44 +01:00
mjavurek
007ff70c48
Add info about docker privileges to SETUP_DEVELOPMENT_DOCKER.md (#859) 2021-03-15 18:01:49 +01:00
wvengen
7d42552349 Fix inconsistency in swagger tag 2021-03-10 13:57:57 +01:00
wvengen
409309177a Fix Docker build status badge 2021-03-10 13:55:07 +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
07c8393c8c Add availability_short header to ArticlesCsv (fixes #854) 2021-03-08 12:05:34 +01:00
Patrick Gansterer
4b7cbf111f Fix small issues after 401c8f5 and 67ad202 2021-03-05 14:14:56 +01:00
Patrick Gansterer
38d49dedb8 Make usage of Docker for development easier by avoiding COPY operations 2021-03-05 11:33:28 +01:00