From 10c04d51c6b61a3539070a81492d8d77b673feac Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Thu, 27 Jun 2024 12:50:21 +0530 Subject: [PATCH 1/3] fixing changes --- app/Http/Controllers/Frontend/DashboardController.php | 6 +++--- public/assets/css/FrontendCss/style.css | 2 +- resources/views/Frontend/Pages/profile/dashboard.blade.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index 5ecaa76..4e10802 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -901,7 +901,7 @@ class DashboardController extends Controller 'marketplace_fre_sellers.property_grade', 'marketplace_fre_sellers.asset_type', 'marketplace_fre_sellers.fractional_real_estate_platform', - 'marketplace_fre_sellers.expected_selling_price' + 'marketplace_fre_sellers.og_expected_selling_price' ) ->get(); $data['data']->each(function ($value) { @@ -958,7 +958,7 @@ class DashboardController extends Controller ->sold() // ->where('listing_status', '!=', 'Hide') // ->where('marketplace_fre_sellers.listing_status', 'Hide') - ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price') + ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'og_expected_selling_price') ->get(); $data['data']->each(function ($value) { if ($value->fractional_real_estate_platform != null) { @@ -1001,7 +1001,7 @@ class DashboardController extends Controller ->join('marketplace_fre_sellers', 'marketplace_seller_forms.id', 'marketplace_fre_sellers.seller_forms_id') ->where('marketplace_fre_sellers.listing_status', '!=', 'Hide') // ->where('marketplace_fre_sellers.status', 'Approved') - ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price') + ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'og_expected_selling_price') ->get(); return $data; } diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css index d5739b0..3f823ea 100644 --- a/public/assets/css/FrontendCss/style.css +++ b/public/assets/css/FrontendCss/style.css @@ -6468,7 +6468,7 @@ ul.notification-drop { .inn_to_testi { width: 80%; background: #fff; - box-shadow: 0 0 16px 0px #fcdff0; + box-shadow: 0 0 16px 0px #EDD9C2; padding: 20px; vertical-align: middle; border-radius: 10px; diff --git a/resources/views/Frontend/Pages/profile/dashboard.blade.php b/resources/views/Frontend/Pages/profile/dashboard.blade.php index 1c00a53..fecc641 100644 --- a/resources/views/Frontend/Pages/profile/dashboard.blade.php +++ b/resources/views/Frontend/Pages/profile/dashboard.blade.php @@ -278,7 +278,7 @@ {{ $data->property_grade }} {{ $data->asset_type }} {{ $data->company_name }} - {{ number_format((float) $data->expected_selling_price, 0, '.', '') }} + {{ number_format((float) $data->og_expected_selling_price, 0, '.', '') }} @endforeach @@ -418,7 +418,7 @@ {{ $data->property_grade }} {{ $data->asset_type }} {{ $data->company_name }} - {{ number_format((float) IND_money_format($data->expected_selling_price), 0, '.', '') }} + {{ number_format((float) IND_money_format($data->og_expected_selling_price), 0, '.', '') }} From 7d2e50e49a0357def48fb264949e9ed31dd8d027 Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Thu, 27 Jun 2024 13:21:27 +0530 Subject: [PATCH 2/3] fixing changes --- .../manage_user_product/manage_user_add.blade.php | 4 ++-- resources/views/Admin/add-sub-admin.blade.php | 2 +- .../long-only-equity-fund-product.blade.php | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php index 9d7728a..428cfee 100644 --- a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php +++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php @@ -151,7 +151,7 @@ PAN - +
- +
diff --git a/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php b/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php index 76251ac..7c445d3 100644 --- a/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php +++ b/resources/views/Frontend/Pages/alternative-investment-fund/long-only-equity-fund-product.blade.php @@ -410,11 +410,11 @@

Focused Real Estate Sectors

{{ $longOnlyEquityFund->focused_real_estate_sectors ?? '--' }} - {{--
-

Regions Covered

- {{ $longOnlyEquityFund->regions_covered ?? '--' }} -
+

Return on investment (IRR/DPI)

+ {{ $longOnlyEquityFund->return_on_investment_irr_dpi_rvpi_tvpi ?? '--' }} +
+ {{--

ISIN Code

{{ $longOnlyEquityFund->isin_code ?? '--' }}
--}} From c26ecdf7f7bb66c84d82710f13b5553448620bcc Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Thu, 27 Jun 2024 13:28:55 +0530 Subject: [PATCH 3/3] fixing changes --- resources/views/Admin/add-sub-admin.blade.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/resources/views/Admin/add-sub-admin.blade.php b/resources/views/Admin/add-sub-admin.blade.php index 306c04e..8ec4dc0 100644 --- a/resources/views/Admin/add-sub-admin.blade.php +++ b/resources/views/Admin/add-sub-admin.blade.php @@ -347,7 +347,7 @@ @@ -537,7 +537,7 @@