diff --git a/mails/en/order_conf.txt b/mails/en/order_conf.txt
index 06eeabbb7..2f6384972 100644
--- a/mails/en/order_conf.txt
+++ b/mails/en/order_conf.txt
@@ -37,9 +37,6 @@ Extra Services Tax
Final Booking Amount
{total_paid}
-Customer address
-{invoice_block_html}
-
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
diff --git a/mails/en/overbooking.html b/mails/en/overbooking.html
index 4fc0e43c6..95631ee77 100755
--- a/mails/en/overbooking.html
+++ b/mails/en/overbooking.html
@@ -318,35 +318,6 @@
-
-
-
-
-
-
-
- | |
-
-
-
- Customer address
-
- {invoice_block_html}
-
-
-
- |
- |
-
-
- |
-
-
- |
-
-
-
-
diff --git a/mails/en/overbooking.txt b/mails/en/overbooking.txt
index a6bd05b32..6a8f8975a 100644
--- a/mails/en/overbooking.txt
+++ b/mails/en/overbooking.txt
@@ -43,9 +43,6 @@ Extra Services Tax
Final Booking Amount
{total_paid}
-Customer address
-{invoice_block_html}
-
You can review your order and download your invoice from the
"Order history" [{history_url}] section of your
customer account by clicking "My account"
diff --git a/pdf/invoice.addresses-tab.tpl b/pdf/invoice.addresses-tab.tpl
index d4d9f0701..0b743c4f0 100644
--- a/pdf/invoice.addresses-tab.tpl
+++ b/pdf/invoice.addresses-tab.tpl
@@ -22,7 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
-{if $invoice_address}
|
|
- {l s='Customer Address' pdf='true'}
+ |
+ {l s='Customer Detail' pdf='true'}
+ {if $invoice_address}
{$invoice_address}
+ {else}
+ {$customer->firstname} {$customer->lastname}
+
+ {$customer->phone}
+ {/if}
|
-
-{/if}
\ No newline at end of file
+
\ No newline at end of file
diff --git a/themes/hotel-reservation-theme/authentication.tpl b/themes/hotel-reservation-theme/authentication.tpl
index 51dae4122..e94709781 100644
--- a/themes/hotel-reservation-theme/authentication.tpl
+++ b/themes/hotel-reservation-theme/authentication.tpl
@@ -461,6 +461,10 @@
+
+
+
+
diff --git a/themes/hotel-reservation-theme/identity.tpl b/themes/hotel-reservation-theme/identity.tpl
index 63d5645b5..12ce54882 100644
--- a/themes/hotel-reservation-theme/identity.tpl
+++ b/themes/hotel-reservation-theme/identity.tpl
@@ -84,6 +84,12 @@
+
+
+
+
{if isset($birthday) && $birthday}
|
+ {if isset($guestInformations['phone']) && $guestInformations['phone']}
+
+ | {l s='Phone'} |
+ {$guestInformations['phone']|escape:'html':'UTF-8'} |
+
+ {/if}
+
{if isset($address_invoice->phone_mobile) && $address_invoice->phone_mobile}
| {l s='Mobile'} |
@@ -687,7 +694,12 @@
{l s='Email'} |
{$guestInformations['email']|escape:'html':'UTF-8'} |
-
+ {if isset($guestInformations['phone']) && $guestInformations['phone']}
+
+ | {l s='Phone'} |
+ {$guestInformations['phone']|escape:'html':'UTF-8'} |
+
+ {/if}
{if isset($address_invoice->phone_mobile) && $address_invoice->phone_mobile}
| {l s='Mobile'} |
diff --git a/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl b/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl
index 78e57e11c..ec645221d 100644
--- a/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl
+++ b/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl
@@ -86,8 +86,8 @@
@@ -313,8 +313,5 @@
{else}
{addJsDef idSelectedCountryInvoice=false}
{/if}
- {if isset($countries)}
- {addJsDef countries=$countries}
- {/if}
- {addJsDef PS_REGISTRATION_PROCESS_TYPE=$PS_REGISTRATION_PROCESS_TYPE|intval}
+
{/strip}
diff --git a/themes/hotel-reservation-theme/order-opc-new-account.tpl b/themes/hotel-reservation-theme/order-opc-new-account.tpl
index c9248ab9b..a267c8af3 100644
--- a/themes/hotel-reservation-theme/order-opc-new-account.tpl
+++ b/themes/hotel-reservation-theme/order-opc-new-account.tpl
@@ -101,8 +101,8 @@
{if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE}
@@ -396,3 +396,8 @@
+{strip}
+ {if isset($countries)}
+ {addJsDef countries=$countries}
+ {/if}
+{/strip}
\ No newline at end of file
diff --git a/themes/hotel-reservation-theme/order-opc.tpl b/themes/hotel-reservation-theme/order-opc.tpl
index 77ad2a465..282820672 100644
--- a/themes/hotel-reservation-theme/order-opc.tpl
+++ b/themes/hotel-reservation-theme/order-opc.tpl
@@ -125,31 +125,23 @@
{l s='Name'}
{if $isGuest}
- {$guestInformations['customer_firstname']} {$guestInformations['customer_lastname']}
+ {$guestInformations['customer_firstname']|escape:'html':'UTF-8'} {$guestInformations['customer_lastname']|escape:'html':'UTF-8'}
{else}
- {$guestInformations['firstname']} {$guestInformations['lastname']}
+ {$guestInformations['firstname']|escape:'html':'UTF-8'} {$guestInformations['lastname']|escape:'html':'UTF-8'}
{/if}
{l s='Email'}
- {$guestInformations['email']}
+ {$guestInformations['email']|escape:'html':'UTF-8'}
- {if (isset($delivery->phone_mobile) && $delivery->phone_mobile) || (isset($delivery->phone) && $delivery->phone)}
+ {if (isset({$guestInformations['phone']}) && {$guestInformations['phone']})}
- {if isset($delivery->phone_mobile) && $delivery->phone_mobile}
- {l s='Mobile Number'}
- {else}
{l s='Phone Number'}
- {/if}
- {if isset($delivery->phone_mobile) && $delivery->phone_mobile}
- {$delivery->phone_mobile|escape:'html':'UTF-8'}
- {else}
- {$delivery->phone|escape:'html':'UTF-8'}
- {/if}
+ {$guestInformations['phone']|escape:'html':'UTF-8'}
{/if}
@@ -180,9 +172,11 @@
{include file="$tpl_dir./order-opc-new-account.tpl"}
{/if}
-
- {include file="./order-opc-edit-guest-info.tpl"}
-
+ {if $is_logged || $isGuest}
+
+ {include file="./order-opc-edit-guest-info.tpl"}
+
+ {/if}
{/if}
@@ -477,6 +471,7 @@
{addJsDef addresses=array()}
{addJsDef isVirtualCart=$isVirtualCart|intval}
{addJsDef isPaymentStep=$isPaymentStep|intval}
+ {addJsDef PS_REGISTRATION_PROCESS_TYPE=$PS_REGISTRATION_PROCESS_TYPE|intval}
{addJsDefL name=txtWithTax}{l s='(tax incl.)' js=1}{/addJsDefL}
{addJsDefL name=txtWithoutTax}{l s='(tax excl.)' js=1}{/addJsDefL}
{addJsDefL name=txtHasBeenSelected}{l s='has been selected' js=1}{/addJsDefL}
|