From 6a33faeba17a23dd46b8f43c5545b70390c1924e Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 9 Oct 2024 20:01:31 +0530 Subject: [PATCH] Removed: cancelled rooms filter from Admin order --- controllers/admin/AdminOrdersController.php | 10 ++-------- .../views/templates/hook/dashboard_zone_one.tpl | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index e80fe1fa4..75490c162 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -301,17 +301,11 @@ class AdminOrdersControllerCore extends AdminController 'optional' => true, ), 'is_refunded' => array( - 'title' => $this->l('Refunded rooms'), + 'title' => $this->l('Refunded / Cancelled Rooms'), 'filter_key' => 'hbd!is_refunded', 'type'=>'bool', 'displayed' => false, ), - 'is_cancelled' => array( - 'title' => $this->l('Cancelled rooms'), - 'filter_key' => 'hbd!is_cancelled', - 'type'=>'bool', - 'displayed' => false, - ), 'id_status' => array( 'title' => $this->l('Room status'), 'filter_key' => 'hbd!id_status', @@ -2521,7 +2515,7 @@ class AdminOrdersControllerCore extends AdminController $helper->color = 'color2'; $helper->title = $this->l('Total Due Amount', null, null, false); $minValue = ('0.' . str_repeat('0', (Configuration::get('PS_PRICE_DISPLAY_PRECISION') - 1)) . '1'); - $helper->href = $this->context->link->getAdminLink('AdminOrders').'&submitFilterorder=1&orderFilter_hbd!is_refunded=0&orderFilter_hbd!is_cancelled=0&orderFilter_amount_due%5B0%5D='.$minValue; + $helper->href = $this->context->link->getAdminLink('AdminOrders').'&submitFilterorder=1&orderFilter_hbd!is_refunded=0&orderFilter_amount_due%5B0%5D='.$minValue; $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_due_amount'; $helper->tooltip = $this->l('Total due amount of all the orders created.', null, null, false); $this->kpis[] = $helper; diff --git a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl index 90acecce1..a1ee08c96 100644 --- a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl +++ b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl @@ -80,7 +80,7 @@