Modified

app/Http/Controllers/Admin/SubContentController.php

@@ -94,7 +94,9 @@ class SubContentController extends Controller
                 'apply_status', [0,2,3] // 0 = Pending; 2= In active ; 3= Suspend
             )->where(
                 'user_type',2
-            )->orderBy(
+            )->where(
+				'sign_up',1
+			)->orderBy(
                 'name','ASC'
             )->get();
 		}elseif($name=="edit_teacher_load"){

app/Http/Controllers/AjaxController.php

@@ -90,6 +90,7 @@ class AjaxController extends Controller
             $teacher->update();
 
             $data['name'] = $teacher->first_name.' '.$teacher->last_name;
+            $data['receive_email']=$teacher->email;
             $user_mail = $teacher->email;
             $from = 'asraful@revinr.com';
             if($teacher->apply_status==1){
@@ -195,7 +196,7 @@ class AjaxController extends Controller
             $user =Auth::user();
             $validator=\Validator::make($req->all(), [
                 'name'=>'required',
-                'email'=>'required|email|max:255|unique:refer_users'
+                'email'=>'required|email|max:255'
             ]);
 
             if($validator->fails()){
@@ -223,6 +224,7 @@ class AjaxController extends Controller
                 $data['teacher_id'] = $refer->teacher_id;
                 $data['std_email'] = $refer->email;
                 $data['applicant_name'] = $user->first_name.' '.$user->last_name;
+                $data['receive_email']=$refer->email;
                 $user_mail = $refer->email;
                 $from = 'asraful@revinr.com';
 
@@ -411,7 +413,7 @@ class AjaxController extends Controller
                 return response(['msg'=>$errors[0]], 422);
             }
 
-            $user_check_data =User::where('email',$req->email)->doesntExist();
+            $user_check_data =User::where('email',$req->email)->where('user_type',1)->doesntExist();
 
             if($user_check_data){ 
                $user_data =new User;
@@ -419,7 +421,7 @@ class AjaxController extends Controller
                $user_data->email =$req->email; 
                $user_data->user_type =1;
                $user_data->status =0; 
-               $user_data->register_type =3; // 1=invitation ; 2= landing/wishlish; 3 =q_form 
+               $user_data->register_type =3; // 1=invitation ; 2= landing/wishlish; 3 =q_form ; 4=student_wishlist
                $user_data->invitation_date =now();
                $user_data->wishlist_teacher_id =$req->id;
                $user_data->save();
@@ -444,6 +446,7 @@ class AjaxController extends Controller
                 $data['department'] = $user_teacher->others_department;
                 $data['university'] = $user_teacher->university_name;
                 $data['email'] =$refer->email;
+                $data['receive_email']=$refer->email;
                 $user_mail = $refer->email;
                 $from = 'asraful@revinr.com';
 
@@ -478,10 +481,25 @@ class AjaxController extends Controller
                 return response(['msg'=>$errors[0]], 422);
             }
 
-            $user_data = User::find($req->id);
             $token =Str::random(64);
 
-            if($user_data){ 
+            $user_check = User::where(
+                'id',$req->id
+            )->where(
+                'sign_up',1
+            )->first();
+ 
+
+            if($user_check){  
+               // return redirect()->to("/login")->with('success','You are already registered. Please login here.'); 
+               return response(
+                ['msg'=>'You are already registered.','action'=>'redirect'] 
+            
+            );
+
+            }else{
+
+                $user_data = User::find($req->id);  
                 $user_data->first_name =$req->first_name;
                 $user_data->last_name =$req->last_name;
                 $user_data->first_name =$req->first_name;
@@ -500,19 +518,18 @@ class AjaxController extends Controller
                  
                 $data['name'] = $user_data->first_name .' '.$user_data->last_name;
                 $data['token']=$token;
+                $data['receive_email']=$user_data->email;
                 $user_mail = $user_data->email;
                 $from = 'asraful@revinr.com';
 
                 Mail::send('email.q_apply_wishlist_registration_email',$data, function ($message) use ($user_mail,$from) {
                     $message->from($from);
                     $message->to($user_mail)->subject('Thank You for joining us!');
-                });
-                 
-
-                return response(
-                    ['msg'=>'Successfully saved. Please check your email for verify.']
-                );
+                }); 
             }
+            return response(
+                ['msg'=>'Successfully saved. Please check your email for verify.']
+            );
 
         }elseif($name=="invitation_register_save"){
              
@@ -536,9 +553,27 @@ class AjaxController extends Controller
                 return response(['msg'=>$errors[0]], 422);
             }
 
