Merge pull request Qloapps#218 from shreesh-webkul/gli-515

Added : hotel name column in order confirmation mail and invoice.
bibekdari · Feb 10, 2021 · 82b30db · 82b30db
2 parents ecb5009 + 14e594a
commit 82b30db
Show file tree

Hide file tree

Showing 12 changed files with 113 additions and 93 deletions.
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
@@ -734,14 +734,17 @@ public function validateOrder($id_cart, $id_order_state, $amount_paid, $payment_
 
                         // 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 @@ public function cartBookingDataForMail($order)
                     $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
@@ -354,6 +354,7 @@ public function getContent()
                     $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
diff --git a/mails/en/booking_extra_demands_text.tpl 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
@@ -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}
+<img src="{$data_v['cover_img']}" class="img-responsive" />
+
+{$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
@@ -28,6 +28,19 @@
 						</tr>
 					</table>
 				</td>
+				<td style="border:1px solid #D6D4D4;">
+					<table class="table">
+						<tr>
+							<td width="10">&nbsp;</td>
+							<td  class="text-center">
+								<font size="2" face="Open-sans, sans-serif" color="#555454">
+									{$data_v['hotel_name']}
+								</font>
+							</td>
+							<td width="10">&nbsp;</td>
+						</tr>
+					</table>
+				</td>
 				<td style="border:1px solid #D6D4D4;">
 					<table class="table">
 						<tr>

diff --git a/mails/en/hotel-booking-cart-data.txt b/mails/en/hotel-booking-cart-data.txt
diff --git a/mails/en/order_conf.html b/mails/en/order_conf.html
@@ -55,7 +55,7 @@
 </style>
 
 	</head>
-	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:650px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
+	<body style="-webkit-text-size-adjust:none;background-color:#fff;width:800px;font-family:Open-sans, sans-serif;color:#555454;font-size:13px;line-height:18px;margin:auto">
 		<table class="table table-mail" style="width:100%;margin-top:10px;-moz-box-shadow:0 0 5px #afafaf;-webkit-box-shadow:0 0 5px #afafaf;-o-box-shadow:0 0 5px #afafaf;box-shadow:0 0 5px #afafaf;filter:progid:DXImageTransform.Microsoft.Shadow(color=#afafaf,Direction=134,Strength=5)">
 			<tr>
 				<td class="space" style="width:20px;padding:7px 0">&nbsp;</td>
@@ -108,6 +108,7 @@
 					<tr>
 						<th bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;background-color: #fbfbfb;color: #333;font-family: Arial;font-size: 13px;padding: 10px;">Room Image</th>
 						<th bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;background-color: #fbfbfb;color: #333;font-family: Arial;font-size: 13px;padding: 10px;">Room Description</th>
+						<th bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;background-color: #fbfbfb;color: #333;font-family: Arial;font-size: 13px;padding: 10px;">Hotel</th>
 						<th bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;background-color: #fbfbfb;color: #333;font-family: Arial;font-size: 13px;padding: 10px;" width="17%">Room Capcity</th>
 						<th bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;background-color: #fbfbfb;color: #333;font-family: Arial;font-size: 13px;padding: 10px;">Unit Price</th>
 						<th bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;background-color: #fbfbfb;color: #333;font-family: Arial;font-size: 13px;padding: 10px;" width="17%">Rooms Qty</th>
@@ -116,18 +117,18 @@
 						<th bgcolor="#f8f8f8" style="border:1px solid #D6D4D4;background-color: #fbfbfb;color: #333;font-family: Arial;font-size: 13px;padding: 10px;" width="17%">Total</th>
 					</tr>
 				<tr>
-					<td colspan="5" style="border:1px solid #D6D4D4;text-align:center;color:#777;padding:7px 0">
+					<td colspan="9" style="border:1px solid #D6D4D4;text-align:center;color:#777;padding:7px 0">
 						&nbsp;&nbsp;{cart_booking_data_html}
 					</td>
 				</tr>
 
 				<tr>
-					<td colspan="8" style="border:1px solid #D6D4D4;text-align:center;color:#777;padding:7px 0">
+					<td colspan="9" style="border:1px solid #D6D4D4;text-align:center;color:#777;padding:7px 0">
 						{extra_demands_details_html}
 					</td>
 				</tr>
 				<tr>
-					<td colspan="8" style="border:1px solid #D6D4D4;text-align:center;color:#777;padding:7px 0">
+					<td colspan="9" style="border:1px solid #D6D4D4;text-align:center;color:#777;padding:7px 0">
 						&nbsp;&nbsp;{discounts}
 					</td>
 				</tr>
@@ -145,7 +146,7 @@
 							</tr>
 						</table>
 					</td>
-					<td bgcolor="#f8f8f8" align="right" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" align="right" colspan="5" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -173,7 +174,7 @@
 							</tr>
 						</table>
 					</td>
-					<td bgcolor="#f8f8f8" align="right" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" align="right" colspan="5" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -201,7 +202,7 @@
 							</tr>
 						</table>
 					</td>
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" colspan="5" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -229,7 +230,7 @@
 							</tr>
 						</table>
 					</td>
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" colspan="5" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -258,7 +259,7 @@
 							</tr>
 						</table>
 					</td>
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" colspan="5" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -287,7 +288,7 @@
 							</tr>
 						</table>
 					</td>
-					<td bgcolor="#f8f8f8" colspan="4" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
+					<td bgcolor="#f8f8f8" colspan="5" style="border:1px solid #D6D4D4;color:#333;padding:7px 0">
 						<table class="table" style="width:100%;border-collapse:collapse">
 							<tr>
 								<td width="10" style="color:#333;padding:0">&nbsp;</td>
@@ -313,7 +314,6 @@
 	<td style="padding:7px 0">
 		<table class="table" style="width:100%">
 			<tr>
-				<td width="20" class="space_address" style="padding:7px 0">&nbsp;</td>
 				<td class="box address" width="310" style="border:1px solid #D6D4D4;background-color:#f8f8f8;padding:7px 0">
 					<table class="table" style="width:100%">
 						<tr>
@@ -351,7 +351,7 @@
 	<td class="linkbelow" style="padding:7px 0">
 		<font size="2" face="Open-sans, sans-serif" color="#555454">
 			<span>
-				If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}?id_order={order_name}" style="color:#337ff1">"Guest Tracking"</a> section on our shop.			</span>
+				If you have a guest account, you can follow your order via the <a href="{guest_tracking_url}?id_order={order_name}" style="color:#337ff1">"Guest Tracking"</a> section on our shop.</span>
 		</font>
 	</td>
 </tr>

diff --git a/mails/en/order_conf.txt b/mails/en/order_conf.txt
@@ -3,18 +3,19 @@ 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
 Check-in Date
 Check-out Date
 Total
 
-{cart_booking_data_html}
+{cart_booking_data_text}
 
-{extra_demands_details_html}
+{extra_demands_details_text}
 
 {discounts}