Commit graph

2469 commits

Author SHA1 Message Date
dependabot[bot]
793da37cff
Bump puma from 5.6.2 to 5.6.4 (PR #936)
Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4.
- [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.6.2...v5.6.4)

---
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>
2022-04-25 14:02:30 +02:00
kidhab
8ebf122707
Fix Typo (PR #938) 2022-04-25 14:02:11 +02:00
dependabot[bot]
d92edf4dc6
Bump nokogiri from 1.13.1 to 1.13.4 (PR #940)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.1 to 1.13.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.1...v1.13.4)

---
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>
2022-04-25 13:58:50 +02:00
kidhab
216fb9b3cf
Enabled systemd socket activation (PR #942)
With this [configuration](https://github.com/puma/puma/blob/master/docs/systemd.md) puma automatically binds to all systemd activated sockets. With socket activation systemd opens the listening socket(s) in advance and provides them to the Puma master process on startup. This keeps listening sockets open across puma restarts and achieves graceful restarts.
2022-04-25 12:41:40 +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
3149e00e11 adapt tests for manually generating group order invoices for order 2022-04-05 12:05:17 +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
e8a28d7fee
Add table_print for debugging ActiveRecord queries in the console 2022-03-11 22:43:43 +01: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
Patrick Gansterer
f260e607bf Fix Dockerfile with Debian bullseye 2022-02-20 04:13:36 +01:00
Patrick Gansterer
83e3590c88 Add missing nodejs dependecy to Dockerfile-dev 2022-02-19 20:53:58 +01:00
decentral1se
16eb9888a6
Also note login details in docker development docs 2022-02-18 16:15:59 +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
1798aad5e2 Use decimal to store number of billed/received units 2022-02-18 12:46:31 +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
Patrick Gansterer
06b035f2ea Add Rails 6 backport for ActiveRecord
This fixes the "can't create Thread: Resource temporarily unavailable" error.
2022-02-18 10:04:17 +01:00
mjavurek
0d6a3c14e9
fix translation missing: xxx.orders.state.received (#927) 2022-02-16 21:02:22 +01:00
kidhab
64ab699047
Allow longer passwords (#923) 2022-02-16 18:13:08 +01:00
mjavurek
daccf91ab6
Invoice: change label "delivery" to "stock delivery" (#922) 2022-02-16 18:11:34 +01:00
Patrick Gansterer
5b1552945b Bundle update 2022-02-16 18:00:12 +01:00
Patrick Gansterer
ae99619bf5 Bundle update rubocop 2022-02-16 17:59:52 +01:00
Patrick Gansterer
bca29bea70 Bundle update midi-smtp-server 2022-02-16 17:56:04 +01:00
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