Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Helpers/IconHelper.php

@@ -43,6 +43,8 @@ public static function icon($type) {
                 return 'fa-regular fa-envelope';
             case 'phone':
                 return 'fa-solid fa-phone';
+            case 'mobile':
+                return 'fas fa-mobile-screen-button';
             case 'long-arrow-right':
                 return 'fas fa-long-arrow-alt-right';
             case 'download':

app/Http/Controllers/Api/UsersController.php

@@ -70,6 +70,7 @@ public function index(Request $request) : array
             'users.notes',
             'users.permissions',
             'users.phone',
+            'users.mobile',
             'users.state',
             'users.two_factor_enrolled',
             'users.two_factor_optin',
@@ -121,6 +122,14 @@ public function index(Request $request) : array
             $users = $users->where('users.company_id', '=', $request->input('company_id'));
         }
 
+        if ($request->filled('phone')) {
+            $users = $users->where('users.phone', '=', $request->input('phone'));
+        }
+
+        if ($request->filled('mobile')) {
+            $users = $users->where('users.mobile', '=', $request->input('mobile'));
+        }
+
         if ($request->filled('location_id')) {
             $users = $users->where('users.location_id', '=', $request->input('location_id'));
         }
@@ -293,6 +302,7 @@ public function index(Request $request) : array
                         'manages_users_count',
                         'manages_locations_count',
                         'phone',
+                        'mobile',
                         'address',
                         'city',
                         'state',

app/Http/Controllers/Users/UsersController.php

@@ -98,6 +98,7 @@ public function store(SaveUserRequest $request)
         $user->activated = $request->input('activated', 0);
         $user->jobtitle = $request->input('jobtitle');
         $user->phone = $request->input('phone');
+        $user->mobile = $request->input('mobile');
         $user->location_id = $request->input('location_id', null);
         $user->department_id = $request->input('department_id', null);
         $user->company_id = Company::getIdForUser($request->input('company_id', null));
@@ -244,6 +245,7 @@ public function update(SaveUserRequest $request, User $user)
         $user->employee_num = $request->input('employee_num');
         $user->jobtitle = $request->input('jobtitle', null);
         $user->phone = $request->input('phone');
+        $user->mobile = $request->input('mobile');
         $user->location_id = $request->input('location_id', null);
         $user->company_id = Company::getIdForUser($request->input('company_id', null));
         $user->manager_id = $request->input('manager_id', null);

app/Http/Transformers/UsersTransformer.php

@@ -45,6 +45,7 @@ public function transformUser(User $user)
                 'jobtitle' => ($user->jobtitle) ? e($user->jobtitle) : null,
                 'vip' => ($user->vip == '1') ? true : false,
                 'phone' => ($user->phone) ? e($user->phone) : null,
+                'mobile' => ($user->mobile) ? e($user->mobile) : null,
                 'website' => ($user->website) ? e($user->website) : null,
                 'address' => ($user->address) ? e($user->address) : null,
                 'city' => ($user->city) ? e($user->city) : null,

app/Importer/UserImporter.php

@@ -52,6 +52,7 @@ public function createUserIfNotExists(array $row)
         $this->item['email'] = trim($this->findCsvMatch($row, 'email'));
         $this->item['gravatar'] = trim($this->findCsvMatch($row, 'gravatar'));
         $this->item['phone'] = trim($this->findCsvMatch($row, 'phone_number'));
+        $this->item['mobile'] = trim($this->findCsvMatch($row, 'mobile_number'));
         $this->item['website'] = trim($this->findCsvMatch($row, 'website'));
         $this->item['jobtitle'] = trim($this->findCsvMatch($row, 'jobtitle'));
         $this->item['address'] = trim($this->findCsvMatch($row, 'address'));

app/Livewire/Importer.php

@@ -334,6 +334,7 @@ public function mount()
             'manager_username' => trans('general.importer.manager_username'),
             'notes' => trans('general.notes'),
             'phone_number' => trans('admin/users/table.phone'),
+            'mobile_number' => trans('admin/users/table.mobile'),
             'remote' => trans('admin/users/general.remote'),
             'start_date' => trans('general.start_date'),
             'state' => trans('general.state'),
@@ -510,6 +511,13 @@ public function mount()
                     'telephone',
                     'tel.',
                 ],
+            'mobile_number' =>
+                [
+                    'mobile',
+                    'mobile number',
+                    'cell',
+                    'cellphone',
+                ],
 
             'serial' =>
                 [

app/Models/User.php

@@ -70,6 +70,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'manager_id',
         'password',
         'phone',
+        'mobile',
         'notes',
         'state',
         'username',
@@ -139,6 +140,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'locale',
         'notes',
         'phone',
+        'mobile',
         'state',
         'username',
         'website',

app/Presenters/UserPresenter.php

@@ -124,6 +124,15 @@ public static function dataTableLayout()
                 'visible' => true,
                 'formatter'    => 'phoneFormatter',
             ],
+            [
+                'field' => 'mobile',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/users/table.mobile'),
+                'visible' => false,
+                'formatter'    => 'mobileFormatter',
+            ],
             [
                 'field' => 'website',
                 'searchable' => true,

database/factories/UserFactory.php

@@ -35,6 +35,7 @@ public function definition()
             'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
             'permissions' => '{}',
             'phone' => $this->faker->phoneNumber(),
+            'mobile' => $this->faker->phoneNumber(),
             'state' => $this->faker->stateAbbr(),
             'username' => $this->faker->unique()->username(),
             'zip' => $this->faker->postcode(),

database/migrations/2025_08_11_181519_add_mobile_number_to_users_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            if (!Schema::hasColumn('users', 'mobile')) {
+                $table->text('mobile')->after('phone')->nullable()->default(null);
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('mobile');
+        });
+    }
+};