diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php index 6b8e03801..9d99916d5 100644 --- a/classes/order/OrderReturn.php +++ b/classes/order/OrderReturn.php @@ -195,12 +195,12 @@ class OrderReturnCore extends ObjectModel * * @return string raw SQL, not a full query */ - public static function getRefundedBookingIdsSubquery() + public static function getRefundedBookingIdsSubquery($eventType = null) { return 'SELECT ord.`id_htl_booking` FROM `'._DB_PREFIX_.'order_return_detail` ord INNER JOIN `'._DB_PREFIX_.'order_return` orr ON orr.`id_order_return` = ord.`id_order_return` INNER JOIN `'._DB_PREFIX_.'order_return_state` ors ON ors.`id_order_return_state` = orr.`state` - WHERE ors.`refunded` = 1'; + WHERE ors.`refunded` = 1'.(!is_null($eventType) ? ' AND orr.`event_type` = '.(int) $eventType : ''); } /** diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index d18aa5286..39b20614e 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -1636,7 +1636,7 @@ class AdminStatsControllerCore extends AdminStatsTabController $cancelledBookings = Db::getInstance()->getValue( 'SELECT COUNT(hbd.`id`) FROM `'._DB_PREFIX_.'htl_booking_detail` hbd - WHERE hbd.`id` IN ('.OrderReturn::getRefundedBookingIdsSubquery().') AND hbd.`date_add` BETWEEN "'.pSQL($dateFrom).' 00:00:00" AND "'.pSQL($dateTo).' 23:59:59"'. + WHERE hbd.`id` IN ('.OrderReturn::getRefundedBookingIdsSubquery(OrderReturn::EVENT_TYPE_CANCELLATION).') AND hbd.`date_add` BETWEEN "'.pSQL($dateFrom).' 00:00:00" AND "'.pSQL($dateTo).' 23:59:59"'. HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') ); diff --git a/install/langs/bg/data/order_state.xml b/install/langs/bg/data/order_state.xml index 268dff528..7da450ff2 100644 --- a/install/langs/bg/data/order_state.xml +++ b/install/langs/bg/data/order_state.xml @@ -50,6 +50,6 @@ Неявяване -