From 943ab38954f3521f9de92de295c34c37109c9555 Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Tue, 25 Jun 2024 15:20:10 +0530 Subject: [PATCH] fix changes --- .../ManageFreeUInvestments/ManageCompaniesController.php | 3 ++- app/Http/Controllers/Frontend/MarketPlaceController.php | 4 ++-- public/assets/css/style.bundle.css | 3 +++ public/assets/css/style.css | 3 +++ public/assets/css/style1.css | 3 +++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCompaniesController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCompaniesController.php index 2882b64..2927061 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCompaniesController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCompaniesController.php @@ -170,6 +170,7 @@ class ManageCompaniesController extends Controller public function getCompaniesData() { - return $this->company->getActiveCompanies(); + $data['data'] = $this->company->getActiveCompanies(); + return $data; } } diff --git a/app/Http/Controllers/Frontend/MarketPlaceController.php b/app/Http/Controllers/Frontend/MarketPlaceController.php index 5290341..208d528 100644 --- a/app/Http/Controllers/Frontend/MarketPlaceController.php +++ b/app/Http/Controllers/Frontend/MarketPlaceController.php @@ -539,7 +539,7 @@ class MarketPlaceController extends Controller 'no_of_units_you_wish_to_buy' => $request->no_of_units_you_wish_to_buy, 'offer_price_per_unit' => $request->offer_price_per_unit, // 'total_purchase_value' => $request->total_purchase_value, - 'total_purchase_value' => $request->no_of_units_you_wish_to_buy * $request->offer_price_per_unit + 'total_purchase_value' => ($request->no_of_units_you_wish_to_buy == 0 && $request->offer_price_per_unit == 0) ? $request->total_purchase_value : $request->no_of_units_you_wish_to_buy * $request->offer_price_per_unit, ]); $user = ModelsUser::find($request->user()->id); if ($buyerForm) { @@ -631,7 +631,7 @@ class MarketPlaceController extends Controller }; if (MarketplaceFractionalRealEstateSeller::where('slug', $slug)->exists()) { $offering['type'] = 'fractional-real-estate'; - $marketFRE = MarketplaceFractionalRealEstateSeller::where('slug', $slug)->first(); + $marketFRE = MarketplaceFractionalRealEstateSeller::with('company')->where('slug', $slug)->first(); $offering['own-product'] = MarketplaceSellerForm::where(['id' => $marketFRE->seller_forms_id, 'users_id' => auth('sanctum')->id()])->exists(); $offering['data'] = $marketFRE; // dd($marketFRE); diff --git a/public/assets/css/style.bundle.css b/public/assets/css/style.bundle.css index 3d9624d..f94d252 100644 --- a/public/assets/css/style.bundle.css +++ b/public/assets/css/style.bundle.css @@ -57991,4 +57991,7 @@ label.error { } .ck.ck-content.ck-focused { height: 300px; +} +#kt_profile_details_view svg.svg-inline--fa.fa-download:hover { + color: #c18948; } \ No newline at end of file diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 86661b5..1e28e71 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -1434,4 +1434,7 @@ label.error { } .chat-msgs { height: 90% !important; +} +#kt_profile_details_view svg.svg-inline--fa.fa-download:hover { + color: #c18948; } \ No newline at end of file diff --git a/public/assets/css/style1.css b/public/assets/css/style1.css index 838e554..c52d4e0 100644 --- a/public/assets/css/style1.css +++ b/public/assets/css/style1.css @@ -1069,4 +1069,7 @@ table.dataTable tbody tr { } label.error { color: red !important; +} +#kt_profile_details_view svg.svg-inline--fa.fa-download:hover { + color: #c18948; } \ No newline at end of file