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

profit sharing issue

Browse Source
This commit is contained in:
Ritikesh yadav
2024-05-17 15:40:16 +05:30
parent 2455011ce8 d011b75c51
commit 71bf0b4afd
12 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Admin/ManageCommissionController.php
View File

@@ -56,6 +56,7 @@ class ManageCommissionController extends Controller
// ->orderBy('products.created_at')
->latest('products.created_at')
->get();
// dd($products);
return view('Admin.Pages.manage_commission.manage_commission', compact('products'));
}

26
app/Http/Controllers/Frontend/AccountsController.php
View File

@@ -73,8 +73,10 @@ class AccountsController extends Controller
public function individual()
{
$user = User::where('id', auth()->guard('users')->user()->id)->first();
// dd($user);
$this->kyc->blockUser($this->kyc->getUserId(), 'Individual');
return view('Frontend.Pages.profile.individual');
return view('Frontend.Pages.profile.individual', compact('user'));
}
public function createIndividual(StoreIndividualKYC $request)
@@ -97,8 +99,10 @@ class AccountsController extends Controller
public function huf()
{
$user = User::where('id', auth()->guard('users')->id())->first();
// dd($user);
$this->kyc->blockUser($this->kyc->getUserId(), 'HUF');
return view('Frontend.Pages.profile.huf');
return view('Frontend.Pages.profile.huf',compact('user'));
}
public function createHUF(StoreHUFKYC $request)
@@ -120,8 +124,10 @@ class AccountsController extends Controller
public function nri()
{
$user = User::where('id', auth()->guard('users')->id())->first();
// dd($user);
$this->kyc->blockUser($this->kyc->getUserId(), 'NRI');
return view('Frontend.Pages.profile.nri');
return view('Frontend.Pages.profile.nri',compact('user'));
}
public function createNRI(StoreNRIKYC $request)
@@ -148,8 +154,10 @@ class AccountsController extends Controller
public function company()
{
$user = User::where('id', auth()->guard('users')->id())->first();
// dd($user);
$this->kyc->blockUser($this->kyc->getUserId(), 'Company');
return view('Frontend.Pages.profile.company');
return view('Frontend.Pages.profile.company',compact('user'));
}
public function companyKycCreate(StoreCompanyKYC $request)
@@ -176,9 +184,11 @@ class AccountsController extends Controller
// }
public function partnership()
{
{
$user = User::where('id', auth()->guard('users')->id())->first();
// dd($user);
$this->kyc->blockUser($this->kyc->getUserId(), 'Partnership');
return view('Frontend.Pages.profile.partnership');
return view('Frontend.Pages.profile.partnership',compact('user'));
}
public function partnerShipKyc(StorePartnerShipKYC $request)
@@ -200,8 +210,10 @@ class AccountsController extends Controller
public function others()
{
$user = User::where('id', auth()->guard('users')->id())->first();
// dd($user);
$this->kyc->blockUser($this->kyc->getUserId(), 'Others');
return view('Frontend.Pages.profile.others');
return view('Frontend.Pages.profile.others',compact('user'));
}
public function otherKyc(StoreOtherKYC $request)

BIN
public/assets/uploads/fractionalrealestate_images/202405171522_download (1).jfif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

2
resources/views/Admin/Pages/manage_commission/edit_commission.blade.php
View File

@@ -240,7 +240,7 @@
if (result.status == 200) {
toastr.success(result.message);
setTimeout(() => {
// window.location = "{{route('manage_commission')}}"
window.location = "{{route('manage_commission')}}"
}, 1000);
}
if (result.status == 400) {

6
resources/views/Admin/Pages/manage_commission/manage_commission.blade.php
View File

@@ -110,11 +110,7 @@
<td>{{ $product->minimum_investment }}</td>
<td>{{ $product->commission_type }}</td>
<td>{{ $product->category_name }}</td>
@if ($product->rate)
<td>{{ $product->rate }}%</td>
@else
<td></td>
@endif
<td>{{ $product->rate ?? $product->upfront_rate ?? $product->trail_rate }}</td>
<td>{{ $product->commission }}</td>
<td
class="text-end d-flex align-items-center justify-content-around notexport">

2
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->profit_sharing != null ? (int)$data->products->profit_sharing : 'null' }}, '{{ $data->custom_id }}','{{ $data->categories }}',{{ $data->products_id }})"
onclick="holdingStatus({{ $data->id }},'{{ $data->holding_status }}',{{ $count }},{{ $data->products ? ($data->products->profit_sharing == null ? 'null' : $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

6
resources/views/Frontend/Pages/profile/company.blade.php
View File

