Projekt

Allgemein

Profil

GX-Bug #54822 » WithdrawalConfirmationMailFix.patch

Till Tepelmann, 16.01.2018 13:19

Unterschiede anzeigen:

src/lang/english/original_mail_templates/withdrawal_confirmation.html (revision )
1
{load_language_text section="withdrawal"}
2 1
<meta charset="UTF-8" />
3 2
<div style="margin: 0 !important; padding: 0 !important; max-width: 9000px !important; font-family: arial, verdana, sans-serif; background-color: #e5e5e5; height: 100%">
4 3
	<div style="margin-left: auto; margin-right: auto; width: 720px; padding-bottom: 5px; padding-top: 5px; font-size: 9pt; color: #999999; text-align: right;">&nbsp;</div>
......
16 15
				<tr>
17 16
					<td style="font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px">
18 17
						<span style="font-size:13px;"><span style="font-family: verdana,geneva,sans-serif;">
19
							<strong>{$txt.customer_greeting}</strong><br />
18
							<strong>Dear customer,</strong><br />
20 19
							<br />
21
							{$txt.process_cancellation}
20
							we have received the following cancellation, which we will process as quickly as possible:
22 21
						</span></span>
23 22

  
24 23
						<div style="font-style: italic">
25 24
							<p>
26 25
								<span style="font-size:13px;"><span style="font-family: verdana,geneva,sans-serif;">
27
									{$txt.withdrawal_to}:
26
									Withdraw to:
28 27
								</span></span>
29 28
							</p>
30 29

  
......
36 35
									{$smarty.const.TRADER_ZIPCODE} {$smarty.const.TRADER_LOCATION}<br />
37 36
									{$smarty.const.STORE_COUNTRY_NAME}<br />
38 37
									<br />
39
									{if $smarty.const.TRADER_FAX != ''}{$txt.fax}: {$smarty.const.TRADER_FAX}<br />{/if} 
40
									{if $smarty.const.STORE_OWNER_EMAIL_ADDRESS != ''}{$txt.mail}: <a href="mailto:{$smarty.const.STORE_OWNER_EMAIL_ADDRESS}">{$smarty.const.STORE_OWNER_EMAIL_ADDRESS}</a><br />{/if}
38
									{if $smarty.const.TRADER_FAX != ''}Fax: {$smarty.const.TRADER_FAX}<br />{/if}
39
									{if $smarty.const.STORE_OWNER_EMAIL_ADDRESS != ''}E-Mail: <a href="mailto:{$smarty.const.STORE_OWNER_EMAIL_ADDRESS}">{$smarty.const.STORE_OWNER_EMAIL_ADDRESS}</a><br />{/if}
41 40
								</span></span>
42 41
							</p>
43 42

  
44 43
							<p>
45 44
								<span style="font-size:13px;"><span style="font-family: verdana,geneva,sans-serif;">
46
									{$txt.withdrawal_yourData}:
45
									Your data:
47 46
								</span></span>
48 47
							</p>
49 48

  
......
59 58

  
60 59
							<p>
61 60
								<span style="font-size:13px;"><span style="font-family: verdana,geneva,sans-serif;">
62
									{if $ORDER_DATE}{$txt.order_date}: {$ORDER_DATE}<br />
63
									{/if} {if $DELIVERY_DATE}{$txt.deliverydate_t}: {$DELIVERY_DATE}<br />
64
									{/if} {$txt.withdrawal_date}: {$WITHDRAWAL_DATE}
61
									{if $ORDER_DATE}Order date: {$ORDER_DATE}<br />
62
									{/if} {if $DELIVERY_DATE}Delivery date: {$DELIVERY_DATE}<br />
63
									{/if} Withdrawal date: {$WITHDRAWAL_DATE}
65 64
								</span></span>
66 65
							</p>
67 66

  
68 67
							<p>
69
								<span style="font-size:13px;"><span style="font-family: verdana,geneva,sans-serif;">{$txt.withdrawal}:</span></span>
68
								<span style="font-size:13px;"><span style="font-family: verdana,geneva,sans-serif;">Withdrawal:</span></span>
70 69
							</p>
71 70

  
72 71
							<p>
