diff --git a/payment_server/v2/main/ride/cliq/check_status.php b/payment_server/v2/main/ride/cliq/check_status.php index 17dd1b12..a1614d9a 100644 --- a/payment_server/v2/main/ride/cliq/check_status.php +++ b/payment_server/v2/main/ride/cliq/check_status.php @@ -12,7 +12,7 @@ try { exit; } - $stmt = $con->prepare("SELECT status FROM click_invoices WHERE invoice_number = :invoice_number LIMIT 1"); + $stmt = $con->prepare("SELECT status FROM cliq_invoices WHERE invoice_number = :invoice_number LIMIT 1"); $stmt->execute([':invoice_number' => $invoiceNumber]); $invoice = $stmt->fetch(PDO::FETCH_ASSOC); diff --git a/payment_server/v2/main/ride/cliq/cliq_webhook_handler.php b/payment_server/v2/main/ride/cliq/cliq_webhook_handler.php index 4198855b..a4ad9829 100755 --- a/payment_server/v2/main/ride/cliq/cliq_webhook_handler.php +++ b/payment_server/v2/main/ride/cliq/cliq_webhook_handler.php @@ -38,7 +38,7 @@ try { // 1. البحث عن الفاتورة وتحديث حالتها $stmt = $con->prepare( - "UPDATE `click_invoices` + "UPDATE `cliq_invoices` SET `status` = 'completed', `click_transaction_id` = :transaction_id WHERE `invoice_number` = :invoice_number AND `status` = 'pending'" ); @@ -52,7 +52,7 @@ try { $invoiceId = $con->lastInsertId(); // ملاحظة: هذا قد لا يعمل دائماً مع UPDATE، الأفضل جلب الـ ID // جلب ID الفاتورة بعد التأكد من وجودها - $idStmt = $con->prepare("SELECT id FROM `click_invoices` WHERE `invoice_number` = :invoice_number"); + $idStmt = $con->prepare("SELECT id FROM `cliq_invoices` WHERE `invoice_number` = :invoice_number"); $idStmt->execute([':invoice_number' => $invoiceNumber]); $invoiceRecord = $idStmt->fetch(); $invoiceId = $invoiceRecord['id']; diff --git a/payment_server/v2/main/ride/cliq/query_click_invoice.php b/payment_server/v2/main/ride/cliq/query_click_invoice.php index aae75ba9..6fcc4b3f 100755 --- a/payment_server/v2/main/ride/cliq/query_click_invoice.php +++ b/payment_server/v2/main/ride/cliq/query_click_invoice.php @@ -32,7 +32,7 @@ try { // البحث عن فاتورة معلقة لهذا الرقم $stmt = $con->prepare( "SELECT invoice_number, amount, user_id, user_type - FROM `click_invoices` + FROM `cliq_invoices` WHERE `click_phone` = :click_phone AND `status` = 'pending' ORDER BY `created_at` DESC LIMIT 1" ); diff --git a/siro_driver/lib/views/home/my_wallet/payment_screen_cliq.dart b/siro_driver/lib/views/home/my_wallet/payment_screen_cliq.dart index 97f1c83a..5795d547 100644 --- a/siro_driver/lib/views/home/my_wallet/payment_screen_cliq.dart +++ b/siro_driver/lib/views/home/my_wallet/payment_screen_cliq.dart @@ -115,7 +115,8 @@ class _PaymentScreenCliqState extends State with SingleTicker children: [ const Text("المبلغ المطلوب", style: TextStyle(color: Colors.white70, fontSize: 14)), const SizedBox(height: 5), - Text("${currencyFormat.format(widget.amount)} ل.س", style: const TextStyle(color: Colors.white, fontSize: 28, fontWeight: FontWeight.bold)), + Text('${widget.amount.toStringAsFixed(widget.amount == widget.amount.roundToDouble() ? 0 : 1)} JOD', + style: const TextStyle(color: Colors.white, fontSize: 32, fontWeight: FontWeight.w700, letterSpacing: 1)), ], ), ), diff --git a/siro_rider/lib/views/home/my_wallet/payment_screen_cliq.dart b/siro_rider/lib/views/home/my_wallet/payment_screen_cliq.dart index eea0741f..139ed1b7 100644 --- a/siro_rider/lib/views/home/my_wallet/payment_screen_cliq.dart +++ b/siro_rider/lib/views/home/my_wallet/payment_screen_cliq.dart @@ -124,7 +124,7 @@ class _PaymentScreenCliqState extends State with SingleTicker children: [ Text('Invoice Amount'.tr, style: TextStyle(color: Colors.white.withOpacity(0.6), fontSize: 13)), const SizedBox(height: 6), - Text('${widget.amount.toStringAsFixed(widget.amount == widget.amount.roundToDouble() ? 0 : 1)} ${'SYP'}', + Text('${widget.amount.toStringAsFixed(widget.amount == widget.amount.roundToDouble() ? 0 : 1)} JOD', style: const TextStyle(color: Colors.white, fontSize: 32, fontWeight: FontWeight.w700, letterSpacing: 1)), ], ),