900cc91197
API documentation and spec setup
2019-04-03 17:08:38 +00:00
25deefced1
Move setting availability to sync method
2019-03-24 22:14:10 +01:00
9283ed4f5e
Fix syncing articles with non-import sync methods ( #633 )
2019-03-23 18:31:22 +01:00
4137992032
fix auto_close_and_send_min_quantity
2018-10-12 15:47:32 +02:00
924f346b4c
Show the financial transaction type if there are more than one type #367
2017-12-09 11:51:23 +01:00
e7657b987f
Update model to support financial transactions #367
...
This change introduces two new data types to group the financial
transactions. Now every transaction has a "type", which itself belongs
to a "class".
Types should be used add structured information to an transaction, instead
of writing it into the notice textfield. E.g. this could be used to have
different types depending on the source of money (cash vs. bank transfer).
Classes are shown as different columns in the tables and will be uses to
group transactions of specific types. They should be used if not the whole
amount of ordergroup should be used to order food. E.g. if there is a
deposit or membership fee, which is independent of the normal credit.
This will allow us to implement additional features based on classes in
the future. E.g. the sum of transactions in the "membership fee" class
must be positive to allow food orders or show a big warning if it is bellow
a certain value.
2017-12-09 11:51:23 +01:00
8a5c130875
Bundle update
2017-10-27 23:21:31 +02:00
564492afe4
Add an option to automatically finish an order
2017-10-12 21:14:29 +02:00
386bc7382d
Support integers for price_markup
...
The config panel writes an integer into the settings table in the
database, which results in a wrong calculation of the fc_price.
2017-10-08 12:33:44 +02:00
ca7416f2e7
Check correct calculation of fc_price
2017-10-08 12:33:14 +02:00
b35357d4b3
Do not accept invalid addresses in SMTP RCPT TO
...
This gives the MTA the chance to inform the original sender
about the transmission error via a delivery report.
2017-10-05 10:14:49 +02:00
b857b10814
Fix specs after update (switching to webkit)
2017-04-01 15:18:56 +02:00
b8010fedca
Add ordergroup_name to GroupOrder
2016-03-11 13:36:49 +01:00
d6bf09b0b8
Fix failing tests
2016-02-18 23:52:07 +01:00
a03789e048
Add optional boxfill phase to orders
2015-11-13 18:10:46 +01:00
aa7a2a31ae
Bundle update & restructure tests (RSpec 3)
2015-04-25 17:14:37 +02:00
c30ec67548
Allow synchronising units when uploading
2015-04-11 02:52:57 +02:00
4d1e102f47
Checkbox to remove articles not in upload
2015-04-11 02:52:57 +02:00
6ce1b7f928
Handle errors in upload and sync form
2015-04-11 02:52:57 +02:00
18cc105c1e
Add tests for upload
2015-04-11 02:52:57 +02:00
26e7012ef0
Fix import options and add tests
2015-04-11 02:52:57 +02:00
610cd8fce4
Test rounded at cents
2015-04-11 02:52:57 +02:00
1063aea4af
Add file import test
2015-01-14 22:52:17 +01:00
c31d015434
Bundle update (and fix spec that started failing)
2015-01-14 21:20:14 +01:00
dbdc7ae4aa
Workaround occasional mailer test failure
2015-01-14 20:57:43 +01:00
8a4b65c4a5
Add test for reset password
2015-01-13 17:59:31 +01:00
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
6e990fed4c
Upgrade to rails 4.1
2014-11-21 14:37:56 +01:00
a594dffed2
disable config validation (closes foodcoops#313)
2014-09-30 15:09:47 +02:00
d2a218c9fa
Fixed rspec deprecation warning concerning spec type.
2014-09-21 12:28:00 +02:00
8b83787252
simplify config loading
2014-09-11 16:40:21 +02:00
1c878c3c13
fix config issue with nested hash
2014-09-02 16:19:08 +02:00
10a193add3
make nested properties work better
2014-09-02 15:02:26 +02:00
f09ef892dc
add foodsoft_config protection whitelisting
2014-09-02 15:02:25 +02:00
6115979bae
allow protected keys to be set/unset + config_db tests
2014-09-02 14:21:32 +02:00
647b7f0430
allow to synchronize all articles of a shared supplier
2014-09-02 12:58:31 +02:00
d9c61b2db3
allow to match category names on import/sync
2014-09-02 12:58:31 +02:00
63d52db91b
more sensible mailer option defaults
...
Conflicts:
app/mailers/base_mailer.rb
config/app_config.yml.SAMPLE
spec/app_config.yml
2014-09-02 12:35:57 +02:00
72709be60a
try workaround for failing test
...
(closes foodcoops#303)
2014-08-25 18:29:59 +02:00
21838e9c84
prepare for RSpec 3.0
2014-08-19 11:53:01 +02:00
6d98be6d22
reload app config before each test
...
(complements 21bef8e304d05025b72b39e790abc7e8a4f4f5e1)
2014-05-13 17:01:26 +02:00
ed439d0b08
use minimal app_config for tests
2014-05-13 17:01:26 +02:00
25854f2de7
do not store GroupOrderArticles with zero quantity and tolerance
2014-05-13 17:01:26 +02:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
f8fca4d630
fix order article add + test
2014-02-24 11:37:06 +01:00
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
e88810e4a7
fix "Mysql2::Error: This connection is in use by" in spec for Rails 4
...
Conflicts:
Gemfile
Gemfile.lock
2014-02-10 15:58:52 +01:00
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
b30b424540
Merge branch 'master' into feature-receive
...
Conflicts:
app/helpers/finance/order_articles_helper.rb
2014-01-09 18:42:29 +01:00
8f14ab31f3
cleanup and expand receive integration test
2014-01-08 13:07:11 +01:00
d01d1bc496
add integration tests for receive
2014-01-08 11:52:45 +01:00
0d0ff90a64
adds an RSS feed for pages/all
2014-01-04 20:12:01 +01:00
2b511ee559
Merge branch 'master' into fresh-flow
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-18 17:03:26 +01:00
147365cba1
update coverage and use coveralls.io
2013-12-16 23:11:39 +01:00
c900cf4988
make product redistribution work!
2013-11-27 00:06:25 +01:00
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
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
4219eff0ab
fix rspec warning
2013-11-13 23:22:26 +01:00
ac6b00d4f5
add unit tests for shared database synchronisation
2013-11-13 23:09:17 +01:00
e883f4cfa7
fix last commit for non-js tests
2013-10-30 01:28:59 +01:00
042fbdc3a3
maximise window before running tests
2013-10-30 01:03:51 +01:00
c37ed74942
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00
bfcf35cd34
fix i18n spec after changes
2013-10-17 17:10:33 +02:00
9ac9d1ea50
add spec for foodcoops/foodsoft#179
2013-10-02 16:32:01 +02:00
a77c3b59b1
allow to login with email instead of nick as well + tests
2013-09-20 22:39:19 +02:00
6b0146eb95
add spec for article#in_open_order
2013-09-18 22:46:57 +02:00
857eb64a45
Merge pull request #173 from foodcoop-adam/keep-member-order-on-orderarticle-deletion
...
Keep member order on orderarticle deletion
2013-09-18 08:32:33 -07:00
f462e70e49
uses FactoryGirl helpers
2013-09-18 12:44:41 +02:00
f224735718
remember what member ordered when deleted in balancing screen
2013-09-17 14:19:46 +02:00
1bb257c41b
remember member order when order article is deleted + test
2013-09-13 15:37:30 +02:00
37e5b0c25c
add balancing integration spec
2013-07-26 18:34:03 +02:00
eac8260b38
add i18n tests
2013-07-25 14:46:25 +02:00
ca50006235
add coverage report, set COVERAGE=1 in env when running specs
2013-07-25 14:00:08 +02:00
0f01b87e3b
do not exceed 99 articles when ordering in specs
2013-07-25 13:21:24 +02:00
50f5064d8e
fix product distribution integration test
2013-07-25 13:08:38 +02:00
7dafcf714a
spec move functionality into factory
2013-07-25 11:16:39 +02:00
b302cbde4f
make sure price spec works when price is zero
2013-07-25 09:42:29 +02:00
e9ed6f8c0f
Revert "try to fix integration spec on travis"
...
This reverts commit 06d39f52ca
2013-07-25 01:25:08 +02:00
c753ae0471
comment tests that are unclear how they should behave
2013-07-25 01:07:41 +02:00
9a12ea9efc
fix uniquess spec problems
2013-07-25 00:52:41 +02:00
06d39f52ca
try to fix integration spec on travis
2013-07-25 00:35:42 +02:00
1e986e704a
remove spec test that is broken and not really useful
2013-07-25 00:07:39 +02:00
ebf71ad494
fix price history spec
2013-07-25 00:01:58 +02:00
d602b7cd0d
use expect instead of should in specs
2013-07-24 22:48:48 +02:00
0be3955cd7
Revert "cleaner way to set foodcoop scope"
...
This reverts commit 23a08b2ac8
2013-07-24 22:06:53 +02:00
a6114f137b
add order integration spec
2013-07-24 21:25:57 +02:00
23a08b2ac8
cleaner way to set foodcoop scope
2013-07-24 20:44:07 +02:00
62682b7e64
make integration test work
2013-07-24 12:37:20 +02:00
8af04e0112
add product distribution integration test
2013-07-24 04:04:59 +02:00
0d33922ed9
make integration spec work with javascript driver too
2013-07-24 02:58:53 +02:00
a858ceedea
more flexible login in spec helper
2013-07-24 01:11:36 +02:00
d58ce31b7f
add first integration test
2013-07-24 01:05:01 +02:00
427a023135
add group_order_article spec
2013-07-15 21:01:46 +02:00
679fc673c7
add group_order spec
2013-07-15 18:45:02 +02:00
3a7d650ed8
fix tests
2013-07-15 17:57:20 +02:00
cc6a188f4e
fix small test bug
2013-07-15 00:22:20 +02:00
acd18721aa
expand rspec tests
2013-07-15 00:17:07 +02:00
3c264f6225
add some rspec tests for supplier and article
2013-07-14 02:50:54 +02:00
7fa8193010
start using rspec for tests
2013-07-12 20:06:49 +02:00
wvengen
Patrick Gansterer
Benjamin Meichsner
Manuel Wiedenmann
Benjamin Meichsner