Browse Source

Send Email

Mostafijur Rahman 1 year ago
parent
commit
2bf9f70dae

+ 1 - 1
app/Http/Controllers/AjaxController.php

@@ -443,7 +443,7 @@ class AjaxController extends Controller
 
                 if($is_student_proposal_exists){
                     return response(
-                        ['msg'=>'Already pending a proposal'],403
+                        ['msg'=>'You have already received an invitation. Please login to your account to submit'],403
                     );
                 }else{
 

+ 2 - 0
app/Http/Controllers/ModalController.php

@@ -72,7 +72,9 @@ class ModalController extends Controller{
             $data['countries'] =Country::where('status',1)->orderBy('name','ASC')->get();
             //$data['universities'] =University::orderBy('name','ASC')->get();
         }elseif($name=="send_email_document_information"){
+            $data['teacher']=Auth::guard('teacher')->user();
             $data['std_proposal']=StudentProposal::find($req->id);
+            $data['doc_requirement_list']=Requirement::where('std_proposal_id',$req->id)->get();
         }else $name='default';
 
 

BIN
public/css/moment-timezone.zip


+ 2 - 2
resources/views/Q_apply_form.blade.php

@@ -266,10 +266,10 @@
                                         <div class="card-body" style="padding: 0px;">
                                              <h3 class="mb-3" style="font-size: 22px !important; line-height: 43px; font-weight: 700; text-align: left; color: #3c3d5b;">You're going to submit your doctoral application proposal to - </h3>
                                              <div class="uni_details" style="display:flex;">
-                                                    @if($user->nationality)
+                                                    @if(isset($user->university->country))
                                                     <div class="mt-2"> 
                                                             {{-- <p style="color:white; font-weight:600 !important; letter-spacing: 2px;">{{ strtoupper(mb_substr($user->first_name, 0, 1) . mb_substr($user->last_name, 0, 1)) }}</p> --}}
-                                                        <img class="img-responsive listFlag mt-2" style="padding:0px; height: 63px; width: 63px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($user,'country_name.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+                                                        <img class="img-responsive listFlag mt-2" style="padding:0px; height: 63px; width: 63px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($user,'university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
                                                     </div>
                                                     @endif 
                                                     <div class="alert" style="margin-bottom: 0px; color: #3c3d5b;">

+ 6 - 1
resources/views/admin/admin_profile.blade.php

@@ -903,7 +903,12 @@ tbody, td, tfoot, th, thead, tr {
                                                                                             @endif
                                                                                             <br>
                                                                                             @if($row->last_logged_at)
-                                                                                            {{utc_to_ltz($row->last_logged_at, 'd M Y g:i A', local_tz($admin))}}
+                                                                                            <span style="color: #808080;"> 
+                                                                                                Last Login :
+                                                                                            </span>
+                                                                                            <span style="color: #808080;"> 
+                                                                                                {{utc_to_ltz($row->last_logged_at, 'd M Y g:i A', local_tz($admin))}}
+                                                                                            </span>
                                                                                             @endif
                                                                                         </td>
                                                                                         <td style="font-size: 11px; width: 9%;">

+ 36 - 13
resources/views/modal_pages/send_email_document_information.blade.php

@@ -57,7 +57,9 @@
 
 <form class="req-email-form" action="{{ url()->current() }}" method="POST">
     <div class="form-row mb-0">
-    
+        <input type="hidden" name="teacher_id" value="{{ $std_proposal->teacher_id }}">
+        <input type="hidden" name="student_id" value="{{ $std_proposal->student_id }}">
+        <input type="hidden" name="id" value="{{ $std_proposal->id }}">
         <div class="col-md-3 d-none">
             <ul class="list-group">
     
@@ -111,27 +113,48 @@
                     <div class="col-md-12">
                         <div class="row">
                             <div class="col-md-8 mt-3 mb-3">
-                                <h5 style="margin: 0px;"> H Rahman </h5>
-                                <span style="margin: 0px;"> University of Hull</span>
-                                <span> • </span>
-                                <span> Masters </span>
+                                <h5 style="margin: 0px;"> {{cn($std_proposal,'student_details.first_name','')}} {{cn($std_proposal,'student_details.last_name','')}} </h5>
+                                {{-- <span style="margin: 0px;">
+                                    @if($std_proposal->student_details->university_name)
+                                     {{cn($std_proposal,'student_details.university_name','')}}
+                                     @else
+                                     {{cn($std_proposal,'student_details.universit.name','')}}
+                                    @endif
+                                </span>
+                                <span> • </span> --}}
+                                {{-- <span> Masters </span> --}}
+                                <p style="margin: 0px;">Apply Ref : {{ $std_proposal->student_apply_ref ?? "N/A"}}</p>
                             </div>
                             <div class="col-md-4  mt-3 mb-3" style="text-align: end;">
-                                <p style="margin: 0px;">31 May, 2023</p>
-                                <p style="margin: 0px;">Our Reference : 12345678</p>
+                                <p style="margin: 0px;">{{ Carbon\Carbon::now()->format('d M, Y')}}</p>
+                                {{-- <p style="margin: 0px;">Our Reference : {{ $std_proposal->student_apply_ref ?? "N/A"}}</p> --}}
                             </div>
                         </div>
                         <div style="border-bottom: 1px solid #eee;"></div>
                     </div>
                     
-                    <p class="mt-3">Dear [Applicant’s Name], </p>
+                    <p class="mt-3">Dear {{cn($std_proposal,'student_details.first_name','')}} {{cn($std_proposal,'student_details.last_name','')}},</p>
                     <p class="mt-3" style="margin: 0px;">Thank you for submitting your research proposal. </p>
                     <p class="mt-3" style="margin: 0px;">To further evaluate your application, the following documents/information are required: </p>
-                    <p class="mt-3" style="margin: 0px;">(list of docs/info) </p>   
+                    <ul>
+                        @if(count($doc_requirement_list) > 0)
+                        @foreach($doc_requirement_list as $row)
+                        <li>
+                            <div class="input-group mt-2"> 
+                                <div class="input-group-addon">
+                                    <div class="checkbox-bird green" style="margin: 0px;">
+                                         {{ $row->requirement_title}}
+                                    </div>
+                                </div>
+                            </div>
+                        </li>
+                        @endforeach
+                        @endif
+                    </ul>  
                     <p class="mt-3" style="margin: 0px;">I highly recommend that you provide the required documents/information as soon as possible to avoid any delays in the review process. </p>
                     <p class="mt-3" style="margin: 0px;">Looking forward to hearing from you. </p>
                     <p class="mt-3" style="margin: 0px;">Thanking you</p>
-                    <p> [teacher name] </p>
+                    <p> {{cn($std_proposal,'teacher_details.first_name','')}} {{cn($std_proposal,'teacher_details.last_name','')}} </p>
                     </div>  
                 </div>      
             </div>
@@ -141,10 +164,10 @@
     
     <div id="div_send_mail" class="row mt-3">
         <div class="col" style="text-align: end;">
-            <button type="button" class="btn btn-inline cancel_button" data-dismiss="modal">
+            {{-- <button type="button" class="btn btn-inline cancel_button" data-dismiss="modal">
                 Cancel
-            </button>
-            <button type="button" class="btn btn-inline submit_button btn-submit mr-0 btn-send">
+            </button> --}}
+            <button type="submit" class="btn btn-inline submit_button btn-submit mr-0 btn-send">
                 Send
             </button> 
         </div>