diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 92fb7c577..90c769ef8 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -734,14 +734,17 @@ abstract class PaymentModuleCore extends Module // changing mail format $cart_booking_data = $this->cartBookingDataForMail($order); - $cart_booking_data_text = $this->getEmailTemplateContent('hotel-booking-cart-data.text', Mail::TYPE_TEXT, $cart_booking_data['cart_htl_data']); + $cart_booking_data_text = $this->getEmailTemplateContent('hotel-booking-cart-data-text.tpl', Mail::TYPE_TEXT, $cart_booking_data['cart_htl_data']); $cart_booking_data_html = $this->getEmailTemplateContent('hotel-booking-cart-data.tpl', Mail::TYPE_HTML, $cart_booking_data['cart_htl_data']); $extra_demands_details_html = $this->getEmailTemplateContent('booking_extra_demands.tpl', Mail::TYPE_HTML, $cart_booking_data['cart_htl_data']); + $extra_demands_details_text = $this->getEmailTemplateContent('booking_extra_demands_text.tpl', Mail::TYPE_HTML, $cart_booking_data['cart_htl_data']); $data = array( '{cart_booking_data_html}' => $cart_booking_data_html, + '{cart_booking_data_text}' => $cart_booking_data_text, '{extra_demands_details_html}' => $extra_demands_details_html, + '{extra_demands_details_text}' => $extra_demands_details_text, '{total_extra_demands_te}' => Tools::displayPrice( $cart_booking_data['total_extra_demands_te'], $this->context->currency, @@ -1188,6 +1191,7 @@ abstract class PaymentModuleCore extends Module $cart_htl_data[$type_key]['cover_img'] = $cover_img; $cart_htl_data[$type_key]['name'] = $product->name; $cart_htl_data[$type_key]['unit_price'] = $unit_price; + $cart_htl_data[$type_key]['hotel_name'] = $rm_dtl['hotel_name']; $cart_htl_data[$type_key]['adult'] = $rm_dtl['adult']; $cart_htl_data[$type_key]['children'] = $rm_dtl['children']; diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php index 8f62a5892..15a2eda93 100644 --- a/classes/pdf/HTMLTemplateInvoice.php +++ b/classes/pdf/HTMLTemplateInvoice.php @@ -354,6 +354,7 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate $cart_htl_data[$type_key]['cover_img'] = $cover_img; $cart_htl_data[$type_key]['adult'] = $rm_dtl['adult']; $cart_htl_data[$type_key]['children'] = $rm_dtl['children']; + $cart_htl_data[$type_key]['hotel_name'] = $rm_dtl['hotel_name']; $objBookingDemand = new HotelBookingDemands(); foreach ($order_bk_data as $data_k => $data_v) { $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']); diff --git a/mails/en/booking_extra_demands.txt b/mails/en/booking_extra_demands.txt deleted file mode 100644 index 3139f8ce3..000000000 --- a/mails/en/booking_extra_demands.txt +++ /dev/null @@ -1,40 +0,0 @@ -{if isset($list)} - {l s='Extra Demands Details'} - {l s='Room Type'} - {l s='Extra demand name'} - {l s='Total'} {l s='(Tax excl.)'} - - {if isset($list)} - {foreach from=$list key=data_k item=data_v} - {foreach from=$data_v['date_diff'] key=rm_k item=rm_v} - {if isset($rm_v['extra_demands']) && $rm_v['extra_demands']} - {assign var=roomCount value=1} - {foreach $rm_v['extra_demands'] as $roomDemand} - {foreach name=demandRow from=$roomDemand['extra_demands'] item=demand} - {if $smarty.foreach.demandRow.first} - - - {$data_v['name']}
- {$rm_v['data_form']|date_format:"%d-%m-%Y"} {l s='to'} {$rm_v['data_to']|date_format:"%d-%m-%Y"}
- {l s='Room'} - {$roomCount} - - - {/if} - - - {$demand['name']} - - - - - {convertPrice price=$demand['total_price_tax_excl']} - - - - {/foreach} - {assign var=roomCount value=$roomCount+1} - {/foreach} - {/if} - {/foreach} - {/foreach} - {/if} diff --git a/mails/en/booking_extra_demands_text.tpl b/mails/en/booking_extra_demands_text.tpl new file mode 100644 index 000000000..5f74a1b03 --- /dev/null +++ b/mails/en/booking_extra_demands_text.tpl @@ -0,0 +1,30 @@ +{if isset($list)} +{l s='Extra Demands Details'} +{l s='Room Type'} +{l s='Extra demand name'} +{l s='Total'} {l s='(Tax excl.)'} + +{foreach from=$list key=data_k item=data_v} +{foreach from=$data_v['date_diff'] key=rm_k item=rm_v} +{if isset($rm_v['extra_demands']) && $rm_v['extra_demands']} +{assign var=roomCount value=1} +{foreach $rm_v['extra_demands'] as $roomDemand} +{foreach name=demandRow from=$roomDemand['extra_demands'] item=demand} + +{if $smarty.foreach.demandRow.first} +{$data_v['name']} +{$rm_v['data_form']|date_format:"%d-%m-%Y"} {l s='to'} {$rm_v['data_to']|date_format:"%d-%m-%Y"} +{l s='Room'} - {$roomCount} +{/if} + +{$demand['name']} + +{convertPrice price=$demand['total_price_tax_excl']} + +{/foreach} +{assign var=roomCount value=$roomCount+1} +{/foreach} +{/if} +{/foreach} +{/foreach} +{/if} diff --git a/mails/en/hotel-booking-cart-data-text.tpl b/mails/en/hotel-booking-cart-data-text.tpl new file mode 100644 index 000000000..5f70fa759 --- /dev/null +++ b/mails/en/hotel-booking-cart-data-text.tpl @@ -0,0 +1,26 @@ +{if isset($list)} +{foreach from=$list key=data_k item=data_v} +{foreach from=$data_v['date_diff'] key=rm_k item=rm_v} + + +{$data_v['name']} + +{$data_v['hotel_name']} + +{$data_v['adult']} {l s='Adults'}, {$data_v['children']} {l s='Children'} + +{convertPrice price=$data_v['unit_price']} + +{$rm_v['num_rm']} + +{$rm_v['data_form']|date_format:"%d-%b-%G"} + +{$rm_v['data_to']|date_format:"%d-%b-%G"} + +{$rm_v['amount']} + + +{/foreach} +{/foreach} +{/if} + diff --git a/mails/en/hotel-booking-cart-data.tpl b/mails/en/hotel-booking-cart-data.tpl index 9389a895b..374aff837 100644 --- a/mails/en/hotel-booking-cart-data.tpl +++ b/mails/en/hotel-booking-cart-data.tpl @@ -28,6 +28,19 @@ + + + + + + + +
  + + {$data_v['hotel_name']} + +  
