Finished Client Profile CRUD

app/Http/Controllers/ClientPortal/ProfileController.php

@@ -13,7 +13,7 @@ namespace App\Http\Controllers\ClientPortal;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ClientPortal\UpdateContactRequest;
-use App\Http\Requests\ClientPortal\UpdateSettingsRequest;
+use App\Http\Requests\ClientPortal\UpdateClientRequest;
 use App\Jobs\Util\UploadAvatar;
 use App\Models\ClientContact;
 use Illuminate\Http\Request;
@@ -90,9 +90,14 @@ class ProfileController extends Controller
         return back();
     }
 
-    public function updateClient(UpdateSettingsRequest $request, ClientContact $client_contact)
+    public function updateClient(UpdateClientRequest $request, ClientContact $client_contact)
     {
-dd("hi");
+
+        $client = $client_contact->client;
+
+        $client->fill($request->all());
+        $client->save();
+
         return back();
     }
 }

app/Http/Requests/ClientPortal/UpdateClientRequest.php

@@ -14,7 +14,7 @@ namespace App\Http\Requests\ClientPortal;
 use App\Http\Requests\Request;
 use App\Utils\Traits\MakesHash;
 
-class UpdateSettingsRequest extends Request
+class UpdateClientRequest extends Request
 {
     use MakesHash;
     
@@ -33,6 +33,7 @@ class UpdateSettingsRequest extends Request
     {
 
         return [
+            'name' => 'required'
         ];
 
     }

app/Http/Requests/ClientPortal/UpdateContactRequest.php

@@ -36,7 +36,6 @@ class UpdateContactRequest extends Request
         return [
             'first_name' => 'required',
             'last_name' => 'required',
-            //'email' => 'required|email',
             'email' => 'required|email|unique:client_contacts,email,' . auth()->user()->id,
             'password' => 'sometimes|nullable|min:6|confirmed',
             'file' => 'sometimes|nullable|max:100000|mimes:png,svg,jpeg,gif,jpg,bmp'

app/Models/ClientContact.php

@@ -35,23 +35,23 @@ class ClientContact extends Authenticatable
     /* Used to authenticate a contact */
     protected $guard = 'contact';
 
-    /* Deprecated TODO remove*/
-    protected $presenter = 'App\Models\Presenters\ClientContactPresenter';
-
-    protected $dates = ['deleted_at'];
-    
     /* Allow microtime timestamps */
     protected $dateFormat = 'Y-m-d H:i:s.u';
 
+    protected $presenter = 'App\Models\Presenters\ClientContactPresenter';
+
+    protected $dates = [
+        'deleted_at'
+    ];
+    
     protected $appends = [
         'hashed_id'
     ];
 
-    public function getHashedIdAttribute()
-    {
-        return $this->encodePrimaryKey($this->id);
-    }
-    
+    protected $with = [
+        'client'
+    ];
+
     protected $hidden = [
         'password', 
         'remember_token',
@@ -65,7 +65,6 @@ class ClientContact extends Authenticatable
         'token',
     ];
 
-
     protected $fillable = [
         'first_name',
         'last_name',
@@ -77,6 +76,11 @@ class ClientContact extends Authenticatable
         'email',
     ];
     
+    public function getHashedIdAttribute()
+    {
+        return $this->encodePrimaryKey($this->id);
+    }
+    
     /**/
     public function getRouteKeyName()
     {

resources/views/portal/default/header.blade.php

@@ -51,8 +51,6 @@
                 </div>
                 <a class="dropdown-item" href="{{ route('client.profile.edit', ['id' => auth()->user()->hashed_id])}}">
                     <i class="fa fa-user"></i> @lang('texts.profile')</a>
-                <a class="dropdown-item" href="{{ route('client.profile.settings', ['id' => auth()->user()->hashed_id])}}">
-                    <i class="fa fa-wrench"></i> @lang('texts.settings')</a>
 
                 <div class="dropdown-divider"></div>
                 <a class="dropdown-item" href="{{ route('client.logout') }}">

resources/views/portal/default/profile/client_information.blade.php

@@ -6,25 +6,111 @@
 
   {!! Former::horizontal_open()
         ->id('update_settings')
-        ->route('client.profile.update_settings', auth()->user()->hashed_id)
+        ->route('client.profile.edit_client', auth()->user()->hashed_id)
         ->method('PUT');	!!}
   
+  {!! Former::populate(auth()->user()->client) !!}
+
   @csrf
 
     <div class="card">
 
       <div class="card-header">
-        {{ ctrans('texts.client_information') }}
+        <strong> {{ ctrans('texts.client_information') }} </strong>
       </div>
 
       <div class="card-body">
-                <button class="btn btn-primary pull-right">{{ ctrans('texts.save') }}</button>
+          
+          <div class="row">
+            <div class="col-sm-6  pull-left">
+              {!! Former::text('name')->label( ctrans('texts.name')) !!}
+              {!! Former::text('website')->label( ctrans('texts.website')) !!}
+            </div>
+          </div>
+
+                <div class="row">
+
+                  <div class="col-sm-6">
+                    <div class="card">
+                      <div class="card-header">
+                        <strong> {{ ctrans('texts.address') }} </strong>
+                      </div>
+                      <div class="card-body">
+
+                        {!! Former::text('address1')->label( ctrans('texts.address1')) !!}
+                        {!! Former::text('address2')->label( ctrans('texts.address2')) !!}
+                        {!! Former::text('city')->label( ctrans('texts.city')) !!}
+                        {!! Former::text('state')->label( ctrans('texts.state')) !!}
+                        {!! Former::text('postal_code')->label( ctrans('texts.postal_code')) !!}
+
+                        {!! Former::select('country_id')
+                            ->addOption('','')
+                            ->autocomplete('off')
+                            ->label(ctrans('texts.country'))
+                            ->fromQuery($countries, 'name', 'id') !!}
+
+                      </div>
+                    </div>
+                  </div>
+
+
+                  <div class="col-sm-6">
+                    <div class="card">
+                      <div class="card-header">
+                        <strong> {{ ctrans('texts.shipping_address') }} </strong>
+                      </div>
+                      <div class="card-body">      
+
+                        {!! Former::text('shipping_address1')->label( ctrans('texts.shipping_address1')) !!}
+                        {!! Former::text('shipping_address2')->label( ctrans('texts.shipping_address2')) !!}
+                        {!! Former::text('shipping_city')->label(ctrans('texts.shipping_city')) !!}
+                        {!! Former::text('shipping_state')->label(ctrans('texts.shipping_state')) !!}
+                        {!! Former::text('shipping_postal_code')->label(ctrans('texts.shipping_postal_code')) !!}
+
+                        {!! Former::select('shipping_country_id')
+                            ->addOption('','')
+                            ->autocomplete('off')
+                            ->label(ctrans('texts.shipping_country'))
+                            ->fromQuery($countries, 'name', 'id') !!}
+                      </div>
+                    </div>
+                  </div>
+
+                </div>
+
+          <button class="btn btn-primary pull-right">{{ ctrans('texts.save') }}</button>
 
       </div>
   
   {!! Former::close() !!}
 
     </div>
+@push('scripts')
+<script src="/vendors/js/select2.min.js"></script>
+<script>
+  $(document).ready(function() {
+
+    $('#shipping_country_id').each(function () {
+      $(this).select2({
+        placeholder: "{{ ctrans('texts.country') }}",
+        theme: 'bootstrap4',
+        width: 'style',
+        allowClear: Boolean($(this).data('allow-clear')),
+      }).on('change', function() {
+      
+      });
+    });
 
 
-          
+    $('#country_id').each(function () {
+      $(this).select2({
+        placeholder: "{{ ctrans('texts.country') }}",
+        theme: 'bootstrap4',
+        width: 'style',
+        allowClear: Boolean($(this).data('allow-clear')),
+      });
+    });
+
+  });
+</script>  
+@endpush

resources/views/portal/default/profile/client_localization.blade.php

@@ -0,0 +1,35 @@
+<div class="row">
+
+  <div class="col-sm-12">
+
+  {!! Former::framework('TwitterBootstrap4'); !!}
+
+  {!! Former::horizontal_open()
+        ->id('update_settings')
+        ->route('client.profile.edit_localization', auth()->user()->hashed_id)
+        ->method('PUT');	!!}
+  
+  {!! Former::populate(auth()->user()->client->settings) !!}
+
+  @csrf
+
+    <div class="card">
+
+      <div class="card-header">
+        <strong> {{ ctrans('texts.localization') }} </strong>
+      </div>
+
+      <div class="card-body">
+          
+          {!! Former::text('timezone_id')->label( ctrans('texts.timezone_id')) !!}
+          {!! Former::text('language_id')->label( ctrans('texts.language')) !!}
+          {!! Former::text('date_format')->label( ctrans('texts.date_format')) !!}
+          {!! Former::text('datetime_format')->label( ctrans('texts.datetime_format')) !!}
+
+          <button class="btn btn-primary pull-right">{{ ctrans('texts.save') }}</button>
+
+      </div>
+  
+  {!! Former::close() !!}
+
+    </div>

resources/views/portal/default/profile/index.blade.php

@@ -1,12 +1,12 @@
 @extends('portal.default.layouts.master')
 @push('css')
-  <link href="/vendors/css/select2.min.css" rel="stylesheet">
-  <link href="/vendors/css/select2-bootstrap4.css" rel="stylesheet">
-  <style>    
-    select {border: 1px solid  !important;}
-    .select2-container--bootstrap4 .select2-selection--single {border: 1px solid #e4e7ea !important;}
-    .control-label {text-align:right;}
-  </style>
+    <link href="/vendors/css/select2.min.css" rel="stylesheet">
+    <link href="/vendors/css/select2-bootstrap4.css" rel="stylesheet">
+    <style>    
+      select {border: 1px solid  !important;}
+      .select2-container--bootstrap4 .select2-selection--single {border: 1px solid #e4e7ea !important;}
+      .control-label {text-align:right;}
+    </style>
 @endpush
 @section('body')
   <main class="main">
@@ -31,8 +31,8 @@
 
                 <div class="row">
                   <div class="col-sm-4">
-                    <div class="card">
-                      <div class="card-body align-items-center">
+                    <div class="card align-items-center">
+                      <div class="card-body">
                         @if(auth()->user()->avatar)
                         <img src="{{ auth()->user()->avatar }}" class="img-fluid">
                         @else
@@ -77,8 +77,9 @@
                         {!! Former::close() !!}
 
         @include('portal.default.profile.client_information')
-
       </div>
   </main>
 </body>
+@endsection
+@section('footer')
 @endsection

routes/client.php

@@ -19,6 +19,7 @@ Route::group(['middleware' => ['auth:contact'], 'prefix' => 'client', 'as' => 'c
 	Route::get('profile/{client_contact}/edit', 'ClientPortal\ProfileController@edit')->name('profile.edit');
 	Route::put('profile/{client_contact}/edit', 'ClientPortal\ProfileController@update')->name('profile.update');
 	Route::put('profile/{client_contact}/edit_client', 'ClientPortal\ProfileController@updateClient')->name('profile.edit_client');
+	Route::put('profile/{client_contact}/localization', 'ClientPortal\ProfileController@updateClientLocalization')->name('profile.edit_localization');
 
 	Route::post('document', 'ClientPortal\DocumentController@store')->name('document.store');
 	Route::delete('document', 'ClientPortal\DocumentController@destroy')->name('document.destroy');