merge accounting app and solve conflict

2026-05-20 13:22:17 +07:00
parent bf3be28f79 91f8bb854f
commit 8ec2e89f79
208 changed files with 26394 additions and 3756 deletions
@@ -140,7 +140,7 @@ if (password_verify(trim($data["password"]), $temp["password"])) {
                    . '://' . $_SERVER['HTTP_HOST'] . rtrim($server_url, '/');
        $verify_url = $base_url . '/login/verify.php?token=' . $token;

-        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([
            'company_id'   => 0,