Update Apllication Proposal

app/Http/Controllers/Admin/AdminController.php

@@ -26,7 +26,7 @@ class AdminController extends Controller
 
     public function dashboard()
     {
-        $admin = Auth::guard('admin')->user(); 
+        $admin = Auth::guard('admin')->user();
 
         $register_active_teachers_list =User::where(
                 'apply_status',1
@@ -69,11 +69,15 @@ class AdminController extends Controller
                 'market_countries.*', \DB::raw('(SELECT name FROM countries WHERE market_countries.country_id = countries.id ) as sort')
             )->orderBy('sort')->get();
 
-        $refer_users =ReferUser::orderBy('id','DESC')->get();
+        $refer_users =User::whereIn(
+            'register_type',[3,4] // 3 = QForm ; 4 = Student Wishlist or Refer
+        )->where(
+            'user_type',2
+        )->orderBy('id','DESC')->get();
 
-        $application = StudentProposal::orderBy('id','DESC')->get(); 
+        $application = StudentProposal::orderBy('id','DESC')->get();
 
-        $data =[ 
+        $data =[
           'register_active_teachers_list'=>$register_active_teachers_list,
           'register_student_list'=>$register_student_list ,
           'market_countries'=>$market_countries,

resources/views/admin/admin_profile.blade.php

@@ -607,7 +607,7 @@ tbody, td, tfoot, th, thead, tr {
                                         @else
                                          <tr>
                                             <td colspan="6" class="text-center text-danger">No data found!</td>
-                                        </tr> 
+                                        </tr>
                                         @endif
                                     </tbody>
                                 </table>
@@ -666,7 +666,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                             {{-- <div class="inner_left mt-1" style="border: 1px solid black; border-radius: 20px; padding: 9px 4px 5px 8px; height: 37px; width: 37px;">
                                                                                                                 <i class="fa fa fa-university ms-1"></i>
                                                                                                             </div> --}}
-                                                                                                            @if($row->nationality) 
+                                                                                                            @if($row->nationality)
                                                                                                                 <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 mt-1">
@@ -754,17 +754,14 @@ tbody, td, tfoot, th, thead, tr {
                                                                                     @foreach($refer_users as $key=>$row)
                                                                                     <tr>
                                                                                         <td style="font-size: 11px;">{{$key+1}}</td>
-                                                                                        <td style="font-size: 11px;">{{$row->name}}</td>
+                                                                                        <td style="font-size: 11px;">{{$row->first_name}} {{$row->last_name}}</td>
                                                                                         <td style="font-size: 11px;">{{$row->email}}</td>
                                                                                         <td style="font-size: 11px;">{{date('y M', strtotime($row->created_at))}}</td>
-                                                                                        <td style="font-size: 11px;">{{cn($row, 'refer_by_user.first_name','')}} {{cn($row, 'refer_by_user.last_name','')}}</td>
+                                                                                        <td style="font-size: 11px;"></td>
                                                                                         <td style="font-size: 11px; text-align:center;">
-                                                                                            @php
-                                                                                                $refer_signup_user = \App\User::where('email',$row->email)->where('sign_up',1)->first();
-                                                                                            @endphp
-                                                                                            @if($refer_signup_user)
-                                                                                                <span class="label_badge_radius" style="background-color: #d8fdd8; color: green;">Yes</span><br> 
-                                                                                                <span>{{date('y M', strtotime($refer_signup_user->registered_date))}}</span> 
+                                                                                            @if($row->sign_up ==1)
+                                                                                                <span class="label_badge_radius" style="background-color: #d8fdd8; color: green;">Yes</span><br>
+                                                                                                <span>{{date('y M', strtotime($row->registered_date))}}</span>
                                                                                             @else
                                                                                             <span class="label_badge_radius" style="background-color: #d8fdd8; color: rgb(230, 13, 13);">No</span><br>
                                                                                             @endif
@@ -830,7 +827,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                 <div class="row align-items-center">
                                                                     <div class="col-md-12">
                                                                         <div id="pending_teacher_load"></div>
-                                                                        
+
                                                                     </div><!--end col-->
                                                                 </div><!--end row-->
                                                             </div><!--end teb pane-->
@@ -857,7 +854,7 @@ 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>
                                                                                         <td style="font-size: 11px;">
                                                                                             @if($row->university_name)
                                                                                                 {{$row->university_name}}
@@ -867,7 +864,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                                              <br>
                                                                                             <span>{{$row->uni_website}}</span>
                                                                                         </td>
-                                                                                        <td style="font-size: 11px;"> 
+                                                                                        <td style="font-size: 11px;">
                                                                                             @if($row->others_department)
                                                                                                 {{ $row->others_department }}
                                                                                             @else
@@ -951,16 +948,16 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                             {{-- <div class="inner_left mt-1" style="border: 1px solid black; border-radius: 20px; padding: 9px 4px 5px 8px; height: 37px; width: 37px;">
                                                                                                                 <i class="fa fa fa-university ms-1"></i>
                                                                                                             </div> --}}
-                                                                                                            @if($row->nationality) 
+                                                                                                            @if($row->nationality)
                                                                                                                 <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">
                                                                                                             @if($row->university_name)
-                                                                                                                <strong style="font-size:13px;">{{$row->university_name}}</strong> 
+                                                                                                                <strong style="font-size:13px;">{{$row->university_name}}</strong>
                                                                                                             @else
-                                                                                                                <strong style="font-size:13px;">{{ cn($row, 'university.name','') }}</strong> 
+                                                                                                                <strong style="font-size:13px;">{{ cn($row, 'university.name','') }}</strong>
                                                                                                             @endif
-                                                                                                             <br> 
+                                                                                                             <br>
                                                                                                                 <strong style="font-size:10px !important; font-weight:100 !important;">{{$row->uni_website}}</strong>
                                                                                                             </div>
                                                                                                         </div>
@@ -1011,7 +1008,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                 <td style="font-size: 11px;">{{ ++$key }}</td>
                                                                                                 <td style="font-size: 11px; width: 22%;">{{ $row->first_name }}  {{ $row->last_name }}</td>
                                                                                                 <td style="font-size: 11px; width: 30%;">
-                                                                                                    {{ $row->email }}                                                  
+                                                                                                    {{ $row->email }}
                                                                                                 </td>
                                                                                                 <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>
@@ -1021,7 +1018,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                     @endphp
                                                                                                     @if($user_invited_count > 1)
                                                                                                     <span class="badge bg-secondary">
-                                                                                                        {{ $user_invited_count }} 
+                                                                                                        {{ $user_invited_count }}
                                                                                                     </span>
                                                                                                     @else
                                                                                                       --
@@ -1340,7 +1337,7 @@ tbody, td, tfoot, th, thead, tr {
             fetch_sub_content(
                 '#pending_teacher_load',
                 "{{ route('sub-content', ['name'=>'register_pending_teacher_load']) }}"
-            ); 
+            );
 
             $('.status_change').on('click', function(e){
                 var self =$(this);
@@ -1385,12 +1382,12 @@ 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 id =$(this).data('id');
+                var send_email =$(this).data('email');
 
                 var form_data={
                 _token:"{{ csrf_token() }}",
-                'id':id, 
+                'id':id,
                 }
                 swal({
                     title: "Are you sure?",
@@ -1404,7 +1401,7 @@ tbody, td, tfoot, th, thead, tr {
 
                     if(isConfirm) {
                         $.post("{{ route('ajax-post', ['name'=>'landing_invitation_email_send'])}}" ,form_data).done(function(res){
-                            pop_up_msg(res.msg); 
+                            pop_up_msg(res.msg);
                         }).fail(function(error){
 
                                 let msg='Sorry!, form submission failed try again later.';