diff --git a/app/Http/Controllers/Frontend/ProfileController.php b/app/Http/Controllers/Frontend/ProfileController.php
index bf2c5c5..6b4688a 100644
--- a/app/Http/Controllers/Frontend/ProfileController.php
+++ b/app/Http/Controllers/Frontend/ProfileController.php
@@ -529,19 +529,21 @@ class ProfileController extends Controller
$id = $request->id;
// dd(Auth::guard('users')->user());
// dd(getAllNotifications());
+ $userNotifications = User::find(auth()->guard('users')->user()->id);
if ($id) {
- Auth::guard('users')->user()->unreadNotifications->where('id', $id)->markAsRead();
+ $userNotifications->notifications->where('id', $id)->markAsRead();
}
- $notifications = Auth::guard('users')->user()->notifications;
- // dd($notifications);
+ // $notifications = Auth::guard('users')->user()->notifications;
+ // dd($userNotifications->notifications->toArray());
$notificationHTML = '';
- $count = 0;
- foreach ($notifications as $data) {
- $count++;
- $read_at = $data->read_at ? 'style="color:#808080"' : 'style="color:black"';
- $oddEven = $count % 2 == 1 ? 'odd' : 'even';
+ // $count = 0;
+ foreach ($userNotifications->notifications as $data) {
+ // $count++;
+ $background_color = $data->read_at ? 'style="background-color:#efecec"' : 'style="background-color:white"';
+ $read_at = $data->read_at ? 'style="color:#a3a0a0"' : 'style="color:black"';
+ // $oddEven = $count % 2 == 1 ? 'odd' : 'even';
// $notificationHTML .= "
- $notificationHTML .= "
+ $notificationHTML .= "
" . $data->data['message'] . "
@@ -551,7 +553,7 @@ class ProfileController extends Controller
";
}
if ($notificationHTML) {
- return response()->json(['status' => 200, 'data' => $notificationHTML, 'count'=>Auth::guard('users')->user()->unreadNotifications->count()]);
+ return response()->json(['status' => 200, 'data' => $notificationHTML, 'count'=>$userNotifications->unreadNotifications->count()]);
}
}
}
diff --git a/app/Http/Resources/AngelFundResource.php b/app/Http/Resources/AngelFundResource.php
index 9ab7ee9..39f362b 100644
--- a/app/Http/Resources/AngelFundResource.php
+++ b/app/Http/Resources/AngelFundResource.php
@@ -65,7 +65,7 @@ class AngelFundResource extends JsonResource
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
'isin_code' => $this->isin_code,
'focused_funds' => $this->focused_funds,
- 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
+ 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,
diff --git a/app/Http/Resources/FundForDistressedAssetResource.php b/app/Http/Resources/FundForDistressedAssetResource.php
index 27e728a..bdbbb0b 100644
--- a/app/Http/Resources/FundForDistressedAssetResource.php
+++ b/app/Http/Resources/FundForDistressedAssetResource.php
@@ -69,7 +69,7 @@ class FundForDistressedAssetResource extends JsonResource
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
// 'isin_code' => $this->isin_code,
'focused_funds' => $this->focused_funds,
- 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
+ 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,
diff --git a/app/Http/Resources/HedgeFundResource.php b/app/Http/Resources/HedgeFundResource.php
index 3b2fb9d..4e895dc 100644
--- a/app/Http/Resources/HedgeFundResource.php
+++ b/app/Http/Resources/HedgeFundResource.php
@@ -74,7 +74,7 @@ class HedgeFundResource extends JsonResource
'focused_real_estate_sectors'=>$this->focused_real_estate_sectors,
'rera_complied_property' =>$this->rera_complied_property,
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
- 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
+ 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
];
diff --git a/app/Http/Resources/InfrastructureFundResource.php b/app/Http/Resources/InfrastructureFundResource.php
index 9eaafff..e14dbbc 100644
--- a/app/Http/Resources/InfrastructureFundResource.php
+++ b/app/Http/Resources/InfrastructureFundResource.php
@@ -68,7 +68,7 @@ class InfrastructureFundResource extends JsonResource
'minimum_investment' => $this->minimum_investment,
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
'focused_funds' => $this->focused_funds,
- 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
+ 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,
diff --git a/app/Http/Resources/LongOnlyEquityResource.php b/app/Http/Resources/LongOnlyEquityResource.php
index eb9e578..76731ca 100644
--- a/app/Http/Resources/LongOnlyEquityResource.php
+++ b/app/Http/Resources/LongOnlyEquityResource.php
@@ -77,7 +77,7 @@ class LongOnlyEquityResource extends JsonResource
'isin_code' => $this->isin_code,
'focused_real_estate_sectors' => $this->focused_real_estate_sectors,
'rera_complied_property' => $this->rera_complied_property,
- 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
+ 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
diff --git a/app/Http/Resources/PrivateEquityFundResource.php b/app/Http/Resources/PrivateEquityFundResource.php
index eae582b..6814411 100644
--- a/app/Http/Resources/PrivateEquityFundResource.php
+++ b/app/Http/Resources/PrivateEquityFundResource.php
@@ -69,7 +69,7 @@ class PrivateEquityFundResource extends JsonResource
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
'isin_code' => $this->isin_code,
'focused_funds' => $this->focused_funds,
- 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
+ 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,
diff --git a/app/Http/Resources/PrivateInvestmentInPublicEquityFundResource.php b/app/Http/Resources/PrivateInvestmentInPublicEquityFundResource.php
index e289466..179deae 100644
--- a/app/Http/Resources/PrivateInvestmentInPublicEquityFundResource.php
+++ b/app/Http/Resources/PrivateInvestmentInPublicEquityFundResource.php
@@ -71,7 +71,7 @@ class PrivateInvestmentInPublicEquityFundResource extends JsonResource
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
'isin_code' => $this->isin_code,
'focused_funds' => $this->focused_funds,
- 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
+ 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,
diff --git a/app/Http/Resources/PrivateRealEstateFundResource.php b/app/Http/Resources/PrivateRealEstateFundResource.php
index ba3d493..6e21236 100644
--- a/app/Http/Resources/PrivateRealEstateFundResource.php
+++ b/app/Http/Resources/PrivateRealEstateFundResource.php
@@ -71,7 +71,7 @@ class PrivateRealEstateFundResource extends JsonResource
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
'isin_code' => $this->isin_code,
'focused_funds' => $this->focused_funds,
- 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
+ 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,
diff --git a/app/Http/Resources/VentureCapitalFundResource.php b/app/Http/Resources/VentureCapitalFundResource.php
index 0728593..dd987a4 100644
--- a/app/Http/Resources/VentureCapitalFundResource.php
+++ b/app/Http/Resources/VentureCapitalFundResource.php
@@ -77,7 +77,7 @@ class VentureCapitalFundResource extends JsonResource
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
- 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
+ 'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
];
diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css
index 3f823ea..1255603 100644
--- a/public/assets/css/FrontendCss/style.css
+++ b/public/assets/css/FrontendCss/style.css
@@ -5527,6 +5527,14 @@ span.color-red {
width: 70px;
}
+ .inn_to_testi {
+ height: auto;
+ width: 100%;
+ }
+ .faqs-content .dropdown .dropdown-menu {
+ height: auto;
+ }
+
.investor-profile .invest-view-form .form-sec {
width: 100%;
}
@@ -6437,7 +6445,9 @@ span.color-red {
}
.notifications li.item {
+ padding: 5px;
list-style: none;
+ border-radius: 5px;
}
ul.notification-drop {
@@ -6468,7 +6478,7 @@ ul.notification-drop {
.inn_to_testi {
width: 80%;
background: #fff;
- box-shadow: 0 0 16px 0px #EDD9C2;
+ box-shadow: 0 0 16px 0px #edd9c2;
padding: 20px;
vertical-align: middle;
border-radius: 10px;
@@ -6514,7 +6524,7 @@ button.swal2-confirm.btn.yellow-btn.popup-button {
}
.notifications .list-item p strong {
font-weight: normal;
- font-size: 13px !important;
+ font-size: 12px !important;
width: 100%;
display: flex;
justify-content: end;
@@ -6524,7 +6534,7 @@ ul#user_notification {
padding: 0;
}
a.read_notification {
- font-size: 15px !important;
+ font-size: 13px !important;
}
p.regist,
p.regist a {
diff --git a/resources/views/Frontend/menu-after-lg.blade.php b/resources/views/Frontend/menu-after-lg.blade.php
index 4c57b49..acceee3 100644
--- a/resources/views/Frontend/menu-after-lg.blade.php
+++ b/resources/views/Frontend/menu-after-lg.blade.php
@@ -579,9 +579,7 @@
{{-- --}}
{{-- --}}
{{-- --}}
-