From 25ecc6313b417c875ba2ba8384f772e9560c3118 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Sat, 25 Mar 2023 17:17:08 +0530 Subject: [PATCH] added filter validations --- .../orders/helpers/list/list_header.tpl | 381 ++++++++++-------- .../template/helpers/list/list_header.tpl | 41 ++ classes/controller/AdminController.php | 25 +- classes/helper/HelperList.php | 21 + controllers/admin/AdminOrdersController.php | 7 +- 5 files changed, 307 insertions(+), 168 deletions(-) diff --git a/admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl b/admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl index 9224d8ae1..c5fa152c5 100644 --- a/admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/list/list_header.tpl @@ -69,96 +69,98 @@ {block name="tableFilter"}{/block} {block name="override_form_extra"} - -
-
-
-
- - + {if !$simple_header && $show_filters} + +
+
+
+
+ + +
+
+
+
+ +
-
-
- -
-
-
- {if $filters_has_value} -
- {l s='Filters: '} - - {foreach $fields_display AS $key => $params} - {if (!isset($params.search) || $params.search) && $params.value != ''} - {if ($params.type == 'date' || $params.type == 'datetime' || $params.type == 'range') && $params.value|is_array} - {assign var="filter_value" value=''} - {foreach $params.value as $value} - {if ($value|is_string && !empty($value))} - {if empty($filter_value)} - {assign var="filter_value" value=$value} - {else} - {assign var="filter_value" value="`$filter_value` - `$value`"} +
+
+ {if $filters_has_value} +
+ {l s='Filters: '} + + {foreach $fields_display AS $key => $params} + {if (!isset($params.search) || $params.search) && $params.value != ''} + {if ($params.type == 'date' || $params.type == 'datetime' || $params.type == 'range') && $params.value|is_array} + {assign var="filter_value" value=''} + {foreach $params.value as $value} + {if ($value|is_string && !empty($value))} + {if empty($filter_value)} + {assign var="filter_value" value=$value} + {else} + {assign var="filter_value" value="`$filter_value` - `$value`"} + {/if} {/if} + {/foreach} + {if !empty($filter_value)} + + {$params['title']|escape:'html':'UTF-8'}: {$filter_value|escape:'html':'UTF-8'} + + {/if} - {/foreach} - {if !empty($filter_value)} - - {$params['title']|escape:'html':'UTF-8'}: {$filter_value|escape:'html':'UTF-8'} + {else if $params.type == 'select'} + + {$params['title']|escape:'html':'UTF-8'}: {$params['list'][$params['value']]|escape:'html':'UTF-8'} + + + {else} + + {$params['title']|escape:'html':'UTF-8'}: {$params['value']|escape:'html':'UTF-8'} {/if} - {else if $params.type == 'select'} - - {$params['title']|escape:'html':'UTF-8'}: {$params['list'][$params['value']]|escape:'html':'UTF-8'} - - - {else} - - {$params['title']|escape:'html':'UTF-8'}: {$params['value']|escape:'html':'UTF-8'} - - {/if} - {/if} - {/foreach} - -
- {/if} -
- {if !$simple_header && $show_filters} + {/foreach} + +
+ {/if} +
{foreach $fields_display AS $key => $params} {if !isset($params.search) || $params.search}
- -
+ +
{if $params.type == 'range'}
@@ -198,6 +200,47 @@ if (dateEnd !== null){ $("#local_{$params.id_date}_1").datepicker("setDate", dateEnd); } + + $('#local_{$params.id_date}_0').datepicker('option', { + prevText: '', + nextText: '', + dateFormat: 'yy-mm-dd', + beforeShow: function() { + let dateTo = $('#local_{$params.id_date}_1').val().trim(); + if (typeof dateTo != 'undefined' && dateTo != '') { + let objDateToMax = $.datepicker.parseDate('yy-mm-dd', dateTo); + objDateToMax.setDate(objDateToMax.getDate() - 1); + $('#local_{$params.id_date}_0').datepicker('option', 'maxDate', objDateToMax); + } + }, + onClose: function() { + let dateFrom = $('#local_{$params.id_date}_0').val().trim(); + let dateTo = $('#local_{$params.id_date}_1').val().trim(); + + if (dateFrom >= dateTo) { + let objDateToMin = $.datepicker.parseDate('yy-mm-dd', dateFrom); + objDateToMin.setDate(objDateToMin.getDate() + 1); + + $('#local_{$params.id_date}_1').datepicker('option', 'minDate', objDateToMin); + } + }, + }); + + $('#local_{$params.id_date}_1').datepicker('option', { + prevText: '', + nextText: '', + dateFormat: 'yy-mm-dd', + beforeShow: function() { + let dateFrom = $('#local_{$params.id_date}_0').val().trim(); + + if (typeof dateFrom != 'undefined' && dateFrom != '') { + let objDateToMin = $.datepicker.parseDate('yy-mm-dd', dateFrom); + objDateToMin.setDate(objDateToMin.getDate() + 1); + + $('#local_{$params.id_date}_1').datepicker('option', 'minDate', objDateToMin); + } + }, + }); });
@@ -239,97 +282,115 @@
- {/if} +
-
- - + + {/if} {/block} diff --git a/admin/themes/default/template/helpers/list/list_header.tpl b/admin/themes/default/template/helpers/list/list_header.tpl index b9e761136..fc2dcc571 100644 --- a/admin/themes/default/template/helpers/list/list_header.tpl +++ b/admin/themes/default/template/helpers/list/list_header.tpl @@ -417,6 +417,47 @@ if (dateEnd !== null){ $("#local_{$params.id_date}_1").datepicker("setDate", dateEnd); } + + $('#local_{$params.id_date}_0').datepicker('option', { + prevText: '', + nextText: '', + dateFormat: 'yy-mm-dd', + beforeShow: function() { + let dateTo = $('#local_{$params.id_date}_1').val().trim(); + if (typeof dateTo != 'undefined' && dateTo != '') { + let objDateToMax = $.datepicker.parseDate('yy-mm-dd', dateTo); + objDateToMax.setDate(objDateToMax.getDate() - 1); + $('#local_{$params.id_date}_0').datepicker('option', 'maxDate', objDateToMax); + } + }, + onClose: function() { + let dateFrom = $('#local_{$params.id_date}_0').val().trim(); + let dateTo = $('#local_{$params.id_date}_1').val().trim(); + + if (dateFrom >= dateTo) { + let objDateToMin = $.datepicker.parseDate('yy-mm-dd', dateFrom); + objDateToMin.setDate(objDateToMin.getDate() + 1); + + $('#local_{$params.id_date}_1').datepicker('option', 'minDate', objDateToMin); + } + }, + }); + + $('#local_{$params.id_date}_1').datepicker('option', { + prevText: '', + nextText: '', + dateFormat: 'yy-mm-dd', + beforeShow: function() { + let dateFrom = $('#local_{$params.id_date}_0').val().trim(); + + if (typeof dateFrom != 'undefined' && dateFrom != '') { + let objDateToMin = $.datepicker.parseDate('yy-mm-dd', dateFrom); + objDateToMin.setDate(objDateToMin.getDate() + 1); + + $('#local_{$params.id_date}_1').datepicker('option', 'minDate', objDateToMin); + } + }, + }); });
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index e59362528..cd64e7e99 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -712,13 +712,19 @@ class AdminControllerCore extends Controller } elseif (isset($t['type']) && $t['type'] == 'range') { $range = json_decode($val, true); if (isset($range[0]) && !empty($range[0])) { - $filter_value = $range[0]; - if (isset($range[1]) && !empty($range[1])) { - $filter_value .= ' - '.$range[1]; + if (Validate::isUnsignedInt($range[0])) { + $filter_value = $range[0]; + if (isset($range[1]) && !empty($range[1])) { + if (Validate::isUnsignedInt($range[1]) && $range[0] < $range[1]) { + $filter_value .= ' - '.$range[1]; + } + } } } else { if (isset($range[1]) && !empty($range[1])) { - $filter_value = $range[1]; + if (Validate::isUnsignedInt($range[1])) { + $filter_value = $range[1]; + } } } } elseif (is_string($val)) { @@ -861,6 +867,7 @@ class AdminControllerCore extends Controller foreach ($filters as $key => $value) { /* Extracting filters from $_POST on key filter_ */ if ($value != null && !strncmp($key, $prefix.$this->list_id.'Filter_', 7 + Tools::strlen($prefix.$this->list_id))) { + $key_org = $key; $key = Tools::substr($key, 7 + Tools::strlen($prefix.$this->list_id)); /* Table alias could be specified using a ! eg. alias!field */ $tmp_tab = explode('!', $key); @@ -897,7 +904,13 @@ class AdminControllerCore extends Controller } } if (isset($value[1]) && !empty($value[1])) { - $sql_filter .= ' AND '.pSQL($key).' <= '.pSQL($value[1]); + if (!Validate::isUnsignedInt($value[1])) { + $this->errors[] = Tools::displayError('The \'From\' value is invalid'); + } elseif (isset($value[0]) && !empty($value[0]) && $value[0] > $value[1]) { + $this->errors[] = Tools::displayError('The \'To\' value cannot be less than from value'); + } else { + $sql_filter .= ' AND '.pSQL($key).' <= '.pSQL($value[1]); + } } } else { if (isset($value[0]) && !empty($value[0])) { @@ -911,6 +924,8 @@ class AdminControllerCore extends Controller if (isset($value[1]) && !empty($value[1])) { if (!Validate::isDate($value[1])) { $this->errors[] = Tools::displayError('The \'To\' date format is invalid (YYYY-MM-DD)'); + } elseif (isset($value[0]) && !empty($value[0]) && strtotime($value[0]) > strtotime($value[1])) { + $this->errors[] = Tools::displayError('The \'To\' date cannot be before than from date'); } else { $sql_filter .= ' AND '.pSQL($key).' <= \''.pSQL(Tools::dateTo($value[1])).'\''; } diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index d1a9e1946..c64c8aae7 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -635,6 +635,17 @@ class HelperListCore extends Helper if (isset($value[0]) && !Validate::isCleanHtml($value[0]) || isset($value[1]) && !Validate::isCleanHtml($value[1])) { $value = ''; } + if (!Validate::isDate($value[0])) { + $value[0] = ''; + } + if (!Validate::isDate($value[1])) { + $value[1] = ''; + } + if (isset($value[0]) && !empty($value[0]) && strtotime($value[0]) > strtotime($value[1])) { + $value[1] = ''; + } + + $name = $this->list_id.'Filter_'.(isset($params['filter_key']) ? $params['filter_key'] : $key); $name_id = str_replace('!', '__', $name); @@ -648,6 +659,16 @@ class HelperListCore extends Helper if (is_string($value)) { $value = json_decode($value, true); } + + if (isset($value[0]) && !Validate::isUnsignedInt($value[0])) { + $value[0] = ''; + } + if (isset($value[1]) && !Validate::isUnsignedInt($value[1])) { + $value[1] = ''; + } + if (isset($value[0]) && isset($value[1]) && $value[0] > $value[1]) { + $value[1] = ''; + } break; case 'select': diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 6903ec301..dd3902554 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -43,6 +43,7 @@ class AdminOrdersControllerCore extends AdminController public $toolbar_title; protected $statuses_array = array(); + protected $all_order_sources = array(); public function __construct() { @@ -69,7 +70,7 @@ class AdminOrdersControllerCore extends AdminController SUM(hbd.`adults`), \' '.$this->l('Adult(s)').' \', IF(SUM(hbd.`children`), CONCAT(SUM(hbd.`children`), \' '.$this->l('Children').'\'), \'\') - ) as `guest_text`, + ) as `total_guests`, SUM(DATEDIFF(hbd.`date_to`, hbd.`date_from`)) as los, GROUP_CONCAT(hbd.`date_from`) as `all_date_from`, GROUP_CONCAT(hbd.`date_to`) as `all_date_to`, GROUP_CONCAT(hbd.`room_type_name`) as `all_room_types`'; @@ -143,7 +144,7 @@ class AdminOrdersControllerCore extends AdminController 'type'=>'text', 'displayed' => false, ), - 'guest_text' => array( + 'total_guests' => array( 'title' => $this->l('Guests'), 'type' => 'range', 'filter_key' => 'total_guests', @@ -178,7 +179,7 @@ class AdminOrdersControllerCore extends AdminController $this->fields_list = array_merge($this->fields_list, array( 'total_paid_tax_incl' => array( - 'title' => $this->l('Total'), + 'title' => $this->l('Order Total'), 'align' => 'text-right', 'type' => 'price', 'currency' => true,