Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #567 from abhishek-webkul/gli-1223

Browse Source 
Fix Direct Revenue Ratio (DRR) on dashboard
This commit is contained in:
Rohit Jain
2023-03-07 12:54:06 +05:30
committed by GitHub
parent f526fb3636 75eef294c0
commit ea25cacda3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/admin/AdminStatsController.php
View File

@@ -1665,9 +1665,10 @@ class AdminStatsControllerCore extends AdminStatsTabController
$dateTo = date('Y-m-d', strtotime('+1 day', strtotime($dateTo)));
}
$sql = 'SELECT SUM(total_paid_tax_excl)
$sql = 'SELECT SUM(total_paid_tax_excl - refunded_amount)
FROM (
SELECT o.`id_order`, o.`total_paid_tax_excl` / o.`conversion_rate` AS total_paid_tax_excl,
IFNULL(orr.`refunded_amount`, 0) AS refunded_amount,
(SELECT hbd.`id_hotel`
FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
WHERE hbd.`id_order` = o.`id_order` LIMIT 1
@@ -1677,6 +1678,8 @@ class AdminStatsControllerCore extends AdminStatsTabController
ON (hbd.`id_order` = o.`id_order`)
INNER JOIN `'._DB_PREFIX_.'htl_branch_info` hbi
ON (hbi.`id` = hbd.`id_hotel`)
LEFT JOIN `' ._DB_PREFIX_.'order_return` orr
ON (orr.`id_order` = o.`id_order`)
WHERE o.`valid` = 1 AND hbi.`active` = 1 AND hbd.`is_refunded` = 0
AND o.`invoice_date` BETWEEN "'.pSQL($dateFrom).' 00:00:00" AND "'.pSQL($dateTo).' 23:59:59"
AND o.`source` = "'.pSQL(Configuration::get('PS_SHOP_DOMAIN')).'"'.