Merge pull request #1291 from vishal-singh-webkul/gli-2427

Updated: Validation for 'Consider guest as child below age' in the back-office and removed child ages from occupancy fields in case 'Maximum children' for a room type is 0  from front-office.

Author: rohit053

modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php

@@ -349,6 +349,11 @@ public function postProcess()
             // max age of infant after which guest will considered as child // below 18
             $globalChildMaxAge = Tools::getValue('WK_GLOBAL_CHILD_MAX_AGE');
             $globalMaxChildInRoom = Tools::getValue('WK_GLOBAL_MAX_CHILD_IN_ROOM');
+            if (!Validate::isUnsignedInt($globalChildMaxAge)) {
+                $this->errors[] = $this->l('Invalid value for "Consider guest as child below age".');
+            } else if ($globalChildMaxAge <= 0) {
+                $this->errors[] = $this->l('The value for "Consider guest as child below age" must be at least 1.');
+            }
 
             // End occupancy fields validation
 

themes/hotel-reservation-theme/_partials/occupancy_field.tpl

@@ -64,7 +64,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="form-group col-sm-7 col-xs-6 occupancy_count_block">
+                                <div class="form-group col-sm-7 col-xs-6 occupancy_count_block {if !$room_type_info['max_children']} hide {/if}">
                                     <div class="row">
                                         <label class="col-sm-12">{l s='Children'}</label>
                                         <div class="col-sm-12 clearfix">
@@ -139,7 +139,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="form-group col-sm-7 col-xs-6 occupancy_count_block">
+                            <div class="form-group col-sm-7 col-xs-6 occupancy_count_block {if !$room_type_info['max_children']} hide {/if}">
                                 <div class="row">
                                     <label class="col-sm-12">{l s='Children'}</label>
                                     <div class="col-sm-12 clearfix">

themes/hotel-reservation-theme/js/occupancy.js

@@ -241,6 +241,7 @@ $(document).ready(function(){
         var roomBlockIndex = parseInt($(booking_occupancy_wrapper).find(".occupancy_info_block").last().attr('occ_block_index'));
         roomBlockIndex += 1;
 
+        var max_children = parseInt($(booking_occupancy_wrapper).find('.max_children').val());
 
         var countRooms = parseInt($(booking_occupancy_wrapper).find('.occupancy_info_block').length);
         countRooms += 1
@@ -269,7 +270,7 @@ $(document).ready(function(){
                             occupancy_block += '</div>';
                         occupancy_block += '</div>';
                     occupancy_block += '</div>';
-                    occupancy_block += '<div class="form-group col-sm-7 col-xs-6 occupancy_count_block">';
+                    occupancy_block += '<div class="form-group col-sm-7 col-xs-6 occupancy_count_block ' + (!max_children ? 'hide' : '') +' ">';
                         occupancy_block += '<div class="row">';
                             occupancy_block += '<label class="col-sm-12">' + children_txt + '</label>';
                             occupancy_block += '<div class="col-sm-12 clearfix">';