merge request id	421
Titel	Feature/ll 901 fix voucher inconsistencies
Beschreibung
Status	merged
Created at	2021-05-14T14:19:01.291Z
Updated at	2021-05-17T14:51:09.802Z
Source branch	feature/LL-901-fix-voucher-inconsistencies
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 1 commit 75fe520c - changed name for display name in case name is not filled Compare with previous version	Sascha Immig	2021-05-17T14:42:01.243Z
merged	Sascha Immig	2021-05-17T14:51:09.951Z
mentioned in commit fefba2eefa1a4f9d06fdfafc64cfa7e4bd1fc5d1	Sascha Immig	2021-05-17T14:51:10.486Z

Merge Commits

Title	Id	Author	Created at	Message
changed predefined time ranges for campaigns	118c556b9ee4d18e930ddadfac813c850658e709	TUV\gabrielg	2021-05-14T09:24:39.000Z	changed predefined time ranges for campaigns
added newline between paymentinterval and notes and set notes to bold in 3 emails	1856ad145ad39e640771ebd703f1e42a9c627eed	TUV\gabrielg	2021-05-14T10:03:18.000Z	added newline between paymentinterval and notes and set notes to bold in 3 emails
+ run php-cs-fixer	4a8b30ea80ed05948cc03391789b5164c1170f16	TUV\gabrielg	2021-05-14T11:02:33.000Z	+ run php-cs-fixer
+ added confirm dialog for voucher deactivation and activaion when voucher was…	69cab82621a9da4a402a035e4f677d78f16a224c	TUV\gabrielg	2021-05-14T14:18:14.000Z	+ added confirm dialog for voucher deactivation and activaion when voucher was already redeemed and revoke or resore discount on affecteds subscription
changed name for display name in case name is not filled	75fe520cd16827473cdca86292b0d39326eea081	TUV\immigs	2021-05-17T14:41:45.000Z	changed name for display name in case name is not filled
+ translated voucher email text	7ffc528b6fa373fb092d8f202bdb0b185116897b	TUV\gabrielg	2021-05-14T10:58:57.000Z	+ translated voucher email text
Changed text to the one given by Sascha	eecc52270a268a768114eecbfbbd9f64e186f576	TUV\gabrielg	2021-05-14T12:47:56.000Z	Changed text to the one given by Sascha
+ add price after discount end to subsctiption show blade	fd74ee3fd7b0ff891b76dd4db2ccd79547e2b696	TUV\gabrielg	2021-05-14T10:44:14.000Z	+ add price after discount end to subsctiption show blade + added methode to get tariff price per period to Subscription class