+ diff --git a/mails/en/hotel-booking-cart-data.txt b/mails/en/hotel-booking-cart-data.txt deleted file mode 100644 index de17a1632..000000000 --- a/mails/en/hotel-booking-cart-data.txt +++ /dev/null @@ -1,23 +0,0 @@ -{if isset($list)} - {foreach from=$list key=data_k item=data_v} - {foreach from=$data_v['date_diff'] key=rm_k item=rm_v} - - - - {$data_v['name']} - - {$data_v['adult']} {l s='Adults'}, {$data_v['children']} {l s='Children'} - - {convertPrice price=$data_v['unit_price']} - - {$rm_v['num_rm']} - - {$rm_v['data_form']|date_format:"%d-%b-%G"} - - {$rm_v['data_to']|date_format:"%d-%b-%G"} - - {$rm_v['amount']} - {/foreach} - {/foreach} -{/if} - diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html index 23f7035d2..08346500a 100755 --- a/mails/en/order_conf.html +++ b/mails/en/order_conf.html @@ -55,7 +55,7 @@ - +
@@ -108,6 +108,7 @@ + @@ -116,18 +117,18 @@ - - - @@ -145,7 +146,7 @@
 
Room Image Room DescriptionHotel Room Capcity Unit Price Rooms QtyTotal
+   {cart_booking_data_html}
+ {extra_demands_details_html}
+   {discounts}
- + @@ -173,7 +174,7 @@
 
