Vishal.Chandora/freeu-project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #244 from Ritikeshyadav/shaileshfreeu

Browse Source 
Shaileshfreeu
This commit is contained in:
Ritikeshyadav
2024-06-06 17:37:31 +05:30
committed by GitHub
parent 853fb9f645 0b4f44fbfe
commit 969eabe993
7 changed files with 103 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php
View File

@@ -166,6 +166,7 @@ class AlternativeInvestmentFundController extends Controller
$productData = AlternativeInvestmentFund::where('slug',$slug)->first();
// dd($productData,$slug,$ventureCapitalFund);
$productData = Product::with('product_images')->where('id', '=', $productData->products_id)->first();
// dd($ventureCapitalFund, $otherVCP, $productData);
return view('Frontend.Pages.alternative-investment-fund.venture-capital-fund-product', compact('ventureCapitalFund', 'otherVCP', 'productData'));
}
@@ -194,7 +195,7 @@ class AlternativeInvestmentFundController extends Controller
->get();
$productData = AlternativeInvestmentFund::where('slug', '=', $slug)->first();
$product = Product::with('product_images')->where('id', '=', $productData->products_id)->first();
// dd($otherAF);
// dd($product);
return view('Frontend.Pages.alternative-investment-fund.angel-fund-product', compact('angelFund', 'otherAF', 'productData','product'));
}

2
app/Http/Controllers/Frontend/ProfileController.php
View File

