From 878fdf9d12028c6cea856a79086f17a889a9bf8f Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 28 Feb 2024 11:55:39 +0530 Subject: [PATCH] Fix 0 in range filters and date from calendar issues --- .../orders/helpers/list/list_header.tpl | 8 +++---- .../template/helpers/list/list_header.tpl | 2 +- classes/controller/AdminController.php | 23 ++++++++++++------- classes/helper/HelperList.php | 17 +++++++++++--- controllers/admin/AdminOrdersController.php | 2 ++ 5 files changed, 36 insertions(+), 16 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 edfb1b68d..24385cc8e 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 @@ -122,15 +122,15 @@ {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)} + {if (isset($value) && ($value !== '' || $value === 0))} + {if !(isset($filter_value) && ($filter_value !== '' || $filter_value === 0))} {assign var="filter_value" value=$value} {else} {assign var="filter_value" value="`$filter_value` - `$value`"} {/if} {/if} {/foreach} - {if !empty($filter_value)} + {if (isset($filter_value) && ($filter_value !== '' || $filter_value === 0))} {$params['title']|escape:'html':'UTF-8'}: {$filter_value|escape:'html':'UTF-8'} @@ -229,7 +229,7 @@ let dateFrom = $('#local_{$params.id_date}_0').val().trim(); let dateTo = $('#local_{$params.id_date}_1').val().trim(); - if (dateFrom >= dateTo) { + if ((dateFrom && dateTo) && (dateFrom >= dateTo)) { let objDateToMin = $.datepicker.parseDate('yy-mm-dd', dateFrom); objDateToMin.setDate(objDateToMin.getDate() + 1); diff --git a/admin/themes/default/template/helpers/list/list_header.tpl b/admin/themes/default/template/helpers/list/list_header.tpl index fc2dcc571..b00a0080a 100644 --- a/admin/themes/default/template/helpers/list/list_header.tpl +++ b/admin/themes/default/template/helpers/list/list_header.tpl @@ -434,7 +434,7 @@ let dateFrom = $('#local_{$params.id_date}_0').val().trim(); let dateTo = $('#local_{$params.id_date}_1').val().trim(); - if (dateFrom >= dateTo) { + if ((dateFrom && dateTo) && (dateFrom >= dateTo)) { let objDateToMin = $.datepicker.parseDate('yy-mm-dd', dateFrom); objDateToMin.setDate(objDateToMin.getDate() + 1); diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 2d89a07ba..01c8a0899 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -905,18 +905,25 @@ class AdminControllerCore extends Controller $sql_filter .= ' AND '.pSQL($key).' IN ('.pSQL(implode(',', $value)).')'; } } elseif ($type == 'range') { - if (isset($value[0]) && !empty($value[0])) { - if (!Validate::isUnsignedInt($value[0])) { + // set validation type + if (isset($field['validation']) && $field['validation'] && method_exists('Validate', $field['validation'])) { + $validation = $field['validation']; + } else { + $validation = 'isUnsignedInt'; + } + + if (isset($value[0]) && ($value[0] !== '' || $value[0] === 0)) { + if (!Validate::$validation($value[0])) { $this->errors[] = Tools::displayError('The \'From\' value is invalid'); } else { $sql_filter .= ' AND '.pSQL($key).' >= '.pSQL($value[0]); } } - if (isset($value[1]) && !empty($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'); + if (isset($value[1]) && ($value[1] !== '' || $value[1] === 0)) { + if (!Validate::$validation($value[1])) { + $this->errors[] = Tools::displayError('The \'To\' value is invalid'); + } elseif ((isset($value[0]) && ($value[0] !== '' || $value[0] === 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]); } @@ -934,7 +941,7 @@ class AdminControllerCore extends Controller 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'); + $this->errors[] = Tools::displayError('The \'To\' date cannot be earlier 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 306d6c1c3..63223cc11 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -660,13 +660,24 @@ class HelperListCore extends Helper $value = json_decode($value, true); } - if (isset($value[0]) && !Validate::isUnsignedInt($value[0])) { + // set validation type + if (isset($params['validation']) && $params['validation'] && method_exists('Validate', $params['validation'])) { + $validation = $params['validation']; + } else { + $validation = 'isUnsignedInt'; + } + + $hasValueFrom = isset($value[0]) && ($value[0] !== '' || $value[0] === 0); + if ($hasValueFrom && !Validate::$validation($value[0])) { $value[0] = ''; } - if (isset($value[1]) && !Validate::isUnsignedInt($value[1])) { + + $hasValueTo = isset($value[1]) && ($value[1] !== '' || $value[1] === 0); + if ($hasValueTo && !Validate::$validation($value[1])) { $value[1] = ''; } - if (isset($value[0]) && isset($value[1]) && $value[0] > $value[1]) { + + if ($hasValueFrom && $hasValueTo && $value[0] > $value[1]) { $value[1] = ''; } break; diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index e57662606..92ac3c55d 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -219,6 +219,7 @@ class AdminOrdersControllerCore extends AdminController 'title' => $this->l('Order Total'), 'align' => 'text-right', 'type' => 'range', + 'validation' => 'isFloat', 'currency' => true, 'callback' => 'setOrderCurrency', 'badge_success' => true, @@ -227,6 +228,7 @@ class AdminOrdersControllerCore extends AdminController 'title' => $this->l('Due Amount'), 'align' => 'text-right', 'type' => 'range', + 'validation' => 'isFloat', 'currency' => true, 'havingFilter' => true, 'callback' => 'setOrderCurrency',