src/lang/english/original_mail_templates/withdrawal_confirmation.txt (revision )
1
{load_language_text section="withdrawal"}
2
{$txt.customer_greeting}
1
Dear customer,
3 2

  
4
{$txt.process_cancellation}
3
we have received the following cancellation, which we will process as quickly as possible:
5 4

  
6
{$txt.withdrawal_to}:
5
Withdraw to:
7 6

  
8 7
{$smarty.const.COMPANY_NAME}
9 8
{$smarty.const.TRADER_FIRSTNAME} {$smarty.const.TRADER_NAME}
......
11 10
{$smarty.const.TRADER_ZIPCODE} {$smarty.const.TRADER_LOCATION}
12 11
{$smarty.const.STORE_COUNTRY_NAME}
13 12

  
14
{if $smarty.const.TRADER_FAX != ''}{$txt.fax}: {$smarty.const.TRADER_FAX}{/if}
13
{if $smarty.const.TRADER_FAX != ''}Fax: {$smarty.const.TRADER_FAX}{/if}
15 14

  
16
{if $smarty.const.STORE_OWNER_EMAIL_ADDRESS != ''}{$txt.mail}: {$smarty.const.STORE_OWNER_EMAIL_ADDRESS}{/if}
15
{if $smarty.const.STORE_OWNER_EMAIL_ADDRESS != ''}E-Mail: {$smarty.const.STORE_OWNER_EMAIL_ADDRESS}{/if}
17 16

  
18 17

  
19 18

  
20
{$txt.withdrawal_yourData}:
19
Your data:
21 20

  
22 21
{$CUSTOMER_GENDER}
23 22
{$CUSTOMER_NAME}
......
25 24
{$CUSTOMER_POSTCODE} {$CUSTOMER_CITY}
26 25
{$CUSTOMER_COUNTRY}
27 26

  
28
{if $ORDER_DATE}{$txt.order_date}: {$ORDER_DATE}{/if}
29
{if $DELIVERY_DATE}{$txt.deliverydate_t}: {$DELIVERY_DATE}{/if}
27
{if $ORDER_DATE}Order date: {$ORDER_DATE}{/if}
28
{if $DELIVERY_DATE}Delivery date: {$DELIVERY_DATE}{/if}
30 29

  
31
{$txt.withdrawal_date}: {$WITHDRAWAL_DATE}
30
Withdrawal date: {$WITHDRAWAL_DATE}
32 31

  
33
{$txt.withdrawal}:
32
Withdrawal:
34 33
{$WITHDRAWAL_CONTENT}
35 34

  
36 35

  
src/lang/german/original_mail_templates/withdrawal_confirmation.txt (revision )
1
{load_language_text section="withdrawal"}
2
{$txt.customer_greeting}
1
Sehr geehrter Kunde,
3 2

  
4
{$txt.process_cancellation}
3
folgenden Widerruf haben wir erhalten und werden ihn schnellstmöglich bearbeiten:
5 4

  
6
{$txt.withdrawal_to}:
5
Widerruf an:
7 6

  
8 7
{$smarty.const.COMPANY_NAME}
9 8
{$smarty.const.TRADER_FIRSTNAME} {$smarty.const.TRADER_NAME}
......
11 10
{$smarty.const.TRADER_ZIPCODE} {$smarty.const.TRADER_LOCATION}
12 11
{$smarty.const.STORE_COUNTRY_NAME}
13 12

  
14
{if $smarty.const.TRADER_FAX != ''}{$txt.fax}: {$smarty.const.TRADER_FAX}{/if}
13
{if $smarty.const.TRADER_FAX != ''}Fax: {$smarty.const.TRADER_FAX}{/if}
15 14

  
16
{if $smarty.const.STORE_OWNER_EMAIL_ADDRESS != ''}{$txt.mail}: {$smarty.const.STORE_OWNER_EMAIL_ADDRESS}{/if}
15
{if $smarty.const.STORE_OWNER_EMAIL_ADDRESS != ''}E-Mail: {$smarty.const.STORE_OWNER_EMAIL_ADDRESS}{/if}
17 16

  
18 17

  
19 18

  
20
{$txt.withdrawal_yourData}:
19
Ihre Daten:
21 20

  
22 21
{$CUSTOMER_GENDER}
23 22
{$CUSTOMER_NAME}
......
25 24
{$CUSTOMER_POSTCODE} {$CUSTOMER_CITY}
26 25
{$CUSTOMER_COUNTRY}
27 26

  
28
{if $ORDER_DATE}{$txt.order_date}: {$ORDER_DATE}{/if}
29
{if $DELIVERY_DATE}{$txt.deliverydate_t}: {$DELIVERY_DATE}{/if}
27
{if $ORDER_DATE}Bestelldatum: {$ORDER_DATE}{/if}
28
{if $DELIVERY_DATE}Lieferdatum: {$DELIVERY_DATE}{/if}
30 29

  
31
{$txt.withdrawal_date}: {$WITHDRAWAL_DATE}
30
Widerrufsdatum: {$WITHDRAWAL_DATE}
32 31

  
33
{$txt.withdrawal}:
32
Widerruf:
34 33
{$WITHDRAWAL_CONTENT}
35 34

  
36 35

  
src/lang/german/original_mail_templates/withdrawal_confirmation.html (revision )
1
{load_language_text section="withdrawal"}
2 1
<meta charset="UTF-8" />
3 2
<div style="margin: 0 !important; padding: 0 !important; max-width: 9000px !important; font-family: arial, verdana, sans-serif; background-color: #e5e5e5; height: 100%">
4 3
	<div style="margin-left: auto; margin-right: auto; width: 720px; padding-bottom: 5px; padding-top: 5px; font-size: 9pt; color: #999999; text-align: right;">&nbsp;</div>
