merge accounting app and solve conflict

This commit is contained in:
Thanakorn S
2026-05-20 13:22:17 +07:00
208 changed files with 26394 additions and 3756 deletions
+3 -2
View File
@@ -60,7 +60,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$csrf = $_SERVER['HTTP_X_CSRF_TOKEN'] ?? '';
if (empty($csrf) || $csrf !== ($_SESSION['csrf_token'] ?? '')) {
http_response_code(403);
exit(json_encode(['message' => 'Invalid request.']));
$answer['message'] = 'Invalid request.';
exit(json_encode($answer));
}
}
@@ -176,7 +177,7 @@ try {
// ── Step 14: Send verification email (non-fatal) ─────────────────────────
// silent=true means the mailer returns false on failure instead of calling
// exit() — so the account is always created even if SMTP is unavailable.
require_once $include_url . 'assets/utils/module/mailer.php';
require_once '../../../assets/utils/module/mailer.php';
$mailer = new mailer(['pdo1' => $pdo1]);
$mail_sent = $mailer->send_email([