Commit Graph

935 Commits

Author SHA1 Message Date
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 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
viehlieb 5c04a43f61 update article category implemented
adapt tests

add translations

adapt test

fix bug
2023-02-24 18:54:32 +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
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 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 79fdb4dafb Add admin UI for BankGateway 2022-02-18 10:09:15 +01:00
twothreenine b2a6c198ac
Improve invoice and supplier show views (#840) 2021-03-24 21:29:44 +01:00
Patrick Gansterer d48320f9e0 Add CSV download for User 2021-03-08 17:28:08 +01:00
lentschi 9a7d4bf07d
Add option to send mails when an order has been received 2021-02-27 17:24:25 +01:00
twothreenine 226c11737f
Improve reference calculator
fix rounding error, add currency symbol, better(?) translation for headline
2021-02-22 11:40:36 +01:00
twothreenine 401c8f50a8
better readable IBAN (#824)
display IBANs in groups of 4 digits with whitespaces in between
2021-02-20 12:16:21 +01:00
Patrick Gansterer 00f1dddd3d Add admin interface to enable the self service functionality 2021-02-18 18:09:40 +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
Patrick Gansterer aad4fbd5b6 Add option to set all received items to zero
When an order could not be delivered, this option makes it easy to
set all amounts to zero with only one click.
2021-02-12 15:07:21 +01:00
Patrick Gansterer 9f2e630266 Add CSV downloads for BankTransaction and Invoice 2021-02-12 14:55:59 +01:00
Patrick Gansterer 6e4b9696a2 Do not show deleted articles and suppliers for new deleiveries 2021-02-08 01:05:21 +01:00
Patrick Gansterer 373d137f9f Hide IBAN of BankTransactions when empty 2021-02-08 01:04:57 +01:00
Patrick Gansterer 979439f967 Hide stock order button in stock orders 2021-02-08 01:04:46 +01:00
lentschi 45a8911ca6
Add option to ignore delivered amounts in order group distribution (#765) 2021-02-05 16:19:05 +01:00
lentschi 67ad202859
Fix permission issue in pickups (PR #800, #799) 2021-01-30 11:21:00 +01:00
JuliusR 4043433539 fix searching in external article database (#772) 2020-10-17 12:21:04 +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
wvengen 7b2072251e Fix i18n reference 2020-09-05 13:28:56 +02:00
Patrick Gansterer 271af8f59f Update HAML 2020-09-04 12:26:44 +02:00
Patrick Gansterer 5f60844a13 Change supplier_id of stock orders to NULL 2020-09-04 12:26:19 +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 67ab647eb0 Remove number_display.rb 2020-08-03 15:31:34 +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 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
Patrick Gansterer 0aa853c53d Add information text to the receive view 2020-06-22 16:35:22 +02:00
Patrick Gansterer 5a9cc811c9 Add download for articles 2020-06-22 16:35:22 +02:00
Patrick Gansterer b6f5295267 Add created_by user to Task 2020-04-11 00:04:49 +02:00