Merge pull request #97 from Ritikeshyadav/RitikeshFreeu
fixing freedcamp bugs
This commit is contained in:
Ritikeshyadav
GitHub
@@ -195,8 +195,8 @@ class DashboardController extends Controller
|
||||
$userCount = User::users()->count();
|
||||
$investingUserCount = MonthlyUpdateMaster::distinct('users_id')->count('users_id');
|
||||
$totalProductCount = Product::count();
|
||||
$leads = Lead::with('leadSource')->where('lead_owner', auth()->user()->id)->latest()->get();
|
||||
// dd($leads);
|
||||
$leads = Lead::with('leadSourceName')->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();
|
||||
// dd($meetings);
|
||||
|
||||
@@ -109,7 +109,7 @@ class ManageChatController extends Controller
|
||||
$search = $request->search;
|
||||
// $userData = $this->initialUsers($search);
|
||||
$userData = $this->getUserList(1)->toArray();
|
||||
// $searchResults=[];
|
||||
$searchResults=[];
|
||||
// $count = 0;
|
||||
foreach ($userData as $user) {
|
||||
// dd(strpos(strtolower($user['name']), strtolower($search)) !== false);
|
||||
@@ -174,7 +174,7 @@ class ManageChatController extends Controller
|
||||
if ($data) {
|
||||
return $data;
|
||||
} else {
|
||||
return "NO data found";
|
||||
return "No data found";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -133,6 +133,7 @@ class ManageLeadController extends Controller
|
||||
|
||||
public function editLead($id)
|
||||
{
|
||||
// dd($this->lead->edit($id));
|
||||
return view('Admin.Pages.manage_leads.edit-lead', [
|
||||
'lead' => $this->lead->edit($id),
|
||||
'users' => User::admins()->get(),
|
||||
|
||||
@@ -341,8 +341,18 @@ class OverviewController extends Controller
|
||||
->latest('marketplace_aif_sellers.created_at')->get();
|
||||
$freBuyerForm = MarketplaceFractionalRealEstateSeller::with('seller', 'company')->join('marketplace_buyer_forms', 'marketplace_fre_sellers.id', 'marketplace_buyer_forms.associated_id')->latest('marketplace_fre_sellers.created_at')->get();
|
||||
$opBuyerForm = MarketplaceOtherProductsSeller::with('seller', 'company')->join('marketplace_buyer_forms', 'marketplace_op_sellers.id', 'marketplace_buyer_forms.associated_id')->latest('marketplace_op_sellers.created_at')->get();
|
||||
$completedData = collect();
|
||||
$aifBuyerForm->each(function($value) use($completedData){
|
||||
$completedData[] = $value;
|
||||
});
|
||||
$freBuyerForm->each(function($value) use($completedData){
|
||||
$completedData[] = $value;
|
||||
});
|
||||
// $latestArray = array_merge($aifBuyerForm->toArray(),$freBuyerForm->toArray());
|
||||
$newData = $completedData->sortBy('created_at');
|
||||
|
||||
$companies = Company::active()->pluck('company_name', 'id');
|
||||
return view('Admin.Pages.pre_owned_investment.transactions', compact('aifBuyerForm', 'freBuyerForm', 'opBuyerForm', 'companies'));
|
||||
return view('Admin.Pages.pre_owned_investment.transactions', compact('aifBuyerForm', 'freBuyerForm', 'opBuyerForm', 'companies','newData'));
|
||||
}
|
||||
|
||||
// public function manage_seller_profile()
|
||||
|
||||
@@ -162,7 +162,7 @@
|
||||
<span>PAN</span>
|
||||
</label>
|
||||
<!--begin::Input-->
|
||||
<input type="text" class="form-control form-control-solid" name="pan" minlength="10" maxlength="10"/>
|
||||
<input type="text" oninput="convertToUpperCase('#pan')" class="form-control form-control-solid" name="pan" id="pan" minlength="10" maxlength="10"/>
|
||||
</div>
|
||||
<div class="form-box mb-5">
|
||||
<label class="fs-6 fw-semibold form-label mt-3">
|
||||
@@ -781,7 +781,7 @@
|
||||
<span>PAN</span>
|
||||
</label>
|
||||
<!--begin::Input-->
|
||||
<input type="text" class="form-control form-control-solid" name="pan" minlength="10" maxlength="10"/>
|
||||
<input type="text" oninput="convertToUpperCase('#fre_pan')" class="form-control form-control-solid" id="fre_pan" name="pan" minlength="10" maxlength="10"/>
|
||||
</div>
|
||||
<div class="form-box mb-5">
|
||||
<label class="fs-6 fw-semibold form-label mt-3">
|
||||
@@ -1099,6 +1099,13 @@
|
||||
@endsection
|
||||
@section('scripts')
|
||||
<script>
|
||||
// $('#pan').on
|
||||
function convertToUpperCase(id)
|
||||
{
|
||||
var text = $(id).val();
|
||||
$(id).val(text.toUpperCase());
|
||||
}
|
||||
|
||||
function showForm() {
|
||||
// var selection = document.getElementById("formSelector").dataset.categories;
|
||||
// alert(selection);
|
||||
|
||||
@@ -618,13 +618,13 @@
|
||||
name="total_employees" value='{{ $lead->total_employees }}' />
|
||||
|
||||
</div>
|
||||
<div class="form-box mb-5">
|
||||
{{-- <div class="form-box mb-5">
|
||||
<label class="fs-6 fw-semibold form-label mt-3">
|
||||
<span>Lead Name</span>
|
||||
</label>
|
||||
<input type="text" class="form-control form-control-solid"
|
||||
name="first_name" value='{{ $lead->first_name }}' />
|
||||
</div>
|
||||
</div> --}}
|
||||
|
||||
</div>
|
||||
|
||||
@@ -767,6 +767,24 @@
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-box mb-5">
|
||||
|
||||
<label class="fs-6 fw-semibold form-label mt-3">
|
||||
|
||||
<span>State</span>
|
||||
|
||||
</label>
|
||||
|
||||
<input type="text" class="form-control form-control-solid"
|
||||
name="state" value='{{ $lead->state }}' />
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="form-box mb-5">
|
||||
|
||||
<label class="fs-6 fw-semibold form-label mt-3">
|
||||
@@ -778,26 +796,7 @@
|
||||
<input type="text" class="form-control form-control-solid"
|
||||
name="city" value='{{ $lead->city }}' />
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="col-md-6">
|
||||
|
||||
<div class="form-box mb-5">
|
||||
|
||||
<label class="fs-6 fw-semibold form-label mt-3">
|
||||
|
||||
<span>Country</span>
|
||||
|
||||
</label>
|
||||
|
||||
<input type="text" class="form-control form-control-solid"
|
||||
name="country" value='{{ $lead->country }}' />
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-box mb-5">
|
||||
|
||||
@@ -813,6 +812,21 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-box mb-5">
|
||||
|
||||
<label class="fs-6 fw-semibold form-label mt-3">
|
||||
|
||||
<span>Country</span>
|
||||
|
||||
</label>
|
||||
|
||||
<input type="text" class="form-control form-control-solid"
|
||||
name="country" value='{{ $lead->country }}' />
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@@ -83,8 +83,8 @@
|
||||
<th class="min-w-125px w-125px align-top">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="text-gray-600 fw-semibold">
|
||||
@php($iteration = 1)
|
||||
@php($iteration = 1)
|
||||
{{-- <tbody class="text-gray-600 fw-semibold">
|
||||
@foreach($aifBuyerForm as $data)
|
||||
@if($data->status == 'Sold')
|
||||
@include('Admin.Pages.pre_owned_investment.partial.transaction-row')
|
||||
@@ -103,6 +103,14 @@
|
||||
@php($iteration++)
|
||||
@endif
|
||||
@endforeach
|
||||
</tbody> --}}
|
||||
<tbody class="text-gray-600 fw-semibold">
|
||||
@foreach($newData as $data)
|
||||
@if($data->status == 'Sold')
|
||||
@include('Admin.Pages.pre_owned_investment.partial.transaction-row')
|
||||
@php($iteration++)
|
||||
@endif
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@@ -199,7 +199,7 @@
|
||||
<td>{{$lead->lead_company ?? 'N/A'}}</td>
|
||||
<td>{{$lead->email}}</td>
|
||||
<td>{{$lead->mobile}}</td>
|
||||
<td>{{$lead->leadSource == null ? 'No Lead Source Assigned' : $lead->leadSource->name}}</td>
|
||||
<td>{{$lead->leadSourceName == null ? 'No Lead Source Assigned' : $lead->leadSourceName->name}}</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="">
|
||||
|
||||
Reference in New Issue
Block a user