Commit graph

494 commits

Author SHA1 Message Date
91df920119 fix deposit is agnostic to percentage on pdf 2023-10-19 01:05:02 +02:00
90e06a475f fix deposit is net value 2023-10-05 10:21:35 +02:00
Philipp Rothmann
93143c28f2 merge automatic group order invoice generation
see https://github.com/foodcoops/foodsoft/pull/907 for reference
and original work by viehlieb

Co-authored-by: viehlieb <pf@pragma-shift.net>

fix PDF Pdf

make explicit deposit in invoices work

add ordergroupname to invoice file name

mark bold sum for vat exempt foodcoops

download multiple group order invoice as zip
2023-10-05 10:21:35 +02:00
Philipp Rothmann
33034e66b8 fix: add null checks for articles convert_units
Prevents division by zero exception because of a unit beeing 0.
A Unit becomes also zero e.g. when a comma symbol is used Unit.new("0,9kg") == 0

fixes #1014
2023-06-22 22:49:22 +02:00
Philipp Rothmann
a1682932ac fix: price_markup with value nil gives exception
fixes #1011
2023-06-16 13:20:33 +02:00
Philipp Rothmann
fb2b4d8a8a chore: rubocop
chore: fix api test conventions

chore: rubocop -A spec/

chore: more rubocop -A

fix failing test

rubocop fixes

removes helper methods that are in my opinion dead code

more rubocop fixes

rubocop -a --auto-gen-config
2023-06-09 17:35:05 +02:00
45ae192891 move BigDecimal.new to BigDecimal() 2023-06-09 17:35:05 +02:00
3ffdb424d5 replace deprecated update_attributes with update 2022-10-26 13:19:27 +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
Harald Reingruber
15e715c9f3
Fix filtering of active ordergroups 2022-03-08 00:11:06 +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
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
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
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
ea2862fdef Run rubocop --fix-layout and remove encoding comments 2021-03-02 09:12:19 +01:00
lentschi
9a7d4bf07d
Add option to send mails when an order has been received 2021-02-27 17:24:25 +01:00
Patrick Gansterer
4752a0aaa9 Add method to parse bank transactions as JSON
This implements parsing of the Account Information Service format as
defined in the Berlin Group Group NextGenPSD2 XS2A Framework, which
is widely used across various European banks.

This is a first step to replace the current bank import features with
a standardized JSON interface.
2021-02-24 14:59:55 +01:00
Patrick Gansterer
e6061e6760 Add API v1 financial_transactions POST endpoint
In a first step we allow members to create financial transactions
for their own ordergroup.
2021-02-18 18:09:40 +01:00
wvengen
f7c7b56bd0
Split order close method (PR #829) 2021-02-17 18:42:52 +01:00
wvengen
69732cca0d API v1 article_categories endpoint 2021-02-17 17:07:39 +01:00
wvengen
e1d50e5b9c API v1 group_order_articles endpoints 2021-02-17 17:07:39 +01:00
wvengen
ed9192c47f API v1 order_articles endpoints 2021-02-17 17:07:39 +01:00
wvengen
127ae83f04 API v1 orders endpoints 2021-02-17 17:07:39 +01:00
Patrick Gansterer
7d5155bef6 Add option to ignore financial transaction when calculating the balance 2021-02-17 14:07:03 +01:00
Patrick Gansterer
a30d0d4453 Add option to create a new FinancialTransaction at a FinancialLink 2021-02-17 13:52:39 +01:00
Patrick Gansterer
0e77a0e77c Add button to create a new empty FinacialLink 2021-02-17 13:52:39 +01:00
lentschi
45a8911ca6
Add option to ignore delivered amounts in order group distribution (#765) 2021-02-05 16:19:05 +01:00
lentschi
085562dbf4
#779 Received state for orders (PR #789, #779) 2021-02-03 20:57:53 +01:00
Patrick Gansterer
beaca7d384 Make user in Task model optional to support old database entries 2020-10-10 20:39:40 +02:00
Patrick Gansterer
44a198c7bc Adopt Rails 5 belongs_to_required_by_default 2020-09-05 14:40:11 +02:00
Patrick Gansterer
2557645f4f Rails 5.0 2020-09-05 14:40:11 +02:00
Patrick Gansterer
785313ac23 Make StockEvent a base class for Delivery and StockTaking
This helps to share code between the two entities and allows easier
extensions in the future.
2020-09-05 13:52:18 +02:00
Patrick Gansterer
a5582e9542 Rename Delivery.delivered_on to date
This aligns it with column names of StockTaking and us to use inheritance
in a next step to share common code between the entities.
2020-09-05 13:52:18 +02:00
Patrick Gansterer
3a6276aece Ensure that the article_id is set for every article_price
This addresses the TODO from dc92de771e.
2020-09-04 12:29:17 +02:00
Patrick Gansterer
5f60844a13 Change supplier_id of stock orders to NULL 2020-09-04 12:26:19 +02:00
Patrick Gansterer
4c567fece1 Add transport costs to Order 2020-08-07 00:52:43 +02:00
Patrick Gansterer
d52315287d Use the correct Unicode character in MarkAsDeletedWithName 2020-07-31 21:44:46 +02:00
Patrick Gansterer
d90d188dbf Add SupplierCategory
This allows the categorization of suppliers. For a better reporting
it is necessary to split the expenses of the invoices.
E.g. we want to be able to generate independent sums of general cost
like the rent or electricity and the cost of the bought articles.
2020-07-30 17:46:07 +02:00
Patrick Gansterer
645c142bf6 Add FinancialLinksController#incomplete 2020-07-30 17:19:02 +02:00
Patrick Gansterer
057f3ec8ea Add welcome mail 2020-07-30 17:14:14 +02:00
Patrick Gansterer
fc22a97f52 Nullify deliveries and orders depending on an invoice (#718) 2020-07-29 15:12:48 +02:00