|
b2882d8592
|
Merge branch 'feature/tw_automatic_group_order_invoice_generation'
|
2022-03-01 13:31:29 +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 |
|
Viehlieb
|
bafa163ce5
|
fix rubocop errors
|
2021-12-24 13:35:26 +01:00 |
|
Viehlieb
|
298a476061
|
add tests (integration + model)
|
2021-12-23 01:52:37 +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 |
|
wvengen
|
0f01b87e3b
|
do not exceed 99 articles when ordering in specs
|
2013-07-25 13:21:24 +02:00 |
|
wvengen
|
7dafcf714a
|
spec move functionality into factory
|
2013-07-25 11:16:39 +02:00 |
|
wvengen
|
b302cbde4f
|
make sure price spec works when price is zero
|
2013-07-25 09:42:29 +02:00 |
|
wvengen
|
c753ae0471
|
comment tests that are unclear how they should behave
|
2013-07-25 01:07:41 +02:00 |
|
wvengen
|
1e986e704a
|
remove spec test that is broken and not really useful
|
2013-07-25 00:07:39 +02:00 |
|
wvengen
|
ebf71ad494
|
fix price history spec
|
2013-07-25 00:01:58 +02:00 |
|
wvengen
|
d602b7cd0d
|
use expect instead of should in specs
|
2013-07-24 22:48:48 +02:00 |
|
wvengen
|
427a023135
|
add group_order_article spec
|
2013-07-15 21:01:46 +02:00 |
|