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

64 commits

Author SHA1 Message Date
viehlieb
b7268918d0 fix deposit is net value 2023-09-29 10:13:08 +02:00
Philipp Rothmann
2d0c163f13 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-09-21 21:28:03 +02:00
Philipp Rothmann
33034e66b8 fix: add null checks for articles convert_units 
Prevents division by zero exception because of a unit beeing 0.
A Unit becomes also zero e.g. when a comma symbol is used Unit.new("0,9kg") == 0

fixes #1014
 2023-06-22 22:49:22 +02:00
Philipp Rothmann
a1682932ac fix: price_markup with value nil gives exception 
fixes #1011
 2023-06-16 13:20:33 +02:00
Philipp Rothmann
fb2b4d8a8a chore: rubocop 
chore: fix api test conventions

chore: rubocop -A spec/

chore: more rubocop -A

fix failing test

rubocop fixes

removes helper methods that are in my opinion dead code

more rubocop fixes

rubocop -a --auto-gen-config
 2023-06-09 17:35:05 +02:00
Philipp Rothmann
c6560e0cea Add additional model and integration tests 
This commit adds new tests for a better coverage.

integration/
  * home
  * supplier

models/
  * article
  * delivery
  * group_order_article
  * supplier

also adds a new factory for delivery

Co-authored-by: viehlieb <pf@pragma-shift.net>
Co-authored-by: Tobias Kneuker <tk@pragma-shift.net>
 2022-11-27 12:39:57 +01:00
viehlieb
3ffdb424d5 replace deprecated update_attributes with update 2022-10-26 13:19:27 +02:00
Philipp Rothmann
0c5ff5b41d Add test to delete article 2022-10-09 13:24:29 +02:00
Patrick Gansterer
9c9ebdf557 Bundle update rubocop and auto correct style issues 2022-05-27 23:10:07 +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
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
kidhab
64ab699047
Allow longer passwords (#923) 2022-02-16 18:13:08 +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
Patrick Gansterer
7d5155bef6 Add option to ignore financial transaction when calculating the balance 2021-02-17 14:07:03 +01:00
lentschi
45a8911ca6
Add option to ignore delivered amounts in order group distribution (#765) 2021-02-05 16:19:05 +01:00
Florian Lentsch
ecda1c1478 Added rspec tests for order boolean states 2021-02-05 14:57:26 +01:00
Florian Lentsch
f7b65856aa Refactored order model's scope rspec test to ignore sequence 2021-02-05 14:57:26 +01:00
Florian Lentsch
e33d2d7f48 Added order scope rspec tests for #779 2021-02-05 14:57:26 +01:00
Patrick Gansterer
44a198c7bc Adopt Rails 5 belongs_to_required_by_default 2020-09-05 14:40:11 +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
1d9856ff93 Handle nil values correctly in User.authenticateUser 2019-11-11 11:10:26 +01:00
Patrick Gansterer
8e2ca5e7d7 Add automatic generation of financial transactions and links 2019-10-29 13:52:56 +01:00
wvengen
25deefced1 Move setting availability to sync method 2019-03-24 22:14:10 +01:00
wvengen
9283ed4f5e Fix syncing articles with non-import sync methods (#633) 2019-03-23 18:31:22 +01:00
Patrick Gansterer
4137992032 fix auto_close_and_send_min_quantity 2018-10-12 15:47:32 +02:00
Patrick Gansterer
924f346b4c Show the financial transaction type if there are more than one type #367 2017-12-09 11:51:23 +01:00
wvengen
8a5c130875 Bundle update 2017-10-27 23:21:31 +02:00
Patrick Gansterer
564492afe4 Add an option to automatically finish an order 2017-10-12 21:14:29 +02:00
Patrick Gansterer
ca7416f2e7 Check correct calculation of fc_price 2017-10-08 12:33:14 +02:00
wvengen
a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen
610cd8fce4 Test rounded at cents 2015-04-11 02:52:57 +02:00
wvengen
c31d015434 Bundle update (and fix spec that started failing) 2015-01-14 21:20:14 +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
647b7f0430 allow to synchronize all articles of a shared supplier 2014-09-02 12:58:31 +02:00
wvengen
21838e9c84 prepare for RSpec 3.0 2014-08-19 11:53:01 +02:00
wvengen
25854f2de7 do not store GroupOrderArticles with zero quantity and tolerance 2014-05-13 17:01:26 +02:00
wvengen
7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
wvengen
49e563af89 allow non-shared articles to be part of a shared supplier using a blank order number 2014-01-24 22:10:00 +01:00
wvengen
c900cf4988 make product redistribution work! 2013-11-27 00:06:25 +01:00
wvengen
bd1b932775 add receive screen, quantities for model, redistribution 2013-11-25 14:17:31 +01:00
wvengen
66ac3be81f Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
 2013-11-18 11:42:49 +01:00
wvengen
4219eff0ab fix rspec warning 2013-11-13 23:22:26 +01:00
wvengen
ac6b00d4f5 add unit tests for shared database synchronisation 2013-11-13 23:09:17 +01:00
wvengen
a77c3b59b1 allow to login with email instead of nick as well + tests 2013-09-20 22:39:19 +02:00
wvengen
6b0146eb95 add spec for article#in_open_order 2013-09-18 22:46:57 +02:00
Manuel Wiedenmann
f462e70e49 uses FactoryGirl helpers 2013-09-18 12:44:41 +02:00