Commit Graph

162 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 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 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
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
viehlieb 5c04a43f61 update article category implemented
adapt tests

add translations

adapt test

fix bug
2023-02-24 18:54:32 +01:00
mjavurek 0d6a3c14e9
fix translation missing: xxx.orders.state.received (#927) 2022-02-16 21:02:22 +01:00
mjavurek daccf91ab6
Invoice: change label "delivery" to "stock delivery" (#922) 2022-02-16 18:11:34 +01:00
wvengen dee1241888 Crowdin roundtrip 2021-03-03 13:44:28 +01:00
lentschi 45a8911ca6
Add option to ignore delivered amounts in order group distribution (#765) 2021-02-05 16:19:05 +01: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 85e16c3e28 Crowdin roundtrip 2020-09-05 13:22:28 +02:00
Patrick Gansterer f221a081dd Rename config tab roles to security 2020-08-12 13:32:37 +02:00
wvengen e3746eebd7 Translation fixes + Crowdin roundtrip 2020-07-25 15:48:36 +02:00
Patrick Gansterer b6f5295267 Add created_by user to Task 2020-04-11 00:04:49 +02:00
Patrick Gansterer f15ca8610b Add pickup date to order_result message 2020-02-18 19:04:10 +01:00
Patrick Gansterer 30c53746fc Replace custom search placeholder with ui.search_placeholder 2019-10-30 12:00:46 +01:00
wvengen 9840803a9f Crowdin roundtrip 2019-10-26 21:24:46 +02:00
wvengen 3cbb5783d4 Move translations to wiki plugin 2019-10-21 17:42:25 +00:00
wvengen ca76de8a5b Move translations to messages plugin 2019-10-21 17:42:25 +00:00
wvengen 4366a9b2bb Move translations to documents plugin 2019-10-21 17:42:25 +00:00
wvengen f3ffcdaf6a Move translations to discourse plugin 2019-10-21 17:42:25 +00:00
wvengen c03bd5996c Move translations to current_orders plugin 2019-10-21 17:42:25 +00:00
Tom Carchrae 99052fa3a7 Don't allow changes to settled orders (PR #614) 2019-03-26 19:14:39 +00:00
Tom Carchrae 02328eba2b fix missing translation 2019-02-20 22:26:51 +01:00
wvengen fd96b6ccc1
Prepare for API v1 (PR #570) 2018-10-13 20:16:35 +02:00
Patrick Gansterer bd49a64cd7 Make the download button of orders reusable 2017-12-09 12:25:29 +01:00
Patrick Gansterer 3e156bbbf3 Rewrite OrderPdfs to support multiple orders at once 2017-12-09 12:22:37 +01:00
Patrick Gansterer dae4d075fe Add UI to manage the financial transaction types and classes 2017-12-09 11:51:23 +01:00
Patrick Gansterer dc94e98138 Add folders to the documents plugin 2017-11-21 10:12:13 +01:00
wvengen 33aa1c4b4a Localeapp roundtrip 2017-11-10 17:06:20 +01:00
acracia 3b18dc7532 Add translations for Spanish 2017-11-06 20:12:03 +01:00
Patrick Gansterer f77f2fcbfd Localeapp roundtrip 2017-10-29 01:17:49 +02:00
Patrick Gansterer 72b5a5ca82 Add option to show account balance instead of available funds
Some foodcoops do not use the accounting feature of the foodsoft, which
results in wrong calculation of the available credit. To avoid
confusions show the current account balance instead.
2017-10-28 20:16:25 +02:00
wvengen b49bfb0d8c Localeapp roundtrip + fixes
This includes an overdue synchronization of plugin locales. To make
translation easier for non-developers, we keep the strings at localeapp,
which puts everything in one file. All plugins enabled by default are
therefore included in Foodsoft's locales.
2017-10-27 22:37:32 +02:00
Patrick Gansterer 287cce2e92 Make "via Foodsoft" in mail From-header translateable 2017-10-02 16:08:16 +02:00
Patrick Gansterer a10aa75f49 Improve user interface for creating new messages in messages plugin 2017-10-01 00:12:10 +02:00
Patrick Gansterer add281c738 Remove email from subject of feedback mail
The mail address of the user sending the feedback is now set in the
Reply-To header of the mail already.
2017-09-30 12:14:16 +02:00
wvengen c8999333a6 Localeapp roundtrip 2017-04-01 16:51:05 +02:00
Patrick Gansterer c6731b4e4f Add IBAN field to supplier and user model 2017-01-21 22:43:48 +01:00
wvengen 0d309af5f6 Update translations from localeapp 2016-06-28 20:43:53 +02:00
wvengen c6a625e5ed Localeapp update 2016-06-11 19:19:30 +02:00
Patrick Gansterer 749791bb7a Add possibility to add an attachment to an invoice #345 2016-05-06 15:04:58 +02:00
wvengen 8d5467ab7c Merge pull request #355 from foodcoop1040/expeted_delivery_date
Add expected delivery date
2016-05-04 17:42:29 +02:00
Patrick Gansterer f286dd6053 Add pickup date
This additional date helps users to find the correct order if the time
between end and pickup varies a lot.
2016-04-29 15:28:05 +02:00
Patrick Gansterer efb929e64f Allow editing of linked deliveries and orders at invoice 2016-03-11 13:23:13 +01:00
wvengen 14e2fd179e Merge pull request #403 from foodcoops/feature/402-messagegroups
Add messagegroups
2016-03-07 22:36:37 +01:00
wvengen 5d9e1845b7 Fix i18n key typo 2016-03-07 21:06:49 +01:00
wvengen d358278333 Merge pull request #416 from foodcoop1040/invite_config
Add config option to disable the invites
2016-03-07 19:47:00 +01:00
wvengen b4e2ddf66d Merge pull request #412 from foodcoop1040/confirm
Get rid of duplicated confirm_delete translations
2016-03-07 19:44:06 +01:00
Patrick Gansterer e16a0fb336 Add config option to disable the invites
Some foodcoops require that an admin adds all users to have more control
over the users.
2016-03-06 13:56:33 +01:00