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

Send the chosen company when switching branch

Browse Source
This commit is contained in:
Thanakorn
2026-09-14 17:17:40 +07:00
parent 501c70050f
commit ba73456185
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/include_topbar.php
+3 -1
View File
@@ -420,7 +420,9 @@ function do_switch_branch(company_id) {
autoPrepare: true, autoPrepare: true,
checkRequired: 0, checkRequired: 0,
action: 'update', action: 'update',
company_id: company_id, // Sent under its own key: prepare_form_data() always fills company_id with
// the CURRENT company, and only options.data reaches the payload.
data: { target_company_id: company_id },
onSuccess: function(res) { onSuccess: function(res) {
window.location.reload(); window.location.reload();
} }
app/setting/api/engine/switch_branch.php
+6 -2
View File
@@ -3,7 +3,11 @@
* switch_branch.php — Switch the active company for the current session. * switch_branch.php — Switch the active company for the current session.
* *
* action: 'read' → return list of companies the user belongs to * action: 'read' → return list of companies the user belongs to
* action: 'update' → switch to the requested company_id * action: 'update' → switch to target_company_id
*
* The target is read from target_company_id, not company_id: every request
* carries company_id = the CURRENT company (prepare_form_data in custom.js),
* so reading it made a switch silently re-select the company already active.
*/ */
session_start(); session_start();
require_once '../../../assets/utils/db_auth.php'; require_once '../../../assets/utils/db_auth.php';
@@ -20,7 +24,7 @@ if ($action === 'read') {
} }
if ($action === 'update') { if ($action === 'update') {
$target_company_id = (int)($data['company_id'] ?? 0); $target_company_id = (int)($data['target_company_id'] ?? 0);
if (!$target_company_id) { if (!$target_company_id) {
$answer['message'] = 'Invalid company.'; $answer['message'] = 'Invalid company.';