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

1326 commits

Author SHA1 Message Date
Patrick Gansterer
c559a31a9e Fix and clean up bank account translations for English and German 2019-10-30 12:42:41 +01:00
Patrick Gansterer
30c53746fc Replace custom search placeholder with ui.search_placeholder 2019-10-30 12:00:46 +01:00
Patrick Gansterer
1550eedb5a Add additional eager loading annotations 2019-10-30 11:53:44 +01:00
Patrick Gansterer
39aff78f11 Remove protected_attributes gem 
We do not enforce the rules, so removing it and switching the existing
annotations to strong_parameters does not make our situation worse.
 2019-10-29 18:09:24 +01:00
Patrick Gansterer
d4ab0a055f Fix "Cannot infer root key from collection type." in UserController 2019-10-29 17:46:04 +01:00
Patrick Gansterer
8e2ca5e7d7 Add automatic generation of financial transactions and links 2019-10-29 13:52:56 +01:00
Patrick Gansterer
2100c738af Change deprecated *_filter methods to *_action 2019-10-29 09:41:01 +01:00
wvengen
6d9c35db20 Move to apparition for integration tests 2019-10-28 17:58:14 +00:00
JuliusR
71bdf3bfcc Allow to copy articles (PR #673, #541) 2019-10-14 07:25:34 +00:00
JuliusR
00458f79ab Suppress deleted suppliers from SharedSupplier.suppliers 
Fixes #546.
 2019-06-14 10:10:20 +00:00
JuliusR
5bf7f41005 Fix matching of uploaded articles by order_number 2019-06-14 10:08:19 +00:00
MatCast
7136d015c4 Added css to improve smaller screen usability (PR #668) 2019-06-05 21:50:11 +02:00
JuliusR
2d0a81c92d Fix and cleanup stock takings (PR #667) 2019-05-14 14:24:41 +00:00
Tom Carchrae
ef545e978e add search to balancing page (PR #651) 
(cherry picked from commit 2039da54b2077a6befccb409ef02a3172bcba237)
 2019-05-01 17:33:32 +00:00
wvengen
e9be38b3e9 Add OAuth scopes 
https://github.com/foodcoops/foodsoft/issues/582#issuecomment-442513237
 2019-04-03 17:20:44 +00:00
wvengen
366d92e421 Fix sync with unavailable by default (#649) 2019-04-03 18:53:23 +02:00
Tom Carchrae
99052fa3a7 Don't allow changes to settled orders (PR #614) 2019-03-26 19:14:39 +00:00
Tom Carchrae
d70c3a9bf1 allow 1 char unit, eg L or g 2019-03-26 18:58:36 +00:00
wvengen
25deefced1 Move setting availability to sync method 2019-03-24 22:14:10 +01:00
wvengen
cd164bc3eb Small performance improvement for sync with many new articles 2019-03-24 22:02:53 +01:00
wvengen
9283ed4f5e Fix syncing articles with non-import sync methods (#633) 2019-03-23 18:31:22 +01:00
wvengen
d669edb173 Fix shared database sync (relates to PR #610) 2019-03-23 08:54:10 +01:00
Tom Carchrae
02328eba2b fix missing translation 2019-02-20 22:26:51 +01:00
Patrick Gansterer
63e1541aa3 Use the default locale when sending mails to suppliers 2019-02-05 23:32:00 +01:00
Patrick Gansterer
d925533366 Fix rendering of stock order in OrderByGroups 2019-02-05 23:31:45 +01:00
Patrick Gansterer
b029fb98d6 Show sums for financial transaction types for ordergroups 2019-02-05 23:31:16 +01:00
Patrick Gansterer
5dab748fe3 Move sending of PDF into new ActiveSupport::Concern 2019-02-02 12:30:42 +01:00
Tom Carchrae
e5f64cff8c units cannot show html in tooltip 2019-01-18 18:26:11 +01:00
Patrick Gansterer
52323b98b8 Fix create_collection in FinancialTransactionsController 2019-01-17 20:27:43 +01:00
Patrick Gansterer
a4f5b8fb33 Do not show deleted users as members of groups (fixes #587) 2019-01-15 05:20:58 +01:00
Patrick Gansterer
8d1dbe1448 Remove mail workaround after upgrade to 2.7 2019-01-15 05:08:03 +01:00
Patrick Gansterer
71fd6f2a24 Add CSV download for ordergroups 2019-01-15 04:50:32 +01:00
Patrick Gansterer
389f205a6b Add set_balance to FinancialTransactions#new_collection (fixes #438) 
A new checkbox will allow user to set the balance to a given ABSOLUTE value
in addition to changing it by a RELATIVE value. This can be used if the
balance is tracked outside of foodsoft and should be syncroniced or for
setting the balance to zero for multiple ordergroups.
 2019-01-15 04:44:16 +01:00
Patrick Gansterer
abe847c0ee Add and inherit from ApplicationRecord to match Rails 5.0 style 2019-01-15 04:40:05 +01:00
Patrick Gansterer
8c6d48da86 Avoid ActionView::MissingTemplate occurred in sessions#new 
Some browser request /:foodcoop/login with the HTTP-Accept-Header set
to "image/webp,image/*;q=0.8", which leads to an internal server error
due to a not existing template. Call respond_to to allow only html and
respond with the correct "406 Not Acceptable" HTTP status code.
 2019-01-15 04:18:47 +01:00
Tom Carchrae
7e88798778 big speedup in syncing via caching/reducing queries (#610) 2019-01-15 02:56:21 +01:00
Tom Carchrae
31689dfb75 allow override of default limit (<200) on articles on shared suppliers (#609) 2019-01-15 02:55:12 +01:00
Tom Carchrae
a66a44bdcf error was on incorrect property 2019-01-14 21:01:30 +01:00
wvengen
554be093b9 API v1 navigation endpoint 2018-10-13 20:41:47 +02:00
wvengen
9c5a5d9492 API v1 config endpoint 2018-10-13 20:41:47 +02:00
wvengen
110c7cc3e9 API v1 user endpoint 2018-10-13 20:41:47 +02:00
wvengen
fd96b6ccc1
Prepare for API v1 (PR #570) 2018-10-13 20:16:35 +02:00
Patrick Gansterer
4137992032 fix auto_close_and_send_min_quantity 2018-10-12 15:47:32 +02:00
Patrick Gansterer
4eef0f07d5 Fix internal server error at invoices 2018-10-12 15:47:16 +02:00
Patrick Gansterer
903086ab97 Add import route for bank_transactions 2018-10-12 15:47:02 +02:00
Patrick Gansterer
0bb0536903 Add short name to FinancialTransactionType 2018-10-12 13:33:41 +02:00
Patrick Gansterer
707501e3f8 Add edit functionality for financial links 2018-10-12 13:18:23 +02:00
Patrick Gansterer
f0a55fb951 Add model and views for bank accounts 2018-10-11 22:29:15 +02:00
Martin Ortbauer
4b1e9a6f53 improve usability when ordering (PR #552) 
also show box with links to currently open orders after the order has been saved
 2018-10-11 22:15:00 +02:00
Patrick Gansterer
6cc02cb563 Add format helper for currency 2018-10-11 21:56:46 +02:00