- + @@ -201,7 +202,7 @@
 
- + @@ -229,7 +230,7 @@
 
- + @@ -258,7 +259,7 @@
 
- + @@ -287,7 +288,7 @@
 
- + @@ -313,7 +314,6 @@
  - - - - - - -
  @@ -351,7 +351,7 @@ diff --git a/mails/en/order_conf.txt b/mails/en/order_conf.txt index e5ed48ab5..93a944c72 100644 --- a/mails/en/order_conf.txt +++ b/mails/en/order_conf.txt @@ -3,8 +3,9 @@ Hi {firstname} {lastname}, Thank you for selecting our hotel! Order details Order: {order_name} Placed on {date} -Room Image< -Room Description< +Room Image +Room Description +Hotel Room Capcity Unit Price Rooms Qty @@ -12,9 +13,9 @@ Check-in Date Check-out Date Total -{cart_booking_data_html} +{cart_booking_data_text} -{extra_demands_details_html} +{extra_demands_details_text} {discounts} diff --git a/mails/en/order_conf_admin.html b/mails/en/order_conf_admin.html index 83bc1f399..ccdf8ccdd 100755 --- a/mails/en/order_conf_admin.html +++ b/mails/en/order_conf_admin.html @@ -55,7 +55,7 @@ - +
- If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop. + If you have a guest account, you can follow your order via the "Guest Tracking" section on our shop.
@@ -130,6 +130,7 @@ + @@ -138,18 +139,18 @@ - - - @@ -167,7 +168,7 @@
 
Room Image Room DescriptionHotel Room Capcity Unit Price Rooms QtyTotal
+   {cart_booking_data_html}
+ {extra_demands_details_html}
+   {discounts}
+ @@ -195,7 +196,7 @@
 
 + @@ -223,7 +224,7 @@
 
 + @@ -251,7 +252,7 @@
 
 + @@ -279,7 +280,7 @@
 
 + @@ -307,7 +308,7 @@
 
 + diff --git a/mails/en/order_conf_admin.txt b/mails/en/order_conf_admin.txt index 57f2f8e75..29f683846 100644 --- a/mails/en/order_conf_admin.txt +++ b/mails/en/order_conf_admin.txt @@ -12,16 +12,17 @@ Order: {order_name} Placed on {date} Payment: {payment} Room Image Room Description +Hotel Room Capcity Unit Price Rooms Qty Check-in Date Check-out Date - Total -{cart_booking_data_html} -{extra_demands_details_html} +{cart_booking_data_text} + +{extra_demands_details_text} {discounts} diff --git a/pdf/invoice.product-tab.tpl b/pdf/invoice.product-tab.tpl index 667c398c8..62ef53264 100644 --- a/pdf/invoice.product-tab.tpl +++ b/pdf/invoice.product-tab.tpl @@ -29,6 +29,7 @@ {/if} + {* {if isset($layout.before_discount)} @@ -58,6 +59,11 @@ {$data_v['name']}

+
 {l s='Room Image' pdf='true'}{l s='Room Description' pdf='true'}{l s='Hotel' pdf='true'} {l s='Room Capcity' pdf='true'} {l s='Tax Rate(s)' pdf='true'} +

+ {$data_v['hotel_name']} +

+

{$data_v['adult']} {l s='Adults'}, {$data_v['children']} {l s='Children'}