some other stuff

yum

modules/input/_oxlib.lua

@@ -0,0 +1,55 @@
+if GetResourceState('ox_lib') ~= 'started' or (BridgeClientConfig.InputSystem ~= "ox" and BridgeClientConfig.InputSystem ~= "auto") then return end
+
+
+
+function QBTypeToOxType(_type)
+    if _type == "text" then
+        return "input"
+    elseif _type == "password" then
+        return "input"
+    elseif _type == "number" then
+        return "number"
+    elseif _type == "radio" then
+        return "checkbox"
+    elseif _type == "checkbox" then
+        return "checkbox"
+    elseif _type == "select" then
+        return "select"
+    end
+end
+
+
+function QBToOxInput(data)
+    local returnData = {}
+    for i, v in pairs(data) do
+        local input = {
+            label = v.text,
+            name = i,
+            type = QBTypeToOxType(v.type),
+            required = v.isRequired,
+            default = v.placeholder,
+        }
+        if v.type == "select" then
+            input.options = {}
+            for i, v in pairs(v.options) do
+                table.insert(input.options, {value = v.value, label = v.text})
+            end
+        elseif v.type == "checkbox" then
+            for i, v in pairs(v.options) do
+                table.insert(returnData, {value = v.value, label = v.text})
+            end
+        end
+        table.insert(returnData, input)
+    end
+    return returnData
+end
+
+
+function OpenInput(title, data, isQBFormat, submitText)
+    local inputs = data.inputs
+    if isQBFormat then
+        return lib.inputDialog(title, QBToOxInput(inputs))
+    else
+        return lib.inputDialog(title, data)
+    end
+end

modules/input/_qb-input.lua

@@ -0,0 +1,69 @@
+
+if GetResourceState('qb-input') ~= 'started' or (BridgeClientConfig.InputSystem ~= "qb" and BridgeClientConfig.InputSystem ~= "auto") then return end
+
+
+-- ox to Qb
+function OxTypeToQBType(_type)
+    if _type == "input" then
+        return "text"
+    elseif _type == "number" then
+        return "number"
+    elseif _type == "checkbox" then
+        return "checkbox"
+    elseif _type == "select" then
+        return "select"
+    elseif _type == "multi-select" then
+        return "select"
+    elseif _type == "slider" then
+        return "number"
+    elseif _type == "color" then
+        return "text"
+    elseif _type == "date" then
+        return "date"
+    elseif _type == "date-range" then
+        return "date"
+    elseif _type == "time" then
+        return "time"
+    elseif _type == "textarea" then
+        return "text"
+    end
+end
+
+function OxToQBInput(data)
+    local returnData = {}
+    for i, v in pairs(data) do
+        local input = {
+            text = v.label,
+            name = i,
+            type = OxTypeToQBType(v.type),
+            isRequired = v.required,
+            placeholder = v.default,
+        }
+        if v.type == "select" then
+            input.text = ""
+            input.options = {
+                {value = v.value, text = v.label}
+            }
+        elseif v.type == "checkbox" then
+            input.text = ""
+            input.options = {
+                {value = v.value, text = v.label}
+            }
+        end
+        table.insert(returnData, input)
+    end
+    return returnData
+end
+
+function OpenInput(title, data, isQBFormat, submitText)
+    print("Opening input", json.encode(data))
+    local input = data.inputs
+    if not isQBFormat then
+        input = OxToQBInput(data)
+    end
+    return exports['qb-input']:ShowInput({
+        header = title,
+        submitText = submitText or "Submit",
+        inputs = input
+    })    
+end

modules/input/client.lua

@@ -79,104 +79,13 @@ if GetResourceState('ox_lib') ~= 'started' and GetResourceState('qb-menu') ~= 's
 Input = {}
 
 
--- ox to Qb
-function OxTypeToQBType(_type)
-    if _type == "input" then
-        return "text"
-    elseif _type == "number" then
-        return "number"
-    elseif _type == "checkbox" then
-        return "checkbox"
-    elseif _type == "select" then
-        return "select"
-    elseif _type == "multi-select" then
-        return "select"
-    elseif _type == "slider" then
-        return "number"
-    elseif _type == "color" then
-        return "text"
-    elseif _type == "date" then
-        return "date"
-    elseif _type == "date-range" then
-        return "date"
-    elseif _type == "time" then
-        return "time"
-    elseif _type == "textarea" then
-        return "text"
-    end
-end
 
 
-function OxToQBInput(data)
-    local returnData = {}
-    for i, v in pairs(data) do
-        local input = {
-            text = v.label,
-            name = i,
-            type = OxTypeToQBType(v.type),
-            isRequired = v.required,
-            placeholder = v.default,
-        }
-        if v.type == "select" then
-            input.text = ""
-            input.options = {
-                {value = v.value, text = v.label}
-            }
-        elseif v.type == "checkbox" then
-            input.text = ""
-            input.options = {
-                {value = v.value, text = v.label}
-            }
-        end
-        table.insert(returnData, input)
-    end
-    return returnData
-end
+
+
 
 -- qb to ox
 
-function QBTypeToOxType(_type)
-    if _type == "text" then
-        return "input"
-    elseif _type == "password" then
-        return "input"
-    elseif _type == "number" then
-        return "number"
-    elseif _type == "radio" then
-        return "checkbox"
-    elseif _type == "checkbox" then
-        return "checkbox"
-    elseif _type == "select" then
-        return "select"
-    end
-end
-
-
-function QBToOxInput(data)
-    local returnData = {}
-    for i, v in pairs(data) do
-        local input = {
-            label = v.text,
-            name = i,
-            type = QBTypeToOxType(v.type),
-            required = v.isRequired,
-            default = v.placeholder,
-        }
-        if v.type == "select" then
-            input.options = {}
-            for i, v in pairs(v.options) do
-                table.insert(input.options, {value = v.value, label = v.text})
-            end
-        elseif v.type == "checkbox" then
-            for i, v in pairs(v.options) do
-                table.insert(returnData, {value = v.value, label = v.text})
-            end
-        end
-        table.insert(returnData, input)
-    end
-    return returnData
-end
-
 --Open menu
 
 function Input.Open(title, data, isQBFormat, submitText)
@@ -202,7 +111,7 @@ function Input.Open(title, data, isQBFormat, submitText)
             })
         end
     end
-    return id
+    return OpenInput(title, data, isQBFormat, submitText)
 end
 
 --[[