diff --git a/app/devices/app_config.php b/app/devices/app_config.php index da31452c5a..a346b9fd38 100644 --- a/app/devices/app_config.php +++ b/app/devices/app_config.php @@ -224,6 +224,9 @@ $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $y++; + $apps[$x]['permissions'][$y]['name'] = "device_serial_number"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; $apps[$x]['permissions'][$y]['name'] = "device_model"; //$apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $y++; @@ -462,6 +465,11 @@ $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "device_serial_number"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "device_model"; $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "phone_model"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php index a1893028e9..1fe1aa92be 100644 --- a/app/devices/app_languages.php +++ b/app/devices/app_languages.php @@ -3198,6 +3198,32 @@ $text['label-device_location']['zh-cn'] = "地点"; $text['label-device_location']['ja-jp'] = "位置"; $text['label-device_location']['ko-kr'] = "위치"; +$text['label-device_serial_number']['en-us'] = "Serial Number"; +$text['label-device_serial_number']['en-gb'] = "Serial Number"; +$text['label-device_serial_number']['ar-eg'] = ""; +$text['label-device_serial_number']['de-at'] = ""; +$text['label-device_serial_number']['de-ch'] = ""; +$text['label-device_serial_number']['de-de'] = ""; +$text['label-device_serial_number']['el-gr'] = ""; +$text['label-device_serial_number']['es-cl'] = ""; +$text['label-device_serial_number']['es-mx'] = ""; +$text['label-device_serial_number']['fr-ca'] = ""; +$text['label-device_serial_number']['fr-fr'] = ""; +$text['label-device_serial_number']['he-il'] = ""; +$text['label-device_serial_number']['it-it'] = ""; +$text['label-device_serial_number']['ka-ge'] = ""; +$text['label-device_serial_number']['nl-nl'] = ""; +$text['label-device_serial_number']['pl-pl'] = ""; +$text['label-device_serial_number']['pt-br'] = ""; +$text['label-device_serial_number']['pt-pt'] = ""; +$text['label-device_serial_number']['ro-ro'] = ""; +$text['label-device_serial_number']['ru-ru'] = ""; +$text['label-device_serial_number']['sv-se'] = ""; +$text['label-device_serial_number']['uk-ua'] = ""; +$text['label-device_serial_number']['zh-cn'] = ""; +$text['label-device_serial_number']['ja-jp'] = ""; +$text['label-device_serial_number']['ko-kr'] = ""; + $text['label-device_key_vendor']['en-us'] = "Vendor"; $text['label-device_key_vendor']['en-gb'] = "Vendor"; $text['label-device_key_vendor']['ar-eg'] = "البائع"; @@ -6634,6 +6660,32 @@ $text['description-device_location']['zh-cn'] = "输入设备位置。"; $text['description-device_location']['ja-jp'] = "デバイスの場所を入力します。"; $text['description-device_location']['ko-kr'] = "장치 위치를 입력합니다."; +$text['description-device_serial_number']['en-us'] = "Enter the device serial number."; +$text['description-device_serial_number']['en-gb'] = "Enter the device serial number."; +$text['description-device_serial_number']['ar-eg'] = ""; +$text['description-device_serial_number']['de-at'] = ""; +$text['description-device_serial_number']['de-ch'] = ""; +$text['description-device_serial_number']['de-de'] = ""; +$text['description-device_serial_number']['el-gr'] = ""; +$text['description-device_serial_number']['es-cl'] = ""; +$text['description-device_serial_number']['es-mx'] = ""; +$text['description-device_serial_number']['fr-ca'] = ""; +$text['description-device_serial_number']['fr-fr'] = ""; +$text['description-device_serial_number']['he-il'] = ""; +$text['description-device_serial_number']['it-it'] = ""; +$text['description-device_serial_number']['ka-ge'] = ""; +$text['description-device_serial_number']['nl-nl'] = ""; +$text['description-device_serial_number']['pl-pl'] = ""; +$text['description-device_serial_number']['pt-br'] = ""; +$text['description-device_serial_number']['pt-pt'] = ""; +$text['description-device_serial_number']['ro-ro'] = ""; +$text['description-device_serial_number']['ru-ru'] = ""; +$text['description-device_serial_number']['sv-se'] = ""; +$text['description-device_serial_number']['uk-ua'] = ""; +$text['description-device_serial_number']['zh-cn'] = ""; +$text['description-device_serial_number']['ja-jp'] = ""; +$text['description-device_serial_number']['ko-kr'] = ""; + $text['description-device_time_zone']['en-us'] = "Enter the time zone."; $text['description-device_time_zone']['en-gb'] = "Enter the time zone."; $text['description-device_time_zone']['ar-eg'] = "أدخل المنطقة الزمنية"; diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index f058c0becb..b8cedfff56 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -124,6 +124,7 @@ $device_password = $_POST["device_password"]; $device_vendor = $_POST["device_vendor"]; $device_location = $_POST["device_location"]; + $device_serial_number = $_POST["device_serial_number"]; $device_uuid_alternate = $_POST["device_uuid_alternate"] ?? null; $device_model = $_POST["device_model"] ?? null; $device_firmware_version = $_POST["device_firmware_version"] ?? null; @@ -269,6 +270,9 @@ if (permission_exists('device_location')) { $array['devices'][0]['device_location'] = $device_location; } + if (permission_exists('device_serial_number')) { + $array['devices'][0]['device_serial_number'] = $device_serial_number; + } if (permission_exists('device_alternate')) { $array['devices'][0]['device_uuid_alternate'] = is_uuid($device_uuid_alternate) ? $device_uuid_alternate : null; } @@ -521,6 +525,7 @@ $device_password = $row["device_password"]; $device_vendor = $row["device_vendor"]; $device_location = $row["device_location"]; + $device_serial_number = $row["device_serial_number"]; $device_uuid_alternate = $row["device_uuid_alternate"]; $device_model = $row["device_model"]; $device_firmware_version = $row["device_firmware_version"]; @@ -1915,6 +1920,19 @@ echo "\n"; } + if (permission_exists('device_serial_number')) { + echo "