Update: 2026-07-21 18:33:13

docker/.env.example

@@ -14,6 +14,11 @@ APP_CURRENCY=JOD
 # --- 2. Databases (Hosts must be 'mysql' in Docker) ---
 MYSQL_ROOT_PASSWORD=3w71Qacjl3kh1pOgJUeD5jRBnG3jRVpf
 
+DB_PAYMENT_HOST=mysql
+DB_PAYMENT_NAME=payment
+DB_PAYMENT_USER=root
+DB_PAYMENT_PASS=3w71Qacjl3kh1pOgJUeD5jRBnG3jRVpf
+
 DB_PRIMARY_HOST_V2=mysql
 DB_PRIMARY_NAME_V2=jorSiroDB
 DB_PRIMARY_USER_V2=intaleqapp-jordan-siro

loction_server/siro/connect.php

@@ -33,18 +33,19 @@ if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
     exit;
 }
 // $TRIPZ_SMTP_PASSWORD=getenv('TRIPZ_SMTP_PASSWORD');
- $dbname = getenv('dbname');
 // --- Database Connection (Still needed for your application logic) ---
 try {
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbname = getenv('DB_TRACKING_NAME') ?: (getenv('dbname') ?: 'locationDB');
+    $dbHost = getenv('DB_TRACKING_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
     $options = [
         PDO::ATTR_EMULATE_PREPARES => false,
         PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
         PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8"
     ];
-    $user = getenv('USER'); // Still used for DB connection
+    $user = getenv('DB_TRACKING_USER') ?: (getenv('USER') ?: 'root');
-    $pass = getenv('PASS'); // Still used for DB connection
+    $pass = getenv('DB_TRACKING_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
     $con = new PDO($dsn, $user, $pass, $options);
 //$con->exec("SET time_zone = '+03:00'");
     // --- JWT Authentication ---

loction_server/siro/jwtconnect.php

@@ -33,18 +33,19 @@ if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
     exit;
 }
 // $TRIPZ_SMTP_PASSWORD=getenv('TRIPZ_SMTP_PASSWORD');
- $dbname = getenv('dbname');
 // --- Database Connection (Still needed for your application logic) ---
 try {
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbname = getenv('DB_TRACKING_NAME') ?: (getenv('dbname') ?: 'locationDB');
+    $dbHost = getenv('DB_TRACKING_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
     $options = [
         PDO::ATTR_EMULATE_PREPARES => false,
         PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
         PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8"
     ];
-    $user = getenv('USER'); // Still used for DB connection
+    $user = getenv('DB_TRACKING_USER') ?: (getenv('USER') ?: 'root');
-    $pass = getenv('PASS'); // Still used for DB connection
+    $pass = getenv('DB_TRACKING_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
     $con = new PDO($dsn, $user, $pass, $options);
 //$con->exec("SET time_zone = '+03:00'");
     // --- JWT Authentication ---

payment_server/WalletDB.sql

@@ -934,7 +934,7 @@ ALTER TABLE `raw_sms_log`
 -- AUTO_INCREMENT for table `siroWallet`
 --
 ALTER TABLE `siroWallet`
-  ADD AUTO_INCREMENT = 1;
+  MODIFY `id` int NOT NULL AUTO_INCREMENT;
 
 
 --

payment_server/v2/main/connect.php

@@ -23,11 +23,11 @@ if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
     exit;
 }
 
-$dbname = getenv('dbname');
-
 // --- Database Connection (Still needed for your application logic) ---
 try {
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbname = getenv('DB_PAYMENT_NAME') ?: (getenv('dbname') ?: 'payment');
+    $dbHost = getenv('DB_PAYMENT_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
     
     $options = [
         PDO::ATTR_EMULATE_PREPARES => false,
@@ -35,8 +35,8 @@ try {
         PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
         PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8"
     ];
-    $user = getenv('USER'); // Still used for DB connection
+    $user = getenv('DB_PAYMENT_USER') ?: (getenv('USER') ?: 'root');
-    $pass = getenv('PASS'); // Still used for DB connection
+    $pass = getenv('DB_PAYMENT_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
     $con = new PDO($dsn, $user, $pass, $options);
     
 // echo $con;

payment_server/v2/main/jwtconnect.php

@@ -50,19 +50,19 @@ if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
     exit;
 }
 
-$dbname = getenv('dbname');
+// --- Database Connection (Still needed for your application logic) ---
-
-// --- Database Connection ---
 try {
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbname = getenv('DB_PAYMENT_NAME') ?: (getenv('dbname') ?: 'payment');
+    $dbHost = getenv('DB_PAYMENT_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
     $options = [
         PDO::ATTR_EMULATE_PREPARES => false,
         PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
         PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8"
     ];
-    $user = getenv('USER');
+    $user = getenv('DB_PAYMENT_USER') ?: (getenv('USER') ?: 'root');
-    $pass = getenv('PASS');
+    $pass = getenv('DB_PAYMENT_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
     $con = new PDO($dsn, $user, $pass, $options);
 
     // --- Load Functions ---

payment_server/v2/main/loginWalletAdmin.php

@@ -52,10 +52,11 @@ try {
     }
 
     // --- الاتصال بقاعدة البيانات ---
-    $dbuser = getenv('USER');
+    $dbname = getenv('DB_PAYMENT_NAME') ?: (getenv('dbname') ?: 'payment');
-    $dbpass = getenv('PASS');
+    $dbHost = getenv('DB_PAYMENT_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
-    $dbname = getenv('dbname');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbuser = getenv('DB_PAYMENT_USER') ?: (getenv('USER') ?: 'root');
+    $dbpass = getenv('DB_PAYMENT_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
 
     $con = new PDO($dsn, $dbuser, $dbpass, [
         PDO::ATTR_EMULATE_PREPARES => false,

payment_server/v2/main/ride/ecash/driver/webhook_connect.php

@@ -19,18 +19,19 @@ if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
     exit;
 }
 
-$dbname = getenv('dbname');
 // --- Database Connection ONLY ---
 try {
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbname = getenv('DB_PAYMENT_NAME') ?: (getenv('dbname') ?: 'payment');
+    $dbHost = getenv('DB_PAYMENT_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
     $options = [
         PDO::ATTR_EMULATE_PREPARES   => false,
         PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
         PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8"
     ];
-    $user = getenv('USER');
+    $user = getenv('DB_PAYMENT_USER') ?: (getenv('USER') ?: 'root');
-    $pass = getenv('PASS');
+    $pass = getenv('DB_PAYMENT_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
     $con = new PDO($dsn, $user, $pass, $options);
 
 } catch (PDOException $e) {

payment_server/v2/main/ride/ecash/passenger/webhook_connect.php

@@ -19,18 +19,19 @@ if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
     exit;
 }
 
-$dbname = getenv('dbname');
 // --- Database Connection ONLY ---
 try {
-    $dsn = "mysql:host=localhost;dbname=$dbname;charset=utf8mb4";
+    $dbname = getenv('DB_PAYMENT_NAME') ?: (getenv('dbname') ?: 'payment');
+    $dbHost = getenv('DB_PAYMENT_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
+    $dsn = "mysql:host=$dbHost;dbname=$dbname;charset=utf8mb4";
     $options = [
         PDO::ATTR_EMULATE_PREPARES   => false,
         PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
         PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF8"
     ];
-    $user = getenv('USER');
+    $user = getenv('DB_PAYMENT_USER') ?: (getenv('USER') ?: 'root');
-    $pass = getenv('PASS');
+    $pass = getenv('DB_PAYMENT_PASS') ?: (getenv('PASS') ?: getenv('MYSQL_ROOT_PASSWORD'));
     $con = new PDO($dsn, $user, $pass, $options);
 
 } catch (PDOException $e) {