Merge pull request #1242 from vishal-singh-webkul/gli-2352

Fixed: The default date ranges in the booking form are not correct in case los and minimum booking offset is applied on the room type in the front-office.

Author: rohit053

controllers/front/ProductController.php

@@ -337,27 +337,19 @@ public function initContent()
                     $preparationTime = (int) HotelOrderRestrictDate::getPreparationTime($hotel_id);
                     if (!($date_from = Tools::getValue('date_from'))) {
                         $date_from = date('Y-m-d');
-                        // set date to according to los
-                        $objHotelRoomTypeRestrictionDateRange = new HotelRoomTypeRestrictionDateRange();
-                        $los = $objHotelRoomTypeRestrictionDateRange->getRoomTypeLengthOfStay($this->product->id, $date_from);
-                        $date_to = date('Y-m-d', strtotime('+'.$los['min_los'].' day', strtotime($date_from)));
-                    }
-                    if (!($date_to = Tools::getValue('date_to'))) {
-                        // set date to according to los
-                        $objHotelRoomTypeRestrictionDateRange = new HotelRoomTypeRestrictionDateRange();
-                        $los = $objHotelRoomTypeRestrictionDateRange->getRoomTypeLengthOfStay($this->product->id, $date_from);
-                        $date_to = date('Y-m-d', strtotime('+'.$los['min_los'].' day', strtotime($date_from)));
                     }
 
                     if ($preparationTime
                         && strtotime(date('Y-m-d', strtotime('+'. ($preparationTime) .' days'))) > strtotime($date_from)
                     ) {
                         $date_from = date('Y-m-d', strtotime('+ '.$preparationTime.' day'));
-                        if (strtotime($date_from) >= strtotime($date_to)) {
-                            $objHotelRoomTypeRestrictionDateRange = new HotelRoomTypeRestrictionDateRange();
-                            $los = $objHotelRoomTypeRestrictionDateRange->getRoomTypeLengthOfStay($this->product->id, $date_from);
-                            $date_to = date('Y-m-d', strtotime('+'.$los['min_los'].' day', strtotime($date_from)));
-                        }
+                    }
+
+                    if (!($date_to = Tools::getValue('date_to'))) {
+                        // set date to according to los
+                        $objHotelRoomTypeRestrictionDateRange = new HotelRoomTypeRestrictionDateRange();
+                        $los = $objHotelRoomTypeRestrictionDateRange->getRoomTypeLengthOfStay($this->product->id, $date_from);
+                        $date_to = date('Y-m-d', strtotime('+'.$los['min_los'].' day', strtotime($date_from)));
                     }
 
                     $hotel_branch_obj = new HotelBranchInformation($hotel_id);