Fix timestamps, delete requests, invoice dates and GR quantities
Apply the configured timezone to PHP and both DB connections, wrap unwrapped ajax payloads so delete buttons reach their engines, normalise and validate invoice due dates, reject stock quantities below the stored 4dp scale, and list stock movements across all warehouses.
This commit is contained in:
Thanakorn
+56
-1
@@ -772,6 +772,42 @@ function ajax_request(options) {
|
||||
// Override options.data with the full FormData object
|
||||
options.data = options.formData;
|
||||
}
|
||||
|
||||
} else if (
|
||||
options.data && !(options.data instanceof FormData) &&
|
||||
typeof options.data === 'object' && !('json' in options.data)
|
||||
) {
|
||||
|
||||
// autoPrepare: false with a plain field map — e.g. the delete buttons'
|
||||
// `data: { id: id }`. db_auth.php only accepts a `json` string or a
|
||||
// FormData post carrying `otp`, so an unwrapped map was rejected outright
|
||||
// with "Request denied: No valid JSON payload or Form Data detected.", and
|
||||
// `options.action` was dropped because only the autoPrepare branch applied
|
||||
// it. Wrap it the same way here, without touching callers that already
|
||||
// pass a ready-made `{ json: ... }`.
|
||||
const session_element = document.getElementById('session-context');
|
||||
const payload = {};
|
||||
|
||||
if (session_element) {
|
||||
payload['company_id'] = session_element.dataset.companyId;
|
||||
payload['otp'] = session_element.dataset.otp;
|
||||
}
|
||||
|
||||
Object.entries(options.data).forEach(([key, value]) => {
|
||||
payload[key] = value;
|
||||
});
|
||||
|
||||
if (options.action) {
|
||||
payload['action'] = (options.action === 'manage')
|
||||
? (payload['id'] ? 'update' : 'create')
|
||||
: options.action;
|
||||
}
|
||||
|
||||
options.data = { json: JSON.stringify(payload) };
|
||||
|
||||
if (options.debugMode) {
|
||||
console.log("REQUEST DATA:", options.data);
|
||||
}
|
||||
}
|
||||
|
||||
// --- START MODIFIED $.AJAX BLOCK ---
|
||||
@@ -1073,6 +1109,25 @@ function expand_exponential_number(value) {
|
||||
return sign + digits.slice(0, point) + '.' + digits.slice(point);
|
||||
}
|
||||
|
||||
/**
|
||||
* Format a stock quantity without hiding real data.
|
||||
*
|
||||
* Quantity columns are decimal(18,4), so a genuine 0.0001 exists. Formatting
|
||||
* every quantity at 2 dp printed such a value as "0.00", which reads as "no
|
||||
* data" — the stock popups and list pages all showed an empty-looking QTY for
|
||||
* a receipt that had in fact been made. Show 2 dp normally, and the stored
|
||||
* 4 dp whenever rounding to 2 would lose something.
|
||||
*/
|
||||
function format_quantity(value) {
|
||||
var n = Number(value);
|
||||
if (isNaN(n)) return '--';
|
||||
|
||||
return (round_dp(n, 2) !== round_dp(n, 4))
|
||||
? format_number(n, 4)
|
||||
: format_number(n, 2);
|
||||
}
|
||||
|
||||
|
||||
function format_number(value, decimal) {
|
||||
var n = Number(value);
|
||||
if (isNaN(n)) return '--';
|
||||
@@ -1184,7 +1239,7 @@ function show_stock_rows(source, source_id, label) {
|
||||
<td>${escape_html(r.warehouse_name)}</td>
|
||||
<td><small>${escape_html(location)}</small></td>
|
||||
<td><small>${escape_html(r.lot_number || '—')}</small></td>
|
||||
<td class="text-end fw-semibold">${format_number(r.quantity, 2)}</td>
|
||||
<td class="text-end fw-semibold">${format_quantity(r.quantity)}</td>
|
||||
<td>${status_badge}</td>
|
||||
<td><small>${format_date(r.date)}</small></td>
|
||||
</tr>`;
|
||||
|
||||
@@ -403,12 +403,47 @@ class InvoiceManager {
|
||||
* @param array $logging Audit entry.
|
||||
* @throws Exception If invoice not found or not in draft status.
|
||||
*/
|
||||
/**
|
||||
* Normalise a client-supplied date to ISO YYYY-MM-DD and reject anything
|
||||
* that is not a real calendar date.
|
||||
*
|
||||
* The date pickers display d/m/Y, and a page that forgets to convert before
|
||||
* posting sends that text straight through to a MySQL DATE column, where it
|
||||
* fails as a PDOException and surfaces to the user as the opaque
|
||||
* "Database error, please try again." Accepting both spellings here keeps
|
||||
* the failure mode a named, actionable message instead.
|
||||
*
|
||||
* @param string $value ISO or d/m/Y date; '' is treated as "not set".
|
||||
* @param string $label Field name used in the error message.
|
||||
* @return string|null ISO date, or null when nothing was supplied.
|
||||
* @throws Exception When the value is not a valid date.
|
||||
*/
|
||||
private function normaliseDate(string $value, string $label): ?string
|
||||
{
|
||||
$value = trim($value);
|
||||
if ($value === '') return null;
|
||||
|
||||
// Strip a time part, if the caller passed a datetime.
|
||||
$value = explode(' ', $value)[0];
|
||||
|
||||
foreach (['Y-m-d', 'd/m/Y'] as $format) {
|
||||
$parsed = DateTime::createFromFormat('!' . $format, $value);
|
||||
// createFromFormat() accepts overflowing values such as 32/01/2026
|
||||
// and rolls them over, so compare the round-trip to reject those.
|
||||
if ($parsed && $parsed->format($format) === $value) {
|
||||
return $parsed->format('Y-m-d');
|
||||
}
|
||||
}
|
||||
|
||||
throw new Exception("{$label} is not a valid date.");
|
||||
}
|
||||
|
||||
public function saveInvoice(array $data, array $logging): void
|
||||
{
|
||||
$id = (int)($data['id'] ?? 0);
|
||||
|
||||
$sth = $this->pdo->prepare(
|
||||
"SELECT status, doc_type, issued_date, `log` FROM td_invoice
|
||||
"SELECT status, doc_type, issued_date, due_date, `log` FROM td_invoice
|
||||
WHERE company_id = :company_id AND id = :id"
|
||||
);
|
||||
$sth->execute([':company_id' => $this->company_id, ':id' => $id]);
|
||||
@@ -428,8 +463,21 @@ class InvoiceManager {
|
||||
$formula_id = isset($data['formula_id']) && (int)$data['formula_id'] > 0
|
||||
? (int)$data['formula_id'] : null;
|
||||
|
||||
// Absent key means "not being edited" — keep what is stored rather than
|
||||
// clearing it, so a caller that posts only tax_adjustment cannot wipe
|
||||
// the agreed payment term.
|
||||
$due_date = array_key_exists('due_date', $data)
|
||||
? $this->normaliseDate((string)$data['due_date'], 'Due date')
|
||||
: ($row['due_date'] ?: null);
|
||||
|
||||
$issued_date = $row['issued_date'] ?: null;
|
||||
|
||||
if ($due_date !== null && $issued_date !== null && $due_date < $issued_date) {
|
||||
throw new Exception("The due date cannot be earlier than the issue date.");
|
||||
}
|
||||
|
||||
$params = [
|
||||
':due_date' => $data['due_date'] ?: null,
|
||||
':due_date' => $due_date,
|
||||
':notes' => $data['notes'] ?? '',
|
||||
':formula_id' => $formula_id,
|
||||
':log' => json_encode($log),
|
||||
@@ -525,6 +573,11 @@ class InvoiceManager {
|
||||
if (in_array($row['doc_type'], ['invoice', 'purchase_invoice']) && !$due_date) {
|
||||
throw new Exception("Due date is required before issuing this document.");
|
||||
}
|
||||
|
||||
$due_date = $this->normaliseDate((string)($due_date ?? ''), 'Due date');
|
||||
if ($due_date !== null && $due_date < $issued_date) {
|
||||
throw new Exception("The due date cannot be earlier than the issue date.");
|
||||
}
|
||||
$this->assertPostingWindow($issued_date, ucfirst(str_replace('_', ' ', $row['doc_type'])));
|
||||
|
||||
$log = json_decode($row['log'] ?? '[]', true) ?: [];
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?php
|
||||
require_once __DIR__ . '/DocumentNumberManager.php';
|
||||
require_once __DIR__ . '/WarehouseManager.php';
|
||||
require_once __DIR__ . '/StockManager.php';
|
||||
require_once __DIR__ . '/../classes_ac/PostingWindowGuard.php';
|
||||
|
||||
/**
|
||||
@@ -575,7 +576,16 @@ class PurchaseOrderManager {
|
||||
$warehouse_id = (int)($recv['warehouse_id'] ?? $po['warehouse_id']);
|
||||
$quantity = (float)($recv['quantity'] ?? 0);
|
||||
|
||||
if ($quantity <= 0) continue;
|
||||
// A blank line is a line the user chose not to receive — skip it.
|
||||
if ($quantity == 0) continue;
|
||||
|
||||
// Anything positive has to survive the decimal(18,4) columns it is
|
||||
// about to be written to. Without this, 0.0000001 was accepted, was
|
||||
// stored as 0.0000, produced a stock movement of nothing, and still
|
||||
// advanced received_qty enough to leave the PO stuck on "Partial".
|
||||
$name = $po_items[$po_items_by_id[$item_id] ?? -1]['product_name'] ?? $product_sku;
|
||||
$quantity = StockManager::normaliseQuantity($quantity, "Receiving quantity for \"{$name}\"");
|
||||
|
||||
if (!$product_sku) throw new Exception("Item #{$j}: missing product_sku.");
|
||||
if (!$warehouse_id) throw new Exception("Item #{$j}: missing warehouse_id.");
|
||||
|
||||
@@ -600,6 +610,16 @@ class PurchaseOrderManager {
|
||||
$zone = $recv['zone'] ?? '';
|
||||
$aisle = $recv['aisle'] ?? '';
|
||||
|
||||
// Expiry dates live on md_lot, keyed by lot number, so an expiry
|
||||
// entered without one is silently dropped and the received stock
|
||||
// shows no expiry at all. Say so instead of discarding it.
|
||||
if (trim((string)($recv['expiry_date'] ?? '')) !== ''
|
||||
&& trim((string)($recv['lot_number'] ?? '')) === '') {
|
||||
throw new Exception(
|
||||
"Enter a lot number for \"{$name}\" — an expiry date is recorded against its lot."
|
||||
);
|
||||
}
|
||||
|
||||
// Simple location mode: zone and aisle must mirror the bin value
|
||||
// (same convention as manage_stock_in.php).
|
||||
// occupyBin() looks up md_bin WHERE zone=:zone AND aisle=:aisle AND bin=:bin,
|
||||
|
||||
@@ -26,6 +26,18 @@ require_once __DIR__ . '/../notify_node.php';
|
||||
*/
|
||||
class StockManager {
|
||||
|
||||
/**
|
||||
* Scale of every stock quantity column (`in`, `out`, td_*_item.quantity are
|
||||
* all decimal(18,4)). Anything finer than this cannot be stored: MySQL
|
||||
* rounds it on insert, so a quantity of 0.0000001 silently became 0.0000
|
||||
* and produced a movement of nothing that still left the source document
|
||||
* "partially received".
|
||||
*/
|
||||
public const QTY_SCALE = 4;
|
||||
|
||||
/** Smallest quantity the schema can represent — 0.0001. */
|
||||
public const QTY_MIN = 0.0001;
|
||||
|
||||
private PDO $pdo;
|
||||
private int $company_id;
|
||||
|
||||
@@ -56,6 +68,39 @@ class StockManager {
|
||||
return 'td_stock_' . $warehouse_id;
|
||||
}
|
||||
|
||||
/**
|
||||
* Round a quantity to the stored scale and reject values that cannot be
|
||||
* represented.
|
||||
*
|
||||
* A positive input that rounds to zero is a mistake worth naming — the
|
||||
* caller asked to move some stock and would otherwise get a zero-quantity
|
||||
* movement that looks successful and reports as "0.00" everywhere.
|
||||
*
|
||||
* @param mixed $value Raw client input.
|
||||
* @param string $label Field name used in the error message.
|
||||
* @return float Quantity rounded to QTY_SCALE.
|
||||
* @throws Exception When the value is not a usable quantity.
|
||||
*/
|
||||
public static function normaliseQuantity($value, string $label = 'Quantity'): float
|
||||
{
|
||||
$raw = (float)$value;
|
||||
|
||||
if ($raw <= 0) {
|
||||
throw new Exception("{$label} must be greater than zero.");
|
||||
}
|
||||
|
||||
$rounded = round($raw, self::QTY_SCALE);
|
||||
|
||||
if ($rounded < self::QTY_MIN) {
|
||||
throw new Exception(
|
||||
"{$label} of {$raw} is smaller than the minimum the system records (" .
|
||||
rtrim(rtrim(number_format(self::QTY_MIN, self::QTY_SCALE), '0'), '.') . ")."
|
||||
);
|
||||
}
|
||||
|
||||
return $rounded;
|
||||
}
|
||||
|
||||
private function stockReferenceSql(): string
|
||||
{
|
||||
return "CONCAT(DATE_FORMAT(COALESCE(a.`date`, a.updated_at), '%Y%m%d%H%i%s'), '-', LPAD(a.id, 11, '0'))";
|
||||
@@ -72,36 +117,93 @@ class StockManager {
|
||||
* The 'quantity' alias resolves to the correct column (in or out) depending
|
||||
* on the type. For transfers, only the outbound row is listed (out > 0).
|
||||
*
|
||||
* @param int $warehouse_id The md_warehouse.id to query.
|
||||
* @param int $warehouse_id The md_warehouse.id to query, or 0 for every
|
||||
* warehouse of this company.
|
||||
* @param string $type Movement type: 'in' | 'out' | 'transfer'.
|
||||
* @return array Stock rows ordered by date DESC, each with 'quantity' and 'product_name'.
|
||||
* @return array Stock rows ordered by date DESC, each with 'quantity',
|
||||
* 'product_name', 'warehouse_id' and 'warehouse_name'.
|
||||
*/
|
||||
public function getStockList(int $warehouse_id, string $type): array
|
||||
{
|
||||
$table = $this->stockTableNameFromWarehouseId($warehouse_id);
|
||||
// warehouse_id 0 = every warehouse. Stock lives in one table per
|
||||
// warehouse, so a single-warehouse list hides the rest of a receipt
|
||||
// that was split across warehouses — a 4-line PO received into two of
|
||||
// them looked like only 3 lines had been received.
|
||||
$warehouses = $warehouse_id > 0
|
||||
? [$warehouse_id]
|
||||
: $this->warehouseIdsWithStockTable();
|
||||
|
||||
// The transfer list shows the outbound row, whose quantity is in `out` (its `in` is always 0).
|
||||
$column = in_array($type, ['out', 'transfer'], true) ? 'ROUND(a.out, 2)' : 'ROUND(a.in, 2)';
|
||||
// Quantity is NOT rounded for display here: rounding to 2 dp reports a
|
||||
// small-but-real quantity as "0.00", which reads as missing data.
|
||||
$column = in_array($type, ['out', 'transfer'], true) ? 'a.out' : 'a.in';
|
||||
$stock_ref = $this->stockReferenceSql();
|
||||
|
||||
// Transfer list: show only the outbound side (out > 0) to avoid duplicate display
|
||||
$extra_cond = ($type === 'transfer') ? 'AND a.out > 0' : '';
|
||||
|
||||
$rows = [];
|
||||
|
||||
foreach ($warehouses as $wh_id) {
|
||||
$table = $this->stockTableNameFromWarehouseId($wh_id);
|
||||
|
||||
$sth = $this->pdo->prepare(
|
||||
"SELECT a.*, {$stock_ref} AS stock_reference, {$column} AS quantity,
|
||||
b.product_name, b.uom,
|
||||
w.warehouse_name
|
||||
FROM `{$table}` a
|
||||
LEFT JOIN md_product b
|
||||
ON a.company_id = b.company_id
|
||||
AND a.product_sku = b.sku
|
||||
LEFT JOIN md_warehouse w
|
||||
ON w.company_id = a.company_id
|
||||
AND w.id = :warehouse_id
|
||||
WHERE a.company_id = :company_id
|
||||
AND a.type = :type
|
||||
{$extra_cond}
|
||||
ORDER BY a.date DESC"
|
||||
);
|
||||
$sth->execute([
|
||||
':company_id' => $this->company_id,
|
||||
':warehouse_id' => $wh_id,
|
||||
':type' => $type,
|
||||
]);
|
||||
|
||||
foreach ($sth->fetchAll(PDO::FETCH_ASSOC) as $row) {
|
||||
// The row's own warehouse, so the list can link each Action
|
||||
// back to the right td_stock_<id> table when showing them all.
|
||||
$row['warehouse_id'] = $wh_id;
|
||||
$rows[] = $row;
|
||||
}
|
||||
}
|
||||
|
||||
// Re-sort across warehouses — each table was only ordered internally.
|
||||
usort($rows, fn($x, $y) => strcmp((string)($y['date'] ?? ''), (string)($x['date'] ?? '')));
|
||||
|
||||
return $rows;
|
||||
}
|
||||
|
||||
/**
|
||||
* Warehouse ids of this company that actually have a stock table.
|
||||
*
|
||||
* td_stock_<id> tables are created lazily on first use, so a warehouse with
|
||||
* no movements yet has none and must be skipped rather than queried.
|
||||
*
|
||||
* @return int[]
|
||||
*/
|
||||
private function warehouseIdsWithStockTable(): array
|
||||
{
|
||||
$sth = $this->pdo->prepare(
|
||||
"SELECT a.*, {$stock_ref} AS stock_reference, {$column} AS quantity, b.product_name, b.uom
|
||||
FROM `{$table}` a
|
||||
LEFT JOIN md_product b
|
||||
ON a.company_id = b.company_id
|
||||
AND a.product_sku = b.sku
|
||||
WHERE a.company_id = :company_id
|
||||
AND a.type = :type
|
||||
{$extra_cond}
|
||||
ORDER BY a.date DESC"
|
||||
"SELECT w.id
|
||||
FROM md_warehouse w
|
||||
JOIN information_schema.tables t
|
||||
ON t.table_schema = DATABASE()
|
||||
AND t.table_name = CONCAT('td_stock_', w.id)
|
||||
WHERE w.company_id = :company_id
|
||||
ORDER BY w.id"
|
||||
);
|
||||
$sth->execute([
|
||||
':company_id' => $this->company_id,
|
||||
':type' => $type,
|
||||
]);
|
||||
return $sth->fetchAll(PDO::FETCH_ASSOC);
|
||||
$sth->execute([':company_id' => $this->company_id]);
|
||||
return array_map('intval', $sth->fetchAll(PDO::FETCH_COLUMN));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -258,8 +360,8 @@ class StockManager {
|
||||
$warehouse_id = (int)($data["warehouse"] ?? 0);
|
||||
$quantity = (float)($data['quantity'] ?? 0);
|
||||
|
||||
if ($id === 0 && $quantity <= 0) {
|
||||
throw new Exception("Quantity must be greater than zero.");
|
||||
if ($id === 0) {
|
||||
$quantity = self::normaliseQuantity($quantity);
|
||||
}
|
||||
$whMgmt = new WarehouseManager($this->pdo, $this->company_id);
|
||||
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
<?php
|
||||
// Applies the configured application timezone to PHP, and exposes the matching
|
||||
// UTC offset so the database session can be pinned to the same zone.
|
||||
//
|
||||
// config.php has always defined $time_zone ("Asia/Bangkok"), but nothing ever
|
||||
// called date_default_timezone_set() with it. PHP therefore ran on its ini
|
||||
// default (UTC on this stack) while MySQL NOW() ran on the database server's
|
||||
// zone (Bangkok). Every timestamp written from PHP — stock movement `date`
|
||||
// above all — was stored 7 hours behind the real wall clock, so a stock-in
|
||||
// created at 14:02 was listed as 07:02.
|
||||
//
|
||||
// Loaded from dbconn.php (covers every API engine, which is where writes
|
||||
// happen) and from include_header.php (covers the rendered pages).
|
||||
|
||||
if (!defined('APP_TIMEZONE')) {
|
||||
|
||||
$app_tz = $GLOBALS['time_zone'] ?? 'Asia/Bangkok';
|
||||
|
||||
// An unknown identifier would leave PHP on UTC and silently reintroduce the
|
||||
// skew, so fall back to the documented project zone instead.
|
||||
try {
|
||||
$tz = new DateTimeZone($app_tz);
|
||||
} catch (Exception $e) {
|
||||
$app_tz = 'Asia/Bangkok';
|
||||
$tz = new DateTimeZone($app_tz);
|
||||
}
|
||||
|
||||
date_default_timezone_set($app_tz);
|
||||
define('APP_TIMEZONE', $app_tz);
|
||||
|
||||
// "+07:00" — the form MySQL accepts without its named-timezone tables
|
||||
// having been loaded, which is the usual case on a stock install.
|
||||
$offset_seconds = $tz->getOffset(new DateTime('now', $tz));
|
||||
define('APP_TIMEZONE_OFFSET', sprintf(
|
||||
'%s%02d:%02d',
|
||||
$offset_seconds < 0 ? '-' : '+',
|
||||
intdiv(abs($offset_seconds), 3600),
|
||||
intdiv(abs($offset_seconds) % 3600, 60)
|
||||
));
|
||||
}
|
||||
Reference in New Issue
Block a user