sync

.github/workflows/codeql.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript', 'TypeScript' ]
+        language: [ 'javascript']
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
         # Use only 'java' to analyze code written in Java, Kotlin or both
         # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both

server-data/resources/[bpt_addons]/bpt_ammujob/client/main.lua

@@ -231,7 +231,7 @@ function OpenMobileAmmuActionsMenu()
                     if closestPlayer == -1 or closestDistance > 3.0 then
                         ESX.ShowNotification(TranslateCap("no_players_near"))
                     else
-                        TriggerServerEvent("bpt_billing:sendBill", GetPlayerServerId(closestPlayer), "society_ammu", "Ammu", amount)
+                        TriggerServerEvent("bpt_billing:sendBill", GetPlayerServerId(closestPlayer), "society_ammu", TranslateCap("Ammu"), amount)
                         ESX.ShowNotification(TranslateCap("billing_sent"))
                     end
                 end

server-data/resources/[bpt_addons]/bpt_crafting/config.lua

@@ -271,7 +271,7 @@ Config = {
 			isGun = false,
 			Jobs = { "ammu" },
 			JobGrades = {},
-			Amount = 1,
+			Amount = 10,
 			SuccessRate = 100,
 			requireBlueprint = false,
 			Time = 30,
@@ -289,7 +289,7 @@ Config = {
 			isGun = false,
 			Jobs = { "ammu" },
 			JobGrades = {},
-			Amount = 1,
+			Amount = 10,
 			SuccessRate = 100,
 			requireBlueprint = false,
 			Time = 30,

server-data/resources/[bpt_addons]/bpt_taxijob/server/main.lua

@@ -68,7 +68,7 @@ AddEventHandler("bpt_taxijob:getStockItem", function(itemName, count)
     local xPlayer = ESX.GetPlayerFromId(source)
 
     if xPlayer.job.name == "taxi" then
-        TriggerEvent("esx_addoninventory:getSharedInventory", "society_taxi", function(inventory)
+        TriggerEvent("bpt_addoninventory:getSharedInventory", "society_taxi", function(inventory)
             local item = inventory.getItem(itemName)
 
             -- is there enough in the society?
@@ -91,7 +91,7 @@ AddEventHandler("bpt_taxijob:getStockItem", function(itemName, count)
 end)
 
 ESX.RegisterServerCallback("bpt_taxijob:getStockItems", function(source, cb)
-    TriggerEvent("esx_addoninventory:getSharedInventory", "society_taxi", function(inventory)
+    TriggerEvent("bpt_addoninventory:getSharedInventory", "society_taxi", function(inventory)
         cb(inventory.items)
     end)
 end)
@@ -102,7 +102,7 @@ AddEventHandler("bpt_taxijob:putStockItems", function(itemName, count)
     local sourceItem = xPlayer.getInventoryItem(itemName)
 
     if xPlayer.job.name == "taxi" then
-        TriggerEvent("esx_addoninventory:getSharedInventory", "society_taxi", function(inventory)
+        TriggerEvent("bpt_addoninventory:getSharedInventory", "society_taxi", function(inventory)
             local item = inventory.getItem(itemName)
 
             if sourceItem.count >= count and count > 0 then

server-data/resources/[bpt_addons]/bpt_billing/server/main.lua → server-data/resources/[esx]/bpt_billing/server/main.lua

@@ -1,158 +1,158 @@
-local function billPlayerByIdentifier(targetIdentifier, senderIdentifier, sharedAccountName, label, amount)
-    local xTarget = ESX.GetPlayerFromIdentifier(targetIdentifier)
-    amount = ESX.Math.Round(amount)
-
-    if amount <= 0 then
-        return
-    end
-
-    if string.match(sharedAccountName, "society_") then
-        return TriggerEvent("esx_addonaccount:getSharedAccount", sharedAccountName, function(account)
-            if not account then
-                return print(("[^2ERROR^7] Player ^5%s^7 Attempted to Send bill from invalid society - ^5%s^7"):format(senderIdentifier, sharedAccountName))
-            end
-
-            MySQL.insert.await("INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (?, ?, ?, ?, ?, ?)", { targetIdentifier, senderIdentifier, "society", sharedAccountName, label, amount })
-
-            if not xTarget then
-                return
-            end
-
-            xTarget.showNotification(TranslateCap("received_invoice"))
-        end)
-    end
-
-    MySQL.insert.await("INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (?, ?, ?, ?, ?, ?)", { targetIdentifier, senderIdentifier, "player", senderIdentifier, label, amount })
-
-    if not xTarget then
-        return
-    end
-
-    xTarget.showNotification(TranslateCap("received_invoice"))
-end
-
-local function billPlayer(targetId, senderIdentifier, sharedAccountName, label, amount)
-    local xTarget = ESX.GetPlayerFromId(targetId)
-
-    if not xTarget then
-        return
-    end
-
-    billPlayerByIdentifier(xTarget.identifier, senderIdentifier, sharedAccountName, label, amount)
-end
-
-RegisterNetEvent("bpt_billing:sendBill", function(targetId, sharedAccountName, label, amount)
-    local xPlayer = ESX.GetPlayerFromId(source)
-    local jobName = string.gsub(sharedAccountName, "society_", "")
-
-    if xPlayer.job.name ~= jobName then
-        return print(("[^2ERROR^7] Player ^5%s^7 Attempted to Send bill from a society (^5%s^7), but does not have the correct Job - Possibly Cheats"):format(xPlayer.source, sharedAccountName))
-    end
-
-    billPlayer(targetId, xPlayer.identifier, sharedAccountName, label, amount)
-end)
-exports("BillPlayer", billPlayer)
-
-RegisterNetEvent("bpt_billing_billing:sendBillToIdentifier", function(targetIdentifier, sharedAccountName, label, amount)
-    local xPlayer = ESX.GetPlayerFromId(source)
-    local jobName = string.gsub(sharedAccountName, "society_", "")
-
-    if xPlayer.job.name ~= jobName then
-        return print(("[^2ERROR^7] Player ^5%s^7 Attempted to Send bill from a society (^5%s^7), but does not have the correct Job - Possibly Cheats"):format(xPlayer.source, sharedAccountName))
-    end
-
-    billPlayerByIdentifier(targetIdentifier, xPlayer.identifier, sharedAccountName, label, amount)
-end)
-exports("BillPlayerByIdentifier", billPlayerByIdentifier)
-
-ESX.RegisterServerCallback("bpt_billing:getBills", function(source, cb)
-    local xPlayer = ESX.GetPlayerFromId(source)
-
-    local result = MySQL.query.await("SELECT amount, id, label FROM billing WHERE identifier = ?", { xPlayer.identifier })
-    cb(result)
-end)
-
-ESX.RegisterServerCallback("bpt_billing:getTargetBills", function(source, cb, target)
-    local xPlayer = ESX.GetPlayerFromId(target)
-
-    if not xPlayer then
-        return cb({})
-    end
-
-    local result = MySQL.query.await("SELECT amount, id, label FROM billing WHERE identifier = ?", { xPlayer.identifier })
-    cb(result)
-end)
-
-ESX.RegisterServerCallback("bpt_billing:payBill", function(source, cb, billId)
-    local xPlayer = ESX.GetPlayerFromId(source)
-
-    local result = MySQL.single.await("SELECT sender, target_type, target, amount FROM billing WHERE id = ?", { billId })
-    if not result then
-        return
-    end
-
-    local amount = result.amount
-    local xTarget = ESX.GetPlayerFromIdentifier(result.sender)
-
-    if result.target_type == "player" then
-        if not xTarget then
-            xPlayer.showNotification(TranslateCap("player_not_online"))
-            return cb()
-        end
-
-        local paymentAccount = "money"
-        if xPlayer.getMoney() < amount then
-            paymentAccount = "bank"
-            if xPlayer.getAccount("bank").money < amount then
-                xTarget.showNotification(TranslateCap("target_no_money"))
-                xPlayer.showNotification(TranslateCap("no_money"))
-                return cb()
-            end
-        end
-
-        local rowsChanged = MySQL.update.await("DELETE FROM billing WHERE id = ?", { billId })
-        if rowsChanged ~= 1 then
-            return cb()
-        end
-
-        xPlayer.removeAccountMoney(paymentAccount, amount, "Bill Paid")
-        xTarget.addAccountMoney(paymentAccount, amount, "Paid bill")
-
-        local groupedDigits = ESX.Math.GroupDigits(amount)
-        xPlayer.showNotification(TranslateCap("paid_invoice", groupedDigits))
-        xTarget.showNotification(TranslateCap("received_payment", groupedDigits))
-
-        return cb(true)
-    end
-
-    TriggerEvent("esx_addonaccount:getSharedAccount", result.target, function(account)
-        local paymentAccount = "money"
-        if xPlayer.getMoney() < amount then
-            paymentAccount = "bank"
-            if xPlayer.getAccount("bank").money < amount then
-                xTarget.showNotification(TranslateCap("target_no_money"))
-                xPlayer.showNotification(TranslateCap("no_money"))
-                return cb()
-            end
-        end
-
-        local rowsChanged = MySQL.update.await("DELETE FROM billing WHERE id = ?", { billId })
-        if rowsChanged ~= 1 then
-            return cb()
-        end
-
-        xPlayer.removeAccountMoney(paymentAccount, amount, "Bill Paid")
-        account.addMoney(amount)
-
-        TriggerEvent("bpt_billing:paidBill", source, billId)
-
-        local groupedDigits = ESX.Math.GroupDigits(amount)
-        xPlayer.showNotification(TranslateCap("paid_invoice", groupedDigits))
-
-        if xTarget then
-            xTarget.showNotification(TranslateCap("received_payment", groupedDigits))
-        end
-
-        cb(true)
-    end)
-end)
+local function billPlayerByIdentifier(targetIdentifier, senderIdentifier, sharedAccountName, label, amount)
+    local xTarget = ESX.GetPlayerFromIdentifier(targetIdentifier)
+    amount = ESX.Math.Round(amount)
+
+    if amount <= 0 then
+        return
+    end
+
+    if string.match(sharedAccountName, "society_") then
+        return TriggerEvent("bpt_addonaccount:getSharedAccount", sharedAccountName, function(account)
+            if not account then
+                return print(("[^2ERROR^7] Player ^5%s^7 Attempted to Send bill from invalid society - ^5%s^7"):format(senderIdentifier, sharedAccountName))
+            end
+
+            MySQL.insert.await("INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (?, ?, ?, ?, ?, ?)", { targetIdentifier, senderIdentifier, "society", sharedAccountName, label, amount })
+
+            if not xTarget then
+                return
+            end
+
+            xTarget.showNotification(TranslateCap("received_invoice"))
+        end)
+    end
+
+    MySQL.insert.await("INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (?, ?, ?, ?, ?, ?)", { targetIdentifier, senderIdentifier, "player", senderIdentifier, label, amount })
+
+    if not xTarget then
+        return
+    end
+
+    xTarget.showNotification(TranslateCap("received_invoice"))
+end
+
+local function billPlayer(targetId, senderIdentifier, sharedAccountName, label, amount)
+    local xTarget = ESX.GetPlayerFromId(targetId)
+
+    if not xTarget then
+        return
+    end
+
+    billPlayerByIdentifier(xTarget.identifier, senderIdentifier, sharedAccountName, label, amount)
+end
+
+RegisterNetEvent("bpt_billing:sendBill", function(targetId, sharedAccountName, label, amount)
+    local xPlayer = ESX.GetPlayerFromId(source)
+    local jobName = string.gsub(sharedAccountName, "society_", "")
+
+    if xPlayer.job.name ~= jobName then
+        return print(("[^2ERROR^7] Player ^5%s^7 Attempted to Send bill from a society (^5%s^7), but does not have the correct Job - Possibly Cheats"):format(xPlayer.source, sharedAccountName))
+    end
+
+    billPlayer(targetId, xPlayer.identifier, sharedAccountName, label, amount)
+end)
+exports("BillPlayer", billPlayer)
+
+RegisterNetEvent("bpt_billing:sendBillToIdentifier", function(targetIdentifier, sharedAccountName, label, amount)
+    local xPlayer = ESX.GetPlayerFromId(source)
+    local jobName = string.gsub(sharedAccountName, "society_", "")
+
+    if xPlayer.job.name ~= jobName then
+        return print(("[^2ERROR^7] Player ^5%s^7 Attempted to Send bill from a society (^5%s^7), but does not have the correct Job - Possibly Cheats"):format(xPlayer.source, sharedAccountName))
+    end
+
+    billPlayerByIdentifier(targetIdentifier, xPlayer.identifier, sharedAccountName, label, amount)
+end)
+exports("BillPlayerByIdentifier", billPlayerByIdentifier)
+
+ESX.RegisterServerCallback("bpt_billing:getBills", function(source, cb)
+    local xPlayer = ESX.GetPlayerFromId(source)
+
+    local result = MySQL.query.await("SELECT amount, id, label FROM billing WHERE identifier = ?", { xPlayer.identifier })
+    cb(result)
+end)
+
+ESX.RegisterServerCallback("bpt_billing:getTargetBills", function(source, cb, target)
+    local xPlayer = ESX.GetPlayerFromId(target)
+
+    if not xPlayer then
+        return cb({})
+    end
+
+    local result = MySQL.query.await("SELECT amount, id, label FROM billing WHERE identifier = ?", { xPlayer.identifier })
+    cb(result)
+end)
+
+ESX.RegisterServerCallback("bpt_billing:payBill", function(source, cb, billId)
+    local xPlayer = ESX.GetPlayerFromId(source)
+
+    local result = MySQL.single.await("SELECT sender, target_type, target, amount FROM billing WHERE id = ?", { billId })
+    if not result then
+        return
+    end
+
+    local amount = result.amount
+    local xTarget = ESX.GetPlayerFromIdentifier(result.sender)
+
+    if result.target_type == "player" then
+        if not xTarget then
+            xPlayer.showNotification(TranslateCap("player_not_online"))
+            return cb()
+        end
+
+        local paymentAccount = "money"
+        if xPlayer.getMoney() < amount then
+            paymentAccount = "bank"
+            if xPlayer.getAccount("bank").money < amount then
+                xTarget.showNotification(TranslateCap("target_no_money"))
+                xPlayer.showNotification(TranslateCap("no_money"))
+                return cb()
+            end
+        end
+
+        local rowsChanged = MySQL.update.await("DELETE FROM billing WHERE id = ?", { billId })
+        if rowsChanged ~= 1 then
+            return cb()
+        end
+
+        xPlayer.removeAccountMoney(paymentAccount, amount, "Bill Paid")
+        xTarget.addAccountMoney(paymentAccount, amount, "Paid bill")
+
+        local groupedDigits = ESX.Math.GroupDigits(amount)
+        xPlayer.showNotification(TranslateCap("paid_invoice", groupedDigits))
+        xTarget.showNotification(TranslateCap("received_payment", groupedDigits))
+
+        return cb(true)
+    end
+
+    TriggerEvent("bpt_addonaccount:getSharedAccount", result.target, function(account)
+        local paymentAccount = "money"
+        if xPlayer.getMoney() < amount then
+            paymentAccount = "bank"
+            if xPlayer.getAccount("bank").money < amount then
+                xTarget.showNotification(TranslateCap("target_no_money"))
+                xPlayer.showNotification(TranslateCap("no_money"))
+                return cb()
+            end
+        end
+
+        local rowsChanged = MySQL.update.await("DELETE FROM billing WHERE id = ?", { billId })
+        if rowsChanged ~= 1 then
+            return cb()
+        end
+
+        xPlayer.removeAccountMoney(paymentAccount, amount, "Bill Paid")
+        account.addMoney(amount)
+
+        TriggerEvent("bpt_billing:paidBill", source, billId)
+
+        local groupedDigits = ESX.Math.GroupDigits(amount)
+        xPlayer.showNotification(TranslateCap("paid_invoice", groupedDigits))
+
+        if xTarget then
+            xTarget.showNotification(TranslateCap("received_payment", groupedDigits))
+        end
+
+        cb(true)
+    end)
+end)

server-data/resources/[esx]/es_extended/server/paycheck.lua

@@ -21,7 +21,7 @@ function StartPayCheck()
                     elseif Config.EnableSocietyPayouts then -- possibly a society
                         TriggerEvent("esx_society:getSociety", xPlayer.job.name, function(society)
                             if society ~= nil then -- verified society
-                                TriggerEvent("esx_addonaccount:getSharedAccount", society.account, function(account)
+                                TriggerEvent("bpt_addonaccount:getSharedAccount", society.account, function(account)
                                     if account.money >= salary then -- does the society money to pay its employees?
                                         xPlayer.addAccountMoney("bank", salary, "Paycheck")
                                         account.removeMoney(salary)