nok/wms-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final prep for production

Browse Source
This commit is contained in:
Thanakorn S
2026-05-12 13:55:39 +07:00
parent adfd5ef017
commit 5c6a478b40
58 changed files with 15114 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/utils/classes/BarcodeManager.php
+5 -5
View File
@@ -127,11 +127,11 @@ class BarcodeManager {
private function validateLocation(int $warehouse_id, string $zone, string $aisle, string $rack): void {
$sth = $this->pdo->prepare(
"SELECT 1 FROM md_rack
WHERE company_id = :company_id
AND warehouse = :warehouse
AND zone = :zone
AND aisle = :aisle
AND rack = :rack
WHERE company_id = :company_id
AND warehouse = :warehouse
AND COALESCE(zone, '') = :zone
AND COALESCE(aisle,'') = :aisle
AND rack = :rack
LIMIT 1"
);
$sth->execute([
app/dashboard/api/engine_report/reports_stats.php
+18 -2
View File
@@ -42,20 +42,36 @@
$sth->execute([':company_id' => $company_id]);
$pending_returns = (int)$sth->fetchColumn();
// Stock health breakdown for the Overall Information donut chart
$low_stock_items = $report->getLowStockItems();
$critical_count = count(array_filter($low_stock_items, fn($i) => $i['status'] === 'critical'));
$warning_count = count(array_filter($low_stock_items, fn($i) => $i['status'] === 'warning'));
$total_in_stock = (int) $report->getTotalProductInStock();
$healthy_count = max(0, $total_in_stock - $critical_count - $warning_count);
$answer['output'] = [
'total_in' => $stats['total_in'],
'total_out' => $stats['total_out'],
'active_products' => $stats['active_products'],
'low_stock' => $report->getDashboardLowStockCount(),
'low_stock' => count($low_stock_items),
'total_orders' => (int)$total_orders,
'total_revenue' => (float)$total_revenue,
'unpaid_invoices' => $unpaid_invoices,
'pending_returns' => $pending_returns,
'stock_movement' => $report->getStockMovementChart(12),
'most_moved' => $report->getMostMovedProducts($month),
'low_stock_items' => $report->getLowStockItems(),
'low_stock_items' => $low_stock_items,
'recent_activity' => $report->getRecentActivity(10),
'months' => $report->getAvailableMonths(),
'stock_health' => [
'healthy' => $healthy_count,
'warning' => $warning_count,
'critical' => $critical_count,
'total' => $total_in_stock,
],
'total_products' => (int) $report->getTotalProduct(),
'total_contacts' => (int) $report->getTotalContact(),
'total_warehouses' => (int) $report->getTotalWarehouse(),
];
$answer['success'] = 1;
exit(json_encode($answer));
app/dashboard/index.php
+189 -8
View File
@@ -34,19 +34,19 @@
<!-- Stat cards -->
<div class="row g-5 mb-5">
<div class="col-lg-3 col-sm-6 col-12">
<div class="card p-4 bg-primary bg-opacity-10 border border-primary border-opacity-25 rounded-2" style="position:relative;">
<div class="card p-4 bg-warning bg-opacity-10 border border-warning border-opacity-25 rounded-2" style="position:relative;">
<div class="d-flex gap-3">
<div class="icon-shape icon-md bg-primary text-white rounded-2">
<div class="icon-shape icon-md bg-warning text-white rounded-2">
<i class="ti ti-trending-up fs-4"></i>
</div>
<div>
<h2 class="mb-3 fs-6">Total Stock In</h2>
<h3 class="fw-bold mb-0" id="stat_total_in">—</h3>
<p class="text-primary mb-0 small">Units received this month</p>
<p class="text-warning mb-0 small">Units received this month</p>
</div>
</div>
<div class="card-loader-overlay" id="overlay_in">
<div class="spinner-border spinner-border-sm text-primary"></div>
<div class="spinner-border spinner-border-sm text-warning"></div>
</div>
</div>
</div>
@@ -104,9 +104,64 @@
</div>
<!-- Stock Movement Chart -->
<!-- Secondary stat cards -->
<div class="row g-5 mb-5">
<div class="col-12">
<div class="col-lg-4 col-sm-6 col-12">
<div class="card" style="position:relative;">
<div class="card-body p-4">
<div class="d-flex justify-content-between border-bottom pb-3 mb-3">
<div>
<h3 class="fw-bold h4 mb-1" id="stat_low_stock_count">—</h3>
<span class="text-muted small">Low Stock Alert</span>
</div>
<i class="ti ti-alert-triangle fs-1 text-warning"></i>
</div>
<div class="small">
<a href="<?php echo $server_url?>dashboard/low_stock_products.php" class="link-primary text-decoration-underline">View All</a>
</div>
</div>
<div class="card-loader-overlay" id="overlay_ls"><div class="spinner-border spinner-border-sm text-primary"></div></div>
</div>
</div>
<div class="col-lg-4 col-sm-6 col-12">
<div class="card" style="position:relative;">
<div class="card-body p-4">
<div class="d-flex justify-content-between border-bottom pb-3 mb-3">
<div>
<h3 class="fw-bold h4 mb-1" id="stat_unpaid_invoices">—</h3>
<span class="text-muted small">Unpaid Invoices</span>
</div>
<i class="ti ti-file-invoice fs-1 text-danger"></i>
</div>
<div class="small">
<a href="<?php echo $server_url?>order/invoice.php" class="link-primary text-decoration-underline">View All</a>
</div>
</div>
<div class="card-loader-overlay" id="overlay_ui"><div class="spinner-border spinner-border-sm text-primary"></div></div>
</div>
</div>
<div class="col-lg-4 col-sm-6 col-12">
<div class="card" style="position:relative;">
<div class="card-body p-4">
<div class="d-flex justify-content-between border-bottom pb-3 mb-3">
<div>
<h3 class="fw-bold h4 mb-1" id="stat_pending_returns">—</h3>
<span class="text-muted small">Pending Returns</span>
</div>
<i class="ti ti-arrows-exchange fs-1 text-info"></i>
</div>
<div class="small">
<a href="<?php echo $server_url?>order/return.php" class="link-primary text-decoration-underline">View All</a>
</div>
</div>
<div class="card-loader-overlay" id="overlay_pr"><div class="spinner-border spinner-border-sm text-primary"></div></div>
</div>
</div>
</div>
<!-- Stock Movement Chart + Overall Information -->
<div class="row g-5 mb-5">
<div class="col-12 col-lg-6">
<div class="card" style="position:relative;">
<div class="card-body p-5">
<h3 class="h5 mb-0">Stock Movement</h3>
@@ -118,6 +173,56 @@
</div>
</div>
</div>
<div class="col-12 col-lg-6">
<div class="card" style="position:relative;">
<div class="card-header d-flex justify-content-between align-items-center bg-transparent px-4 py-3">
<h3 class="h5 mb-0">Overall Information</h3>
</div>
<div class="card-body p-6">
<h3 class="h6">Stock Health Overview</h3>
<div class="row align-items-center">
<div class="col-sm-6">
<div id="ics_overallChart"></div>
</div>
<div class="col-sm-6">
<div class="row">
<div class="col-6 border-end">
<div class="text-center">
<h2 class="mb-1" id="stat_health_healthy">—</h2>
<p class="text-success mb-2">Healthy</p>
<span class="badge bg-success d-inline-flex align-items-center"><i class="ti ti-arrow-up-left me-1"></i><span id="stat_health_healthy_pct">—</span></span>
</div>
</div>
<div class="col-6">
<div class="text-center">
<h2 class="mb-1" id="stat_health_critical">—</h2>
<p class="text-warning mb-2">Warning</p>
<span class="badge bg-success badge-xs d-inline-flex align-items-center"><i class="ti ti-arrow-up-left me-1"></i><span id="stat_health_critical_pct">—</span></span>
</div>
</div>
</div>
</div>
</div>
<div class="row text-center border-top mt-4 pt-4">
<div class="col-4 border-end">
<h3 class="fw-bold mb-2" id="stat_total_products">—</h3>
<small class="text-secondary">Products</small>
</div>
<div class="col-4 border-end">
<h3 class="fw-bold mb-2" id="stat_total_contacts">—</h3>
<small class="text-secondary">Contacts</small>
</div>
<div class="col-4">
<h3 class="fw-bold mb-2" id="stat_total_wh">—</h3>
<small class="text-secondary">Warehouses</small>
</div>
</div>
</div>
<div class="card-loader-overlay" id="overlay_overall">
<div class="spinner-border spinner-border-sm text-primary"></div>
</div>
</div>
</div>
</div>
<!-- Bottom 3 cards -->
@@ -180,24 +285,32 @@
<script>
var movementChart = null;
var overallChart = null;
// ── Show all overlays ─────────────────────────────────────────────────
function show_overlays() {
$('#overlay_in, #overlay_out, #overlay_orders, #overlay_revenue, #overlay_chart, #overlay_moved, #overlay_low_list, #overlay_activity').show();
$('#overlay_in, #overlay_out, #overlay_orders, #overlay_revenue, #overlay_chart, #overlay_moved, #overlay_low_list, #overlay_activity, #overlay_ls, #overlay_ui, #overlay_pr, #overlay_overall').show();
}
// ── Render all sections ───────────────────────────────────────────────
async function render(d, month) {
// Stats
// Stats — top row
$('#stat_total_in').text(format_number(d.total_in, 2));
$('#stat_total_out').text(format_number(d.total_out, 2));
$('#stat_total_orders').text(format_number(d.total_orders));
$('#stat_total_revenue').text(format_number(d.total_revenue, 2));
$('#overlay_in, #overlay_out, #overlay_orders, #overlay_revenue').hide();
// Stats — secondary row
$('#stat_active_products').text(format_number(d.active_products));
$('#stat_low_stock_count').text(format_number(d.low_stock));
$('#stat_unpaid_invoices').text(format_number(d.unpaid_invoices));
$('#stat_pending_returns').text(format_number(d.pending_returns));
$('#overlay_ls, #overlay_ui, #overlay_pr').hide();
// Chart
var mv = d.stock_movement;
if (movementChart) {
@@ -227,6 +340,74 @@
}
$('#overlay_chart').hide();
// Overall Information
var sh = d.stock_health || { healthy: 0, warning: 0, critical: 0, total: 0 };
var sh_count = sh.healthy + sh.warning + sh.critical;
var healthy_pct = sh_count > 0 ? Math.round(sh.healthy / sh_count * 100) : 0;
var warning_pct = sh_count > 0 ? Math.round(sh.warning / sh_count * 100) : 0;
var critical_pct = sh_count > 0 ? Math.round(sh.critical / sh_count * 100) : 0;
$('#stat_health_healthy').text(format_number(sh.healthy));
$('#stat_health_critical').text(format_number(sh.warning + sh.critical));
$('#stat_health_healthy_pct').text(healthy_pct + '%');
$('#stat_health_critical_pct').text((warning_pct + critical_pct) + '%');
$('#stat_total_products').text(format_number(d.total_products || 0));
$('#stat_total_contacts').text(format_number(d.total_contacts || 0));
$('#stat_total_wh').text(format_number(d.total_warehouses || 0));
var sh_series = [healthy_pct, critical_pct];
if (overallChart) {
await overallChart.updateSeries(sh_series);
} else {
$('#ics_overallChart').empty();
overallChart = new ApexCharts(document.querySelector('#ics_overallChart'), {
series: sh_series,
chart: { height: 200, type: 'radialBar', toolbar: { show: false } },
colors: ['#00C951', '#E66239'],
plotOptions: {
radialBar: {
dataLabels: {
name: { fontSize: '13px', offsetY: -5 },
value: { fontSize: '16px', offsetY: 5 },
total: {
show: true,
label: 'Healthy',
color: '#00C951',
formatter: function(w) {
return w.globals.series[0] + '%';
}
}
},
hollow: {
margin: 3,
size: '50%',
background: 'transparent',
},
track: {
show: true,
background: '#f0f0f0',
strokeWidth: '45%',
opacity: 1,
margin: 5,
}
}
},
fill: {
type: 'gradient',
gradient: {
shade: 'dark',
type: 'vertical',
gradientToColors: ['#007867', '#FFAC82'],
stops: [0, 100]
}
},
stroke: { lineCap: 'round' },
labels: ['Healthy', 'Critical']
});
await overallChart.render();
}
$('#overlay_overall').hide();
// Most Moved Products
$('#most_moved_month').text(format_month(month));
var moved_html = '';
app/ics/api/engine/location_barcode_label.php
+1 -1
View File
@@ -56,7 +56,7 @@
}
// Default: create
if ($barcode === '' || !$warehouse_id || $zone === '' || $aisle === '' || $rack === '') {
if ($barcode === '' || !$warehouse_id || $rack === '') {
$answer['message'] = 'Location barcode data is incomplete.';
http_response_code(400);
exit(json_encode($answer));
app/ics/location_barcode_label.php
+2 -2
View File
@@ -247,8 +247,8 @@
label_action: 'create',
barcode: payload,
warehouse_id: item.warehouse_id,
zone: advanced ? item.zone : item.rack,
aisle: advanced ? item.aisle : item.rack,
zone: item.zone || '',
aisle: item.aisle || '',
rack: item.rack
},
onSuccess: function() {
app/ics/sku_barcode_label.php
+1
View File
@@ -521,6 +521,7 @@
</script>
<style>
.barcode-label { max-width: 420px; background: #fff; color: #111; }
.barcode-label svg { max-width: 100%; height: auto; }
.table-scroll {
max-height: calc(100vh - 320px);
overflow-y: auto;