Update: 2026-07-04 15:39:18

backend/core/Services/LocationIntelligenceEngine.php

@@ -97,17 +97,27 @@ class LocationIntelligenceEngine {
 
     private function sendCampaignNotification($passengerId, $zone) {
         // Get passenger token
-        $sql = "SELECT users_token, country_code FROM users WHERE users_id = :pid";
+        $sql = "SELECT t.token as users_token, p.country_code 
+                FROM passengers p 
+                JOIN tokens t ON p.id = t.passengerID 
+                WHERE p.id = :pid";
         $stmt = $this->db->prepare($sql);
         $stmt->execute([':pid' => $passengerId]);
         $user = $stmt->fetch(PDO::FETCH_ASSOC);
 
         if ($user && !empty($user['users_token'])) {
-            $title = "مرحباً بك في " . $zone['zone_name'] . " \u{1F389}";
+            $title = "مرحباً بك في " . $zone['zone_name'] . " 🎉";
             $body = "اطلب رحلتك الآن من " . $zone['zone_name'] . " واستمتع بتجربة سيرو!";
             
-            // Send Push
-            sendFCM_Internal([$user['users_token']], $title, $body, ['type' => 'geofence_promo'], '');
+            // Decrypt token
+            require_once __DIR__ . '/../Security/EncryptionHelper.php';
+            $encryptionHelper = new EncryptionHelper();
+            $decryptedToken = $encryptionHelper->decryptData($user['users_token']);
+            
+            if ($decryptedToken) {
+                // Send Push
+                sendFCM_Internal($decryptedToken, $title, $body, ['type' => 'geofence_promo'], 'Marketing');
+            }
             
             // Log it
             $logSql = "INSERT INTO marketing_campaigns_log (passenger_id, message_type, country_code, region_name, triggered_by)