From d390dd5fdf6c77934f33bfa24c7982cf3dc061f0 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Mon, 3 Jun 2024 19:52:39 +0530 Subject: [PATCH] Added: option for modules to manipulate KPI data --- classes/controller/AdminController.php | 20 +++ classes/helper/HelperKpi.php | 5 + controllers/admin/AdminCartsController.php | 16 +-- .../admin/AdminCustomerThreadsController.php | 14 +- .../admin/AdminCustomersController.php | 24 ++-- controllers/admin/AdminModulesController.php | 14 +- controllers/admin/AdminOrdersController.php | 36 +++-- controllers/admin/AdminProductsController.php | 27 ++-- controllers/admin/AdminStatsController.php | 126 +++++++++--------- .../admin/AdminTranslationsController.php | 14 +- .../classes/HotelBranchInformation.php | 14 +- 11 files changed, 151 insertions(+), 159 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 6d36f953e..470855754 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -320,6 +320,9 @@ class AdminControllerCore extends Controller /** @var string */ protected $display; + /** @var array */ + public $kpis = array(); + /** @var bool */ protected $_includeContainer = true; @@ -2647,6 +2650,23 @@ class AdminControllerCore extends Controller public function renderKpis() { + Hook::exec('action'.$this->controller_name.'KPIListingModifier', array( + 'kpis' => &$this->kpis, + )); + + foreach ($this->kpis as $key => &$kpi) { + $kpi->exclude_id_hotels[] = 3; + if (count($kpi->exclude_id_hotels)) { + if (empty($kpi->id_hotels)) { + $kpi->id_hotels = HotelBranchInformation::getProfileAccessedHotels($this->context->employee->id_profile, 1, 1); + } + $kpi->id_hotels = array_diff($kpi->id_hotels, $kpi->exclude_id_hotels); + } + } + + $helper = new HelperKpiRow(); + $helper->kpis = $this->kpis; + return $helper->generate(); } /** diff --git a/classes/helper/HelperKpi.php b/classes/helper/HelperKpi.php index 179ac3045..1cdfff3e0 100644 --- a/classes/helper/HelperKpi.php +++ b/classes/helper/HelperKpi.php @@ -38,6 +38,8 @@ class HelperKpiCore extends Helper public $value; public $data; public $source; + public $id_hotels = false; + public $exclude_id_hotels = array(); public $href; public $target; public $tooltip; @@ -47,6 +49,7 @@ class HelperKpiCore extends Helper { $this->tpl = $this->createTemplate($this->base_tpl); + $this->manageHotelPremissions(); $this->tpl->assign(array( 'id' => $this->id, 'icon' => $this->icon, @@ -57,6 +60,8 @@ class HelperKpiCore extends Helper 'value' => $this->value, 'data' => $this->data, 'source' => $this->source, + 'id_hotels' => $this->id_hotels, + 'exclude_id_hotels' => $this->exclude_id_hotels, 'href' => $this->href, 'target' => $this->target, 'tooltip' => $this->tooltip, diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 3f3798675..dd8938267 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -197,7 +197,7 @@ class AdminCartsControllerCore extends AdminController $helper->data = ConfigurationKPI::get('CONVERSION_RATE_CHART'); } $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=conversion_rate'; - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-carts'; @@ -209,7 +209,7 @@ class AdminCartsControllerCore extends AdminController $helper->subtitle = sprintf($this->l('From %s to %s', null, null, false), $date_from, $date_to); $helper->href = $this->context->link->getAdminLink('AdminCarts').'&action=filterOnlyAbandonedCarts&date_from='.$date_from.'&date_to='.$date_to; $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=abandoned_cart'; - $kpis[] = $helper; + $this->kpis[] = $helper; $daysForAvgOrderVal = Configuration::get('PS_ORDER_KPI_AVG_ORDER_VALUE_NB_DAYS'); $helper = new HelperKpi(); @@ -219,7 +219,7 @@ class AdminCartsControllerCore extends AdminController $helper->title = $this->l('Average Order Value', null, null, false); $helper->subtitle = $daysForAvgOrderVal.' '.$this->l('days', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=average_order_value'; - $kpis[] = $helper; + $this->kpis[] = $helper; $daysForProfitPerVisitor = Configuration::get('PS_ORDER_KPI_PER_VISITOR_PROFIT_NB_DAYS'); $helper = new HelperKpi(); @@ -229,15 +229,9 @@ class AdminCartsControllerCore extends AdminController $helper->title = $this->l('Net Profit per Visitor', null, null, false); $helper->subtitle = $daysForProfitPerVisitor.' '.$this->l('days', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=netprofit_visit'; - $kpis[] = $helper; + $this->kpis[] = $helper; - Hook::exec('action'.$this->controller_name.'KPIListingModifier', array( - 'kpis' => &$kpis, - )); - - $helper = new HelperKpiRow(); - $helper->kpis = $kpis; - return $helper->generate(); + return parent::renderKpis(); } diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php index c7a52fc5e..ac4ad3670 100644 --- a/controllers/admin/AdminCustomerThreadsController.php +++ b/controllers/admin/AdminCustomerThreadsController.php @@ -524,7 +524,7 @@ class AdminCustomerThreadsControllerCore extends AdminController $helper->color = 'color1'; $helper->title = $this->l('Pending Discussion Threads', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=pending_messages'; - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-age'; @@ -533,7 +533,7 @@ class AdminCustomerThreadsControllerCore extends AdminController $helper->title = $this->l('Average Response Time', null, null, false); $helper->subtitle = $this->l('30 days', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=avg_msg_response_time'; - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-messages-per-thread'; @@ -542,15 +542,9 @@ class AdminCustomerThreadsControllerCore extends AdminController $helper->title = $this->l('Messages per Thread', null, null, false); $helper->subtitle = $this->l('30 day', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=messages_per_thread'; - $kpis[] = $helper; + $this->kpis[] = $helper; - Hook::exec('action'.$this->controller_name.'KPIListingModifier', array( - 'kpis' => &$kpis, - )); - - $helper = new HelperKpiRow(); - $helper->kpis = $kpis; - return $helper->generate(); + return parent::renderKpis(); } public function renderView() diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 6c763f10c..310cb23d3 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -689,7 +689,7 @@ class AdminCustomersControllerCore extends AdminController $helper->subtitle = $this->l('All Time', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=orders_per_customer'; $helper->tooltip = $this->l('The average number of orders placed per customer in given period of time.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-total-frequent-customers'; @@ -699,7 +699,7 @@ class AdminCustomersControllerCore extends AdminController $helper->subtitle = $this->l('All Time', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_frequent_customers'; $helper->tooltip = $this->l('The total number of frequent customers in given period of time.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-revenue-per-available-customer'; @@ -710,7 +710,7 @@ class AdminCustomersControllerCore extends AdminController $helper->subtitle = sprintf($this->l('%d Days', null, null, false), (int) $nbDaysRevPac); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=revenue_per_available_customer'; $helper->tooltip = $this->l('Revenue per Available Customer (RevPAC) in given period of time.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-total-newsletter-registrations'; @@ -720,7 +720,7 @@ class AdminCustomersControllerCore extends AdminController $helper->subtitle = $this->l('All Time', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_newsletter_registrations'; $helper->tooltip = $this->l('The total number of newsletter registrations in given period of time.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-conversion-rate'; @@ -731,7 +731,7 @@ class AdminCustomersControllerCore extends AdminController $helper->subtitle = sprintf($this->l('%d Days', null, null, false), (int) $nbDaysConversionRate); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=conversion_rate'; $helper->tooltip = $this->l('The percentage of visitors who created a booking in given period of time.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-total-new-customers'; @@ -742,7 +742,7 @@ class AdminCustomersControllerCore extends AdminController $helper->subtitle = sprintf($this->l('%d Days', null, null, false), (int) $nbDaysNewCustomers); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_new_customers'; $helper->tooltip = $this->l('The total number of new customers who registered in given period of time.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-total-banned-customers'; @@ -752,7 +752,7 @@ class AdminCustomersControllerCore extends AdminController $helper->subtitle = $this->l('All Time', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_banned_customers'; $helper->tooltip = $this->l('The total number of banned customers.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-gender'; @@ -762,15 +762,9 @@ class AdminCustomersControllerCore extends AdminController $helper->subtitle = $this->l('All Time', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=customer_main_gender'; $helper->tooltip = $this->l('The main gender from all the customers.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; - Hook::exec('action'.$this->controller_name.'KPIListingModifier', array( - 'kpis' => &$kpis, - )); - - $helper = new HelperKpiRow(); - $helper->kpis = $kpis; - return $helper->generate(); + return parent::renderKpis(); } public function renderView() diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index a71362676..bfba269ae 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -1333,7 +1333,7 @@ class AdminModulesControllerCore extends AdminController $helper->color = 'color1'; $helper->title = $this->l('Installed Modules', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=installed_modules'; - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-disabled-modules'; @@ -1341,7 +1341,7 @@ class AdminModulesControllerCore extends AdminController $helper->color = 'color2'; $helper->title = $this->l('Disabled Modules', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=disabled_modules'; - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-update-modules'; @@ -1349,15 +1349,9 @@ class AdminModulesControllerCore extends AdminController $helper->color = 'color3'; $helper->title = $this->l('Modules to Update', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=update_modules'; - $kpis[] = $helper; + $this->kpis[] = $helper; - Hook::exec('action'.$this->controller_name.'KPIListingModifier', array( - 'kpis' => &$kpis, - )); - - $helper = new HelperKpiRow(); - $helper->kpis = $kpis; - return $helper->generate(); + return parent::renderKpis(); } public function initModal() diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 3cfdfdf15..6657e9a7d 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -2312,7 +2312,7 @@ class AdminOrdersControllerCore extends AdminController $helper->color = 'color3'; $helper->title = $this->l('Order Date'); $helper->value = Tools::displayDate($objOrder->date_add); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-order-total'; @@ -2320,7 +2320,7 @@ class AdminOrdersControllerCore extends AdminController $helper->color = 'color4'; $helper->title = $this->l('Total'); $helper->value = Tools::displayPrice($objOrder->total_paid_tax_incl, new Currency($objOrder->id_currency)); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-messages'; @@ -2329,7 +2329,7 @@ class AdminOrdersControllerCore extends AdminController $helper->title = $this->l('Messages'); $helper->href = $this->context->link->getAdminLink('AdminCustomerThreads').'&id_order='.$objOrder->id; $helper->value = count(CustomerThread::getCustomerMessages($objOrder->id_customer, null, $objOrder->id)); - $kpis[] = $helper; + $this->kpis[] = $helper; $objHotelBookingDetail = new HotelBookingDetail(); $numRooms = count($objHotelBookingDetail->getBookingDataByOrderId($objOrder->id)); @@ -2340,11 +2340,7 @@ class AdminOrdersControllerCore extends AdminController $helper->title = $this->l('Total Rooms'); $helper->href = '#start_products'; $helper->value = $numRooms; - $kpis[] = $helper; - - Hook::exec('action'.$this->controller_name.'KPIListingModifier', array( - 'kpis' => &$kpis, - )); + $this->kpis[] = $helper; } else { $time = time(); $kpis = array(); @@ -2356,7 +2352,7 @@ class AdminOrdersControllerCore extends AdminController $helper->title = $this->l('Total Sales', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_sales'; $helper->tooltip = $this->l('Total sales/revenue of all the orders created.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-total-due-amount'; @@ -2366,7 +2362,7 @@ class AdminOrdersControllerCore extends AdminController $helper->href = $this->context->link->getAdminLink('AdminOrders').'&submitResetorder=1&due_amount_orders=1'; $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); - $kpis[] = $helper; + $this->kpis[] = $helper; $arivalDate = date('Y-m-d'); $helper = new HelperKpi(); @@ -2378,7 +2374,7 @@ class AdminOrdersControllerCore extends AdminController $helper->href = $this->context->link->getAdminLink('AdminOrders').'&orders_arrival_today=1'; $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=today_arrivals'; $helper->tooltip = $this->l('Total number of arrivals for today.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $departureDate = date('Y-m-d'); $helper = new HelperKpi(); @@ -2390,7 +2386,7 @@ class AdminOrdersControllerCore extends AdminController $helper->href = $this->context->link->getAdminLink('AdminOrders').'&orders_departures_today=1'; $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=today_departures'; $helper->tooltip = $this->l('Total number of departures for today.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $dateFrom = date('Y-m-d'); $dateTo = date('Y-m-d', strtotime('+1 day')); @@ -2403,7 +2399,7 @@ class AdminOrdersControllerCore extends AdminController $helper->href = $this->context->link->getAdminLink('AdminOrders').'&orders_stay_over=1'; $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=today_stay_over'; $helper->tooltip = $this->l('Total number of stay overs for today.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-carts'; @@ -2416,7 +2412,7 @@ class AdminOrdersControllerCore extends AdminController $helper->href = $this->context->link->getAdminLink('AdminCarts').'&action=filterOnlyAbandonedCarts&date_from='.$dateFrom.'&date_to='.$dateTo; $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=abandoned_cart'; $helper->tooltip = $this->l('Total number of abandoned carts in given period of time.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $daysForConversionRate = Configuration::get('PS_KPI_CONVERSION_RATE_NB_DAYS'); $helper = new HelperKpi(); @@ -2427,7 +2423,7 @@ class AdminOrdersControllerCore extends AdminController $helper->subtitle = $daysForConversionRate.' '.$this->l('days', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=conversion_rate'; $helper->tooltip = $this->l('Percentage of visits that resulted in an order/booking in given period of time.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $daysForAvgOrderVal = Configuration::get('PS_ORDER_KPI_AVG_ORDER_VALUE_NB_DAYS'); $helper = new HelperKpi(); @@ -2438,7 +2434,7 @@ class AdminOrdersControllerCore extends AdminController $helper->subtitle = $daysForAvgOrderVal.' '.$this->l('days', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=average_order_value'; $helper->tooltip = $this->l('Total average order value without tax in given period of time.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-average-lead-time'; @@ -2447,7 +2443,7 @@ class AdminOrdersControllerCore extends AdminController $helper->title = $this->l('Average Lead Time', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=average_lead_time'; $helper->tooltip = $this->l('Average number of days between the time guests book their rooms and the time guest schedule to arrive at the hotel.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-average-guest-in-booking'; @@ -2456,12 +2452,10 @@ class AdminOrdersControllerCore extends AdminController $helper->title = $this->l('Average Guest Per Booking', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=average_guest_in_booking'; $helper->tooltip = $this->l('Average number of guests per booking.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; } - $helper = new HelperKpiRow(); - $helper->kpis = $kpis; - return $helper->generate(); + return parent::renderKpis(); } public function renderView() diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 21bba9ce7..c66791ac4 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2449,7 +2449,7 @@ class AdminProductsControllerCore extends AdminController $helper->subtitle = $this->l('Today', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_rooms'; $helper->tooltip = $this->l('The total number of rooms in all hotels.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-occupied-rooms'; @@ -2459,7 +2459,7 @@ class AdminProductsControllerCore extends AdminController $helper->subtitle = $this->l('Today', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=occupied_rooms'; $helper->tooltip = $this->l('The current count of rooms that are currently occupied by guests.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-vacant-rooms'; @@ -2469,7 +2469,7 @@ class AdminProductsControllerCore extends AdminController $helper->subtitle = $this->l('Today', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=vacant_rooms'; $helper->tooltip = $this->l('The count of rooms that are currently unoccupied and available for booking.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-reserved-rooms'; @@ -2479,7 +2479,7 @@ class AdminProductsControllerCore extends AdminController $helper->subtitle = $this->l('Today', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=booked_rooms'; $helper->tooltip = $this->l('The number of rooms that are currently booked but not yet occupied.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-disabled-rooms'; @@ -2489,7 +2489,7 @@ class AdminProductsControllerCore extends AdminController $helper->subtitle = $this->l('Today', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=disabled_rooms'; $helper->tooltip = $this->l('The number of rooms that are currently disabled.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-online-bookable-rooms'; @@ -2499,7 +2499,7 @@ class AdminProductsControllerCore extends AdminController $helper->subtitle = $this->l('Today', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=online_bookable_rooms'; $helper->tooltip = $this->l('The total number of rooms that can be booked only using website.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-offline-bookable-rooms'; @@ -2509,7 +2509,7 @@ class AdminProductsControllerCore extends AdminController $helper->subtitle = $this->l('Today', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=offline_bookable_rooms'; $helper->tooltip = $this->l('The number of rooms that can be booked either through website or offline channels (e.g., phone or in-person).', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-best-selling-room-type'; @@ -2520,7 +2520,7 @@ class AdminProductsControllerCore extends AdminController $helper->subtitle = sprintf($this->l('%d Days', null, null, false), (int) $nbDaysBestSelling); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=best_selling_room_type'; $helper->tooltip = $this->l('Displays the best selling room type based on the last 30 days of sales.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-disbled-room-types'; @@ -2530,16 +2530,9 @@ class AdminProductsControllerCore extends AdminController $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=disabled_room_types'; $helper->href = Context::getContext()->link->getAdminLink('AdminProducts').'&productFilter_sa!active=0&submitFilterproduct=1'; $helper->tooltip = $this->l('The total number of room types that are currently disabled.', null, null, false); - $kpis[] = $helper; + $this->kpis[] = $helper; - Hook::exec('action'.$this->controller_name.'KPIListingModifier', array( - 'kpis' => &$kpis, - )); - - $helper = new HelperKpiRow(); - $helper->kpis = $kpis; - - return $helper->generate(); + return parent::renderKpis(); } public function renderList() diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 782f989f8..ce55508d4 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -262,15 +262,15 @@ class AdminStatsControllerCore extends AdminStatsTabController return $sales; } else { return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue( - 'SELECT SUM(total_paid_tax_excl / o.conversion_rate), - ( - SELECT hbd.`id_hotel` - FROM`'._DB_PREFIX_.'htl_booking_detail` hbd - WHERE hbd.`id_order` = o.`id_order` LIMIT 1 - ) AS id_hotel + 'SELECT SUM(total_paid_tax_excl / o.`conversion_rate`), t.`id_hotel` FROM `'._DB_PREFIX_.'orders` o LEFT JOIN `'._DB_PREFIX_.'order_state` os ON o.current_state = os.id_order_state - WHERE os.logable = 1'. (($date_from && $date_to) ? ' AND `invoice_date` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59"' : '').' HAVING 1 '.HotelBranchInformation::addHotelRestriction($id_hotel) + LEFT JOIN ( + SELECT hbd.`id_hotel` as id_hotel, hbd.`id_order` as id_order + FROM`'._DB_PREFIX_.'htl_booking_detail` hbd + GROUP BY hbd.`id_order` + ) t ON (t.`id_order` = o.`id_order`) + WHERE os.logable = 1'. (($date_from && $date_to) ? ' AND `invoice_date` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59"' : '').HotelBranchInformation::addHotelRestriction($id_hotel) ); } } @@ -287,7 +287,7 @@ class AdminStatsControllerCore extends AdminStatsTabController if (!$distinct_products) { return '0%'; } - return round(100 * $distinct_products / AdminStatsController::getTotalRoomTypes()).'%'; + return round(100 * $distinct_products / AdminStatsControllerCore::getTotalRoomTypes()).'%'; } public static function getOrders($date_from, $date_to, $granularity = false, $id_hotel = false) @@ -402,7 +402,7 @@ class AdminStatsControllerCore extends AdminStatsTabController public static function getMainCountry($date_from, $date_to) { - $total_orders = AdminStatsController::getOrders($date_from, $date_to); + $total_orders = AdminStatsControllerCore::getOrders($date_from, $date_to); if (!$total_orders) { return false; } @@ -593,7 +593,8 @@ class AdminStatsControllerCore extends AdminStatsTabController public function displayAjaxGetKpi() { - $value = $this->getLatestKpiValue(Tools::getValue('kpi')); + ddd(Tools::getValue('id_hotels')); + $value = $this->getLatestKpiValue(Tools::getValue('kpi'), Tools::getValue('id_hotels')); if ($value !== false) { $array = array('value' => $value); if (isset($data)) { @@ -604,7 +605,7 @@ class AdminStatsControllerCore extends AdminStatsTabController die(json_encode(array('has_errors' => true))); } - public function getLatestKpiValue($kpi) + public function getLatestKpiValue($kpi, $idHotels) { $currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT')); $value = false; @@ -612,17 +613,18 @@ class AdminStatsControllerCore extends AdminStatsTabController case 'conversion_rate': $nbDaysConversionRate = Validate::isUnsignedInt(Configuration::get('PS_KPI_CONVERSION_RATE_NB_DAYS')) ? Configuration::get('PS_KPI_CONVERSION_RATE_NB_DAYS') : 30; - $visitors = AdminStatsController::getVisits( + $visitors = AdminStatsControllerCore::getVisits( true, date('Y-m-d', strtotime('-'.($nbDaysConversionRate + 1).' day')), date('Y-m-d', strtotime('+1 day')), false /*'day'*/ ); - $orders = AdminStatsController::getOrders( + $orders = AdminStatsControllerCore::getOrders( date('Y-m-d', strtotime('-'.($nbDaysConversionRate + 1).' day')), date('Y-m-d', strtotime('-1 day')), - false /*'day'*/ + false /*'day'*/, + $idHotels ); $visits_sum = $visitors; //array_sum($visitors); @@ -640,7 +642,7 @@ class AdminStatsControllerCore extends AdminStatsTabController break; case 'abandoned_cart': - $value = AdminStatsController::getAbandonedCarts( + $value = AdminStatsControllerCore::getAbandonedCarts( date('Y-m-d', strtotime('-2 day')).' 0:0:0', date('Y-m-d', strtotime('-1 day')).' 23:59:59', _TIME_1_DAY_ @@ -648,62 +650,62 @@ class AdminStatsControllerCore extends AdminStatsTabController break; case 'installed_modules': - $value = AdminStatsController::getInstalledModules(); + $value = AdminStatsControllerCore::getInstalledModules(); break; case 'disabled_modules': - $value = AdminStatsController::getDisabledModules(); + $value = AdminStatsControllerCore::getDisabledModules(); break; case 'update_modules': - $value = AdminStatsController::getModulesToUpdate(); + $value = AdminStatsControllerCore::getModulesToUpdate(); break; case 'percent_product_stock': - $value = AdminStatsController::getPercentProductStock(); + $value = AdminStatsControllerCore::getPercentProductStock(); ConfigurationKPI::updateValue('PERCENT_PRODUCT_STOCK', $value); ConfigurationKPI::updateValue('PERCENT_PRODUCT_STOCK_EXPIRE', strtotime('+4 hour')); break; case 'percent_product_out_of_stock': - $value = AdminStatsController::getPercentProductOutOfStock(); + $value = AdminStatsControllerCore::getPercentProductOutOfStock(); ConfigurationKPI::updateValue('PERCENT_PRODUCT_OUT_OF_STOCK', $value); ConfigurationKPI::updateValue('PERCENT_PRODUCT_OUT_OF_STOCK_EXPIRE', strtotime('+4 hour')); break; case 'product_avg_gross_margin': - $value = AdminStatsController::getProductAverageGrossMargin(); + $value = AdminStatsControllerCore::getProductAverageGrossMargin(); break; case 'disabled_categories': - $value = AdminStatsController::getDisabledCategories(); + $value = AdminStatsControllerCore::getDisabledCategories(); break; case 'disabled_room_types': - $value = AdminStatsController::getDisabledRoomTypes(0); + $value = AdminStatsControllerCore::getDisabledRoomTypes($idHotels); ConfigurationKPI::updateValue('DISABLED_ROOM_TYPES', $value); ConfigurationKPI::updateValue('DISABLED_ROOM_TYPES_EXPIRE', strtotime('+2 hour')); break; case 'disabled_products': - if (AdminStatsController::getTotalProducts()) { - $value = round(100 * AdminStatsController::getDisabledProducts() / AdminStatsController::getTotalProducts(), 2).'%'; + if (AdminStatsControllerCore::getTotalProducts()) { + $value = round(100 * AdminStatsControllerCore::getDisabledProducts() / AdminStatsControllerCore::getTotalProducts(), 2).'%'; } else { $value = '0%'; } break; case '8020_sales_catalog': - $value = AdminStatsController::get8020SalesCatalog(date('Y-m-d', strtotime('-30 days')), date('Y-m-d')); + $value = AdminStatsControllerCore::get8020SalesCatalog(date('Y-m-d', strtotime('-30 days')), date('Y-m-d')); $value = sprintf($this->l('%d%% of your Catalog'), $value); break; case 'empty_categories': - $value = AdminStatsController::getEmptyCategories(); + $value = AdminStatsControllerCore::getEmptyCategories(); break; case 'customer_main_gender': - $value = AdminStatsController::getCustomerMainGender(); + $value = AdminStatsControllerCore::getCustomerMainGender(); if ($value === false) { $value = $this->l('No customers', null, null, false); @@ -718,11 +720,11 @@ class AdminStatsControllerCore extends AdminStatsTabController break; case 'pending_messages': - $value = (int)AdminStatsController::getPendingMessages(); + $value = (int)AdminStatsControllerCore::getPendingMessages(); break; case 'avg_msg_response_time': - $value = AdminStatsController::getAverageMessageResponseTime(date('Y-m-d', strtotime('-31 day')), date('Y-m-d', strtotime('-1 day')), true); + $value = AdminStatsControllerCore::getAverageMessageResponseTime(date('Y-m-d', strtotime('-31 day')), date('Y-m-d', strtotime('-1 day')), true); if ($value <= 0) { $value = '--'; @@ -736,7 +738,7 @@ class AdminStatsControllerCore extends AdminStatsTabController break; case 'messages_per_thread': - $value = round(AdminStatsController::getMessagesPerThread(date('Y-m-d', strtotime('-31 day')), date('Y-m-d', strtotime('-1 day'))), 1); + $value = round(AdminStatsControllerCore::getMessagesPerThread(date('Y-m-d', strtotime('-31 day')), date('Y-m-d', strtotime('-1 day'))), 1); break; case 'enabled_languages': @@ -752,7 +754,7 @@ class AdminStatsControllerCore extends AdminStatsTabController break; case 'main_country': - if (!($row = AdminStatsController::getMainCountry(date('Y-m-d', strtotime('-30 day')), date('Y-m-d')))) { + if (!($row = AdminStatsControllerCore::getMainCountry(date('Y-m-d', strtotime('-30 day')), date('Y-m-d')))) { $value = $this->l('No orders', null, null, false); } else { $country = new Country($row['id_country'], $this->context->language->id); @@ -803,10 +805,10 @@ class AdminStatsControllerCore extends AdminStatsTabController $date_from = date('Y-m-d', strtotime('-'.($daysForProfitPerVisitor + 1).' day')); $date_to = date('Y-m-d', strtotime('-1 day')); - $total_visitors = AdminStatsController::getVisits(false, $date_from, $date_to); - $net_profits = AdminStatsController::getTotalSales($date_from, $date_to); - $net_profits -= AdminStatsController::getExpenses($date_from, $date_to); - $net_profits -= AdminStatsController::getPurchases($date_from, $date_to); + $total_visitors = AdminStatsControllerCore::getVisits(false, $date_from, $date_to); + $net_profits = AdminStatsControllerCore::getTotalSales($date_from, $date_to, false, $idHotels); + $net_profits -= AdminStatsControllerCore::getExpenses($date_from, $date_to, false, $idHotels); + $net_profits -= AdminStatsControllerCore::getPurchases($date_from, $date_to, false, $idHotels); if ($total_visitors) { $value = Tools::displayPrice($net_profits / $total_visitors, $currency); @@ -819,13 +821,13 @@ class AdminStatsControllerCore extends AdminStatsTabController break; case 'products_per_category': - $products = AdminStatsController::getTotalProducts(); - $categories = AdminStatsController::getTotalCategories(); + $products = AdminStatsControllerCore::getTotalProducts(); + $categories = AdminStatsControllerCore::getTotalCategories(); $value = round($products / $categories); break; case 'top_category': - if (!($id_category = AdminStatsController::getBestCategory(date('Y-m-d', strtotime('-1 month')), date('Y-m-d', strtotime('+1 month'))))) { + if (!($id_category = AdminStatsControllerCore::getBestCategory(date('Y-m-d', strtotime('-1 month')), date('Y-m-d', strtotime('+1 month'))))) { $value = $this->l('No category', null, null, false); } else { $category = new Category($id_category, $this->context->language->id); @@ -837,10 +839,10 @@ class AdminStatsControllerCore extends AdminStatsTabController case 'best_selling_room_type': $nbDaysBestSelling = Validate::isUnsignedInt(Configuration::get('PS_KPI_BEST_SELLING_ROOM_TYPE_NB_DAYS')) ? Configuration::get('PS_KPI_BEST_SELLING_ROOM_TYPE_NB_DAYS') : 30; - if (!($idProduct = AdminStatsController::getBestSellingRoomType( + if (!($idProduct = AdminStatsControllerCore::getBestSellingRoomType( date('Y-m-d', strtotime('-'.($nbDaysBestSelling + 1).' day')), date('Y-m-d', strtotime('-1 day')), - 0 + $idHotels ))) { $value = $this->l('--', null, null, false); } else { @@ -851,42 +853,42 @@ class AdminStatsControllerCore extends AdminStatsTabController break; case 'total_rooms': - $value = AdminStatsController::getTotalRooms(0); + $value = AdminStatsControllerCore::getTotalRooms($idHotels); break; case 'occupied_rooms': - $value = AdminStatsController::getOccupiedRooms(0); + $value = AdminStatsControllerCore::getOccupiedRooms($idHotels); break; case 'vacant_rooms': - $totalAvailableRooms = AdminStatsController::getAvailableRoomsForDiscreteDates(date('Y-m-d'), null, 0); + $totalAvailableRooms = AdminStatsControllerCore::getAvailableRoomsForDiscreteDates(date('Y-m-d'), null, $idHotels); $totalAvailableRooms = $totalAvailableRooms[strtotime(date('Y-m-d'))]; - $totalOccupiedRooms = AdminStatsController::getOccupiedRooms(0); + $totalOccupiedRooms = AdminStatsControllerCore::getOccupiedRooms($idHotels); $value = $totalAvailableRooms - $totalOccupiedRooms; break; case 'booked_rooms': - $value = AdminStatsController::getBookedRooms(0); + $value = AdminStatsControllerCore::getBookedRooms($idHotels); break; case 'disabled_rooms': - $value = AdminStatsController::getDisabledRoomsForDiscreteDates(date('Y-m-d'), null, 0); + $value = AdminStatsControllerCore::getDisabledRoomsForDiscreteDates(date('Y-m-d'), null, $idHotels); $value = $value[strtotime(date('Y-m-d'))]; break; case 'online_bookable_rooms': - $value = AdminStatsController::getAvailableRoomsForDiscreteDates(date('Y-m-d'), null, 0, 1); + $value = AdminStatsControllerCore::getAvailableRoomsForDiscreteDates(date('Y-m-d'), null, $idHotels, 1); $value = $value[strtotime(date('Y-m-d'))]; break; case 'offline_bookable_rooms': - $value = AdminStatsController::getAvailableRoomsForDiscreteDates(date('Y-m-d'), null, 0); + $value = AdminStatsControllerCore::getAvailableRoomsForDiscreteDates(date('Y-m-d'), null, $idHotels); $value = $value[strtotime(date('Y-m-d'))]; break; @@ -894,17 +896,17 @@ class AdminStatsControllerCore extends AdminStatsTabController case 'total_frequent_customers': $nbOrdersFrequentCustomers = Configuration::get('PS_KPI_FREQUENT_CUSTOMER_NB_ORDERS'); - $value = AdminStatsController::getTotalFrequentCustomers($nbOrdersFrequentCustomers, 0); + $value = AdminStatsControllerCore::getTotalFrequentCustomers($nbOrdersFrequentCustomers, $idHotels); break; case 'revenue_per_available_customer': $nbDaysRevPac = Configuration::get('PS_KPI_REVPAC_NB_DAYS'); - $value = AdminStatsController::getRevenuePerAvailableCustomer( + $value = AdminStatsControllerCore::getRevenuePerAvailableCustomer( date('Y-m-d', strtotime('-'.($nbDaysRevPac + 1).' day')), date('Y-m-d', strtotime('-1 day')), - 0 + $idHotels ); $value = Tools::displayPrice($value, $currency); @@ -912,23 +914,23 @@ class AdminStatsControllerCore extends AdminStatsTabController break; case 'total_newsletter_registrations': - $value = AdminStatsController::getTotalNewsletterRegistrations(); + $value = AdminStatsControllerCore::getTotalNewsletterRegistrations(); break; case 'total_new_customers': $nbDaysNewCustomers = Validate::isUnsignedInt(Configuration::get('PS_KPI_NEW_CUSTOMERS_NB_DAYS')) ? Configuration::get('PS_KPI_NEW_CUSTOMERS_NB_DAYS') : 30; - $value = AdminStatsController::getTotalNewCustomers($nbDaysNewCustomers); + $value = AdminStatsControllerCore::getTotalNewCustomers($nbDaysNewCustomers); break; case 'total_banned_customers': - $value = AdminStatsController::getTotalBannedCustomers(); + $value = AdminStatsControllerCore::getTotalBannedCustomers(); break; case 'total_sales': - $totalSales = AdminStatsController::getTotalSales('', '', false, false, 1); + $totalSales = AdminStatsController::getTotalSales('', '', false, $idHotels); if ($totalSales > 0) { $value = Tools::displayPrice($totalSales, $currency); } else { @@ -938,24 +940,24 @@ class AdminStatsControllerCore extends AdminStatsTabController case 'today_arrivals': $dateToday = date('Y-m-d'); $value = 0; - if ($arrivalsData = AdminStatsController::getArrivalsByDate($dateToday)) { + if ($arrivalsData = AdminStatsControllerCore::getArrivalsByDate($dateToday, $idHotels)) { $value = $arrivalsData['total_arrivals']; } break; case 'today_departures': $dateToday = date('Y-m-d'); $value = 0; - if ($departureData = AdminStatsController::getDeparturesByDate($dateToday)) { + if ($departureData = AdminStatsControllerCore::getDeparturesByDate($dateToday, $idHotels)) { $value = $departureData['total_departures']; } break; case 'today_stay_over': $dateToday = date('Y-m-d'); - $value = AdminStatsController::getStayOversByDate($dateToday); + $value = AdminStatsControllerCore::getStayOversByDate($dateToday, $idHotels); break; case 'total_due_amount': $dateToday = date('Y-m-d'); - $dueAmount = AdminStatsController::getTotalDueAmount('', '', false, 1); + $dueAmount = AdminStatsControllerCore::getTotalDueAmount('', '', $idHotels, 1); if ($dueAmount > 0) { $value = Tools::displayPrice($dueAmount, $currency); } else { @@ -964,11 +966,11 @@ class AdminStatsControllerCore extends AdminStatsTabController break; case 'average_lead_time': $dateToday = date('Y-m-d'); - $value = Tools::ps_round(AdminStatsController::getAverageLeadTime(), 2); + $value = Tools::ps_round(AdminStatsControllerCore::getAverageLeadTime('', '', $idHotels), 2); break; case 'average_guest_in_booking': $dateToday = date('Y-m-d'); - $value = AdminStatsController::getAverageGuestsPerBooking(); + $value = AdminStatsControllerCore::getAverageGuestsPerBooking('', '', $idHotels); $value = Tools::ps_round($value['avg_adults'], 2).''.$this->l('Adults').', '.Tools::ps_round($value['avg_children'], 2).''.$this->l('Children'); break; default: diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 5f275f62d..b3604821b 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -1366,7 +1366,7 @@ class AdminTranslationsControllerCore extends AdminController $helper->href = $this->context->link->getAdminLink('AdminLanguages'); $helper->title = $this->l('Enabled Languages', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=enabled_languages'; - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-fo-translations'; @@ -1374,7 +1374,7 @@ class AdminTranslationsControllerCore extends AdminController $helper->color = 'color3'; $helper->title = $this->l('Front office Translations', null, null, false); $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=frontoffice_translations'; - $kpis[] = $helper; + $this->kpis[] = $helper; $helper = new HelperKpi(); $helper->id = 'box-bo-translations'; @@ -1386,15 +1386,9 @@ class AdminTranslationsControllerCore extends AdminController } $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=backoffice_translations'; $helper->refresh = (bool)(ConfigurationKPI::get('BACKOFFICE_TRANSLATIONS_EXPIRE') < $time); - $kpis[] = $helper; + $this->kpis[] = $helper; - Hook::exec('action'.$this->controller_name.'KPIListingModifier', array( - 'kpis' => &$kpis, - )); - - $helper = new HelperKpiRow(); - $helper->kpis = $kpis; - return $helper->generate(); + return parent::renderKpis(); } /** diff --git a/modules/hotelreservationsystem/classes/HotelBranchInformation.php b/modules/hotelreservationsystem/classes/HotelBranchInformation.php index 05af3c72b..d950e1566 100644 --- a/modules/hotelreservationsystem/classes/HotelBranchInformation.php +++ b/modules/hotelreservationsystem/classes/HotelBranchInformation.php @@ -852,11 +852,19 @@ class HotelBranchInformation extends ObjectModel $idProfile = Context::getContext()->employee->id_profile; } + $accessedIds = self::getProfileAccessedHotels($idProfile, 1, 1); if (!$idsHotel) { - $idsHotel = self::getProfileAccessedHotels($idProfile, 1, 1); + $idsHotel = $accessedIds; } else { - $idsHotel = array($idsHotel); + if (!is_array($idsHotel)) { + $idsHotel = array($idsHotel); + } + // check if passed hotel id's are available for current employee + $idsHotel = array_filter($idsHotel, function ($idHotel) use($accessedIds) { + return in_array($idHotel, $accessedIds); + }); } + $restriction = ' AND '; if (count($idsHotel)) { if ($alias) { @@ -866,7 +874,7 @@ class HotelBranchInformation extends ObjectModel $identifier = "`$identifier`"; $restriction .= $alias.$identifier.' IN ('.implode(', ', $idsHotel).') '; } else { - $restriction .= 1; + $restriction .= 0; } return $restriction;