update index
This commit is contained in:
parent
19ccad0890
commit
9d33b04070
28
index.php
28
index.php
@ -1471,7 +1471,7 @@ function renderPagination($currentPage, $totalPages) {
|
|||||||
unset($query['p']);
|
unset($query['p']);
|
||||||
$url = 'index.php?' . http_build_query($query) . '&p=';
|
$url = 'index.php?' . http_build_query($query) . '&p=';
|
||||||
|
|
||||||
$limit = isset($_GET['limit']) ? (int)$_GET['limit'] : 20;
|
$limit = isset($_GET['limit']) ? min(500, max(5, (int)$_GET['limit'])) : 20;
|
||||||
$limitHtml = "
|
$limitHtml = "
|
||||||
<div class='d-flex justify-content-end align-items-center mb-2'>
|
<div class='d-flex justify-content-end align-items-center mb-2'>
|
||||||
<label class='me-2 small text-muted' data-en='Rows per page:' data-ar='الصفوف لكل صفحة:'>Rows per page:</label>
|
<label class='me-2 small text-muted' data-en='Rows per page:' data-ar='الصفوف لكل صفحة:'>Rows per page:</label>
|
||||||
@ -4621,7 +4621,7 @@ if ($oid != -1) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$limit = isset($_GET["limit"]) ? max(5, (int)$_GET["limit"]) : 20;
|
$limit = isset($_GET["limit"]) ? min(500, max(5, (int)$_GET["limit"])) : 20;
|
||||||
$page_num = isset($_GET["p"]) ? (int)$_GET["p"] : 1;
|
$page_num = isset($_GET["p"]) ? (int)$_GET["p"] : 1;
|
||||||
if ($page_num < 1) $page_num = 1;
|
if ($page_num < 1) $page_num = 1;
|
||||||
$offset = ($page_num - 1) * $limit;
|
$offset = ($page_num - 1) * $limit;
|
||||||
@ -4883,6 +4883,30 @@ switch ($page) {
|
|||||||
break;
|
break;
|
||||||
case 'sales':
|
case 'sales':
|
||||||
case 'purchases':
|
case 'purchases':
|
||||||
|
$salesRequestedLimit = isset($_GET['limit']) ? (int)$_GET['limit'] : (isset($limit) ? (int)$limit : 20);
|
||||||
|
$salesSafeLimit = min(500, max(5, $salesRequestedLimit > 0 ? $salesRequestedLimit : 20));
|
||||||
|
if ($salesRequestedLimit !== $salesSafeLimit) {
|
||||||
|
runtime_debug_mark('page:sales_purchases_limit_normalized', [
|
||||||
|
'page' => (string)$page,
|
||||||
|
'requested_limit' => (string)$salesRequestedLimit,
|
||||||
|
'applied_limit' => (string)$salesSafeLimit,
|
||||||
|
]);
|
||||||
|
if (function_exists('app_debug_file_log')) {
|
||||||
|
app_debug_file_log(
|
||||||
|
'runtime_debug.log',
|
||||||
|
date('Y-m-d H:i:s') . " [sales_purchases_limit_normalized] page=" . (string)$page
|
||||||
|
. " requested_limit=" . (string)$salesRequestedLimit
|
||||||
|
. " applied_limit=" . (string)$salesSafeLimit
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$limit = $salesSafeLimit;
|
||||||
|
$page_num = isset($_GET['p']) ? max(1, (int)$_GET['p']) : (isset($page_num) ? max(1, (int)$page_num) : 1);
|
||||||
|
$offset = ($page_num - 1) * $limit;
|
||||||
|
$_GET['limit'] = (string)$limit;
|
||||||
|
$_REQUEST['limit'] = (string)$limit;
|
||||||
|
$_GET['p'] = (string)$page_num;
|
||||||
|
$_REQUEST['p'] = (string)$page_num;
|
||||||
runtime_debug_require('pages/sales_purchases_logic.php', ['phase' => 'logic', 'page' => (string)$page]);
|
runtime_debug_require('pages/sales_purchases_logic.php', ['phase' => 'logic', 'page' => (string)$page]);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
// Shared Sales/Purchases data loading extracted from index.php to reduce risk when editing this module.
|
// Shared Sales/Purchases data loading extracted from index.php to reduce risk when editing this module.
|
||||||
$requestedLimit = isset($limit) ? (int)$limit : (isset($_GET['limit']) ? (int)$_GET['limit'] : 20);
|
$incomingLimit = isset($limit) ? $limit : ($_GET['limit'] ?? 20);
|
||||||
|
$requestedLimit = is_numeric($incomingLimit) ? (int)$incomingLimit : 20;
|
||||||
if ($requestedLimit < 1) {
|
if ($requestedLimit < 1) {
|
||||||
if (function_exists('runtime_debug_mark')) {
|
if (function_exists('runtime_debug_mark')) {
|
||||||
runtime_debug_mark('page:sales_purchases_limit_fallback', [
|
runtime_debug_mark('page:sales_purchases_limit_fallback', [
|
||||||
@ -19,7 +20,12 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
$limit = min(500, max(5, $requestedLimit > 0 ? $requestedLimit : 20));
|
$limit = min(500, max(5, $requestedLimit > 0 ? $requestedLimit : 20));
|
||||||
$page_num = isset($page_num) ? max(1, (int)$page_num) : (isset($_GET['p']) ? max(1, (int)$_GET['p']) : 1);
|
$_GET['limit'] = (string)$limit;
|
||||||
|
$_REQUEST['limit'] = (string)$limit;
|
||||||
|
$incomingPageNum = isset($page_num) ? $page_num : ($_GET['p'] ?? 1);
|
||||||
|
$page_num = is_numeric($incomingPageNum) ? max(1, (int)$incomingPageNum) : 1;
|
||||||
|
$_GET['p'] = (string)$page_num;
|
||||||
|
$_REQUEST['p'] = (string)$page_num;
|
||||||
$offset = ($page_num - 1) * $limit;
|
$offset = ($page_num - 1) * $limit;
|
||||||
|
|
||||||
$type = ($page === 'sales') ? 'sale' : 'purchase';
|
$type = ($page === 'sales') ? 'sale' : 'purchase';
|
||||||
@ -78,7 +84,7 @@
|
|||||||
$countStmt = db()->prepare("SELECT COUNT(*) FROM $table v LEFT JOIN $cust_supplier_table c ON v.$cust_supplier_col = c.id WHERE $whereSql");
|
$countStmt = db()->prepare("SELECT COUNT(*) FROM $table v LEFT JOIN $cust_supplier_table c ON v.$cust_supplier_col = c.id WHERE $whereSql");
|
||||||
$countStmt->execute($params);
|
$countStmt->execute($params);
|
||||||
$total_records = (int)$countStmt->fetchColumn();
|
$total_records = (int)$countStmt->fetchColumn();
|
||||||
$data['total_pages'] = ceil($total_records / $limit);
|
$data['total_pages'] = ceil($total_records / max(1, (int)$limit));
|
||||||
$data['current_page'] = $page_num;
|
$data['current_page'] = $page_num;
|
||||||
|
|
||||||
$customerTaxColumn = entity_tax_column($cust_supplier_table);
|
$customerTaxColumn = entity_tax_column($cust_supplier_table);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user