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

703 commits

Author SHA1 Message Date
Patrick Gansterer
e742958c0c Add missing German translations 2017-01-21 22:41:18 +01:00
wvengen
0d309af5f6 Update translations from localeapp 2016-06-28 20:43:53 +02:00
wvengen
c6a625e5ed Localeapp update 2016-06-11 19:19:30 +02:00
Patrick Gansterer
749791bb7a Add possibility to add an attachment to an invoice #345 2016-05-06 15:04:58 +02:00
wvengen
8d5467ab7c Merge pull request #355 from foodcoop1040/expeted_delivery_date 
Add expected delivery date
 2016-05-04 17:42:29 +02:00
Patrick Gansterer
f286dd6053 Add pickup date 
This additional date helps users to find the correct order if the time
between end and pickup varies a lot.
 2016-04-29 15:28:05 +02:00
wvengen
42eb6c8509 Make ordergroup break fields a bit nicer 2016-03-11 13:56:02 +01:00
wvengen
b067808937 Merge pull request #404 from foodcoop1040/ordergroup_break 
Add break to ordergroup
 2016-03-11 13:48:57 +01:00
wvengen
4433a665e4 Merge pull request #421 from foodcoop1040/edit_links 
Add page to edit deliveries and orders linked to an invoice
 2016-03-11 13:39:27 +01:00
Patrick Gansterer
efb929e64f Allow editing of linked deliveries and orders at invoice 2016-03-11 13:23:13 +01:00
Patrick Gansterer
9c4d9d5c20 Add stock group order 
This allows us to add additional items to an order, which do not belong
a specific user, but will be put into stock. The benefit of this change
is that we use the same order for ordergroups and stock.
 2016-03-11 13:15:16 +01:00
Patrick Gansterer
253512eb51 Add break to ordergroup 
In some foodcoops it is possible that ordergroups make a break. During that
they e.g. pay reduced or no membership fees and do not need to do work for
the foodcoop. This new fields make this visible to all members.
 2016-03-08 04:38:13 +01:00
wvengen
14e2fd179e Merge pull request #403 from foodcoops/feature/402-messagegroups 
Add messagegroups
 2016-03-07 22:36:37 +01:00
wvengen
5d9e1845b7 Fix i18n key typo 2016-03-07 21:06:49 +01:00
wvengen
d358278333 Merge pull request #416 from foodcoop1040/invite_config 
Add config option to disable the invites
 2016-03-07 19:47:00 +01:00
wvengen
0b70ce39a8 Merge pull request #414 from foodcoop1040/ftc 
Add a button to add all ordergroups to a new finanacial transaction c…
 2016-03-07 19:45:45 +01:00
wvengen
cb8205e4de Merge pull request #413 from foodcoop1040/error_translations 
Add missing German translations for error messages
 2016-03-07 19:44:29 +01:00
wvengen
b4e2ddf66d Merge pull request #412 from foodcoop1040/confirm 
Get rid of duplicated confirm_delete translations
 2016-03-07 19:44:06 +01:00
Patrick Gansterer
7aacc7fef6 Fix German ui.* translations 2016-03-07 15:21:03 +01:00
Patrick Gansterer
e16a0fb336 Add config option to disable the invites 
Some foodcoops require that an admin adds all users to have more control
over the users.
 2016-03-06 13:56:33 +01:00
Patrick Gansterer
a5d0c5ccab Add a button to add all ordergroups to a new finanacial transaction collection 
This function can be used if we need to add the same financial transaction
to all ordergroups at the same time. E.g. the monthly membership fee.
 2016-03-06 11:53:31 +01:00
Patrick Gansterer
f24a18371e Add missing German translations for error messages 2016-03-04 23:23:56 +01:00
Patrick Gansterer
c62104a388 Get rid of duplicated confirm_delete translations 2016-03-04 23:13:28 +01:00
Patrick Gansterer
5e744453f8 Add more infos to the invoice page 
When a foodcoop does not use the balancing feature the invoice page is
the main page for informations. Add all related information to it, so
people do not need to open the balancing page.
 2016-03-04 22:26:55 +01:00
