Fixed issue

Co-authored-by: Sumit <sumit201@webkul.in>
This commit is contained in:
varun kewlani
2026-08-04 17:50:53 +05:30
parent b296990b4e
commit 9ba0ce7e4f
30 changed files with 31 additions and 31 deletions

View File

@@ -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 : '');
}
/**

View File

@@ -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')
);

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Неявяване</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>অনুপস্থিত</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Não comparecimento</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Nedostavení se</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Nichterscheinen</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>No presentado</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>عدم حضور</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Non présentation</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>אי-הגעה</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Nedolazak</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Meg nem jelenés</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Ketidakhadiran</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Mancata presentazione</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Neatvykimas</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Непојавување</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Niet verschenen</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Ikke-møtt</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Niepojawienie się</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Não comparência</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Non présentation</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Neprezentare</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Неявка</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>නොපැමිණි</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Непојављивање</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Utebliven ankomst</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>未入住</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>Khách không đến</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>

View File

@@ -50,6 +50,6 @@
</order_state>
<order_state id="No_show">
<name>未入住</name>
<template/>
<template>no_show</template>
</order_state>
</entity_order_state>