-            $user_data = User::find($req->id);
+            
+
+            $user_check = User::where(
+                'id',$req->id
+            )->where(
+                'user_type',2
+            )->where(
+                'sign_up',1
+            )->first();
+ 
+
+            if($user_check){  
+                //return redirect()->to("/login")->with('success','You are already registered. Please login here.'); 
+                
+                return response(
+                    ['msg'=>'You are already registered.','action'=>'redirect'] 
+                );
+
+            }else{ 
 
-            if($user_data){
+                $user_data = User::find($req->id);
 
                 // $user_exists = ReferUser::where('email',$req->email)->where('signup',1)->exists();
 
@@ -564,11 +599,13 @@ class AjaxController extends Controller
                 $user_data->password =Hash::make($req->password);
                 $user_data->status =1;
                 $user_data->sign_up = 1; // 1=signup
+                $user_data->user_type = 2;  
                 $user_data->registered_date = now();
                 $user_data->update();
 
                 if($user_data->update()){
                     $data['name'] = $user_data->first_name .' '.$user_data->last_name;
+                    $data['receive_email']=$user_data->email;
                     $user_mail = $user_data->email;
                     $from = 'asraful@revinr.com';
 
@@ -578,10 +615,10 @@ class AjaxController extends Controller
                     });
                 }
 
-                return response(
-                    ['msg'=>'Registration successfully saved.']
-                );
             }