@@ -524,7 +524,7 @@ class ProfileController extends Controller
<strong>" . $data->created_at->diffForHumans() . "</strong>
</p>
</a>
</li>";
</li>";
}
if ($notificationHTML) {
return response()->json(['status' => 200, 'data' => $notificationHTML, 'count'=>Auth::guard('users')->user()->unreadNotifications->count()]);

22
public/assets/css/style.css
View File

@@ -1275,7 +1275,7 @@ nav {
border-radius: 9px;
}
.chat-box div#kt_drawer_chat_messenger_footer {
position: absolute;
/* position: absolute; */
bottom: 0;
width: 100%;
background-color: #dfdfdf;
@@ -1283,7 +1283,8 @@ nav {
}
.chat-box .chat-msgs .card-body {
height: 66%;
overflow: scroll;
overflow-y: scroll;
overflow-x: hidden;
}
#manage_commission_view
.modal-dialog
@@ -1302,18 +1303,31 @@ nav {
width: 150px;
height: 150px;
}
.list .list_details {
width: -webkit-fill-available;
margin: 0 !important;
}
table th,
table td,
.align-top {
vertical-align: middle !important;
/* width: auto !important; */
}
textarea#message {
border-bottom-left-radius: 10px !important;
}
.card-body.py-4 {
padding: 0;
}
.chat-msgs img {
width: 26%;
margin: 0 auto;
}
.chat-msgs {
display: flex;
align-items: center;
}
td a.action_icon {
padding: 10px;
margin: 0px 6px;

9
resources/views/Admin/Pages/manage_chat/manage_chat.blade.php
View File

@@ -13,7 +13,7 @@
<div id="kt_app_content_container" class="app-container container-xxl">
<div class="chat-box">
<div class="row max-w-100 h-100">
<div class="col-md-3 p-0 users_list h-100" style="height:45rem;overflow:auto">
<div class="col-md-4 p-0 users_list h-100" style="height:45rem;overflow:auto">
<div class="card h-100">
<div class="card-header pt-5" id="kt_chat_contacts_header">
<form class="w-100 position-relative" autocomplete="off">
@@ -67,10 +67,13 @@
</div>
</div>
</div>
<div class="col-md-6 p-0 chat_screen h-100">
<div class="col-md-5 p-0 chat_screen h-100">
<div class="card w-100 rounded-0 border-0" id="kt_drawer_chat_messenger"
style="overflow:auto;background-color: #cccccc1a;position: relative;height: 100%;">
style="overflow-x:hidden;background-color: #cccccc1a;position: relative;height: 100%;">
<div class="chat-msgs h-100">
<img src="{{ asset('/public/assets/media/FrontendImages/menu-logo.png') }}"/>
<p></p>
</div>
<div class="card-footer d-flex align-items-center me-2 p-0 d-none"
id="kt_drawer_chat_messenger_footer">

42
resources/views/Admin/Pages/manage_chat/user-details.blade.php
View File

@@ -1,6 +1,6 @@
<!-- <div class="col-md-3 p-0 active_user_details"> -->
<div class="card">
<div class="card p-3">
<div class="profile pt-5 text-center">
@@ -8,23 +8,19 @@
<!--begin::Avatar-->
@if($user->getAttributes()['profile_image'])
<?php
$img = 'public/uploads/profile/img/' . $user->getAttributes()['profile_image'];
?>
@if ($user->getAttributes()['profile_image'])
<?php
$img = 'public/uploads/profile/img/' . $user->getAttributes()['profile_image'];
?>
@else
@php($img ='https://cdn.pixabay.com/photo/2015/10/05/22/37/blank-profile-picture-973460_960_720.png')
@php($img = 'https://cdn.pixabay.com/photo/2015/10/05/22/37/blank-profile-picture-973460_960_720.png')
@endif
<div class="symbol symbol-75px w-75px h-75px bg-muted symbol-circle">
<img alt="Pic" src="{{$img}}">
<img alt="Pic" src="{{ $img }}">
</div>
@@ -32,13 +28,13 @@
</div>
<a href="#" class="fs-4 text-gray-800 text-hover-primary fw-bold mb-0">{{$user->name}}</a>
<a href="#" class="fs-4 text-gray-800 text-hover-primary fw-bold mb-0">{{ $user->name }}</a>
</div>
<div class="separator"></div>
<div class="info_list px-5 py-4">
<div class="info_list px-2 py-4">
<p class="p-0 m-0 fs-6 fw-bold">
@@ -54,7 +50,7 @@
<p class="fs-7 m-0 p-0">Phone</p>
<span class="text-muted fs-6 d-block m-0 p-0">{{$user->contact_number}}</span>
<span class="text-muted fs-6 d-block m-0 p-0">{{ $user->contact_number }}</span>
</div>
@@ -66,7 +62,7 @@
<p class="fs-7 m-0 p-0">Email</p>
<span class="text-muted fs-6 d-block m-0 p-0">{{$user->email}}</span>
<span class="text-muted fs-6 d-block m-0 p-0">{{ $user->email }}</span>
</div>
@@ -78,7 +74,7 @@
<p class="fs-7 m-0 p-0">Address</p>
<span class="text-muted fs-6 d-block m-0 p-0">{{$user->address}}</span>
<span class="text-muted fs-6 d-block m-0 p-0">{{ $user->address }}</span>
</div>
@@ -90,7 +86,7 @@
<p class="fs-7 m-0 p-0">Total Active Investment</p>
<span class="text-muted fs-6 d-block m-0 p-0">{{totalInvestmentCount($user->id)}}</span>
<span class="text-muted fs-6 d-block m-0 p-0">{{ totalInvestmentCount($user->id) }}</span>
</div>
@@ -102,7 +98,7 @@
<p class="fs-7 m-0 p-0">Total Investment Till Date</p>
<span class="text-muted fs-6 d-block m-0 p-0">{{totalInvestment($user->id)}}</span>
<span class="text-muted fs-6 d-block m-0 p-0">{{ totalInvestment($user->id) }}</span>
</div>
@@ -114,7 +110,7 @@
<p class="fs-7 m-0 p-0">Active Investment</p>
<span class="text-muted fs-6 d-block m-0 p-0">{{totalInvestment($user->id,'Holding')}}</span>
<span class="text-muted fs-6 d-block m-0 p-0">{{ totalInvestment($user->id, 'Holding') }}</span>
</div>
@@ -126,7 +122,7 @@
<p class="fs-7 m-0 p-0">Reedemed Investment</p>
<span class="text-muted fs-6 d-block m-0 p-0">{{totalInvestment($user->id,'Reedemed')}}</span>
<span class="text-muted fs-6 d-block m-0 p-0">{{ totalInvestment($user->id, 'Reedemed') }}</span>
</div>
@@ -138,7 +134,7 @@
<p class="fs-7 m-0 p-0">KYC Status</p>
<span class="text-muted fs-6 d-block m-0 p-0">{{$kycStatus}}</span>
<span class="text-muted fs-6 d-block m-0 p-0">{{ $kycStatus }}</span>
</div>

11
resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php
View File

@@ -94,18 +94,21 @@
<!--</div>-->
<div class="table-invest">
<div class="container">
{{-- @dd($productData) --}}
@if ($productData && $productData->product_images != null)
{{-- @dd($productData); --}}
@if ($product && $product->product_images != null)
<div id="carouselExampleIndicators" class="carousel slide" data-bs-ride="carousel">
<div class="carousel-indicators">
@foreach ($productData->product_images as $key => $image)
@foreach ($product->product_images as $key => $image)
<button type="button" data-bs-target="#carouselExampleIndicators"
data-bs-slide-to="{{ $key }}" class="{{ $key === 0 ? 'active' : '' }}"
aria-label="Slide {{ $key + 1 }}"></button>
@endforeach
</div>
<div class="carousel-inner">
@foreach ($productData->product_images as $key => $image)
@foreach ($product->product_images as $key => $image)
<div class="carousel-item {{ $key === 0 ? 'active' : '' }}">
<img src="{{ asset('public/' . $image['images']) }}" class="d-block w-100 img-zoom"
alt="Image {{ $key }}">

52
resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php
View File

@@ -331,10 +331,10 @@
<p>Other expenses</p>
<span>{{ $ventureCapitalFund->other_expenses ?? '-' }}</span>
</div>
<div class="col-md-4">
{{-- <div class="col-md-4">
<p>Company</p>
<span>{{ $ventureCapitalFund->company->company_name ?? '-' }}</span>
</div>
</div> --}}
</div>
</div>
</div>
@@ -358,6 +358,54 @@
</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-4">
<p>ISIN Code</p>
<span>{{ $otherVCP[0]->isin_code ?? '-' }}</span>
</div>
<div class="col-md-4">
<p>Focused Real Estate Sectors</p>
<span>{{ $otherVCP[0]->focused_sectors_industries ?? '-' }}</span>
</div>
<div class="col-md-4">
<p>Rera Complied Property</p>
<span>{{ $otherVCP[0]->rera_complied_property ?? '-' }}</span>
</div>
</div>
<div class="tables row">
<div class="col-md-4">
<p>Return On Investment</p>
<span>{{ $otherVCP[0]->return_on_investment ?? '-' }}</span>
</div>
<div class="col-md-4">
<p>Valuation Per Sector</p>
<span>{{ $otherVCP[0]->valuation_per_sector ?? '-' }}</span>
</div>
<div class="col-md-4">
<p>Focused Funds</p>
<span>{{ $otherVCP[0]->focused_funds ?? '-' }}</span>
</div>
</div>
<div class="tables row">
<div class="col-md-4">
<p>Trading Strategy</p>
<span>{{ $otherVCP[0]->trading_strategy ?? '-' }}</span>
</div>
<div class="col-md-4">
<p>Involved In Short Selling</p>
<span>{{ $otherVCP[0]->involved_in_short_selling ?? '-' }}</span>
</div>
{{-- <div class="col-md-4">
<p>Description</p>
<span>{{ $alternative_investment_funds->description ?? '-' }}</span>
</div> --}}
</div>
</div>
</div>
{{-- <div class="categeory">
<div class="details aos-init aos-animate" data-aos="zoom-in">
<div class="tables row">