Commit Graph

413 Commits

Author SHA1 Message Date
wvengen a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen c1413ff817 Allow clearing default order schedule 2015-10-23 14:53:01 +02:00
wvengen 9efa9d5d43 Handle errors using Gaffe 2015-07-21 00:08:17 +02:00
wvengen b07e855235 Make compatible with Ruby 2.0 2015-06-05 15:35:19 +02:00
wvengen ec03d579d0 Merge branch 'feature/edit-recurring-task'
Conflicts:
	config/locales/en.yml
2015-05-08 20:10:23 +02:00
wvengen a00e7c94be Rework user-interface for editing recurring tasks 2015-05-08 17:39:20 +02:00
Robert a8a434ef7b Move due date according to delta 2015-05-01 21:31:06 +02:00
Robert fd51b07e21 Allow editing recurring task groups, basic functionality for #152 2015-05-01 21:14:16 +02:00
wvengen aa7a2a31ae Bundle update & restructure tests (RSpec 3) 2015-04-25 17:14:37 +02:00
wvengen 5d47171b76 Improve upload error handling 2015-04-17 18:44:38 +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 d5a7f6a074 Move file import logic to model 2015-04-11 02:52:57 +02:00
wvengen 16e9210035 Fix title of new upload screen 2015-04-11 02:52:57 +02:00
wvengen 07ba6f0535 Import multiple spreadsheet formats. Make upload work like sync. 2015-04-11 02:52:57 +02:00
Patrick Gansterer 700eed27b8 Add last user login and activity 2015-03-03 14:55:30 +01:00
wvengen 1b48882c0e Refactor orders index 2015-02-18 23:46:50 +01:00
Patrick Gansterer e57fd500fc Add possibility to copy an order
If a supplier has a long list of articles, which are all available, but
the order should contain only a subset of them, selecting them for every
order can take a long time. Starting with a copy of an existing order
can safe a lot of time.
2015-02-18 22:09:37 +01:00
wvengen 65c7673a41 Allow updating profile without ordergroup 2015-01-16 20:25:58 +01:00
Benjamin Meichsner 65dee49cdb Fixed broken eager loading in orders#edit. 2015-01-16 15:57:11 +01:00
wvengen 7e0aa66936 Use more boolean comparators where it makes sense 2015-01-14 22:56:32 +01:00
wvengen 2687da357a Fix mailer warnings 2015-01-13 18:02:30 +01:00
wvengen 1c0db4374f Merge pull request #332 from foodcoops/feature/edit-address
Allow to edit address from user profile
2014-12-23 21:00:20 +01:00
wvengen bf6a31a032 Cleanup groups view on profile page 2014-12-16 21:14:20 +01:00
wvengen 56f6efa590 Allow to edit address from user profile 2014-12-10 21:27:53 +01:00
wvengen 219eb71bc9 Allow to specify an order schedule for new orders. 2014-11-23 00:38:13 +01:00
wvengen 68d54e7e25 add sudo functionality 2014-10-18 17:58:31 +02:00
wvengen 7826d2f674 move login and logout to separate methods
Conflicts:
	app/controllers/sessions_controller.rb

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
2014-10-18 17:57:07 +02:00
wvengen 9a7b3378c3 Make invalid login message depend on use_nick (closes foodcoops#321) 2014-10-09 09:42:13 +02:00
Benjamin Meichsner cc4e925c1a Fixed ensure_open_order filter on missing id params. 2014-09-23 10:39:10 +02:00
wvengen cf360335ee fix articles with zero quantity showing
complements 8913ad615c
2014-09-11 13:47:03 +02:00
wvengen ee1874a15f fix upload error 2014-09-10 14:42:44 +02:00
wvengen 68ccc19c70 allow to configure currency (closes foodcoops#258) 2014-09-02 15:02:25 +02:00
wvengen 3fee071a10 specify timezone in configuration (closes foodcoops#282) 2014-09-02 14:21:33 +02:00
wvengen 7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +02:00
wvengen 97dc090e4d Merge pull request #306 from wvengen/feature-styling
allow foodcoops to add custom css
2014-09-02 13:59:18 +02:00
wvengen 19630e8607 allow foodcoops to add custom css 2014-09-02 13:35:45 +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 d906a7342f workaround receive error with many articles 2014-09-02 12:35:57 +02:00
wvengen e61c3c9267 order articles by number then name in fax+receive
This makes it easier to enter the receive screen from an order pdf print
with received amounts.

Conflicts:
	app/documents/order_fax.rb
2014-08-19 09:19:01 +02:00
wvengen 8c0df3b4e8 edit order user-interface update
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
wvengen ef0888f38d add view for all transactions + csv 2014-06-23 17:51:17 +02:00
wvengen 5d9c9856d1 show proper error when all articles are deselected in order edit 2014-05-13 17:01:27 +02:00
wvengen 64bb8e043d enable/disable plugins by config option 2014-05-13 17:01:26 +02:00
Robert Waltemath 7556c753d0 Extract message system to plugin. 2014-05-13 17:01:25 +02:00
wvengen 48e9a3e4f5 add fax csv 2014-05-13 17:01:25 +02:00
wvengen f71b78665e allow 500 items per page 2014-05-13 17:01:24 +02:00
wvengen 0fa9bebac9 show supplier user-interface update 2014-05-13 17:01:24 +02:00