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

2258 commits

This branch
This branch
All branches
Author SHA1 Message Date
wvengen
7b2072251e Fix i18n reference 2020-09-05 13:28:56 +02:00
wvengen
85e16c3e28 Crowdin roundtrip 2020-09-05 13:22:28 +02:00
Patrick Gansterer
266e9337be Various small rails 5 adoptions 2020-09-04 12:54:42 +02:00
Patrick Gansterer
3a6276aece Ensure that the article_id is set for every article_price 
This addresses the TODO from dc92de771e.
 2020-09-04 12:29:17 +02:00
Patrick Gansterer
26aecbbe9e Do not limit the number of page versions to 20 
This reverts 164653dbfc.
 2020-09-04 12:27:05 +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
aa44291b69 Handle more possible inputs for polls correct 2020-08-13 17:20:49 +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
8cb70d819e Change ordergroup default in FinancialTransaction to NULL 
The AllowEmtpyOrdergroupInFinancialTransaction migration only changed the
possibility to store NULL values, but did not set the default to NULL.
 2020-08-07 00:36:46 +02:00
Patrick Gansterer
7e3c601a25 Update Ruby version to 2.6.6 2020-08-03 15:39:32 +02:00
Patrick Gansterer
67ab647eb0 Remove number_display.rb 2020-08-03 15:31:34 +02:00
Patrick Gansterer
5f2e319469 Add at least one BankAccount to the reference_calculator 2020-08-01 17:37:43 +02:00
Patrick Gansterer
d52315287d Use the correct Unicode character in MarkAsDeletedWithName 2020-07-31 21:44:46 +02:00
Patrick Gansterer
6b400b4f96 Increase choices size for polls 
MariaDB/MySQL stores the array as serialized string, so the current
limit of 255 is too small to store all choices.
 2020-07-31 21:43:56 +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
f5bbe0d5ae Fix exception for blank body in SMTP server 2020-07-30 17:19:49 +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
75129b52c6 Add set_balance_as_sum and wait_with_text to BankAccountConnector 2020-07-29 19:19:27 +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
wvengen
97b9145223 Update sassc to avoid crash in some cases 
https://github.com/sass/sassc-ruby/issues/146
 2020-07-29 15:46:58 +02:00
Patrick Gansterer
fc22a97f52 Nullify deliveries and orders depending on an invoice (#718) 2020-07-29 15:12:48 +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
1053b3883d Add admin interface for the links 2020-07-29 11:38:23 +02:00
Patrick Gansterer
7657b05787 Add links plugin 
This can be used to link to external services related to the foodcoop.
With the indirect mode it is possible to implement a secure login to other
services. In that case Foodsoft will send a HTTP GET request and redirect
the user to the returned Location header. This allows the generation of
a one-time login URL.
A typical use-case would be that a workgroup, which is responsible for
the email account, does not need to share the login credentials and can
use a link within the Foodsoft instead.
 2020-07-29 11:25:04 +02:00
Patrick Gansterer
e16f03eebf Add reference_calculator 2020-07-29 11:02:58 +02:00
Patrick Gansterer
d75b881318 Set Poll.multi_select_count to default value in model if nil 
Since multi_select_count depends on the type of poll, we can not require
its presence via validates_presence_of, but can use the default value.
 2020-07-29 09:14:30 +02:00
dependabot[bot]
b089b7c186
Bump json from 2.2.0 to 2.3.1 (#739) 
Bumps [json](https://github.com/flori/json) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/flori/json/releases)
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md)
- [Commits](https://github.com/flori/json/compare/v2.2.0...v2.3.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-28 18:14:56 +00:00
wvengen
ef1903381b Improve testing on docker 2020-07-27 18:17:30 +02:00
wvengen
b96ce06d94
API v1 financial_transactions endpoints (#627) 2020-07-25 14:18:59 +00:00
wvengen
8c8b42c2b2 Fix schema issue 2020-07-25 15:57:53 +02:00
wvengen
e3746eebd7 Translation fixes + Crowdin roundtrip 2020-07-25 15:48:36 +02:00
dependabot[bot]
682d9d23b5 Bump kaminari from 1.1.1 to 1.2.1 
Bumps [kaminari](https://github.com/kaminari/kaminari) from 1.1.1 to 1.2.1.
- [Release notes](https://github.com/kaminari/kaminari/releases)
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kaminari/kaminari/compare/v1.1.1...v1.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-22 16:54:33 +02:00
dependabot[bot]
cc15ea16dc Bump websocket-extensions from 0.1.4 to 0.1.5 
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.4 to 0.1.5.
- [Release notes](https://github.com/faye/websocket-extensions-ruby/releases)
- [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-ruby/compare/0.1.4...0.1.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-22 16:53:55 +02:00
dependabot[bot]
2b9b4a1ca7 Bump puma from 4.3.3 to 4.3.5 
Bumps [puma](https://github.com/puma/puma) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-22 16:53:24 +02:00
dependabot[bot]
ae0a0f40cf Bump doorkeeper from 5.0.2 to 5.0.3 
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.2 to 5.0.3.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.2...v5.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-22 16:52:52 +02:00
Florian Feigenbutz
2f19ca1289 Fixed typo in German translation 2020-06-22 16:51:43 +02:00
Patrick Gansterer
dbb7407005 Clear IBAN when deleting a supplier 2020-06-22 16:35:22 +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
Patrick Gansterer
18e38be6be Create new FinancialLink for reverted FinancialTransaction 2020-04-11 00:04:49 +02:00
Patrick Gansterer
9b889dd643 Add option to create ordergroup together with user 2020-04-11 00:04:49 +02:00
Patrick Gansterer
a3946ed3d4 Add missing authorization for InvoicesController 2020-04-11 00:04:35 +02:00
Patrick Gansterer
3b79c05ffe Add link to unpaid invoices to invoice index page 2020-04-11 00:03:55 +02:00
Patrick Gansterer
08065a09ec Sort suppliers in dropdown menu for new deliveries 2020-04-10 23:59:06 +02:00