diff --git a/classes/order/Order.php b/classes/order/Order.php index bcf70b259..9d2d9fff2 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -3201,22 +3201,36 @@ class OrderCore extends ObjectModel 'SELECT o.`id_order`, o.`reference`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, c.`email`, a.`phone`, - hbd.`room_type_name`, hbd.`room_num`, - hbd.`date_from`, hbd.`date_to`, hbd.`id_status`, + MIN(hbd.`room_type_name`) AS room_type_name, + MIN(hbd.`room_num`) AS room_num, + MIN(hbd.`date_from`) AS date_from, + MAX(hbd.`date_to`) AS date_to, + MIN(hbd.`id_status`) AS id_status, o.`total_paid_tax_incl` / o.`conversion_rate` AS total_charges, - IFNULL(SUM(op.`amount`), 0) / o.`conversion_rate` AS total_paid, - (o.`total_paid_tax_incl` - IFNULL(SUM(op.`amount`), 0)) / o.`conversion_rate` AS balance_due, - GREATEST(0, DATEDIFF(CURDATE(), hbd.`date_to`)) AS days_overdue, - MAX(op.`date_add`) AS last_payment_date + IFNULL(( + SELECT SUM(op.`amount`) + FROM `'._DB_PREFIX_.'order_payment` op + WHERE op.`order_reference` = o.`reference` + ), 0) / o.`conversion_rate` AS total_paid, + (o.`total_paid_tax_incl` - IFNULL(( + SELECT SUM(op.`amount`) + FROM `'._DB_PREFIX_.'order_payment` op + WHERE op.`order_reference` = o.`reference` + ), 0)) / o.`conversion_rate` AS balance_due, + GREATEST(0, DATEDIFF(CURDATE(), MAX(hbd.`date_to`))) AS days_overdue, + ( + SELECT MAX(op.`date_add`) + FROM `'._DB_PREFIX_.'order_payment` op + WHERE op.`order_reference` = o.`reference` + ) AS last_payment_date FROM `'._DB_PREFIX_.'orders` o INNER JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = o.`id_customer`) INNER JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd ON (hbd.`id_order` = o.`id_order` AND hbd.`is_cancelled` = 0 AND hbd.`is_refunded` = 0) INNER JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = hbd.`id_product` AND p.`active` = 1 AND p.`booking_product` = 1) LEFT JOIN `'._DB_PREFIX_.'address` a ON (a.`id_address` = o.`id_address_invoice`) - LEFT JOIN `'._DB_PREFIX_.'order_payment` op ON (op.`order_reference` = o.`reference`) WHERE o.`valid` = 1 - AND o.`invoice_date` BETWEEN "'.$dateFrom.' 00:00:00" AND "'.$dateTo.' 23:59:59"' + AND hbd.`date_from` BETWEEN "'.$dateFrom.'" AND "'.$dateTo.'"' .($idProduct ? ' AND hbd.`id_product` = '.$idProduct : '') .($idStatus ? ' AND hbd.`id_status` = '.$idStatus : '') .HotelBranchInformation::addHotelRestriction($idHotel, 'hbd').' diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index d3933c954..4cee40fab 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -1370,15 +1370,16 @@ class AdminStatsControllerCore extends AdminStatsTabController ); } - public static function getTotalRooms($idHotel = null, $active = null) + public static function getTotalRooms($idHotel = null, $active = null, $idProduct = null) { $sql = 'SELECT COUNT(hri.`id`) FROM `'._DB_PREFIX_.'htl_room_information` hri INNER JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = hri.`id_product`) WHERE p.`booking_product` = 1 '. - (!is_null($active) ? ' AND p.`active` ='.(int) $active : ' '). - (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hri') : ''); + (!is_null($active) ? ' AND p.`active` = '.(int) $active : ''). + (!is_null($idProduct) ? ' AND hri.`id_product` = '.(int) $idProduct : ''). + (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hri') : ''); return Db::getInstance()->getValue($sql); } diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php index 4e7c924ca..76df9920d 100644 --- a/controllers/admin/AdminStatsTabController.php +++ b/controllers/admin/AdminStatsTabController.php @@ -201,10 +201,17 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor 'stats_tabs' => &$statsTabs )); + $currentModuleName = Tools::getValue('module') ?: array_key_first($statsTabs); + $currentTab = Tools::getValue('tab', ''); + if (!$currentTab && isset($statsTabs[$currentModuleName]['tabs'])) { + $firstTab = reset($statsTabs[$currentModuleName]['tabs']); + $currentTab = $firstTab['key']; + } + $tpl->assign(array( 'current' => self::$currentIndex, - 'current_module_name' => Tools::getValue('module', 'statsforecast'), - 'current_tab' => Tools::getValue('tab', ''), // active sub-tab key + 'current_module_name' => $currentModuleName, + 'current_tab' => $currentTab, 'token' => $this->token, 'module_tabs' => $statsTabs, )); @@ -225,12 +232,30 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor return Db::getInstance()->executeS($sql); } + protected function getDefaultModuleName() + { + $modules = $this->getModules(); + if (empty($modules)) { + return ''; + } + $sorted = []; + foreach ($modules as $mod) { + $instance = Module::getInstanceByName($mod['name']); + $pos = ($instance && property_exists($instance, 'stats_position')) + ? (int) $instance->stats_position + : PHP_INT_MAX; + $sorted[] = ['name' => $mod['name'], 'pos' => $pos]; + } + usort($sorted, fn($a, $b) => $a['pos'] <=> $b['pos']); + return $sorted[0]['name']; + } + public function displayStats() { $tpl = $this->createTemplate('stats.tpl'); - if ((!($module_name = Tools::getValue('module')) || !Validate::isModuleName($module_name)) && ($module_instance = Module::getInstanceByName('statsforecast')) && $module_instance->active) { - $module_name = 'statsforecast'; + if (!($module_name = Tools::getValue('module')) || !Validate::isModuleName($module_name)) { + $module_name = $this->getDefaultModuleName(); } if ($module_name) { diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index a8b60a38e..70376cbf4 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -3953,8 +3953,7 @@ class HotelBookingDetail extends ObjectModel .($idCustomer ? ' AND hbd.`id_customer` = '.$idCustomer : '') .HotelBranchInformation::addHotelRestriction($idHotel, 'hbd'); - $loopEnd = ($dateFrom === $dateTo) ? $dateTo : date('Y-m-d', strtotime('-1 day', strtotime($dateTo))); - while ($current <= $loopEnd) { + while ($current <= $dateTo) { $nextDay = date('Y-m-d', strtotime('+1 day', strtotime($current))); $ts = strtotime($current); $row = Db::getInstance()->getRow( @@ -4302,15 +4301,16 @@ class HotelBookingDetail extends ObjectModel self::ALLOTMENT_AUTO => $moduleInstance->l('Online / Direct', 'hotelreservationsystem'), self::ALLOTMENT_MANUAL => $moduleInstance->l('Walk-in / Admin', 'hotelreservationsystem'), ); - $totalBookings = array_sum(array_column($rows, 'bookings')); + $totalRevExcl = array_sum(array_column($rows, 'revenue_excl')); foreach ($rows as &$row) { $type = (int) $row['booking_type']; $row['channel_label'] = isset($labels[$type]) ? $labels[$type] : $moduleInstance->l('Other', 'hotelreservationsystem'); $row['tax_amount'] = (float) $row['revenue_incl'] - (float) $row['revenue_excl']; + $row['net_revenue'] = (float) $row['revenue_excl'] - (float) $row['discount_amount']; $row['adr'] = (float) $row['room_nights'] > 0 ? (float) $row['revenue_excl'] / (float) $row['room_nights'] : 0.0; - $row['contribution_pct'] = $totalBookings > 0 - ? round((float) $row['bookings'] / $totalBookings * 100, 1) : 0.0; + $row['contribution_pct'] = $totalRevExcl > 0 + ? round((float) $row['revenue_excl'] / $totalRevExcl * 100, 1) : 0.0; $row['cancel_rate_pct'] = (int) $row['bookings'] > 0 ? round((float) $row['cancellations'] / (int) $row['bookings'] * 100, 1) : 0.0; } @@ -4595,8 +4595,12 @@ class HotelBookingDetail extends ObjectModel return $result; } + $countExpr = (isset($params['count_rows']) && $params['count_rows']) + ? 'hbd.`id`' + : 'DISTINCT hbd.`id_order`'; + return (int) Db::getInstance()->getValue( - 'SELECT COUNT(DISTINCT hbd.`id_order`) + 'SELECT COUNT('.$countExpr.') FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`date_add` BETWEEN "'.$dateFrom.' 00:00:00" AND "'.$dateTo.' 23:59:59"' .($idProduct ? ' AND hbd.`id_product` = '.$idProduct : '') @@ -4633,37 +4637,6 @@ class HotelBookingDetail extends ObjectModel ); } - /** - * Total no-shows: rooms expected to arrive (date_from in range) never checked in and past arrival. - * - * @param array $params date_from, date_to, id_hotel, id_product - * @return int - */ - public static function getTotalNoShows(array $params) - { - $dateFrom = pSQL($params['date_from']); - $dateTo = pSQL(isset($params['date_to']) ? $params['date_to'] : $params['date_from']); - $idHotel = isset($params['id_hotel']) ? $params['id_hotel'] : false; - $idProduct = isset($params['id_product']) ? (int) $params['id_product'] : 0; - - return (int) Db::getInstance()->getValue( - 'SELECT COUNT(hbd.`id`) - FROM `'._DB_PREFIX_.'htl_booking_detail` hbd - LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = hbd.`id_product`) - LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`) - WHERE p.`active` = 1 - AND o.`valid` = 1 - AND hbd.`is_cancelled` = 0 - AND hbd.`is_refunded` = 0 - AND hbd.`id_status` = '.(int) self::STATUS_ALLOTED.' - AND hbd.`date_from` < CURDATE() - AND hbd.`date_from` >= "'.$dateFrom.'" - AND hbd.`date_from` <= "'.$dateTo.'"' - .($idProduct ? ' AND hbd.`id_product` = '.$idProduct : '') - .HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') - ); - } - /** * New booking counts per day across a date range. * @@ -4742,7 +4715,7 @@ class HotelBookingDetail extends ObjectModel $dateTo = isset($params['date_to']) ? $params['date_to'] : $params['date_from']; $idHotel = isset($params['id_hotel']) ? $params['id_hotel'] : false; - $numNights = max(1, (int)(new DateTime($dateTo))->diff(new DateTime($dateFrom))->days); + $numNights = max(1, (int)(new DateTime($dateTo))->diff(new DateTime($dateFrom))->days + 1); $totalRooms = (int) AdminStatsController::getTotalRooms($idHotel !== false ? $idHotel : null, 1); if (!$totalRooms) { @@ -4767,7 +4740,7 @@ class HotelBookingDetail extends ObjectModel $dateTo = isset($params['date_to']) ? $params['date_to'] : $params['date_from']; $idHotel = isset($params['id_hotel']) ? $params['id_hotel'] : false; - $numNights = max(1, (int)(new DateTime($dateTo))->diff(new DateTime($dateFrom))->days); + $numNights = max(1, (int)(new DateTime($dateTo))->diff(new DateTime($dateFrom))->days + 1); $totalRooms = (int) AdminStatsController::getTotalRooms($idHotel !== false ? $idHotel : null, 1); if (!$totalRooms || !$numNights) { @@ -4810,21 +4783,24 @@ class HotelBookingDetail extends ObjectModel */ public static function getOccupiedRoomsForDiscreteDates(array $params) { - $dateFrom = $params['date_from']; - $dateTo = isset($params['date_to']) ? $params['date_to'] : $params['date_from']; - $idHotel = isset($params['id_hotel']) ? $params['id_hotel'] : null; - $idStatus = isset($params['id_status']) ? (int) $params['id_status'] : null; + $dateFrom = $params['date_from']; + $dateTo = isset($params['date_to']) ? $params['date_to'] : $params['date_from']; + $idHotel = isset($params['id_hotel']) ? $params['id_hotel'] : null; + $idStatus = isset($params['id_status']) ? (int) $params['id_status'] : null; + $idProduct = isset($params['id_product']) ? (int) $params['id_product'] : 0; - // ponytail: no-status case handled by AdminStatsController to reuse its cache - if ($idStatus === null) { + // Delegate to AdminStatsController only when no additional filters need own SQL + if ($idStatus === null && !$idProduct) { return AdminStatsController::getOccupiedRoomsForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); } - $hotelFilter = HotelBranchInformation::addHotelRestriction($idHotel, 'hbd'); - $result = array(); - $dateTemp = $dateFrom; + $hotelFilter = HotelBranchInformation::addHotelRestriction($idHotel, 'hbd'); + $statusFilter = $idStatus !== null ? ' AND hbd.`id_status` = '.$idStatus : ''; + $productFilter = $idProduct ? ' AND hri.`id_product` = '.$idProduct : ''; + $result = array(); + $dateTemp = $dateFrom; while ($dateTemp <= $dateTo) { - $dateNext = date('Y-m-d', strtotime('+1 day', strtotime($dateTemp))); + $dateNext = date('Y-m-d', strtotime('+1 day', strtotime($dateTemp))); $result[strtotime($dateTemp)] = (int) Db::getInstance()->getValue( 'SELECT COUNT(DISTINCT hbd.`id_room`) FROM `'._DB_PREFIX_.'htl_booking_detail` hbd @@ -4832,9 +4808,10 @@ class HotelBookingDetail extends ObjectModel INNER JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = hri.`id_product`) WHERE p.`active` = 1 AND hbd.`is_cancelled` = 0 - AND hbd.`id_status` = '.$idStatus.' AND hbd.`date_from` < "'.pSQL($dateNext).' 00:00:00" AND hbd.`date_to` > "'.pSQL($dateTemp).' 00:00:00"' + .$statusFilter + .$productFilter .$hotelFilter ); $dateTemp = $dateNext; diff --git a/modules/hotelreservationsystem/classes/HotelRoomInformation.php b/modules/hotelreservationsystem/classes/HotelRoomInformation.php index 4c644c466..8b2e0ab99 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomInformation.php +++ b/modules/hotelreservationsystem/classes/HotelRoomInformation.php @@ -391,12 +391,13 @@ class HotelRoomInformation extends ObjectModel return array(); } + $dateToNext = pSQL(date('Y-m-d', strtotime('+1 day', strtotime($dateTo)))); $bookingsRaw = Db::getInstance()->executeS( 'SELECT hbd.`id_product`, hbd.`id_room`, hbd.`date_from`, hbd.`date_to` FROM `'._DB_PREFIX_.'htl_booking_detail` hbd INNER JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order` AND o.`valid` = 1) WHERE hbd.`is_refunded` = 0 AND hbd.`is_cancelled` = 0 - AND hbd.`date_from` < "'.$dateTo.'" AND hbd.`date_to` > "'.$dateFrom.'"' + AND hbd.`date_from` < "'.$dateToNext.'" AND hbd.`date_to` > "'.$dateFrom.'"' .HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') .($idProduct ? ' AND hbd.`id_product` = '.$idProduct : '') ); @@ -408,7 +409,7 @@ class HotelRoomInformation extends ObjectModel $result = array(); $current = $dateFrom; - while ($current < $dateTo) { + while ($current <= $dateTo) { $next = date('Y-m-d', strtotime('+1 day', strtotime($current))); foreach ($roomTypes as $rt) { $idProd = $rt['id_product']; @@ -451,6 +452,7 @@ class HotelRoomInformation extends ObjectModel { $dateFrom = pSQL($params['date_from']); $dateTo = pSQL(isset($params['date_to']) ? $params['date_to'] : $params['date_from']); + $dateToNext = pSQL(date('Y-m-d', strtotime('+1 day', strtotime($dateTo)))); $idHotel = isset($params['id_hotel']) ? $params['id_hotel'] : false; $idProduct = isset($params['id_product']) ? (int) $params['id_product'] : 0; $idLang = isset($params['id_lang']) ? (int) $params['id_lang'] : 0; @@ -481,7 +483,7 @@ class HotelRoomInformation extends ObjectModel LEFT JOIN ( SELECT `id_room` FROM `'._DB_PREFIX_.'htl_room_disable_dates` - WHERE `date_from` < "'.$dateTo.'" AND `date_to` > "'.$dateFrom.'" + WHERE `date_from` < "'.$dateToNext.'" AND `date_to` > "'.$dateFrom.'" GROUP BY `id_room` ) hrdd ON (hrdd.`id_room` = hri.`id`) LEFT JOIN ( @@ -493,7 +495,7 @@ class HotelRoomInformation extends ObjectModel MIN(hbd.`id_customer`) AS `id_customer` FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`is_refunded` = 0 - AND hbd.`date_from` < "'.$dateTo.'" AND hbd.`date_to` > "'.$dateFrom.'" + AND hbd.`date_from` < "'.$dateToNext.'" AND hbd.`date_to` > "'.$dateFrom.'" GROUP BY hbd.`id_room` ) bkgs ON (bkgs.`id_room` = hri.`id`) LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = bkgs.`id_customer`) diff --git a/modules/hotelreservationsystem/classes/HotelRoomType.php b/modules/hotelreservationsystem/classes/HotelRoomType.php index 506c02948..e649e171a 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomType.php +++ b/modules/hotelreservationsystem/classes/HotelRoomType.php @@ -490,8 +490,7 @@ class HotelRoomType extends ObjectModel IFNULL(SUM(CASE WHEN hbd.`is_cancelled` = 0 THEN DATEDIFF(hbd.`date_to`, hbd.`date_from`) ELSE 0 END), 0) AS room_nights, IFNULL(SUM(CASE WHEN hbd.`is_cancelled` = 0 THEN hbd.`total_price_tax_excl` / o.`conversion_rate` ELSE 0 END), 0) AS room_revenue, IFNULL(SUM(CASE WHEN hbd.`is_cancelled` = 0 THEN (hbd.`total_price_tax_incl` - hbd.`total_price_tax_excl`) / o.`conversion_rate` ELSE 0 END), 0) AS tax_amount, - COUNT(CASE WHEN hbd.`is_cancelled` = 1 THEN hbd.`id` END) AS cancel_count, - COUNT(CASE WHEN hbd.`is_cancelled` = 0 AND hbd.`id_status` = 1 AND hbd.`date_from` < CURDATE() THEN hbd.`id` END) AS no_show_count + COUNT(CASE WHEN hbd.`is_cancelled` = 1 THEN hbd.`id` END) AS cancel_count FROM `'._DB_PREFIX_.'htl_room_type` hrt INNER JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = hrt.`id_product`) INNER JOIN `'._DB_PREFIX_.'product_lang` pl diff --git a/modules/qlohotelreports/qlohotelreports.php b/modules/qlohotelreports/qlohotelreports.php index 296cc5a64..be4a5790d 100644 --- a/modules/qlohotelreports/qlohotelreports.php +++ b/modules/qlohotelreports/qlohotelreports.php @@ -36,24 +36,24 @@ class QloHotelReports extends Module * Labels are plain English; call $this->l($config['label']) at render time. */ private static $reports = array( - 'reservation' => array('label' => 'Reservations', 'tpl' => 'group-bookings.tpl'), + 'reservation' => array('label' => 'Room Reservations', 'tpl' => 'group-bookings.tpl'), 'arrivals' => array('label' => 'Arrivals', 'tpl' => 'group-bookings.tpl'), 'in-house' => array('label' => 'In-House', 'tpl' => 'group-bookings.tpl'), 'departures' => array('label' => 'Departures', 'tpl' => 'group-bookings.tpl'), - 'no-show' => array('label' => 'No-Shows', 'tpl' => 'group-bookings.tpl'), + 'cancellation' => array('label' => 'Cancellations', 'tpl' => 'group-bookings.tpl'), - 'revenue' => array('label' => 'Revenue', 'tpl' => 'group-revenue.tpl'), + 'revenue' => array('label' => 'Daily Revenue', 'tpl' => 'group-revenue.tpl'), 'refund' => array('label' => 'Refunds', 'tpl' => 'group-revenue.tpl'), 'payment' => array('label' => 'Payments', 'tpl' => 'group-revenue.tpl'), 'tax' => array('label' => 'Tax', 'tpl' => 'group-revenue.tpl'), 'outstanding' => array('label' => 'Outstanding', 'tpl' => 'group-revenue.tpl'), - 'occupancy' => array('label' => 'Occupancy', 'tpl' => 'group-occupancy.tpl'), + 'occupancy' => array('label' => 'Day-wise Occupancy', 'tpl' => 'group-occupancy.tpl'), 'availability' => array('label' => 'Availability', 'tpl' => 'group-occupancy.tpl'), 'room-status' => array('label' => 'Room Status', 'tpl' => 'group-occupancy.tpl'), 'room-perf' => array('label' => 'Room Type Performance', 'tpl' => 'group-occupancy.tpl'), 'source' => array('label' => 'Booking Source', 'tpl' => 'group-channels.tpl'), 'payment-method' => array('label' => 'Payment Methods', 'tpl' => 'group-channels.tpl'), - 'services' => array('label' => 'Services', 'tpl' => 'group-guests.tpl'), + 'services' => array('label' => 'Booked Services', 'tpl' => 'group-guests.tpl'), 'guest-directory' => array('label' => 'Guest Directory', 'tpl' => 'group-guests.tpl'), 'daily-summary' => array('label' => 'Daily Summary', 'tpl' => 'group-property.tpl'), 'hotel-comparison' => array('label' => 'Hotel Comparison', 'tpl' => 'group-property.tpl'), @@ -73,6 +73,7 @@ class QloHotelReports extends Module parent::__construct(); $this->displayName = $this->l('Hotel Reports'); + $this->stats_position = 1; $this->description = $this->l('Comprehensive hotel reports: reservations, revenue, occupancy, channels, guests, and more.'); $this->confirmUninstall = $this->l('Are you sure you want to uninstall?'); } @@ -122,7 +123,7 @@ class QloHotelReports extends Module $currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT')); if (Tools::getValue('export')) { - $bookingReports = array('reservation', 'arrivals', 'departures', 'in-house', 'no-show', 'cancellation'); + $bookingReports = array('reservation', 'arrivals', 'departures', 'in-house', 'cancellation'); $revenueReports = array('revenue', 'refund', 'payment', 'tax', 'outstanding'); $occupancyReports = array('occupancy', 'availability', 'room-status', 'room-perf'); @@ -156,7 +157,7 @@ class QloHotelReports extends Module . self::$reports[$report]['tpl'], )); - if (in_array($report, array('reservation', 'arrivals', 'in-house', 'departures', 'no-show', 'cancellation'))) { + if (in_array($report, array('reservation', 'arrivals', 'in-house', 'departures', 'cancellation'))) { $idProduct = (int) Tools::getValue('id_product', 0); $idStatus = (int) Tools::getValue('booking_status', 0); $bookingType = (int) Tools::getValue('booking_type', 0); @@ -253,29 +254,6 @@ class QloHotelReports extends Module 'cancellations' => $cancellations, 'total_refunded' => $totalRefunded, )); - } elseif ($report === 'no-show') { - // TODO: No-show logic will be replaced by a dedicated PR. Kept below for reference. - // $noShows = HotelBookingDetail::getArrivalsInfo(array( - // 'date_from' => $dateFrom, - // 'date_to' => $dateTo, - // 'id_hotel' => $idHotel ?: false, - // 'id_product' => $idProduct, - // 'id_status' => HotelBookingDetail::STATUS_ALLOTED, - // )); - // $this->attachCurrencyToRows($noShows, $currencyMap, $currency->iso_code); - // $noShowTotals = array('los' => 0, 'adults' => 0, 'children' => 0, 'total_price_tax_incl' => 0.0); - // foreach ($noShows as $row) { - // $rate = (float) $row['conversion_rate']; - // if ($rate <= 0) { $rate = 1.0; } - // $noShowTotals['los'] += (int) $row['los']; - // $noShowTotals['adults'] += (int) $row['adults']; - // $noShowTotals['children'] += (int) $row['children']; - // $noShowTotals['total_price_tax_incl'] += (float) $row['total_price_tax_incl'] / $rate; - // } - $this->context->smarty->assign(array( - 'no_shows' => array(), - 'no_show_totals' => array('los' => 0, 'adults' => 0, 'children' => 0, 'total_price_tax_incl' => 0.0), - )); } elseif ($report === 'arrivals') { $arrivals = HotelBookingDetail::getArrivalsInfo(array( 'date_from' => $dateFrom, @@ -609,38 +587,51 @@ class QloHotelReports extends Module )); if ($report === 'occupancy') { - $occupancyData = AdminStatsController::getOccupancyData($dateFrom, $dateTo, $idHotel ?: false); - $dailyOccupied = HotelBookingDetail::getOccupiedRoomsForDiscreteDates($baseParams); - $dailyBooked = HotelBookingDetail::getOccupiedRoomsForDiscreteDates( + $dailyOccupied = HotelBookingDetail::getOccupiedRoomsForDiscreteDates($baseParams); + $dailyBooked = HotelBookingDetail::getOccupiedRoomsForDiscreteDates( array_merge($baseParams, array('id_status' => HotelBookingDetail::STATUS_ALLOTED)) ); - $dailyCheckedIn = HotelBookingDetail::getOccupiedRoomsForDiscreteDates( + $dailyCheckedIn = HotelBookingDetail::getOccupiedRoomsForDiscreteDates( array_merge($baseParams, array('id_status' => HotelBookingDetail::STATUS_CHECKED_IN)) ); - $dailyAvailable = AdminStatsController::getAvailableRoomsForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); - $dailyRevenue = AdminStatsController::getRoomsRevenueForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); - $dailyAdr = AdminStatsController::getAverageDailyRateForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); - $numNights = max(1, (int)(new DateTime($dateTo))->diff(new DateTime($dateFrom))->days); - $totalRooms = $numNights ? (int) round($occupancyData['count_total'] / $numNights) : 0; + + if ($idProduct) { + $totalRooms = (int) AdminStatsController::getTotalRooms($idHotel ?: null, 1, $idProduct); + $dailyRevenue = HotelBookingDetail::getDatewiseRoomRevenue($baseParams); + $dailyAvailable = array(); + $dailyAdr = array(); + foreach ($dailyOccupied as $ts => $occ) { + $dailyAvailable[$ts] = max(0, $totalRooms - $occ); + $rev = isset($dailyRevenue[$ts]) ? (float) $dailyRevenue[$ts] : 0.0; + $dailyAdr[$ts] = $occ ? round($rev / $occ, 2) : 0.0; + } + } else { + $occupancyData = AdminStatsController::getOccupancyData($dateFrom, $dateTo, $idHotel ?: false); + $numNights = max(1, (int)(new DateTime($dateTo))->diff(new DateTime($dateFrom))->days); + $totalRooms = $numNights ? (int) round($occupancyData['count_total'] / $numNights) : 0; + $dailyAvailable = AdminStatsController::getAvailableRoomsForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); + $dailyRevenue = AdminStatsController::getRoomsRevenueForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); + $dailyAdr = AdminStatsController::getAverageDailyRateForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); + } $dailyRows = array(); - foreach ($dailyOccupied as $timestamp=> $occupied) { - $available = isset($dailyAvailable[$timestamp]) ? (int) $dailyAvailable[$timestamp] : 0; - $unavailable = max(0, $totalRooms - $occupied - $available); - $revenue = isset($dailyRevenue[$timestamp]) ? (float) $dailyRevenue[$timestamp] : 0.0; - $adr = isset($dailyAdr[$timestamp]) ? round((float) $dailyAdr[$timestamp], 2) : 0.0; - $revpar = $totalRooms ? round($revenue / $totalRooms, 2) : 0.0; + foreach ($dailyOccupied as $timestamp => $occupied) { + $available = isset($dailyAvailable[$timestamp]) ? (int) $dailyAvailable[$timestamp] : 0; + $unavailable = max(0, $totalRooms - $occupied - $available); + $revenue = isset($dailyRevenue[$timestamp]) ? (float) $dailyRevenue[$timestamp] : 0.0; + $adr = isset($dailyAdr[$timestamp]) ? round((float) $dailyAdr[$timestamp], 2) : 0.0; + $revpar = $totalRooms ? round($revenue / $totalRooms, 2) : 0.0; $dailyRows[] = array( - 'date' => date('Y-m-d', $timestamp), - 'total' => $totalRooms, - 'available' => $available, - 'rooms_booked' => isset($dailyBooked[$timestamp]) ? (int) $dailyBooked[$timestamp] : 0, - 'rooms_occupied' => isset($dailyCheckedIn[$timestamp]) ? (int) $dailyCheckedIn[$timestamp] : 0, - 'out_of_order' => $unavailable, - 'occupancy_pct' => $totalRooms ? round($occupied / $totalRooms * 100, 1) : 0.0, - 'adr' => $adr, - 'revpar' => $revpar, - 'total_room_revenue'=> round($revenue, 2), + 'date' => date('Y-m-d', $timestamp), + 'total' => $totalRooms, + 'available' => $available, + 'rooms_booked' => isset($dailyBooked[$timestamp]) ? (int) $dailyBooked[$timestamp] : 0, + 'rooms_occupied' => isset($dailyCheckedIn[$timestamp]) ? (int) $dailyCheckedIn[$timestamp] : 0, + 'out_of_order' => $unavailable, + 'occupancy_pct' => $totalRooms ? round($occupied / $totalRooms * 100, 1) : 0.0, + 'adr' => $adr, + 'revpar' => $revpar, + 'total_room_revenue' => round($revenue, 2), ); } @@ -813,7 +804,7 @@ class QloHotelReports extends Module 'bookings' => 0, 'room_nights' => 0, 'revenue_excl' => 0.0, 'revenue_incl' => 0.0, 'discount_amount' => 0.0, 'refund_amount' => 0.0, - 'tax_amount' => 0.0, 'cancellations' => 0, + 'tax_amount' => 0.0, 'net_revenue' => 0.0, 'cancellations' => 0, ); foreach ($sourceRows as $row) { $sourceTotals['bookings'] += (int) $row['bookings']; @@ -823,6 +814,7 @@ class QloHotelReports extends Module $sourceTotals['discount_amount'] += (float) $row['discount_amount']; $sourceTotals['refund_amount'] += (float) $row['refund_amount']; $sourceTotals['tax_amount'] += (float) $row['tax_amount']; + $sourceTotals['net_revenue'] += (float) $row['net_revenue']; $sourceTotals['cancellations'] += (int) $row['cancellations']; } $this->context->smarty->assign(array( @@ -924,7 +916,7 @@ class QloHotelReports extends Module foreach ($hotels as $hotel) { $hotelId = (int) $hotel['id']; $hotelParams = array_merge($baseParams, array('id_hotel' => $hotelId)); - $bookings = HotelBookingDetail::getTotalBookings($hotelParams); + $bookings = HotelBookingDetail::getTotalBookings(array_merge($hotelParams, array('count_rows' => true))); $cancels = HotelBookingDetail::getTotalCancellations($hotelParams); $roomNights = HotelBookingDetail::getTotalRoomNights($hotelParams); $roomRevenue = HotelBookingDetail::getTotalRoomRevenue($hotelParams); @@ -943,7 +935,6 @@ class QloHotelReports extends Module 'bookings' => $bookings, 'cancellations' => $cancels, 'cancel_rate_pct' => $bookings > 0 ? round($cancels / $bookings * 100, 1) : 0.0, - 'no_shows' => HotelBookingDetail::getTotalNoShows($hotelParams), 'avg_los' => ($bookings > 0 && $roomNights > 0) ? round($roomNights / $bookings, 1) : 0.0, 'outstanding_balance' => $obRows ? array_sum(array_column($obRows, 'balance_due')) : 0.0, ); @@ -1000,37 +991,6 @@ class QloHotelReports extends Module $defaultCurrency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT')); $csvCurrencyMap = $this->currencySignMap(); - if ($report === 'no-show') { - // TODO: No-show logic will be replaced by a dedicated PR. Kept below for reference. - // $rows = HotelBookingDetail::getArrivalsInfo(array( - // 'date_from' => $dateFrom, - // 'date_to' => $dateTo, - // 'id_hotel' => $idHotel ?: false, - // 'id_product' => $idProduct, - // 'id_status' => HotelBookingDetail::STATUS_ALLOTED, - // )); - // $this->attachCurrencyToRows($rows, $csvCurrencyMap, $defaultCurrency->iso_code); - // foreach ($rows as $row) { - // fputcsv($out, array( - // $row['id_order'], $row['customer_name'], - // $row['room_type_name'], $row['room_num'], $row['actual_checkin'], - // number_format((float) $row['total_price_tax_incl'], _PS_PRICE_DISPLAY_PRECISION_, '.', ''), - // '', - // $row['currency_iso'], - // )); - // } - header('Content-Disposition: attachment; filename="no-show-report-'.$dateFrom.'-to-'.$dateTo.'.csv"'); - $out = fopen('php://output', 'w'); - fputs($out, "\xEF\xBB\xBF"); - fputcsv($out, array( - $this->l('Booking ID'), $this->l('Guest Name'), $this->l('Room Type'), - $this->l('Room No.'), $this->l('Check-in Date'), - $this->l('Total Amount'), $this->l('Penalty Charged'), $this->l('Currency'), - )); - fclose($out); - exit; - } - if ($report === 'arrivals' || $report === 'departures') { if ($report === 'arrivals') { $rows = HotelBookingDetail::getArrivalsInfo(array( @@ -1057,21 +1017,15 @@ class QloHotelReports extends Module $this->l('Booking ID'), $this->l('Guest Name'), $this->l('Hotel'), $this->l('Room Type'), $this->l('Room No.'), $this->l('Check-in'), $this->l('Check-out'), $this->l('Nights'), $this->l('Adults'), - $this->l('Children'), $this->l('Total (incl. Tax)'), $this->l('Status'), + $this->l('Children'), $this->l('Total (incl. Tax)'), $this->l('Currency'), )); - $statusLabels = array( - HotelBookingDetail::STATUS_ALLOTED => $this->l('Allotted'), - HotelBookingDetail::STATUS_CHECKED_IN => $this->l('Checked In'), - HotelBookingDetail::STATUS_CHECKED_OUT => $this->l('Checked Out'), - ); foreach ($rows as $row) { fputcsv($out, array( $row['id_order'], $row['customer_name'], $row['hotel_name'], $row['room_type_name'], $row['room_num'], $row['actual_checkin'], $row['actual_checkout'], $row['los'], $row['adults'], $row['children'], $row['total_price_tax_incl'], - isset($statusLabels[$row['id_status']]) ? $statusLabels[$row['id_status']] : $row['id_status'], $row['currency_iso'], )); } @@ -1128,7 +1082,6 @@ class QloHotelReports extends Module $this->l('Check-in Date'), $this->l('Cancellation Date'), $this->l('Cancellation Reason'), - $this->l('Cancellation Remark'), $this->l('Refund Amount'), $this->l('Refund Status'), $this->l('Booking Date'), @@ -1143,7 +1096,6 @@ class QloHotelReports extends Module $row['hotel_check_in'], isset($row['cancellation_date']) ? $row['cancellation_date'] : '', isset($row['cancellation_reason']) ? $row['cancellation_reason'] : '', - '', isset($row['refunded_amount']) ? number_format((float) $row['refunded_amount'], _PS_PRICE_DISPLAY_PRECISION_, '.', '') : '0.00', isset($row['refund_status']) ? $row['refund_status'] : '', isset($row['booking_date']) ? $row['booking_date'] : '', @@ -1265,25 +1217,27 @@ class QloHotelReports extends Module $out = fopen('php://output', 'w'); fputs($out, "\xEF\xBB\xBF"); fputcsv($out, array( - $this->l('Date'), $this->l('Booking ID'), $this->l('Reference'), - $this->l('Guest Name'), $this->l('Payment Method'), $this->l('Payment Type'), - $this->l('Amount'), $this->l('Currency'), $this->l('Transaction ID'), - $this->l('Payment Status'), + $this->l('Payment Date'), $this->l('Payment ID'), $this->l('Booking ID'), + $this->l('Booking Ref.'), $this->l('Guest Name'), + $this->l('Payment Method'), $this->l('Payment Type'), + $this->l('Amount'), $this->l('Payment Status'), $this->l('Transaction Reference'), + $this->l('Currency'), )); foreach ($rows as $row) { $rate = isset($row['conversion_rate']) ? (float) $row['conversion_rate'] : 1.0; if ($rate <= 0) { $rate = 1.0; } fputcsv($out, array( - isset($row['date_add']) ? $row['date_add'] : '', + isset($row['date_add']) ? $row['date_add'] : '', + isset($row['id_order_payment']) ? (int) $row['id_order_payment'] : '', $row['id_order'], $row['reference'], $row['customer_name'], $row['payment_method'], - isset($row['payment_type']) ? $row['payment_type'] : '', + isset($row['payment_type']) ? $row['payment_type'] : '', number_format((float) $row['amount'] / $rate, _PS_PRICE_DISPLAY_PRECISION_, '.', ''), - $currencyIso, - isset($row['transaction_id']) ? $row['transaction_id'] : '', $this->l('Success'), + isset($row['transaction_id']) ? $row['transaction_id'] : '', + $currencyIso, )); } } elseif ($report === 'refund') { @@ -1299,21 +1253,20 @@ class QloHotelReports extends Module $out = fopen('php://output', 'w'); fputs($out, "\xEF\xBB\xBF"); fputcsv($out, array( - $this->l('Booking ID'), $this->l('Guest Name'), $this->l('Booking Date'), - $this->l('Cancellation Date'), $this->l('Check-in'), $this->l('Check-out'), - $this->l('Original Booking Amount'), $this->l('Refunded Amount'), - $this->l('Refund Status'), $this->l('Reason'), $this->l('Currency'), + $this->l('Refund Date'), $this->l('Refund ID'), $this->l('Booking ID'), + $this->l('Guest Name'), $this->l('Original Booking Amount'), $this->l('Refund Amount'), + $this->l('Refund Method'), $this->l('Refund Status'), $this->l('Refund Remark'), + $this->l('Currency'), )); foreach ($rows as $row) { fputcsv($out, array( + isset($row['cancellation_date']) ? $row['cancellation_date'] : '', + isset($row['id_order_return']) ? (int) $row['id_order_return'] : '', $row['id_order'], $row['customer_name'], - isset($row['booking_date']) ? $row['booking_date'] : '', - isset($row['cancellation_date']) ? $row['cancellation_date'] : '', - $row['date_from'], - $row['date_to'], number_format((float) $row['total_price_tax_incl'], _PS_PRICE_DISPLAY_PRECISION_, '.', ''), number_format((float) $row['refunded_amount'], _PS_PRICE_DISPLAY_PRECISION_, '.', ''), + isset($row['refund_method']) ? $row['refund_method'] : '', isset($row['refund_status']) ? $row['refund_status'] : '', isset($row['cancellation_reason']) ? $row['cancellation_reason'] : '', $currencyIso, @@ -1367,12 +1320,12 @@ class QloHotelReports extends Module $out = fopen('php://output', 'w'); fputs($out, "\xEF\xBB\xBF"); fputcsv($out, array( - $this->l('Booking ID'), $this->l('Reference'), $this->l('Guest Name'), - $this->l('Email'), $this->l('Phone'), + $this->l('Booking ID'), $this->l('Guest Name'), + $this->l('Guest Email'), $this->l('Guest Phone'), $this->l('Room Type'), $this->l('Room No.'), - $this->l('Check-in'), $this->l('Check-out'), - $this->l('Total Charges'), $this->l('Total Paid'), $this->l('Balance Due'), - $this->l('Days Overdue'), $this->l('Last Payment Date'), $this->l('Status'), + $this->l('Check-in Date'), $this->l('Check-out Date'), + $this->l('Total Charges'), $this->l('Total Paid'), $this->l('Outstanding Balance'), + $this->l('Days Overdue'), $this->l('Last Payment Date'), $this->l('Booking Status'), $this->l('Currency'), )); $bookingStatusLabels = array( @@ -1385,7 +1338,6 @@ class QloHotelReports extends Module ? $bookingStatusLabels[(int) $row['id_status']] : ''; fputcsv($out, array( $row['id_order'], - $row['reference'], $row['customer_name'], isset($row['email']) ? $row['email'] : '', isset($row['phone']) ? $row['phone'] : '', @@ -1475,9 +1427,10 @@ class QloHotelReports extends Module $currencyIso = (new Currency(Configuration::get('PS_CURRENCY_DEFAULT')))->iso_code; $idProduct = (int) Tools::getValue('id_product', 0); $baseParams = array( - 'date_from' => $dateFrom, - 'date_to' => $dateTo, - 'id_hotel' => $idHotel ?: false, + 'date_from' => $dateFrom, + 'date_to' => $dateTo, + 'id_hotel' => $idHotel ?: false, + 'id_product' => $idProduct ?: 0, ); header('Content-Type: text/csv; charset=utf-8'); @@ -1564,7 +1517,7 @@ class QloHotelReports extends Module $this->l('Total Revenue (excl. Tax)'), $this->l('Tax Amount'), $this->l('Total Revenue (incl. Tax)'), $this->l('ADR'), $this->l('RevPAR'), - $this->l('Cancellation Count'), $this->l('No-Show Count'), $this->l('Avg. LOS'), + $this->l('Cancellation Count'), $this->l('Avg. LOS'), $this->l('Currency'), )); foreach ($rows as $row) { @@ -1581,13 +1534,12 @@ class QloHotelReports extends Module number_format((float) $row['adr'], _PS_PRICE_DISPLAY_PRECISION_, '.', ''), number_format((float) $row['revpar'], _PS_PRICE_DISPLAY_PRECISION_, '.', ''), (int) $row['cancel_count'], - (int) $row['no_show_count'], number_format((float) $row['avg_los'], 1, '.', ''), $currencyIso, )); } } else { - $totalRoomsOcc = AdminStatsController::getTotalRooms($idHotel ?: null, 1); + $totalRoomsOcc = (int) AdminStatsController::getTotalRooms($idHotel ?: null, 1, $idProduct ?: null); $dailyAllOcc = HotelBookingDetail::getOccupiedRoomsForDiscreteDates($baseParams); $dailyBooked = HotelBookingDetail::getOccupiedRoomsForDiscreteDates( array_merge($baseParams, array('id_status' => HotelBookingDetail::STATUS_ALLOTED)) @@ -1595,9 +1547,20 @@ class QloHotelReports extends Module $dailyCheckedIn = HotelBookingDetail::getOccupiedRoomsForDiscreteDates( array_merge($baseParams, array('id_status' => HotelBookingDetail::STATUS_CHECKED_IN)) ); - $dailyAvailable = AdminStatsController::getAvailableRoomsForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); - $dailyRevenue = AdminStatsController::getRoomsRevenueForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); - $dailyAdrOcc = AdminStatsController::getAverageDailyRateForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); + if ($idProduct) { + $dailyRevenue = HotelBookingDetail::getDatewiseRoomRevenue($baseParams); + $dailyAvailable = array(); + $dailyAdrOcc = array(); + foreach ($dailyAllOcc as $ts => $occ) { + $dailyAvailable[$ts] = max(0, $totalRoomsOcc - $occ); + $rev = isset($dailyRevenue[$ts]) ? (float) $dailyRevenue[$ts] : 0.0; + $dailyAdrOcc[$ts] = $occ ? round($rev / $occ, 2) : 0.0; + } + } else { + $dailyAvailable = AdminStatsController::getAvailableRoomsForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); + $dailyRevenue = AdminStatsController::getRoomsRevenueForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); + $dailyAdrOcc = AdminStatsController::getAverageDailyRateForDiscreteDates($dateFrom, $dateTo, $idHotel ?: null); + } header('Content-Disposition: attachment; filename="occupancy-report-'.$dateFrom.'-to-'.$dateTo.'.csv"'); $out = fopen('php://output', 'w'); @@ -1605,7 +1568,7 @@ class QloHotelReports extends Module fputcsv($out, array( $this->l('Date'), $this->l('Total Rooms (Inventory)'), $this->l('Available Rooms'), $this->l('Rooms Booked'), $this->l('Rooms Occupied'), $this->l('Out of Order'), - $this->l('Complimentary'), $this->l('Occupancy Rate %'), + $this->l('Occupancy Rate %'), $this->l('ADR'), $this->l('RevPAR'), $this->l('Total Room Revenue'), $this->l('Currency'), )); @@ -1625,7 +1588,6 @@ class QloHotelReports extends Module $booked, $occupied, $outOfOrder, - '—', number_format($occupancyPct, 1, '.', '').'%', number_format($adr, _PS_PRICE_DISPLAY_PRECISION_, '.', ''), number_format($revpar, _PS_PRICE_DISPLAY_PRECISION_, '.', ''), @@ -1871,7 +1833,7 @@ class QloHotelReports extends Module $this->l('Date'), $this->l('Total Rooms'), $this->l('Rooms Sold'), $this->l('Occupancy %'), $this->l('ADR'), $this->l('RevPAR'), $this->l('Total Revenue'), $this->l('Arrivals'), $this->l('Departures'), - $this->l('In-house Guests'), $this->l('Cancellations'), $this->l('No-Shows'), + $this->l('In-house Guests'), $this->l('Cancellations'), $this->l('Currency'), )); $current = $dateFrom; @@ -1891,7 +1853,6 @@ class QloHotelReports extends Module isset($departuresByDay[$timestamp]) ? (int) $departuresByDay[$timestamp] : 0, isset($checkedInByDay[$timestamp]) ? (int) $checkedInByDay[$timestamp] : 0, isset($cancsByDay[$timestamp]) ? (int) $cancsByDay[$timestamp] : 0, - '—', $currencyIso, )); $current = date('Y-m-d', strtotime('+1 day', strtotime($current))); @@ -1906,8 +1867,8 @@ class QloHotelReports extends Module $this->l('Hotel Name'), $this->l('Total Rooms'), $this->l('Rooms Sold'), $this->l('Occupancy %'), $this->l('Room Revenue'), $this->l('Extra Service Revenue'), $this->l('Gross Revenue'), $this->l('ADR'), $this->l('RevPAR'), - $this->l('Total Bookings'), $this->l('Total Cancellations'), $this->l('Cancel Rate %'), - $this->l('No-Shows'), $this->l('Avg LOS'), $this->l('Outstanding Balance'), + $this->l('Total Room Bookings'), $this->l('Total Cancellations'), $this->l('Cancel Rate %'), + $this->l('Avg LOS'), $this->l('Due Amount'), $this->l('Currency'), )); foreach ($hotels as $hotel) { @@ -1921,7 +1882,6 @@ class QloHotelReports extends Module $extraRev = (float) ServiceProductOrderDetail::getTotalServiceRevenue($hotelParams); $grossRevenue = $roomRevenue + $extraRev; $occupancy = round(HotelBookingDetail::getOccupancyRate($hotelParams), 1); - $noShows = (int) HotelBookingDetail::getTotalNoShows($hotelParams); $avgLos = ($bookings > 0 && $roomNights > 0) ? round($roomNights / $bookings, 1) : 0.0; $obRows = Order::getOutstandingBalance($hotelParams); $outstanding = is_array($obRows) @@ -1939,7 +1899,6 @@ class QloHotelReports extends Module $bookings, $cancels, number_format($cancelRate, 1, '.', '').'%', - $noShows, number_format($avgLos, 1, '.', ''), number_format((float) $outstanding, _PS_PRICE_DISPLAY_PRECISION_, '.', ''), $currencyIso, @@ -1962,9 +1921,8 @@ class QloHotelReports extends Module fputcsv($out, array( $this->l('Room No.'), $this->l('Floor'), $this->l('Room Type'), $this->l('OOO Status'), $this->l('Reason'), - $this->l('Start Date'), $this->l('Expected End Date'), $this->l('Actual End Date'), + $this->l('Start Date'), $this->l('End Date'), $this->l('Duration (Days)'), $this->l('Current Status'), - $this->l('Marked By'), $this->l('Resolved By'), $this->l('Est. Revenue Loss'), )); $today = date('Y-m-d'); foreach ($rows as $row) { @@ -1980,12 +1938,8 @@ class QloHotelReports extends Module $row['reason'] ? $row['reason'] : '', $row['disabled_from'], $row['disabled_to'], - '—', (int) $row['disabled_days'], $currentStatus, - '—', - '—', - '—', )); } } else { diff --git a/modules/qlohotelreports/views/templates/hook/group-bookings.tpl b/modules/qlohotelreports/views/templates/hook/group-bookings.tpl index 9fa944373..b62c3e7aa 100644 --- a/modules/qlohotelreports/views/templates/hook/group-bookings.tpl +++ b/modules/qlohotelreports/views/templates/hook/group-bookings.tpl @@ -218,7 +218,6 @@ {l s='Check-in Date' mod='qlohotelreports'} {l s='Cancellation Date' mod='qlohotelreports'} {l s='Cancellation Reason' mod='qlohotelreports'} - {l s='Cancellation Remark' mod='qlohotelreports'} {l s='Refund Amount' mod='qlohotelreports'} {l s='Refund Status' mod='qlohotelreports'} {l s='Booking Date' mod='qlohotelreports'} @@ -235,7 +234,6 @@ {$cancellation.hotel_check_in|escape:'html':'UTF-8'} {if $cancellation.cancellation_date}{$cancellation.cancellation_date|date_format:'%d-%m-%Y'}{else}—{/if} {if $cancellation.cancellation_reason}{$cancellation.cancellation_reason|escape:'html':'UTF-8'}{else}—{/if} - — {displayPrice price=$cancellation.refunded_amount currency=$cancellation.id_currency} {if $cancellation.refund_status}{$cancellation.refund_status|escape:'html':'UTF-8'}{else}—{/if} {if $cancellation.booking_date}{$cancellation.booking_date|escape:'html':'UTF-8'}{else}—{/if} @@ -243,7 +241,7 @@ {/foreach} {else} - +
{l s='No cancellations found for the selected date range.' mod='qlohotelreports'} @@ -267,62 +265,6 @@
{/if} - {* ── No-Show Report ──────────────────────────────────────────────── *} - {if $active_report == 'no-show'} -
-
-
- - - - - - - - - - - - - - {if $no_shows} - {foreach $no_shows as $noShow} - - - - - - - - - - {/foreach} - {else} - - - - {/if} - - {if $no_shows} - - - - - - - - {/if} -
{l s='Booking ID' mod='qlohotelreports'}{l s='Guest Name' mod='qlohotelreports'}{l s='Room Type' mod='qlohotelreports'}{l s='Room No.' mod='qlohotelreports'}{l s='Check-in Date' mod='qlohotelreports'}{l s='Total Amount' mod='qlohotelreports'}{l s='Penalty Charged' mod='qlohotelreports'}
{$noShow.id_order|intval}{$noShow.customer_name|escape:'html':'UTF-8'}{$noShow.room_type_name|escape:'html':'UTF-8'}{$noShow.room_num|escape:'html':'UTF-8'}{$noShow.actual_checkin|escape:'html':'UTF-8'}{displayPrice price=$noShow.total_price_tax_incl currency=$noShow.id_currency}—
-
- - {l s='No no-shows found for the selected date range.' mod='qlohotelreports'} -
-
{l s='Totals' mod='qlohotelreports'}{displayPrice price=$no_show_totals.total_price_tax_incl currency=$id_currency}
-
-
-
- {/if} - {* ── Arrivals Report ─────────────────────────────────────────────── *} {if $active_report == 'arrivals'}
diff --git a/modules/qlohotelreports/views/templates/hook/group-channels.tpl b/modules/qlohotelreports/views/templates/hook/group-channels.tpl index b04086db3..110b940ce 100644 --- a/modules/qlohotelreports/views/templates/hook/group-channels.tpl +++ b/modules/qlohotelreports/views/templates/hook/group-channels.tpl @@ -78,7 +78,6 @@ {l s='Total Bookings' mod='qlohotelreports'} {l s='Nights Sold' mod='qlohotelreports'} {l s='Room Revenue (excl. Tax)' mod='qlohotelreports'} - {l s='Extra Services Revenue' mod='qlohotelreports'} {l s='Discount Amount' mod='qlohotelreports'} {l s='Refund Amount' mod='qlohotelreports'} {l s='Tax Amount' mod='qlohotelreports'} @@ -98,12 +97,11 @@ {$sourceRow.bookings|intval} {$sourceRow.room_nights|intval} {displayPrice price=$sourceRow.revenue_excl currency=$id_currency} - {displayPrice price=0 currency=$id_currency} {displayPrice price=$sourceRow.discount_amount currency=$id_currency} {displayPrice price=$sourceRow.refund_amount currency=$id_currency} {displayPrice price=$sourceRow.tax_amount currency=$id_currency} {displayPrice price=$sourceRow.revenue_incl currency=$id_currency} - {displayPrice price=$sourceRow.revenue_excl currency=$id_currency} + {displayPrice price=$sourceRow.net_revenue currency=$id_currency} {$sourceRow.cancellations|intval} {$sourceRow.cancel_rate_pct|string_format:'%.1f'}% {displayPrice price=$sourceRow.adr currency=$id_currency} @@ -112,7 +110,7 @@ {/foreach} {else} - +
{l s='No bookings found for the selected period.' mod='qlohotelreports'} @@ -128,12 +126,11 @@ {$source_totals.bookings|intval} {$source_totals.room_nights|intval} {displayPrice price=$source_totals.revenue_excl currency=$id_currency} - {displayPrice price=0 currency=$id_currency} {displayPrice price=$source_totals.discount_amount currency=$id_currency} {displayPrice price=$source_totals.refund_amount currency=$id_currency} {displayPrice price=$source_totals.tax_amount currency=$id_currency} {displayPrice price=$source_totals.revenue_incl currency=$id_currency} - {displayPrice price=$source_totals.revenue_excl currency=$id_currency} + {displayPrice price=$source_totals.net_revenue currency=$id_currency} {$source_totals.cancellations|intval} diff --git a/modules/qlohotelreports/views/templates/hook/group-occupancy.tpl b/modules/qlohotelreports/views/templates/hook/group-occupancy.tpl index 7ba73cb32..2e55ea133 100644 --- a/modules/qlohotelreports/views/templates/hook/group-occupancy.tpl +++ b/modules/qlohotelreports/views/templates/hook/group-occupancy.tpl @@ -99,7 +99,6 @@ {l s='Rooms Booked' mod='qlohotelreports'} {l s='Rooms Occupied' mod='qlohotelreports'} {l s='Out of Order' mod='qlohotelreports'} - {l s='Complimentary' mod='qlohotelreports'} {l s='Occupancy Rate %' mod='qlohotelreports'} {l s='ADR (Avg. Daily Rate)' mod='qlohotelreports'} {l s='RevPAR (Rev. Per Avail. Room)' mod='qlohotelreports'} @@ -116,7 +115,6 @@ {$occupancyRow.rooms_booked|intval} {$occupancyRow.rooms_occupied|intval} {$occupancyRow.out_of_order|intval} - — {$occupancyRow.occupancy_pct|string_format:'%.1f'}% {displayPrice price=$occupancyRow.adr currency=$id_currency} {displayPrice price=$occupancyRow.revpar currency=$id_currency} @@ -125,7 +123,7 @@ {/foreach} {else} - +
{l s='No data for the selected period.' mod='qlohotelreports'} @@ -391,7 +389,6 @@ {l s='ADR (Avg. Daily Rate)' mod='qlohotelreports'} {l s='RevPAR (Rev. Per Avail. Room)' mod='qlohotelreports'} {l s='Cancellation Count' mod='qlohotelreports'} - {l s='No-Show Count' mod='qlohotelreports'} {l s='Avg. Length of Stay' mod='qlohotelreports'} @@ -411,13 +408,12 @@ {displayPrice price=$perfRow.adr currency=$id_currency} {displayPrice price=$perfRow.revpar currency=$id_currency} {$perfRow.cancel_count|intval} - {$perfRow.no_show_count|intval} {$perfRow.avg_los|string_format:'%.1f'} {/foreach} {else} - +
{l s='No data for the selected period.' mod='qlohotelreports'} @@ -435,7 +431,6 @@ {assign var="tot_tax" value=0} {assign var="tot_total_rev" value=0} {assign var="tot_cancels" value=0} - {assign var="tot_noshows" value=0} {foreach $roomTypePerformance_rows as $perfRow} {assign var="tot_rooms" value=$tot_rooms+$perfRow.total_rooms} {assign var="tot_nights_avail" value=$tot_nights_avail+$perfRow.total_nights_available} @@ -444,7 +439,6 @@ {assign var="tot_tax" value=$tot_tax+$perfRow.tax_amount} {assign var="tot_total_rev" value=$tot_total_rev+$perfRow.total_revenue} {assign var="tot_cancels" value=$tot_cancels+$perfRow.cancel_count} - {assign var="tot_noshows" value=$tot_noshows+$perfRow.no_show_count} {/foreach} {l s='Total' mod='qlohotelreports'} @@ -458,7 +452,6 @@ — — {$tot_cancels|intval} - {$tot_noshows|intval} — diff --git a/modules/qlohotelreports/views/templates/hook/group-property.tpl b/modules/qlohotelreports/views/templates/hook/group-property.tpl index ab148a6c8..17bf30660 100644 --- a/modules/qlohotelreports/views/templates/hook/group-property.tpl +++ b/modules/qlohotelreports/views/templates/hook/group-property.tpl @@ -105,7 +105,6 @@ {l s='Departures' mod='qlohotelreports'} {l s='In-house Guests' mod='qlohotelreports'} {l s='Cancellations' mod='qlohotelreports'} - {l s='No-Shows' mod='qlohotelreports'} @@ -123,12 +122,11 @@ {$dailySummaryRow.departures|intval} {$dailySummaryRow.inhouse_guests|intval} {$dailySummaryRow.cancels|intval} - — {/foreach} {else} - +
{l s='No data for the selected period.' mod='qlohotelreports'} @@ -162,12 +160,11 @@ {l s='Gross Revenue' mod='qlohotelreports'} {l s='ADR (Avg. Daily Rate)' mod='qlohotelreports'} {l s='RevPAR (Rev. Per Avail. Room)' mod='qlohotelreports'} - {l s='Total Bookings' mod='qlohotelreports'} + {l s='Total Room Bookings' mod='qlohotelreports'} {l s='Total Cancellations' mod='qlohotelreports'} {l s='Cancel Rate %' mod='qlohotelreports'} - {l s='No-Shows' mod='qlohotelreports'} {l s='Avg LOS' mod='qlohotelreports'} - {l s='Outstanding Balance' mod='qlohotelreports'} + {l s='Due Amount' mod='qlohotelreports'} @@ -186,14 +183,13 @@ {$hotelRow.bookings|intval} {$hotelRow.cancellations|intval} {$hotelRow.cancel_rate_pct|string_format:'%.1f'}% - {$hotelRow.no_shows|intval} {$hotelRow.avg_los|string_format:'%.1f'} {displayPrice price=$hotelRow.outstanding_balance currency=$id_currency} {/foreach} {else} - +
{l s='No hotels found.' mod='qlohotelreports'} @@ -224,13 +220,9 @@ {l s='OOO Status' mod='qlohotelreports'} {l s='Reason' mod='qlohotelreports'} {l s='Start Date' mod='qlohotelreports'} - {l s='Expected End Date' mod='qlohotelreports'} - {l s='Actual End Date' mod='qlohotelreports'} + {l s='End Date' mod='qlohotelreports'} {l s='Duration (Days)' mod='qlohotelreports'} {l s='Current Status' mod='qlohotelreports'} - {l s='Marked By' mod='qlohotelreports'} - {l s='Resolved By' mod='qlohotelreports'} - {l s='Est. Revenue Loss' mod='qlohotelreports'} @@ -249,7 +241,6 @@ {if $outOfOrderRow.reason}{$outOfOrderRow.reason|escape:'html':'UTF-8'}{else}—{/if} {if $outOfOrderRow.disabled_from}{$outOfOrderRow.disabled_from|escape:'html':'UTF-8'}{else}—{/if} {if $outOfOrderRow.disabled_to}{$outOfOrderRow.disabled_to|escape:'html':'UTF-8'}{else}—{/if} - — {if $outOfOrderRow.disabled_days}{$outOfOrderRow.disabled_days|intval}{else}—{/if} {if !$outOfOrderRow.disabled_to || $outOfOrderRow.disabled_to >= $today} @@ -258,14 +249,11 @@ {l s='Resolved' mod='qlohotelreports'} {/if} - — - — - — {/foreach} {else} - +
{l s='No out of order rooms for the selected period.' mod='qlohotelreports'} diff --git a/modules/qlohotelreports/views/templates/hook/group-revenue.tpl b/modules/qlohotelreports/views/templates/hook/group-revenue.tpl index 2de2d3eec..69dad3e6e 100644 --- a/modules/qlohotelreports/views/templates/hook/group-revenue.tpl +++ b/modules/qlohotelreports/views/templates/hook/group-revenue.tpl @@ -169,7 +169,7 @@ {displayPrice price=$revenueRow.service_revenue currency=$id_currency} {displayPrice price=$revenueRow.discounts currency=$id_currency} {displayPrice price=$revenueRow.tax_amount currency=$id_currency} - {displayPrice price=0 currency=$id_currency} + {displayPrice price=$revenueRow.refund_amount currency=$id_currency} {displayPrice price=$revenueRow.total_collection currency=$id_currency} {displayPrice price=$revenueRow.net_revenue currency=$id_currency} {displayPrice price=$revenueRow.adr currency=$id_currency} @@ -198,7 +198,7 @@ {displayPrice price=$revenue_totals.service_revenue currency=$id_currency} {displayPrice price=$revenue_totals.discounts currency=$id_currency} {displayPrice price=$revenue_totals.tax_amount currency=$id_currency} - {displayPrice price=0 currency=$id_currency} + {displayPrice price=$revenue_totals.refund_amount currency=$id_currency} {displayPrice price=$revenue_totals.total_collection currency=$id_currency} {displayPrice price=$revenue_totals.net_revenue currency=$id_currency} @@ -227,10 +227,7 @@ {l s='Refund Amount' mod='qlohotelreports'} {l s='Refund Method' mod='qlohotelreports'} {l s='Refund Status' mod='qlohotelreports'} - {l s='Processed Date' mod='qlohotelreports'} - {l s='Processed By' mod='qlohotelreports'} - {l s='Refund Reason' mod='qlohotelreports'} - {l s='Remarks' mod='qlohotelreports'} + {l s='Refund Remark' mod='qlohotelreports'} @@ -245,15 +242,12 @@ {displayPrice price=$refund.refunded_amount currency=$refund.id_currency} {if $refund.refund_method}{$refund.refund_method|escape:'html':'UTF-8'}{else}—{/if} {if $refund.refund_status}{$refund.refund_status|escape:'html':'UTF-8'}{else}—{/if} - {if $refund.processed_date}{$refund.processed_date|date_format:'%d-%m-%Y'}{else}—{/if} - {if $refund.processed_by}{$refund.processed_by|escape:'html':'UTF-8'}{else}—{/if} {if $refund.cancellation_reason}{$refund.cancellation_reason|escape:'html':'UTF-8'}{else}—{/if} - — {/foreach} {else} - +
{l s='No refunds found for the selected date range.' mod='qlohotelreports'} @@ -267,7 +261,7 @@ {l s='Total Refunded' mod='qlohotelreports'} {displayPrice price=$total_refunded currency=$id_currency} - + {/if} @@ -295,7 +289,6 @@ {l s='Amount' mod='qlohotelreports'} {l s='Payment Status' mod='qlohotelreports'} {l s='Transaction Reference' mod='qlohotelreports'} - {l s='Received By' mod='qlohotelreports'} @@ -314,12 +307,11 @@ {displayPrice price=$payment.amount currency=$payment.id_currency} {l s='Success' mod='qlohotelreports'} {if $payment.transaction_id}{$payment.transaction_id|escape:'html':'UTF-8'}{else}—{/if} - — {/foreach} {else} - +
{l s='No payments found for the selected date range.' mod='qlohotelreports'} @@ -333,7 +325,7 @@ {l s='Total Collected' mod='qlohotelreports'} {displayPrice price=$total_payments currency=$id_currency} - + {/if}