From 126fbc87fbdad41ca788a9955b5e323e6219472b Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 12 Jul 2022 12:33:35 +0530 Subject: [PATCH] Fix hotel city access method as introduced in tax flow changes --- classes/PaymentModule.php | 10 +++++----- controllers/admin/AdminDashboardController.php | 3 ++- controllers/admin/AdminProductsController.php | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 1e09d31e7..fd3c557a1 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -752,11 +752,11 @@ abstract class PaymentModuleCore extends Module $objBookingDetail->check_in_time = $objHotelBranch->check_in; $objBookingDetail->check_out_time = $objHotelBranch->check_out; if ($hotelAddress = $objHotelBranch->getAddress($objCartBkData->id_hotel)) { - $objHtlBkDtl->city = $hotelAddress['city']; - $objHtlBkDtl->state = $hotelAddress['state']; - $objHtlBkDtl->country = $hotelAddress['country']; - $objHtlBkDtl->zipcode = $hotelAddress['postcode']; - $objHtlBkDtl->phone = $hotelAddress['phone']; + $objBookingDetail->city = $hotelAddress['city']; + $objBookingDetail->state = $hotelAddress['state']; + $objBookingDetail->country = $hotelAddress['country']; + $objBookingDetail->zipcode = $hotelAddress['postcode']; + $objBookingDetail->phone = $hotelAddress['phone']; } } if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($idProduct)) { diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php index 29d0e555b..a7a01800c 100644 --- a/controllers/admin/AdminDashboardController.php +++ b/controllers/admin/AdminDashboardController.php @@ -271,9 +271,10 @@ class AdminDashboardControllerCore extends AdminController $hotelOptions = array(array('id_hotel' => false, 'hotel_name' => $this->l('All Hotels'))); foreach ($idsHotel as $idHotel) { $objHotelBranchInfo = new HotelBranchInformation($idHotel, $this->context->language->id); + $hotelAddressInfo = $objHotelBranchInfo->getAddress($idHotel); $hotelOptions[] = array( 'id_hotel' => (int) $idHotel, - 'hotel_name' => $objHotelBranchInfo->hotel_name.', '.$objHotelBranchInfo->city, + 'hotel_name' => $objHotelBranchInfo->hotel_name.', '.$hotelAddressInfo['city'], ); } $this->tpl_view_vars = array( diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index ac8b09807..8a558d516 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -5503,11 +5503,12 @@ class AdminProductsControllerCore extends AdminController foreach ($idsHotel as $idHotel) { $objHotelBranchInfo = new HotelBranchInformation($idHotel, $this->context->language->id); if (Validate::isLoadedObject($objHotelBranchInfo)) { + $hotelAddressInfo = $objHotelBranchInfo->getAddress($idHotel); $hotelInfo = array( 'id_hotel' => $objHotelBranchInfo->id, 'hotel_name' => $objHotelBranchInfo->hotel_name, 'rating' => $objHotelBranchInfo->rating, - 'city' => $objHotelBranchInfo->city, + 'city' => $hotelAddressInfo['city'], ); $hotelsInfo[] = $hotelInfo; }