@@ -40,19 +40,19 @@
<label class="mandatory">Name</label>
<input type="text" id="name" name="name" placeholder="Enter Name"
onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)"
class="iv-input form-control p-2">
class="iv-input form-control p-2" value="{{$user->name}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Mobile Number</label>
<input type="text" id="mobile_number" name="mobile_number"
placeholder="Enter Mobile Number" minlength="10" maxlength="10"
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1');"
class="iv-input form-control p-2">
class="iv-input form-control p-2" value="{{$user->contact_number}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Email ID</label>
<input type="email" id="email" name="email" placeholder="Enter Email"
class="iv-input form-control p-2">
class="iv-input form-control p-2" value="{{$user->email}}">
</div>
{{-- <div class="col-md-6 mb-4">
<label class="mandatory">Father Name</label>

6
resources/views/Frontend/Pages/profile/huf.blade.php
View File

@@ -38,15 +38,15 @@
<div class="row form-sec">
<div class="col-md-6 mb-4">
<label class="mandatory">Name</label>
<input type="text" id="name" name="name" placeholder="Enter Name" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" class="iv-input form-control p-2">
<input type="text" id="name" name="name" placeholder="Enter Name" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" class="iv-input form-control p-2" value="{{$user->name}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Mobile Number</label>
<input type="text" id="mobile_number" name="mobile_number" placeholder="Enter Mobile Number" minlength="10" maxlength="10" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1');" class="iv-input form-control p-2">
<input type="text" id="mobile_number" name="mobile_number" placeholder="Enter Mobile Number" minlength="10" maxlength="10" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1');" class="iv-input form-control p-2" value="{{$user->contact_number}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Email ID</label>
<input type="email" id="email" name="email" placeholder="Enter Email" class="iv-input form-control p-2">
<input type="email" id="email" name="email" placeholder="Enter Email" class="iv-input form-control p-2" value="{{$user->email}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Date Of Birth</label>

6
resources/views/Frontend/Pages/profile/individual.blade.php
View File

@@ -41,19 +41,19 @@
<label class="mandatory">Name</label>
<input type="text" id="name" name="name" placeholder="Enter Name"
onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)"
class="iv-input form-control p-2">
class="iv-input form-control p-2" value="{{$user->name}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Mobile Number</label>
<input type="tel" id="mobile_number" name="mobile_number"
placeholder="Enter Mobile Number" minlength="10" maxlength="10"
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1');"
class="contact-number iv-input form-control p-2">
class="contact-number iv-input form-control p-2" value="{{$user->contact_number}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Email ID</label>
<input type="email" id="email" name="email" placeholder="Enter Email"
class="iv-input form-control p-2">
class="iv-input form-control p-2" value="{{$user->email}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Father's Name</label>

6
resources/views/Frontend/Pages/profile/nri.blade.php
View File

@@ -42,16 +42,16 @@
<div class="row form-sec">
<div class="col-md-6 mb-4">
<label class="mandatory">Name</label>
<input type="text" id="name" name="name" placeholder="Enter Name" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" class="iv-input form-control p-2">
<input type="text" id="name" name="name" placeholder="Enter Name" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" class="iv-input form-control p-2" value="{{$user->name}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Mobile Number</label>
<input type="text" id="mobile_number" name="mobile_number" placeholder="Enter Mobile Number" minlength="10" maxlength="10" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1');" class="iv-input form-control p-2">
<input type="text" id="mobile_number" name="mobile_number" placeholder="Enter Mobile Number" minlength="10" maxlength="10" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1');" class="iv-input form-control p-2" value="{{$user->contact_number}}">
<!--<input type="number" id="mobile_number" name="mobile_number" oninput="javascript: if (this.value.length > this.maxLength) this.value = this.value.slice(0, this.maxLength);" placeholder="Enter Mobile Number" minlength="10" maxlength="10" class="iv-input form-control p-2">-->
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Email ID</label>
<input type="email" id="email" name="email" placeholder="Enter Email" class="iv-input form-control p-2">
<input type="email" id="email" name="email" placeholder="Enter Email" class="iv-input form-control p-2" value="{{$user->email}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Father Name</label>

6
resources/views/Frontend/Pages/profile/others.blade.php
View File

@@ -38,15 +38,15 @@
<div class="row form-sec">
<div class="col-md-6 mb-4">
<label class="mandatory">Name</label>
<input type="text" id="name" name="name" placeholder="EnterName" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" class="iv-input form-control p-2">
<input type="text" id="name" name="name" placeholder="EnterName" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" class="iv-input form-control p-2" value="{{$user->name}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Mobile Number</label>
<input type="text" id="mobile_number" name="mobile_number" placeholder="Enter Mobile Number" minlength="10" maxlength="10" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1');" class="iv-input form-control p-2">
<input type="text" id="mobile_number" name="mobile_number" placeholder="Enter Mobile Number" minlength="10" maxlength="10" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1');" class="iv-input form-control p-2" value="{{$user->contact_number}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Email ID</label>
<input type="email" id="email" name="email" placeholder="Enter Email" class="iv-input form-control p-2">
<input type="email" id="email" name="email" placeholder="Enter Email" class="iv-input form-control p-2" value="{{$user->email}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Father Name</label>

6
resources/views/Frontend/Pages/profile/partnership.blade.php
View File

@@ -41,19 +41,19 @@
<label class="mandatory">Name</label>
<input type="text" id="name" name="name" placeholder="EnterName"
onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)"
class="iv-input form-control p-2">
class="iv-input form-control p-2" value="{{$user->name}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Mobile Number</label>
<input type="text" id="mobile_number" name="mobile_number"
placeholder="Enter Mobile Number" minlength="10" maxlength="10"
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1');"
class="iv-input form-control p-2">
class="iv-input form-control p-2" value="{{$user->contact_number}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Email ID</label>
<input type="email" id="email" name="email" placeholder="Enter Email"
class="iv-input form-control p-2">
class="iv-input form-control p-2" value="{{$user->email}}">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Father Name</label>