Merge branch 'develop' into gli-2226

Qloapps · Sep 11, 2024 · 155a9af · 155a9af
2 parents 01a8c1d + 70426c1
commit 155a9af
Show file tree

Hide file tree

Showing 30 changed files with 1,087 additions and 1,258 deletions.
diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl
@@ -124,7 +124,7 @@
                     </button>
                     <ul class="dropdown-menu" role="menu">
                         <li>
-                            <a href="#" class="room_reallocate_swap" id="reallocate_room_{$data['id']}" data-room_type_name="{$data['room_type_name']}" data-toggle="modal" data-target="#mySwappigModal" data-id_htl_booking="{$data['id']}" data-id_order="{$data['id_order']}" data-room_num='{$data.room_num}' data-id_room_type='{$data.id_product}' data-cust_name='{$data.alloted_cust_name}' data-cust_email='{$data.alloted_cust_email}' data-avail_rm_swap='{$data.avail_rooms_to_swap|@json_encode}' data-avail_realloc_room_types='{$data.avail_room_types_to_realloc|@json_encode}' data-allotment_type='{$data['booking_type']}' data-allotment_type_label='{if $data['booking_type'] == $ALLOTMENT_MANUAL}{l s='Manual'}{else}{l s='Auto'}{/if}' data-comment='{$data.comment}'>
+                            <a href="#" class="room_reallocate_swap" id="reallocate_room_{$data['id']}" data-room_type_name="{$data['room_type_name']}" data-toggle="modal" data-target="#mySwappigModal" data-id_htl_booking="{$data['id']}" data-id_order="{$data['id_order']}" data-room_num='{$data.room_num}' data-id_room_type='{$data.id_product}' data-cust_name='{$data.alloted_cust_name}' data-cust_email='{$data.alloted_cust_email}' data-avail_rm_swap='{$data.avail_rooms_to_swap|@json_encode}' data-avail_realloc_room_types='{$data.avail_room_types_to_realloc|@json_encode}' data-allotment_type='{$data.booking_type}' data-allotment_type_label='{if $data.booking_type == $ALLOTMENT_MANUAL}{l s='Manual'}{else}{l s='Auto'}{/if}' data-comment='{$data.comment}'>
                                 <i class="icon-refresh"></i>
                                 {l s='Reallocate/Swap Room'}
                             </a>

diff --git a/...mes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl b/...mes/default/template/controllers/orders/modals/_extra_services_facilities_tab_content.tpl
@@ -45,7 +45,7 @@
 									<td>
 										<div class="input-group">
 											<span class="input-group-addon">{$currencySign}</span>
-											<input type="text" class="form-control unit_price" value="{Tools::ps_round($demand['unit_price_tax_excl'], 2)}">
+											<input type="text" class="form-control unit_price" value="{$demand['unit_price_tax_excl']}">
 											{if $demand['price_calc_method'] == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY}
 												<span class="input-group-addon">{l s='/ night'}</span>
 											{/if}
@@ -115,7 +115,7 @@
 											{else}
 												{assign  var=demand_price value=$demand['price_tax_excl']}
 											{/if}
-											<input type="text" class="form-control unit_price" value="{Tools::ps_round($demand_price, 2)}" data-id-product="{$product['id_product']}">
+											<input type="text" class="form-control unit_price" value="{$demand_price}" data-id-product="{$product['id_product']}">
 											{if $demand['price_calc_method'] == HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY}
 												<span class="input-group-addon">{l s='/ night'}</span>
 											{/if}

diff --git a/admin/themes/default/template/controllers/products/additionalfacilities.tpl b/admin/themes/default/template/controllers/products/additionalfacilities.tpl
@@ -78,7 +78,7 @@
                                         <td class="demand_price_{$demand['id_global_demand']}">
                                             <div class="input-group price_input" {if !isset($selectedDemands[$demand['id_global_demand']])}style="display:none"{/if}>
                                                 <span class="input-group-addon">{$defaultcurrencySign|escape:'html':'UTF-8'}</span>
-                                                <input type="text" name="option_price_{$option['id']|escape:'html':'UTF-8'}" value="{if isset($selectedDemands[$demand['id_global_demand']]['adv_option'][$option['id']]['price'])}{Tools::ps_round($selectedDemands[$demand['id_global_demand']]['adv_option'][$option['id']]['price'], 2)|escape:'html':'UTF-8'}{else}{Tools::ps_round($option['price'], 2)|escape:'html':'UTF-8'}{/if}"/>
+                                                <input type="text" name="option_price_{$option['id']|escape:'html':'UTF-8'}" value="{if isset($selectedDemands[$demand['id_global_demand']]['adv_option'][$option['id']]['price'])}{$selectedDemands[$demand['id_global_demand']]['adv_option'][$option['id']]['price']|escape:'html':'UTF-8'}{else}{$option['price']|escape:'html':'UTF-8'}{/if}"/>
                                             </div>
                                             <div class="price_display" {if isset($selectedDemands[$demand['id_global_demand']])}style="display:none"{/if}>
                                                 {displayPrice price={$option['price']|escape:'html':'UTF-8'}  currency=$idDefaultcurrency}
@@ -112,7 +112,7 @@
                                             <div class="input-group price_input" {if !isset($selectedDemands[$demand['id_global_demand']])}style="display:none"{/if}>
                                                 <span class="input-group-addon">{$defaultcurrencySign|escape:'html':'UTF-8'}</span>
                                                 <input type="text" name="demand_price_{$demand['id_global_demand']|escape:'html':'UTF-8'}"
-                                                value="{if isset($selectedDemands[$demand['id_global_demand']]['price'])}{Tools::ps_round($selectedDemands[$demand['id_global_demand']]['price'], 2)|escape:'html':'UTF-8'}{elseif isset($demand['price'])}{Tools::ps_round($demand['price'], 2)|escape:'html':'UTF-8'}{/if}"/>
+                                                value="{if isset($selectedDemands[$demand['id_global_demand']]['price'])}{$selectedDemands[$demand['id_global_demand']]['price']|escape:'html':'UTF-8'}{elseif isset($demand['price'])}{$demand['price']|escape:'html':'UTF-8'}{/if}"/>
                                             </div>
                                             <div class="price_display" {if isset($selectedDemands[$demand['id_global_demand']])}style="display:none"{/if}>
                                                 {displayPrice price={$demand['price']|escape:'html':'UTF-8'} currency=$idDefaultcurrency}