review feedback

Author: P4NK4J

Modules/Project/Emails/EffortsheetSetupMail.php

@@ -36,7 +36,7 @@ public function build()
                     ->from(config('mail.from.address'))
                     ->to($this->emails['infrasupport_email'])
                     ->cc($this->emails['key_account_manager'])
-                    ->view('project::mail.effortsheet-setup-email')
+                    ->view('project::mail.initiate-project-email')
                     ->with([
                         'project' => $this->project,
                     ]);

Modules/Project/Resources/views/mail/effortsheet-setup-email.blade.php Modules/Project/Resources/views/mail/initiate-project-email.blade.php

@@ -3,15 +3,15 @@
         .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 ?? 'N/A' }}</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>

Modules/Project/Resources/views/subviews/create-project-details.blade.php

@@ -6,7 +6,7 @@
             <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', $projectData['project_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>

Modules/Project/Services/ProjectService.php

@@ -110,8 +110,8 @@ 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' => '[email protected]',
+                'key_account_manager' => $project->keyAccountManager->email,
+                'infrasupport_email' => '[email protected]',
         ];
 
             Mail::send(new EffortsheetSetupMail($project, $emails));

Modules/Prospect/Http/Controllers/ProspectController.php

@@ -109,9 +109,9 @@ public function update(Request $request, Prospect $prospect)
         if ($request->input('action') === 'update_create_project') {
             $totalEstimatedHours = $this->getTotalEstimatedHoursForProject($prospect);
             $projectData = [
-                'project_name'      => $prospect->project_name,
-                'client_id'         => $prospect->client_id,
-                'status'            => 'active',
+                'name'                  => $prospect->project_name,
+                'client_id'             => $prospect->client_id,
+                'status'                => 'active',
                 'total_estimated_hours' => $totalEstimatedHours ?? null,
 
             ];
@@ -151,6 +151,6 @@ public function getTotalEstimatedHoursForProject($prospectData)
         $projectBudget = $prospectData->budget;
         $clientServiceRates = Client::find($prospectData->client_id)->billingDetails->service_rates;
 
-        return $projectBudget / $clientServiceRates;
+        return $clientServiceRates ? $projectBudget / $clientServiceRates : '';
     }
 }

Modules/Prospect/Http/Requests/ProspectRequest.php

@@ -27,7 +27,7 @@ public function rules()
             'proposal_link' => 'nullable|url',
             'currency' => 'nullable',
             'client_id' => 'nullable|exists:clients,id',
-            'project_name' => 'required',
+            'project_name' => 'nullable',
         ];
     }
 

Modules/Prospect/Resources/assets/js/app.js

@@ -23,13 +23,15 @@ document.addEventListener("DOMContentLoaded", function () {
 	const updateAndCreateProjectButton = document.getElementById("update_create_project_button");
 
 	function toggleOrgNameField() {
+		console.log("toggle-prospect");
 		if (customerTypeField.value === CUSTOMER_TYPES.NEW) {
 			orgNameTextField.classList.remove("d-none");
 			orgNameSelectField.classList.add("d-none");
 			orgNameTextInput.required = true;
 			orgNameSelectInput.value = "";
 			orgNameSelectInput.required = false;
 		} else if (customerTypeField.value === CUSTOMER_TYPES.EXISTING) {
+			console.log("elseif");
 			orgNameTextField.classList.add("d-none");
 			orgNameSelectField.classList.remove("d-none");
 			orgNameSelectInput.required = true;
@@ -45,11 +47,14 @@ document.addEventListener("DOMContentLoaded", function () {
 	}
 
 	function toggleUpdateAndCreateProjectButton() {
-		if(proposalStatus.value === PROPOSAL_STATUS.CONVERTED) {
-			updateAndCreateProjectButton.classList.remove("d-none");
-		} else {
-			updateAndCreateProjectButton.classList.add("d-none");
+		if(updateAndCreateProjectButton) {
+			if(proposalStatus.value === PROPOSAL_STATUS.CONVERTED) {
+				updateAndCreateProjectButton.classList.remove("d-none");
+			} else {
+				updateAndCreateProjectButton.classList.add("d-none");
+			}
 		}
+		
 	}
 
 	toggleOrgNameField();

Modules/Prospect/Resources/views/create.blade.php

@@ -56,8 +56,8 @@
                                 </div>
 
                                 <div class="form-group offset-md-1 col-md-5" id="org_name_text_field">
-                                    <label class="field-required" for="project_name">Project Name</label>
-                                    <input type="text" required="required" class="form-control" name="project_name" id="project_name"
+                                    <label for="project_name">Project Name</label>
+                                    <input type="text" class="form-control" name="project_name" id="project_name"
                                         placeholder="Enter Project Name" value="{{ old('project_name') }}">
                                 </div>
                             </div>

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')

Modules/Prospect/Resources/views/subviews/edit-prospect-details.blade.php

@@ -49,8 +49,8 @@
                         </select>
                     </div>
                     <div class="form-group offset-md-1 col-md-5" id="org_name_text_field">
-                        <label class="field-required" for="project_name">Project Name</label>
-                        <input type="text" class="form-control" required="required" name="project_name" id="project_name"
+                        <label for="project_name">Project Name</label>
+                        <input type="text" class="form-control" name="project_name" id="project_name"
                             placeholder="Enter Project Name" value="{{ $prospect->project_name }}">
                     </div>
                 </div>
@@ -123,7 +123,7 @@
         </div>
         <div class="card-footer">
             <button type="submit" name="action" value="update" class="btn btn-primary">Update</button>
-            @if($prospect->customer_type === "exsiting")
+            @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>