From 9ba0ce7e4ff0fae8ee3e4ceeb95cd5684871fbdc Mon Sep 17 00:00:00 2001
From: varun kewlani <varun.kewlani322@webkul.in>
Date: Tue, 4 Aug 2026 17:50:53 +0530
Subject: [PATCH] Fixed issue

Co-authored-by: Sumit <sumit201@webkul.in>
---
 classes/order/OrderReturn.php              | 4 ++--
 controllers/admin/AdminStatsController.php | 2 +-
 install/langs/bg/data/order_state.xml      | 2 +-
 install/langs/bn/data/order_state.xml      | 2 +-
 install/langs/br/data/order_state.xml      | 2 +-
 install/langs/cs/data/order_state.xml      | 2 +-
 install/langs/de/data/order_state.xml      | 2 +-
 install/langs/es/data/order_state.xml      | 2 +-
 install/langs/fa/data/order_state.xml      | 2 +-
 install/langs/fr/data/order_state.xml      | 2 +-
 install/langs/he/data/order_state.xml      | 2 +-
 install/langs/hr/data/order_state.xml      | 2 +-
 install/langs/hu/data/order_state.xml      | 2 +-
 install/langs/id/data/order_state.xml      | 2 +-
 install/langs/it/data/order_state.xml      | 2 +-
 install/langs/lt/data/order_state.xml      | 2 +-
 install/langs/mk/data/order_state.xml      | 2 +-
 install/langs/nl/data/order_state.xml      | 2 +-
 install/langs/no/data/order_state.xml      | 2 +-
 install/langs/pl/data/order_state.xml      | 2 +-
 install/langs/pt/data/order_state.xml      | 2 +-
 install/langs/qc/data/order_state.xml      | 2 +-
 install/langs/ro/data/order_state.xml      | 2 +-
 install/langs/ru/data/order_state.xml      | 2 +-
 install/langs/si/data/order_state.xml      | 2 +-
 install/langs/sr/data/order_state.xml      | 2 +-
 install/langs/sv/data/order_state.xml      | 2 +-
 install/langs/tw/data/order_state.xml      | 2 +-
 install/langs/vn/data/order_state.xml      | 2 +-
 install/langs/zh/data/order_state.xml      | 2 +-
 30 files changed, 31 insertions(+), 31 deletions(-)

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 @@
   </order_state>
   <order_state id="No_show">
     <name>Неявяване</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/bn/data/order_state.xml b/install/langs/bn/data/order_state.xml
index ec145aa4f..6120bd93d 100644
--- a/install/langs/bn/data/order_state.xml
+++ b/install/langs/bn/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>অনুপস্থিত</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/br/data/order_state.xml b/install/langs/br/data/order_state.xml
index f7db799a8..537f37e0e 100644
--- a/install/langs/br/data/order_state.xml
+++ b/install/langs/br/data/order_state.xml
@@ -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>
diff --git a/install/langs/cs/data/order_state.xml b/install/langs/cs/data/order_state.xml
index d0c191327..cafdf5e3c 100644
--- a/install/langs/cs/data/order_state.xml
+++ b/install/langs/cs/data/order_state.xml
@@ -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>
\ No newline at end of file
diff --git a/install/langs/de/data/order_state.xml b/install/langs/de/data/order_state.xml
index 1686c189a..a6fc39b7d 100644
--- a/install/langs/de/data/order_state.xml
+++ b/install/langs/de/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>Nichterscheinen</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/es/data/order_state.xml b/install/langs/es/data/order_state.xml
index 0524c625a..33d2c0702 100644
--- a/install/langs/es/data/order_state.xml
+++ b/install/langs/es/data/order_state.xml
@@ -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>
diff --git a/install/langs/fa/data/order_state.xml b/install/langs/fa/data/order_state.xml
index 6fdd254c9..406c7a993 100644
--- a/install/langs/fa/data/order_state.xml
+++ b/install/langs/fa/data/order_state.xml
@@ -50,6 +50,6 @@
     </order_state>
   <order_state id="No_show">
     <name>عدم حضور</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/fr/data/order_state.xml b/install/langs/fr/data/order_state.xml
