diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index 135959c42..fa85718d8 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -758,35 +758,6 @@ -
-
-  {l s='Guest Address'} - {if $can_edit} - {if $idGuestAddress} - - {l s='Edit'} - - {else} - - {l s='Add Address'} - - {/if} - {/if} -
-
- {if $guestFormatedAddress} - {$guestFormatedAddress} - {else} -
-
- - {l s='Guest address not found.'} -
-
- {/if} -
-
- {* Order Internal notes *} {if (sizeof($messages))}
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 8710cc160..e1d0df03b 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -2892,15 +2892,7 @@ class AdminOrdersControllerCore extends AdminController // Overbookings information of the order $orderOverBookings = $objHotelBookingDetail->getOverbookedRooms($order->id, 0, '', '', 0, 0, 1); - // Guest address info - $guestFormatedAddress = ''; - if ($idGuestAddress = Customer::getCustomerIdAddress($order->id_customer)) { - $guestFormatedAddress = AddressFormat::generateAddress(new Address($idGuestAddress), array(), "
"); - } - $this->tpl_view_vars = array( - 'guestFormatedAddress' => $guestFormatedAddress, - 'idGuestAddress' => $idGuestAddress, 'totalRefundedRooms' => $totalRefundedRooms, 'orderOverBookings' => $orderOverBookings, // refund info diff --git a/js/admin/orders.js b/js/admin/orders.js index d85d8c93b..ac60ba167 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -1248,22 +1248,7 @@ function setRoomTypeGuestOccupancy(booking_occupancy_wrapper) /* Refund system script */ var flagRefund = ''; -// when submit from ajax from guest address controller the function will be called from the controller header -function getSummary() -{ - return; -} $(document).ready(function() { - // when click edit/add guest address we have to initialize fancybox - $('.fancybox').fancybox({ - 'type': 'iframe', - 'width': '90%', - 'height': '90%', - afterClose: function() { - location.reload(); - }, - }); - // when change order state to cancel or refund then show modal of bookings cancellation $(document).on('change', '#id_order_state', function(e) { if ($(this).val() == PS_OS_CANCELED || $(this).val() == PS_OS_REFUND) {