From 64b89f7b5ca7e07821023e0356aea838429110c2 Mon Sep 17 00:00:00 2001 From: Shailesh-1981 <86923815+Shailesh-1981@users.noreply.github.com> Date: Wed, 5 Jun 2024 16:08:09 +0530 Subject: [PATCH 1/3] company commented --- app/Http/Controllers/Frontend/ProfileController.php | 2 +- .../venture-capital-fund-product.blade.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Frontend/ProfileController.php b/app/Http/Controllers/Frontend/ProfileController.php index 2a5c1cf..9e3cd62 100644 --- a/app/Http/Controllers/Frontend/ProfileController.php +++ b/app/Http/Controllers/Frontend/ProfileController.php @@ -524,7 +524,7 @@ class ProfileController extends Controller " . $data->created_at->diffForHumans() . "

- "; + "; } if ($notificationHTML) { return response()->json(['status' => 200, 'data' => $notificationHTML, 'count'=>Auth::guard('users')->user()->unreadNotifications->count()]); diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php index f7faf5e..928d0a5 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/venture-capital-fund-product.blade.php @@ -331,10 +331,10 @@

Other expenses

{{ $ventureCapitalFund->other_expenses ?? '-' }} -
+ {{--

Company

{{ $ventureCapitalFund->company->company_name ?? '-' }} -
+
--}} From 9bfbe74c65b35cc2810b7b974092a42dfce880fd Mon Sep 17 00:00:00 2001 From: Shailesh-1981 <86923815+Shailesh-1981@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:08:39 +0530 Subject: [PATCH 2/3] fixing admin chat --- .../AlternativeInvestmentFundController.php | 3 +- public/assets/css/style.css | 22 +++++++-- .../Pages/manage_chat/manage_chat.blade.php | 33 +++++++------ .../Pages/manage_chat/user-details.blade.php | 42 ++++++++-------- .../angel-fund-product.blade.php | 10 ++-- .../venture-capital-fund-product.blade.php | 48 +++++++++++++++++++ 6 files changed, 112 insertions(+), 46 deletions(-) diff --git a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php index 8cd5395..a0a6bec 100644 --- a/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php +++ b/app/Http/Controllers/Frontend/AlternativeInvestmentFundController.php @@ -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')); } diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 31447ed..9ce1c34 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -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; diff --git a/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php b/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php index 18848ee..859b2e1 100644 --- a/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php +++ b/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php @@ -13,7 +13,7 @@
-
+
@@ -67,10 +67,13 @@
-
+
+
+ style="overflow-x:hidden;background-color: #cccccc1a;position: relative;height: 100%;">
+ +

@@ -102,7 +98,7 @@

Total Investment Till Date

- {{totalInvestment($user->id)}} + {{ totalInvestment($user->id) }}
@@ -114,7 +110,7 @@

Active Investment

- {{totalInvestment($user->id,'Holding')}} + {{ totalInvestment($user->id, 'Holding') }}
@@ -126,7 +122,7 @@

Reedemed Investment

- {{totalInvestment($user->id,'Reedemed')}} + {{ totalInvestment($user->id, 'Reedemed') }}
@@ -138,7 +134,7 @@

KYC Status

- {{$kycStatus}} + {{ $kycStatus }}
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php index 1472cc1..9a533c0 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/angel-fund-product.blade.php @@ -94,17 +94,21 @@
- @if ($productData && $productData->product_images != null) + {{-- @dd($productData); --}} + @if ($product && $product->product_images != null) + +
+
+
+
+

ISIN Code

+ {{ $otherVCP[0]->isin_code ?? '-' }} +
+
+

Focused Real Estate Sectors

+ {{ $otherVCP[0]->focused_sectors_industries ?? '-' }} +
+
+

Rera Complied Property

+ {{ $otherVCP[0]->rera_complied_property ?? '-' }} +
+
+
+
+

Return On Investment

+ {{ $otherVCP[0]->return_on_investment ?? '-' }} +
+
+

Valuation Per Sector

+ {{ $otherVCP[0]->valuation_per_sector ?? '-' }} +
+
+

Focused Funds

+ {{ $otherVCP[0]->focused_funds ?? '-' }} +
+
+
+
+

Trading Strategy

+ {{ $otherVCP[0]->trading_strategy ?? '-' }} +
+
+

Involved In Short Selling

+ {{ $otherVCP[0]->involved_in_short_selling ?? '-' }} +
+ {{--
+

Description

+ {{ $alternative_investment_funds->description ?? '-' }} +
--}} +
+
+
+ + {{--
From 1fe138ea1c49330f7827275c6a618475e7b06b23 Mon Sep 17 00:00:00 2001 From: Shailesh-1981 <86923815+Shailesh-1981@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:08:51 +0530 Subject: [PATCH 3/3] fixing admin chat --- .../Pages/manage_chat/manage_chat.blade.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php b/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php index 859b2e1..a712463 100644 --- a/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php +++ b/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php @@ -99,19 +99,19 @@ $(function() { userList(); }) - // setInterval(function() { - // if ($('#user_id').val()) { - // // $(`#user_${$('#user_id').val()}`).addClass('active'); - // getUser($('#user_id').val()); - // // $('.spanName').each(function() { - // // $(this).removeClass('active'); - // // }) - // } - // }, 4000); + setInterval(function() { + if ($('#user_id').val()) { + // $(`#user_${$('#user_id').val()}`).addClass('active'); + getUser($('#user_id').val()); + // $('.spanName').each(function() { + // $(this).removeClass('active'); + // }) + } + }, 4000); - // setInterval(function() { - // userList(); - // }, 5000) + setInterval(function() { + userList(); + }, 5000) function searchData(search) { // alert(search)