Membership Approval: just pass the user object to the editDetails view

Author: dpslwk

app/Http/Controllers/MembershipController.php

@@ -182,19 +182,7 @@ public function editDetails(User $user)
             return redirect()->route('home');
         }
 
-        return view('membership.editDetails', [
-            'id' => $user->getId(),
-            'firstname' => $user->getFirstname(),
-            'lastname' => $user->getLastname(),
-            'address1' => $user->getProfile()->getAddress1(),
-            'address2' => $user->getProfile()->getAddress2(),
-            'address3' => $user->getProfile()->getAddress3(),
-            'addressCity' => $user->getProfile()->getAddressCity(),
-            'addressCounty' => $user->getProfile()->getAddressCounty(),
-            'addressPostcode' => $user->getProfile()->getAddressPostcode(),
-            'contactNumber' => $user->getProfile()->getContactNumber(),
-            'dateOfBirth' => $user->getProfile()->getDateOfBirth(),
-            ]);
+        return view('membership.editDetails')->with('user', $user);
     }
 
     /**

resources/views/membership/editDetails.blade.php

@@ -4,15 +4,15 @@
 <h1>Update detials</h1>
 <p>Please review the details below and update them as requested by the membership team.</p>
 
-<form role="form" method="POST" action="{{ route('membership.update', $id) }}">
+<form role="form" method="POST" action="{{ route('membership.update', $user->getId()) }}">
   {{ csrf_field() }}
   {{ method_field('PUT') }}
 
   <div class="form-container">
     <div class="row">
       <label for="firstname" class="form-label">First name</label>
       <div class="form-control">
-        <input id="firstname" type="text" name="firstname" value="{{ old('firstname', $firstname) }}" required autofocus>
+        <input id="firstname" type="text" name="firstname" value="{{ old('firstname', $user->getFirstname()) }}" required autofocus>
         @if ($errors->has('firstname'))
         <span class="help-block">
           <strong>{{ $errors->first('firstname') }}</strong>
@@ -24,7 +24,7 @@
     <div class="row">
       <label for="lastname" class="form-label">Last name</label>
       <div class="form-control">
-        <input id="lastname" type="text" name="lastname" value="{{ old('lastname', $lastname) }}" required>
+        <input id="lastname" type="text" name="lastname" value="{{ old('lastname', $user->getLastname()) }}" required>
         @if ($errors->has('lastname'))
         <span class="help-block">
           <strong>{{ $errors->first('lastname') }}</strong>
@@ -36,7 +36,7 @@
     <div class="row">
       <label for="address1" class="form-label">Address 1</label>
       <div class="form-control">
-        <input id="address1" type="text" name="address1" value="{{ old('address1', $address1) }}" required autocomplete="address-line1">
+        <input id="address1" type="text" name="address1" value="{{ old('address1', $user->getProfile()->getAddress1()) }}" required autocomplete="address-line1">
         @if ($errors->has('address1'))
         <p class="help-text">
           <strong>{{ $errors->first('address1') }}</strong>
@@ -48,7 +48,7 @@
     <div class="row">
       <label for="address2" class="form-label">Address 2</label>
       <div class="form-control">
-        <input id="address2" type="text" name="address2" value="{{ old('address2', $address2) }}" autocomplete="address-line2">
+        <input id="address2" type="text" name="address2" value="{{ old('address2', $user->getProfile()->getAddress2()) }}" autocomplete="address-line2">
         @if ($errors->has('address2'))
         <p class="help-text">
           <strong>{{ $errors->first('address2') }}</strong>
@@ -60,7 +60,7 @@
     <div class="row">
       <label for="address3" class="form-label">Address 3</label>
       <div class="form-control">
-        <input id="address3" type="text" name="address3" value="{{ old('address3', $address3) }}" autocomplete="address-line3">
+        <input id="address3" type="text" name="address3" value="{{ old('address3', $user->getProfile()->getAddress3()) }}" autocomplete="address-line3">
         @if ($errors->has('address3'))
         <p class="help-text">
           <strong>{{ $errors->first('address3') }}</strong>
@@ -72,7 +72,7 @@
     <div class="row">
       <label for="addressCity" class="form-label">City</label>
       <div class="form-control">
-        <input id="addressCity" type="text" name="addressCity" value="{{ old('addressCity', $addressCity) }}" required autocomplete="city">
+        <input id="addressCity" type="text" name="addressCity" value="{{ old('addressCity', $user->getProfile()->getAddressCity()) }}" required autocomplete="city">
         @if ($errors->has('addressCity'))
         <p class="help-text">
           <strong>{{ $errors->first('addressCity') }}</strong>
@@ -84,7 +84,7 @@
     <div class="row">
       <label for="addressCounty" class="form-label">County</label>
       <div class="form-control">
-        <input id="addressCounty" type="text" name="addressCounty" value="{{ old('addressCounty', $addressCounty) }}" required autocomplete="region">
+        <input id="addressCounty" type="text" name="addressCounty" value="{{ old('addressCounty', $user->getProfile()->getAddressCounty()) }}" required autocomplete="region">
         @if ($errors->has('addressCounty'))
         <p class="help-text">
           <strong>{{ $errors->first('addressCounty') }}</strong>
@@ -96,7 +96,7 @@
     <div class="row">
       <label for="addressPostcode" class="form-label">Postcode</label>
       <div class="form-control">
-        <input id="addressPostcode" type="text" name="addressPostcode" value="{{ old('addressPostcode', $addressPostcode) }}" required autocomplete="postal-code">
+        <input id="addressPostcode" type="text" name="addressPostcode" value="{{ old('addressPostcode', $user->getProfile()->getAddressPostcode()) }}" required autocomplete="postal-code">
         @if ($errors->has('addressPostcode'))
         <p class="help-text">
           <strong>{{ $errors->first('addressPostcode') }}</strong>
@@ -108,7 +108,7 @@
     <div class="row">
       <label for="contactNumber" class="form-label">Contact Number</label>
       <div class="form-control">
-        <input id="telephone" type="text" name="contactNumber" value="{{ old('contactNumber', $contactNumber) }}" required autocomplete="tel">
+        <input id="telephone" type="text" name="contactNumber" value="{{ old('contactNumber', $user->getProfile()->getContactNumber()) }}" required autocomplete="tel">
         @if ($errors->has('contactNumber'))
         <p class="help-text">
           <strong>{{ $errors->first('contactNumber') }}</strong>
@@ -124,7 +124,7 @@
     <div class="row">
       <label for="dateOfBirth" class="form-label">Date Of Birth (dd/mm/yyyy)</label>
       <div class="form-control">
-        <input id="dateOfBirth" type="date" name="dateOfBirth" value="{{ old('dateOfBirth', $dateOfBirth ? $dateOfBirth->format('d/m/Y') : '' )}}">
+        <input id="dateOfBirth" type="date" name="dateOfBirth" value="{{ old('dateOfBirth', $user->getProfile()->getDateOfBirth() ? $user->getProfile()->getDateOfBirth()->format('d/m/Y') : '' )}}">
         @if ($errors->has('dateOfBirth'))
         <p class="help-text">
           <strong>{{ $errors->first('dateOfBirth') }}</strong>