diff --git a/admin/themes/default/template/controllers/access/helpers/form/form.tpl b/admin/themes/default/template/controllers/access/helpers/form/form.tpl
index d3f2a73f8..7c5a71acc 100644
--- a/admin/themes/default/template/controllers/access/helpers/form/form.tpl
+++ b/admin/themes/default/template/controllers/access/helpers/form/form.tpl
@@ -107,6 +107,47 @@
}
perfect_access_js_gestion(this, perm, id_tab, tabsize, tabnumber, table);
+ if (perm == 'kpi') {
+ $(table + ' .kpi.' + id_tab).prop('checked', !!enabled);
+ }
+
+ $(table + ' tr.kpi-row').each(function() {
+ var kpiTabId = $(this).data('kpi-parent');
+ var kpiProfile = $(this).data('kpi-profile');
+ var $kpiInputs = $(this).find('input.ajaxPower.kpi');
+ if (!$kpiInputs.length || $kpiInputs.first().data('kpi-editable') != 1) { return; }
+ // For perm=view, read state directly from action — jQuery 1.11 .attr() doesn't update .prop()
+ var parentEnabled = (perm == 'view' && (id_tab == kpiTabId || id_tab == -1))
+ ? !!enabled
+ : $(table + ' input.view.' + kpiTabId).first().is(':checked');
+ if (!parentEnabled) {
+ $kpiInputs.prop('checked', false).prop('disabled', true);
+ } else {
+ $kpiInputs.prop('disabled', false);
+ if (perm == 'all' && (id_tab == -1 || id_tab == kpiTabId)) {
+ $kpiInputs.prop('checked', !!enabled).first().trigger('change');
+ }
+ if (perm == 'view' && (id_tab == kpiTabId || id_tab == -1) && !!enabled) {
+ $kpiInputs.prop('checked', true);
+ $.ajax({
+ url: "{$link->getAdminLink('AdminAccess')|addslashes}",
+ cache: false,
+ data: {
+ ajaxMode: '1',
+ id_tab: kpiTabId,
+ id_profile: kpiProfile,
+ perm: 'kpi',
+ enabled: 1,
+ submitAddAccess: '1',
+ action: 'updateAccess',
+ ajax: '1',
+ token: '{getAdminToken tab='AdminAccess'}'
+ }
+ });
+ }
+ }
+ });
+
$.ajax({
url: "{$link->getAdminLink('AdminAccess')|addslashes}",
cache: false,
@@ -349,6 +390,32 @@
+ {if !empty($tab.has_kpi)}
+
+ | » {l s='KPI'} |
+
+
+ |
+ |
+ |
+ |
+
+
+ |
+
+ {/if}
{foreach $tabs AS $child}
{if $child.id_parent === $tab.id_tab}
{if isset($access[$child.id_tab])}
@@ -372,6 +439,32 @@
+ {if !empty($child.has_kpi)}
+
+ | » {l s='KPI'} |
+
+
+ |
+ |
+ |
+ |
+
+
+ |
+
+ {/if}
{/if}
{/if}
{/foreach}
@@ -438,4 +531,4 @@
{/foreach}
-
+
\ No newline at end of file
diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
index c5a4f58ae..3ed6b7448 100644
--- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -456,7 +456,7 @@
{l s='Transaction ID'} |
{l s='Amount'} |
{l s='Invoice'} |
- |
+ |
@@ -468,6 +468,11 @@
{$payment['transaction_id']|escape:'html':'UTF-8'} |
{displayPrice price=$payment['real_paid_amount'] currency=$payment['id_currency']} |
{if isset($payment['invoice_number'])}{$payment['invoice_number']}{else}--{/if} |
+ {if isset($receipt_management_active) && $receipt_management_active}
+
+ {l s='Receipt'}
+ |
+ {/if}
{l s='Details'}
|
diff --git a/classes/Profile.php b/classes/Profile.php
index 39637163a..54900fb44 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -81,7 +81,7 @@ class ProfileCore extends ObjectModel
public function add($autodate = true, $null_values = false)
{
if (parent::add($autodate, true)) {
- $result = Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'access (SELECT '.(int)$this->id.', id_tab, 0, 0, 0, 0 FROM '._DB_PREFIX_.'tab)');
+ $result = Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'access (SELECT '.(int)$this->id.', id_tab, 0, 0, 0, 0, 0 FROM '._DB_PREFIX_.'tab)');
$result &= Db::getInstance()->execute('
INSERT INTO '._DB_PREFIX_.'module_access
(`id_profile`, `id_module`, `configure`, `view`, `uninstall`)
@@ -138,6 +138,7 @@ class ProfileCore extends ObjectModel
'add' => 1,
'edit' => 1,
'delete' => 1,
+ 'kpi' => 1,
);
}
} else {
@@ -151,6 +152,7 @@ class ProfileCore extends ObjectModel
$result[$key]['delete'] = (int) $profileAccess['delete'];
$result[$key]['add'] = (int) $profileAccess['add'];
$result[$key]['edit'] = (int) $profileAccess['edit'];
+ $result[$key]['kpi'] = (int) $profileAccess['kpi'];
}
}
diff --git a/classes/Tab.php b/classes/Tab.php
index 662ad74b5..4f8dfed89 100644
--- a/classes/Tab.php
+++ b/classes/Tab.php
@@ -137,12 +137,12 @@ class TabCore extends ObjectModel
}
/* Query definition */
- $query = 'REPLACE INTO `'._DB_PREFIX_.'access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) VALUES ';
- $query .= '(1, '.(int)$id_tab.', 1, 1, 1, 1),';
+ $query = 'REPLACE INTO `'._DB_PREFIX_.'access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`, `kpi`) VALUES ';
+ $query .= '(1, '.(int)$id_tab.', 1, 1, 1, 1, 1),';
foreach ($profiles as $profile) {
$rights = $profile['id_profile'] == $context->employee->id_profile ? 1 : 0;
- $query .= '('.(int)$profile['id_profile'].', '.(int)$id_tab.', '.(int)$rights.', '.(int)$rights.', '.(int)$rights.', '.(int)$rights.'),';
+ $query .= '('.(int)$profile['id_profile'].', '.(int)$id_tab.', '.(int)$rights.', '.(int)$rights.', '.(int)$rights.', '.(int)$rights.', '.(int)$rights.'),';
}
$query = trim($query, ', ');
return Db::getInstance()->execute($query);
@@ -247,7 +247,7 @@ class TabCore extends ObjectModel
* @return array tabs
*/
protected static $_cache_tabs = array();
- public static function getTabs($id_lang, $id_parent = null)
+ public static function getTabs($id_lang, $id_parent = null, $include_kpi = false)
{
if (!isset(self::$_cache_tabs[$id_lang])) {
self::$_cache_tabs[$id_lang] = array();
@@ -274,10 +274,52 @@ class TabCore extends ObjectModel
foreach (self::$_cache_tabs[$id_lang] as $array_parent) {
$array_all = array_merge($array_all, $array_parent);
}
- return $array_all;
+ $tabs = $array_all;
+ } else {
+ $tabs = isset(self::$_cache_tabs[$id_lang][$id_parent]) ? self::$_cache_tabs[$id_lang][$id_parent] : array();
}
- return (isset(self::$_cache_tabs[$id_lang][$id_parent]) ? self::$_cache_tabs[$id_lang][$id_parent] : array());
+ if ($include_kpi) {
+ $hookKpiClasses = array();
+ $hookRows = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
+ SELECT DISTINCT SUBSTRING(h.`name`, 7, LENGTH(h.`name`) - 24) AS `class_name`
+ FROM `'._DB_PREFIX_.'hook` h
+ INNER JOIN `'._DB_PREFIX_.'hook_module` hm
+ ON hm.`id_hook` = h.`id_hook`
+ AND hm.`id_shop` = '.(int)Context::getContext()->shop->id.'
+ INNER JOIN `'._DB_PREFIX_.'module` m
+ ON m.`id_module` = hm.`id_module` AND m.`active` = 1
+ WHERE h.`name` LIKE \'action%KPIListingModifier\''
+ );
+ if (is_array($hookRows)) {
+ foreach ($hookRows as $row) {
+ $hookKpiClasses[$row['class_name']] = true;
+ }
+ }
+
+ foreach ($tabs as &$tab) {
+ if (!empty($tab['module'])) {
+ $file = _PS_MODULE_DIR_.$tab['module'].'/controllers/admin/'.$tab['class_name'].'Controller.php';
+ $class_name = $tab['class_name'].'Controller';
+ } else {
+ $file = _PS_CONTROLLER_DIR_.'admin/'.$tab['class_name'].'Controller.php';
+ $class_name = $tab['class_name'].'ControllerCore';
+ }
+ if (file_exists($file) && !class_exists($class_name)) {
+ require_once $file;
+ }
+ try {
+ $objreflect = new ReflectionMethod($class_name, 'renderKpis');
+ $tab['has_kpi'] = ($objreflect->getDeclaringClass()->getName() === $class_name)
+ || isset($hookKpiClasses[$tab['class_name']]);
+ } catch (ReflectionException $e) {
+ $tab['has_kpi'] = isset($hookKpiClasses[$tab['class_name']]);
+ }
+ }
+ unset($tab);
+ }
+
+ return $tabs;
}
/**
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 88cb91075..bdf2d3f74 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -2307,7 +2307,9 @@ class AdminControllerCore extends Controller
$this->content .= $this->renderDetails();
} elseif (!$this->ajax) {
$this->content .= $this->renderModulesList();
- $this->content .= $this->renderKpis();
+ if ($this->tabAccess['kpi'] === 1) {
+ $this->content .= $this->renderKpis();
+ }
$this->content .= $this->renderList();
$this->content .= $this->renderOptions();
diff --git a/classes/order/Order.php b/classes/order/Order.php
index 7bceb94cf..e5ed30602 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -1905,7 +1905,15 @@ class OrderCore extends ObjectModel
$order_payment_detail->id_order = $this->id;
$order_payment_detail->id_order_payment = (int)$payment->id;
$order_payment_detail->amount = $amount;
+ $receipt_number = Configuration::get('PS_PAYMENT_RECEIPTS_START_NUMBER', null, null, $this->id_shop);
+ // If payment start number has been set, you clean the value of this configuration
+ if ($receipt_number) {
+ Configuration::updateValue('PS_PAYMENT_RECEIPTS_START_NUMBER', false, false, null, $this->id_shop);
+ }else{
+ $receipt_number = OrderPaymentDetail::getLastPaymentReceiptNumber() + 1;
+ }
+ $order_payment_detail->receipt_number = $receipt_number;
if ($payment->id_currency == $this->id_currency) {
$this->total_paid_real += $order_payment_detail->amount;
} else {
@@ -1935,6 +1943,8 @@ class OrderCore extends ObjectModel
return false;
}
+
+
/**
* Returns the correct product taxes breakdown.
*
@@ -3148,4 +3158,26 @@ class OrderCore extends ObjectModel
return $totalOrder;
}
+
+ public function getPaymentsTypes()
+ {
+ $module = Module::getInstanceByName('hotelreservationsystem');
+ return array(
+ OrderPayment::PAYMENT_TYPE_PAY_AT_HOTEL => array(
+ 'key' => 'PAYMENT_TYPE_PAY_AT_HOTEL',
+ 'value' => OrderPayment::PAYMENT_TYPE_PAY_AT_HOTEL,
+ 'name' => $module->l('Pay at hotel')
+ ),
+ OrderPayment::PAYMENT_TYPE_ONLINE => array(
+ 'key' => 'PAYMENT_TYPE_ONLINE',
+ 'value' => OrderPayment::PAYMENT_TYPE_ONLINE,
+ 'name' => $module->l('Online')
+ ),
+ OrderPayment::PAYMENT_TYPE_REMOTE_PAYMENT => array(
+ 'key' => 'PAYMENT_TYPE_REMOTE_PAYMENT',
+ 'value' => OrderPayment::PAYMENT_TYPE_REMOTE_PAYMENT,
+ 'name' => $module->l('Remote payment')
+ ),
+ );
+ }
}
diff --git a/classes/order/OrderPayment.php b/classes/order/OrderPayment.php
index b3f3c981b..c20215785 100644
--- a/classes/order/OrderPayment.php
+++ b/classes/order/OrderPayment.php
@@ -159,4 +159,5 @@ class OrderPaymentCore extends ObjectModel
{
return Db::getInstance()->getValue('SELECT (SUM(`amount` * `conversion_rate`) / SUM(`amount`)) FROM `'._DB_PREFIX_.'order_payment` WHERE `order_reference` = \''.pSQL($order_reference).'\' AND `id_currency` = '.(int)$idCurrency);
}
+
}
diff --git a/classes/order/OrderPaymentDetail.php b/classes/order/OrderPaymentDetail.php
index f1e616bc8..72ae48635 100644
--- a/classes/order/OrderPaymentDetail.php
+++ b/classes/order/OrderPaymentDetail.php
@@ -26,6 +26,7 @@ class OrderPaymentDetailCore extends ObjectModel
public $id_order_payment;
public $id_order;
public $amount;
+ public $receipt_number;
public $date_add;
public static $definition = array(
@@ -35,6 +36,7 @@ class OrderPaymentDetailCore extends ObjectModel
'id_order_payment' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
'id_order' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
'amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isNegativePrice', 'required' => true),
+ 'receipt_number' => array('type' => self::TYPE_INT, 'validate' => 'isGenericName', 'size' => 64),
'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
)
);
@@ -71,4 +73,49 @@ class OrderPaymentDetailCore extends ObjectModel
WHERE oip.`id_order_invoice` = '.(int)$id_invoice
);
}
+
+ public static function getLastPaymentReceiptNumber()
+ {
+ $sql = 'SELECT MAX(`receipt_number`) FROM `'._DB_PREFIX_.'order_payment_detail`';
+ if (Configuration::get('PS_PAYMENT_RECEIPTS_RESET')) {
+ $sql .= ' WHERE DATE_FORMAT(`date_add`, "%Y") = '.(int)date('Y');
+ }
+ return Db::getInstance()->getValue($sql);
+ }
+
+ public static function getPaymentDetailsByPaymentId($id_order_payment)
+ {
+ return Db::getInstance()->executeS('
+ SELECT *
+ FROM `'._DB_PREFIX_.'order_payment_detail`
+ WHERE `id_order_payment` = '.(int)$id_order_payment
+ );
+ }
+
+ public static function getByDateInterval($date_from, $date_to)
+ {
+ $payment_list = Db::getInstance()->executeS('
+ SELECT DISTINCT opd.*
+ FROM `'._DB_PREFIX_.'order_payment_detail` opd
+ LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = opd.`id_order`)
+ WHERE DATE_ADD(opd.`date_add`, INTERVAL -1 DAY) <= \''.pSQL($date_to).'\'
+ AND opd.`date_add` >= \''.pSQL($date_from).'\'
+ AND opd.`receipt_number` > 0
+ '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').'
+ ORDER BY opd.`date_add` ASC, opd.`id_order_payment_detail` ASC
+ ');
+
+ return ObjectModel::hydrateCollection('OrderPaymentDetail', $payment_list);
+ }
+
+ public function getPaymentReceiptNumberFormated($id_lang, $id_shop = null)
+ {
+ $format = '%1$s%2$06d';
+
+ if (Configuration::get('PS_PAYMENT_RECEIPTS_USE_YEAR')) {
+ $format = '%1$s%2$06d/%3$s';
+ }
+
+ return sprintf($format, Configuration::get('PS_PAYMENT_RECEIPTS_PREFIX', (int)$id_lang, null, (int)$id_shop), $this->receipt_number, date('Y', strtotime($this->date_add)));
+ }
}
diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php
index c23fdd280..e5b36b518 100644
--- a/classes/pdf/HTMLTemplateInvoice.php
+++ b/classes/pdf/HTMLTemplateInvoice.php
@@ -474,8 +474,32 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] = 1;
$fullDate = (isset($context->controller->show_full_date) && $context->controller->show_full_date && (date('Y-m-d', strtotime($data_v['date_from'])) == date('Y-m-d', strtotime($data_v['date_to'])))) ? true : false;
- $cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = Tools::displayDate($data_v['date_from'], null, $fullDate);
- $cart_htl_data[$type_key]['date_diff'][$date_join]['data_to'] = Tools::displayDate($data_v['date_to'], null, $fullDate);
+ $display_date_from = $data_v['date_from'];
+ $display_date_to = $data_v['date_to'];
+ if ((int)$data_v['id_status'] === HotelBookingDetail::STATUS_CHECKED_OUT) {
+ if ($data_v['check_in']) {
+ $display_date_from = $data_v['check_in'];
+ }
+ if ($data_v['check_out']) {
+ $display_date_to = $data_v['check_out'];
+ }
+ } elseif ((int)$data_v['id_status'] === HotelBookingDetail::STATUS_CHECKED_IN) {
+ if ($data_v['check_in']) {
+ $display_date_from = $data_v['check_in'];
+ }
+ if ($data_v['check_out_time']) {
+ $display_date_to = date('Y-m-d', strtotime($data_v['date_to'])) . ' ' . date('H:i:s', strtotime($data_v['check_out_time']));
+ }
+ } else {
+ if ($data_v['check_in_time']) {
+ $display_date_from = date('Y-m-d', strtotime($data_v['date_from'])) . ' ' . date('H:i:s', strtotime($data_v['check_in_time']));
+ }
+ if ($data_v['check_out_time']) {
+ $display_date_to = date('Y-m-d', strtotime($data_v['date_to'])) . ' ' . date('H:i:s', strtotime($data_v['check_out_time']));
+ }
+ }
+ $cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = Tools::displayDate($display_date_from, null, true);
+ $cart_htl_data[$type_key]['date_diff'][$date_join]['data_to'] = Tools::displayDate($display_date_to, null, true);
$cart_htl_data[$type_key]['date_diff'][$date_join]['num_days'] = $num_days;
$cart_htl_data[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults'];
$cart_htl_data[$type_key]['date_diff'][$date_join]['children'] = $data_v['children'];
diff --git a/classes/pdf/HTMLTemplatePaymentReceipt.php b/classes/pdf/HTMLTemplatePaymentReceipt.php
new file mode 100644
index 000000000..ec5ab1c87
--- /dev/null
+++ b/classes/pdf/HTMLTemplatePaymentReceipt.php
@@ -0,0 +1,171 @@
+paymentReceipt = $paymentReceipt;
+ $this->smarty = $smarty;
+ $this->date = Tools::displayDate($this->paymentReceipt->date_add);
+ $id_lang = Context::getContext()->language->id;
+ $this->orderPayment = new OrderPayment((int)$this->paymentReceipt->id_order_payment);
+ if (!Validate::isLoadedObject($this->orderPayment)) {
+ throw new PrestaShopException('Cannot load the payment associated with this payment receipt.');
+ }
+
+ $this->order = new Order((int)$this->paymentReceipt->id_order);
+
+ if (!Validate::isLoadedObject($this->order)) {
+ throw new PrestaShopException('Cannot load the order associated with this payment receipt.');
+ }
+
+ $id_shop = (int)$this->order->id_shop;
+ $this->shop = new Shop($id_shop);
+ $this->orderPayment->amount = $this->paymentReceipt->amount;
+ $this->title = $this->paymentReceipt->getPaymentReceiptNumberFormated($id_lang, $id_shop);
+ }
+
+ /**
+ * Returns the template's HTML header
+ *
+ * @return string HTML header
+ */
+ public function getHeader()
+ {
+ $this->assignCommonHeaderData();
+ $this->smarty->assign(array(
+ 'header' => HTMLTemplatePaymentReceipt::l('Receipt'),
+ ));
+
+ return $this->smarty->fetch($this->getTemplate('header'));
+ }
+
+ public function getFooter()
+ {
+ $shop_address = $this->getShopAddress();
+
+ $id_shop = (int)$this->shop->id;
+
+ $this->smarty->assign(array(
+ 'shop_address' => $shop_address,
+ 'shop_fax' => Configuration::get('PS_SHOP_FAX', null, null, $id_shop),
+ 'shop_phone' => Configuration::get('PS_SHOP_PHONE', null, null, $id_shop),
+ 'shop_email' => Configuration::get('PS_SHOP_EMAIL', null, null, $id_shop),
+ 'free_text' => Configuration::get('PS_PAYMENT_RECEIPTS_FREE_TEXT', (int)Context::getContext()->language->id, null, $id_shop)
+ ));
+
+ return $this->smarty->fetch($this->getTemplate('footer'));
+ }
+
+ public function getContent()
+ {
+ $delivery_address = $invoice_address = new Address((int)$this->order->id_address_invoice);
+ $formatted_invoice_address = AddressFormat::generateAddress($invoice_address, array(), '
', ' ');
+ $formatted_delivery_address = '';
+
+ if ($this->order->id_address_delivery != $this->order->id_address_invoice) {
+ $delivery_address = new Address((int)$this->order->id_address_delivery);
+ $formatted_delivery_address = AddressFormat::generateAddress($delivery_address, array(), '
', ' ');
+ }
+
+ $formattedHotelAddress = '';
+ if (Module::isInstalled('hotelreservationsystem')) {
+ if ($idHotel = HotelBookingDetail::getIdHotelByIdOrder($this->order->id)) {
+ $objHotelBranchInfo = new HotelBranchInformation((int) $idHotel, Context::getContext()->language->id);
+ $invoiceAddressPatternRules['avoid'][] = 'lastname';
+ if ($idHotelAddress = $objHotelBranchInfo->getHotelIdAddress()) {
+ $objHotelAddress = new Address((int) $idHotelAddress);
+ $objHotelAddress->firstname = $objHotelBranchInfo->hotel_name;
+ $formattedHotelAddress = AddressFormat::generateAddress($objHotelAddress, $invoiceAddressPatternRules, '
', ' ');
+ }
+ }
+ }
+ $customer = new Customer((int)$this->order->id_customer);
+ $getPaymentTypes = $this->order->getPaymentsTypes();
+ $this->orderPayment->payment_type = isset($getPaymentTypes[$this->orderPayment->payment_type]) ? $getPaymentTypes[$this->orderPayment->payment_type] : null;
+
+ $legal_free_text = Configuration::get('PS_PAYMENT_RECEIPTS_LEGAL_FREE_TEXT', (int)Context::getContext()->language->id, null, (int)$this->order->id_shop);
+
+ $this->smarty->assign(array(
+ 'order' => $this->order,
+ 'payment_list' => array($this->orderPayment),
+ 'delivery_address' => $formatted_delivery_address,
+ 'invoice_address' => $formatted_invoice_address,
+ 'addresses' => array('invoice' => $invoice_address, 'delivery' => $delivery_address),
+ 'customer' => $customer,
+ 'hotel_address' => $formattedHotelAddress,
+ 'legal_free_text' => $legal_free_text,
+ ));
+
+ $smarty_tpls = array(
+ 'style_tab' => $this->smarty->fetch($this->getTemplate('payment-receipt.style-tab')),
+ 'addresses_tab' => $this->smarty->fetch($this->getTemplate('payment-receipt.addresses-tab')),
+ 'payment_info_tab' => $this->smarty->fetch($this->getTemplate('payment-receipt.payment-info-tab')),
+ );
+ $this->smarty->assign($smarty_tpls);
+ return $this->smarty->fetch($this->getTemplate('payment-receipt'));
+
+ }
+
+ public function getFilename()
+ {
+ return 'payment-receipt-'.sprintf('%06d', $this->paymentReceipt->id).'.pdf';
+ }
+
+ public function getBulkFilename()
+ {
+ return 'payment-receipts.pdf';
+ }
+
+ protected function getPaymentType($paymentType = null)
+ {
+ $paymentTypeName = null;
+ switch ($paymentType) {
+ case OrderPayment::PAYMENT_TYPE_PAY_AT_HOTEL:
+ $paymentTypeName = HTMLTemplatePaymentReceipt::l('Pay at hotel');
+ break;
+ case OrderPayment::PAYMENT_TYPE_ONLINE:
+ $paymentTypeName = HTMLTemplatePaymentReceipt::l('Online');
+ break;
+ case OrderPayment::PAYMENT_TYPE_REMOTE_PAYMENT:
+ $paymentTypeName = HTMLTemplatePaymentReceipt::l('Remote payment');
+ break;
+ default:
+ $paymentTypeName = null;
+ break;
+ }
+ return $paymentTypeName;
+ }
+}
diff --git a/classes/pdf/PDF.php b/classes/pdf/PDF.php
index 626d3a51a..833d5b17e 100644
--- a/classes/pdf/PDF.php
+++ b/classes/pdf/PDF.php
@@ -41,6 +41,7 @@ class PDFCore
const TEMPLATE_ORDER_SLIP = 'OrderSlip';
const TEMPLATE_DELIVERY_SLIP = 'DeliverySlip';
const TEMPLATE_SUPPLY_ORDER_FORM = 'SupplyOrderForm';
+ const TEMPLATE_PAYMENT_RECEIPT = 'PaymentReceipt';
/**
* @param $objects
diff --git a/composer.json b/composer.json
index 74ff00cb0..db48f1054 100644
--- a/composer.json
+++ b/composer.json
@@ -1,22 +1,52 @@
{
- "require": {
- "php": ">=5.4 <8.0",
- "ext-simplexml": "*",
- "ext-curl": "*",
- "ext-gd": "*",
- "ext-zip": "*",
- "ext-soap": "*"
- },
- "name": "webkul/qloapps",
+ "name": "qloapps/qloapps",
"description": "QloApps is an Open-source and Free hotel reservation system and booking engine. With the help of QloApps, you can launch your hotel booking website without any cost and take & manage online bookings.",
"type": "project",
+ "homepage": "https://qloapps.com",
"license": "OSL-3.0",
+ "keywords": [
+ "qloapps",
+ "hospitality",
+ "booking-engine",
+ "hotel-booking-website",
+ "hotel-management-system",
+ "hotel-reservation-system",
+ "property-management-system",
+ "cms"
+ ],
"authors": [
{
- "name": "webkul",
- "email": "support@qloapps.com"
+ "name": "QloApps",
+ "email": "support@qloapps.com",
+ "homepage": "https://qloapps.com"
+ },
+ {
+ "name": "QloApps Community",
+ "homepage": "https://github.com/Qloapps/QloApps/graphs/contributors"
}
],
- "minimum-stability": "dev",
- "prefer-stable": true
+ "support": {
+ "docs": "https://qloapps.com/docs/",
+ "email": "support@qloapps.com",
+ "forum": "https://forums.qloapps.com/",
+ "source": "https://github.com/Qloapps/QloApps"
+ },
+ "require": {
+ "php": ">8.0 <8.5",
+ "ext-curl": "*",
+ "ext-dom": "*",
+ "ext-gd": "*",
+ "ext-mcrypt": "*",
+ "ext-openssl": "*",
+ "ext-pdo_mysql": "*",
+ "ext-phar": "*",
+ "ext-simplexml": "*",
+ "ext-soap": "*",
+ "ext-zip": "*"
+ },
+ "minimum-stability": "stable",
+ "prefer-stable": true,
+ "config": {
+ "sort-packages": true
+ }
}
\ No newline at end of file
diff --git a/controllers/admin/AdminAccessController.php b/controllers/admin/AdminAccessController.php
index 74ef79b09..0d588c240 100644
--- a/controllers/admin/AdminAccessController.php
+++ b/controllers/admin/AdminAccessController.php
@@ -56,7 +56,7 @@ class AdminAccessControllerCore extends AdminController
{
$current_profile = (int)$this->getCurrentProfileId();
$profiles = Profile::getProfiles($this->context->language->id);
- $tabs = Tab::getTabs($this->context->language->id);
+ $tabs = Tab::getTabs($this->context->language->id, null, true);
$accesses = array();
foreach ($profiles as $profile) {
$accesses[$profile['id_profile']] = Profile::getProfileAccesses($profile['id_profile']);
@@ -214,7 +214,7 @@ class AdminAccessControllerCore extends AdminController
if (Tools::isSubmit('submitAddAccess')) {
$perm = Tools::getValue('perm');
- if (!in_array($perm, array('view', 'add', 'edit', 'delete', 'all'))) {
+ if (!in_array($perm, array('view', 'add', 'edit', 'delete', 'all', 'kpi'))) {
throw new PrestaShopException('permission does not exist');
}
diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php
index 1fc4a45ae..81ff78003 100644
--- a/controllers/admin/AdminDashboardController.php
+++ b/controllers/admin/AdminDashboardController.php
@@ -168,6 +168,10 @@ class AdminDashboardControllerCore extends AdminController
return parent::renderOptions();
}
+ if ($this->tabAccess['kpi'] === 1) {
+ $this->content .= $this->renderKpis();
+ }
+
// $translations = array(
// 'Calendar' => $this->l('Calendar', 'AdminStatsTab'),
// 'Day' => $this->l('Day', 'AdminStatsTab'),
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 8a3722b84..8e76b8a48 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -467,7 +467,9 @@ class AdminOrdersControllerCore extends AdminController
}
$paymentTypes = array();
- foreach ($this->getPaymentsTypes() as $paymentType) {
+ $objOrder = new Order();
+
+ foreach ($objOrder->getPaymentsTypes() as $paymentType) {
if ($paymentType['value'] != OrderPayment::PAYMENT_TYPE_REMOTE_PAYMENT) {
$paymentTypes[] = $paymentType;
}
@@ -682,7 +684,7 @@ class AdminOrdersControllerCore extends AdminController
'order' => $objOrder,
'currencies' => $currencies,
'payment_methods' => $payment_methods,
- 'payment_types' => $this->getPaymentsTypes(),
+ 'payment_types' => $objOrder->getPaymentsTypes(),
'invoices_collection' => $objOrder->getInvoicesCollection(),
'current_id_lang' => $this->context->language->id,
)
@@ -3213,8 +3215,9 @@ class AdminOrdersControllerCore extends AdminController
if (!Validate::isLoadedObject($order = new Order(Tools::getValue('id_order')))) {
return;
}
-
- $this->content .= $this->renderKpis();
+ if ($this->tabAccess['kpi'] === 1) {
+ $this->content .= $this->renderKpis();
+ }
$customer = new Customer($order->id_customer);
$carrier = new Carrier($order->id_carrier);
@@ -3763,8 +3766,9 @@ class AdminOrdersControllerCore extends AdminController
'invoices_collection' => $order->getInvoicesCollection(),
'not_paid_invoices_collection' => $order->getNotPaidInvoicesCollection(),
'payment_methods' => $payment_methods,
- 'payment_types' => $this->getPaymentsTypes(),
+ 'payment_types' => $order->getPaymentsTypes(),
'invoice_management_active' => Configuration::get('PS_INVOICE', null, null, $order->id_shop),
+ 'receipt_management_active' => Configuration::get('PS_PAYMENT_RECEIPTS', null, null, $order->id_shop),
'display_warehouse' => (int)Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'),
'HOOK_CONTENT_ORDER' => Hook::exec(
'displayAdminOrderContentOrder',
@@ -7273,26 +7277,6 @@ class AdminOrdersControllerCore extends AdminController
return $products;
}
- protected function getPaymentsTypes()
- {
- return array(
- OrderPayment::PAYMENT_TYPE_PAY_AT_HOTEL => array(
- 'key' => 'PAYMENT_TYPE_PAY_AT_HOTEL',
- 'value' => OrderPayment::PAYMENT_TYPE_PAY_AT_HOTEL,
- 'name' => $this->l('Pay at hotel')
- ),
- OrderPayment::PAYMENT_TYPE_ONLINE => array(
- 'key' => 'PAYMENT_TYPE_ONLINE',
- 'value' => OrderPayment::PAYMENT_TYPE_ONLINE,
- 'name' => $this->l('Online')
- ),
- OrderPayment::PAYMENT_TYPE_REMOTE_PAYMENT => array(
- 'key' => 'PAYMENT_TYPE_REMOTE_PAYMENT',
- 'value' => OrderPayment::PAYMENT_TYPE_REMOTE_PAYMENT,
- 'name' => $this->l('Remote payment')
- ),
- );
- }
/**
* @param OrderInvoice $order_invoice
diff --git a/controllers/admin/AdminPaymentReceiptsController.php b/controllers/admin/AdminPaymentReceiptsController.php
new file mode 100644
index 000000000..1ca890269
--- /dev/null
+++ b/controllers/admin/AdminPaymentReceiptsController.php
@@ -0,0 +1,192 @@
+bootstrap = true;
+ parent::__construct();
+ $this->context = Context::getContext();
+ $this->lang = false;
+ $this->table = 'order_payment';
+
+ $this->fields_options = array(
+ 'general' => array(
+ 'title' => $this->l('Payment receipts options'),
+ 'fields' => array(
+ 'PS_PAYMENT_RECEIPTS' => array(
+ 'title' => $this->l('Enable Receipts'),
+ 'desc' => $this->l('If enabled, receipts will be generated for order payments.'),
+ 'cast' => 'intval',
+ 'type' => 'bool'
+ ),
+ 'PS_PAYMENT_RECEIPTS_PREFIX' => array(
+ 'title' => $this->l('Receipt prefix'),
+ 'desc' => $this->l('Prefix used for receipt name (e.g. #IN00001).'),
+ 'size' => 6,
+ 'type' => 'textLang'
+ ),
+ 'PS_PAYMENT_RECEIPTS_USE_YEAR' => array(
+ 'title' => $this->l('Add current year to receipt number'),
+ 'cast' => 'intval',
+ 'type' => 'bool'
+ ),
+ 'PS_PAYMENT_RECEIPTS_RESET' => array(
+ 'title' => $this->l('Reset Receipt progressive number at beginning of the year'),
+ 'cast' => 'intval',
+ 'type' => 'bool'
+ ),
+ 'PS_PAYMENT_RECEIPTS_START_NUMBER' => array(
+ 'title' => $this->l('Receipt number'),
+ 'desc' => sprintf($this->l('The next receipt will begin with this number, and then increase with each additional receipt. Set to 0 if you want to keep the current number (which is #%s).'), OrderPaymentDetail::getLastPaymentReceiptNumber() + 1),
+ 'size' => 6,
+ 'type' => 'text',
+ 'cast' => 'intval'
+ ),
+ 'PS_PAYMENT_RECEIPTS_LEGAL_FREE_TEXT' => array(
+ 'title' => $this->l('Legal free text'),
+ 'desc' => $this->l('Use this field to display additional text on your receipt, like specific legal information. It will appear below the payment methods summary.'),
+ 'size' => 50,
+ 'type' => 'textareaLang',
+ ),
+ 'PS_PAYMENT_RECEIPTS_FREE_TEXT' => array(
+ 'title' => $this->l('Footer text'),
+ 'desc' => $this->l('This text will appear at the bottom of the receipt, below your company details.'),
+ 'size' => 50,
+ 'type' => 'textLang',
+ )
+ ),
+ 'submit' => array('title' => $this->l('Save'))
+ )
+ );
+ }
+
+ public function initContent()
+ {
+ $this->display = 'edit';
+ $this->initTabModuleList();
+ $this->initToolbar();
+ $this->initPageHeaderToolbar();
+ $this->table = 'order_payment';
+ $this->content .= $this->initFormByDate();
+
+ $this->content .= $this->renderOptions();
+
+ $this->context->smarty->assign(array(
+ 'content' => $this->content,
+ 'url_post' => self::$currentIndex.'&token='.$this->token,
+ 'show_page_header_toolbar' => $this->show_page_header_toolbar,
+ 'page_header_toolbar_title' => $this->page_header_toolbar_title,
+ 'page_header_toolbar_btn' => $this->page_header_toolbar_btn
+ ));
+ }
+
+ public function initFormByDate()
+ {
+ $this->fields_form = array(
+ 'legend' => array(
+ 'title' => $this->l('By date'),
+ 'icon' => 'icon-calendar'
+ ),
+ 'input' => array(
+ array(
+ 'type' => 'date',
+ 'label' => $this->l('From'),
+ 'name' => 'date_from',
+ 'maxlength' => 10,
+ 'required' => true,
+ 'hint' => $this->l('Format: 2011-12-31 (inclusive).')
+ ),
+ array(
+ 'type' => 'date',
+ 'label' => $this->l('To'),
+ 'name' => 'date_to',
+ 'maxlength' => 10,
+ 'required' => true,
+ 'hint' => $this->l('Format: 2012-12-31 (inclusive).')
+ )
+ ),
+ 'submit' => array(
+ 'title' => $this->l('Generate PDF file by date'),
+ 'id' => 'submitPrint',
+ 'icon' => 'process-icon-download-alt'
+ )
+ );
+
+ $this->fields_value = array(
+ 'date_from' => date('Y-m-d'),
+ 'date_to' => date('Y-m-d')
+ );
+
+ $this->table = 'order_payment';
+ $this->show_toolbar = false;
+ $this->show_form_cancel_button = false;
+ $this->toolbar_title = $this->l('Print PDF invoices');
+ return parent::renderForm();
+ }
+
+ public function initToolbarTitle()
+ {
+ $this->toolbar_title = array_unique($this->breadcrumbs);
+ }
+
+ public function initPageHeaderToolbar()
+ {
+ parent::initPageHeaderToolbar();
+ unset($this->page_header_toolbar_btn['cancel']);
+ }
+
+ public function postProcess()
+ {
+ if(Tools::isSubmit('submitAddorder_payment')) {
+ if (!Validate::isDate(Tools::getValue('date_from'))) {
+ $this->errors[] = $this->l('Invalid "From" date');
+ }
+
+ if (!Validate::isDate(Tools::getValue('date_to'))) {
+ $this->errors[] = $this->l('Invalid "To" date');
+ }
+ if(Tools::getValue('date_from') > Tools::getValue('date_to')) {
+ $this->errors[] = $this->l('"From" date must be earlier than "To" date');
+ }
+ if (!count($this->errors)) {
+ if (count(OrderPaymentDetail::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to')))) {
+ Tools::redirectAdmin($this->context->link->getAdminLink('AdminPdf').'&submitAction=generatePaymentReceiptsPDF&date_from='.urlencode(Tools::getValue('date_from')).'&date_to='.urlencode(Tools::getValue('date_to')));
+ }
+
+ $this->errors[] = $this->l('No payment receipt has been found for this period.');
+ }
+ }else{
+ parent::postProcess();
+ }
+ }
+
+ public function beforeUpdateOptions()
+ {
+ if ((int)Tools::getValue('PS_PAYMENT_RECEIPTS_START_NUMBER') != 0 && (int)Tools::getValue('PS_PAYMENT_RECEIPTS_START_NUMBER') <= OrderPaymentDetail::getLastPaymentReceiptNumber()) {
+ $this->errors[] = $this->l('Invalid receipt number.').OrderPaymentDetail::getLastPaymentReceiptNumber().')';
+ }
+ }
+}
+
diff --git a/controllers/admin/AdminPdfController.php b/controllers/admin/AdminPdfController.php
index 7fba0f8e1..2e534d75b 100644
--- a/controllers/admin/AdminPdfController.php
+++ b/controllers/admin/AdminPdfController.php
@@ -93,7 +93,6 @@ class AdminPdfControllerCore extends AdminController
public function processGenerateInvoicesPDF()
{
$order_invoice_collection = OrderInvoice::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'));
-
if (!count($order_invoice_collection)) {
die(Tools::displayError('No invoice was found.'));
}
@@ -150,14 +149,38 @@ class AdminPdfControllerCore extends AdminController
$id_supply_order = (int)Tools::getValue('id_supply_order');
$supply_order = new SupplyOrder($id_supply_order);
-
if (!Validate::isLoadedObject($supply_order)) {
die(Tools::displayError('The supply order cannot be found within your database.'));
}
$this->generatePDF($supply_order, PDF::TEMPLATE_SUPPLY_ORDER_FORM);
+ }
+
+ public function processGeneratePaymentReceiptsPDF()
+ {
+ $order_payment_collection = OrderPaymentDetail::getByDateInterval(
+ Tools::getValue('date_from'),
+ Tools::getValue('date_to')
+ );
+
+ if (!count($order_payment_collection)) {
+ die(Tools::displayError('No payment receipt was found.'));
+ }
+
+ $this->generatePDF($order_payment_collection, PDF::TEMPLATE_PAYMENT_RECEIPT);
}
+ public function processGeneratePaymentReceipt()
+ {
+ $idOrderPaymentDetail = (int) Tools::getValue('id_order_payment_detail');
+ $orderPaymentDetail = new OrderPaymentDetail($idOrderPaymentDetail);
+ if (!Validate::isLoadedObject($orderPaymentDetail)) {
+ die(Tools::displayError('The order payment detail cannot be found.'));
+ }
+ $this->generatePDF($orderPaymentDetail, PDF::TEMPLATE_PAYMENT_RECEIPT);
+ }
+
+
public function generateDeliverySlipPDFByIdOrder($id_order)
{
$order = new Order((int)$id_order);
diff --git a/install/data/db_structure.sql b/install/data/db_structure.sql
index 37b5d93da..9520ec459 100644
--- a/install/data/db_structure.sql
+++ b/install/data/db_structure.sql
@@ -8,6 +8,7 @@ CREATE TABLE `PREFIX_access` (
`add` int(11) NOT NULL,
`edit` int(11) NOT NULL,
`delete` int(11) NOT NULL,
+ `kpi` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`id_profile`,`id_tab`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
@@ -1514,6 +1515,7 @@ CREATE TABLE `PREFIX_order_payment_detail` (
`id_order_payment` INT(10) unsigned NOT NULL,
`id_order` INT(10) unsigned NOT NULL,
`amount` DECIMAL(10,2) NOT NULL,
+ `receipt_number` INT(10) NOT NULL,
`date_add` DATETIME NOT NULL,
PRIMARY KEY (`id_order_payment_detail`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION;
diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml
index e8e2ac993..9e5658518 100644
--- a/install/data/xml/configuration.xml
+++ b/install/data/xml/configuration.xml
@@ -133,6 +133,9 @@
#IN
+
+
+ #IN
{"avoid":[]}
@@ -152,6 +155,9 @@
1
+
+ 1
+
360
diff --git a/install/data/xml/tab.xml b/install/data/xml/tab.xml
index 09eed80f3..8909ed603 100644
--- a/install/data/xml/tab.xml
+++ b/install/data/xml/tab.xml
@@ -102,6 +102,9 @@
AdminInvoices
+
+ AdminPaymentReceipts
+
diff --git a/install/langs/en/data/configuration.xml b/install/langs/en/data/configuration.xml
index b4bf4ef61..610649713 100644
--- a/install/langs/en/data/configuration.xml
+++ b/install/langs/en/data/configuration.xml
@@ -3,6 +3,9 @@
#IN
+
+ #IN
+
#DE
diff --git a/install/langs/en/data/tab.xml b/install/langs/en/data/tab.xml
index ab5391a0f..2ccd45418 100644
--- a/install/langs/en/data/tab.xml
+++ b/install/langs/en/data/tab.xml
@@ -32,6 +32,7 @@
+
diff --git a/modules/dashguestcycle/dashguestcycle.php b/modules/dashguestcycle/dashguestcycle.php
index d630c926a..6aae1cb46 100644
--- a/modules/dashguestcycle/dashguestcycle.php
+++ b/modules/dashguestcycle/dashguestcycle.php
@@ -46,7 +46,7 @@ class DashGuestCycle extends Module
public function install()
{
return (parent::install()
- && $this->registerHook('dashboardTop')
+ && $this->registerHook('actionAdminDashboardKPIListingModifier')
&& $this->registerHook('dashboardZoneTwo')
&& $this->registerHook('dashboardData')
&& $this->registerHook('actionAdminControllerSetMedia')
@@ -60,9 +60,120 @@ class DashGuestCycle extends Module
}
}
- public function hookDashboardTop()
+ public function hookActionAdminDashboardKPIListingModifier(array $params)
{
- return $this->display(__FILE__, 'dashboard-top.tpl');
+ $idHotel = (int)$this->context->cookie->stats_id_hotel;
+ $kpiValues = $this->getKpiValues($idHotel);
+
+ $kpisData = array(
+ array(
+ 'id' => 'box-dgc-arrivals',
+ 'color' => 'color1',
+ 'title' => $this->l('Arrivals'),
+ 'tooltip' => $this->l('The number of arrivals scheduled for today.'),
+ 'value' => $kpiValues['box-dgc-arrivals'],
+ ),
+ array(
+ 'id' => 'box-dgc-departures',
+ 'color' => 'color2',
+ 'title' => $this->l('Departures'),
+ 'tooltip' => $this->l('The number of departures scheduled for today.'),
+ 'value' => $kpiValues['box-dgc-departures'],
+ ),
+ array(
+ 'id' => 'box-dgc-new-bookings',
+ 'color' => 'color3',
+ 'title' => $this->l('New Bookings'),
+ 'tooltip' => $this->l('The number of new bookings created today so far.'),
+ 'value' => $kpiValues['box-dgc-new-bookings'],
+ ),
+ array(
+ 'id' => 'box-dgc-occupied',
+ 'color' => 'color4',
+ 'title' => $this->l('Occupied Rooms'),
+ 'tooltip' => $this->l('The count of rooms currently occupied by guests.'),
+ 'value' => $kpiValues['box-dgc-occupied'],
+ ),
+ array(
+ 'id' => 'box-dgc-messages',
+ 'color' => 'color5',
+ 'title' => $this->l('Guest Messages'),
+ 'tooltip' => $this->l('The number of new messages received from guests today.'),
+ 'value' => $kpiValues['box-dgc-messages'],
+ ),
+ array(
+ 'id' => 'box-dgc-cancelled',
+ 'color' => 'color6',
+ 'title' => $this->l('Cancelled Bookings'),
+ 'tooltip' => $this->l('The number of bookings cancelled today so far.'),
+ 'value' => $kpiValues['box-dgc-cancelled'],
+ ),
+ array(
+ 'id' => 'box-dgc-guests',
+ 'color' => 'color1',
+ 'title' => $this->l('Guests (Adults/Children)'),
+ 'tooltip' => $this->l('The number of adults and children scheduled to stay today.'),
+ 'value' => $kpiValues['box-dgc-guests'],
+ ),
+ );
+
+ foreach ($kpisData as $data) {
+ $helper = new HelperKpi();
+ $helper->id = $data['id'];
+ $helper->color = $data['color'];
+ $helper->title = $data['title'];
+ $helper->tooltip = $data['tooltip'];
+ $helper->value = $data['value'];
+ $params['kpis'][] = $helper;
+ }
+ }
+
+ private function getKpiValues($idHotel)
+ {
+ $dateToday = date('Y-m-d');
+
+ if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
+ $totalArrivals = rand(100, 1000);
+ $arrived = rand(0, $totalArrivals);
+ $totalDepartures = rand(100, 1000);
+ $departed = rand(0, $totalDepartures);
+ $newBookings = rand(10, 500);
+ $occupied = rand(10, 500);
+ $newMessages = rand(0, 20);
+ $cancelledBookings = rand(0, 20);
+ $totalAdults = rand(100, 1000);
+ $children = rand(0, $totalAdults);
+ } else {
+ $arrivalsData = AdminStatsController::getArrivalsByDate($dateToday, $idHotel);
+ $departuresData = AdminStatsController::getDeparturesByDate($dateToday, $idHotel);
+ $guestsData = AdminStatsController::getGuestsByDate($dateToday, $idHotel);
+
+ $arrived = (int) $arrivalsData['arrived'];
+ $totalArrivals = (int) $arrivalsData['total_arrivals'];
+ $departed = (int) $departuresData['departed'];
+ $totalDepartures = (int) $departuresData['total_departures'];
+ $newBookings = count(AdminStatsController::getNewBookingsInfoByDate($dateToday, $idHotel));
+ $occupied = (int) AdminStatsController::getDistinctRoomBookingsCount(
+ date('Y-m-d', strtotime('-1 day')),
+ $dateToday,
+ $idHotel,
+ HotelBookingDetail::STATUS_CHECKED_IN
+ );
+ $newMessages = (int) CustomerMessage::getMessagesByDate($dateToday);
+ $cancelledBookings = (int) AdminStatsController::getCancelledBookingsByDate($dateToday, $idHotel);
+ $totalAdults = (int) $guestsData['adults'];
+ $children = (int) $guestsData['children'];
+ }
+
+ return array(
+ 'box-dgc-arrivals' => sprintf('%02d', $arrived).'/'.sprintf('%02d', $totalArrivals),
+ 'box-dgc-departures' => sprintf('%02d', $departed).'/'.sprintf('%02d', $totalDepartures),
+ 'box-dgc-new-bookings' => sprintf('%02d', $newBookings),
+ 'box-dgc-occupied' => sprintf('%02d', $occupied),
+ 'box-dgc-messages' => sprintf('%02d', $newMessages),
+ 'box-dgc-cancelled' => sprintf('%02d', $cancelledBookings),
+ 'box-dgc-guests' => sprintf('%02d', $totalAdults).'/'.sprintf('%02d', $children),
+ );
}
public function hookDashboardZoneTwo()
@@ -76,37 +187,10 @@ class DashGuestCycle extends Module
$dataTable = array();
$dateToday = date('Y-m-d');
- if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
- $dataValue['dgc_total_arrivals'] = sprintf('%02d', rand(100, 1000));
- $dataValue['dgc_arrived'] = sprintf('%02d', rand(0, $dataValue['dgc_total_arrivals']));
- $dataValue['dgc_total_departures'] = sprintf('%02d', rand(100, 1000));
- $dataValue['dgc_departed'] = sprintf('%02d', rand(0, $dataValue['dgc_total_departures']));
- $dataValue['dgc_new_bookings'] = sprintf('%02d', rand(10, 500));
- $dataValue['dgc_occupied'] = sprintf('%02d', rand(10, 500));
- $dataValue['dgc_new_messages'] = sprintf('%02d', rand(0, 20));
- $dataValue['dgc_cancelled_bookings'] = sprintf('%02d', rand(0, 20));
- $dataValue['dgc_guests_adults'] = sprintf('%02d', rand(100, 1000));
- $dataValue['dgc_guests_children'] = sprintf('%02d', rand(0, $dataValue['dgc_guests_adults']));
- } else {
- // set badges data
- $arrivalsData = AdminStatsController::getArrivalsByDate($dateToday, $params['id_hotel']);
- $departuresData = AdminStatsController::getDeparturesByDate($dateToday, $params['id_hotel']);
- $guestsData = AdminStatsController::getGuestsByDate($dateToday, $params['id_hotel']);
- $dataValue['dgc_arrived'] = sprintf('%02d', $arrivalsData['arrived']);
- $dataValue['dgc_total_arrivals'] = sprintf('%02d', $arrivalsData['total_arrivals']);
- $dataValue['dgc_departed'] = sprintf('%02d', $departuresData['departed']);
- $dataValue['dgc_total_departures'] = sprintf('%02d', $departuresData['total_departures']);
- $dataValue['dgc_new_bookings'] = sprintf('%02d', count(AdminStatsController::getNewBookingsInfoByDate($dateToday, $params['id_hotel'])));
- $dataValue['dgc_occupied'] = sprintf('%02d', AdminStatsController::getDistinctRoomBookingsCount(
- date('Y-m-d', strtotime('-1 day')),
- $dateToday,
- $params['id_hotel'],
- HotelBookingDetail::STATUS_CHECKED_IN
- ));
- $dataValue['dgc_new_messages'] = sprintf('%02d', CustomerMessage::getMessagesByDate($dateToday));
- $dataValue['dgc_cancelled_bookings'] = sprintf('%02d', AdminStatsController::getCancelledBookingsByDate($dateToday, $params['id_hotel']));
- $dataValue['dgc_guests_adults'] = sprintf('%02d', $guestsData['adults']);
- $dataValue['dgc_guests_children'] = sprintf('%02d', $guestsData['children']);
+
+ // KPI box values — updated on every AJAX refresh (demo toggle, date change)
+ foreach ($this->getKpiValues((int) $params['id_hotel']) as $boxId => $value) {
+ $dataValue[$boxId . ' .value'] = $value;
}
// set tables data
diff --git a/modules/dashguestcycle/views/css/dashguestcycle.css b/modules/dashguestcycle/views/css/dashguestcycle.css
index 0f8e7ca14..7fd58544d 100644
--- a/modules/dashguestcycle/views/css/dashguestcycle.css
+++ b/modules/dashguestcycle/views/css/dashguestcycle.css
@@ -20,76 +20,6 @@
* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
*/
-#dashguestcycle {
- padding-bottom: 5px;
-}
-
-#dashguestcycle .badges-wrapper {
- white-space: nowrap;
- overflow: auto;
- margin: -5px;
- margin-bottom: 0px;
- padding-bottom: 10px;
- font-size: 0;
-}
-
-#dashguestcycle .badge-wrapper {
- display: inline-block;
- width: 14.28%;
- min-width: 145px;
- padding: 5px;
-}
-
-#dashguestcycle .badge-item {
- position: relative;
- min-width: 135px;
- height: 80px;
- border-radius: 10px;
- background: #FFFFFF;
- box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.15);
-}
-
-#dashguestcycle .badge-strip {
- position: absolute;
- width: 10px;
- height: 100%;
- border-top-left-radius: 10px;
- border-bottom-left-radius: 10px;
-}
-
-#dashguestcycle .badge-content-wrapper {
- height: 100%;
-}
-
-#dashguestcycle .badge-content-wrapper p {
- color: #00AFF0;
- margin-bottom: 0;
-}
-
-#dashguestcycle .title-wrapper, #dashguestcycle .value-wrapper {
- display: table;
- width: 100%;
- height: 50%;
- padding: 0 10px;
-}
-
-#dashguestcycle .title-wrapper p {
- display: table-cell;
- vertical-align: middle;
- font-weight: normal;
- font-size: 13px;
- line-height: 15px;
- white-space: normal;
-}
-
-#dashguestcycle .value-wrapper p {
- display: table-cell;
- vertical-align: top;
- font-weight: bold;
- font-size: 24px;
- line-height: 30px;
-}
-
#dashguestcycle .tab-content {
max-height: 300px;
overflow-y: auto;
@@ -97,4 +27,107 @@
#dashguestcycle table tbody>tr>td {
padding: 8px 7px;
+}
+
+/* ── KPI row container: strip panel chrome ──────────────────────────────── */
+.kpi-container {
+ background: transparent !important;
+ border: none !important;
+ box-shadow: none !important;
+ padding: 0 0 15px !important;
+}
+
+.kpi-container .kpis-wrap {
+ flex-wrap: nowrap !important;
+ overflow-x: auto;
+ gap: 8px;
+ margin: 0 !important;
+}
+
+.kpi-container .kpis-wrap .kpi-wrap {
+ width: 14.28% !important;
+ min-width: 110px;
+ padding: 0 !important;
+ margin-bottom: 0 !important;
+}
+
+.kpi-container .box-stats {
+ height: 80px !important;
+ background: #fff !important;
+ border-radius: 10px !important;
+ overflow: hidden;
+ font-size: inherit !important;
+}
+
+.kpi-container .box-stats .kpi-content {
+ border: none !important;
+ border-left: 10px solid !important;
+ border-radius: 0 !important;
+ height: 100% !important;
+ padding: 8px 12px !important;
+ align-items: center !important;
+ gap: 0 !important;
+}
+
+.kpi-container .box-stats .kpi-content .kpi-data {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ width: 100%;
+ gap: 4px;
+}
+
+.kpi-container .box-stats .kpi-content .title-subtitle {
+ justify-content: center !important;
+ width: 100%;
+}
+
+.kpi-container .box-stats .kpi-content .title-subtitle .title-container .title {
+ font-size: 13px !important;
+ font-weight: normal !important;
+ color: #555 !important;
+ display: block;
+ text-align: center;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+.kpi-container .box-stats .kpi-content .value-container {
+ width: 100%;
+ text-align: center;
+}
+
+.kpi-container .box-stats .kpi-content .value-container .value {
+ font-size: 24px !important;
+ font-weight: bold !important;
+ min-height: auto !important;
+ display: block;
+ text-align: center;
+}
+
+.kpi-container .box-stats .kpi-content .arrow {
+ display: none !important;
+}
+
+.kpi-container .box-stats.color1 .kpi-content { border-left-color: #266FFE !important; }
+.kpi-container .box-stats.color1 .value { color: #266FFE !important; }
+
+.kpi-container .box-stats.color2 .kpi-content { border-left-color: #72C3F0 !important; }
+.kpi-container .box-stats.color2 .value { color: #72C3F0 !important; }
+
+.kpi-container .box-stats.color3 .kpi-content { border-left-color: #56CE56 !important; }
+.kpi-container .box-stats.color3 .value { color: #56CE56 !important; }
+
+.kpi-container .box-stats.color4 .kpi-content { border-left-color: #FFC148 !important; }
+.kpi-container .box-stats.color4 .value { color: #FFC148 !important; }
+
+.kpi-container .box-stats.color5 .kpi-content { border-left-color: #A569DF !important; }
+.kpi-container .box-stats.color5 .value { color: #A569DF !important; }
+
+.kpi-container .box-stats.color6 .kpi-content { border-left-color: #FF4036 !important; }
+.kpi-container .box-stats.color6 .value { color: #FF4036 !important; }
+
+.kpi-container .actions-wrap {
+ display: none !important;
}
\ No newline at end of file
diff --git a/modules/dashguestcycle/views/templates/hook/dashboard-top.tpl b/modules/dashguestcycle/views/templates/hook/dashboard-top.tpl
deleted file mode 100644
index 1d904e3b9..000000000
--- a/modules/dashguestcycle/views/templates/hook/dashboard-top.tpl
+++ /dev/null
@@ -1,143 +0,0 @@
-{**
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License version 3.0
-* that is bundled with this package in the file LICENSE.md
-* It is also available through the world-wide-web at this URL:
-* https://opensource.org/license/osl-3-0-php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to support@qloapps.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade this module to a newer
-* versions in the future. If you wish to customize this module for your needs
-* please refer to https://store.webkul.com/customisation-guidelines for more information.
-*
-* @author Webkul IN
-* @copyright Since 2010 Webkul
-* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
-*}
-
-
diff --git a/modules/hotelreservationsystem/classes/HotelBranchInformation.php b/modules/hotelreservationsystem/classes/HotelBranchInformation.php
index b4fb0ada8..0797c7035 100644
--- a/modules/hotelreservationsystem/classes/HotelBranchInformation.php
+++ b/modules/hotelreservationsystem/classes/HotelBranchInformation.php
@@ -51,7 +51,7 @@ class HotelBranchInformation extends ObjectModel
'fields' => array(
'id_category' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
'email' => array('type' => self::TYPE_STRING,'validate' => 'isEmail', 'size' => 255, 'required' => true),
- 'rating' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
+ 'rating' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
'check_in' => array('type' => self::TYPE_STRING, 'required' => true),
'check_out' => array('type' => self::TYPE_STRING, 'required' => true),
'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
@@ -1160,7 +1160,7 @@ class HotelBranchInformation extends ObjectModel
{
// set additional hotel address and restriction fields validations here
if (isset($this->webservice_validation) && $this->webservice_validation) {
- if ($this->rating < 1 || $this->rating > 5) {
+ if ($this->rating && ($this->rating < 1 || $this->rating > 5)) {
$message = Tools::displayError('Rating must be between 1 and 5.');
} elseif (!strtotime($this->check_in)) {
$message = Tools::displayError('Check In time is invalid.');
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
index f804b11ba..868012630 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
@@ -391,10 +391,6 @@ class AdminAddHotelController extends ModuleAdminController
$this->errors[] = $this->l('Check Out time must be before Check In time.');
}
- if (!$rating) {
- $this->errors[] = $this->l('Rating is required field.');
- }
-
if (!$address = trim($address)) {
$this->errors[] = $this->l('Address is required field.');
}
diff --git a/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl
index 22ae63e61..978872548 100644
--- a/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl
+++ b/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl
@@ -214,11 +214,11 @@