Commit Graph

1463 Commits

Author SHA1 Message Date
FGU ce7b4d7ce4 feat: add price per base unit
continuous-integration/drone/push Build is failing Details
2023-02-24 18:56:21 +01:00
Philipp Rothmann dfe8beae2c fix: article category remove option from list 2023-02-24 18:55:12 +01:00
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 0bd04fba41 move BigDecimal.new to BigDecimal() 2023-02-24 18:54:32 +01:00
viehlieb 46e3794a4e change .search to .ransack for updated ransack gem 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
viehlieb fb8ccfea4a rails up to 7.0and ruby to 2.7.2
mv lib to app/lib due to upgrade

removing concerns from autoload path

resolve zeitwerk issues

make foodsoft run for dev on rails 7 and ruby 2.7

fix mail file permission bug

fix database_config

fix articles controller test ActiveModell::Error

bump Gemfile.lock
2023-01-17 16:35:04 +01:00
Philipp Rothmann d16aa19300 Add home controller test
Co-authored-by: viehlieb <pf@pragma-shift.net>
Co-authored-by: Tobias Kneuker <tk@pragma-shift.net>
2023-01-17 16:09:27 +01:00
Florian Lentsch ec6d69c27f Allow entering decimals (#830, PR #868) 2022-12-14 10:17:40 +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
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
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
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 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
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
kidhab 4306389f93
Enable to configure feedback recipient address (PR #901) 2021-12-28 19:40:26 +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
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 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
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 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 f7c7b56bd0
Split order close method (PR #829) 2021-02-17 18:42:52 +01:00