bugs solving
This commit is contained in:
cj201199
@@ -195,7 +195,7 @@ class DashboardController extends Controller
|
||||
$userCount = User::users()->count();
|
||||
$investingUserCount = MonthlyUpdateMaster::distinct('users_id')->count('users_id');
|
||||
$totalProductCount = Product::count();
|
||||
$leads = Lead::with('leadSourceName')->where('lead_owner', auth()->user()->id)->latest()->get();
|
||||
$leads = Lead::where('lead_owner', auth()->user()->id)->latest()->get();
|
||||
// dd($leads->toArray());
|
||||
$tasks = LeadTasksMeeting::where('owner', auth()->user()->id)->tasks()->get();
|
||||
$meetings = LeadTasksMeeting::where('host', (string)auth()->user()->id)->meetings()->get();
|
||||
|
||||
@@ -638,17 +638,17 @@ class DashboardController extends Controller
|
||||
'fund_category' => 'required',
|
||||
'fund_structure' => 'required',
|
||||
'type_of_fund' => 'required',
|
||||
'fund_strategy' => 'required',
|
||||
'fund_manager_name' => 'required',
|
||||
'sponsor' => 'required',
|
||||
// 'fund_strategy' => 'required',
|
||||
// 'fund_manager_name' => 'required',
|
||||
// 'sponsor' => 'required',
|
||||
// 'credit_rating' => 'required',
|
||||
'total_capital_commitment' => 'required',
|
||||
'uncalled_capital_commitment' => 'required',
|
||||
'date_of_final_close' => 'required',
|
||||
'tenure_from_final_close' => 'required',
|
||||
// 'date_of_final_close' => 'required',
|
||||
// 'tenure_from_final_close' => 'required',
|
||||
'current_or_latest_nav' => 'required',
|
||||
'no_of_units_held' => 'required',
|
||||
'no_of_units_you_wish_to_sell' => 'required',
|
||||
// 'no_of_units_you_wish_to_sell' => 'required',
|
||||
'expected_sale_per_unit' => 'required',
|
||||
'latest_valuation_date' => 'required',
|
||||
|
||||
@@ -670,18 +670,18 @@ class DashboardController extends Controller
|
||||
'fund_category' => $request->fund_category,
|
||||
'fund_structure' => $request->fund_structure,
|
||||
'type_of_fund' => $request->type_of_fund,
|
||||
'fund_strategy' => $request->fund_strategy,
|
||||
'fund_manager_name' => $request->fund_manager_name,
|
||||
'sponsor' => $request->sponsor,
|
||||
'credit_rating' => $request->credit_rating,
|
||||
'fund_strategy' => $request->fund_strategy ?? null,
|
||||
'fund_manager_name' => $request->fund_manager_name ?? null,
|
||||
'sponsor' => $request->sponsor ?? null,
|
||||
'credit_rating' => $request->credit_rating ?? null,
|
||||
'total_capital_commitment' => $request->total_capital_commitment,
|
||||
'uncalled_capital_commitment' => $request->uncalled_capital_commitment,
|
||||
'date_of_final_close' => $request->date_of_final_close,
|
||||
'tenure_from_final_close' => $request->tenure_from_final_close,
|
||||
'date_of_final_close' => $request->date_of_final_close ?? null,
|
||||
'tenure_from_final_close' => $request->tenure_from_final_close ?? null,
|
||||
'current_or_latest_nav' => $request->current_or_latest_nav,
|
||||
'no_of_units_held' => $request->no_of_units_held,
|
||||
'no_of_units_you_wish_to_sell' => $request->no_of_units_you_wish_to_sell,
|
||||
'og_no_of_units_wish_to_sell' => $request->no_of_units_you_wish_to_sell,
|
||||
'no_of_units_you_wish_to_sell' => $request->no_of_units_you_wish_to_sell ?? null,
|
||||
'og_no_of_units_wish_to_sell' => $request->no_of_units_you_wish_to_sell ?? null,
|
||||
'expected_sale_per_unit' => $request->expected_sale_per_unit,
|
||||
'latest_valuation_date' => $request->latest_valuation_date,
|
||||
'listing_status' => 'Hide',
|
||||
|
||||
@@ -12,7 +12,7 @@ use Illuminate\Support\Facades\DB;
|
||||
class LeadService{
|
||||
|
||||
public function getAllLeads(){
|
||||
return Lead::with('kyc','leadSourceName','user', 'product.category')->latest()->get();
|
||||
return Lead::with('kyc','user', 'product.category')->latest()->get();
|
||||
}
|
||||
|
||||
public function totalLead(){
|
||||
|
||||
@@ -615,13 +615,23 @@
|
||||
|
||||
<select id="lead_source" name="lead_source" data-control="select2"
|
||||
class="form-control form-control-solid">
|
||||
@foreach ($users as $data)
|
||||
<option></option>
|
||||
<option
|
||||
<option value="" disabled selected>Select Lead Source</option>
|
||||
<option value="Direct">Direct</option>
|
||||
<option value="Referral">Referral</option>
|
||||
<option value="Website Visitor">Website Visitor</option>
|
||||
<option value="Email Marketing">Email Marketing</option>
|
||||
<option value="Cold calling">Cold calling</option>
|
||||
<option value="Social Media">Social Media</option>
|
||||
<option value="Third-Party Lead Providers">Third-Party Lead Providers</option>
|
||||
<option value="Webinar & Events">Webinar & Events</option>
|
||||
<option value="Others">Others</option>
|
||||
{{-- @foreach ($users as $data) --}}
|
||||
|
||||
{{-- <option
|
||||
value="{{ $data->id }}"{{ $lead->lead_source == $data->id ? 'selected' : '' }}>
|
||||
{{ $data->name }}
|
||||
</option>
|
||||
@endforeach
|
||||
</option> --}}
|
||||
{{-- @endforeach --}}
|
||||
</select>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -281,7 +281,7 @@
|
||||
</td>
|
||||
<td>{{$lead->kyc == null ? 'No KYC' : $lead->kyc->status }}</td>
|
||||
<td>
|
||||
{{$lead->leadSourceName != null ? $lead->leadSourceName->name : 'No lead assigned'}}
|
||||
{{$lead->lead_source != null ? $lead->lead_source : 'No lead assigned'}}
|
||||
</td>
|
||||
<td class='w-75px'>{{ $lead->mobile }}</td>
|
||||
<td>{{ $lead->lead_status }}</td>
|
||||
|
||||
@@ -199,7 +199,7 @@
|
||||
<td>{{$lead->lead_company ?? 'N/A'}}</td>
|
||||
<td>{{$lead->email}}</td>
|
||||
<td>{{$lead->mobile}}</td>
|
||||
<td>{{$lead->leadSourceName == null ? 'No Lead Source Assigned' : $lead->leadSourceName->name}}</td>
|
||||
<td>{{$lead->lead_source == null ? 'No Lead Source Assigned' : $lead->lead_source}}</td>
|
||||
<td class="text-end d-flex align-items-center justify-content-around notexport">
|
||||
<a href="{{route('edit-lead',$lead->id)}}" class="action_icon return_to_personal_dashboard" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" data-kt-initialized="1">
|
||||
<svg class="svg-inline--fa fa-pen-to-square" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="pen-to-square" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg="">
|
||||
|
||||
@@ -242,7 +242,7 @@
|
||||
|
||||
</div> --}}
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-12">
|
||||
|
||||
<p>Description</p>
|
||||
|
||||
|
||||
@@ -135,10 +135,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="tables row">
|
||||
<div class="col-md-4">
|
||||
<p>Description</p>
|
||||
<h4>{{ $productData->description ?? '-' }}</h4>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<p>Involved in short selling</p>
|
||||
<h4>{{ $productData->involved_in_short_selling ?? '-' }}</h4>
|
||||
@@ -160,6 +157,19 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="categeory">
|
||||
<div class="details aos-init aos-animate" data-aos="zoom-in">
|
||||
<div class="tables row">
|
||||
<div class="col-md-12">
|
||||
<p>Description</p>
|
||||
<h4>{{ $productData->description ?? '-' }}</h4>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="categeory">
|
||||
<div class="details aos-init aos-animate" data-aos="zoom-in">
|
||||
<div class="tables row">
|
||||
|
||||
@@ -66,10 +66,7 @@
|
||||
<p>About Issuer</p>
|
||||
<span>{{ $privateEquityFund->about_issuer ?? '-' }}</span>
|
||||
</div>
|
||||
<div class="col-md-4 mb-2">
|
||||
<p>Description</p>
|
||||
<span>{{ $productData->description ?? '-' }}</span>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 mb-2">
|
||||
<p>Sharpe Ratio</p>
|
||||
<span>{{ $privateEquityFund->sharpe_ratio ?? '-' }}</span>
|
||||
@@ -101,6 +98,18 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="categeory">
|
||||
<div class="details aos-init aos-animate" data-aos="zoom-in">
|
||||
<div class="tables row">
|
||||
<div class="col-md-12 mb-2">
|
||||
<p>Description</p>
|
||||
<span>{{ $productData->description ?? '-' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="categeory">
|
||||
<div class="details aos-init aos-animate" data-aos="zoom-in">
|
||||
<div class="tables row">
|
||||
|
||||
@@ -213,16 +213,16 @@
|
||||
type_of_fund: "required",
|
||||
fund_strategy: "required",
|
||||
// type_of_fund: "required",
|
||||
fund_strategy: "required",
|
||||
fund_manager_name: "required",
|
||||
sponsor: "required",
|
||||
// fund_strategy: "required",
|
||||
// fund_manager_name: "required",
|
||||
// sponsor: "required",
|
||||
total_capital_commitment: "required",
|
||||
uncalled_capital_commitment: "required",
|
||||
date_of_final_close: "required",
|
||||
tenure_from_final_close: "required",
|
||||
// date_of_final_close: "required",
|
||||
// tenure_from_final_close: "required",
|
||||
current_or_latest_nav: "required",
|
||||
no_of_units_held: "required",
|
||||
no_of_units_you_wish_to_sell: "required",
|
||||
// no_of_units_you_wish_to_sell: "required",
|
||||
expected_sale_per_unit: "required",
|
||||
latest_valuation_date: "required",
|
||||
declaration: "required",
|
||||
@@ -235,16 +235,16 @@
|
||||
type_of_fund: 'Please select type of fund',
|
||||
fund_strategy: 'Please enter fund strategy',
|
||||
// type_of_fund: 'Please select type of fund',
|
||||
fund_strategy: 'Please enter fund strategy',
|
||||
fund_manager_name: 'Please enter fund manager name',
|
||||
sponsor: 'Please enter sponsor',
|
||||
// fund_strategy: 'Please enter fund strategy',
|
||||
// fund_manager_name: 'Please enter fund manager name',
|
||||
// sponsor: 'Please enter sponsor',
|
||||
total_capital_commitment: 'Please enter total capital commitment',
|
||||
uncalled_capital_commitment: 'Please enter uncalled capital commitment',
|
||||
date_of_final_close: 'Please enter date of final close',
|
||||
tenure_from_final_close: 'Please enter tenure from final close',
|
||||
// date_of_final_close: 'Please enter date of final close',
|
||||
// tenure_from_final_close: 'Please enter tenure from final close',
|
||||
current_or_latest_nav: 'Please enter current or latest nav',
|
||||
no_of_units_held: 'Please enter no. of units held',
|
||||
no_of_units_you_wish_to_sell: 'Please enter no. of units you wish to sell',
|
||||
// no_of_units_you_wish_to_sell: 'Please enter no. of units you wish to sell',
|
||||
expected_sale_per_unit: 'Please enter expected sale per unit',
|
||||
latest_valuation_date: 'Please select latest valuation date',
|
||||
declaration: 'Please check this box',
|
||||
|
||||
@@ -92,14 +92,11 @@
|
||||
<div class="categeory">
|
||||
<div class="details aos-init aos-animate" data-aos="zoom-in">
|
||||
<div class="tables row">
|
||||
<div class="col-md-4 mb-2">
|
||||
<div class="col-md-8 mb-2">
|
||||
<p>About Issuer</p>
|
||||
<span>{{ $ventureCapitalFund->about_issuer ?? '-' }}</span>
|
||||
</div>
|
||||
<div class="col-md-4 mb-2">
|
||||
<p>Description</p>
|
||||
<span>{{ $productData->description ?? '-' }}</span>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 mb-2">
|
||||
<p>Sharpe Ratio</p>
|
||||
<span>{{ $ventureCapitalFund->sharpe_ratio ?? '-' }}</span>
|
||||
@@ -131,6 +128,18 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="categeory">
|
||||
<div class="details aos-init aos-animate" data-aos="zoom-in">
|
||||
<div class="tables row">
|
||||
<div class="col-md-12 mb-2">
|
||||
<p>Description</p>
|
||||
<span>{{ $productData->description ?? '-' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="categeory">
|
||||
<div class="details aos-init aos-animate" data-aos="zoom-in">
|
||||
<div class="tables row">
|
||||
|
||||
Reference in New Issue
Block a user