Merge pull request #658 from lakshya-webkul/gli-1235

Replaced: child with children in occupancy text front-office
Qloapps · Apr 5, 2023 · e3d4e5f · e3d4e5f
2 parents bf080f0 + 9770cd6
commit e3d4e5f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
@@ -714,7 +714,7 @@ $(document).ready(function() {
                         occupancy_block += '<input type="number" class="form-control num_occupancy num_adults" name="occupancy['+roomBlockIndex+'][adults]" value="1" min="1">';
                     occupancy_block += '</div>';
                     occupancy_block += '<div class="form-group col-xs-6 occupancy_count_block">';
-                        occupancy_block += '<label>' + child_txt + '<span class="label-desc-txt"></span></label>';
+                        occupancy_block += '<label>' + children_txt + '<span class="label-desc-txt"></span></label>';
                         occupancy_block += '<input type="number" class="form-control num_occupancy num_children" name="occupancy['+roomBlockIndex+'][children]" value="0" min="0" max="'+max_child_in_room+'">(' + below_txt + ' ' + max_child_age + ' ' + years_txt + ')';
                     occupancy_block += '</div>';
                 occupancy_block += '</div>';

diff --git a/modules/wkroomsearchblock/views/css/wk-global-search.css b/modules/wkroomsearchblock/views/css/wk-global-search.css
@@ -172,7 +172,8 @@
 
 .header-rmsearch-wrapper .label-desc-txt {
   font-size: 12px;
-  color: #777777;}
+  color: #777777;
+  margin: 0;}
 .header-rmsearch-wrapper .btn {
   font-weight: 600;}
 .header-rmsearch-wrapper .btn-primary {

diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js
@@ -367,7 +367,7 @@ $(document).ready(function() {
                     occupancy_block += '</div>';
                 occupancy_block += '</div>';
                 occupancy_block += '<div class="form-group occupancy_count_block">';
-                    occupancy_block += '<label>' + child_txt + '<span class="label-desc-txt"> (' + below_txt + ' ' + max_child_age + ' ' + years_txt + ')</span></label>';
+                    occupancy_block += '<label>' + children_txt + '<p class="label-desc-txt"> (' + below_txt + ' ' + max_child_age + ' ' + years_txt + ')</p></label>';
                     occupancy_block += '<div>';
                         occupancy_block += '<input type="hidden" class="num_occupancy num_children room_occupancies" name="occupancy['+roomBlockIndex+'][children]" value="0">';
                         occupancy_block += '<div class="occupancy_count pull-left">';

diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
@@ -93,7 +93,7 @@
                                             </div>
                                         </div>
                                         <div class="form-group occupancy_count_block">
-                                            <label>{l s='Child' mod='wkroomsearchblock'}<span class="label-desc-txt"> ({l s='Below' mod='wkroomsearchblock'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years' mod='wkroomsearchblock'})</span></label>
+                                            <label>{l s='Children' mod='wkroomsearchblock'}<span class="label-desc-txt"> ({l s='Below' mod='wkroomsearchblock'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years' mod='wkroomsearchblock'})</span></label>
                                             <div>
                                                 <input type="hidden" class="num_occupancy num_children room_occupancies" name="occupancy[{$key|escape:'htmlall':'UTF-8'}][children]" value="{$occupancy['children']|escape:'htmlall':'UTF-8'}">
                                                 <div class="occupancy_count pull-left">
@@ -158,7 +158,7 @@
                                         </div>
                                     </div>
                                     <div class="form-group occupancy_count_block">
-                                        <label>{l s='Child' mod='wkroomsearchblock'} <span class="label-desc-txt">({l s='Below' mod='wkroomsearchblock'}  {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years' mod='wkroomsearchblock'})</span></label>
+                                        <label>{l s='Children' mod='wkroomsearchblock'} <p class="label-desc-txt">({l s='Below' mod='wkroomsearchblock'}  {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years' mod='wkroomsearchblock'})</p></label>
                                         <div>
                                             <input type="hidden" class="num_occupancy num_children room_occupancies" name="occupancy[0][children]" value="0">
                                             <div class="occupancy_count pull-left">

diff --git a/themes/hotel-reservation-theme/js/occupancy.js b/themes/hotel-reservation-theme/js/occupancy.js
@@ -228,7 +228,7 @@ $(document).ready(function(){
                     occupancy_block += '</div>';
                     occupancy_block += '<div class="form-group col-sm-7 col-xs-6 occupancy_count_block">';
                         occupancy_block += '<div class="row">';
-                            occupancy_block += '<label class="col-sm-12">' + child_txt + '<span class="label-desc-txt">(' + below_txt + ' ' + max_child_age + ' ' + years_txt + ')</span></label>';
+                            occupancy_block += '<label class="col-sm-12">' + children_txt + '<span class="label-desc-txt">(' + below_txt + ' ' + max_child_age + ' ' + years_txt + ')</span></label>';
                             occupancy_block += '<div class="col-sm-12">';
                                 occupancy_block += '<input type="hidden" class="num_occupancy num_children room_occupancies" name="occupancy['+roomBlockIndex+'][children]" value="0">';
                                 occupancy_block += '<div class="occupancy_count pull-left">';