+            return response(
+                ['msg'=>'Registration successfully saved.']
+            );
 
         }elseif($name=="delete_doc_required"){
             $requirements=Requirement::find($req->delete_id);
@@ -667,9 +704,8 @@ class AjaxController extends Controller
                 'first_name'=>'required',
                 'last_name'=>'required',
                 'university'=>'required',
-                //'department'=>'required',
-                'designation'=>'required',
-
+                'department'=>'required',
+                'designation'=>'required', 
             ]);
 
             if($validator->fails()){
@@ -679,10 +715,11 @@ class AjaxController extends Controller
 
             $user_data = User::find($req->edit_id);
             $user_data->first_name =$req->first_name;
-            $user_data->last_name =$req->last_name;
-            $user_data->university_name =$req->university;
+            $user_data->last_name =$req->last_name; 
+            $user_data->university_id =$req->university;
+            $user_data->university_name = NULL;
             $user_data->department =$req->department;
-            $user_data->others_department =$req->others_department;
+            $user_data->others_department = NULL;
             $user_data->designation =$req->designation;
             $user_data->uni_website =$req->uni_website;
             $user_data->update();
@@ -696,6 +733,7 @@ class AjaxController extends Controller
 
             if($user_data->update()){
                 $data['name'] = $user_data->first_name .' '.$user_data->last_name;
+                $data['receive_email']=$user_data->email;
                 $user_mail = $user_data->email;
                 $data['teacher_id'] = $user_data->id;
                 $data['email'] = $user_data->email;
@@ -708,7 +746,7 @@ class AjaxController extends Controller
             }
 
             return response(
-                ['msg'=>'Registration successfully saved.You can login now.']
+                ['msg'=>'Invitation sent successfully.']
             );
 
 

app/Http/Controllers/Auth/LoginController.php

@@ -52,18 +52,26 @@ class LoginController extends Controller
 
     public function login(Request $request)
     {
-        $student = User::where('user_type',1)->where('email',$request->email)->first();
+        $student = User::where(
+            'user_type',1
+        )->where(
+            'email',$request->email
+        )->where(
+            'sign_up',1 
+        )->first();
 
         if(!$student){
             return redirect('/login')->with('error','Unknown Email address!');
         }else{
-            if($student->status == 0){
-                return redirect('/login')->with('error', 'Account Status is not Activated!');
+            if($student->email_verification == 0){
+                return redirect('/login')->with('error', 'Account is not verified!. Please check your email.');
             }else{
                 $credentials = [
                     'email' => $request->email,
                     'password' => $request->password,
-                    'status' => '1'
+                    'status' => '1',
+                    'email_verification'=>'1',
+                    'sign_up'=>'1',
                 ];
 
                 if (Auth::attempt($credentials)) {

app/Http/Controllers/Auth/RegisterController.php

@@ -77,20 +77,32 @@ class RegisterController extends Controller
      */
     protected function create(Request $req)
     {
-        //if($data['user_type']==1){
+        //if($data['user_type']==1){ 
             $token =Str::random(64);
-            $user_data = User::create([
-                'first_name' => $req->givenname,
-                'last_name' => $req->familyname,
-                'email' => $req->email,
-                'nationality' => $req->nationality,
-                'dob' => \Carbon\Carbon::parse($req->dob)->format('Y-m-d'),
-                'gender' => $req->optradio,
-                'user_type' => $req->user_type,
-                'password' => Hash::make($req->password),
-                'status' => 1,
-                'remember_token' => $token,
-            ]);
+
+            $user_check_data =User::where('email',$req->email)->where('user_type',1)->where('sign_up',1)->doesntExist();
+
+            if($user_check_data){
+                $user_data = User::create([
+                    'first_name' => $req->givenname,
+                    'last_name' => $req->familyname,
+                    'email' => $req->email,
+                    'nationality' => $req->nationality,
+                    'dob' => \Carbon\Carbon::parse($req->dob)->format('Y-m-d'),
+                    'gender' => $req->optradio,
+                    'user_type' => 1,
+                    'password' => Hash::make($req->password),
+                    'status' => 0,
+                    'remember_token' => $token,
+                    'sign_up' =>1,
+                    'register_type' =>5, // Normal registration student
+                    'registered_date' =>now(),
+                ]);
+
+            }else{
+                return redirect()->to("/login")->with('success','You are already registered. Please login here.');
+            }
+            
 
             $refer_user_exists = ReferUser::where('email',$req->email)->first();
 
@@ -100,7 +112,8 @@ class RegisterController extends Controller
             }
 
             $data['token'] = $token;
-            $data['name'] = $req->givenname .''.$req->familyname;
+            $data['name'] = $req->givenname .' '.$req->familyname;
+            $data['receive_email']=$req->email;
             $user_mail = $req->email;
             $from = 'asraful@revinr.com';
 

app/Http/Controllers/ModalController.php

@@ -135,6 +135,7 @@ class ModalController extends Controller{
 				$data['teacher'] = $proposal_user->first_name.' '.$proposal_user->last_name;
                 $data['university'] = $proposal_user->university_name;
                 $data['submission_date'] = $student_data->created_at;
+                $data['receive_email']=$student_data->email;
 				//$data['arn'] = $proposal_user->ref_no;
 				$user_mail =$student_data->email;
 				$from = 'asraful@revinr.com';
@@ -155,6 +156,7 @@ class ModalController extends Controller{
                 $data['std_name'] = $user->first_name.' '.$user->last_name;
                 $data['proposal_title'] =$proposal->title;
                 $data['date_time']=$student_proposal->created_at;
+                $data['receive_email']=$proposal_user->email;
 				$user_mail =$proposal_user->email;
 				$from = 'asraful@revinr.com';
 				Mail::send('email.teacher_proposal_email',$data, function ($message) use ($user_mail,$from) {
@@ -205,15 +207,19 @@ class ModalController extends Controller{
             $refer->teacher_id =$user->id;
             $refer->save();
 
+            
+            $user_notify =User::where('email',$req->email)->where('user_type',1)->first();
+
             if($refer->save()){
                 $data['name'] = $refer->name;
                 $data['teacher_id'] = $refer->teacher_id;
-                $data['student_id'] = $user_data->id;
+                $data['student_id'] = $user_notify->id;
                 $data['std_email'] = $refer->email;
                 $data['teacher'] = $user->first_name.' '.$user->last_name;
                 $data['designation'] = $user->designation;
                 $data['department'] = $user->others_department;
                 $data['university'] = $user->university_name;
+                $data['receive_email']=$refer->email;
                 $user_mail = $refer->email;
                 $from = 'asraful@revinr.com';
 
@@ -271,6 +277,7 @@ class ModalController extends Controller{
                 $data['teacher_id'] = $teacher_user->id;
                 $data['applicant_name'] = $admin->first_name.' '.$admin->last_name;
                 $data['email']=$refer->email;
+                $data['receive_email']=$refer->email;
                 $user_mail = $refer->email;
                 $from = 'asraful@revinr.com';
 
@@ -361,7 +368,7 @@ class ModalController extends Controller{
             //     return response(['msg'=>'Sorry! this email is already exists!.'],403);
             // }
 
-            $user_check_data =User::where('email',$req->email)->doesntExist();
+            $user_check_data =User::where('email',$req->email)->where('user_type',2)->doesntExist();
 
             if($user_check_data){ 
                $user_data =new User;

app/Http/Controllers/TeacherAuth/LoginController.php

@@ -54,7 +54,13 @@ class LoginController extends Controller
 
     public function login(Request $request)
     {
-        $teacher = User::where('user_type',2)->where('email',$request->email)->first();
+        $teacher = User::where(
+            'user_type',2
+        )->where(
+            'email',$request->email
+        )->where(
+            'sign_up',1
+        )->first();
 
         if(!$teacher){
             return redirect('/login-v2')->with('error','Unknown Email address!');
@@ -66,7 +72,8 @@ class LoginController extends Controller
                 $credentials = [
                     'email' => $request->email,
                     'password' => $request->password,
-                    'status' => '1'
+                    'status' => '1',
+                    'email_verification' => '0'
                 ];
 
                 if (Auth::guard('teacher')->attempt($credentials)) {

app/Http/Controllers/TeacherAuth/RegisterController.php

@@ -70,27 +70,33 @@ class RegisterController extends Controller
      */
     protected function create(Request $req)
     {
-
-        $user_data = User::create([
-            'first_name' => $req->firstname,
-            'last_name' => $req->lastname,
-            'password' => Hash::make($req->password),
-            'email' => $req->email,
-           // 'phone_number' => $req->phonenumber,
-            'university_name' => $req->university,
-            'department' => $req->department,
-            'others_department' => $req->others_department,
-            'designation' => $req->designation,
-            'uni_website' => $req->universitywebsite,
-            'user_type' => $req->user_type,
-            'ref_no' => name_initials($req->firstname,$req->lastname).''.teacherRefNoGenerate(),
-            'status' =>1,
-            'sign_up' => 1, // 1=signup
-            'registered_date' =>now(),
-        ]);
-       
-
+        $user_check_data =User::where('email',$req->email)->where('user_type',2)->where('sign_up',1)->doesntExist();
+
+        if($user_check_data){ 
+            $user_data = User::create([
+                'first_name' => $req->firstname,
+                'last_name' => $req->lastname,
+                'password' => Hash::make($req->password),
+                'email' => $req->email,
+            // 'phone_number' => $req->phonenumber,
+                'university_name' => $req->university,
+                'department' => $req->department,
+                'others_department' => $req->others_department,
+                'designation' => $req->designation,
+                'uni_website' => $req->universitywebsite,
+                'user_type' => 2,
+                'ref_no' => name_initials($req->firstname,$req->lastname).''.teacherRefNoGenerate(),
+                'status' =>1,
+                'sign_up' => 1, // 1=signup
+                'registered_date' =>now(), 
+            ]);
+
+        }else{
+            return redirect()->to("/login-v2")->with('success','You are already registered. Please login here.');
+        }
+        
         $data['name'] = $user_data->first_name .' '.$user_data->last_name;
+        $data['receive_email']=$user_data->email;
         $user_mail = $user_data->email;
         $from = 'asraful@revinr.com';
 
@@ -99,7 +105,7 @@ class RegisterController extends Controller
             $message->to($user_mail)->subject('We’re excited to have you as a member of our community');
         });
 
-        return redirect()->to("/login-v2")->with('success','Your registration successfully saved. Please check your email for verification login.');
+        return redirect()->to("/login-v2")->with('success','Your registration successfully saved.');
 
     }
 

app/User.php

@@ -78,7 +78,7 @@ class User extends Authenticatable
 
     public function university()
     {
-        return $this->belongsTo('App\Models\University', 'university_name');
+        return $this->belongsTo('App\Models\University', 'university_id');
     }
 
 

resources/views/Q_apply_form.blade.php

@@ -386,6 +386,8 @@
 
                     $.post("{{ route('ajax-post', ['name'=>'student_q_form']) }}", form_data, function(res){
                         $('.wait').waitMe("hide");
+                        $('#name').val('');
+                        $('#email').val('');
                         pop_up_msg(res.msg);
 
                     }).fail(function(err){

resources/views/admin/admin_profile.blade.php

@@ -548,7 +548,7 @@ tbody, td, tfoot, th, thead, tr {
                                                     <span>{{cn($row,'student_details.country_name.name','')}}</span>
                                                 </div>
                                                 <div style="font-size: 11px;">
-                                                    <span style="color: black;">@if(!empty(cn($row,'student_details.dob'))){{date('d M Y', strtotime(cn($row,'student_details.dob','')))}} @endif</span>
+                                                    <span style="color: black;">@if(!empty($row->student_details->dob)){{date('d M Y', strtotime(cn($row,'student_details.dob','')))}} @else @endif</span>
                                                 </div>
                                             </td>
                                             <td style="font-size: 11px;">
@@ -558,14 +558,18 @@ tbody, td, tfoot, th, thead, tr {
                                                 <div style="font-size: 11px;">
                                                     <span>{{cn($row,'teacher_details.designation','')}}</span>
                                                     <span>.</span>
-                                                    @if(isset($row->teacher_details->department_name))
-                                                        <span style="color: black;">{{cn($row,'teacher_details.department_name.name','')}}</span>
+                                                    @if(isset($row->teacher_details->others_department))
+                                                        <span style="color: black;">{{cn($row,'teacher_details.others_department','')}}</span>
                                                     @else
-                                                        <span style="color: black;">{{cn($row,'teacher_details.others_department','')}}<</span>
+                                                        <span style="color: black;">{{cn($row,'teacher_details.department_name.name','')}}</span>
                                                     @endif
                                                 </div>
                                                 <div style="font-size: 11px;">
-                                                    <span style="color: black;">{{cn($row,'teacher_details.university.name','')}}</span>
+                                                    @if($row->teacher_details->university_name)
+                                                        <span style="color: black;">{{cn($row,'teacher_details.university_name','')}}</span>
+                                                    @else
+                                                         <span style="color: black;">{{cn($row,'teacher_details.university.name','')}}</span>
+                                                    @endif
                                                 </div>
                                             </td>
                                             <td style="font-size: 11px;">
@@ -853,15 +857,21 @@ tbody, td, tfoot, th, thead, tr {
                                                                                         <td style="font-size: 11px;"><span style="font-weight: bold !important;">{{$row->first_name }} {{$row->last_name }}</span><br>
                                                                                             <span>{{$row->designation}}</span><br>
                                                                                             <span>{{$row->email}}</span>
-                                                                                        </td>
-                                                                                        <td style="font-size: 11px;">{{$row->university_name}}<br>
+                                                                                        </td> 
+                                                                                        <td style="font-size: 11px;">
+                                                                                            @if($row->university_name)
+                                                                                                {{$row->university_name}}
+                                                                                            @else
+                                                                                              {{ cn($row, 'university.name','') }}
+                                                                                            @endif
+                                                                                             <br>
                                                                                             <span>{{$row->uni_website}}</span>
                                                                                         </td>
-                                                                                        <td style="font-size: 11px;">
-                                                                                            @if(isset($row->department))
-                                                                                                {{ cn($row, 'department_name.name','') }}
+                                                                                        <td style="font-size: 11px;"> 
+                                                                                            @if($row->others_department)
+                                                                                                {{ $row->others_department }}
                                                                                             @else
-                                                                                              {{ $row->others_department }}
+                                                                                                {{ cn($row, 'department_name.name','') }}
                                                                                             @endif
                                                                                         </td>
                                                                                         <td style="font-size: 11px; width: 9%;">
@@ -869,10 +879,10 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                 <div class="top_part_status" style="position: relative; width: fit-content; margin-left: 10px;">
                                                                                                     <span class="top_part_status_name" style="background-color: #d8fdd8; color: green;">
                                                                                                         @if($row->apply_status==1)
-                                                                                                        Active
+                                                                                                        Approved
                                                                                                         @endif
                                                                                                         @if($row->apply_status==2)
-                                                                                                        In active
+                                                                                                        Terminet
                                                                                                         @endif
                                                                                                         @if($row->apply_status==3)
                                                                                                         Suspend
@@ -930,7 +940,8 @@ tbody, td, tfoot, th, thead, tr {
                                                                                         <td style="font-size: 11px;">{{++$key}}</td>
                                                                                         <td style="font-size: 11px;"><span style="font-weight: bold !important;">
                                                                                             {{ $row->first_name }}  {{ $row->last_name }}
-                                                                                        </span>
+                                                                                        </span><br>
+                                                                                        {{$row->email}}
                                                                                         </td>
                                                                                         <td style="font-size: 11px;">
                                                                                             <div class="scrolled_content_part">
@@ -944,7 +955,12 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                                 <img class="img-responsive listFlag" style="border-radius: 20px; padding: 0px;height: 35px;width: 35px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($row,'country_name.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
                                                                                                             @endif
                                                                                                             <div class="inner_right ms-2">
-                                                                                                                <strong style="font-size:13px;">{{$row->university_name}}</strong></br>
+                                                                                                            @if($row->university_name)
+                                                                                                                <strong style="font-size:13px;">{{$row->university_name}}</strong> 
+                                                                                                            @else
+                                                                                                                <strong style="font-size:13px;">{{ cn($row, 'university.name','') }}</strong> 
+                                                                                                            @endif
+                                                                                                             <br> 
                                                                                                                 <strong style="font-size:10px !important; font-weight:100 !important;">{{$row->uni_website}}</strong>
                                                                                                             </div>
                                                                                                         </div>
@@ -952,10 +968,10 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                 </div>
                                                                                             </div>
                                                                                         </td>
-                                                                                        <td class="text-center" style="font-size: 11px;">@if(!empty($row->invitation_date)) {{ date('d M Y', strtotime($row->invitation_date)) }} @else -- @endif</td>
-                                                                                        <td class="text-center" style="font-size: 11px;">@if(!empty($row->registered_date)) {{ date('d M Y', strtotime($row->registered_date)) }} @else -- @endif</td>
+                                                                                        <td class="text-center" style="font-size: 11px;">@if(!empty($row->invitation_date)) {{ date('d M Y H:i:A', strtotime($row->invitation_date)) }} @else -- @endif</td>
+                                                                                        <td class="text-center" style="font-size: 11px;">@if(!empty($row->registered_date)) {{ date('d M Y H:i:A', strtotime($row->registered_date)) }} @else -- @endif</td>
                                                                                         <td class="text-center" style="font-size: 11px;">
-                                                                                            <span class="invitation hand tooltips" data-id="{{ $row->id }}" title="Sent Invitation"><i class="fa fa-paper-plane"></i></span>
+                                                                                            <span class="invitation hand tooltips" data-id="{{ $row->id }}" data-email="{{$row->email}}" title="Sent Invitation"><i class="fa fa-paper-plane"></i></span>
                                                                                         </td>
                                                                                     </tr>
                                                                                     @endforeach
@@ -984,7 +1000,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                                         <th>Email</th>
                                                                                         <th>Invited on</th>
                                                                                         <th>Registered</th>
-                                                                                        <th class="text-center">Invitation</th>
+                                                                                        {{-- <th class="text-center">Invitation</th> --}}
                                                                                     </tr>
                                                                                 </thead>
 
@@ -997,9 +1013,9 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                 <td style="font-size: 11px; width: 30%;">
                                                                                                     {{ $row->email }}                                                  
                                                                                                 </td>
-                                                                                                <td style="font-size: 11px;">@if(!empty($row->invitation_date)) {{ date('d M Y', strtotime($row->invitation_date)) }} @else -- @endif</td>
-                                                                                                <td style="font-size: 11px;">@if(!empty($row->registered_date)) {{ date('d M Y', strtotime($row->registered_date)) }} @else -- @endif</td>
-                                                                                                <td class="text-center">
+                                                                                                <td style="font-size: 11px;">@if(!empty($row->invitation_date)) {{ date('d M Y H:i:A', strtotime($row->invitation_date)) }} @else -- @endif</td>
+                                                                                                <td style="font-size: 11px;">@if(!empty($row->registered_date)) {{ date('d M Y H:i:A', strtotime($row->registered_date)) }} @else -- @endif</td>
+                                                                                                {{-- <td class="text-center">
                                                                                                     @php
                                                                                                       $user_invited_count = \DB::table('refer_users')->where('email',$row->email)->count();
                                                                                                     @endphp
@@ -1010,7 +1026,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                     @else
                                                                                                       --
                                                                                                     @endif
-                                                                                                </td>
+                                                                                                </td> --}}
                                                                                             </tr>
                                                                                         @endforeach
                                                                                         @else
@@ -1370,6 +1386,7 @@ tbody, td, tfoot, th, thead, tr {
             $('.invitation').on('click', function(e){
                 var self =$(this);
                 var id =$(this).data('id'); 
+                var send_email =$(this).data('email'); 
 
                 var form_data={
                 _token:"{{ csrf_token() }}",
@@ -1377,7 +1394,7 @@ tbody, td, tfoot, th, thead, tr {
                 }
                 swal({
                     title: "Are you sure?",
-                    text: "Do you want to send invaitation?",
+                    text: "Do you want to send invaitation this " + send_email + "?",
                     type: "warning",
                     showCancelButton: true,
                     confirmButtonClass: "btn btn-md btn-success",

resources/views/admin/sub_contents/edit_teacher_load.blade.php

@@ -57,14 +57,14 @@
                     </div>
                 </div>
             </div>
-            <div class="col-md-4 others_department" style="display: none;">
+            {{-- <div class="col-md-4 others_department" style="display: none;">
                 <div class="mb-2">
                     <label class="form-label config" >Others Department</label>
                     <div class="form-icon position-relative">
                         <input type="text" class="form-control" placeholder="Others Department" id="others_department" name="others_department" value="{{$edit_data->others_department}}" style="font-size: 13px;">
                     </div>
                 </div>
-            </div> 
+            </div>  --}}
             <div class="col-md-4">
                 <div class="mb-2">
                     <label class="form-label config">Website</label>
@@ -90,15 +90,15 @@
 
 <script>
     $(function(){
-        $('.department_id').change(function() { 
-            var value = $(this).attr('selected','selected').val();
-            if (value == "" ) {
-                $('.others_department').show();
-            } else {
-                $('.others_department').removeClass('display:none');
-                $('.others_department').hide();
-            }
-        });
+        // $('.department_id').change(function() { 
+        //     var value = $(this).attr('selected','selected').val();
+        //     if (value == "" ) {
+        //         $('.others_department').show();
+        //     } else {
+        //         $('.others_department').removeClass('display:none');
+        //         $('.others_department').hide();
+        //     }
+        // });
 
         $('.edit_register_pending_teacher_form').on('submit', function(event){
             event.preventDefault();

resources/views/admin/sub_contents/load_profile_info.blade.php

@@ -12,14 +12,20 @@
 </div>
 <div class="single_glance_row mt-1" style="display: flex;">
     <span class="title" style="font-size:11px; font-weight: 600;">University Name : </span>
-    <span style="font-size: 11px; color: #868e96;"> {{cn($tuser,'university.name','') }}</span>
+    <span style="font-size: 11px; color: #868e96;"> 
+        @if($tuser->university_name)
+        $tuser->university_name
+        @else
+        {{cn($tuser,'university.name','') }} 
+        @endif
+    </span>
 </div>
 <div class="single_glance_row mt-1" style="display: flex;">
     <span class="title" style="font-size:11px; font-weight: 600;">Department : </span>
-    @if(isset($tuser->department))
-        <span style="font-size: 11px; color: #868e96;"> {{ cn($tuser,'department_name.name','')}}</span>
-    @else
+    @if(isset($tuser->others_department))
         <span style="font-size: 11px; color: #868e96;"> {{ $tuser->others_department }}</span>
+    @else
+        <span style="font-size: 11px; color: #868e96;"> {{ cn($tuser,'department_name.name','')}}</span>
     @endif
 </div>   
 <div class="single_glance_row mt-1" style="display: flex;">

resources/views/admin/sub_contents/register_pending_teacher_load.blade.php

@@ -21,14 +21,20 @@
                     <span>{{$row->designation}}</span><br>
                     <span>{{$row->email}}</span>
                 </td>
-                <td style="font-size: 11px;"> {{ cn($row, 'university.name','') }}<br>
+                <td style="font-size: 11px;">
+                    @if($row->university_name)
+                        {{$row->university_name}}
+                    @else
+                      {{ cn($row, 'university.name','') }}
+                    @endif
+                     <br>
                     <span>{{$row->uni_website}}</span>
                 </td>
-                <td style="font-size: 11px;">
-                    @if(isset($row->department))
-                        {{ cn($row, 'department_name.name','') }}
+                <td style="font-size: 11px;"> 
+                    @if($row->others_department)
+                        {{ $row->others_department }}
                     @else
-                      {{ $row->others_department }}
+                        {{ cn($row, 'department_name.name','') }}
                     @endif
                 </td>
                 <td style="font-size: 11px; width: 9%;">

resources/views/auth/invited_register_form.blade.php

@@ -315,9 +315,14 @@
                   }
 
                   $.post("{{ route('ajax-post', ['name'=>'invitation_register_save']) }}", form_data, function(res){
-                    pop_up_msg(res.msg);
-                    $('.wait').waitMe("hide");
-                    window.location.href = "{{ url('/login-v2') }}";
+                      $('.wait').waitMe("hide");
+                      if(res.action=='redirect'){
+                          window.location.href = "{{ url('/login-v2') }}";
+                        }else{
+                            window.location.href = "{{ url('/login-v2') }}";
+                        }
+                     pop_up_msg(res.msg);
+                    
 
                   }).fail(function(err){
                     $('.wait').waitMe("hide");

resources/views/auth/wishlist_register_form.blade.php

@@ -161,7 +161,7 @@
 
                                                 <div class="row mb-4">
                                                     <div class="col-md-12">
-                                                        <input type="email" class="form-control disabled" name="email" value="{{ $user->email}}" id="email" required placeholder="Email" disabled>
+                                                        <input type="email" class="form-control" name="email" value="{{ $user->email}}" id="email" required placeholder="Email" disabled>
 
                                                     </div>
                                                 </div>
@@ -308,6 +308,9 @@
 
                   $.post("{{ route('ajax-post', ['name'=>'q_apply_wishlist_registration_save']) }}", form_data, function(res){
                     $('.wait').waitMe("hide");
+                    if(res.action=='redirect'){
+                        window.location.href = "{{ url('/login') }}";
+                    }
                     pop_up_msg(res.msg);
                       //window.location.href = "{{ url('/login') }}";
 

resources/views/email/approve_teacher_email.blade.php

@@ -109,7 +109,7 @@
                                     <p class="mt-2" style="margin: 0px;">Best regards,</p>
                                     <h6 class="mb-3">Research Admission Team</h6>
                                     <div style="border-top: 1px solid #eee;">
-                                        <p class="mt-3 tmail" style="font-style: italic;">This email was sent to example@gmail.com</p>
+                                        <p class="mt-3 tmail" style="font-style: italic;">This email was sent to {{$receive_email}}</p>
                                         <p class="mt-3 tmail" style="font-size: 12px;">Copyright © 2023 Research Admission</p>
                                     </div>
                             </div>

resources/views/email/invitation_to_supervisor_email.blade.php

@@ -104,7 +104,7 @@
                                 <h4 style="font-weight: 300 !important;"> Founder & CEO  </h4>
                                 <h4 style="font-weight: 300 !important;"> Research Admission Platform  </h4>
                                     <div style="border-top: 1px solid #eee;">
-                                    <p class="mt-3 tmail" style="font-style: italic;">This email was sent to example@gmail.com</p>
+                                    <p class="mt-3 tmail" style="font-style: italic;">This email was sent to {{$receive_email}}</p>
                                 </div>
                                 <p class="mt-3 tmail" style="font-size: 12px;">Copyright © {{date('Y')}} Research Admission</p>
                             </div>

resources/views/email/invitation_to_supervisor_email_with_checked.blade.php

@@ -106,7 +106,7 @@
                                 <h4 style="font-weight: 300 !important;"> Founder & CEO  </h4>
                                 <h4 style="font-weight: 300 !important;"> Research Admission Platform  </h4>
                                     <div style="border-top: 1px solid #eee;">
-                                    <p class="mt-3 tmail" style="font-style: italic;">This email was sent to example@gmail.com</p>
+                                    <p class="mt-3 tmail" style="font-style: italic;">This email was sent to {{$receive_email}}</p>
                                 </div>
                                 <p class="mt-3 tmail" style="font-size: 12px;">Copyright © {{date('Y')}} Research Admission</p>
                             </div>

resources/views/email/q_apply_wishlist_registration_email.blade.php

@@ -88,7 +88,7 @@
                                     <p class="mt-2" style="margin: 0px;">Best regards,</p>
                                     <p>Research Admission</p>
                                      <div style="border-top: 1px solid #eee;">
-                                        <p class="mt-3 tmail" style="font-style: italic;">This email was sent to example@gmail.com</p>
+                                        <p class="mt-3 tmail" style="font-style: italic;">This email was sent to {{$receive_email }}</p>
                                     </div>
                                     <p class="mt-3 tmail" style="font-size: 12px;">Copyright © 2023 Research Admission</p>
                             </div>

resources/views/email/q_form_email.blade.php

@@ -94,9 +94,9 @@
                                     <h5>{{ $teacher }}</h5>
                                     <h5>{{ $designation }}</h5>
                                     <h5>{{ $department }}</h5>
-                                    <h5>{{ $university }}</h5>
+                                    {{-- <h5>{{ $university }}</h5> --}}
                                      <div style="border-top: 1px solid #eee;">
-                                        <p class="mt-3 tmail" style="font-style: italic;">This email was sent to example@gmail.com</p>
+                                        <p class="mt-3 tmail" style="font-style: italic;">This email was sent to {{$receive_email}}</p>
                                     </div>
                                     <p class="mt-3 tmail" style="font-size: 12px;">Copyright © 2023 Research Admission</p>
                             </div>

resources/views/email/refer_email.blade.php

@@ -88,7 +88,7 @@
                                 <p class="mt-2" style="margin: 0px;">Best regards,</p>
                                 <h4>{{$applicant_name}}</h4>
                                     <div style="border-top: 1px solid #eee;">
-                                    <p class="mt-3 tmail" style="font-style: italic;">This email was sent to example@gmail.com</p>
+                                    <p class="mt-3 tmail" style="font-style: italic;">This email was sent to {{$receive_email}}</p>
                                 </div>
                                 <p class="mt-3 tmail" style="font-size: 12px;">Copyright © {{date('Y')}} Research Admission</p>
                             </div>

resources/views/email/register_teacher_email.blade.php

@@ -88,7 +88,7 @@
                                     <p class="mt-2" style="margin: 0px;">Best regards,</p>
                                     <h6>Research Admission Team</h6>
                                      <div style="border-top: 1px solid #eee;">
-                                        <p class="mt-3 tmail" style="font-style: italic;">This email was sent to example@gmail.com</p>
+                                        <p class="mt-3 tmail" style="font-style: italic;">This email was sent to {{$receive_email}}</p>
                                     </div>
                                     <p class="mt-3 tmail" style="font-size: 12px;">Copyright © 2023 Research Admission</p>
                             </div>

resources/views/email/student_proposal_email.blade.php

@@ -90,7 +90,7 @@
                                     <p class="mt-2" style="margin: 0px;">Best regards,</p>
                                     <h4>Research Admission Team</h4>
                                      <div style="border-top: 1px solid #eee;">
-                                        <p class="mt-3 tmail" style="font-style: italic;">This email was sent to example@gmail.com</p>
+                                        <p class="mt-3 tmail" style="font-style: italic;">This email was sent to {{$receive_email}}</p>
                                     </div>
                                     <p class="mt-3 tmail" style="font-size: 12px;">Copyright © 2023 Research Admission</p>
                             </div>

resources/views/email/student_signup_verify_email.blade.php

@@ -88,7 +88,7 @@
                                 <p class="mt-2" style="margin: 0px;">Best regards,</p>
                                 <p>Research Admission</p>
                                     <div style="border-top: 1px solid #eee;">
-                                    <p class="mt-3 tmail" style="font-style: italic; font-size: 12px;">This email was sent to example@gmail.com</p>
+                                    <p class="mt-3 tmail" style="font-style: italic; font-size: 12px;">This email was sent to {{$receive_email}}</p>
                                 </div>
                                 <p class="mt-3 tmail" style="font-size: 12px;">Copyright © {{date('Y')}} Research Admission</p>
                             </div>

resources/views/email/teacher_proposal_email.blade.php

@@ -89,7 +89,7 @@
                                 <p class="mt-2" style="margin: 0px;">Best regards,</p>
                                 <h6>Research Admission Team</h6>
                                     <div style="border-top: 1px solid #eee;">
-                                    <p class="mt-3 tmail" style="font-style: italic;">This email was sent to example@gmail.com</p>
+                                    <p class="mt-3 tmail" style="font-style: italic;">This email was sent to {{$receive_email}}</p>
                                 </div>
                                 <p class="mt-3 tmail" style="font-size: 12px;">Copyright © 2023 Research Admission</p>
                             </div>

resources/views/email/wishlist_email.blade.php

@@ -94,9 +94,9 @@
                                  <h5>{{ $teacher }}</h5>
                                  <h5>{{ $designation }}</h5>
                                  <h5>{{ $department }}</h5>
-                                 <h5>{{ $university }}</h5>
+                                 {{-- <h5>{{ $university }}</h5> --}}
                                     <div style="border-top: 1px solid #eee;">
-                                    <p class="mt-3 tmail" style="font-style: italic;">This email was sent to example@gmail.com</p>
+                                    <p class="mt-3 tmail" style="font-style: italic;">This email was sent to {{$receive_email}}</p>
                                 </div>
                                 <p class="mt-3 tmail" style="font-size: 12px;">Copyright © {{date('Y')}} Research Admission</p>
                             </div>

sql/update.sql

@@ -185,4 +185,11 @@ ALTER TABLE `users`
 	ADD COLUMN `apply_status` TINYINT(4) NULL DEFAULT '0' COMMENT '1=active, 2=in-active, 3=suspend' AFTER `registered_date`;
 
 ALTER TABLE `users`
-	ADD COLUMN `register_type` TINYINT(4) NULL DEFAULT '0' COMMENT '1=invitation, 2=wishlist/landing, 3=q_form' AFTER `sign_up`;
+	ADD COLUMN `register_type` TINYINT(4) NULL DEFAULT '0' COMMENT '1=invitation, 2=wishlist/landing, 3=q_form' AFTER `sign_up`;
+
+
+ALTER TABLE `users`
+	ADD COLUMN `university_id` INT(11) NULL DEFAULT NULL AFTER `university_name`;
+
+ALTER TABLE `users`
+	CHANGE COLUMN `department` `department` INT(11) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci' AFTER `university_id`;