Merge pull request #3755 from ColoredCow/feature/create-project-on-prospect-conversion

P4NK4J · web-flow · commit 06a69a4de127 · 2025-02-26T19:28:40.000+05:30
Project Setup after Prospect conversion
diff --git a/Modules/Project/Emails/EffortsheetSetupMail.php b/Modules/Project/Emails/EffortsheetSetupMail.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Modules\Project\Emails;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class EffortsheetSetupMail extends Mailable
+{
+    use Queueable;
+    use SerializesModels;
+
+    public $project;
+    public $emails = [];
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct($project, array $emails)
+    {
+        $this->project = $project;
+        $this->emails = $emails;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        $mail = $this->subject("Project Effortsheet Setup Request: {$this->project->name}")
+                    ->from(config('mail.from.address'))
+                    ->to($this->emails['infrasupport_email'])
+                    ->cc($this->emails['key_account_manager'])
+                    ->view('project::mail.initiate-project-email')
+                    ->with([
+                        'project' => $this->project,
+                    ]);
+
+        return $mail;
+    }
+}
diff --git a/Modules/Project/Http/Controllers/ProjectController.php b/Modules/Project/Http/Controllers/ProjectController.php
@@ -45,9 +45,10 @@ public function index()
      */
     public function create()
     {
+        $projectData = session('projectData', []);
         $clients = $this->service->getClients($status = 'all');
 
-        return view('project::create')->with('clients', $clients);
+        return view('project::create')->with(['clients' => $clients, 'projectData' => $projectData]);
     }
 
     /**
diff --git a/Modules/Project/Http/Requests/ProjectRequest.php b/Modules/Project/Http/Requests/ProjectRequest.php
@@ -45,6 +45,7 @@ public function rules()
                     'start_date' => 'nullable|date',
                     'end_date' => 'nullable|date',
                     'is_amc' => 'nullable',
+                    'send_mail_to_infra' => 'nullable',
                 ];
                 break;
 
@@ -64,6 +65,7 @@ public function rules()
                     'start_date' => 'nullable|date',
                     'end_date' => 'nullable|date',
                     'is_amc' => 'nullable',
+                    'send_mail_to_infra' => 'nullable',
                 ];
                 break;
 
diff --git a/Modules/Project/Resources/views/mail/initiate-project-email.blade.php b/Modules/Project/Resources/views/mail/initiate-project-email.blade.php
@@ -0,0 +1,25 @@
+<div>
+    <style>
+        .line {
+            line-height: 1px;
+        }
+        
+    </style>
+    <p>Hi Infrastructure Support Team,</p>
+
+    <p>This is to put a request to set up a project folder and its effortsheet. Please find the necessary details below:</p>
+
+    <ul>
+        <li><strong>Project Name:</strong> {{ $project->name }}</li>
+        <li><strong>Client Name:</strong> {{ $project->client->name }}</li>
+        <li><strong>Billing Type:</strong> {{ Str::of($project->type)->replace('-', ' ')->title() }}</li>
+        <li><strong>Due Date:</strong> {{ now()->format('d M Y') }}</li>
+    </ul>
+
+    <p>We've copied the key account manager in the email thread. Once processed, please share the link on this thread. If you come across any queries or need assistance with details, please drop an email here.</p>
+
+    <br>
+    <p class="line">Best,</p>
+    <p class="line">Portal Team</p>
+    <p class="line">ColoredCow</p>
+</div>
diff --git a/Modules/Project/Resources/views/subviews/create-project-details.blade.php b/Modules/Project/Resources/views/subviews/create-project-details.blade.php
@@ -5,14 +5,14 @@
             <div class="form-group col-md-5">
                 <label for="name" class="field-required">Name</label>
                 <input type="text" class="form-control" name="name" id="name" placeholder="Enter project name"
-                    required="required" value="{{ old('name') }}">
+                    required="required" value="{{ old('name', $projectData['name'] ?? '') }}">
             </div>
             <div class="form-group offset-md-1 col-md-5">
                 <label for="client_id" class="field-required">Client</label>
                 <select name="client_id" id="client_id" class="form-control" required="required">
                     <option value="">Select client</option>
                     @foreach ($clients as $client)
-                        <option value="{{ $client->id }}" {{ old('client_id') == $client->id ? 'selected' : '' }}>{{ $client->name }}</option>
+                        <option value="{{ $client->id }}" {{ old('client_id', $projectData['client_id'] ?? '') == $client->id ? 'selected' : '' }}>{{ $client->name }}</option>
                     @endforeach
                 </select>
             </div>
@@ -22,7 +22,7 @@
                 <label for="status" class="field-required">Status</label>
                 <select name="status" id="status" class="form-control" required="required">
                     @foreach (config('project.status') as $key => $display_name)
-                        <option value="{{ $key }}" {{ old('status') == $key ? 'selected' : '' }}>{{ $display_name }}</option>
+                        <option value="{{ $key }}" {{ old('status', $projectData['status'] ?? '') == $key ? 'selected' : '' }}>{{ $display_name }}</option>
                     @endforeach
                 </select>
             </div>
@@ -82,19 +82,21 @@
             <div class="form-group offset-md-1 col-md-5">
                 <input type="checkbox" id="isamc" name="is_amc" value="true">
                 <label for="is_amc">AMC</label><br>
+                <input type="checkbox" id="send_mail_to_infra" name="send_mail_to_infra" value="true">
+                <label for="send_mail_to_infra">Send Project Initiation Email to Infrasupport</label><br>
             </div>
         </div>
         <br>
         <div class="form-row">
             <div class="form-group col-md-5" v-if="projectType !== 'non-billable'">
                 <label for="total_estimated_hours">{{ __('Total Estimated Hours') }}</label>
                 <input type="number" class="form-control" name="total_estimated_hours" id="total_estimated_hours"
-                    placeholder="Enter total estimated hours" value="{{ old('total_estimated_hours') }}">
+                    placeholder="Enter total estimated hours" value="{{ old('total_estimated_hours', $projectData['total_estimated_hours'] ?? '') }}">
             </div>
         </div>
     </div>
     <div class="card-footer">
-        <button type="button" class="btn btn-primary mb-10" id="save-btn-action">Create</button>
+        <button type="button" class="btn btn-primary" id="save-btn-action">Create</button>
     </div>
 </div>
 
diff --git a/Modules/Project/Services/ProjectService.php b/Modules/Project/Services/ProjectService.php
@@ -7,11 +7,13 @@
 use Carbon\CarbonPeriod;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Storage;
 use Maatwebsite\Excel\Facades\Excel;
 use Modules\Client\Entities\Client;
 use Modules\HR\Entities\Employee;
 use Modules\Project\Contracts\ProjectServiceContract;
+use Modules\Project\Emails\EffortsheetSetupMail;
 use Modules\Project\Entities\Project;
 use Modules\Project\Entities\ProjectBillingDetail;
 use Modules\Project\Entities\ProjectContract;
@@ -104,6 +106,17 @@ public function store($data)
             );
         }
 
+
+        if (isset($data['send_mail_to_infra']) && $data['send_mail_to_infra']) {
+            // ToDo: Make infra email fetched from ENV
+            $emails = [
+                'key_account_manager' => $project->keyAccountManager->email,
+                'infrasupport_email' => 'infrasupport@coloredcow.in',
+            ];
+
+            Mail::send(new EffortsheetSetupMail($project, $emails));
+        }
+
         $project->client->update(['status' => 'active']);
         $this->saveOrUpdateProjectContract($data, $project);
     }
diff --git a/Modules/Prospect/Http/Controllers/ProspectController.php b/Modules/Prospect/Http/Controllers/ProspectController.php
@@ -106,6 +106,17 @@ public function edit($id)
     public function update(Request $request, Prospect $prospect)
     {
         $data = $this->service->update($request, $prospect);
+        if ($request->input('action') === 'update_create_project') {
+            $totalEstimatedHours = $this->getTotalEstimatedHoursForProject($prospect);
+            $projectData = [
+                'name'                  => $prospect->project_name,
+                'client_id'             => $prospect->client_id,
+                'status'                => 'active',
+                'total_estimated_hours' => $totalEstimatedHours ?? null,
+            ];
+
+            return redirect()->route('project.create')->with('projectData', $projectData);
+        }
 
         return $data;
     }
@@ -133,4 +144,12 @@ public function insightsUpdate(Request $request, $id)
 
         return redirect()->route('prospect.show', $id)->with('status', 'Prospect Insights updated successfully!');
     }
+
+    public function getTotalEstimatedHoursForProject($prospectData)
+    {
+        $projectBudget = $prospectData->budget;
+        $clientServiceRates = Client::find($prospectData->client_id)->billingDetails->service_rates;
+
+        return $clientServiceRates ? $projectBudget / $clientServiceRates : '';
+    }
 }
diff --git a/Modules/Prospect/Resources/assets/js/app.js b/Modules/Prospect/Resources/assets/js/app.js
@@ -3,12 +3,24 @@ const CUSTOMER_TYPES = {
 	EXISTING: "existing",
 	DORMANT: "dormant"
 };
+
+const PROPOSAL_STATUS = {
+	PENDING: "pending",
+	DISCUSSION_ONGOING: "discussions-ongoing", 
+	CONVERTED: "converted",
+	REJECTED: "rejected",
+	CLIENT_UNRESPONSIVE: "client-unresponsive",
+	FINAL_DECISION_PENDING: "final-decision-pending"
+};
+
 document.addEventListener("DOMContentLoaded", function () {
 	const customerTypeField = document.getElementById("customer_type");
 	const orgNameTextField = document.getElementById("org_name_text_field");
 	const orgNameSelectField = document.getElementById("org_name_select_field");
 	const orgNameTextInput = document.getElementById("org_name");
 	const orgNameSelectInput = document.getElementById("org_name_select");
+	const proposalStatus = document.getElementById("proposal_status");
+	const updateAndCreateProjectButton = document.getElementById("update_create_project_button");
 
 	function toggleOrgNameField() {
 		if (customerTypeField.value === CUSTOMER_TYPES.NEW) {
@@ -32,7 +44,20 @@ document.addEventListener("DOMContentLoaded", function () {
 		}
 	}
 
+	function toggleUpdateAndCreateProjectButton() {
+		if(updateAndCreateProjectButton) {
+			if(proposalStatus.value === PROPOSAL_STATUS.CONVERTED) {
+				updateAndCreateProjectButton.classList.remove("d-none");
+			} else {
+				updateAndCreateProjectButton.classList.add("d-none");
+			}
+		}
+		
+	}
+
 	toggleOrgNameField();
+	toggleUpdateAndCreateProjectButton();
 
 	customerTypeField.addEventListener("change", toggleOrgNameField);
+	proposalStatus.addEventListener("change", toggleUpdateAndCreateProjectButton);
 });
diff --git a/Modules/Prospect/Resources/views/index.blade.php b/Modules/Prospect/Resources/views/index.blade.php
@@ -44,7 +44,7 @@
                             <td class="w-30p">
                                 <div>
                                     <a href="{{ route('prospect.show', $prospect->id) }}" class="text-decoration-none">
-                                        {{ $prospect->project_name ?? $prospect->organization_name }}
+                                        {{ $prospect->project_name ?? ($prospect->organization_name ?? $prospect->client->name) }}
                                     </a>
                                     <div>
                                         @if($prospect->customer_type == 'new')
diff --git a/Modules/Prospect/Resources/views/subviews/edit-prospect-details.blade.php b/Modules/Prospect/Resources/views/subviews/edit-prospect-details.blade.php
@@ -122,7 +122,10 @@
             </div>
         </div>
         <div class="card-footer">
-            <button type="submit" class="btn btn-primary">Update</button>
+            <button type="submit" name="action" value="update" class="btn btn-primary">Update</button>
+            @if($prospect->customer_type === "existing")
+            <button type="submit" name="action" id="update_create_project_button" value="update_create_project" class="btn ml-3 d-none btn-primary">Update and Create Project</button>
+            @endif
         </div>
     </form>
 </div>
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,10 @@ public function index()`
`45`	`45`	`*/`
`46`	`46`	`public function create()`
`47`	`47`	`{`
	`48`	`+ $projectData = session('projectData', []);`
`48`	`49`	`$clients = $this->service->getClients($status = 'all');`
`49`	`50`
`50`		`- return view('project::create')->with('clients', $clients);`
	`51`	`+ return view('project::create')->with(['clients' => $clients, 'projectData' => $projectData]);`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`/**`