Commit graph

152 commits

Author SHA1 Message Date
24c25b5278 fix xhr and javascript problems for group orderinvoice modal 2023-12-11 18:19:12 +01:00
90c5450525 changing view for group_order_invoices
testing ui of goi restructuring
2023-11-17 15:53:32 +01: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
c4a53caf52 feat: add actiontext and trix editor 2023-08-04 12:48:15 +02:00
Philipp Rothmann
026c3a6285
introduce importmaps (#983)
* 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>

* fix: rubocop violations

---------

Co-authored-by: FGU <fgu@pragma-shift.net>
2023-06-14 13:29:31 +02:00
nurp
f2d5936cf0
Turkish language support added (#995)
* Added Turkish translation with help of ChatGPT

* Changed 'article' and 'item' to 'ürün' and addedtranslations for messages plugin

* added translation for the rest of plugins

* merge conflicts

* fix tr.yml in messages plugin

* Corrected more translations

---------

Co-authored-by: Nurp <>
2023-04-12 21:42:03 +02:00
Florian Lentsch
ec6d69c27f Allow entering decimals (#830, PR #868) 2022-12-14 10:17:40 +01:00
twothreenine
b2a6c198ac
Improve invoice and supplier show views (#840) 2021-03-24 21:29:44 +01:00
Patrick Gansterer
ff76fa60c0 Allow deletion of financial transactions 2019-11-01 20:56:00 +01:00
MatCast
7136d015c4 Added css to improve smaller screen usability (PR #668) 2019-06-05 21:50:11 +02:00
Patrick Gansterer
6cc02cb563 Add format helper for currency 2018-10-11 21:56:46 +02:00
Patrick Gansterer
ac11ba1cc1 Add pickups role 2018-01-25 18:09:29 +01:00
Patrick Gansterer
dc94e98138 Add folders to the documents plugin 2017-11-21 10:12:13 +01:00
acracia
3b18dc7532 Add translations for Spanish 2017-11-06 20:12:03 +01:00
wvengen
d06a9ed3f0 Fix dynamic select2 usage (oops!) 2016-08-12 15:54:28 +02:00
wvengen
2e2efec5e7 Get rid of coffeescript. 2016-04-25 20:34:30 +02:00
Patrick Gansterer
8ac1471a89 Add message threads #394
This new view sorts the messages by threads based on the reply_to.
Now we store only the message which started a new thread in the reply_to
field to avoid recursive queries.
2016-03-04 16:52:34 +01:00
Patrick Gansterer
1315103a7d Add role_invoices
This new role allows users to create invoices without role_finance. Users
can then only modify their own created invoices until somebody with the
role_finance sets the paid_on value.
2016-03-04 16:06:02 +01:00
wvengen
227ca0dd84 Merge pull request #387 from foodcoops/feature/boxfills
Add optional boxfill phase to orders (+ bootstrap buttons)
2015-11-20 14:25:41 +01:00
wvengen
6a0147d2e7 Improve article header consistency 2015-11-18 22:44:38 +01:00
wvengen
dcf921dc8d Improve delta-input styling 2015-11-18 22:44:38 +01:00
wvengen
adb6089773 Disable +/- buttons on boundaries in ordering 2015-11-13 18:10:46 +01:00
wvengen
945a9e4d4a Use bootstrap buttons for ordering 2015-11-13 18:10:46 +01:00
wvengen
9efa9d5d43 Handle errors using Gaffe 2015-07-21 00:08:17 +02:00
Alexander Kirk
d9b3064c2e fix missing units calculation, change missing-none background color 2015-05-19 17:58:29 +02:00
Alexander Kirk
75967bad22 Add color marking to items in group orders that have missing items 2015-05-04 06:16:14 +02:00
wvengen
08c8d25a9d New message form and checkbox papercuts 2015-04-11 02:32:30 +02:00
wvengen
f47e0b5b2a Give a bit more space to token inputs 2015-04-11 02:18:55 +02:00
wvengen
de794a48b0 Reorder roles and add icons 2015-04-04 10:56:42 +02:00
wvengen
bf6a31a032 Cleanup groups view on profile page 2014-12-16 21:14:20 +01:00
wvengen
219eb71bc9 Allow to specify an order schedule for new orders. 2014-11-23 00:38:13 +01:00
wvengen
6e990fed4c Upgrade to rails 4.1 2014-11-21 14:37:56 +01:00
wvengen
7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +02:00
wvengen
d8f4ac47dd handle ajax errors (closes foodcoops#300) 2014-07-02 13:55:05 +02:00
wvengen
6466ea9653 revamp footer 2014-06-23 17:51:20 +02:00
wvengen
2bf13dbefa give partially unused order articles a distinct colour 2014-06-23 17:51:19 +02:00
wvengen
2a6e0e0460 fix asset url in css (unbreaks heroku image 404) 2014-06-23 17:51:18 +02:00
wvengen
8c0df3b4e8 edit order user-interface update
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
wvengen
b5b4ccd922 make data-submit-onchange work with datepicker 2014-06-23 17:51:17 +02:00
wvengen
4c1e5e2b00 fix default textarea height 2014-05-13 17:01:27 +02:00
wvengen
950480941a expanded data-ignore-onchange support 2014-05-13 17:01:24 +02:00
wvengen
8fba40eba6 fix submit-onchange 2014-02-19 11:41:10 +01:00
wvengen
60826ceedc allow to edit GroupOrderArticle result from orders screen
Conflicts:
	app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
wvengen
f9d2c20aaa cleanup articles sorted in groups 2014-02-10 15:58:58 +01:00
wvengen
6e0489b25f Merge pull request #257 from wvengen/feature-touchclick
Better workaround for touch devices
2014-02-03 06:33:27 -08:00
wvengen
7ebb2459e0 make click work better on touch devices (closes foodcoops#104) 2014-01-25 15:19:50 +01:00
wvengen
23ee2ef0fb Revert "make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104)"
This reverts commit add4afd172.

Conflicts:
	app/assets/javascripts/application.js
2014-01-25 15:15:42 +01:00
wvengen
8db516c5f0 Merge branch 'master' into feature-cleaner_order_details
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
2014-01-20 13:36:46 +01:00
wvengen
8b4c292ea0 Merge pull request #222 from wvengen/feature-receive
New receive screen
2014-01-20 03:02:27 -08:00
wvengen
42d622d1b2 cleanup orders and add search
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/views/orders/_articles.html.haml
	app/views/orders/show.html.haml
2014-01-17 13:41:38 +01:00