Student QForm & Wishlist Modified

app/Http/Controllers/AjaxController.php

@@ -429,31 +429,11 @@ class AjaxController extends Controller
                 return response(['msg'=>$errors[0]], 422);
             }
 
-            $new_user =User::where(
-                'email',$req->email
-            )->where(
-                'user_type',1
-            )->where(
-                'sign_up',1
-            )->doesntExist();
-
-
-            if($new_user){
-               $user_data =new User;
-               $user_data->first_name =$req->name;
-               $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 ; 4=student_wishlist
-               $user_data->invitation_date =now();
-               $user_data->wishlist_teacher_id =$req->id;
-               $user_data->save();
-            }
 
             $user =User::where('email',$req->email)->where('user_type',1)->first();
 
             if($user){
-                $student_proposal_applyed =StudentProposal::where(
+                $is_student_proposal_exists =StudentProposal::where(
                     'teacher_id',$req->id
                 )->where(
                     'student_id',$user->id
@@ -461,11 +441,9 @@ class AjaxController extends Controller
                     'proposal_status',[1,2,3,4] // 1 =New; 2 =In Review; 3=Push; 4=Hold;
                 )->exists();
 
-                //dd($student_proposal_applyed);
-
-                if($student_proposal_applyed){
+                if($is_student_proposal_exists){
                     return response(
-                        ['msg'=>'Already pending a proposal']
+                        ['msg'=>'Already pending a proposal'],403
                     );
                 }else{
 
@@ -481,60 +459,66 @@ class AjaxController extends Controller
                     $refer->teacher_id =$req->id;
                     $refer->q_form_status =1;
                     $refer->save();
-
-                    $old_user =User::where(
-                        'email',$req->email
-                    )->where(
-                        'user_type',1
-                    )->where(
-                        'sign_up',1
-                    )->exists();
-
-                    if($old_user){
-                        return response(
-                            ['msg'=>'Already an account associated with this email ID.','action'=>'old_user']
-                        );
+                }
+            }else{
+                $user_data =new User;
+                $user_data->first_name =$req->name;
+                $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 ; 4=student_wishlist
+                $user_data->invitation_date =now();
+                $user_data->wishlist_teacher_id =$req->id;
+                $user_data->save();
+
+                $student_proposal =new StudentProposal;
+                $student_proposal->student_id =$user->id;
+                $student_proposal->teacher_id =$req->id;
+                $student_proposal->save();
+
+                $refer =new ReferUser;
+                $refer->name =$req->name;
+                $refer->email =$req->email;
+                $refer->refer_by =$user->id;
+                $refer->teacher_id =$req->id;
+                $refer->q_form_status =1;
+                $refer->save();
+
+                if($refer->save()){
+                    $teacher = User::find($refer->teacher_id);
+
+                    if($teacher->others_department){
+                        $department =$teacher->others_department;
+                    }else{
+                        $department = cn($teacher,'department_name.name','');
                     }
 
-                    if($refer->save()){
-                        $teacher = User::find($refer->teacher_id);
-
-                        if($teacher->others_department){
-                            $department =$teacher->others_department;
-                        }else{
-                            $department = cn($teacher,'department_name.name','');
-                        }
-
-                        if($teacher->university_name){
-                            $university =$teacher->university_name;
-                        }else{
-                            $university = cn($teacher,'university.name','');
-                        }
-
-
-                        $data['name'] = $refer->name;
-                        $data['student_id'] = $user->id;
-                        $data['teacher'] = $teacher->first_name.' '.$teacher->last_name;
-                        $data['designation'] = $teacher->designation;
-                        $data['department'] = $department;
-                        $data['university'] = $university;
-                        $data['email'] =$refer->email;
-                        $data['receive_email']=$refer->email;
-                        $user_mail = $refer->email;
-                        $from = 'asraful@revinr.com';
-
-                        Mail::send('email.q_form_email',$data, function ($message) use ($user_mail,$from) {
-                            $message->from($from);
-                            $message->to($user_mail)->subject('Invitation to submit your doctoral application');
-                        });
+                    if($teacher->university_name){
+                        $university =$teacher->university_name;
+                    }else{
+                        $university = cn($teacher,'university.name','');
                     }
-                }
 
 
+                    $data['name'] = $refer->name;
+                    $data['student_id'] = $user->id;
+                    $data['teacher'] = $teacher->first_name.' '.$teacher->last_name;
+                    $data['designation'] = $teacher->designation;
+                    $data['department'] = $department;
+                    $data['university'] = $university;
+                    $data['email'] =$refer->email;
+                    $data['receive_email']=$refer->email;
+                    $user_mail = $refer->email;
+                    $from = 'asraful@revinr.com';
 
+                    Mail::send('email.q_form_email',$data, function ($message) use ($user_mail,$from) {
+                        $message->from($from);
+                        $message->to($user_mail)->subject('Invitation to submit your doctoral application');
+                    });
+                }
             }
             return response(
-                ['msg'=>'Saved successfully. Please check your email for register.']
+                ['msg'=>'Saved successfully.']
             );
         }elseif($name=="q_apply_wishlist_registration_save"){
 
@@ -637,14 +621,10 @@ class AjaxController extends Controller
                 'sign_up',1
             )->first();
 
-
             if($isExists){
-                //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);

app/Http/Controllers/ModalController.php

@@ -268,7 +268,7 @@ class ModalController extends Controller{
             return response(['msg'=>'Successfully updated.']);
 
         }elseif($name=="add_wishlist"){
-            $user =Auth::guard('teacher')->user();
+            $teacher =Auth::guard('teacher')->user();
             $validator=\Validator::make($req->all(), [
                 'name'=>'required',
                 'email'=>'required|email|max:255'
@@ -279,15 +279,35 @@ class ModalController extends Controller{
                 return response(['msg'=>$errors[0]], 422);
             }
 
-            // $already_exists =User::where('email',$req->email)->exists();
 
-            // if($already_exists){
-            //     return response(['msg'=>'Sorry! this email is already exists!.'],403);
-            // }
+            $is_user_exists=User::where('email',$req->email)->where('user_type',1)->exists();
+
+            if($is_user_exists){
 
-            $user_check_data =User::where('email',$req->email)->where('user_type',1)->doesntExist();
+                $user_notify =User::where('email',$req->email)->where('user_type',1)->first();
 
-            if($user_check_data){
+                $is_student_proposal_exists =StudentProposal::where(
+                    'teacher_id',$teacher->id
+                )->where(
+                    'student_id',$user_notify->id
+                )->whereIn(
+                    'proposal_status',[1,2,3,4] // 1 =New; 2 =In Review; 3=Push; 4=Hold;
+                )->exists();
+
+                if($is_student_proposal_exists){
+                    return response(
+                        ['msg'=>'Already pending a proposal'],403
+                    );
+                }else{
+                    $refer =new ReferUser;
+                    $refer->name =$req->name;
+                    $refer->email =$req->email;
+                    $refer->refer_by =$teacher->id;
+                    $refer->teacher_id =$teacher->id;
+                    $refer->save();
+                }
+
+            }else{
                 $user_data =new User;
                 $user_data->first_name =$req->name;
                 $user_data->email =$req->email;
@@ -295,29 +315,26 @@ class ModalController extends Controller{
                 $user_data->status =0;
                 $user_data->register_type =4; // 1=invitation ; 2= landing/wishlish; 3 =q_form ; 4=student-wishlist
                 $user_data->invitation_date =now();
-                $user_data->wishlist_teacher_id =$user->id;
+                $user_data->wishlist_teacher_id =$teacher->id;
                 $user_data->save();
-            }
-
-            $refer =new ReferUser;
-            $refer->name =$req->name;
-            $refer->email =$req->email;
-            $refer->refer_by =$user->id;
-            $refer->teacher_id =$user->id;
-            $refer->save();
 
+                $refer =new ReferUser;
+                $refer->name =$req->name;
+                $refer->email =$req->email;
+                $refer->refer_by =$teacher->id;
+                $refer->teacher_id =$teacher->id;
+                $refer->save();
 
-            $user_notify =User::where('email',$req->email)->where('user_type',1)->first();
+                $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_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['teacher'] = $teacher->first_name.' '.$teacher->last_name;
+                $data['designation'] = $teacher->designation;
+                $data['department'] = $teacher->others_department;
+                $data['university'] = $teacher->university_name;
                 $data['receive_email']=$refer->email;
                 $user_mail = $refer->email;
                 $from = 'asraful@revinr.com';
@@ -327,9 +344,8 @@ class ModalController extends Controller{
                     $message->to($user_mail)->subject('Research Admission Platform Sign-Up');
                 });
             }
-
             return response(
-                ['msg'=>'Refer saved successfully.']
+                ['msg'=>'Wishlist saved successfully.']
             );
 
         }elseif($name=="teacher_invited"){

resources/views/teacher_profile.blade.php

@@ -584,7 +584,7 @@ tbody, td, tfoot, th, thead, tr {
                                                     <span>{{cn($row,'student_details.first_name','')}} {{cn($row,'student_details.last_name','')}}</span>
                                                 </div>
                                                 <div style="font-size: 11px;">
-                                                    <a href="" class="" style="color: black;"><span class="label_badge_work"> {{$row->student_apply_ref}} </span></a>
+                                                    <a href="" class="" style="color: black;"><span class="label_badge_work"> {{$row->student_apply_ref ?? "N/A"}} </span></a>
                                                 </div>
                                                 <div style="font-size: 11px;">
                                                     <span style="color: black;">{{ date("d M, Y", strtotime(cn($row,'student_details.dob','')))}}</span>
@@ -595,13 +595,13 @@ tbody, td, tfoot, th, thead, tr {
                                                     <span style="color: black;">{{cn($row,'institutes.institution','')}}</span>
                                                 </div>
                                                 <div style="font-size: 11px;">
-                                                    <span style="color: black;">{{date('M Y',strtotime(cn($row,'institutes.start_date','')))}} - {{date('M Y',strtotime(cn($row,'institutes.end_date','')))}}</span>
+                                                    <span style="color: black;">{{date('M Y',strtotime(cn($row,'institutes.start_date','N/A')))}} - {{date('M Y',strtotime(cn($row,'institutes.end_date','N/A')))}}</span>
                                                 </div>
                                                 <div class="mt-1" style="font-size: 11px;">
                                                     <span class="label_badge_gpa">{{cn($row,'institutes.result','')}} (GPA)</span>
                                                 </div>
                                             </td>
-                                            <td style="font-size: 11px; text-align:center; color: black;">{{cn($row,'scores.test_name','')}}
+                                            <td style="font-size: 11px; text-align:center; color: black;">{{cn($row,'scores.test_name','N/A')}}
                                                 <div style="font-size: 11px;">
                                                     <span style="color: black;">{{cn($row,'scores.overall_score','')}}</span>
                                                 </div>
@@ -661,7 +661,7 @@ tbody, td, tfoot, th, thead, tr {
                                             </td>
                                             <td style="font-size: 11px; text-align:center;">
 
-                                                <div class="top_part_status"> 
+                                                <div class="top_part_status">
                                                     @if($row->accepted_status==1 && $row->proposal_status ==1)
                                                          <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Reviewing</button>
                                                     @elseif($row->accepted_status==1 && $row->proposal_status ==2)
@@ -673,14 +673,14 @@ tbody, td, tfoot, th, thead, tr {
                                                     @elseif($row->accepted_status==1 && $row->proposal_status ==5)
                                                         <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Interested</button>
                                                     @elseif($row->accepted_status==1 && $row->proposal_status ==6)
-                                                        <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Rejected</button>  
+                                                        <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Rejected</button>
                                                     @else
                                                         <button class="btn btn2 accept_status_update" data-id="{{$row->id}}" style="padding: 1px 10px !important; font-size: 11px;">Accept</button>
                                                     @endif
 
                                                     @if($row->proposal_status_date)
                                                        <br>
-                                                      <span style="font-size:11px; font-weight: bold;">{{date('d M Y H:i:A', strtotime($row->proposal_status_date))}}</span> 
+                                                      <span style="font-size:11px; font-weight: bold;">{{date('d M Y H:i:A', strtotime($row->proposal_status_date))}}</span>
 
                                                     @endif
                                                 </div>
@@ -723,11 +723,11 @@ tbody, td, tfoot, th, thead, tr {
                                                   $submitted =\DB::table('student_proposals')->where(
                                                     'student_id',$row->id
                                                   )->where(
-                                                    'teacher_id',$teacher_id 
+                                                    'teacher_id',$teacher_id
                                                   )->where(
                                                     'proposal_submit_status',1
                                                   )->orderBy('id','DESC')->first();
-                                                @endphp 
+                                                @endphp
                                                 @if(!empty($submitted->submitted_date)) {{ date('d M Y h.i A', strtotime($submitted->submitted_date)) }} @else -- @endif
                                             </td>
                                             <td style="font-size: 11px;">
@@ -991,33 +991,7 @@ tbody, td, tfoot, th, thead, tr {
                                     </div><!--end col-->
                                 </div>
                             </div><!--end col-->
-                            <!-- <div class="col-md-3 bg-white rounded p-2 ms-4">
-                                <div class="row">
-                                    <div class="col-md-10">
-                                            <h6 style="padding: 13px 10px 0px; color: #141639c4; font-weight:bold !important;">Subscription</h6>
-                                        <div class="left mb-2">
-                                            <div>
-                                                <div class="single_glance_row mt-5">
-                                                    <span class="title" style="font-size:11px; font-weight: 600;">Joined :</span>
-                                                    <span class="tbl2 mb-2 ms-2">
-                                                        16 Mar 2023
-                                                    </span>
-                                                </div>
-                                                <div class="single_glance_row mt-1">
-                                                    <span class="title" style="font-size:11px; font-weight: 600;">Referred :</span>
-                                                    <span class="ms-2" style="font-size: 11px; color: #868e96;">10</span>
-                                                </div>
-                                                <div class="single_glance_row mt-1" style="display: flex;">
-                                                    <span class="title" style="font-size:11px; font-weight: 600;">Account Type :</span>
-                                                    <span class="label_badge_radius mb-1 ms-2" style="background: #d8fdd8; color: green;">
-                                                        Premium
-                                                    </span>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                 </div>
-                            </div> -->
+
                             <div class="col-md-3 bg-white rounded mt-2 p-2 ms-3" style="width: 30%;">
                                 <div class="row">
                                     <div class="col-md-12">