ajustando la relacion del usuario con el socio

higuita1498 · Jun 17, 2022 · 344644b · 344644b
1 parent 9f26c24
commit 344644b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -35,7 +35,7 @@ public function create()
     {
         $roles = Role::select('name', 'id');
         $cities = City::select('name', 'id')->get();
-        $partners = Partner::select('name', 'id')->get();
+        $partners = Partner::select('PartnerName', 'id')->get();
         return  view('users.create', compact('roles', 'cities', 'partners'));
     }
 
@@ -63,8 +63,8 @@ public function store(StoreUserRequest $request)
     public function edit(User $user)
     {
         $user->load('partner', 'role', 'city.department.country');
-        $cities = City::all();
-        $partners = Partner::all();
+        $cities = City::select('name', 'id')->get();
+        $partners = Partner::select('PartnerName', 'id')->get();
 
         return view('users.edit', compact('user', 'cities', 'partners'));
     }

diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
@@ -20,7 +20,7 @@
                                 <label>{{ __('Company') }}</label>
                                 <select type="text" class="form-control" name="partner_id" style="background-color: #2b3553;" title="{{ __('City') }}">
                                     @foreach ($partners as $partner)
-                                    <option value="{{ $partner->id }}">{{ $partner->name }}</option>
+                                    <option value="{{ $partner->id }}">{{ $partner->PartnerName }}</option>
                                     @endforeach
                                 </select>
                                 @include('alerts.feedback', ['field' => 'partner_id'])

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
@@ -20,7 +20,7 @@
                                 <label>{{ __('Company') }}</label>
                                 <select class="form-control" name="partner_id" style="background-color: #2b3553;" title="{{ __('Partner') }}">
                                     @foreach ($partners as $partner)
-                                    <option value="{{ $partner->id }}" {{ $partner->id == $user->partner_id ? 'selected' : ''}}>{{ $partner->name }}</option>
+                                    <option value="{{ $partner->id }}" {{ $partner->id == $user->partner_id ? 'selected' : ''}}>{{ $partner->PartnerName }}</option>
                                     @endforeach
                                 </select>
                                 @include('alerts.feedback', ['field' => 'partner_id'])

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
@@ -27,7 +27,7 @@
                                 <td>{{ $user->UserName }}</td>
                                 <td>{{ $user->UserContactNumber }}</td>
                                 <td>{{ optional($user->role)->name }}</td>
-                                <td>{{ optional($user->partner)->name }}</td>
+                                <td>{{ optional($user->partner)->PartnerName }}</td>
                                 <td>
                                     @if ($user->UserStatus == 1)
                                     <span class="badge badge-success">Activo</span>