Merge branch 'hotfix/voucher_templates' into 'master'
Hotfix/voucher templates Closes #266 and #267 See merge request NCER-PD/scheduling-system!185
Showing
- smash/create_dummy_data.py 9 additions, 3 deletionssmash/create_dummy_data.py
- smash/import_file.py 29 additions, 2 deletionssmash/import_file.py
- smash/web/forms/mail_template.py 24 additions, 0 deletionssmash/web/forms/mail_template.py
- smash/web/forms/voucher_forms.py 2 additions, 1 deletionsmash/web/forms/voucher_forms.py
- smash/web/migrations/0131_study_default_voucher_expiration_in_months.py 21 additions, 0 deletions...ations/0131_study_default_voucher_expiration_in_months.py
- smash/web/models/study.py 6 additions, 0 deletionssmash/web/models/study.py
- smash/web/models/voucher_type.py 2 additions, 2 deletionssmash/web/models/voucher_type.py
- smash/web/templates/includes/subject_vouchers_box.html 13 additions, 3 deletionssmash/web/templates/includes/subject_vouchers_box.html
- smash/web/templates/mail_templates/add_edit.html 58 additions, 2 deletionssmash/web/templates/mail_templates/add_edit.html
- smash/web/tests/data/voucher_pdp.docx 0 additions, 0 deletionssmash/web/tests/data/voucher_pdp.docx
- smash/web/urls.py 5 additions, 5 deletionssmash/web/urls.py
- smash/web/views/mails.py 29 additions, 19 deletionssmash/web/views/mails.py
Loading
Please register or sign in to comment