Fixed: Unable to update check-in/check-out time without changing the room status

Author: shazar-webkul

admin/themes/default/template/controllers/orders/helpers/view/view.tpl

@@ -148,7 +148,7 @@
                                                             {if isset($refundReqBookings) && $refundReqBookings && $data.id|in_array:$refundReqBookings && $data.is_refunded}
                                                                 <span class="badge badge-danger">{if $data.is_cancelled}{l s='Cancelled'}{else}{l s='Refunded'}{/if}</span>
                                                             {elseif $can_edit}
-                                                                <a class="open_room_status_form btn btn-default" href="#" data-id_hotel_booking_detail="{$data['id']}" data-id_order="{$data['id_order']}" data-id_status="{$data['id_status']}" data-id_room="{$data['id_room']}" data-date_from="{$data['date_from']|date_format:"%Y-%m-%d"}" data-date_to="{$data['date_to']|date_format:"%Y-%m-%d"}" data-check_in_time="{$data['check_in_time']}" data-check_out_time="{$data['check_out_time']}">
+                                                                <a class="open_room_status_form btn btn-default" href="#" data-id_hotel_booking_detail="{$data['id']}" data-id_order="{$data['id_order']}" data-id_status="{$data['id_status']}" data-id_room="{$data['id_room']}" data-date_from="{$data['date_from']|date_format:"%Y-%m-%d"}" data-date_to="{$data['date_to']|date_format:"%Y-%m-%d"}" data-check_in_time="{$data['check_in_time']}" data-check_out_time="{$data['check_out_time']}" data-check_in="{$data['check_in']}" data-check_out="{$data['check_out']}">
                                                                     <i class="icon-pencil"></i> {l s='Edit'}
                                                                 </a>
                                                             {/if}

admin/themes/default/template/controllers/orders/modals/_room_status_form.tpl

@@ -30,7 +30,7 @@
                 {/foreach}
             </select>
         </div>
-        <div class="form-group" style="display:none;">
+        <div class="form-group" {if $current_room_status == $ROOM_STATUS_ALLOTED}style="display:none;"{/if}>
             <label class="control-label">{l s='Date'}</label>
             <div class="input-group">
                 <input type="text" name="status_date" class="room_status_date wk-input-date" value="" />

controllers/admin/AdminOrdersController.php

@@ -786,6 +786,8 @@ public function ajaxProcessInitRoomStatusModal()
                     'order' => $objOrder,
                     'current_index' => self::$currentIndex,
                     'hotel_order_status' => $htlOrderStatus,
+                    'ROOM_STATUS_ALLOTED' => HotelBookingDetail::STATUS_ALLOTED,
+                    'current_room_status' => Tools::getValue('current_room_status')
                 )
             );
             $modal = array(

js/admin/orders.js

@@ -2231,13 +2231,14 @@ const RoomStatusModal = {
             url: admin_order_tab_link,
             dataType: 'JSON',
             cache: false,
-            data: 'ajax=true&id_order='+id_order+'&action=InitRoomStatusModal',
+            data: 'ajax=true&id_order='+id_order+'&action=InitRoomStatusModal&current_room_status='+roomObj.data('id_status'),
             beforeSend: function() {
                 $("#page-loader").show();
             },
             success: function(result) {
                 if (result.hasError == 0 && result.modalHtml) {
                     $('#footer').next('.bootstrap').append(result.modalHtml);
+                    var currentStatus = roomObj.data('id_status');
 
                     $('#room-status-modal #room_status_id_hotel_booking_detail').val(roomObj.data('id_hotel_booking_detail'));
                     $('#room-status-modal #room_status_date_from').val(roomObj.data('date_from'));
@@ -2246,14 +2247,24 @@ const RoomStatusModal = {
                     $('#room-status-modal #room_status_id_order').val(roomObj.data('id_order'));
                     $('#room-status-modal .booking_order_status').val(roomObj.data('id_status'));
 
-                    if (roomObj.data('id_status') == result.STATUS_CHECKED_IN) {
-                        $('.room_status_info_form .room_status_date').val(roomObj.data('date_to') + ' ' + roomObj.data('check_out_time'));
-                    } else {
-                        $('.room_status_info_form .room_status_date').val(roomObj.data('date_from') + ' ' + roomObj.data('check_in_time'));
+                    if (currentStatus != result.STATUS_ALLOTED) { 
+                        $('.room_date_field_container').show();
                     }
 
-                    $('#room-status-modal .booking_order_status option:selected').attr('disabled', 'disabled');
-
+                    if (currentStatus == result.STATUS_CHECKED_OUT) {
+                        if (roomObj.data('check_out') && roomObj.data('check_out') !== "0000-00-00 00:00:00") {
+                            $('.room_status_info_form .room_status_date').val(roomObj.data('check_out'));
+                        } else {
+                            $('.room_status_info_form .room_status_date').val(roomObj.data('date_to') + ' ' + roomObj.data('check_out_time'));
+                        }
+                    } else {
+                        if (roomObj.data('check_in') && roomObj.data('check_in') !== "0000-00-00 00:00:00") {
+                            $('.room_status_info_form .room_status_date').val(roomObj.data('check_in'));
+                        } else {
+                            $('.room_status_info_form .room_status_date').val(roomObj.data('date_from') + ' ' + roomObj.data('check_in_time'));
+                        }
+                    }
+                    
                     $('#room-status-modal').modal('show');
                 } else if (result.errors) {
                     showErrorMessage();