Commit Graph

102 Commits

Author SHA1 Message Date
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 9e0ec35e9c Fix schema version (closes foodcoops/foodsoft#425) 2016-03-30 20:27:00 +02:00
wvengen b067808937 Merge pull request #404 from foodcoop1040/ordergroup_break
Add break to ordergroup
2016-03-11 13:48:57 +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
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 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 a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
Patrick Gansterer 700eed27b8 Add last user login and activity 2015-03-03 14:55:30 +01:00
wvengen b42672c06c Add forgotten migration 2015-02-27 17:59:30 +01:00
Patrick Gansterer 55e8ff481c Add reply_to and group_id to messages schema 2015-02-27 17:30:26 +01:00
wvengen 3a3119f274 Regenerate schema 2015-02-27 17:28:50 +01:00
wvengen 8e4f3a4caf Increase account_balance precision (closes foodcoops/foodsoft#322) 2014-12-11 22:12:19 +01:00
wvengen 0e1cde9e2b more extensive database seeds (in two languages) (closes foodcoops#277) 2014-09-29 17:26:27 +02:00
Benjamin Meichsner c750416b9e Remove all memberships where belonging group was deleted. 2014-09-21 12:54:01 +02:00
wvengen dd3ac0971c allow to put foodcoop config in database 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 133b832d78 fix database migrations 2014-06-24 09:13:35 +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 ebe2966895 fix migration, complements 7aae7f4d55 2014-01-03 12:50:49 +01:00
wvengen 7aae7f4d55 Add result_computed to GroupOrderArticle 2014-01-03 10:07:03 +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 9490357fcc fix migration name 2013-11-07 12:03:28 +01:00
wvengen a27dda62e0 copy migrations to default directory instead of trying to make it more easy to use 2013-11-06 10:54:20 +01:00
wvengen c3068c8d51 move foodsoft_wiki db migration to plugin 2013-10-30 09:43:38 +01:00
wvengen a77c3b59b1 allow to login with email instead of nick as well + tests 2013-09-20 22:39:19 +02:00
wvengen 2d549fc1da do not recalculate GroupOrder totals, but show message to do so on migrations 2013-09-18 18:33:49 +02:00
wvengen ebb22ccb53 Merge branch 'master' into fix-closed-group_order-totals
Conflicts:
	db/schema.rb
2013-09-18 18:14:07 +02:00
Benjamin Meichsner 3792069fda Fxed encoding error when uploading files with non-ascii characters. 2013-09-02 16:46:44 +02:00
Benjamin Meichsner bf1c2b5ed2 Handle missing due_date in weekly tasks migration. 2013-09-02 15:42:03 +02:00
Benjamin Meichsner c7cdcf2b82 Allow setting default locale in user settings migration.
Use DEFAULT_LOCALE=de to have german enabled for all users.
2013-09-02 10:42:05 +02:00
Benjamin Meichsner 4ea940e4a3 Removed unused acts_as_configurable gem. 2013-09-02 10:03:12 +02:00
wvengen 74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master.
Updated migration date to today.

Conflicts:
	db/schema.rb
2013-07-18 18:48:49 +02:00
wvengen 497c9e0cf1 fix closed group_order totals 2013-07-02 12:01:25 +02:00
Robert Waltemath e5d790021c Add repeated symbol to task list. 2013-06-27 10:22:22 +02:00
Robert Waltemath 7942ccfae6 Added missing migration files. 2013-06-24 12:02:22 +02:00
Robert Waltemath c27127c745 Added i18n strings. 2013-06-24 11:53:52 +02:00
Robert Waltemath abe7c7181d Remove obsolete columns from database. 2013-06-24 10:57:42 +02:00
Robert Waltemath 3d1faa9ed3 Skip save callback when migrating data. 2013-06-24 10:36:14 +02:00
Robert Waltemath ef329b5647 Added up and down migration for weekly task data. 2013-06-22 17:35:45 +02:00
Robert Waltemath 71d8f9bde7 Fixed schema.rb. 2013-06-12 10:20:06 +02:00
Manuel Wiedenmann 60c4c5510a adds a new user settings system + migration + rake task/worker updates 2013-06-06 03:40:15 +02:00
Robert Waltemath 981944b869 Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks
Conflicts:
	Gemfile
	db/schema.rb
2013-03-15 17:59:19 +01:00