Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
2425 commits 22 branches 1 tag 31 MiB
Commit graph

544 commits

Author SHA1 Message Date
Philipp Rothmann
54e11dc838 revert changes on home controller 2023-03-06 12:57:38 +01:00
Philipp Rothmann
f2965e6673 Add home controller test 
Co-authored-by: viehlieb <pf@pragma-shift.net>
Co-authored-by: Tobias Kneuker <tk@pragma-shift.net>
 2023-03-05 11:03:19 +01:00
viehlieb
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
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
mariandl
708f85a839
Add admin UI for SupplierCategories 2022-02-20 16:43:20 +01:00
Patrick Gansterer
6d71bd2c2f Fix active ordergroup 2022-02-18 12:54:07 +01:00
Patrick Gansterer
79fdb4dafb Add admin UI for BankGateway 2022-02-18 10:09:15 +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
4b7cbf111f Fix small issues after 401c8f5 and 67ad202 2021-03-05 14:14:56 +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
wvengen
f45afb7dd4 Fix error handling in single coop installs (PR #841) 2021-02-26 15:24:33 +01:00
Patrick Gansterer
7a6779ebfd Add API v1 finance_overview endpoint 2021-02-24 15:50:22 +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
Patrick Gansterer
9d68abd908 Add require_config_enabled to Api::V1::BaseController 2021-02-18 18:09:40 +01:00
Patrick Gansterer
17434a038a Move require_minimum_balance and require_enough_apples to BaseController 
This allows us to use them in other controllers too.
 2021-02-18 18:09:40 +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
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
Patrick Gansterer
88228022e3 API v1 Add financial_transaction_type to FinancialTransactions output 2021-02-12 15:17:25 +01:00
Patrick Gansterer
be269101f8 API v1 financial_transaction_types endpoint 2021-02-12 15:17:25 +01:00
Patrick Gansterer
48391f818f API v1 financial_transaction_classes endpoint 2021-02-12 15:17:25 +01:00
Patrick Gansterer
9f2e630266 Add CSV downloads for BankTransaction and Invoice 2021-02-12 14:55:59 +01:00
Patrick Gansterer
d0e73ea1ff Improve selecting deliveries/orders when creating an invoice 
When creating an invoice after balancing an order, it's not
possible to  the corresponding order. Change the elements in
the select box to the latest ended/delivered items (which
have not been assigned already) instead.
 2021-02-08 01:05:13 +01:00
lentschi
085562dbf4
#779 Received state for orders (PR #789, #779) 2021-02-03 20:57:53 +01:00
lentschi
67ad202859
Fix permission issue in pickups (PR #800, #799) 2021-01-30 11:21:00 +01:00
Patrick Gansterer
b22dda4638 Run select_foodcoop as the first before_action 
When e.g. authenticate is run as before_action, it could use the wrong
database in a multicoop installation, if select_foodcoop is not run first.
 2020-11-09 12:33:46 +01:00
JuliusR
4043433539 fix searching in external article database (#772) 2020-10-17 12:21:04 +02:00
Patrick Gansterer
3d5043fd05 Set updated_by when changing an GroupOrder via controller 2020-10-10 20:40:22 +02:00
wvengen
78c4ebcb4b Make navigation API more robust. 
Fixes https://github.com/foodcoops/foodsoft/issues/755.
 2020-10-07 14:45:22 +02:00
Patrick Gansterer
44a198c7bc Adopt Rails 5 belongs_to_required_by_default 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
266e9337be Various small rails 5 adoptions 2020-09-04 12:54:42 +02:00
Patrick Gansterer
f221a081dd Rename config tab roles to security 2020-08-12 13:32:37 +02:00
Patrick Gansterer
4c567fece1 Add transport costs to Order 2020-08-07 00:52:43 +02:00
Patrick Gansterer
5f2e319469 Add at least one BankAccount to the reference_calculator 2020-08-01 17:37:43 +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
3f25138997 Add option to create foodcoop transaction when creating a collection 
This option can be used, if a kind of "double-entry accounting" is used
and every transaction should have a corresponding transaction.
 2020-07-29 18:11:51 +02:00
Florian Lentsch
5eb8abf431 Potential fix for one of the issues mentioned in #49 
Reduces the number of SQL queries used on group_orders/index and
group_orders/archive, but adds extra  complexity to the code
 2020-07-29 13:15:11 +02:00
Patrick Gansterer
602f663245 Add UI to show and create financial transactions for the foodcoop 2020-07-29 11:43:45 +02:00
Patrick Gansterer
1a49bee42d Adopt model to allow FinancialTransaction without an ordergroup 
This will allow us to add accounting for the foodcoop itself, to support
listing for spendings independent of the order (e.g. rent, electricity).
 2020-07-29 11:43:31 +02:00
Patrick Gansterer
e16f03eebf Add reference_calculator 2020-07-29 11:02:58 +02:00
wvengen
b96ce06d94
API v1 financial_transactions endpoints (#627) 2020-07-25 14:18:59 +00:00