Merge pull request #1020 from vishal-singh-webkul/gli-1613

Fixed: A room type shows multiple times in customer message section in front office order detail if admin adds a room from back office.

Author: rohit053

controllers/front/OrderDetailController.php

@@ -100,6 +100,7 @@ public function initContent()
                     $total_demands_price_ti = 0;
                     $total_convenience_fee_te = 0;
                     $total_convenience_fee_ti = 0;
+                    $roomTypes = array();
                     if (!empty($products)) {
                         foreach ($products as $type_key => $type_value) {
                             if (in_array($type_value['product_id'], $processedProducts)) {
@@ -374,7 +375,7 @@ public function initContent()
                                 }
                             }
 
-
+                            $roomTypes[$type_value['id_product']] = $type_value;
                         }
 
                         $redirectTermsLink = $this->context->link->getCMSLink(new CMS(3, $this->context->language->id), null, $this->context->language->id);
@@ -437,6 +438,7 @@ public function initContent()
                         'order_history' => $order->getHistory($this->context->language->id, false, true),
                         'overbooking_order_states' => OrderState::getOverBookingStates(),
                         'products' => $products,
+                        'roomTypes' => $roomTypes,
                         'discounts' => $order->getCartRules(),
                         'carrier' => $carrier,
                         'address_invoice' => $addressInvoice,

themes/hotel-reservation-theme/order-detail.tpl

@@ -454,7 +454,7 @@
 
                                 <select name="id_product" class="form-control">
                                     <option value="0">{l s='-- Choose --'}</option>
-                                    {foreach from=$products item=product}
+                                    {foreach from=$roomTypes item=product}
                                         {if $product.is_booking_product}
                                             <option value="{$product.product_id}">{$product.product_name|escape:'html':'UTF-8'}</option>
                                         {/if}