index b9621343a..17db50c0f 100644
--- a/install/langs/fr/data/order_state.xml
+++ b/install/langs/fr/data/order_state.xml
@@ -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>
diff --git a/install/langs/he/data/order_state.xml b/install/langs/he/data/order_state.xml
index 9e7f3f29b..5a144372a 100644
--- a/install/langs/he/data/order_state.xml
+++ b/install/langs/he/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>אי-הגעה</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/hr/data/order_state.xml b/install/langs/hr/data/order_state.xml
index ce532b0b5..a5d27a288 100644
--- a/install/langs/hr/data/order_state.xml
+++ b/install/langs/hr/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>Nedolazak</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/hu/data/order_state.xml b/install/langs/hu/data/order_state.xml
index d4f2a534f..270110126 100644
--- a/install/langs/hu/data/order_state.xml
+++ b/install/langs/hu/data/order_state.xml
@@ -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>
diff --git a/install/langs/id/data/order_state.xml b/install/langs/id/data/order_state.xml
index d5390ea3f..188fcf8d6 100644
--- a/install/langs/id/data/order_state.xml
+++ b/install/langs/id/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>Ketidakhadiran</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/it/data/order_state.xml b/install/langs/it/data/order_state.xml
index b813eaee0..eac9c3dd5 100644
--- a/install/langs/it/data/order_state.xml
+++ b/install/langs/it/data/order_state.xml
@@ -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>
diff --git a/install/langs/lt/data/order_state.xml b/install/langs/lt/data/order_state.xml
index c02f5f7fe..5e90358ce 100644
--- a/install/langs/lt/data/order_state.xml
+++ b/install/langs/lt/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>Neatvykimas</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/mk/data/order_state.xml b/install/langs/mk/data/order_state.xml
index d0afb0f18..360d441eb 100644
--- a/install/langs/mk/data/order_state.xml
+++ b/install/langs/mk/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>Непојавување</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/nl/data/order_state.xml b/install/langs/nl/data/order_state.xml
index e1b7dc834..92bb928d6 100644
--- a/install/langs/nl/data/order_state.xml
+++ b/install/langs/nl/data/order_state.xml
@@ -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>
diff --git a/install/langs/no/data/order_state.xml b/install/langs/no/data/order_state.xml
index 9f7554330..f2f690a19 100644
--- a/install/langs/no/data/order_state.xml
+++ b/install/langs/no/data/order_state.xml
@@ -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>
diff --git a/install/langs/pl/data/order_state.xml b/install/langs/pl/data/order_state.xml
index 9c4e02944..e97597d51 100644
--- a/install/langs/pl/data/order_state.xml
+++ b/install/langs/pl/data/order_state.xml
@@ -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>
diff --git a/install/langs/pt/data/order_state.xml b/install/langs/pt/data/order_state.xml
index 8a4770dad..cdaa92f4a 100644
--- a/install/langs/pt/data/order_state.xml
+++ b/install/langs/pt/data/order_state.xml
@@ -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>
diff --git a/install/langs/qc/data/order_state.xml b/install/langs/qc/data/order_state.xml
index 1920ac09a..352ac563e 100644
--- a/install/langs/qc/data/order_state.xml
+++ b/install/langs/qc/data/order_state.xml
@@ -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>
diff --git a/install/langs/ro/data/order_state.xml b/install/langs/ro/data/order_state.xml
index db0645dc2..1acc28b93 100644
--- a/install/langs/ro/data/order_state.xml
+++ b/install/langs/ro/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>Neprezentare</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/ru/data/order_state.xml b/install/langs/ru/data/order_state.xml
index 8ffa1500f..010d39782 100644
--- a/install/langs/ru/data/order_state.xml
+++ b/install/langs/ru/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>Неявка</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/si/data/order_state.xml b/install/langs/si/data/order_state.xml
index 174228011..f40d12b42 100644
--- a/install/langs/si/data/order_state.xml
+++ b/install/langs/si/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>නොපැමිණි</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/sr/data/order_state.xml b/install/langs/sr/data/order_state.xml
index e7133d4ba..6c346b528 100644
--- a/install/langs/sr/data/order_state.xml
+++ b/install/langs/sr/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>Непојављивање</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/sv/data/order_state.xml b/install/langs/sv/data/order_state.xml
index f3c391430..eb8b67990 100644
--- a/install/langs/sv/data/order_state.xml
+++ b/install/langs/sv/data/order_state.xml
@@ -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>
diff --git a/install/langs/tw/data/order_state.xml b/install/langs/tw/data/order_state.xml
index ba478cdc2..e333ee2d0 100644
--- a/install/langs/tw/data/order_state.xml
+++ b/install/langs/tw/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>未入住</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>
diff --git a/install/langs/vn/data/order_state.xml b/install/langs/vn/data/order_state.xml
index d0a3ca817..a1ff5b4f8 100644
--- a/install/langs/vn/data/order_state.xml
+++ b/install/langs/vn/data/order_state.xml
@@ -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>
diff --git a/install/langs/zh/data/order_state.xml b/install/langs/zh/data/order_state.xml
index baa2100ba..d55ac5a89 100644
--- a/install/langs/zh/data/order_state.xml
+++ b/install/langs/zh/data/order_state.xml
@@ -50,6 +50,6 @@
   </order_state>
   <order_state id="No_show">
     <name>未入住</name>
-    <template/>
+    <template>no_show</template>
   </order_state>
 </entity_order_state>