Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
2,013 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

92 Commits

Author SHA1 Message Date
Patrick Gansterer 564492afe4 Add an option to automatically finish an order 2017-10-12 21:14:29 +02:00
Patrick Gansterer 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
Patrick Gansterer ca7416f2e7 Check correct calculation of fc_price 2017-10-08 12:33:14 +02:00
Patrick Gansterer 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
wvengen b857b10814 Fix specs after update (switching to webkit) 2017-04-01 15:18:56 +02:00
Patrick Gansterer b8010fedca Add ordergroup_name to GroupOrder 2016-03-11 13:36:49 +01:00
wvengen d6bf09b0b8 Fix failing tests 2016-02-18 23:52:07 +01:00
wvengen a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen aa7a2a31ae Bundle update & restructure tests (RSpec 3) 2015-04-25 17:14:37 +02:00
wvengen c30ec67548 Allow synchronising units when uploading 2015-04-11 02:52:57 +02:00
wvengen 4d1e102f47 Checkbox to remove articles not in upload 2015-04-11 02:52:57 +02:00
wvengen 6ce1b7f928 Handle errors in upload and sync form 2015-04-11 02:52:57 +02:00
wvengen 18cc105c1e Add tests for upload 2015-04-11 02:52:57 +02:00
wvengen 26e7012ef0 Fix import options and add tests 2015-04-11 02:52:57 +02:00
wvengen 610cd8fce4 Test rounded at cents 2015-04-11 02:52:57 +02:00
wvengen 1063aea4af Add file import test 2015-01-14 22:52:17 +01:00
wvengen c31d015434 Bundle update (and fix spec that started failing) 2015-01-14 21:20:14 +01:00
wvengen dbdc7ae4aa Workaround occasional mailer test failure 2015-01-14 20:57:43 +01:00
wvengen 8a4b65c4a5 Add test for reset password 2015-01-13 17:59:31 +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 a594dffed2 disable config validation (closes foodcoops#313) 2014-09-30 15:09:47 +02:00
Benjamin Meichsner d2a218c9fa Fixed rspec deprecation warning concerning spec type. 2014-09-21 12:28:00 +02:00
wvengen 8b83787252 simplify config loading 2014-09-11 16:40:21 +02:00
wvengen 1c878c3c13 fix config issue with nested hash 2014-09-02 16:19:08 +02:00
wvengen 10a193add3 make nested properties work better 2014-09-02 15:02:26 +02:00
wvengen f09ef892dc add foodsoft_config protection whitelisting 2014-09-02 15:02:25 +02:00
wvengen 6115979bae allow protected keys to be set/unset + config_db tests 2014-09-02 14:21:32 +02:00
wvengen 647b7f0430 allow to synchronize all articles of a shared supplier 2014-09-02 12:58:31 +02:00
wvengen d9c61b2db3 allow to match category names on import/sync 2014-09-02 12:58:31 +02:00
wvengen 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
wvengen 72709be60a try workaround for failing test 
(closes foodcoops#303)
 2014-08-25 18:29:59 +02:00
wvengen 21838e9c84 prepare for RSpec 3.0 2014-08-19 11:53:01 +02:00
wvengen 6d98be6d22 reload app config before each test 
(complements 21bef8e304d05025b72b39e790abc7e8a4f4f5e1)
 2014-05-13 17:01:26 +02:00
wvengen ed439d0b08 use minimal app_config for tests 2014-05-13 17:01:26 +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 f8fca4d630 fix order article add + test 2014-02-24 11:37:06 +01:00
wvengen 60826ceedc allow to edit GroupOrderArticle result from orders screen 
Conflicts:
	app/assets/javascripts/application.js
 2014-02-10 16:03:08 +01:00
wvengen 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
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 b30b424540 Merge branch 'master' into feature-receive 
Conflicts:
	app/helpers/finance/order_articles_helper.rb
 2014-01-09 18:42:29 +01:00
wvengen 8f14ab31f3 cleanup and expand receive integration test 2014-01-08 13:07:11 +01:00
wvengen d01d1bc496 add integration tests for receive 2014-01-08 11:52:45 +01:00
Manuel Wiedenmann 0d0ff90a64 adds an RSS feed for pages/all 2014-01-04 20:12:01 +01:00
wvengen 2b511ee559 Merge branch 'master' into fresh-flow 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2013-12-18 17:03:26 +01:00
wvengen 147365cba1 update coverage and use coveralls.io 2013-12-16 23:11:39 +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