From d96661fa924aa305d406164af74322704c0c79b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 2 Aug 2017 10:40:47 +0200 Subject: [PATCH 01/55] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..8c228b9f --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver-esx_billing +FXServer ESX Billing From 9dfece1d66de537ad09874cda31a328bee83759f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 2 Aug 2017 10:44:25 +0200 Subject: [PATCH 02/55] Update README.md --- README.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/README.md b/README.md index 8c228b9f..f6a555e3 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,31 @@ # fxserver-esx_billing FXServer ESX Billing + +[INSTALLATION] + +1) CD in your resources/[esx] folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-esx_billing esx_billing +``` +3) Import esx_billing.sql in your database +4) Add this in your server.cfg : + +``` +start esx_billing +``` + +[USAGE] + +Press [F7] To show billing menu + +``` +local amount = 100 +local closestPlayer, closestDistance = ESX.Game.GetClosestPlayer() + +if closestPlayer == -1 or closestDistance > 3.0 then + ESX.ShowNotification('Aucun joueur à proximité') +else + TriggerServerEvent('esx_billing:sendBill', GetPlayerServerId(closestPlayer), 'society_taxi', 'Taxi', amount) +end +``` From 5534bedaa4daee267df3607d4bf9133a606ba98b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 2 Aug 2017 10:49:26 +0200 Subject: [PATCH 03/55] Add files --- __resource.lua | 12 +++ client/main.lua | 72 ++++++++++++++++++ esx_billing.sql | 12 +++ server/main.lua | 189 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 285 insertions(+) create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 esx_billing.sql create mode 100644 server/main.lua diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..479a2226 --- /dev/null +++ b/__resource.lua @@ -0,0 +1,12 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Billing' + +server_scripts { + '@mysql-async/lib/MySQL.lua', + 'server/main.lua' +} + +client_scripts { + 'client/main.lua' +} diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..99e7a4e4 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,72 @@ +local Keys = { + ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, + ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, + ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, + ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, + ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, + ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, + ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, + ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, + ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 +} + +ESX = nil +local GUI = {} +GUI.Time = 0 + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) + +function ShowBillsMenu() + + ESX.TriggerServerCallback('esx_billing:getBills', function(bills) + + ESX.UI.Menu.CloseAll() + + local elements = {} + + for i=1, #bills, 1 do + table.insert(elements, {label = bills[i].label .. ' $' .. bills[i].amount, value = bills[i].id}) + end + + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'billing', + { + title = 'Factures', + elements = elements + }, + function(data, menu) + + local billId = data.current.value + + ESX.TriggerServerCallback('esx_billing:payBill', function() + ShowBillsMenu() + end, billId) + + end, + function(data, menu) + menu.close() + end + ) + + end) + +end + +-- Key controls +Citizen.CreateThread(function() + while true do + + Wait(0) + + if IsControlPressed(0, Keys["F7"]) and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') and (GetGameTimer() - GUI.Time) > 150 then + ShowBillsMenu() + GUI.Time = GetGameTimer() + end + + end +end) \ No newline at end of file diff --git a/esx_billing.sql b/esx_billing.sql new file mode 100644 index 00000000..78a71771 --- /dev/null +++ b/esx_billing.sql @@ -0,0 +1,12 @@ +CREATE TABLE `billing` ( + + `id` int(11) NOT NULL AUTO_INCREMENT, + `identifier` varchar(255) NOT NULL, + `sender` varchar(255) NOT NULL, + `target_type` varchar(50) NOT NULL, + `target` varchar(255) NOT NULL, + `label` varchar(255) NOT NULL, + `amount` int(11) NOT NULL, + + PRIMARY KEY (`id`) +); \ No newline at end of file diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..75c5a788 --- /dev/null +++ b/server/main.lua @@ -0,0 +1,189 @@ +ESX = nil + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +RegisterServerEvent('esx_billing:sendBill') +AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, label, amount) + + local xPlayer = ESX.GetPlayerFromId(source) + local xPlayers = ESX.GetPlayers() + + TriggerEvent('esx_addonaccount:getSharedAccount', sharedAccountName, function(account) + + if account == nil then + + for k, v in pairs(xPlayers) do + if v.source == playerId then + + MySQL.Async.execute( + 'INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', + { + ['@identifier'] = v.identifier, + ['@sender'] = xPlayer.identifier, + ['@target_type'] = 'player', + ['@target'] = xPlayer.identifier, + ['@label'] = label, + ['@amount'] = amount + }, + function(rowsChanged) + TriggerClientEvent('esx:showNotification', v.source, 'Vous avez ~r~reçu~s~ une facture') + end + ) + + break + end + end + + else + + for k, v in pairs(xPlayers) do + + if v.source == playerId then + + MySQL.Async.execute( + 'INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', + { + ['@identifier'] = v.identifier, + ['@sender'] = xPlayer.identifier, + ['@target_type'] = 'society', + ['@target'] = sharedAccountName, + ['@label'] = label, + ['@amount'] = amount + }, + function(rowsChanged) + TriggerClientEvent('esx:showNotification', v.source, 'Vous avez ~r~reçu~s~ une facture') + end + ) + + break + end + end + + end + + end) + +end) + +ESX.RegisterServerCallback('esx_billing:getBills', function(source, cb) + + local xPlayer = ESX.GetPlayerFromId(source) + + MySQL.Async.fetchAll( + 'SELECT * FROM billing WHERE identifier = @identifier', + { + ['@identifier'] = xPlayer.identifier + }, + function(result) + + local bills = {} + + for i=1, #result, 1 do + table.insert(bills, { + id = result[i].id, + identifier = result[i].identifier, + sender = result[i].sender, + targetType = result[i].target_type, + target = result[i].target, + label = result[i].label, + amount = result[i].amount + }) + end + + cb(bills) + + end + ) + +end) + + +ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) + + local xPlayer = ESX.GetPlayerFromId(source) + + MySQL.Async.fetchAll( + 'SELECT * FROM billing WHERE id = @id', + { + ['@id'] = id + }, + function(result) + + local sender = result[1].sender + local targetType = result[1].target_type + local target = result[1].target + local amount = result[1].amount + local xPlayers = ESX.GetPlayers() + local foundPlayer = nil + + for k,v in pairs(xPlayers) do + if v.identifier == sender then + foundPlayer = v + break + end + end + + if targetType == 'player' then + + if foundPlayer ~= nil then + + if xPlayer.get('money') >= amount then + + MySQL.Async.execute( + 'DELETE from billing WHERE id = @id', + { + ['@id'] = id + }, + function(rowsChanged) + + xPlayer.removeMoney(amount) + foundPlayer.addMoney(amount) + + TriggerClientEvent('esx:showNotification', xPlayer.source, 'Vous avez ~g~payé~s~ une facture de ~r~$' .. amount) + TriggerClientEvent('esx:showNotification', foundPlayer.source, 'Vous avez ~g~reçu~s~ un paiement de ~g~$' .. amount) + + cb() + + end + ) + + else + TriggerClientEvent('esx:showNotification', _source, 'Le joueur n\'est pas connecté') + cb() + end + + end + + else + + TriggerEvent('esx_addonaccount:getSharedAccount', target, function(account) + + MySQL.Async.execute( + 'DELETE from billing WHERE id = @id', + { + ['@id'] = id + }, + function(rowsChanged) + + xPlayer.removeMoney(amount) + account.addMoney(amount) + + TriggerClientEvent('esx:showNotification', xPlayer.source, 'Vous avez ~g~payé~s~ une facture de ~r~$' .. amount) + + if foundPlayer ~= nil then + TriggerClientEvent('esx:showNotification', foundPlayer.source, 'Vous avez ~g~reçu~s~ un paiement de ~g~$' .. amount) + end + + cb() + + end + ) + + end) + + end + + end + ) + +end) \ No newline at end of file From ce6be364f0975f70655073c87d8169a408208706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Mon, 7 Aug 2017 12:20:47 +0200 Subject: [PATCH 04/55] Update esx_billing.sql --- esx_billing.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/esx_billing.sql b/esx_billing.sql index 78a71771..f7571215 100644 --- a/esx_billing.sql +++ b/esx_billing.sql @@ -1,3 +1,5 @@ +USE `essentialmode`; + CREATE TABLE `billing` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -9,4 +11,4 @@ CREATE TABLE `billing` ( `amount` int(11) NOT NULL, PRIMARY KEY (`id`) -); \ No newline at end of file +); From 7f1a14be3dd9e7ed1d4022eb830f20f26a1306dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 9 Aug 2017 14:10:08 +0200 Subject: [PATCH 05/55] Add LICENSE.txt --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..30ace6a8 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file From 9b2852dc684ef5f6e9c17191c675be9f30893afe Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 16 Aug 2017 15:30:22 -0400 Subject: [PATCH 06/55] Multi-language support --- __resource.lua | 8 ++++++++ config.lua | 2 ++ locales/en.lua | 9 +++++++++ locales/fr.lua | 9 +++++++++ server/main.lua | 24 ++++++++++++------------ 5 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 config.lua create mode 100644 locales/en.lua create mode 100644 locales/fr.lua diff --git a/__resource.lua b/__resource.lua index 479a2226..543ec253 100644 --- a/__resource.lua +++ b/__resource.lua @@ -4,9 +4,17 @@ description 'ESX Billing' server_scripts { '@mysql-async/lib/MySQL.lua', + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'config.lua', 'server/main.lua' } client_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'config.lua', 'client/main.lua' } diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..56a8b5e9 --- /dev/null +++ b/config.lua @@ -0,0 +1,2 @@ +Config = {} +Config.Locale = 'fr' diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..5271005b --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,9 @@ +Locales['en'] = { + + ['invoices'] = 'invoices', + ['received_invoice'] = 'you ~r~received~s~ an invoice', + ['paid_invoice'] = 'you ~g~paid~s~ an invoice of ~r~$', + ['received_payment'] = 'you ~g~received~s~ a payment of ~r~$', + ['player_not_logged'] = 'the player is not logged in', + +} diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..46f14598 --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,9 @@ +Locales['fr'] = { + + ['invoices'] = 'factures', + ['received_invoice'] = 'vous avez ~r~reçu~s~ une facture', + ['paid_invoice'] = 'vous avez ~g~payé~s~ une facture de ~r~$', + ['received_payment'] = 'vous avez ~g~reçu~s~ un paiement de ~g~$', + ['player_not_logged'] = 'le joueur n\'est pas connecté', + +} diff --git a/server/main.lua b/server/main.lua index 75c5a788..213da1e7 100644 --- a/server/main.lua +++ b/server/main.lua @@ -26,7 +26,7 @@ AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, la ['@amount'] = amount }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', v.source, 'Vous avez ~r~reçu~s~ une facture') + TriggerClientEvent('esx:showNotification', v.source, _U('received_invoice')) end ) @@ -51,7 +51,7 @@ AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, la ['@amount'] = amount }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', v.source, 'Vous avez ~r~reçu~s~ une facture') + TriggerClientEvent('esx:showNotification', v.source, _U('received_invoice')) end ) @@ -114,7 +114,7 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) local target = result[1].target local amount = result[1].amount local xPlayers = ESX.GetPlayers() - local foundPlayer = nil + local foundPlayer = nil for k,v in pairs(xPlayers) do if v.identifier == sender then @@ -126,7 +126,7 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) if targetType == 'player' then if foundPlayer ~= nil then - + if xPlayer.get('money') >= amount then MySQL.Async.execute( @@ -139,8 +139,8 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) xPlayer.removeMoney(amount) foundPlayer.addMoney(amount) - TriggerClientEvent('esx:showNotification', xPlayer.source, 'Vous avez ~g~payé~s~ une facture de ~r~$' .. amount) - TriggerClientEvent('esx:showNotification', foundPlayer.source, 'Vous avez ~g~reçu~s~ un paiement de ~g~$' .. amount) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice') .. amount) + TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('received_payment') .. amount) cb() @@ -148,7 +148,7 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) ) else - TriggerClientEvent('esx:showNotification', _source, 'Le joueur n\'est pas connecté') + TriggerClientEvent('esx:showNotification', _source, _U('player_not_logged')) cb() end @@ -168,17 +168,17 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) xPlayer.removeMoney(amount) account.addMoney(amount) - TriggerClientEvent('esx:showNotification', xPlayer.source, 'Vous avez ~g~payé~s~ une facture de ~r~$' .. amount) - + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice') .. amount) + if foundPlayer ~= nil then - TriggerClientEvent('esx:showNotification', foundPlayer.source, 'Vous avez ~g~reçu~s~ un paiement de ~g~$' .. amount) + TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('received_payment') .. amount) end cb() end ) - + end) end @@ -186,4 +186,4 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) end ) -end) \ No newline at end of file +end) From b18a0cbd753d79fa80297d3caa6a42ab1a8ac3d1 Mon Sep 17 00:00:00 2001 From: TakumiBR <31086346+TakumiBR@users.noreply.github.com> Date: Wed, 16 Aug 2017 22:52:56 -0700 Subject: [PATCH 07/55] Add files via upload --- locales/br.lua | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 locales/br.lua diff --git a/locales/br.lua b/locales/br.lua new file mode 100644 index 00000000..5bcb5db2 --- /dev/null +++ b/locales/br.lua @@ -0,0 +1,9 @@ +Locales['br'] = { + + ['invoices'] = 'Faturas', + ['received_invoice'] = 'Você ~r~recebeu~s~ uma fatura', + ['paid_invoice'] = 'Você ~g~pagou~s~ uma fatura de ~r~$', + ['received_payment'] = 'Você ~g~recebeu~s~ um pagamento de ~r~$', + ['player_not_logged'] = 'O jogador não está logado', + +} From 54ab2de4843d7d7970f173dddcb11eb957bc067d Mon Sep 17 00:00:00 2001 From: TakumiBR <31086346+TakumiBR@users.noreply.github.com> Date: Wed, 16 Aug 2017 22:53:29 -0700 Subject: [PATCH 08/55] Add files via upload --- __resource.lua | 2 ++ config.lua | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 543ec253..bfc3d345 100644 --- a/__resource.lua +++ b/__resource.lua @@ -5,6 +5,7 @@ description 'ESX Billing' server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', @@ -13,6 +14,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', diff --git a/config.lua b/config.lua index 56a8b5e9..99dea53b 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,2 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'br' From 34840960b9e92432e1f52a669f39db442ccf2bdf Mon Sep 17 00:00:00 2001 From: TakumiBR <31086346+TakumiBR@users.noreply.github.com> Date: Wed, 16 Aug 2017 22:55:45 -0700 Subject: [PATCH 09/55] Add files via upload --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 99dea53b..56a8b5e9 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,2 @@ Config = {} -Config.Locale = 'br' +Config.Locale = 'fr' From a9b49b616b7f9f630925ac35ab3b0c6659638adc Mon Sep 17 00:00:00 2001 From: Don Date: Fri, 18 Aug 2017 00:28:15 -0700 Subject: [PATCH 10/55] fixed missing translation fixed missing translation in client\main.lua invoices --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 99e7a4e4..7183a639 100644 --- a/client/main.lua +++ b/client/main.lua @@ -36,7 +36,7 @@ function ShowBillsMenu() ESX.UI.Menu.Open( 'default', GetCurrentResourceName(), 'billing', { - title = 'Factures', + title = _U('invoices'), elements = elements }, function(data, menu) From 57442d080e0b30cd2121d16d3cc4066b93b408a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Mon, 21 Aug 2017 21:16:47 +0200 Subject: [PATCH 11/55] Update GetPlayers --- server/main.lua | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/server/main.lua b/server/main.lua index 213da1e7..26cacdc8 100644 --- a/server/main.lua +++ b/server/main.lua @@ -12,13 +12,16 @@ AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, la if account == nil then - for k, v in pairs(xPlayers) do - if v.source == playerId then + for i=1, #xPlayers, 1 do + + local xPlayer2 = ESX.GetPlayerFromId(xPlayers[i]) + + if xPlayer2.source == playerId then MySQL.Async.execute( 'INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', { - ['@identifier'] = v.identifier, + ['@identifier'] = xPlayer2.identifier, ['@sender'] = xPlayer.identifier, ['@target_type'] = 'player', ['@target'] = xPlayer.identifier, @@ -26,7 +29,7 @@ AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, la ['@amount'] = amount }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', v.source, _U('received_invoice')) + TriggerClientEvent('esx:showNotification', xPlayer2.source, _U('received_invoice')) end ) @@ -36,14 +39,16 @@ AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, la else - for k, v in pairs(xPlayers) do + for i=1, #xPlayers, 1 do - if v.source == playerId then + local xPlayer2 = ESX.GetPlayerFromId(xPlayers[i]) + + if xPlayer2.source == playerId then MySQL.Async.execute( 'INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', { - ['@identifier'] = v.identifier, + ['@identifier'] = xPlayer2.identifier, ['@sender'] = xPlayer.identifier, ['@target_type'] = 'society', ['@target'] = sharedAccountName, @@ -51,7 +56,7 @@ AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, la ['@amount'] = amount }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', v.source, _U('received_invoice')) + TriggerClientEvent('esx:showNotification', xPlayer2.source, _U('received_invoice')) end ) @@ -116,9 +121,12 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) local xPlayers = ESX.GetPlayers() local foundPlayer = nil - for k,v in pairs(xPlayers) do - if v.identifier == sender then - foundPlayer = v + for i=1, #xPlayers, 1 do + + local xPlayer2 = ESX.GetPlayerFromId(xPlayers[i]) + + if xPlayer2.identifier == sender then + foundPlayer = xPlayer2 break end end From 98b8b38ad29eb039b57b34fa49a188f9f934bbe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 23 Aug 2017 15:58:47 +0200 Subject: [PATCH 12/55] Close menu before re-open --- client/main.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/main.lua b/client/main.lua index 7183a639..7bd0d8fc 100644 --- a/client/main.lua +++ b/client/main.lua @@ -41,6 +41,8 @@ function ShowBillsMenu() }, function(data, menu) + menu.close() + local billId = data.current.value ESX.TriggerServerCallback('esx_billing:payBill', function() From 39ae3e9d01cdfd3506c2114580c8b5138ea8bce9 Mon Sep 17 00:00:00 2001 From: ultratm Date: Sat, 26 Aug 2017 12:31:40 +0200 Subject: [PATCH 13/55] Add German Language --- __resource.lua | 2 ++ locales/de.lua | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 locales/de.lua diff --git a/__resource.lua b/__resource.lua index bfc3d345..543399a8 100644 --- a/__resource.lua +++ b/__resource.lua @@ -5,6 +5,7 @@ description 'ESX Billing' server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', @@ -14,6 +15,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', diff --git a/locales/de.lua b/locales/de.lua new file mode 100644 index 00000000..f1c54612 --- /dev/null +++ b/locales/de.lua @@ -0,0 +1,9 @@ +Locales['de'] = { + + ['invoices'] = 'Rechnungen', + ['received_invoice'] = 'you hast eine Rechnung ~r~erhlaten~s~', + ['paid_invoice'] = 'du ~g~bezahlst~s~ eine Rechnung von ~r~$', + ['received_payment'] = 'du ~g~erhältst~s~ eine Zahlung von ~r~$', + ['player_not_logged'] = 'der Spieler ist nicht online', + +} From 983be68c996a72d39c549c416df2e30b4296f9f9 Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Sun, 27 Aug 2017 10:48:18 +0200 Subject: [PATCH 14/55] fix(menu): add align property --- client/main.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 7bd0d8fc..0fc8eb5c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -37,6 +37,7 @@ function ShowBillsMenu() 'default', GetCurrentResourceName(), 'billing', { title = _U('invoices'), + align = 'top-left', elements = elements }, function(data, menu) @@ -71,4 +72,4 @@ Citizen.CreateThread(function() end end -end) \ No newline at end of file +end) From 7f305f13d00ad88446b27b9b944925bbd26e3505 Mon Sep 17 00:00:00 2001 From: Coro Veneno Date: Tue, 12 Sep 2017 22:17:02 +0200 Subject: [PATCH 15/55] Create es.lua Added spanish language Multi-language --- locales/es.lua | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 locales/es.lua diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..07579913 --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,8 @@ +Locales['es'] = { + + ['invoices'] = 'Facturas', + ['received_invoice'] = 'Has ~r~recibido~s~ una multa', + ['paid_invoice'] = 'Has ~g~pagado~s~ una multa de ~r~€', + ['received_payment'] = 'Has ~g~recibido~s~ un pago de ~g~€', + ['player_not_logged'] = 'El jugador no está conectado', +} From 5a5088317533d5e4d5e543f70bc8e440b353a9b1 Mon Sep 17 00:00:00 2001 From: Coro Veneno Date: Tue, 12 Sep 2017 23:08:36 +0200 Subject: [PATCH 16/55] Update Spanish Language Added Spanish Language --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 543399a8..1367b9cb 100644 --- a/__resource.lua +++ b/__resource.lua @@ -9,6 +9,7 @@ server_scripts { 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/es.lua', 'config.lua', 'server/main.lua' } @@ -19,6 +20,7 @@ client_scripts { 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/es.lua', 'config.lua', 'client/main.lua' } From 9cb59a0c602d5123f52fa33ebdf45eb709f2d519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:16:58 +0200 Subject: [PATCH 17/55] Update LICENSE.txt --- LICENSE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 30ace6a8..79725e27 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + fxserver-esx_billing + Copyright (C) 2015 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + fxserver-esx_billing Copyright (C) 2015 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. From 8121653fb4983ad18090eb8816c370e271e7fc26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:20:58 +0200 Subject: [PATCH 18/55] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 1367b9cb..eaf5b6de 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,8 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Billing' +version '1.0.0' + server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', From bfed8a8f06ca6e5721f2de5d3a44f61079466a86 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 3 Feb 2018 16:03:27 +0100 Subject: [PATCH 19/55] Initial push --- client/main.lua | 2 +- config.lua | 2 +- esx_billing.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/main.lua b/client/main.lua index 0fc8eb5c..ebf72009 100644 --- a/client/main.lua +++ b/client/main.lua @@ -37,7 +37,7 @@ function ShowBillsMenu() 'default', GetCurrentResourceName(), 'billing', { title = _U('invoices'), - align = 'top-left', + align = 'bottom-right', elements = elements }, function(data, menu) diff --git a/config.lua b/config.lua index 56a8b5e9..5290495d 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,2 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'en' diff --git a/esx_billing.sql b/esx_billing.sql index f7571215..014464b7 100644 --- a/esx_billing.sql +++ b/esx_billing.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `fivem2337`; CREATE TABLE `billing` ( From 43392f9691abe9521ae31a73dbc35c03bb11bf6d Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 22 Feb 2018 01:52:37 +0100 Subject: [PATCH 20/55] Fix message pack Error --- server/main.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server/main.lua b/server/main.lua index 26cacdc8..5c4e1d02 100644 --- a/server/main.lua +++ b/server/main.lua @@ -5,7 +5,8 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_billing:sendBill') AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, label, amount) - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) local xPlayers = ESX.GetPlayers() TriggerEvent('esx_addonaccount:getSharedAccount', sharedAccountName, function(account) @@ -72,7 +73,8 @@ end) ESX.RegisterServerCallback('esx_billing:getBills', function(source, cb) - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) MySQL.Async.fetchAll( 'SELECT * FROM billing WHERE identifier = @identifier', @@ -105,7 +107,8 @@ end) ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) MySQL.Async.fetchAll( 'SELECT * FROM billing WHERE id = @id', From d052d9804264f6611965e86e658be4f0545b8e0f Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 22 Feb 2018 16:57:43 +0100 Subject: [PATCH 21/55] Fixed negative bills --- __resource.lua | 2 ++ client/main.lua | 15 ++++++--------- config.lua | 2 +- locales/en.lua | 4 ++-- locales/sv.lua | 8 ++++++++ server/main.lua | 39 +++++++++++++++++---------------------- 6 files changed, 36 insertions(+), 34 deletions(-) create mode 100644 locales/sv.lua diff --git a/__resource.lua b/__resource.lua index eaf5b6de..1b4649c9 100644 --- a/__resource.lua +++ b/__resource.lua @@ -12,6 +12,7 @@ server_scripts { 'locales/en.lua', 'locales/fr.lua', 'locales/es.lua', + 'locales/sv.lua', 'config.lua', 'server/main.lua' } @@ -23,6 +24,7 @@ client_scripts { 'locales/en.lua', 'locales/fr.lua', 'locales/es.lua', + 'locales/sv.lua', 'config.lua', 'client/main.lua' } diff --git a/client/main.lua b/client/main.lua index ebf72009..bfe25dfd 100644 --- a/client/main.lua +++ b/client/main.lua @@ -63,13 +63,10 @@ end -- Key controls Citizen.CreateThread(function() while true do - - Wait(0) - - if IsControlPressed(0, Keys["F7"]) and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') and (GetGameTimer() - GUI.Time) > 150 then - ShowBillsMenu() - GUI.Time = GetGameTimer() - end - - end + Citizen.Wait(25) + if IsControlPressed(0, Keys["F7"]) and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') and (GetGameTimer() - GUI.Time) > 150 then + ShowBillsMenu() + GUI.Time = GetGameTimer() + end + end end) diff --git a/config.lua b/config.lua index 5290495d..926107bc 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,2 @@ Config = {} -Config.Locale = 'en' +Config.Locale = 'sv' diff --git a/locales/en.lua b/locales/en.lua index 5271005b..0c17646c 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,9 +1,9 @@ Locales['en'] = { ['invoices'] = 'invoices', - ['received_invoice'] = 'you ~r~received~s~ an invoice', + ['received_invoice'] = 'you have just ~r~received~s~ an invoice', ['paid_invoice'] = 'you ~g~paid~s~ an invoice of ~r~$', ['received_payment'] = 'you ~g~received~s~ a payment of ~r~$', ['player_not_logged'] = 'the player is not logged in', - + ['no_money'] = 'you do not have enough money to pay this bill', } diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..ca0cc040 --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,8 @@ +Locales['sv'] = { + ['invoices'] = 'räkningar', + ['received_invoice'] = 'du har ~r~mottagit~s~ en räkning', + ['paid_invoice'] = 'du ~g~betalade~s~ precis en räkning på ~g~$', + ['received_payment'] = 'u har ~g~mottagit~s~ en räkning på ~g~$', + ['player_not_logged'] = 'spelaren är inte online', + ['no_money'] = 'du har inte råd för att betala räkningen', +} diff --git a/server/main.lua b/server/main.lua index 26cacdc8..b95b0329 100644 --- a/server/main.lua +++ b/server/main.lua @@ -163,30 +163,25 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) end else - TriggerEvent('esx_addonaccount:getSharedAccount', target, function(account) - - MySQL.Async.execute( - 'DELETE from billing WHERE id = @id', - { - ['@id'] = id - }, - function(rowsChanged) - - xPlayer.removeMoney(amount) - account.addMoney(amount) - - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice') .. amount) - - if foundPlayer ~= nil then - TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('received_payment') .. amount) - end - + if xPlayer.get('money') >= amount then + MySQL.Async.execute( + 'DELETE from billing WHERE id = @id', + { + ['@id'] = id + }, + function(rowsChanged) + xPlayer.removeMoney(amount) + account.addMoney(amount) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice') .. amount) + if foundPlayer ~= nil then + TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('received_payment') .. amount) + end cb() - - end - ) - + end) + else + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('no_money')) + end end) end From 93daf17c9a8723691818bb6766ea3a3c8409cc02 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 22 Feb 2018 17:37:15 +0100 Subject: [PATCH 22/55] Added message to reciver... when the target player doesn't have enough money to pay the bill --- locales/en.lua | 2 +- locales/sv.lua | 9 +++++---- server/main.lua | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/locales/en.lua b/locales/en.lua index 0c17646c..46667262 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,9 +1,9 @@ Locales['en'] = { - ['invoices'] = 'invoices', ['received_invoice'] = 'you have just ~r~received~s~ an invoice', ['paid_invoice'] = 'you ~g~paid~s~ an invoice of ~r~$', ['received_payment'] = 'you ~g~received~s~ a payment of ~r~$', ['player_not_logged'] = 'the player is not logged in', ['no_money'] = 'you do not have enough money to pay this bill', + ['target_no_money'] = 'The player ~r~does not~w~ have enough money to pay the bill!' } diff --git a/locales/sv.lua b/locales/sv.lua index ca0cc040..c5394337 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,8 +1,9 @@ Locales['sv'] = { ['invoices'] = 'räkningar', - ['received_invoice'] = 'du har ~r~mottagit~s~ en räkning', - ['paid_invoice'] = 'du ~g~betalade~s~ precis en räkning på ~g~$', - ['received_payment'] = 'u har ~g~mottagit~s~ en räkning på ~g~$', + ['received_invoice'] = 'du har ~y~mottagit~s~ en räkning', + ['paid_invoice'] = 'du ~y~betalade~w~ precis en räkning på ~g~$', + ['received_payment'] = 'du har ~y~mottagit~w~ en räkning på ~g~$', ['player_not_logged'] = 'spelaren är inte online', - ['no_money'] = 'du har inte råd för att betala räkningen', + ['no_money'] = 'du har ~r~inte råd~w~ för att kunna betala räkningen', + ['target_no_money'] = 'Spelaren har ~r~inte råd~w~ för att betala räkningen' } diff --git a/server/main.lua b/server/main.lua index 0c059a8e..148fbc6c 100644 --- a/server/main.lua +++ b/server/main.lua @@ -184,6 +184,9 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) end) else TriggerClientEvent('esx:showNotification', xPlayer.source, _U('no_money')) + if foundPlayer ~= nil then + TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('target_no_money')) + end end end) From b12d6c139fb1e62e3f4204ce02c5555278926904 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 22 Feb 2018 18:36:14 +0100 Subject: [PATCH 23/55] Fixed exploit: negative bills Sending negative bills gives the target player money! This adds a simple check to see if the bill is a negative value. --- locales/en.lua | 3 ++- locales/sv.lua | 3 ++- server/main.lua | 11 +++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/locales/en.lua b/locales/en.lua index 46667262..d13b1d8b 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -5,5 +5,6 @@ Locales['en'] = { ['received_payment'] = 'you ~g~received~s~ a payment of ~r~$', ['player_not_logged'] = 'the player is not logged in', ['no_money'] = 'you do not have enough money to pay this bill', - ['target_no_money'] = 'The player ~r~does not~w~ have enough money to pay the bill!' + ['target_no_money'] = 'The player ~r~does not~w~ have enough money to pay the bill!', + ['negative_bill'] = 'You cannot send negative bills!' } diff --git a/locales/sv.lua b/locales/sv.lua index c5394337..654fffdf 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -5,5 +5,6 @@ Locales['sv'] = { ['received_payment'] = 'du har ~y~mottagit~w~ en räkning på ~g~$', ['player_not_logged'] = 'spelaren är inte online', ['no_money'] = 'du har ~r~inte råd~w~ för att kunna betala räkningen', - ['target_no_money'] = 'Spelaren har ~r~inte råd~w~ för att betala räkningen' + ['target_no_money'] = 'Spelaren har ~r~inte råd~w~ för att betala räkningen', + ['negative_bill'] = 'Du kan inte skicka negativa räkningar!' } diff --git a/server/main.lua b/server/main.lua index 148fbc6c..bfb9739a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -6,12 +6,15 @@ RegisterServerEvent('esx_billing:sendBill') AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, label, amount) local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(_source) local xPlayers = ESX.GetPlayers() TriggerEvent('esx_addonaccount:getSharedAccount', sharedAccountName, function(account) - if account == nil then + if amount < 0 then + print('esx_billing: ' .. GetPlayerName(_source) .. ' tried sending a negative bill!') + TriggerClientEvent('esx:showNotification', _source, _U('negative_bill')) + elseif account == nil then for i=1, #xPlayers, 1 do @@ -37,9 +40,7 @@ AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, la break end end - else - for i=1, #xPlayers, 1 do local xPlayer2 = ESX.GetPlayerFromId(xPlayers[i]) @@ -64,9 +65,7 @@ AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, la break end end - end - end) end) From 5b0800cbce3b53547ba6cf9a3cea28d41f34ba2e Mon Sep 17 00:00:00 2001 From: Don <30905704+ddh3@users.noreply.github.com> Date: Fri, 23 Feb 2018 00:07:29 -0800 Subject: [PATCH 24/55] Update __resource.lua --- __resource.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 1b4649c9..50f84fe0 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Billing' -version '1.0.0' +version '1.0.1' server_scripts { '@mysql-async/lib/MySQL.lua', From db1c780414c2be641372f6e3616d6c1b16ad8ea5 Mon Sep 17 00:00:00 2001 From: scorpio686 <31187145+scorpio686@users.noreply.github.com> Date: Sun, 4 Mar 2018 20:51:57 +0100 Subject: [PATCH 25/55] Change database to essentialmode --- esx_billing.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esx_billing.sql b/esx_billing.sql index 014464b7..f7571215 100644 --- a/esx_billing.sql +++ b/esx_billing.sql @@ -1,4 +1,4 @@ -USE `fivem2337`; +USE `essentialmode`; CREATE TABLE `billing` ( From b853ccb23984564e6f0a3ea16a520935f37d0d1b Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 15 Apr 2018 23:23:41 +0200 Subject: [PATCH 26/55] Don't let the dead access the F7 menu --- client/main.lua | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index bfe25dfd..68cce371 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,9 +10,10 @@ local Keys = { ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } -ESX = nil -local GUI = {} -GUI.Time = 0 +ESX = nil +local GUI = {} +local isDead = false +GUI.Time = 0 Citizen.CreateThread(function() while ESX == nil do @@ -64,9 +65,17 @@ end Citizen.CreateThread(function() while true do Citizen.Wait(25) - if IsControlPressed(0, Keys["F7"]) and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') and (GetGameTimer() - GUI.Time) > 150 then + if IsControlPressed(0, Keys["F7"]) and not isDead and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') and (GetGameTimer() - GUI.Time) > 150 then ShowBillsMenu() GUI.Time = GetGameTimer() end end end) + +AddEventHandler('esx:onPlayerDeath', function() + isDead = true +end) + +AddEventHandler('playerSpawned', function(spawn) + isDead = false +end) From fd95968a109b51f71b61533e79caef94574f54cb Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 17 Apr 2018 00:32:16 +0200 Subject: [PATCH 27/55] Update README.md --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f6a555e3..5add4081 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# fxserver-esx_billing -FXServer ESX Billing +# esx_billing [INSTALLATION] @@ -8,8 +7,8 @@ FXServer ESX Billing ``` git clone https://github.com/FXServer-ESX/fxserver-esx_billing esx_billing ``` -3) Import esx_billing.sql in your database -4) Add this in your server.cfg : +3) Import `esx_billing.sql` in your database +4) Add this in your `server.cfg`: ``` start esx_billing @@ -17,14 +16,14 @@ start esx_billing [USAGE] -Press [F7] To show billing menu +Press `[F7]` To show billing menu ``` local amount = 100 local closestPlayer, closestDistance = ESX.Game.GetClosestPlayer() if closestPlayer == -1 or closestDistance > 3.0 then - ESX.ShowNotification('Aucun joueur à proximité') + ESX.ShowNotification('There\'s no players nearby!') else TriggerServerEvent('esx_billing:sendBill', GetPlayerServerId(closestPlayer), 'society_taxi', 'Taxi', amount) end From 127bfb6b9ecbd60519ac9ee5f5f34059f10c890c Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 4 Jun 2018 22:30:54 +0200 Subject: [PATCH 28/55] Minor string formatting improvements --- README.md | 46 +++++++++++++++++++++++++++++++++++----------- config.lua | 2 +- esx_billing.sql | 19 +++++++++---------- locales/br.lua | 6 ++---- locales/de.lua | 6 ++---- locales/en.lua | 7 +++---- locales/es.lua | 5 ++--- locales/fr.lua | 6 ++---- locales/sv.lua | 5 ++--- server/main.lua | 9 ++++----- 10 files changed, 62 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index 5add4081..efc4fb4d 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,54 @@ # esx_billing -[INSTALLATION] +## Download & Installation -1) CD in your resources/[esx] folder -2) Clone the repository +### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` -git clone https://github.com/FXServer-ESX/fxserver-esx_billing esx_billing +fvm install --save --folder=esx esx-org/esx_billing ``` -3) Import `esx_billing.sql` in your database -4) Add this in your `server.cfg`: + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_billing [esx]/esx_billing +``` + +### Manually +- Download https://github.com/ESX-Org/esx_billing/archive/master.zip +- Put it in the `[esx]` directory + + +## Installation +- Import `esx_billing.sql` in your database +- Add this in your server.cfg : ``` start esx_billing ``` -[USAGE] +## Usage -Press `[F7]` To show billing menu +Press `[F7]` To show the billing menu -``` +```lua local amount = 100 local closestPlayer, closestDistance = ESX.Game.GetClosestPlayer() if closestPlayer == -1 or closestDistance > 3.0 then - ESX.ShowNotification('There\'s no players nearby!') + ESX.ShowNotification('There\'s no players nearby!') else - TriggerServerEvent('esx_billing:sendBill', GetPlayerServerId(closestPlayer), 'society_taxi', 'Taxi', amount) + TriggerServerEvent('esx_billing:sendBill', GetPlayerServerId(closestPlayer), 'society_taxi', 'Taxi', amount) end ``` + +# Legal +### License +esx_billing - billing for ESX + +Copyright (C) 2015-2018 Jérémie N'gadi + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. \ No newline at end of file diff --git a/config.lua b/config.lua index 926107bc..56a8b5e9 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,2 @@ Config = {} -Config.Locale = 'sv' +Config.Locale = 'fr' diff --git a/esx_billing.sql b/esx_billing.sql index f7571215..a418175c 100644 --- a/esx_billing.sql +++ b/esx_billing.sql @@ -1,14 +1,13 @@ USE `essentialmode`; CREATE TABLE `billing` ( - - `id` int(11) NOT NULL AUTO_INCREMENT, - `identifier` varchar(255) NOT NULL, - `sender` varchar(255) NOT NULL, - `target_type` varchar(50) NOT NULL, - `target` varchar(255) NOT NULL, - `label` varchar(255) NOT NULL, - `amount` int(11) NOT NULL, - - PRIMARY KEY (`id`) + `id` int(11) NOT NULL AUTO_INCREMENT, + `identifier` varchar(255) NOT NULL, + `sender` varchar(255) NOT NULL, + `target_type` varchar(50) NOT NULL, + `target` varchar(255) NOT NULL, + `label` varchar(255) NOT NULL, + `amount` int(11) NOT NULL, + + PRIMARY KEY (`id`) ); diff --git a/locales/br.lua b/locales/br.lua index 5bcb5db2..6cac8e82 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,9 +1,7 @@ Locales['br'] = { - ['invoices'] = 'Faturas', ['received_invoice'] = 'Você ~r~recebeu~s~ uma fatura', - ['paid_invoice'] = 'Você ~g~pagou~s~ uma fatura de ~r~$', - ['received_payment'] = 'Você ~g~recebeu~s~ um pagamento de ~r~$', + ['paid_invoice'] = 'Você ~g~pagou~s~ uma fatura de ~r~$%s~s~', + ['received_payment'] = 'Você ~g~recebeu~s~ um pagamento de ~r~$%s~s~', ['player_not_logged'] = 'O jogador não está logado', - } diff --git a/locales/de.lua b/locales/de.lua index f1c54612..1c55d48b 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,9 +1,7 @@ Locales['de'] = { - ['invoices'] = 'Rechnungen', ['received_invoice'] = 'you hast eine Rechnung ~r~erhlaten~s~', - ['paid_invoice'] = 'du ~g~bezahlst~s~ eine Rechnung von ~r~$', - ['received_payment'] = 'du ~g~erhältst~s~ eine Zahlung von ~r~$', + ['paid_invoice'] = 'du ~g~bezahlst~s~ eine Rechnung von ~r~$%s~s~', + ['received_payment'] = 'du ~g~erhältst~s~ eine Zahlung von ~r~$%s~s~', ['player_not_logged'] = 'der Spieler ist nicht online', - } diff --git a/locales/en.lua b/locales/en.lua index d13b1d8b..220fd265 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,10 +1,9 @@ Locales['en'] = { ['invoices'] = 'invoices', ['received_invoice'] = 'you have just ~r~received~s~ an invoice', - ['paid_invoice'] = 'you ~g~paid~s~ an invoice of ~r~$', - ['received_payment'] = 'you ~g~received~s~ a payment of ~r~$', + ['paid_invoice'] = 'you ~g~paid~s~ an invoice of ~r~$%s~s~', + ['received_payment'] = 'you ~g~received~s~ a payment of ~r~$%s~s~', ['player_not_logged'] = 'the player is not logged in', ['no_money'] = 'you do not have enough money to pay this bill', - ['target_no_money'] = 'The player ~r~does not~w~ have enough money to pay the bill!', - ['negative_bill'] = 'You cannot send negative bills!' + ['target_no_money'] = 'the player ~r~does not~w~ have enough money to pay the bill!', } diff --git a/locales/es.lua b/locales/es.lua index 07579913..9a21351e 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,8 +1,7 @@ Locales['es'] = { - ['invoices'] = 'Facturas', ['received_invoice'] = 'Has ~r~recibido~s~ una multa', - ['paid_invoice'] = 'Has ~g~pagado~s~ una multa de ~r~€', - ['received_payment'] = 'Has ~g~recibido~s~ un pago de ~g~€', + ['paid_invoice'] = 'Has ~g~pagado~s~ una multa de ~r~€%s~s~', + ['received_payment'] = 'Has ~g~recibido~s~ un pago de ~g~€%s~s~', ['player_not_logged'] = 'El jugador no está conectado', } diff --git a/locales/fr.lua b/locales/fr.lua index 46f14598..a9113d73 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,9 +1,7 @@ Locales['fr'] = { - ['invoices'] = 'factures', ['received_invoice'] = 'vous avez ~r~reçu~s~ une facture', - ['paid_invoice'] = 'vous avez ~g~payé~s~ une facture de ~r~$', - ['received_payment'] = 'vous avez ~g~reçu~s~ un paiement de ~g~$', + ['paid_invoice'] = 'vous avez ~g~payé~s~ une facture de ~r~$%s~s~', + ['received_payment'] = 'vous avez ~g~reçu~s~ un paiement de ~g~$%s~s~', ['player_not_logged'] = 'le joueur n\'est pas connecté', - } diff --git a/locales/sv.lua b/locales/sv.lua index 654fffdf..d661d797 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,10 +1,9 @@ Locales['sv'] = { ['invoices'] = 'räkningar', ['received_invoice'] = 'du har ~y~mottagit~s~ en räkning', - ['paid_invoice'] = 'du ~y~betalade~w~ precis en räkning på ~g~$', - ['received_payment'] = 'du har ~y~mottagit~w~ en räkning på ~g~$', + ['paid_invoice'] = 'du ~y~betalade~w~ precis en räkning på ~g~$%s~s~', + ['received_payment'] = 'du har ~y~mottagit~w~ en räkning på ~g~$%s~s~', ['player_not_logged'] = 'spelaren är inte online', ['no_money'] = 'du har ~r~inte råd~w~ för att kunna betala räkningen', ['target_no_money'] = 'Spelaren har ~r~inte råd~w~ för att betala räkningen', - ['negative_bill'] = 'Du kan inte skicka negativa räkningar!' } diff --git a/server/main.lua b/server/main.lua index bfb9739a..ae66ab5f 100644 --- a/server/main.lua +++ b/server/main.lua @@ -13,7 +13,6 @@ AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, la if amount < 0 then print('esx_billing: ' .. GetPlayerName(_source) .. ' tried sending a negative bill!') - TriggerClientEvent('esx:showNotification', _source, _U('negative_bill')) elseif account == nil then for i=1, #xPlayers, 1 do @@ -149,8 +148,8 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) xPlayer.removeMoney(amount) foundPlayer.addMoney(amount) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice') .. amount) - TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('received_payment') .. amount) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) + TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('received_payment', amount)) cb() @@ -175,9 +174,9 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) function(rowsChanged) xPlayer.removeMoney(amount) account.addMoney(amount) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice') .. amount) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) if foundPlayer ~= nil then - TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('received_payment') .. amount) + TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('received_payment', amount)) end cb() end) From 16427de84892709d333c146b482cf8d898ea1a50 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Tue, 12 Jun 2018 21:21:54 +0300 Subject: [PATCH 29/55] Add Finnish lang... --- __resource.lua | 2 ++ locales/fi.lua | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 locales/fi.lua diff --git a/__resource.lua b/__resource.lua index 50f84fe0..090223ed 100644 --- a/__resource.lua +++ b/__resource.lua @@ -10,6 +10,7 @@ server_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'locales/es.lua', 'locales/sv.lua', @@ -22,6 +23,7 @@ client_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'locales/es.lua', 'locales/sv.lua', diff --git a/locales/fi.lua b/locales/fi.lua new file mode 100644 index 00000000..150161fa --- /dev/null +++ b/locales/fi.lua @@ -0,0 +1,9 @@ +Locales['fi'] = { + ['invoices'] = 'laskut', + ['received_invoice'] = 'sinä ~r~sait~s~ laskun', + ['paid_invoice'] = 'sinä ~g~maksoit~s~ laskun suuruudelta ~r~$%s~s~', + ['received_payment'] = 'sinä ~g~sait~s~ maksun suuruudelta ~r~$%s~s~', + ['player_not_logged'] = 'pelaaja ei ole sisäänkirjautuneena', + ['no_money'] = 'sinulla ei ole tarpeeksi rahaa maksaaksesi tätä laskua.', + ['target_no_money'] = 'pelaajalla ~r~ei ole~w~ tarpeeksi rahaa maksaakseentätä laskua', +} From 7bbd1258b3fa0f26d4106e8e3e1a0cdbb924f0f2 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 6 Jul 2018 22:33:35 +0200 Subject: [PATCH 30/55] Improvements --- README.md | 3 +- __resource.lua | 4 +- client/main.lua | 7 +-- server/main.lua | 116 ++++++++++++++++++------------------------------ 4 files changed, 50 insertions(+), 80 deletions(-) diff --git a/README.md b/README.md index efc4fb4d..c4f408ee 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,13 @@ git clone https://github.com/ESX-Org/esx_billing [esx]/esx_billing ## Installation - Import `esx_billing.sql` in your database -- Add this in your server.cfg : +- Add this to your `server.cfg`: ``` start esx_billing ``` ## Usage - Press `[F7]` To show the billing menu ```lua diff --git a/__resource.lua b/__resource.lua index 090223ed..5363db2f 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Billing' -version '1.0.1' +version '1.1.0' server_scripts { '@mysql-async/lib/MySQL.lua', @@ -30,3 +30,5 @@ client_scripts { 'config.lua', 'client/main.lua' } + +dependency 'es_extended' \ No newline at end of file diff --git a/client/main.lua b/client/main.lua index 68cce371..84af3132 100644 --- a/client/main.lua +++ b/client/main.lua @@ -11,9 +11,7 @@ local Keys = { } ESX = nil -local GUI = {} local isDead = false -GUI.Time = 0 Citizen.CreateThread(function() while ESX == nil do @@ -64,10 +62,9 @@ end -- Key controls Citizen.CreateThread(function() while true do - Citizen.Wait(25) - if IsControlPressed(0, Keys["F7"]) and not isDead and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') and (GetGameTimer() - GUI.Time) > 150 then + Citizen.Wait(10) + if IsControlJustReleased(0, Keys["F7"]) and not isDead and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') then ShowBillsMenu() - GUI.Time = GetGameTimer() end end end) diff --git a/server/main.lua b/server/main.lua index ae66ab5f..b420be06 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,10 +4,9 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_billing:sendBill') AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, label, amount) - local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - local xPlayers = ESX.GetPlayers() + local xTarget = ESX.GetPlayerFromId(playerId) TriggerEvent('esx_addonaccount:getSharedAccount', sharedAccountName, function(account) @@ -15,64 +14,49 @@ AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, la print('esx_billing: ' .. GetPlayerName(_source) .. ' tried sending a negative bill!') elseif account == nil then - for i=1, #xPlayers, 1 do - - local xPlayer2 = ESX.GetPlayerFromId(xPlayers[i]) - - if xPlayer2.source == playerId then - - MySQL.Async.execute( - 'INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', - { - ['@identifier'] = xPlayer2.identifier, - ['@sender'] = xPlayer.identifier, - ['@target_type'] = 'player', - ['@target'] = xPlayer.identifier, - ['@label'] = label, - ['@amount'] = amount - }, - function(rowsChanged) - TriggerClientEvent('esx:showNotification', xPlayer2.source, _U('received_invoice')) - end - ) - - break - end + if xTarget ~= nil then + MySQL.Async.execute( + 'INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', + { + ['@identifier'] = xTarget.identifier, + ['@sender'] = xPlayer.identifier, + ['@target_type'] = 'player', + ['@target'] = xPlayer.identifier, + ['@label'] = label, + ['@amount'] = amount + }, + function(rowsChanged) + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_invoice')) + end + ) end + else - for i=1, #xPlayers, 1 do - local xPlayer2 = ESX.GetPlayerFromId(xPlayers[i]) - - if xPlayer2.source == playerId then - - MySQL.Async.execute( - 'INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', - { - ['@identifier'] = xPlayer2.identifier, - ['@sender'] = xPlayer.identifier, - ['@target_type'] = 'society', - ['@target'] = sharedAccountName, - ['@label'] = label, - ['@amount'] = amount - }, - function(rowsChanged) - TriggerClientEvent('esx:showNotification', xPlayer2.source, _U('received_invoice')) - end - ) - - break - end + if xTarget ~= nil then + MySQL.Async.execute( + 'INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', + { + ['@identifier'] = xTarget.identifier, + ['@sender'] = xPlayer.identifier, + ['@target_type'] = 'society', + ['@target'] = sharedAccountName, + ['@label'] = label, + ['@amount'] = amount + }, + function(rowsChanged) + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_invoice')) + end + ) end + end end) end) ESX.RegisterServerCallback('esx_billing:getBills', function(source, cb) - - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) MySQL.Async.fetchAll( 'SELECT * FROM billing WHERE identifier = @identifier', @@ -104,9 +88,7 @@ end) ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) - - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) MySQL.Async.fetchAll( 'SELECT * FROM billing WHERE id = @id', @@ -119,22 +101,12 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) local targetType = result[1].target_type local target = result[1].target local amount = result[1].amount - local xPlayers = ESX.GetPlayers() - local foundPlayer = nil - for i=1, #xPlayers, 1 do - - local xPlayer2 = ESX.GetPlayerFromId(xPlayers[i]) - - if xPlayer2.identifier == sender then - foundPlayer = xPlayer2 - break - end - end + local xTarget = ESX.GetPlayerFromId(sender) if targetType == 'player' then - if foundPlayer ~= nil then + if xTarget ~= nil then if xPlayer.get('money') >= amount then @@ -146,10 +118,10 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) function(rowsChanged) xPlayer.removeMoney(amount) - foundPlayer.addMoney(amount) + xTarget.addMoney(amount) TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) - TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('received_payment', amount)) + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', amount)) cb() @@ -157,7 +129,7 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) ) else - TriggerClientEvent('esx:showNotification', _source, _U('player_not_logged')) + TriggerClientEvent('esx:showNotification', source, _U('player_not_logged')) cb() end @@ -175,15 +147,15 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) xPlayer.removeMoney(amount) account.addMoney(amount) TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) - if foundPlayer ~= nil then - TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('received_payment', amount)) + if xTarget ~= nil then + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', amount)) end cb() end) else TriggerClientEvent('esx:showNotification', xPlayer.source, _U('no_money')) - if foundPlayer ~= nil then - TriggerClientEvent('esx:showNotification', foundPlayer.source, _U('target_no_money')) + if xTarget ~= nil then + TriggerClientEvent('esx:showNotification', xTarget.source, _U('target_no_money')) end end end) From e4b5e23e1afe3fbee4376a1b62d70e3fa4dc07fc Mon Sep 17 00:00:00 2001 From: LuaDeldu Date: Sun, 8 Jul 2018 00:28:11 +0200 Subject: [PATCH 31/55] Fix xTarget always nil GetPlayerFromIdentifier instead of GetPlayerFromId --- server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index b420be06..8fedbf5e 100644 --- a/server/main.lua +++ b/server/main.lua @@ -102,7 +102,7 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) local target = result[1].target local amount = result[1].amount - local xTarget = ESX.GetPlayerFromId(sender) + local xTarget = ESX.GetPlayerFromIdentifier(sender) if targetType == 'player' then From 922d0c5fecd7c1d335bfe4de10674022b3a5030a Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 8 Jul 2018 15:18:47 +0200 Subject: [PATCH 32/55] Implemented paying with bank balance, cleanup --- client/main.lua | 4 +- locales/br.lua | 12 +++--- locales/de.lua | 6 ++- locales/en.lua | 4 +- locales/es.lua | 12 +++--- locales/fi.lua | 2 +- locales/fr.lua | 4 +- locales/sv.lua | 10 ++--- server/main.lua | 108 ++++++++++++++++++++++++++++++++---------------- 9 files changed, 104 insertions(+), 58 deletions(-) diff --git a/client/main.lua b/client/main.lua index 84af3132..e613cf01 100644 --- a/client/main.lua +++ b/client/main.lua @@ -36,7 +36,7 @@ function ShowBillsMenu() 'default', GetCurrentResourceName(), 'billing', { title = _U('invoices'), - align = 'bottom-right', + align = 'bottom-right', elements = elements }, function(data, menu) @@ -63,7 +63,7 @@ end Citizen.CreateThread(function() while true do Citizen.Wait(10) - if IsControlJustReleased(0, Keys["F7"]) and not isDead and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') then + if IsControlJustReleased(0, Keys['F7']) and not isDead and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') then ShowBillsMenu() end end diff --git a/locales/br.lua b/locales/br.lua index 6cac8e82..7921cda0 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,7 +1,9 @@ Locales['br'] = { - ['invoices'] = 'Faturas', - ['received_invoice'] = 'Você ~r~recebeu~s~ uma fatura', - ['paid_invoice'] = 'Você ~g~pagou~s~ uma fatura de ~r~$%s~s~', - ['received_payment'] = 'Você ~g~recebeu~s~ um pagamento de ~r~$%s~s~', - ['player_not_logged'] = 'O jogador não está logado', + ['invoices'] = 'faturas', + ['received_invoice'] = 'você ~r~recebeu~s~ uma fatura', + ['paid_invoice'] = 'você ~g~pagou~s~ uma fatura de ~r~$%s~s~', + ['received_payment'] = 'você ~g~recebeu~s~ um pagamento de ~r~$%s~s~', + ['player_not_online'] = 'o jogador não está logado', + ['no_money'] = 'you do not have enough money to pay this bill', + ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', } diff --git a/locales/de.lua b/locales/de.lua index 1c55d48b..f7bf1a0d 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,7 +1,9 @@ Locales['de'] = { - ['invoices'] = 'Rechnungen', + ['invoices'] = 'rechnungen', ['received_invoice'] = 'you hast eine Rechnung ~r~erhlaten~s~', ['paid_invoice'] = 'du ~g~bezahlst~s~ eine Rechnung von ~r~$%s~s~', ['received_payment'] = 'du ~g~erhältst~s~ eine Zahlung von ~r~$%s~s~', - ['player_not_logged'] = 'der Spieler ist nicht online', + ['player_not_online'] = 'der Spieler ist nicht online', + ['no_money'] = 'you do not have enough money to pay this bill', + ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', } diff --git a/locales/en.lua b/locales/en.lua index 220fd265..a2137db9 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -3,7 +3,7 @@ Locales['en'] = { ['received_invoice'] = 'you have just ~r~received~s~ an invoice', ['paid_invoice'] = 'you ~g~paid~s~ an invoice of ~r~$%s~s~', ['received_payment'] = 'you ~g~received~s~ a payment of ~r~$%s~s~', - ['player_not_logged'] = 'the player is not logged in', + ['player_not_online'] = 'the player is not logged in', ['no_money'] = 'you do not have enough money to pay this bill', - ['target_no_money'] = 'the player ~r~does not~w~ have enough money to pay the bill!', + ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', } diff --git a/locales/es.lua b/locales/es.lua index 9a21351e..17a232c9 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,7 +1,9 @@ Locales['es'] = { - ['invoices'] = 'Facturas', - ['received_invoice'] = 'Has ~r~recibido~s~ una multa', - ['paid_invoice'] = 'Has ~g~pagado~s~ una multa de ~r~€%s~s~', - ['received_payment'] = 'Has ~g~recibido~s~ un pago de ~g~€%s~s~', - ['player_not_logged'] = 'El jugador no está conectado', + ['invoices'] = 'facturas', + ['received_invoice'] = 'has ~r~recibido~s~ una multa', + ['paid_invoice'] = 'has ~g~pagado~s~ una multa de ~r~€%s~s~', + ['received_payment'] = 'has ~g~recibido~s~ un pago de ~g~€%s~s~', + ['player_not_online'] = 'el jugador no está conectado', + ['no_money'] = 'you do not have enough money to pay this bill', + ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', } diff --git a/locales/fi.lua b/locales/fi.lua index 150161fa..f4b7820d 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -3,7 +3,7 @@ Locales['fi'] = { ['received_invoice'] = 'sinä ~r~sait~s~ laskun', ['paid_invoice'] = 'sinä ~g~maksoit~s~ laskun suuruudelta ~r~$%s~s~', ['received_payment'] = 'sinä ~g~sait~s~ maksun suuruudelta ~r~$%s~s~', - ['player_not_logged'] = 'pelaaja ei ole sisäänkirjautuneena', + ['player_not_online'] = 'pelaaja ei ole sisäänkirjautuneena', ['no_money'] = 'sinulla ei ole tarpeeksi rahaa maksaaksesi tätä laskua.', ['target_no_money'] = 'pelaajalla ~r~ei ole~w~ tarpeeksi rahaa maksaakseentätä laskua', } diff --git a/locales/fr.lua b/locales/fr.lua index a9113d73..be53d3b2 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -3,5 +3,7 @@ Locales['fr'] = { ['received_invoice'] = 'vous avez ~r~reçu~s~ une facture', ['paid_invoice'] = 'vous avez ~g~payé~s~ une facture de ~r~$%s~s~', ['received_payment'] = 'vous avez ~g~reçu~s~ un paiement de ~g~$%s~s~', - ['player_not_logged'] = 'le joueur n\'est pas connecté', + ['player_not_online'] = 'le joueur n\'est pas connecté', + ['no_money'] = 'you do not have enough money to pay this bill', + ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', } diff --git a/locales/sv.lua b/locales/sv.lua index d661d797..69cad9bc 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,9 +1,9 @@ Locales['sv'] = { ['invoices'] = 'räkningar', ['received_invoice'] = 'du har ~y~mottagit~s~ en räkning', - ['paid_invoice'] = 'du ~y~betalade~w~ precis en räkning på ~g~$%s~s~', - ['received_payment'] = 'du har ~y~mottagit~w~ en räkning på ~g~$%s~s~', - ['player_not_logged'] = 'spelaren är inte online', - ['no_money'] = 'du har ~r~inte råd~w~ för att kunna betala räkningen', - ['target_no_money'] = 'Spelaren har ~r~inte råd~w~ för att betala räkningen', + ['paid_invoice'] = 'du ~y~betalade~s~ precis en räkning på ~g~$%s~s~', + ['received_payment'] = 'du har ~y~mottagit~s~ en räkning på ~g~$%s~s~', + ['player_not_online'] = 'personen är inte online', + ['no_money'] = 'du har ~r~inte råd~s~ för att kunna betala räkningen', + ['target_no_money'] = 'personen har ~r~inte råd~s~ för att betala räkningen', } diff --git a/server/main.lua b/server/main.lua index 8fedbf5e..36b7d776 100644 --- a/server/main.lua +++ b/server/main.lua @@ -94,13 +94,12 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) 'SELECT * FROM billing WHERE id = @id', { ['@id'] = id - }, - function(result) + }, function(result) - local sender = result[1].sender - local targetType = result[1].target_type - local target = result[1].target - local amount = result[1].amount + local sender = result[1].sender + local targetType = result[1].target_type + local target = result[1].target + local amount = result[1].amount local xTarget = ESX.GetPlayerFromIdentifier(sender) @@ -108,55 +107,94 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) if xTarget ~= nil then - if xPlayer.get('money') >= amount then + if xPlayer.getMoney() >= amount then - MySQL.Async.execute( - 'DELETE from billing WHERE id = @id', - { - ['@id'] = id - }, - function(rowsChanged) + MySQL.Async.execute('DELETE from billing WHERE id = @id', + { + ['@id'] = id + }, function(rowsChanged) + xPlayer.removeMoney(amount) + xTarget.addMoney(amount) - xPlayer.removeMoney(amount) - xTarget.addMoney(amount) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', amount)) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', amount)) + cb() + end) - cb() + elseif xPlayer.getBank() >= amount then - end - ) + MySQL.Async.execute('DELETE from billing WHERE id = @id', + { + ['@id'] = id + }, function(rowsChanged) + xPlayer.removeAccountMoney('bank', amount) + xTarget.addAccountMoney('bank', amount) + + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', amount)) + + cb() + end) else - TriggerClientEvent('esx:showNotification', source, _U('player_not_logged')) + TriggerClientEvent('esx:showNotification', xTarget.source, _U('target_no_money')) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('no_money')) + cb() end + else + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('player_not_online')) + cb() end else + TriggerEvent('esx_addonaccount:getSharedAccount', target, function(account) - if xPlayer.get('money') >= amount then - MySQL.Async.execute( - 'DELETE from billing WHERE id = @id', - { - ['@id'] = id - }, - function(rowsChanged) - xPlayer.removeMoney(amount) - account.addMoney(amount) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) - if xTarget ~= nil then - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', amount)) - end + + if xPlayer.getMoney() >= amount then + + MySQL.Async.execute('DELETE from billing WHERE id = @id', + { + ['@id'] = id + }, function(rowsChanged) + xPlayer.removeMoney(amount) + account.addMoney(amount) + + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) + if xTarget ~= nil then + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', amount)) + end + cb() end) + + elseif xPlayer.getBank() >= amount then + + MySQL.Async.execute('DELETE from billing WHERE id = @id', + { + ['@id'] = id + }, function(rowsChanged) + xPlayer.removeAccountMoney('bank', amount) + account.addMoney(amount) + + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) + if xTarget ~= nil then + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', amount)) + end + + cb() + end) + else TriggerClientEvent('esx:showNotification', xPlayer.source, _U('no_money')) + if xTarget ~= nil then TriggerClientEvent('esx:showNotification', xTarget.source, _U('target_no_money')) end + + cb() end end) @@ -165,4 +203,4 @@ ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) end ) -end) +end) \ No newline at end of file From f61ea60ca806800f1a9984cdb25d081f23d4857d Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 13 Jul 2018 12:54:53 +0200 Subject: [PATCH 33/55] Colorful menu --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index e613cf01..b97f46f3 100644 --- a/client/main.lua +++ b/client/main.lua @@ -29,7 +29,7 @@ function ShowBillsMenu() local elements = {} for i=1, #bills, 1 do - table.insert(elements, {label = bills[i].label .. ' $' .. bills[i].amount, value = bills[i].id}) + table.insert(elements, {label = bills[i].label .. ' - $' .. bills[i].amount .. '', value = bills[i].id}) end ESX.UI.Menu.Open( From 8493c3a69c90d21a88ad8ad03430f04c20072f7b Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 14 Jul 2018 00:20:12 +0200 Subject: [PATCH 34/55] Added esx_billing:getTargetBills callback event, final commit v1.1.0 --- client/main.lua | 2 +- server/main.lua | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index b97f46f3..9de1b2f6 100644 --- a/client/main.lua +++ b/client/main.lua @@ -69,7 +69,7 @@ Citizen.CreateThread(function() end end) -AddEventHandler('esx:onPlayerDeath', function() +AddEventHandler('esx:onPlayerDeath', function(data) isDead = true end) diff --git a/server/main.lua b/server/main.lua index 36b7d776..37f4abca 100644 --- a/server/main.lua +++ b/server/main.lua @@ -86,6 +86,37 @@ ESX.RegisterServerCallback('esx_billing:getBills', function(source, cb) end) +ESX.RegisterServerCallback('esx_billing:getTargetBills', function(source, cb, target) + local xPlayer = ESX.GetPlayerFromId(target) + + MySQL.Async.fetchAll( + 'SELECT * FROM billing WHERE identifier = @identifier', + { + ['@identifier'] = xPlayer.identifier + }, + function(result) + + local bills = {} + + for i=1, #result, 1 do + table.insert(bills, { + id = result[i].id, + identifier = result[i].identifier, + sender = result[i].sender, + targetType = result[i].target_type, + target = result[i].target, + label = result[i].label, + amount = result[i].amount + }) + end + + cb(bills) + + end + ) + +end) + ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) local xPlayer = ESX.GetPlayerFromId(source) From c0cf79ea2d06c1c56147776c3ccf653749d78c4e Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:50:47 -0400 Subject: [PATCH 35/55] Repo Update --- .editorconfig | 9 +++++++++ LICENSE.txt => LICENSE | 0 2 files changed, 9 insertions(+) create mode 100644 .editorconfig rename LICENSE.txt => LICENSE (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..9b425256 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 4 +indent_style = tab +end_of_line = crlf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From f02711422f0f06f0a84eda876f7b202f4808f8af Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 13 Aug 2018 20:46:05 +0200 Subject: [PATCH 36/55] Corrected Swedish locale --- locales/sv.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/sv.lua b/locales/sv.lua index 69cad9bc..adab3253 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,8 +1,8 @@ Locales['sv'] = { ['invoices'] = 'räkningar', ['received_invoice'] = 'du har ~y~mottagit~s~ en räkning', - ['paid_invoice'] = 'du ~y~betalade~s~ precis en räkning på ~g~$%s~s~', - ['received_payment'] = 'du har ~y~mottagit~s~ en räkning på ~g~$%s~s~', + ['paid_invoice'] = 'du ~y~betalade~s~ precis en räkning på ~g~%s SEK~s~', + ['received_payment'] = 'du har ~y~mottagit~s~ en räkning på ~g~%s SEK~s~', ['player_not_online'] = 'personen är inte online', ['no_money'] = 'du har ~r~inte råd~s~ för att kunna betala räkningen', ['target_no_money'] = 'personen har ~r~inte råd~s~ för att betala räkningen', From 786d6d24a0fff6460039224791cdb642e533ee25 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 25 Nov 2018 16:08:28 +0100 Subject: [PATCH 37/55] Proper string formatting, no more hardcoded $ signs --- client/main.lua | 42 +++---- locales/br.lua | 1 + locales/de.lua | 1 + locales/en.lua | 1 + locales/es.lua | 1 + locales/fi.lua | 1 + locales/fr.lua | 1 + locales/sv.lua | 1 + server/main.lua | 295 ++++++++++++++++++++++-------------------------- 9 files changed, 157 insertions(+), 187 deletions(-) diff --git a/client/main.lua b/client/main.lua index 9de1b2f6..68e0b34b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -23,38 +23,30 @@ end) function ShowBillsMenu() ESX.TriggerServerCallback('esx_billing:getBills', function(bills) - ESX.UI.Menu.CloseAll() - local elements = {} for i=1, #bills, 1 do - table.insert(elements, {label = bills[i].label .. ' - $' .. bills[i].amount .. '', value = bills[i].id}) + table.insert(elements, { + label = ('%s - %s'):format(bills[i].label, _U('invoices_item', ESX.Math.GroupDigits(bills[i].amount))), + billID = bills[i].id + }) end - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'billing', - { - title = _U('invoices'), - align = 'bottom-right', - elements = elements - }, - function(data, menu) - - menu.close() - - local billId = data.current.value - - ESX.TriggerServerCallback('esx_billing:payBill', function() - ShowBillsMenu() - end, billId) - - end, - function(data, menu) - menu.close() - end - ) + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'billing', + { + title = _U('invoices'), + align = 'bottom-right', + elements = elements + }, function(data, menu) + menu.close() + ESX.TriggerServerCallback('esx_billing:payBill', function() + ShowBillsMenu() + end, data.current.billID) + end, function(data, menu) + menu.close() + end) end) end diff --git a/locales/br.lua b/locales/br.lua index 7921cda0..caf96470 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,5 +1,6 @@ Locales['br'] = { ['invoices'] = 'faturas', + ['invoices_item'] = '$%s', ['received_invoice'] = 'você ~r~recebeu~s~ uma fatura', ['paid_invoice'] = 'você ~g~pagou~s~ uma fatura de ~r~$%s~s~', ['received_payment'] = 'você ~g~recebeu~s~ um pagamento de ~r~$%s~s~', diff --git a/locales/de.lua b/locales/de.lua index f7bf1a0d..5c8ea45d 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,5 +1,6 @@ Locales['de'] = { ['invoices'] = 'rechnungen', + ['invoices_item'] = '$%s', ['received_invoice'] = 'you hast eine Rechnung ~r~erhlaten~s~', ['paid_invoice'] = 'du ~g~bezahlst~s~ eine Rechnung von ~r~$%s~s~', ['received_payment'] = 'du ~g~erhältst~s~ eine Zahlung von ~r~$%s~s~', diff --git a/locales/en.lua b/locales/en.lua index a2137db9..7c08b09a 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,5 +1,6 @@ Locales['en'] = { ['invoices'] = 'invoices', + ['invoices_item'] = '$%s', ['received_invoice'] = 'you have just ~r~received~s~ an invoice', ['paid_invoice'] = 'you ~g~paid~s~ an invoice of ~r~$%s~s~', ['received_payment'] = 'you ~g~received~s~ a payment of ~r~$%s~s~', diff --git a/locales/es.lua b/locales/es.lua index 17a232c9..a2c8dce9 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,5 +1,6 @@ Locales['es'] = { ['invoices'] = 'facturas', + ['invoices_item'] = '€%s', ['received_invoice'] = 'has ~r~recibido~s~ una multa', ['paid_invoice'] = 'has ~g~pagado~s~ una multa de ~r~€%s~s~', ['received_payment'] = 'has ~g~recibido~s~ un pago de ~g~€%s~s~', diff --git a/locales/fi.lua b/locales/fi.lua index f4b7820d..f91ca3ff 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,5 +1,6 @@ Locales['fi'] = { ['invoices'] = 'laskut', + ['invoices_item'] = '$%s', ['received_invoice'] = 'sinä ~r~sait~s~ laskun', ['paid_invoice'] = 'sinä ~g~maksoit~s~ laskun suuruudelta ~r~$%s~s~', ['received_payment'] = 'sinä ~g~sait~s~ maksun suuruudelta ~r~$%s~s~', diff --git a/locales/fr.lua b/locales/fr.lua index be53d3b2..9e3d201d 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,5 +1,6 @@ Locales['fr'] = { ['invoices'] = 'factures', + ['invoices_item'] = '$%s', ['received_invoice'] = 'vous avez ~r~reçu~s~ une facture', ['paid_invoice'] = 'vous avez ~g~payé~s~ une facture de ~r~$%s~s~', ['received_payment'] = 'vous avez ~g~reçu~s~ un paiement de ~g~$%s~s~', diff --git a/locales/sv.lua b/locales/sv.lua index adab3253..2bbae28d 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,5 +1,6 @@ Locales['sv'] = { ['invoices'] = 'räkningar', + ['invoices_item'] = '%s SEK', ['received_invoice'] = 'du har ~y~mottagit~s~ en räkning', ['paid_invoice'] = 'du ~y~betalade~s~ precis en räkning på ~g~%s SEK~s~', ['received_payment'] = 'du har ~y~mottagit~s~ en räkning på ~g~%s SEK~s~', diff --git a/server/main.lua b/server/main.lua index 37f4abca..ca96824a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -7,47 +7,42 @@ AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, la local _source = source local xPlayer = ESX.GetPlayerFromId(_source) local xTarget = ESX.GetPlayerFromId(playerId) + amount = ESX.Math.Round(amount) TriggerEvent('esx_addonaccount:getSharedAccount', sharedAccountName, function(account) if amount < 0 then - print('esx_billing: ' .. GetPlayerName(_source) .. ' tried sending a negative bill!') + print(('esx_billing: %s attempted to send a negative bill!'):format(xPlayer.identifier)) elseif account == nil then if xTarget ~= nil then - MySQL.Async.execute( - 'INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', - { - ['@identifier'] = xTarget.identifier, - ['@sender'] = xPlayer.identifier, - ['@target_type'] = 'player', - ['@target'] = xPlayer.identifier, - ['@label'] = label, - ['@amount'] = amount - }, - function(rowsChanged) - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_invoice')) - end - ) + MySQL.Async.execute('INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', + { + ['@identifier'] = xTarget.identifier, + ['@sender'] = xPlayer.identifier, + ['@target_type'] = 'player', + ['@target'] = xPlayer.identifier, + ['@label'] = label, + ['@amount'] = amount + }, function(rowsChanged) + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_invoice')) + end) end else if xTarget ~= nil then - MySQL.Async.execute( - 'INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', - { - ['@identifier'] = xTarget.identifier, - ['@sender'] = xPlayer.identifier, - ['@target_type'] = 'society', - ['@target'] = sharedAccountName, - ['@label'] = label, - ['@amount'] = amount - }, - function(rowsChanged) - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_invoice')) - end - ) + MySQL.Async.execute('INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', + { + ['@identifier'] = xTarget.identifier, + ['@sender'] = xPlayer.identifier, + ['@target_type'] = 'society', + ['@target'] = sharedAccountName, + ['@label'] = label, + ['@amount'] = amount + }, function(rowsChanged) + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_invoice')) + end) end end @@ -58,180 +53,156 @@ end) ESX.RegisterServerCallback('esx_billing:getBills', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) - MySQL.Async.fetchAll( - 'SELECT * FROM billing WHERE identifier = @identifier', - { - ['@identifier'] = xPlayer.identifier - }, - function(result) - - local bills = {} - - for i=1, #result, 1 do - table.insert(bills, { - id = result[i].id, - identifier = result[i].identifier, - sender = result[i].sender, - targetType = result[i].target_type, - target = result[i].target, - label = result[i].label, - amount = result[i].amount - }) - end - - cb(bills) - + MySQL.Async.fetchAll('SELECT * FROM billing WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier + }, function(result) + local bills = {} + for i=1, #result, 1 do + table.insert(bills, { + id = result[i].id, + identifier = result[i].identifier, + sender = result[i].sender, + targetType = result[i].target_type, + target = result[i].target, + label = result[i].label, + amount = result[i].amount + }) end - ) + cb(bills) + end) end) ESX.RegisterServerCallback('esx_billing:getTargetBills', function(source, cb, target) local xPlayer = ESX.GetPlayerFromId(target) - MySQL.Async.fetchAll( - 'SELECT * FROM billing WHERE identifier = @identifier', - { - ['@identifier'] = xPlayer.identifier - }, - function(result) - - local bills = {} - - for i=1, #result, 1 do - table.insert(bills, { - id = result[i].id, - identifier = result[i].identifier, - sender = result[i].sender, - targetType = result[i].target_type, - target = result[i].target, - label = result[i].label, - amount = result[i].amount - }) - end - - cb(bills) - + MySQL.Async.fetchAll('SELECT * FROM billing WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier + }, function(result) + local bills = {} + for i=1, #result, 1 do + table.insert(bills, { + id = result[i].id, + identifier = result[i].identifier, + sender = result[i].sender, + targetType = result[i].target_type, + target = result[i].target, + label = result[i].label, + amount = result[i].amount + }) end - ) + cb(bills) + end) end) ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) local xPlayer = ESX.GetPlayerFromId(source) - MySQL.Async.fetchAll( - 'SELECT * FROM billing WHERE id = @id', - { - ['@id'] = id - }, function(result) + MySQL.Async.fetchAll('SELECT * FROM billing WHERE id = @id', { + ['@id'] = id + }, function(result) - local sender = result[1].sender - local targetType = result[1].target_type - local target = result[1].target - local amount = result[1].amount + local sender = result[1].sender + local targetType = result[1].target_type + local target = result[1].target + local amount = result[1].amount - local xTarget = ESX.GetPlayerFromIdentifier(sender) + local xTarget = ESX.GetPlayerFromIdentifier(sender) - if targetType == 'player' then + if targetType == 'player' then - if xTarget ~= nil then + if xTarget ~= nil then - if xPlayer.getMoney() >= amount then + if xPlayer.getMoney() >= amount then - MySQL.Async.execute('DELETE from billing WHERE id = @id', - { - ['@id'] = id - }, function(rowsChanged) - xPlayer.removeMoney(amount) - xTarget.addMoney(amount) + MySQL.Async.execute('DELETE from billing WHERE id = @id', { + ['@id'] = id + }, function(rowsChanged) + xPlayer.removeMoney(amount) + xTarget.addMoney(amount) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', amount)) - - cb() - end) - - elseif xPlayer.getBank() >= amount then - - MySQL.Async.execute('DELETE from billing WHERE id = @id', - { - ['@id'] = id - }, function(rowsChanged) - xPlayer.removeAccountMoney('bank', amount) - xTarget.addAccountMoney('bank', amount) - - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', amount)) - - cb() - end) - - else - TriggerClientEvent('esx:showNotification', xTarget.source, _U('target_no_money')) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('no_money')) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', ESX.Math.GroupDigits(amount))) + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', ESX.Math.GroupDigits(amount))) cb() - end + end) + + elseif xPlayer.getBank() >= amount then + + MySQL.Async.execute('DELETE from billing WHERE id = @id', { + ['@id'] = id + }, function(rowsChanged) + xPlayer.removeAccountMoney('bank', amount) + xTarget.addAccountMoney('bank', amount) + + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', ESX.Math.GroupDigits(amount))) + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', ESX.Math.GroupDigits(amount))) + + cb() + end) else - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('player_not_online')) + TriggerClientEvent('esx:showNotification', xTarget.source, _U('target_no_money')) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('no_money')) + cb() end else + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('player_not_online')) + cb() + end - TriggerEvent('esx_addonaccount:getSharedAccount', target, function(account) + else - if xPlayer.getMoney() >= amount then + TriggerEvent('esx_addonaccount:getSharedAccount', target, function(account) - MySQL.Async.execute('DELETE from billing WHERE id = @id', - { - ['@id'] = id - }, function(rowsChanged) - xPlayer.removeMoney(amount) - account.addMoney(amount) + if xPlayer.getMoney() >= amount then - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) - if xTarget ~= nil then - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', amount)) - end - - cb() - end) - - elseif xPlayer.getBank() >= amount then - - MySQL.Async.execute('DELETE from billing WHERE id = @id', - { - ['@id'] = id - }, function(rowsChanged) - xPlayer.removeAccountMoney('bank', amount) - account.addMoney(amount) - - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', amount)) - if xTarget ~= nil then - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', amount)) - end - - cb() - end) - - else - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('no_money')) + MySQL.Async.execute('DELETE from billing WHERE id = @id', { + ['@id'] = id + }, function(rowsChanged) + xPlayer.removeMoney(amount) + account.addMoney(amount) + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', ESX.Math.GroupDigits(amount))) if xTarget ~= nil then - TriggerClientEvent('esx:showNotification', xTarget.source, _U('target_no_money')) + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', ESX.Math.GroupDigits(amount))) end cb() - end - end) + end) - end + elseif xPlayer.getBank() >= amount then + + MySQL.Async.execute('DELETE from billing WHERE id = @id', { + ['@id'] = id + }, function(rowsChanged) + xPlayer.removeAccountMoney('bank', amount) + account.addMoney(amount) + + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', ESX.Math.GroupDigits(amount))) + if xTarget ~= nil then + TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', ESX.Math.GroupDigits(amount))) + end + + cb() + end) + + else + TriggerClientEvent('esx:showNotification', xPlayer.source, _U('no_money')) + + if xTarget ~= nil then + TriggerClientEvent('esx:showNotification', xTarget.source, _U('target_no_money')) + end + + cb() + end + end) end - ) + end) end) \ No newline at end of file From fec3244e86f84b1e1936c47b1451b9f4c81c5576 Mon Sep 17 00:00:00 2001 From: D3v <39461646+deviljin112@users.noreply.github.com> Date: Wed, 28 Nov 2018 20:37:06 +0000 Subject: [PATCH 38/55] Polish Translation (#17) * Polish Translation * Update pl.lua quick fix * Update pl.lua quick fix --- __resource.lua | 2 ++ locales/pl.lua | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 locales/pl.lua diff --git a/__resource.lua b/__resource.lua index 5363db2f..7ed7647b 100644 --- a/__resource.lua +++ b/__resource.lua @@ -14,6 +14,7 @@ server_scripts { 'locales/fr.lua', 'locales/es.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'server/main.lua' } @@ -27,6 +28,7 @@ client_scripts { 'locales/fr.lua', 'locales/es.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..8c199e49 --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,9 @@ +Locales['pl'] = { + ['invoices'] = 'faktury', + ['received_invoice'] = 'właśnie ~r~dostałeś/aś~s~ fakture', + ['paid_invoice'] = '~g~Zapłaciłeś/aś~s~ fakture: ~r~$%s~s~', + ['received_payment'] = '~g~Otrzymałeś/aś~s~ zapłate: ~r~$%s~s~', + ['player_not_online'] = 'gracz nie jest zalogowany', + ['no_money'] = 'nie masz wystarczająco pieniędzy aby zapłacić tą fakture', + ['target_no_money'] = 'gracz ~r~nie posiada~s~ wystarczająco pieniędzy aby zapłacić tą fakture!', +} From 122510767181c649c24de857d95c7e0a9b1a12af Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 28 Nov 2018 21:39:04 +0100 Subject: [PATCH 39/55] Enforced 2 space indent on locale files --- locales/br.lua | 16 ++++++++-------- locales/de.lua | 16 ++++++++-------- locales/en.lua | 16 ++++++++-------- locales/es.lua | 16 ++++++++-------- locales/fi.lua | 16 ++++++++-------- locales/fr.lua | 16 ++++++++-------- locales/pl.lua | 15 ++++++++------- locales/sv.lua | 16 ++++++++-------- 8 files changed, 64 insertions(+), 63 deletions(-) diff --git a/locales/br.lua b/locales/br.lua index caf96470..9f93e8ea 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,10 +1,10 @@ Locales['br'] = { - ['invoices'] = 'faturas', - ['invoices_item'] = '$%s', - ['received_invoice'] = 'você ~r~recebeu~s~ uma fatura', - ['paid_invoice'] = 'você ~g~pagou~s~ uma fatura de ~r~$%s~s~', - ['received_payment'] = 'você ~g~recebeu~s~ um pagamento de ~r~$%s~s~', - ['player_not_online'] = 'o jogador não está logado', - ['no_money'] = 'you do not have enough money to pay this bill', - ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', + ['invoices'] = 'faturas', + ['invoices_item'] = '$%s', + ['received_invoice'] = 'você ~r~recebeu~s~ uma fatura', + ['paid_invoice'] = 'você ~g~pagou~s~ uma fatura de ~r~$%s~s~', + ['received_payment'] = 'você ~g~recebeu~s~ um pagamento de ~r~$%s~s~', + ['player_not_online'] = 'o jogador não está logado', + ['no_money'] = 'you do not have enough money to pay this bill', + ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', } diff --git a/locales/de.lua b/locales/de.lua index 5c8ea45d..d705bb66 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,10 +1,10 @@ Locales['de'] = { - ['invoices'] = 'rechnungen', - ['invoices_item'] = '$%s', - ['received_invoice'] = 'you hast eine Rechnung ~r~erhlaten~s~', - ['paid_invoice'] = 'du ~g~bezahlst~s~ eine Rechnung von ~r~$%s~s~', - ['received_payment'] = 'du ~g~erhältst~s~ eine Zahlung von ~r~$%s~s~', - ['player_not_online'] = 'der Spieler ist nicht online', - ['no_money'] = 'you do not have enough money to pay this bill', - ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', + ['invoices'] = 'rechnungen', + ['invoices_item'] = '$%s', + ['received_invoice'] = 'you hast eine Rechnung ~r~erhlaten~s~', + ['paid_invoice'] = 'du ~g~bezahlst~s~ eine Rechnung von ~r~$%s~s~', + ['received_payment'] = 'du ~g~erhältst~s~ eine Zahlung von ~r~$%s~s~', + ['player_not_online'] = 'der Spieler ist nicht online', + ['no_money'] = 'you do not have enough money to pay this bill', + ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', } diff --git a/locales/en.lua b/locales/en.lua index 7c08b09a..3973ba13 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,10 +1,10 @@ Locales['en'] = { - ['invoices'] = 'invoices', - ['invoices_item'] = '$%s', - ['received_invoice'] = 'you have just ~r~received~s~ an invoice', - ['paid_invoice'] = 'you ~g~paid~s~ an invoice of ~r~$%s~s~', - ['received_payment'] = 'you ~g~received~s~ a payment of ~r~$%s~s~', - ['player_not_online'] = 'the player is not logged in', - ['no_money'] = 'you do not have enough money to pay this bill', - ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', + ['invoices'] = 'invoices', + ['invoices_item'] = '$%s', + ['received_invoice'] = 'you have just ~r~received~s~ an invoice', + ['paid_invoice'] = 'you ~g~paid~s~ an invoice of ~r~$%s~s~', + ['received_payment'] = 'you ~g~received~s~ a payment of ~r~$%s~s~', + ['player_not_online'] = 'the player is not logged in', + ['no_money'] = 'you do not have enough money to pay this bill', + ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', } diff --git a/locales/es.lua b/locales/es.lua index a2c8dce9..50f1ad23 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,10 +1,10 @@ Locales['es'] = { - ['invoices'] = 'facturas', - ['invoices_item'] = '€%s', - ['received_invoice'] = 'has ~r~recibido~s~ una multa', - ['paid_invoice'] = 'has ~g~pagado~s~ una multa de ~r~€%s~s~', - ['received_payment'] = 'has ~g~recibido~s~ un pago de ~g~€%s~s~', - ['player_not_online'] = 'el jugador no está conectado', - ['no_money'] = 'you do not have enough money to pay this bill', - ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', + ['invoices'] = 'facturas', + ['invoices_item'] = '€%s', + ['received_invoice'] = 'has ~r~recibido~s~ una multa', + ['paid_invoice'] = 'has ~g~pagado~s~ una multa de ~r~€%s~s~', + ['received_payment'] = 'has ~g~recibido~s~ un pago de ~g~€%s~s~', + ['player_not_online'] = 'el jugador no está conectado', + ['no_money'] = 'you do not have enough money to pay this bill', + ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', } diff --git a/locales/fi.lua b/locales/fi.lua index f91ca3ff..a6d3cc84 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,10 +1,10 @@ Locales['fi'] = { - ['invoices'] = 'laskut', - ['invoices_item'] = '$%s', - ['received_invoice'] = 'sinä ~r~sait~s~ laskun', - ['paid_invoice'] = 'sinä ~g~maksoit~s~ laskun suuruudelta ~r~$%s~s~', - ['received_payment'] = 'sinä ~g~sait~s~ maksun suuruudelta ~r~$%s~s~', - ['player_not_online'] = 'pelaaja ei ole sisäänkirjautuneena', - ['no_money'] = 'sinulla ei ole tarpeeksi rahaa maksaaksesi tätä laskua.', - ['target_no_money'] = 'pelaajalla ~r~ei ole~w~ tarpeeksi rahaa maksaakseentätä laskua', + ['invoices'] = 'laskut', + ['invoices_item'] = '$%s', + ['received_invoice'] = 'sinä ~r~sait~s~ laskun', + ['paid_invoice'] = 'sinä ~g~maksoit~s~ laskun suuruudelta ~r~$%s~s~', + ['received_payment'] = 'sinä ~g~sait~s~ maksun suuruudelta ~r~$%s~s~', + ['player_not_online'] = 'pelaaja ei ole sisäänkirjautuneena', + ['no_money'] = 'sinulla ei ole tarpeeksi rahaa maksaaksesi tätä laskua.', + ['target_no_money'] = 'pelaajalla ~r~ei ole~w~ tarpeeksi rahaa maksaakseentätä laskua', } diff --git a/locales/fr.lua b/locales/fr.lua index 9e3d201d..a372d0e6 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,10 +1,10 @@ Locales['fr'] = { - ['invoices'] = 'factures', - ['invoices_item'] = '$%s', - ['received_invoice'] = 'vous avez ~r~reçu~s~ une facture', - ['paid_invoice'] = 'vous avez ~g~payé~s~ une facture de ~r~$%s~s~', - ['received_payment'] = 'vous avez ~g~reçu~s~ un paiement de ~g~$%s~s~', - ['player_not_online'] = 'le joueur n\'est pas connecté', - ['no_money'] = 'you do not have enough money to pay this bill', - ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', + ['invoices'] = 'factures', + ['invoices_item'] = '$%s', + ['received_invoice'] = 'vous avez ~r~reçu~s~ une facture', + ['paid_invoice'] = 'vous avez ~g~payé~s~ une facture de ~r~$%s~s~', + ['received_payment'] = 'vous avez ~g~reçu~s~ un paiement de ~g~$%s~s~', + ['player_not_online'] = 'le joueur n\'est pas connecté', + ['no_money'] = 'you do not have enough money to pay this bill', + ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', } diff --git a/locales/pl.lua b/locales/pl.lua index 8c199e49..e2cac017 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,9 +1,10 @@ Locales['pl'] = { - ['invoices'] = 'faktury', - ['received_invoice'] = 'właśnie ~r~dostałeś/aś~s~ fakture', - ['paid_invoice'] = '~g~Zapłaciłeś/aś~s~ fakture: ~r~$%s~s~', - ['received_payment'] = '~g~Otrzymałeś/aś~s~ zapłate: ~r~$%s~s~', - ['player_not_online'] = 'gracz nie jest zalogowany', - ['no_money'] = 'nie masz wystarczająco pieniędzy aby zapłacić tą fakture', - ['target_no_money'] = 'gracz ~r~nie posiada~s~ wystarczająco pieniędzy aby zapłacić tą fakture!', + ['invoices'] = 'faktury', + ['invoices_item'] = '$%s', + ['received_invoice'] = 'właśnie ~r~dostałeś/aś~s~ fakture', + ['paid_invoice'] = '~g~Zapłaciłeś/aś~s~ fakture: ~r~$%s~s~', + ['received_payment'] = '~g~Otrzymałeś/aś~s~ zapłate: ~r~$%s~s~', + ['player_not_online'] = 'gracz nie jest zalogowany', + ['no_money'] = 'nie masz wystarczająco pieniędzy aby zapłacić tą fakture', + ['target_no_money'] = 'gracz ~r~nie posiada~s~ wystarczająco pieniędzy aby zapłacić tą fakture!', } diff --git a/locales/sv.lua b/locales/sv.lua index 2bbae28d..496cc6d2 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,10 +1,10 @@ Locales['sv'] = { - ['invoices'] = 'räkningar', - ['invoices_item'] = '%s SEK', - ['received_invoice'] = 'du har ~y~mottagit~s~ en räkning', - ['paid_invoice'] = 'du ~y~betalade~s~ precis en räkning på ~g~%s SEK~s~', - ['received_payment'] = 'du har ~y~mottagit~s~ en räkning på ~g~%s SEK~s~', - ['player_not_online'] = 'personen är inte online', - ['no_money'] = 'du har ~r~inte råd~s~ för att kunna betala räkningen', - ['target_no_money'] = 'personen har ~r~inte råd~s~ för att betala räkningen', + ['invoices'] = 'räkningar', + ['invoices_item'] = '%s SEK', + ['received_invoice'] = 'du har ~y~mottagit~s~ en räkning', + ['paid_invoice'] = 'du ~y~betalade~s~ precis en räkning på ~g~%s SEK~s~', + ['received_payment'] = 'du har ~y~mottagit~s~ en räkning på ~g~%s SEK~s~', + ['player_not_online'] = 'personen är inte online', + ['no_money'] = 'du har ~r~inte råd~s~ för att kunna betala räkningen', + ['target_no_money'] = 'personen har ~r~inte råd~s~ för att betala räkningen', } From a12eec553bb6463f4b7bb4ecfaa69b7ef8ba561e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 30 Dec 2018 20:58:50 +0100 Subject: [PATCH 40/55] Check IsControlJustReleased() every frame --- client/main.lua | 2 +- locales/fi.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 68e0b34b..151bbfb7 100644 --- a/client/main.lua +++ b/client/main.lua @@ -54,7 +54,7 @@ end -- Key controls Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(0) if IsControlJustReleased(0, Keys['F7']) and not isDead and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') then ShowBillsMenu() end diff --git a/locales/fi.lua b/locales/fi.lua index a6d3cc84..6c6327a9 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -6,5 +6,5 @@ Locales['fi'] = { ['received_payment'] = 'sinä ~g~sait~s~ maksun suuruudelta ~r~$%s~s~', ['player_not_online'] = 'pelaaja ei ole sisäänkirjautuneena', ['no_money'] = 'sinulla ei ole tarpeeksi rahaa maksaaksesi tätä laskua.', - ['target_no_money'] = 'pelaajalla ~r~ei ole~w~ tarpeeksi rahaa maksaakseentätä laskua', + ['target_no_money'] = 'pelaajalla ~r~ei ole~s~ tarpeeksi rahaa maksaakseentätä laskua', } From cc5b9c1538eac25ffda0f2c21946e25eec4bff69 Mon Sep 17 00:00:00 2001 From: Tinky <48660658+Tinky124@users.noreply.github.com> Date: Mon, 6 Jan 2020 16:04:53 +0100 Subject: [PATCH 41/55] Removed local keys --- client/main.lua | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/client/main.lua b/client/main.lua index 151bbfb7..9b6fe351 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,15 +1,3 @@ -local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, - ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, - ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, - ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, - ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, - ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, - ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 -} - ESX = nil local isDead = false @@ -55,7 +43,7 @@ end Citizen.CreateThread(function() while true do Citizen.Wait(0) - if IsControlJustReleased(0, Keys['F7']) and not isDead and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') then + if IsControlJustReleased(0, 168) and not isDead and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') then ShowBillsMenu() end end From dc1ba4f1ed5f9738a6f80201b83fbe81fc06eca4 Mon Sep 17 00:00:00 2001 From: maiconkkl Date: Mon, 6 Jan 2020 22:10:59 -0300 Subject: [PATCH 42/55] Correcting and improving translation --- locales/br.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/br.lua b/locales/br.lua index 9f93e8ea..bee997ed 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -4,7 +4,7 @@ Locales['br'] = { ['received_invoice'] = 'você ~r~recebeu~s~ uma fatura', ['paid_invoice'] = 'você ~g~pagou~s~ uma fatura de ~r~$%s~s~', ['received_payment'] = 'você ~g~recebeu~s~ um pagamento de ~r~$%s~s~', - ['player_not_online'] = 'o jogador não está logado', - ['no_money'] = 'you do not have enough money to pay this bill', - ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', + ['player_not_online'] = 'o jogador não está na cidade', + ['no_money'] = 'você não tem dinheiro suficiente para pagar esta fatura', + ['target_no_money'] = 'o cidadão ~r~não tem~s~ dinheiro suficiente para pagar a conta!', } From 964a9ff1336885bcb53b08e22c72c6a87dba2b9a Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:06:38 +0100 Subject: [PATCH 43/55] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename __resource.lua => fxmanifest.lua (86%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 86% rename from __resource.lua rename to fxmanifest.lua index 7ed7647b..c0669a48 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Billing' @@ -33,4 +35,4 @@ client_scripts { 'client/main.lua' } -dependency 'es_extended' \ No newline at end of file +dependency 'es_extended' From 19a54ee7501947444964a244183261e9c8214899 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 5 Feb 2020 11:10:51 +0100 Subject: [PATCH 44/55] Minor cleanup, use RegisterKeyMapping() native, fixed not working on latest esx, closes #34 --- client/main.lua | 36 +++--- locales/br.lua | 1 + locales/de.lua | 1 + locales/en.lua | 1 + locales/es.lua | 1 + locales/fi.lua | 1 + locales/fr.lua | 1 + locales/pl.lua | 1 + locales/sv.lua | 1 + server/main.lua | 283 ++++++++++++++++++++---------------------------- 10 files changed, 138 insertions(+), 189 deletions(-) diff --git a/client/main.lua b/client/main.lua index 9b6fe351..eb624e21 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,4 +1,4 @@ -ESX = nil +ESX = nil local isDead = false Citizen.CreateThread(function() @@ -9,20 +9,18 @@ Citizen.CreateThread(function() end) function ShowBillsMenu() - ESX.TriggerServerCallback('esx_billing:getBills', function(bills) ESX.UI.Menu.CloseAll() local elements = {} - for i=1, #bills, 1 do + for k,v in ipairs(bills) do table.insert(elements, { - label = ('%s - %s'):format(bills[i].label, _U('invoices_item', ESX.Math.GroupDigits(bills[i].amount))), - billID = bills[i].id + label = ('%s - %s'):format(v.label, _U('invoices_item', ESX.Math.GroupDigits(v.amount))), + billId = v.id }) end - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'billing', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'billing', { title = _U('invoices'), align = 'bottom-right', elements = elements @@ -31,28 +29,20 @@ function ShowBillsMenu() ESX.TriggerServerCallback('esx_billing:payBill', function() ShowBillsMenu() - end, data.current.billID) + end, data.current.billId) end, function(data, menu) menu.close() end) end) - end --- Key controls -Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - if IsControlJustReleased(0, 168) and not isDead and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') then - ShowBillsMenu() - end +RegisterCommand('showbills', function() + if not isDead and not ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'billing') then + ShowBillsMenu() end -end) +end, false) -AddEventHandler('esx:onPlayerDeath', function(data) - isDead = true -end) +RegisterKeyMapping('showbills', _U('keymap_showbills'), 'keyboard', 'F7') -AddEventHandler('playerSpawned', function(spawn) - isDead = false -end) +AddEventHandler('esx:onPlayerDeath', function() isDead = true end) +AddEventHandler('playerSpawned', function(spawn) isDead = false end) diff --git a/locales/br.lua b/locales/br.lua index bee997ed..c0b129c1 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -7,4 +7,5 @@ Locales['br'] = { ['player_not_online'] = 'o jogador não está na cidade', ['no_money'] = 'você não tem dinheiro suficiente para pagar esta fatura', ['target_no_money'] = 'o cidadão ~r~não tem~s~ dinheiro suficiente para pagar a conta!', + ['keymap_showbills'] = 'open bills menu', } diff --git a/locales/de.lua b/locales/de.lua index d705bb66..3e4eaef1 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -7,4 +7,5 @@ Locales['de'] = { ['player_not_online'] = 'der Spieler ist nicht online', ['no_money'] = 'you do not have enough money to pay this bill', ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', + ['keymap_showbills'] = 'open bills menu', } diff --git a/locales/en.lua b/locales/en.lua index 3973ba13..2d03ba00 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -7,4 +7,5 @@ Locales['en'] = { ['player_not_online'] = 'the player is not logged in', ['no_money'] = 'you do not have enough money to pay this bill', ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', + ['keymap_showbills'] = 'open bills menu', } diff --git a/locales/es.lua b/locales/es.lua index 50f1ad23..10788119 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -7,4 +7,5 @@ Locales['es'] = { ['player_not_online'] = 'el jugador no está conectado', ['no_money'] = 'you do not have enough money to pay this bill', ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', + ['keymap_showbills'] = 'open bills menu', } diff --git a/locales/fi.lua b/locales/fi.lua index 6c6327a9..34a45010 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -7,4 +7,5 @@ Locales['fi'] = { ['player_not_online'] = 'pelaaja ei ole sisäänkirjautuneena', ['no_money'] = 'sinulla ei ole tarpeeksi rahaa maksaaksesi tätä laskua.', ['target_no_money'] = 'pelaajalla ~r~ei ole~s~ tarpeeksi rahaa maksaakseentätä laskua', + ['keymap_showbills'] = 'open bills menu', } diff --git a/locales/fr.lua b/locales/fr.lua index a372d0e6..d8e23916 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -7,4 +7,5 @@ Locales['fr'] = { ['player_not_online'] = 'le joueur n\'est pas connecté', ['no_money'] = 'you do not have enough money to pay this bill', ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', + ['keymap_showbills'] = 'open bills menu', } diff --git a/locales/pl.lua b/locales/pl.lua index e2cac017..59cebbff 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -7,4 +7,5 @@ Locales['pl'] = { ['player_not_online'] = 'gracz nie jest zalogowany', ['no_money'] = 'nie masz wystarczająco pieniędzy aby zapłacić tą fakture', ['target_no_money'] = 'gracz ~r~nie posiada~s~ wystarczająco pieniędzy aby zapłacić tą fakture!', + ['keymap_showbills'] = 'open bills menu', } diff --git a/locales/sv.lua b/locales/sv.lua index 496cc6d2..600246c0 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -7,4 +7,5 @@ Locales['sv'] = { ['player_not_online'] = 'personen är inte online', ['no_money'] = 'du har ~r~inte råd~s~ för att kunna betala räkningen', ['target_no_money'] = 'personen har ~r~inte råd~s~ för att betala räkningen', + ['keymap_showbills'] = 'open bills menu', } diff --git a/server/main.lua b/server/main.lua index ca96824a..c4e71ad5 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,205 +4,156 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_billing:sendBill') AddEventHandler('esx_billing:sendBill', function(playerId, sharedAccountName, label, amount) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) local xTarget = ESX.GetPlayerFromId(playerId) - amount = ESX.Math.Round(amount) + amount = ESX.Math.Round(amount) - TriggerEvent('esx_addonaccount:getSharedAccount', sharedAccountName, function(account) - - if amount < 0 then - print(('esx_billing: %s attempted to send a negative bill!'):format(xPlayer.identifier)) - elseif account == nil then - - if xTarget ~= nil then - MySQL.Async.execute('INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', - { - ['@identifier'] = xTarget.identifier, - ['@sender'] = xPlayer.identifier, - ['@target_type'] = 'player', - ['@target'] = xPlayer.identifier, - ['@label'] = label, - ['@amount'] = amount - }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_invoice')) - end) - end - - else - - if xTarget ~= nil then - MySQL.Async.execute('INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', - { - ['@identifier'] = xTarget.identifier, - ['@sender'] = xPlayer.identifier, + if amount > 0 and xTarget then + TriggerEvent('esx_addonaccount:getSharedAccount', sharedAccountName, function(account) + if account then + MySQL.Async.execute('INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', { + ['@identifier'] = xTarget.identifier, + ['@sender'] = xPlayer.identifier, ['@target_type'] = 'society', - ['@target'] = sharedAccountName, - ['@label'] = label, - ['@amount'] = amount + ['@target'] = sharedAccountName, + ['@label'] = label, + ['@amount'] = amount }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_invoice')) + xTarget.showNotification(_U('received_invoice')) + end) + else + MySQL.Async.execute('INSERT INTO billing (identifier, sender, target_type, target, label, amount) VALUES (@identifier, @sender, @target_type, @target, @label, @amount)', { + ['@identifier'] = xTarget.identifier, + ['@sender'] = xPlayer.identifier, + ['@target_type'] = 'player', + ['@target'] = xPlayer.identifier, + ['@label'] = label, + ['@amount'] = amount + }, function(rowsChanged) + xTarget.showNotification(_U('received_invoice')) end) end - - end - end) - + end) + end end) ESX.RegisterServerCallback('esx_billing:getBills', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) - MySQL.Async.fetchAll('SELECT * FROM billing WHERE identifier = @identifier', { + MySQL.Async.fetchAll('SELECT amount, id, label FROM billing WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier }, function(result) - local bills = {} - for i=1, #result, 1 do - table.insert(bills, { - id = result[i].id, - identifier = result[i].identifier, - sender = result[i].sender, - targetType = result[i].target_type, - target = result[i].target, - label = result[i].label, - amount = result[i].amount - }) - end - - cb(bills) + cb(result) end) end) ESX.RegisterServerCallback('esx_billing:getTargetBills', function(source, cb, target) local xPlayer = ESX.GetPlayerFromId(target) - MySQL.Async.fetchAll('SELECT * FROM billing WHERE identifier = @identifier', { - ['@identifier'] = xPlayer.identifier - }, function(result) - local bills = {} - for i=1, #result, 1 do - table.insert(bills, { - id = result[i].id, - identifier = result[i].identifier, - sender = result[i].sender, - targetType = result[i].target_type, - target = result[i].target, - label = result[i].label, - amount = result[i].amount - }) - end - - cb(bills) - end) + if xPlayer then + MySQL.Async.fetchAll('SELECT amount, id, label FROM billing WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier + }, function(result) + cb(result) + end) + else + cb({}) + end end) - -ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, id) +ESX.RegisterServerCallback('esx_billing:payBill', function(source, cb, billId) local xPlayer = ESX.GetPlayerFromId(source) - MySQL.Async.fetchAll('SELECT * FROM billing WHERE id = @id', { - ['@id'] = id + MySQL.Async.fetchAll('SELECT sender, target_type, target, amount FROM billing WHERE id = @id', { + ['@id'] = billId }, function(result) + if result[1] then + local amount = result[1].amount + local xTarget = ESX.GetPlayerFromIdentifier(result[1].sender) - local sender = result[1].sender - local targetType = result[1].target_type - local target = result[1].target - local amount = result[1].amount + if result[1].target_type == 'player' then + if xTarget then + if xPlayer.getMoney() >= amount then + MySQL.Async.execute('DELETE FROM billing WHERE id = @id', { + ['@id'] = billId + }, function(rowsChanged) + if rowsChanged == 1 then + xPlayer.removeMoney(amount) + xTarget.addMoney(amount) - local xTarget = ESX.GetPlayerFromIdentifier(sender) + xPlayer.showNotification(_U('paid_invoice', ESX.Math.GroupDigits(amount))) + xTarget.showNotification(_U('received_payment', ESX.Math.GroupDigits(amount))) + end - if targetType == 'player' then + cb() + end) + elseif xPlayer.getAccount('bank').money >= amount then + MySQL.Async.execute('DELETE FROM billing WHERE id = @id', { + ['@id'] = billId + }, function(rowsChanged) + if rowsChanged == 1 then + xPlayer.removeAccountMoney('bank', amount) + xTarget.addAccountMoney('bank', amount) - if xTarget ~= nil then - - if xPlayer.getMoney() >= amount then - - MySQL.Async.execute('DELETE from billing WHERE id = @id', { - ['@id'] = id - }, function(rowsChanged) - xPlayer.removeMoney(amount) - xTarget.addMoney(amount) - - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', ESX.Math.GroupDigits(amount))) - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', ESX.Math.GroupDigits(amount))) + xPlayer.showNotification(_U('paid_invoice', ESX.Math.GroupDigits(amount))) + xTarget.showNotification(_U('received_payment', ESX.Math.GroupDigits(amount))) + end + cb() + end) + else + xTarget.showNotification(_U('target_no_money')) + xPlayer.showNotification(_U('no_money')) cb() - end) - - elseif xPlayer.getBank() >= amount then - - MySQL.Async.execute('DELETE from billing WHERE id = @id', { - ['@id'] = id - }, function(rowsChanged) - xPlayer.removeAccountMoney('bank', amount) - xTarget.addAccountMoney('bank', amount) - - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', ESX.Math.GroupDigits(amount))) - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', ESX.Math.GroupDigits(amount))) - - cb() - end) - - else - TriggerClientEvent('esx:showNotification', xTarget.source, _U('target_no_money')) - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('no_money')) - - cb() - end - - else - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('player_not_online')) - cb() - end - - else - - TriggerEvent('esx_addonaccount:getSharedAccount', target, function(account) - - if xPlayer.getMoney() >= amount then - - MySQL.Async.execute('DELETE from billing WHERE id = @id', { - ['@id'] = id - }, function(rowsChanged) - xPlayer.removeMoney(amount) - account.addMoney(amount) - - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', ESX.Math.GroupDigits(amount))) - if xTarget ~= nil then - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', ESX.Math.GroupDigits(amount))) - end - - cb() - end) - - elseif xPlayer.getBank() >= amount then - - MySQL.Async.execute('DELETE from billing WHERE id = @id', { - ['@id'] = id - }, function(rowsChanged) - xPlayer.removeAccountMoney('bank', amount) - account.addMoney(amount) - - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('paid_invoice', ESX.Math.GroupDigits(amount))) - if xTarget ~= nil then - TriggerClientEvent('esx:showNotification', xTarget.source, _U('received_payment', ESX.Math.GroupDigits(amount))) - end - - cb() - end) - - else - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('no_money')) - - if xTarget ~= nil then - TriggerClientEvent('esx:showNotification', xTarget.source, _U('target_no_money')) end - + else + xPlayer.showNotification(_U('player_not_online')) cb() end - end) + else + TriggerEvent('esx_addonaccount:getSharedAccount', result[1].target, function(account) + if xPlayer.getMoney() >= amount then + MySQL.Async.execute('DELETE FROM billing WHERE id = @id', { + ['@id'] = billId + }, function(rowsChanged) + if rowsChanged == 1 then + xPlayer.removeMoney(amount) + account.addMoney(amount) + xPlayer.showNotification(_U('paid_invoice', ESX.Math.GroupDigits(amount))) + if xTarget then + xTarget.showNotification(_U('received_payment', ESX.Math.GroupDigits(amount))) + end + end + + cb() + end) + elseif xPlayer.getAccount('bank').money >= amount then + MySQL.Async.execute('DELETE FROM billing WHERE id = @id', { + ['@id'] = billId + }, function(rowsChanged) + if rowsChanged == 1 then + xPlayer.removeAccountMoney('bank', amount) + account.addMoney(amount) + xPlayer.showNotification(_U('paid_invoice', ESX.Math.GroupDigits(amount))) + + if xTarget then + xTarget.showNotification(_U('received_payment', ESX.Math.GroupDigits(amount))) + end + end + + cb() + end) + else + if xTarget then + xTarget.showNotification(_U('target_no_money')) + end + + xPlayer.showNotification(_U('no_money')) + cb() + end + end) + end end - end) -end) \ No newline at end of file +end) From 146328ddea5fc8e96a39c8eee2cff9ee4800e9de Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 5 Feb 2020 11:16:02 +0100 Subject: [PATCH 45/55] Implemented only show menu if bills available, closes #25 --- client/main.lua | 46 +++++++++++++++++++++++++--------------------- locales/br.lua | 1 + locales/de.lua | 1 + locales/en.lua | 1 + locales/es.lua | 1 + locales/fi.lua | 1 + locales/fr.lua | 1 + locales/pl.lua | 1 + locales/sv.lua | 9 +++++---- 9 files changed, 37 insertions(+), 25 deletions(-) diff --git a/client/main.lua b/client/main.lua index eb624e21..f9a8e4df 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,29 +10,33 @@ end) function ShowBillsMenu() ESX.TriggerServerCallback('esx_billing:getBills', function(bills) - ESX.UI.Menu.CloseAll() - local elements = {} + if #bills > 0 then + ESX.UI.Menu.CloseAll() + local elements = {} - for k,v in ipairs(bills) do - table.insert(elements, { - label = ('%s - %s'):format(v.label, _U('invoices_item', ESX.Math.GroupDigits(v.amount))), - billId = v.id - }) + for k,v in ipairs(bills) do + table.insert(elements, { + label = ('%s - %s'):format(v.label, _U('invoices_item', ESX.Math.GroupDigits(v.amount))), + billId = v.id + }) + end + + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'billing', { + title = _U('invoices'), + align = 'bottom-right', + elements = elements + }, function(data, menu) + menu.close() + + ESX.TriggerServerCallback('esx_billing:payBill', function() + ShowBillsMenu() + end, data.current.billId) + end, function(data, menu) + menu.close() + end) + else + ESX.ShowNotification(_U('no_invoices')) end - - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'billing', { - title = _U('invoices'), - align = 'bottom-right', - elements = elements - }, function(data, menu) - menu.close() - - ESX.TriggerServerCallback('esx_billing:payBill', function() - ShowBillsMenu() - end, data.current.billId) - end, function(data, menu) - menu.close() - end) end) end diff --git a/locales/br.lua b/locales/br.lua index c0b129c1..01825293 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -3,6 +3,7 @@ Locales['br'] = { ['invoices_item'] = '$%s', ['received_invoice'] = 'você ~r~recebeu~s~ uma fatura', ['paid_invoice'] = 'você ~g~pagou~s~ uma fatura de ~r~$%s~s~', + ['no_invoices'] = 'you do not have any bills to pay at this moment', ['received_payment'] = 'você ~g~recebeu~s~ um pagamento de ~r~$%s~s~', ['player_not_online'] = 'o jogador não está na cidade', ['no_money'] = 'você não tem dinheiro suficiente para pagar esta fatura', diff --git a/locales/de.lua b/locales/de.lua index 3e4eaef1..80991e28 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -3,6 +3,7 @@ Locales['de'] = { ['invoices_item'] = '$%s', ['received_invoice'] = 'you hast eine Rechnung ~r~erhlaten~s~', ['paid_invoice'] = 'du ~g~bezahlst~s~ eine Rechnung von ~r~$%s~s~', + ['no_invoices'] = 'you do not have any bills to pay at this moment', ['received_payment'] = 'du ~g~erhältst~s~ eine Zahlung von ~r~$%s~s~', ['player_not_online'] = 'der Spieler ist nicht online', ['no_money'] = 'you do not have enough money to pay this bill', diff --git a/locales/en.lua b/locales/en.lua index 2d03ba00..07f47970 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -3,6 +3,7 @@ Locales['en'] = { ['invoices_item'] = '$%s', ['received_invoice'] = 'you have just ~r~received~s~ an invoice', ['paid_invoice'] = 'you ~g~paid~s~ an invoice of ~r~$%s~s~', + ['no_invoices'] = 'you do not have any bills to pay at this moment', ['received_payment'] = 'you ~g~received~s~ a payment of ~r~$%s~s~', ['player_not_online'] = 'the player is not logged in', ['no_money'] = 'you do not have enough money to pay this bill', diff --git a/locales/es.lua b/locales/es.lua index 10788119..8351147b 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -3,6 +3,7 @@ Locales['es'] = { ['invoices_item'] = '€%s', ['received_invoice'] = 'has ~r~recibido~s~ una multa', ['paid_invoice'] = 'has ~g~pagado~s~ una multa de ~r~€%s~s~', + ['no_invoices'] = 'you do not have any bills to pay at this moment', ['received_payment'] = 'has ~g~recibido~s~ un pago de ~g~€%s~s~', ['player_not_online'] = 'el jugador no está conectado', ['no_money'] = 'you do not have enough money to pay this bill', diff --git a/locales/fi.lua b/locales/fi.lua index 34a45010..4303012d 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -3,6 +3,7 @@ Locales['fi'] = { ['invoices_item'] = '$%s', ['received_invoice'] = 'sinä ~r~sait~s~ laskun', ['paid_invoice'] = 'sinä ~g~maksoit~s~ laskun suuruudelta ~r~$%s~s~', + ['no_invoices'] = 'you do not have any bills to pay at this moment', ['received_payment'] = 'sinä ~g~sait~s~ maksun suuruudelta ~r~$%s~s~', ['player_not_online'] = 'pelaaja ei ole sisäänkirjautuneena', ['no_money'] = 'sinulla ei ole tarpeeksi rahaa maksaaksesi tätä laskua.', diff --git a/locales/fr.lua b/locales/fr.lua index d8e23916..1fbac84d 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -3,6 +3,7 @@ Locales['fr'] = { ['invoices_item'] = '$%s', ['received_invoice'] = 'vous avez ~r~reçu~s~ une facture', ['paid_invoice'] = 'vous avez ~g~payé~s~ une facture de ~r~$%s~s~', + ['no_invoices'] = 'you do not have any bills to pay at this moment', ['received_payment'] = 'vous avez ~g~reçu~s~ un paiement de ~g~$%s~s~', ['player_not_online'] = 'le joueur n\'est pas connecté', ['no_money'] = 'you do not have enough money to pay this bill', diff --git a/locales/pl.lua b/locales/pl.lua index 59cebbff..1275092f 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -3,6 +3,7 @@ Locales['pl'] = { ['invoices_item'] = '$%s', ['received_invoice'] = 'właśnie ~r~dostałeś/aś~s~ fakture', ['paid_invoice'] = '~g~Zapłaciłeś/aś~s~ fakture: ~r~$%s~s~', + ['no_invoices'] = 'you do not have any bills to pay at this moment', ['received_payment'] = '~g~Otrzymałeś/aś~s~ zapłate: ~r~$%s~s~', ['player_not_online'] = 'gracz nie jest zalogowany', ['no_money'] = 'nie masz wystarczająco pieniędzy aby zapłacić tą fakture', diff --git a/locales/sv.lua b/locales/sv.lua index 600246c0..44eb3466 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -3,9 +3,10 @@ Locales['sv'] = { ['invoices_item'] = '%s SEK', ['received_invoice'] = 'du har ~y~mottagit~s~ en räkning', ['paid_invoice'] = 'du ~y~betalade~s~ precis en räkning på ~g~%s SEK~s~', + ['no_invoices'] = 'du har inga inkommande räkningar', ['received_payment'] = 'du har ~y~mottagit~s~ en räkning på ~g~%s SEK~s~', - ['player_not_online'] = 'personen är inte online', - ['no_money'] = 'du har ~r~inte råd~s~ för att kunna betala räkningen', - ['target_no_money'] = 'personen har ~r~inte råd~s~ för att betala räkningen', - ['keymap_showbills'] = 'open bills menu', + ['player_not_online'] = 'spelaren är inte online', + ['no_money'] = 'du har ~r~inte råd~s~ för att betala räkningen', + ['target_no_money'] = 'spelaren har ~r~inte råd~s~ för att betala räkningen', + ['keymap_showbills'] = 'öppna menyn för räkningar', } From b221c33800ca6606e33522d1edfb351da7f0e44c Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 5 Feb 2020 11:21:12 +0100 Subject: [PATCH 46/55] Final commit v1.2.0 --- README.md | 6 +++++- fxmanifest.lua | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c4f408ee..2fcfd7ae 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # esx_billing +This resource for ESX adds possibility for different jobs to send bills to players, for example making police units able to give people fines. It comes with a menu for paying bills, to open the menu the default keybind is `F7`. + +There is a developer server event available in order to register bills in the database, see default resources for examples. + ## Download & Installation ### Using [fvm](https://github.com/qlaffont/fvm-installer) @@ -44,7 +48,7 @@ end ### License esx_billing - billing for ESX -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2020 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/fxmanifest.lua b/fxmanifest.lua index c0669a48..dacdfe59 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -4,7 +4,7 @@ game 'gta5' description 'ESX Billing' -version '1.1.0' +version '1.2.0' server_scripts { '@mysql-async/lib/MySQL.lua', From 0b2754a8e221d3ca7d38a120dc7d54af5bd58c74 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Wed, 5 Feb 2020 23:29:57 +0100 Subject: [PATCH 47/55] Added czech locale (#36) Added Czech locale --- fxmanifest.lua | 2 ++ locales/cs.lua | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 locales/cs.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index dacdfe59..b3db998e 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -17,6 +17,7 @@ server_scripts { 'locales/es.lua', 'locales/sv.lua', 'locales/pl.lua', + 'locales/cs.lua', 'config.lua', 'server/main.lua' } @@ -31,6 +32,7 @@ client_scripts { 'locales/es.lua', 'locales/sv.lua', 'locales/pl.lua', + 'locales/cs.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/cs.lua b/locales/cs.lua new file mode 100644 index 00000000..1f365d83 --- /dev/null +++ b/locales/cs.lua @@ -0,0 +1,12 @@ +Locales['cs'] = { + ['invoices'] = 'faktury', + ['invoices_item'] = '$%s', + ['received_invoice'] = 'právě jsi ~r~obdrzel~s~ fakturu', + ['paid_invoice'] = '~g~zaplatil jsi~s~ fakturu za ~r~$%s~s~', + ['no_invoices'] = 'momentalne nemas zadnou fatkuru k zaplaceni', + ['received_payment'] = '~g~obdržel jsi~s~ platbu za ~r~$%s~s~', + ['player_not_online'] = 'hráč není přihlášen', + ['no_money'] = 'nemáš dostatek peněz na zaplacení této faktury', + ['target_no_money'] = 'hráč ~r~nemá~s~ dostatek peněz na zaplacení faktury!', + ['keymap_showbills'] = 'otevrit menu faktur', +} From 0bb08e6f3ef054d989140f289d15fe6cf47ec2e8 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 17 Feb 2020 23:26:20 +0100 Subject: [PATCH 48/55] Update esx_billing.sql --- esx_billing.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/esx_billing.sql b/esx_billing.sql index a418175c..b57c4838 100644 --- a/esx_billing.sql +++ b/esx_billing.sql @@ -2,10 +2,10 @@ USE `essentialmode`; CREATE TABLE `billing` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `identifier` varchar(255) NOT NULL, - `sender` varchar(255) NOT NULL, + `identifier` varchar(40) NOT NULL, + `sender` varchar(40) NOT NULL, `target_type` varchar(50) NOT NULL, - `target` varchar(255) NOT NULL, + `target` varchar(40) NOT NULL, `label` varchar(255) NOT NULL, `amount` int(11) NOT NULL, From 58e5fe5a9f47f859c337f6da51e08149e6e09b57 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:48:36 +0200 Subject: [PATCH 49/55] Latest ESX code --- client/main.lua | 2 +- esx_billing.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index f9a8e4df..9a033169 100644 --- a/client/main.lua +++ b/client/main.lua @@ -49,4 +49,4 @@ end, false) RegisterKeyMapping('showbills', _U('keymap_showbills'), 'keyboard', 'F7') AddEventHandler('esx:onPlayerDeath', function() isDead = true end) -AddEventHandler('playerSpawned', function(spawn) isDead = false end) +AddEventHandler('esx:onPlayerSpawn', function(spawn) isDead = false end) diff --git a/esx_billing.sql b/esx_billing.sql index b57c4838..d5dec7a2 100644 --- a/esx_billing.sql +++ b/esx_billing.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; CREATE TABLE `billing` ( `id` int(11) NOT NULL AUTO_INCREMENT, From 37e78cbe97d21d8c6ed378db176839e0d46ddbb6 Mon Sep 17 00:00:00 2001 From: shortybsd Date: Sat, 16 May 2020 22:25:49 -0500 Subject: [PATCH 50/55] Update esx_billing.sql int - Integer display width is deprecated and will be removed in a future release. --- esx_billing.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esx_billing.sql b/esx_billing.sql index d5dec7a2..1f310804 100644 --- a/esx_billing.sql +++ b/esx_billing.sql @@ -1,13 +1,13 @@ USE `es_extended`; CREATE TABLE `billing` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` int NOT NULL AUTO_INCREMENT, `identifier` varchar(40) NOT NULL, `sender` varchar(40) NOT NULL, `target_type` varchar(50) NOT NULL, `target` varchar(40) NOT NULL, `label` varchar(255) NOT NULL, - `amount` int(11) NOT NULL, + `amount` int NOT NULL, PRIMARY KEY (`id`) ); From 13f62f28dc32760261ff45ca65a0f95ef7a66533 Mon Sep 17 00:00:00 2001 From: Kevin O'Byrne <62954271+TehZombiJesus@users.noreply.github.com> Date: Fri, 3 Jul 2020 13:01:41 -0400 Subject: [PATCH 51/55] Update fr.lua (#38) --- locales/fr.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locales/fr.lua b/locales/fr.lua index 1fbac84d..f8c4ecbb 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -3,10 +3,10 @@ Locales['fr'] = { ['invoices_item'] = '$%s', ['received_invoice'] = 'vous avez ~r~reçu~s~ une facture', ['paid_invoice'] = 'vous avez ~g~payé~s~ une facture de ~r~$%s~s~', - ['no_invoices'] = 'you do not have any bills to pay at this moment', + ['no_invoices'] = 'vous n\'avez aucune facture à payer en ce moment', ['received_payment'] = 'vous avez ~g~reçu~s~ un paiement de ~g~$%s~s~', ['player_not_online'] = 'le joueur n\'est pas connecté', - ['no_money'] = 'you do not have enough money to pay this bill', - ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', - ['keymap_showbills'] = 'open bills menu', + ['no_money'] = 'vous n\'avez pas assez d\'argent pour payer cette facture', + ['target_no_money'] = 'le joueur ~r~n\'a pas~s~ assez d\'argent pour payer la facture!', + ['keymap_showbills'] = 'ouvrir le menu des factures', } From e0b1ff661df5b2dcb21521cc18287ff285334ad5 Mon Sep 17 00:00:00 2001 From: Jougito - Kheros Date: Sun, 19 Jul 2020 12:55:26 +0200 Subject: [PATCH 52/55] Finished Spanish translation (#44) --- locales/es.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/locales/es.lua b/locales/es.lua index 8351147b..3e7c28d4 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,12 +1,12 @@ Locales['es'] = { - ['invoices'] = 'facturas', - ['invoices_item'] = '€%s', - ['received_invoice'] = 'has ~r~recibido~s~ una multa', - ['paid_invoice'] = 'has ~g~pagado~s~ una multa de ~r~€%s~s~', - ['no_invoices'] = 'you do not have any bills to pay at this moment', - ['received_payment'] = 'has ~g~recibido~s~ un pago de ~g~€%s~s~', - ['player_not_online'] = 'el jugador no está conectado', - ['no_money'] = 'you do not have enough money to pay this bill', - ['target_no_money'] = 'the player ~r~does not~s~ have enough money to pay the bill!', - ['keymap_showbills'] = 'open bills menu', + ['invoices'] = 'Facturas', + ['invoices_item'] = '%s$', + ['received_invoice'] = 'Has ~r~recibido~s~ una multa', + ['paid_invoice'] = 'Has ~g~pagado~s~ una multa de ~r~%s$~s~', + ['no_invoices'] = 'No tienes ninguna factura para pagar en este momento', + ['received_payment'] = 'Has ~g~recibido~s~ un pago de ~g~%s$~s~', + ['player_not_online'] = 'El jugador no está conectado', + ['no_money'] = 'No tienes suficiente dinero para pagar la factura', + ['target_no_money'] = '¡El jugador ~r~no tiene~s~ suficiente dinero para pagar la factura!', + ['keymap_showbills'] = 'Abrir menú de facturas', } From 23027ee95a994e80730b5a18a64f9e36666289c1 Mon Sep 17 00:00:00 2001 From: HypeLevels <61633775+HypeLevels@users.noreply.github.com> Date: Sat, 28 Nov 2020 22:26:18 +0000 Subject: [PATCH 53/55] Update config.lua Changed the default language to be English it is the universal language. --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 56a8b5e9..5290495d 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,2 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'en' From 6aa63aac6dcf245167a51d95e02fa3566d40d598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=BCrkay=20Tanr=C4=B1kulu?= Date: Sun, 20 Dec 2020 07:04:01 +0300 Subject: [PATCH 54/55] Turkish translation implemented --- fxmanifest.lua | 2 ++ locales/tr.lua | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 locales/tr.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index b3db998e..3f5bd13f 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -18,6 +18,7 @@ server_scripts { 'locales/sv.lua', 'locales/pl.lua', 'locales/cs.lua', + 'locales/tr.lua', 'config.lua', 'server/main.lua' } @@ -33,6 +34,7 @@ client_scripts { 'locales/sv.lua', 'locales/pl.lua', 'locales/cs.lua', + 'locales/tr.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/tr.lua b/locales/tr.lua new file mode 100644 index 00000000..3283dd89 --- /dev/null +++ b/locales/tr.lua @@ -0,0 +1,12 @@ +Locales['tr'] = { + ['invoices'] = 'faturalar', + ['invoices_item'] = '%s TL', + ['received_invoice'] = '~r~Yeni~s~ bir fatura aldınız', + ['paid_invoice'] = '~r~%s~s~ Liralık faturanız ödendi', + ['no_invoices'] = 'şuan ödenmeyi bekleyen bir faturanız yok', + ['received_payment'] = 'faturadan ~r~%s~s~ Liralık para kazandınız', + ['player_not_online'] = 'oyuncu aktif değil', + ['no_money'] = 'bu faturayi odemek icin yeterli paran yok', + ['target_no_money'] = 'oyuncunun faturayı ödeyecek miktarda parası yok', + ['keymap_showbills'] = 'faturalar menüsünü aç', + } From 760e5a14bed555171ffe063efb738afb9b4209a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=BCrkay=20Tanr=C4=B1kulu?= Date: Sun, 20 Dec 2020 07:04:55 +0300 Subject: [PATCH 55/55] update tr.lua --- locales/tr.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/tr.lua b/locales/tr.lua index 3283dd89..f2b93e03 100644 --- a/locales/tr.lua +++ b/locales/tr.lua @@ -9,4 +9,4 @@ Locales['tr'] = { ['no_money'] = 'bu faturayi odemek icin yeterli paran yok', ['target_no_money'] = 'oyuncunun faturayı ödeyecek miktarda parası yok', ['keymap_showbills'] = 'faturalar menüsünü aç', - } +}