Merge pull request #44 from Gellipapa/main

✏️ Change label to name, fix nil value in menu
esx-framework · Sep 21, 2024 · ddf9549 · ddf9549
2 parents 5b29feb + 6ea41f8
commit ddf9549
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/client/main.lua b/client/main.lua
@@ -81,7 +81,7 @@ function ReturnVehicleProvider()
 
 		for k, v in ipairs(vehicles) do
 			local returnPrice = ESX.Math.Round(v.price * 0.75)
-			local vehicleLabel = getVehicleFromModel(v.vehicle).label
+			local vehicleLabel = getVehicleFromModel(v.vehicle).name
 
 			table.insert(elements, {
 				label = ('%s [<span style="color:orange;">%s</span>]'):format(vehicleLabel, TranslateCap('generic_shopitem', ESX.Math.GroupDigits(returnPrice))),
@@ -417,7 +417,7 @@ function OpenPopVehicleMenu()
 		local elements = {}
 
 		for k,v in ipairs(vehicles) do
-			local vehicleLabel = getVehicleFromModel(v.vehicle).label
+			local vehicleLabel = getVehicleFromModel(v.vehicle).name
 
 			table.insert(elements, {
 				label = ('%s [<span style="color:green;">%s</span>]'):format(vehicleLabel, TranslateCap('generic_shopitem', ESX.Math.GroupDigits(v.price))),
@@ -454,7 +454,7 @@ function OpenRentedVehiclesMenu()
 		local elements = {}
 
 		for k,v in ipairs(vehicles) do
-			local vehicleLabel = getVehicleFromModel(v.name).label
+			local vehicleLabel = getVehicleFromModel(v.name).name
 
 			table.insert(elements, {
 				label = ('%s: %s - <span style="color:orange;">%s</span>'):format(v.playerName, vehicleLabel, v.plate),

diff --git a/server/main.lua b/server/main.lua
@@ -225,7 +225,7 @@ AddEventHandler('esx_vehicleshop:returnProvider', function(vehicleModel)
 			end
 			TriggerEvent('esx_addonaccount:getSharedAccount', 'society_cardealer', function(account)
 				local price = ESX.Math.Round(result.price * 0.75)
-				local vehicleLabel = getVehicleFromModel(vehicleModel).label
+				local vehicleLabel = getVehicleFromModel(vehicleModel).name
 
 				account.addMoney(price)
 				xPlayer.showNotification(TranslateCap('vehicle_sold_for', vehicleLabel, ESX.Math.GroupDigits(price)))