Patrick Gansterer
0fc80a1ef5 Rename translation "admin.confirm" to "ui.confirm_delete" 2016-03-04 20:10:11 +01:00
Patrick Gansterer
b05ac2ab64 Add deleted_at for User 
Do not remove the user from the database. Mark as deleted instead.
 2016-03-04 19:03:52 +01:00
Patrick Gansterer
4e35e2d58e Add handling for message reply via email 
If the reply_email_domain configuration is set the messages plugin will
use unique Reply-To addresses for every email. They contain enough
information to reconstruct the message context and a hash to avoid
user forgery and spam.
A mail transfer agent must be configured to call the new rake task
foodsoft:parse_reply_email for incoming mails. The rake task requires
the receipt of the mail in the RECIPIENT variable and the raw message
via standard input. An example invocation would look like:
rake foodsoft:parse_reply_email RECIPIENT=f.1.1.HASH < test.eml
 2016-03-04 18:11:27 +01:00
Patrick Gansterer
72ef31c0ec Make unassigned tasks more prominent in the dashboard 
Show all unassigned task in the dashboard to make it more interesting
for members to pick tasks. Some members do not (want to) click on the
task list very often it is not clear if there are new tasks if we show
the number of unassigned tasks only.
 2016-03-04 17:15:45 +01:00
Patrick Gansterer
6015d16cab Add link for creating invoice at an order 2016-03-04 17:12:46 +01:00
Patrick Gansterer
8b8693df5a Show last activity of ordergroups 2016-03-04 16:16:09 +01:00
Patrick Gansterer
1315103a7d Add role_invoices 
This new role allows users to create invoices without role_finance. Users
can then only modify their own created invoices until somebody with the
role_finance sets the paid_on value.
 2016-03-04 16:06:02 +01:00
Patrick Gansterer
460cf1e82c Change relationship of invoices #390 
This change will allow us to have invoices for more than one order/delivery
in the future. There are no UI changes for now.
 2016-03-04 15:55:39 +01:00
Patrick Gansterer
3d6f908102 Add created_by to invoice and show it 2016-02-24 00:39:07 +01:00
wvengen
227ca0dd84 Merge pull request #387 from foodcoops/feature/boxfills 
Add optional boxfill phase to orders (+ bootstrap buttons)
 2015-11-20 14:25:41 +01:00
wvengen
496dd34cc3 Avoid Rails 4.2 deprecation warning 2015-11-14 18:23:33 +01:00
wvengen
bc0c1f1bbe Localeapp roundtrip 2015-11-14 16:38:35 +01:00
wvengen
8b69ac35a8 Add comment to app config 2015-11-14 16:28:01 +01:00
wvengen
a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen
77ee8ee2f1 Disable error page for development 2015-09-05 15:04:56 +02:00
wvengen
4a9cf862be Merge pull request #373 from foodcoops/feature/current-orders-plugin 
Add current_orders plugin
 2015-08-07 19:36:05 +02:00
wvengen
dc731ee40d Make current_orders plugin configurable 2015-07-21 00:13:15 +02:00
wvengen
9efa9d5d43 Handle errors using Gaffe 2015-07-21 00:08:17 +02:00
wvengen
58df186a2a Make sharedlists optional (and disabled by default) 2015-07-20 22:33:28 +02:00
wvengen
13768285e4 localeapp roundtrip 2015-05-15 14:26:08 +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
wvengen
c388b4e410 Merge branch 'dockerization' 2015-05-08 13:06:15 +02:00
wvengen
5e2ff4158e Make mailcatcher & redis work with both Docker and local development 2015-05-08 13:05:48 +02:00
wvengen
beee5a1245 Localeapp roundtrip 2015-05-02 15:27:06 +02:00
Benjamin Meichsner
83dd18eaa7 Added Dockersupport. See README_DOCKER.md for further instructions. 2015-04-26 15:20:05 +02:00
wvengen
d953ee6242 Silence Prawn PDF UTF-8 warning 2015-04-25 18:18:11 +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
d5a7f6a074 Move file import logic to model 2015-04-11 02:52:57 +02:00
wvengen
0d92007274 Improve upload form 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
08c8d25a9d New message form and checkbox papercuts 2015-04-11 02:32:30 +02:00
wvengen
07311aa032 Merge pull request #357 from foodcoop1040/user_activity 
Add last user login and activity
 2015-04-03 16:01:18 +02:00
