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

Merge branch 'main' of https://github.com/Ritikeshyadav/my-freeu into megha

Browse Source
This commit is contained in:
meghamalore
2024-06-25 17:02:48 +05:30
parent 2685868f44 74fa3b4418
commit cff55ecc2a
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Admin/ManageFreeUInvestments/ManageCompaniesController.php
View File

@@ -170,6 +170,7 @@ class ManageCompaniesController extends Controller
public function getCompaniesData()
{
return $this->company->getActiveCompanies();
$data['data'] = $this->company->getActiveCompanies();
return $data;
}
}

8
app/Http/Controllers/Frontend/MarketPlaceController.php
View File

@@ -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) {
@@ -605,7 +605,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);
@@ -677,7 +677,7 @@ class MarketPlaceController extends Controller
{
$interestedStatus = false;
if (request()->user()) {
$interestedStatus = MarketplaceBuyerForm::where(['users_id' => request()->user()->id, 'table' => $table, 'associated_id' => $offering->id])->exists();
$interestedStatus = MarketplaceBuyerForm::where(['users_id' => request()->user()->id, 'table' => $table, 'associated_id' => $offering->id])->where('status','!=','Sold')->exists();
}
$totalInterestedBuyers = MarketplaceBuyerForm::where(['table' => $table, 'associated_id' => $offering->id])->count();
return [

3
public/assets/css/style.bundle.css
View File

@@ -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;
}

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

@@ -1434,4 +1434,7 @@ label.error {
}
.chat-msgs {
height: 90% !important;
}
#kt_profile_details_view svg.svg-inline--fa.fa-download:hover {
color: #c18948;
}

3
public/assets/css/style1.css
View File

@@ -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;
}