ed

resources/[tools]/nordi_billing/billing_server.lua

@@ -1,3 +1,6 @@
+-- Initialize QBCore
+local QBCore = exports['qb-core']:GetCoreObject()
+
 -- Register callback for sending bills
 lib.callback.register('billing:server:sendBill', function(source, data)
     local src = source
@@ -9,7 +12,7 @@ lib.callback.register('billing:server:sendBill', function(source, data)
     end
     
     local senderName = player.PlayerData.charinfo.firstname .. ' ' .. player.PlayerData.charinfo.lastname
-    local description = data.reason .. ' (From: ' .. senderName .. ')'
+    local description = data.reason .. ' (Von: ' .. senderName .. ')'
     
     -- Create the bill
     exports["ps-banking"]:createBill({
@@ -19,9 +22,16 @@ lib.callback.register('billing:server:sendBill', function(source, data)
         amount = data.amount,
     })
     
-    -- Store additional data about the bill if needed
-    -- You could create a separate table to track which account the payment should go to
-    MySQL.insert.await('INSERT INTO billing_accounts (bill_description, sender_id, receiver_id, account_id, amount, created_at) VALUES (?, ?, ?, ?, ?, NOW())', {
+    -- Get the latest bill ID for this user (assuming it's the one we just created)
+    local result = MySQL.query.await('SELECT id FROM ps_banking_bills WHERE identifier = ? ORDER BY id DESC LIMIT 1', {
+        target.PlayerData.citizenid
+    })
+    
+    local billId = result[1] and result[1].id or nil
+    
+    -- Store additional data about the bill
+    MySQL.insert.await('INSERT INTO billing_accounts (bill_id, bill_description, sender_id, receiver_id, account_id, amount, created_at) VALUES (?, ?, ?, ?, ?, ?, NOW())', {
+        billId,
         description,
         player.PlayerData.citizenid,
         target.PlayerData.citizenid,
@@ -29,18 +39,77 @@ lib.callback.register('billing:server:sendBill', function(source, data)
         data.amount
     })
     
-    -- Notify the target player
-    TriggerClientEvent('QBCore:Notify', data.playerId, 'You received a bill for $' .. data.amount .. ' - ' .. data.reason, 'primary', 7500)
+    -- Send payment prompt to target player
+    TriggerClientEvent('billing:client:showPaymentPrompt', data.playerId, {
+        billId = billId,
+        amount = data.amount,
+        reason = data.reason,
+        sender = senderName
+    })
     
     return true
 end)
 
--- Event handler for when a bill is paid
-RegisterNetEvent('billing:server:billPaid', function(billId)
+-- Add a callback to get bill status
+lib.callback.register('billing:server:getBillStatus', function(source, billId)
     local src = source
     local player = QBCore.Functions.GetPlayer(src)
     
-    if not player then return end
+    if not player then return nil end
+    
+    local result = MySQL.query.await('SELECT * FROM billing_accounts WHERE bill_id = ?', {billId})
+    if result and #result > 0 then
+        return result[1]
+    end
+    
+    return nil
+end)
+
+-- Add a new callback for handling bill responses
+lib.callback.register('billing:server:handleBillResponse', function(source, data)
+    local src = source
+    local player = QBCore.Functions.GetPlayer(src)
+    
+    if not player then return false end
+    
+    if data.action == 'pay' then
+        -- Process payment
+        local success = lib.callback.await('ps-banking:server:payBill', src, data.billId)
+        
+        if success then
+            -- Payment successful
+            return true
+        else
+            -- Payment failed (likely insufficient funds)
+            return false
+        end
+    elseif data.action == 'decline' then
+        -- Mark as declined in our system
+        MySQL.update.await('UPDATE billing_accounts SET declined = 1 WHERE bill_id = ?', {data.billId})
+        
+        -- Find the sender to notify them
+        local billInfo = MySQL.query.await('SELECT * FROM billing_accounts WHERE bill_id = ?', {data.billId})
+        if billInfo and #billInfo > 0 then
+            local senderId = billInfo[1].sender_id
+            local sender = QBCore.Functions.GetPlayerByCitizenId(senderId)
+            
+            if sender then
+                TriggerClientEvent('QBCore:Notify', sender.PlayerData.source, 'Deine Rechnung wurde abgelehnt', 'error')
+            end
+        end
+        
+        return true
+    elseif data.action == 'later' then
+        -- No action needed, bill remains in system
+        return true
+    end
+    
+    return false
+end)
+
+-- Event handler for when a bill is paid
+RegisterNetEvent('ps-banking:server:billPaid', function(billId)
+    local src = source
     
     -- Find the bill in our custom table
     local billData = MySQL.query.await('SELECT * FROM billing_accounts WHERE bill_id = ?', {billId})
@@ -57,13 +126,13 @@ RegisterNetEvent('billing:server:billPaid', function(billId)
             if receiver then
                 -- Add money directly to the receiver's bank account
                 receiver.Functions.AddMoney('bank', amount, 'bill-payment')
-                TriggerClientEvent('QBCore:Notify', receiver.PlayerData.source, 'You received $' .. amount .. ' from a bill payment', 'success')
+                TriggerClientEvent('QBCore:Notify', receiver.PlayerData.source, 'Du hast $' .. amount .. ' von einer Rechnungszahlung erhalten', 'success')
             else
-                -- Handle offline player (could store in a separate table for when they log in)
+                -- Handle offline player
                 MySQL.insert.await('INSERT INTO offline_payments (citizen_id, amount, reason) VALUES (?, ?, ?)', {
                     receiverId,
                     amount,
-                    'Bill payment'
+                    'Rechnungszahlung'
                 })
             end
         else
@@ -92,6 +161,7 @@ MySQL.ready(function()
             amount DECIMAL(10,2),
             created_at DATETIME,
             paid TINYINT DEFAULT 0,
+            declined TINYINT DEFAULT 0,
             paid_at DATETIME
         )
     ]])
@@ -127,7 +197,7 @@ RegisterNetEvent('QBCore:Server:PlayerLoaded', function()
         
         if totalAmount > 0 then
             player.Functions.AddMoney('bank', totalAmount, 'offline-bill-payments')
-            TriggerClientEvent('QBCore:Notify', src, 'You received $' .. totalAmount .. ' from bill payments while offline', 'success')
+            TriggerClientEvent('QBCore:Notify', src, 'Du hast $' .. totalAmount .. ' von Rechnungszahlungen erhalten, während du offline warst', 'success')
             
             -- Mark payments as processed
             MySQL.update.await('UPDATE offline_payments SET processed = 1 WHERE citizen_id = ? AND processed = 0', {citizenId})
@@ -135,7 +205,17 @@ RegisterNetEvent('QBCore:Server:PlayerLoaded', function()
     end
 end)
 
--- Listen for bill payment events from ps-banking
-RegisterNetEvent('ps-banking:server:billPaid', function(billId)
-    TriggerEvent('billing:server:billPaid', billId)
+-- Alternative hook method if you can't modify ps-banking
+-- This listens for the MySQL query that deletes a bill (which happens when a bill is paid)
+AddEventHandler('oxmysql:query', function(query, params)
+    if string.find(query, "DELETE FROM ps_banking_bills WHERE id = ?") then
+        -- This is likely a bill payment
+        local billId = params[1]
+        if billId then
+            -- Small delay to ensure the deletion completes
+            SetTimeout(100, function()
+                TriggerEvent('ps-banking:server:billPaid', billId)
+            end)
+        end
+    end
 end)