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

implement JS password scoring, td_stock approve logicc

Browse Source
This commit is contained in:
Thanakorn S
2026-04-30 15:14:42 +07:00
parent db5c47b6ca
commit ac4fd9a5ad
3147 changed files with 1298 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ics/api/engine/approve_stock.php
+46
View File
@@ -0,0 +1,46 @@
<?php
/**
* approve_stock.php — Approve a draft td_stock row (status 0 → 1).
*
* Flips status to 1 and calls adjustBalance() so warehouse_balance
* reflects the transaction. This is the ONLY place adjustBalance() is
* called — both auto-approve (on save) and manual approve go through here.
*
* Expected $data keys:
* id int td_stock row id
* warehouse int warehouse_id (to resolve the dynamic table)
* type string 'in' | 'out' | 'transfer'
*/
session_start();
require '../../../assets/utils/db_auth.php';
require '../../../assets/utils/classes/StockManager.php';
require '../../../assets/utils/classes/WarehouseManager.php';
$id = (int)($data['id'] ?? 0);
$warehouse_id = (int)($data['warehouse'] ?? 0);
$type = $data['type'] ?? '';
if (!$id || !$warehouse_id || !in_array($type, ['in', 'out', 'transfer'])) {
http_response_code(400);
exit(json_encode(['success' => 0, 'message' => 'Invalid parameters.']));
}
$stock = new StockManager($pdo2, $company_id);
$whMgmt = new WarehouseManager($pdo2, $company_id);
try {
$pdo2->beginTransaction();
$result = $stock->approveStock($id, $warehouse_id, $type, $whMgmt);
$pdo2->commit();
$answer['success'] = 1;
$answer['message'] = 'Stock approved.';
exit(json_encode($answer));
} catch (Exception $e) {
$pdo2->rollBack();
http_response_code(400);
exit(json_encode(['success' => 0, 'message' => $e->getMessage()]));
}
app/ics/api/engine/manage_stock_in.php
+16 -4
View File
@@ -3,14 +3,26 @@
require '../../../assets/utils/db_auth.php';
require '../../../assets/utils/classes/StockManager.php';
require '../../../assets/utils/classes/WarehouseManager.php';
require '../../../assets/utils/classes/CompanySettingManager.php';
$csm = new CompanySettingManager($pdo1, $company_id);
$auto_approve = (int)$csm->get('default_stock_status') === 1;
try {
dbTransaction($pdo2, function($pdo) use ($data, $company_id, $logging, $uuid) {
$stock = new StockManager($pdo, $company_id);
$stock->saveStockIn($data, $logging, $uuid);
$new_id = null;
dbTransaction($pdo2, function($pdo) use ($data, $company_id, $logging, $uuid, $auto_approve, &$new_id) {
$stock = new StockManager($pdo, $company_id);
$whMgmt = new WarehouseManager($pdo, $company_id);
$new_id = $stock->saveStockIn($data, $logging, $uuid);
if ($auto_approve && $new_id > 0) {
$stock->approveStock($new_id, (int)$data['warehouse'], 'in', $whMgmt);
}
});
$answer['success'] = 1;
$answer['success'] = 1;
$answer['auto_approved'] = $auto_approve;
} catch (PDOException $e) {
$answer['success'] = 0;
app/ics/api/engine/manage_stock_out.php
+16 -4
View File
@@ -3,14 +3,26 @@
require '../../../assets/utils/db_auth.php';
require '../../../assets/utils/classes/StockManager.php';
require '../../../assets/utils/classes/WarehouseManager.php';
require '../../../assets/utils/classes/CompanySettingManager.php';
$csm = new CompanySettingManager($pdo1, $company_id);
$auto_approve = (int)$csm->get('default_stock_status') === 1;
try {
dbTransaction($pdo2, function($pdo) use ($data, $company_id, $logging, $uuid) {
$stock = new StockManager($pdo, $company_id);
$stock->saveStockOut($data, $logging, $uuid);
$new_id = null;
dbTransaction($pdo2, function($pdo) use ($data, $company_id, $logging, $uuid, $auto_approve, &$new_id) {
$stock = new StockManager($pdo, $company_id);
$whMgmt = new WarehouseManager($pdo, $company_id);
$new_id = $stock->saveStockOut($data, $logging, $uuid);
if ($auto_approve && $new_id > 0) {
$stock->approveStock($new_id, (int)$data['warehouse'], 'out', $whMgmt);
}
});
$answer['success'] = 1;
$answer['success'] = 1;
$answer['auto_approved'] = $auto_approve;
} catch (PDOException $e) {
$answer['success'] = 0;
app/ics/api/engine/manage_stock_transfer.php
+16 -4
View File
@@ -3,14 +3,26 @@
require '../../../assets/utils/db_auth.php';
require '../../../assets/utils/classes/StockManager.php';
require '../../../assets/utils/classes/WarehouseManager.php';
require '../../../assets/utils/classes/CompanySettingManager.php';
$csm = new CompanySettingManager($pdo1, $company_id);
$auto_approve = (int)$csm->get('default_stock_status') === 1;
try {
dbTransaction($pdo2, function($pdo) use ($data, $company_id, $logging, $uuid) {
$stock = new StockManager($pdo, $company_id);
$stock->saveStockTransfer($data, $logging, $uuid);
$new_id = null;
dbTransaction($pdo2, function($pdo) use ($data, $company_id, $logging, $uuid, $auto_approve, &$new_id) {
$stock = new StockManager($pdo, $company_id);
$whMgmt = new WarehouseManager($pdo, $company_id);
$new_id = $stock->saveStockTransfer($data, $logging, $uuid);
if ($auto_approve && $new_id > 0) {
$stock->approveStock($new_id, (int)$data['warehouse_from'], 'transfer', $whMgmt);
}
});
$answer['success'] = 1;
$answer['success'] = 1;
$answer['auto_approved'] = $auto_approve;
} catch (PDOException $e) {
$answer['success'] = 0;
app/ics/api/engine/retrieve_warehouse.php
+14 -6
View File
@@ -3,12 +3,20 @@
require '../../../assets/utils/db_auth.php';
require '../../../assets/utils/classes/WarehouseManager.php';
$wh = new WarehouseManager($pdo2, $company_id);
$answer['output'] = $wh->getWarehouseList(
$data['type'] ?? '',
$data['product_sku'] ?? '',
(int)($data['id'] ?? 0)
);
$wh = new WarehouseManager($pdo2, $company_id);
$type = $data['type'] ?? '';
$sku = $data['product_sku'] ?? '';
$lot = $data['lot_number'] ?? '';
$id = (int)($data['id'] ?? 0);
// When type=from and a lot is selected, filter warehouses to only those
// holding that specific lot in an approved, rack-occupied stock-in row.
if ($type === 'from' && $sku && $lot) {
$answer['output'] = $wh->getWarehousesByLot($sku, $lot);
} else {
$answer['output'] = $wh->getWarehouseList($type, $sku, $id);
}
$answer['success'] = 1;
exit(json_encode($answer));
?>
app/ics/manage_stock_in.php
+2 -2
View File
@@ -289,8 +289,8 @@
.attr('data-id', data.contact_id);
$('#product_name').val(data.product_name);
$('#lot_number').val(data.lot_number || '');
$('#serial_number').val(data.serial_number || '');
$('#lot_number').val(data.lot_number || '').prop('disabled', true);
$('#serial_number').val(data.serial_number || '').prop('disabled', true);
if (data.lot_number) {
if (expiryPicker) { expiryPicker.setDate(data.expiry_date || '', true, 'Y-m-d'); }
$('#expiry_date').prop('disabled', true).attr('title', 'Expiry date is locked for existing lots')
app/ics/manage_stock_out.php
+1 -1
View File
@@ -198,7 +198,7 @@
autoPrepare: true,
checkRequired: 0,
noLoading: true,
data: { "type": 'from' },
data: { "type": 'from', "lot_number": $('#lot_number').val() },
action: 'read',
onSuccess: function(res) {
var option = '<option value="">Select warehouse...</option>';
app/ics/manage_stock_transfer.php
+1 -1
View File
@@ -225,7 +225,7 @@
autoPrepare: true,
checkRequired: 0,
noLoading: true,
data: { "type": type },
data: { "type": type, "lot_number": type === 'from' ? $('#lot_number').val() : '' },
action: 'read',
debugMode: 0,
onSuccess: function(res) {
app/ics/stock_in.php
+47 -2
View File
@@ -133,10 +133,16 @@
<td class="py-3">${item['aisle']}</td>
<td class="py-3">${item['rack']}</td>
<td class="py-3">
${(item['status'])?'<span class="badge bg-success">Active</span>':'<span class="badge bg-secondary">Inactive</span>'}
${item['status'] == 1 ? '<span class="badge bg-success">Approved</span>' : '<span class="badge bg-warning text-dark">Draft</span>'}
</td>
<td class="py-3">
<a href="<?php echo $server_url?>ics/manage_stock_in.php?id=${item['id']}&wh=${warehouse}" class=""><i class="ti ti-eye fs-5"></i></a>
${item['status'] == 0
? (auto_approve
? '<button class="btn btn-sm btn-outline-secondary ms-2" disabled title="Auto-approved on save — no manual approval needed"><i class=\"ti ti-check\"></i></button>'
: '<button class="btn btn-sm btn-outline-success ms-2" onclick=\"approve_stock('+item['id']+', '+item['warehouse_id']+', \'in\')\" title="Approve"><i class=\"ti ti-check\"></i></button>'
)
: ''}
<a href="javascript:void(0);" class="link-danger"
onclick="delete_stock_in($(this),${item['id']})">
<i class="ti ti-trash ms-2 fs-5"></i>
@@ -189,13 +195,52 @@
$(async function() {
try {
await load_company_setting();
await retrieve_warehouse();
await retrieve_stock_in();
} catch (e) {
console.log(e);
}
});
</script>
// ── Stock approval ────────────────────────────────────────────────────────
var auto_approve = false; // set from company_setting on load
function load_company_setting() {
return ajax_request({
url: server_url + 'setting/api/engine/company_setting.php',
autoPrepare: true,
checkRequired: 0,
action: 'read',
onSuccess: function(res) {
auto_approve = res.output.default_stock_status == 1;
}
});
}
function approve_stock(id, warehouse_id, type) {
bootbox.confirm({
message: 'Approve this stock record?',
buttons: { confirm: { label: 'Approve', className: 'btn-success' }, cancel: { label: 'Cancel', className: 'btn-secondary' } },
callback: function(result) {
if (!result) return;
ajax_request({
url: server_url + 'ics/api/engine/approve_stock.php',
autoPrepare: true,
checkRequired: 0,
action: 'update',
id: id,
warehouse: warehouse_id,
type: type,
onSuccess: function(res) {
retrieve_stock_list();
}
});
}
});
}
</script>
</body>
app/ics/stock_out.php
+47 -2
View File
@@ -133,10 +133,16 @@
<td class="py-3">${item['aisle']}</td>
<td class="py-3">${item['rack']}</td>
<td class="py-3">
${(item['status'])?'<span class="badge bg-success">Active</span>':'<span class="badge bg-secondary">Inactive</span>'}
${item['status'] == 1 ? '<span class="badge bg-success">Approved</span>' : '<span class="badge bg-warning text-dark">Draft</span>'}
</td>
<td class="py-3">
<a href="<?php echo $server_url?>ics/manage_stock_out.php?id=${item['id']}&wh=${warehouse}" class=""><i class="ti ti-eye fs-5"></i></a>
${item['status'] == 0
? (auto_approve
? '<button class="btn btn-sm btn-outline-secondary ms-2" disabled title="Auto-approved on save — no manual approval needed"><i class=\"ti ti-check\"></i></button>'
: '<button class="btn btn-sm btn-outline-success ms-2" onclick=\"approve_stock('+item['id']+', '+item['warehouse_id']+', \'out\')\" title="Approve"><i class=\"ti ti-check\"></i></button>'
)
: ''}
<a href="javascript:void(0);" class="link-danger"
onclick="delete_stock_out($(this),${item['id']})">
<i class="ti ti-trash ms-2 fs-5"></i>
@@ -189,13 +195,52 @@
$(async function() {
try {
await load_company_setting();
await retrieve_warehouse();
await retrieve_stock_out();
} catch (e) {
console.log(e);
}
});
</script>
// ── Stock approval ────────────────────────────────────────────────────────
var auto_approve = false; // set from company_setting on load
function load_company_setting() {
return ajax_request({
url: server_url + 'setting/api/engine/company_setting.php',
autoPrepare: true,
checkRequired: 0,
action: 'read',
onSuccess: function(res) {
auto_approve = res.output.default_stock_status == 1;
}
});
}
function approve_stock(id, warehouse_id, type) {
bootbox.confirm({
message: 'Approve this stock record?',
buttons: { confirm: { label: 'Approve', className: 'btn-success' }, cancel: { label: 'Cancel', className: 'btn-secondary' } },
callback: function(result) {
if (!result) return;
ajax_request({
url: server_url + 'ics/api/engine/approve_stock.php',
autoPrepare: true,
checkRequired: 0,
action: 'update',
id: id,
warehouse: warehouse_id,
type: type,
onSuccess: function(res) {
retrieve_stock_list();
}
});
}
});
}
</script>
</body>
app/ics/stock_transfer.php
+47 -2
View File
@@ -129,10 +129,16 @@
<td class="py-3">${item['aisle']}</td>
<td class="py-3">${item['rack']}</td>
<td class="py-3">
${(item['status'])?'<span class="badge bg-success">Active</span>':'<span class="badge bg-secondary">Inactive</span>'}
${item['status'] == 1 ? '<span class="badge bg-success">Approved</span>' : '<span class="badge bg-warning text-dark">Draft</span>'}
</td>
<td class="py-3">
<a href="<?php echo $server_url?>ics/manage_stock_transfer.php?id=${item['id']}&wh=${warehouse}" class=""><i class="ti ti-eye fs-5"></i></a>
${item['status'] == 0
? (auto_approve
? '<button class="btn btn-sm btn-outline-secondary ms-2" disabled title="Auto-approved on save — no manual approval needed"><i class=\"ti ti-check\"></i></button>'
: '<button class="btn btn-sm btn-outline-success ms-2" onclick=\"approve_stock('+item['id']+', '+item['warehouse_id']+', \'transfer\')\" title="Approve"><i class=\"ti ti-check\"></i></button>'
)
: ''}
<a href="javascript:void(0);" class="link-danger"
onclick="delete_stock_transfer($(this),${item['id']})">
<i class="ti ti-trash ms-2 fs-5"></i>
@@ -187,13 +193,52 @@
$(async function() {
try {
await load_company_setting();
await retrieve_warehouse();
await retrieve_stock_transfer();
} catch (e) {
console.log(e);
}
});
</script>
// ── Stock approval ────────────────────────────────────────────────────────
var auto_approve = false; // set from company_setting on load
function load_company_setting() {
return ajax_request({
url: server_url + 'setting/api/engine/company_setting.php',
autoPrepare: true,
checkRequired: 0,
action: 'read',
onSuccess: function(res) {
auto_approve = res.output.default_stock_status == 1;
}
});
}
function approve_stock(id, warehouse_id, type) {
bootbox.confirm({
message: 'Approve this stock record?',
buttons: { confirm: { label: 'Approve', className: 'btn-success' }, cancel: { label: 'Cancel', className: 'btn-secondary' } },
callback: function(result) {
if (!result) return;
ajax_request({
url: server_url + 'ics/api/engine/approve_stock.php',
autoPrepare: true,
checkRequired: 0,
action: 'update',
id: id,
warehouse: warehouse_id,
type: type,
onSuccess: function(res) {
retrieve_stock_list();
}
});
}
});
}
</script>
</body>