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

fixing chnages

Browse Source
This commit is contained in:
cj201199
2024-05-17 11:43:34 +05:30
parent ee2b7e5046 c1be65bb05
commit b3ebee9e4f
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Frontend/DashboardController.php
View File

@@ -477,6 +477,7 @@ class DashboardController extends Controller
$id = \Crypt::decrypt($custom_id);
$data = MonthlyUpdateMaster::with('investor')->where('custom_id', '=', $id)->first();
$category = $data->categories;
$products_id = $data->products_id;
if ($category == "Fractional Real Estate") {
$data['category'] = 'Fractional Real Estate';
} elseif ($category == "Alternative Investment Fund") {
@@ -516,7 +517,7 @@ class DashboardController extends Controller
// 'email' => $userKyc ? $marketPlaceSellerForm->email ?? $user->email : null,
// 'declaration' => $userKyc ? $marketPlaceSellerForm->declaration ?? null : null,
// ];
return view('Frontend.Pages.profile.market-list.sale-form', compact('data', 'userData'));
return view('Frontend.Pages.profile.market-list.sale-form', compact('data', 'userData', 'products_id'));
}
public function sellerFormSubmit(Request $request)

24
app/Http/Controllers/Frontend/HomeController.php
View File

@@ -144,18 +144,18 @@ class HomeController extends Controller
}
// $checkUserKycStatus = UserKyc::where('users_id',auth()->guard('users')->user()->id)->where('status','!=','Approved')->exists();
$checkUserKycStatus = UserKyc::where('users_id',auth()->guard('users')->user()->id)->first();
// dd($checkUserKycStatus == false ? true:false);
if (!$checkUserKycStatus || $checkUserKycStatus->status != 'Approved') {
if($checkUserKycStatus && $checkUserKycStatus->status != 'Approved')
{
return response()->json(['status' => 401, 'message' => "Your kyc under review. <br> <small>Please contact us at info@jerichoalternatives.in </small>"]);
}
// else{
// return response()->json(['status' => 401, 'message' => "Please complete your KYC"]);
// }
return response()->json(['status' => 401, 'message' => "Please complete your KYC"]);
}
// $checkUserKycStatus = UserKyc::where('users_id',auth()->guard('users')->user()->id)->first();
// // dd($checkUserKycStatus == false ? true:false);
// if (!$checkUserKycStatus || $checkUserKycStatus->status != 'Approved') {
// if($checkUserKycStatus && $checkUserKycStatus->status != 'Approved')
// {
// return response()->json(['status' => 401, 'message' => "Your KYC under review. <br> <small>Please contact us at info@jerichoalternatives.in </small>"]);
// }
// // else{
// // return response()->json(['status' => 401, 'message' => "Please complete your KYC"]);
// // }
// return response()->json(['status' => 401, 'message' => "Please complete your KYC"]);
// }
$addLead = Lead::create([

8
resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user.blade.php
View File

@@ -176,7 +176,7 @@
title="Holding and Reedemed"> --}}
<a class="action_icon hold_reedem" data-bs-toggle="tooltip"
{{-- data-count="{{ $count }}" {{$data->products == null ? onclick="holdingStatus({{ $data->id }},'{{ $data->holding_status }}',{{ $count }})" }} onclick="holdingStatus({{ $data->id }},'{{ $data->holding_status }}',{{ $count }}, {{ $data->products == null ? 'null' : ($data->products->profit_sharing == null ? $data->products->id : $data->products->profit_sharing) }})" --}} data-count="{{ $count }}"
onclick="holdingStatus({{ $data->id }},'{{ $data->holding_status }}',{{ $count }}, {{ $data->products == null ? 'null' : ($data->products->profit_sharing == null ? 'null' : $data->products->profit_sharing) }}, '{{ $data->custom_id }}','{{ $data->categories }}',{{ $data->products_id }})"
onclick="holdingStatus({{ $data->id }},'{{ $data->holding_status }}',{{ $count }},{{ $data->products->profit_sharing ? (int)$data->products->profit_sharing : 'null' }}, '{{ $data->custom_id }}','{{ $data->categories }}',{{ $data->products_id }})"
data-bs-custom-class="tooltip-inverse" data-bs-placement="top"
title="Holding and Reedemed">
<label
@@ -892,8 +892,8 @@
});
function holdingStatus(id, status, count = null, profitSharing, customId, categories, productId) {
// alert(profitSharing)
if (profitSharing <= 0 && status == 'Holding') {
// alert(profitSharing);
if (profitSharing >= 0 && status == 'Holding') {
$('#id').val(id);
$('#product_id').val(productId);
$('#status').val(status);
@@ -903,7 +903,7 @@
$('#categories').val(categories);
$('#exampleModalCenter').modal('show');
}
if (profitSharing == null || status == 'Reedemed') {
if (status == 'Reedemed') {
let text;
status == 'Holding' ? text = 'redeem' : text = 'hold';
Swal.fire({

1
resources/views/Frontend/Pages/profile/market-list/sale-form.blade.php
View File

@@ -21,6 +21,7 @@
<form id="marketplace-seller-form" method="POST">
@csrf
<input type="hidden" id="id" value="{{ $userData->encrypted_custom_id }}">
<input type="hidden" id="products_id" value="{{ $products_id }}">
<div class="row">
<div class="form-group col-md-6">
<label>Name</label>