wvengen
15ac566ece Add help page for Foodsoft variables 2015-03-20 16:32:58 +01:00
wvengen
a6f02a24d4 Improve wiki edit documentation 2015-03-20 15:50:49 +01:00
Patrick Gansterer
700eed27b8 Add last user login and activity 2015-03-03 14:55:30 +01:00
Patrick Gansterer
55e8ff481c Add reply_to and group_id to messages schema 2015-02-27 17:30:26 +01:00
wvengen
26c364bf4b Merge pull request #354 from foodcoop1040/recipients 
Show recipients of messages
 2015-02-18 23:28:29 +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
Patrick Gansterer
23f0a1613a Show recipients of messages 2015-02-18 17:45:20 +01:00
wvengen
cfdfe5f23e Improve header+footer in PDFs 2015-01-03 00:24:33 +01:00
wvengen
7bc9d0ede6 Upgrade to rails 4.2 2015-01-02 17:43:44 +01:00
wvengen
8777830029 Add unit: bag 2015-01-02 17:11:02 +01:00
wvengen
6272816358 Localeapp roundtrip 2014-12-31 13:11:39 +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
86eee94249 Add hint for ordergroup address in user form 2014-12-16 20:53:38 +01:00
wvengen
0aa098e75b localeapp roundtrip 2014-12-15 21:11:41 +01:00
wvengen
12bf2198e5 fix simple_form deprecations 2014-12-10 22:04:32 +01:00
wvengen
cee2ac8f9f Merge pull request #331 from foodcoops/feature/configure-upfront-tasks 
Configure upfront tasks
 2014-12-06 14:35:22 +01:00
wvengen
5c78bdde7e Cleanup old task-related i18n 2014-11-23 01:42:15 +01:00
wvengen
f6c008c79c Allow configuration of task periods 2014-11-23 01:34:51 +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
68d54e7e25 add sudo functionality 2014-10-18 17:58:31 +02:00
wvengen
e9dcaadb06 localeapp roundtrip 2014-10-14 18:39:05 +02:00
wvengen
9a7b3378c3 Make invalid login message depend on use_nick (closes foodcoops#321) 2014-10-09 09:42:13 +02:00
wvengen
575928d8a3 fix use_messages heading in config screen (closes foodcoops#319) 2014-10-07 01:07:11 +02:00
Benjamin Meichsner
b961037fff Fixed broken login#update_password route. 2014-10-05 20:35:28 +02:00
wvengen
668ba1e5d6 add webstats_tracking_code to configuration screen (closes foodcoops#311) 2014-09-22 09:36:36 +02:00
Benjamin Meichsner
81d22e6077 Allow adding tracking code for webstatistics service. E.g. piwik. 2014-09-22 09:15:47 +02:00
wvengen
418a8b5806 fix i18n issues + localeapp roundtrip 
thanks, i18n-tasks!
 2014-09-15 13:52:35 +02:00
wvengen
03b307d359 fix more sensible mailer option defaults 2014-09-03 11:43:15 +02:00
wvengen
1a3b690757 add custom css to config screen 2014-09-02 15:02:26 +02:00
wvengen
cf680d3410 add page break to config screen 2014-09-02 15:02:26 +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
6115979bae allow protected keys to be set/unset + config_db tests 2014-09-02 14:21:32 +02:00
wvengen
7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +02:00
wvengen
a39c56fdf1 update strings from localeapp 2014-09-02 14:21:15 +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
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