|
@@ -133,7 +133,9 @@ class ModalController extends Controller{
|
|
if($user){
|
|
if($user){
|
|
$data['name'] = $student_data->first_name.' '.$student_data->last_name;
|
|
$data['name'] = $student_data->first_name.' '.$student_data->last_name;
|
|
$data['teacher'] = $proposal_user->first_name.' '.$proposal_user->last_name;
|
|
$data['teacher'] = $proposal_user->first_name.' '.$proposal_user->last_name;
|
|
- $data['arn'] = $proposal_user->ref_no;
|
|
|
|
|
|
+ $data['university'] = $proposal_user->university_name;
|
|
|
|
+ $data['submission_date'] = $student_data->created_at;
|
|
|
|
+ //$data['arn'] = $proposal_user->ref_no;
|
|
$user_mail =$student_data->email;
|
|
$user_mail =$student_data->email;
|
|
$from = 'asraful@revinr.com';
|
|
$from = 'asraful@revinr.com';
|
|
Mail::send('email.student_proposal_email',$data, function ($message) use ($user_mail,$from,$student_proposal) {
|
|
Mail::send('email.student_proposal_email',$data, function ($message) use ($user_mail,$from,$student_proposal) {
|
|
@@ -157,7 +159,7 @@ class ModalController extends Controller{
|
|
$from = 'asraful@revinr.com';
|
|
$from = 'asraful@revinr.com';
|
|
Mail::send('email.teacher_proposal_email',$data, function ($message) use ($user_mail,$from) {
|
|
Mail::send('email.teacher_proposal_email',$data, function ($message) use ($user_mail,$from) {
|
|
$message->from($from);
|
|
$message->from($from);
|
|
- $message->to($user_mail)->subject('New Email Send to you');
|
|
|
|
|
|
+ $message->to($user_mail)->subject('New Proposal Received - Action Required');
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
@@ -168,7 +170,7 @@ class ModalController extends Controller{
|
|
$user =Auth::guard('teacher')->user();
|
|
$user =Auth::guard('teacher')->user();
|
|
$validator=\Validator::make($req->all(), [
|
|
$validator=\Validator::make($req->all(), [
|
|
'name'=>'required',
|
|
'name'=>'required',
|
|
- 'email'=>'required|email|max:255|unique:users'
|
|
|
|
|
|
+ 'email'=>'required|email|max:255'
|
|
]);
|
|
]);
|
|
|
|
|
|
if($validator->fails()){
|
|
if($validator->fails()){
|
|
@@ -176,18 +178,25 @@ class ModalController extends Controller{
|
|
return response(['msg'=>$errors[0]], 422);
|
|
return response(['msg'=>$errors[0]], 422);
|
|
}
|
|
}
|
|
|
|
|
|
- $already_exists =User::where('email',$req->email)->exists();
|
|
|
|
|
|
+ // $already_exists =User::where('email',$req->email)->exists();
|
|
|
|
|
|
- if($already_exists){
|
|
|
|
- return response(['msg'=>'Sorry! this email is already exists!.'],403);
|
|
|
|
- }
|
|
|
|
|
|
+ // if($already_exists){
|
|
|
|
+ // return response(['msg'=>'Sorry! this email is already exists!.'],403);
|
|
|
|
+ // }
|
|
|
|
|
|
- $user_data =new User;
|
|
|
|
- $user_data->first_name =$req->name;
|
|
|
|
- $user_data->email =$req->email;
|
|
|
|
- $user_data->wishlist_teacher_id =$user->id;
|
|
|
|
- $user_data->user_type =1;
|
|
|
|
- $user_data->save();
|
|
|
|
|
|
+ $user_check_data =User::where('email',$req->email)->where('user_type',1)->doesntExist();
|
|
|
|
+
|
|
|
|
+ if($user_check_data){
|
|
|
|
+ $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 =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->save();
|
|
|
|
+ }
|
|
|
|
|
|
$refer =new ReferUser;
|
|
$refer =new ReferUser;
|
|
$refer->name =$req->name;
|
|
$refer->name =$req->name;
|
|
@@ -201,7 +210,10 @@ class ModalController extends Controller{
|
|
$data['teacher_id'] = $refer->teacher_id;
|
|
$data['teacher_id'] = $refer->teacher_id;
|
|
$data['student_id'] = $user_data->id;
|
|
$data['student_id'] = $user_data->id;
|
|
$data['std_email'] = $refer->email;
|
|
$data['std_email'] = $refer->email;
|
|
- $data['applicant_name'] = $user->first_name.' '.$user->last_name;
|
|
|
|
|
|
+ $data['teacher'] = $user->first_name.' '.$user->last_name;
|
|
|
|
+ $data['designation'] = $user->designation;
|
|
|
|
+ $data['department'] = $user->others_department;
|
|
|
|
+ $data['university'] = $user->university_name;
|
|
$user_mail = $refer->email;
|
|
$user_mail = $refer->email;
|
|
$from = 'asraful@revinr.com';
|
|
$from = 'asraful@revinr.com';
|
|
|
|
|
|
@@ -217,6 +229,8 @@ class ModalController extends Controller{
|
|
|
|
|
|
}elseif($name=="teacher_invited"){
|
|
}elseif($name=="teacher_invited"){
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
$admin =Admin::find($req->id);
|
|
$admin =Admin::find($req->id);
|
|
$validator=\Validator::make($req->all(), [
|
|
$validator=\Validator::make($req->all(), [
|
|
'name'=>'required',
|
|
'name'=>'required',
|
|
@@ -238,7 +252,7 @@ class ModalController extends Controller{
|
|
$user_data->admin_invite_id =$admin->id;
|
|
$user_data->admin_invite_id =$admin->id;
|
|
$user_data->user_type =2;
|
|
$user_data->user_type =2;
|
|
$user_data->register_type =1; // 1=invitation ; 2=wishlist/landing
|
|
$user_data->register_type =1; // 1=invitation ; 2=wishlist/landing
|
|
- $user_data->registered_date =now();
|
|
|
|
|
|
+ $user_data->invitation_date =now();
|
|
$user_data->save();
|
|
$user_data->save();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -260,15 +274,23 @@ class ModalController extends Controller{
|
|
$user_mail = $refer->email;
|
|
$user_mail = $refer->email;
|
|
$from = 'asraful@revinr.com';
|
|
$from = 'asraful@revinr.com';
|
|
|
|
|
|
- Mail::send('email.teacher_invited_email',$data, function ($message) use ($user_mail,$from) {
|
|
|
|
- $message->from($from);
|
|
|
|
- $message->to($user_mail)->subject('Manage Doctoral Applicants with Ease - You’re invited!');
|
|
|
|
- });
|
|
|
|
|
|
+ if($req->is_currently_open==1){
|
|
|
|
+ Mail::send('email.invitation_to_supervisor_email_with_checked',$data, function ($message) use ($user_mail,$from) {
|
|
|
|
+ $message->from($from);
|
|
|
|
+ $message->to($user_mail)->subject('Accepting Doctoral Applications? We Have a Tool to Simplify the Process!');
|
|
|
|
+ });
|
|
|
|
+ }else{
|
|
|
|
+ Mail::send('email.invitation_to_supervisor_email',$data, function ($message) use ($user_mail,$from) {
|
|
|
|
+ $message->from($from);
|
|
|
|
+ $message->to($user_mail)->subject('Manage Doctoral Applicants with Ease - You’re invited!');
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
$already_invited =ReferUser::where('email',$refer->email)->count();
|
|
$already_invited =ReferUser::where('email',$refer->email)->count();
|
|
|
|
|
|
- if($already_invited > 0) {
|
|
|
|
|
|
+ if($already_invited > 1) {
|
|
return response(
|
|
return response(
|
|
['msg'=>"Successfully saved. Already invitation send {$already_invited} times."]
|
|
['msg'=>"Successfully saved. Already invitation send {$already_invited} times."]
|
|
);
|
|
);
|