......
16 15
				<tr>
17 16
					<td style="font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px">
18 17
						<span style="font-size:13px;"><span style="font-family: verdana,geneva,sans-serif;">
19
							<strong>{$txt.customer_greeting}</strong><br />
18
							<strong>Sehr geehrter Kunde,</strong><br />
20 19
							<br />
21
							{$txt.process_cancellation}
20
							folgenden Widerruf haben wir erhalten und werden ihn schnellstmöglich bearbeiten:
22 21
						</span></span>
23 22

  
24 23
						<div style="font-style: italic">
25 24
							<p>
26 25
								<span style="font-size:13px;"><span style="font-family: verdana,geneva,sans-serif;">
27
									{$txt.withdrawal_to}:
26
									Widerruf an:
28 27
								</span></span>
29 28
							</p>
30 29

  
......
36 35
									{$smarty.const.TRADER_ZIPCODE} {$smarty.const.TRADER_LOCATION}<br />
37 36
									{$smarty.const.STORE_COUNTRY_NAME}<br />
38 37
									<br />
39
									{if $smarty.const.TRADER_FAX != ''}{$txt.fax}: {$smarty.const.TRADER_FAX}<br />{/if} 
40
									{if $smarty.const.STORE_OWNER_EMAIL_ADDRESS != ''}{$txt.mail}: <a href="mailto:{$smarty.const.STORE_OWNER_EMAIL_ADDRESS}">{$smarty.const.STORE_OWNER_EMAIL_ADDRESS}</a><br />{/if}
38
									{if $smarty.const.TRADER_FAX != ''}Fax: {$smarty.const.TRADER_FAX}<br />{/if}
39
									{if $smarty.const.STORE_OWNER_EMAIL_ADDRESS != ''}E-Mail: <a href="mailto:{$smarty.const.STORE_OWNER_EMAIL_ADDRESS}">{$smarty.const.STORE_OWNER_EMAIL_ADDRESS}</a><br />{/if}
41 40
								</span></span>
42 41
							</p>
43 42

  
44 43
							<p>
45 44
								<span style="font-size:13px;"><span style="font-family: verdana,geneva,sans-serif;">
46
									{$txt.withdrawal_yourData}:
45
									Ihre Daten:
47 46
								</span></span>
48 47
							</p>
49 48

  
......
59 58

  
60 59
							<p>
61 60
								<span style="font-size:13px;"><span style="font-family: verdana,geneva,sans-serif;">
62
									{if $ORDER_DATE}{$txt.order_date}: {$ORDER_DATE}<br />
63
									{/if} {if $DELIVERY_DATE}{$txt.deliverydate_t}: {$DELIVERY_DATE}<br />
64
									{/if} {$txt.withdrawal_date}: {$WITHDRAWAL_DATE}
61
									{if $ORDER_DATE}Bestelldatum: {$ORDER_DATE}<br />
62
									{/if} {if $DELIVERY_DATE}Lieferdatum: {$DELIVERY_DATE}<br />
63
									{/if} Widerrufsdatum: {$WITHDRAWAL_DATE}
65 64
								</span></span>
66 65
							</p>
67 66

  
68 67
							<p>
69
								<span style="font-size:13px;"><span style="font-family: verdana,geneva,sans-serif;">{$txt.withdrawal}:</span></span>
68
								<span style="font-size:13px;"><span style="font-family: verdana,geneva,sans-serif;">Widerruf:</span></span>
70 69
							</p>
71 70

  
72 71
							<p>
    (1-1/1)