Merge pull request #3742 from ColoredCow/hotfix/remove-mandatory-fields

[Fix]:- Remove the Mandatory Field
ColoredCow · Oct 28, 2024 · b951384 · b951384
2 parents ef79f3d + 24795b2
commit b951384
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/Modules/Prospect/Http/Requests/ProspectRequest.php b/Modules/Prospect/Http/Requests/ProspectRequest.php
@@ -16,6 +16,16 @@ public function rules()
         return [
             'org_name' => 'required',
             'poc_user_id' => 'required',
+            'proposal_sent_date' => 'nullable|date',
+            'domain' => 'nullable',
+            'customer_type' => 'nullable',
+            'budget' => 'nullable',
+            'proposal_status' => 'nullable',
+            'introductory_call' => 'nullable',
+            'last_followup_date' => 'nullable|date',
+            'rfp_link' => 'nullable|url',
+            'proposal_link' => 'nullable|url',
+            'currency' => 'nullable',
         ];
     }
 

diff --git a/Modules/Prospect/Resources/views/index.blade.php b/Modules/Prospect/Resources/views/index.blade.php
@@ -64,9 +64,10 @@
                             <td class="w-20p">
                                 <span>{{ ucfirst($prospect->customer_type) ?? '-' }}</span>
                             </td>
+
                             <td class="w-30p">
                                 <span>
-                                    {{ $prospect->budget ? $currencySymbols[$prospect->currency] : '' }}
+                                    {{ isset($prospect->currency) && isset($currencySymbols[$prospect->currency]) ? $currencySymbols[$prospect->currency] : '' }}
                                     {{ $prospect->budget ? round($prospect->budget, 2) : '-' }}
                                 </span>
                             </td>

diff --git a/Modules/Prospect/Resources/views/subviews/edit-prospect-details.blade.php b/Modules/Prospect/Resources/views/subviews/edit-prospect-details.blade.php
@@ -55,8 +55,9 @@
                                 <select name="currency" v-model="currency" id="currency" class="input-group-text">
                                     <option value="">Select Currency</option>
                                     @foreach ($countries as $country)
-                                        <option value="{{ $country->currency }}">{{ $country->currency }}
-                                        </option>
+                                        <option value="{{ $country->currency }}"
+                                            {{ $prospect->currency == $country->currency ? 'selected' : '' }}>
+                                            {{ $country->currency }}</option>
                                     @endforeach
                                 </select>
                             </div>

diff --git a/Modules/Prospect/Resources/views/subviews/prospect-details.blade.php b/Modules/Prospect/Resources/views/subviews/prospect-details.blade.php
@@ -47,8 +47,10 @@ class="ml-2">{{ config('prospect.customer-types')[$prospect->customer_type] ?? '
             <div class="col-md-6">
                 <div class="form-group col-md-12">
                     <label for="budget" class="font-weight-bold">Budget:</label>
-                    <span class="ml-2">{{ $currencySymbols[$prospect->currency] ?? '' }}
-                        {{ $prospect->budget ? round($prospect->budget, 2) : 'N/A' }}</span>
+                    <span class="ml-2">
+                        {{ isset($prospect->currency) && isset($currencySymbols[$prospect->currency]) ? $currencySymbols[$prospect->currency] : '' }}
+                        {{ $prospect->budget ? round($prospect->budget, 2) : 'N/A' }}
+                    </span>
                 </div>
             </div>
         </div>