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

fixing changes

Browse Source
This commit is contained in:
Ritikesh yadav
2024-05-31 15:52:03 +05:30
parent c7641338b7
commit 74f2aba950
8 changed files with 204 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,6 +58,51 @@ class ManageCommissionController extends Controller
// ->orderBy('products.created_at')
->latest('products.created_at')
->get();
// dd($products);
// $products->each(function($value){
// $monthlyData = MonthlyUpdateMaster::where('products_id',$value->id)->pluck('id');
// $totalCommissionEarnedTillNow = 0;
// if($monthlyData->toArray() != null)
// {
// $monthlyData->each(function($monthlyID) use($totalCommissionEarnedTillNow){
// $data = MonthlyUpdateMasterCommission::where('id',$monthlyID)->get();
// if($data->toArray() != null)
// {
// $totalCommissionEarnedTillNow2 = 0;
// $data->each(function($dataValue) use ($totalCommissionEarnedTillNow2){
// $totalCommissionEarnedTillNow2 += floatval($dataValue->getRawOriginal()['gross_commissioned_earned_inr']);
// });
// $dataValue->commissionEarned = $totalCommissionEarnedTillNow2;
// // $totalCommissionEarnedTillNow = $totalCommissionEarned;
// }
// });
// }
// $value->totalCommissionEarnedTillNow = $totalCommissionEarnedTillNow;
// });
$products->each(function($value){
$monthlyData = MonthlyUpdateMaster::where('products_id',$value->id)->get();
$totalCommission = 0;
if($monthlyData->isNotEmpty())
{
foreach($monthlyData as $monthlyDataRow)
{
$data = MonthlyUpdateMasterCommission::where('monthly_id',$monthlyDataRow->id)->get();
if($data->isNotEmpty())
{
// dd($data);
foreach($data as $dataRow)
{
$totalCommission += floatval($dataRow->getRawOriginal()['gross_commissioned_earned_inr']);
}
}
}
}
// dd($totalCommission);
$value->totalCommission = $totalCommission;
// dd($value);
});
// dd($products);
return view('Admin.Pages.manage_commission.manage_commission', compact('products'));
}

3
app/Http/Controllers/Admin/ManageUserProductController.php
View File

@@ -25,6 +25,7 @@ use App\Models\MonthlyUpdatePeerToPeerLending;
use App\Models\Product;
use App\Notifications\UserAdmin;
use App\Exports\UserProduct;
use Carbon\Carbon;
class ManageUserProductController extends Controller
{
@@ -820,6 +821,8 @@ class ManageUserProductController extends Controller
'product_name' => $request->product_name,
'account_number' => $request->account_number,
'spv_details' => $request->spv_details,
'created_at' => Carbon::now(),
'updated_at' => Carbon::now(),
]);
$statementReportsArray = array();

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

@@ -834,8 +834,20 @@ class DashboardController extends Controller
->join('marketplace_aif_sellers', 'marketplace_buyer_forms.associated_id', 'marketplace_aif_sellers.id')
->alernativeInvestmentFund()
->where('listing_status', '!=', 'Hide')
->select('name_of_the_aif_fund', 'fund_category', 'fund_strategy', 'type_of_fund', 'total_capital_commitment', 'uncalled_capital_commitment')
->notSold()
// ->select('name_of_the_aif_fund', 'fund_category', 'fund_strategy', 'type_of_fund', 'total_capital_commitment', 'uncalled_capital_commitment')
->select(
'marketplace_buyer_forms.*', // Select all columns from marketplace_aif_sellers
'marketplace_aif_sellers.name_of_the_aif_fund',
'marketplace_aif_sellers.fund_category',
'marketplace_aif_sellers.fund_strategy',
'marketplace_aif_sellers.type_of_fund',
'marketplace_aif_sellers.total_capital_commitment',
'marketplace_aif_sellers.uncalled_capital_commitment'
)
->get();
// $data['data'] = MarketplaceBuyerForm::has('aifSellerData')->with('aifSellerData')->alernativeInvestmentFund()->notSold()->get();
// dd($data['data']->toArray());
return $data;
}
@@ -847,7 +859,17 @@ class DashboardController extends Controller
// ->with('compaines')
->fractionalRealEstate()
->where('listing_status', '!=', 'Hide')
->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price')
->notSold()
// ->select('property_name', 'property_address', 'property_grade', 'asset_type', 'fractional_real_estate_platform', 'expected_selling_price')
->select(
'marketplace_buyer_forms.*', // Select all columns from marketplace_aif_sellers
'marketplace_fre_sellers.property_name',
'marketplace_fre_sellers.property_address',
'marketplace_fre_sellers.property_grade',
'marketplace_fre_sellers.asset_type',
'marketplace_fre_sellers.fractional_real_estate_platform',
'marketplace_fre_sellers.expected_selling_price'
)
->get();
$data['data']->each(function($value){
if($value->fractional_real_estate_platform != null)

5
app/Models/MarketplaceBuyerForm.php
View File

@@ -14,6 +14,11 @@ class MarketplaceBuyerForm extends Model
protected $appends = ['fund_category'];
public function scopeNotSold($query)
{
return $query->where('marketplace_buyer_forms.status','!=','Sold');
}
public function scopeAlernativeInvestmentFund($query)
{
return $query->where([

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

@@ -57874,3 +57874,17 @@ html:not([data-theme="dark"]) {
justify-content: flex-start !important;
margin: 0 auto 0 0;
}
.table.gy-5 td, .table.gy-5 th {
padding: 1.25rem !important;
}
.tabdiv input, .tabdiv select {
border: 1px solid #e0dddd;
padding: 10px !important;
height: 40px;
border-radius: 5px;
width: 50%;
}
.tabdiv input[type="checkbox"] {border: 1px solid #e0dddd !important;display: flex;width: 20px;height: 20px;justify-content: flex-start !important;margin: 0 auto 0 0;}
.card {
padding: 20px;
}

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

@@ -1352,3 +1352,17 @@ button.btn.btn-light-primary.me-3 {
justify-content: flex-start !important;
margin: 0 auto 0 0;
}
.table.gy-5 td, .table.gy-5 th {
padding: 1.25rem !important;
}
.tabdiv input, .tabdiv select {
border: 1px solid #e0dddd;
padding: 10px !important;
height: 40px;
border-radius: 5px;
width: 50%;
}
.tabdiv input[type="checkbox"] {border: 1px solid #e0dddd !important;display: flex;width: 20px;height: 20px;justify-content: flex-start !important;margin: 0 auto 0 0;}
.card {
padding: 20px;
}

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

@@ -95,8 +95,8 @@
</tr>
</thead>
<tbody class="text-gray-600 fw-semibold">
{{-- @dd($product) --}}
@foreach ($products as $product)
{{-- @dd($product); --}}
<tr>
<td>
<div
@@ -112,7 +112,7 @@
<td>{{ $product->commission_type }}</td>
<td>{{ $product->category_name }}</td>
<td>{{ number_format($product->rate ?? $product->upfront_rate ?? $product->trail_rate,2) }} %</td>
<td>{{ $product->commission }}</td>
<td>{{ $product->totalCommission }}</td>
<td
class="text-end d-flex align-items-center justify-content-around notexport">
{{-- <a class="get-product-detail" date-rate="{{ $product->rate }}"

190
resources/views/Admin/login/otp.blade.php
View File

@@ -8,106 +8,110 @@
<!--begin::Root-->
<div class="d-flex flex-root bgs align-items-center" id="kt_app_root">
<!--begin::Authentication - Sign-in -->
<div class="row w-100">
<!--begin::Body-->
<div class="col-md-6">
<!--begin::Wrapper-->
<div class="bg-body d-flex flex-center rounded-4 p-10">
<!--begin::Content-->
<div class="w-md-400px">
<!--begin::Form-->
<form class="form w-100 mb-13" method="POST" id="kt_sing_in_two_steps_form">
@csrf
<!--begin::Icon-->
<div class="text-center mb-10">
<img alt="Logo" class="mh-125px"
src="{{ asset('/public/assets/media/svg/misc/smartphone-2.svg') }}" />
</div>
<!--end::Icon-->
<!--begin::Heading-->
<div class="text-center mb-10">
<!--begin::Title-->
<h1 class="text-dark mb-3">Mail Verification</h1>
<!--end::Title-->
<!--begin::Sub-title-->
<div class="text-muted fw-semibold fs-5 mb-5">Please enter the OTP sent to registered
Mail ID</div>
<!--end::Sub-title-->
</div>
<!--end::Heading-->
<!--begin::Section-->
<div class="mb-10">
<!--begin::Label-->
<div class="fw-bold text-start text-dark fs-6 mb-1 ms-1">Type your 4 digit security
code.</div>
<!--end::Label-->
<!--begin::Input group-->
<div class="d-flex flex-wrap flex-stack">
<input type="text" name="code_1" pattern="[1-9]{1}[0-9]{1}"
data-inputmask="'mask': '9', 'placeholder': ''" maxlength="1"
class="form-control bg-transparent h-60px w-60px fs-2qx text-center mx-1 my-2"
value="" />
<input type="text" name="code_2" pattern="[1-9]{1}[0-9]{1}"
data-inputmask="'mask': '9', 'placeholder': ''" maxlength="1"
class="form-control bg-transparent h-60px w-60px fs-2qx text-center mx-1 my-2"
value="" />
<input type="text" name="code_3" pattern="[1-9]{1}[0-9]{1}"
data-inputmask="'mask': '9', 'placeholder': ''" maxlength="1"
class="form-control bg-transparent h-60px w-60px fs-2qx text-center mx-1 my-2"
value="" />
<input type="text" name="code_4" pattern="[1-9]{1}[0-9]{1}"
data-inputmask="'mask': '9', 'placeholder': ''" maxlength="1"
class="form-control bg-transparent h-60px w-60px fs-2qx text-center mx-1 my-2"
value="" />
<div class="container">
<div class="row w-100">
<!--begin::Body-->
<div class="col-md-6">
<!--begin::Wrapper-->
<div class="bg-body d-flex flex-center rounded-4 p-10">
<!--begin::Content-->
<div class="w-md-400px">
<!--begin::Form-->
<form class="form w-100 mb-5" method="POST" id="kt_sing_in_two_steps_form">
@csrf
<!--begin::Icon-->
<div class="text-center mb-5">
<img alt="Logo" class="mh-100px"
src="{{ asset('/public/assets/media/svg/misc/smartphone-2.svg') }}" />
</div>
<!--begin::Input group-->
</div>
<div class="text-muted fw-semibold fs-6 mb-5">OTP has been sent to your Mail ID. OTP valid
for <span id="countdown-timer">02:00</span> Sec</div>
<!--end::Section-->
<!--begin::Submit-->
<div class="d-grid mt-15 mb-10 text-center">
{{-- <a href="../index/index.php" class="text-center btn btn-primary" id="kt_sing_in_two_steps_submit">
<!--end::Icon-->
<!--begin::Heading-->
<div class="text-center mb-5">
<!--begin::Title-->
<h1 class="text-dark mb-3">Mail Verification</h1>
<!--end::Title-->
<!--begin::Sub-title-->
<div class="text-muted fw-semibold fs-5 mb-5">Please enter the OTP sent to
registered
Mail ID</div>
<!--end::Sub-title-->
</div>
<!--end::Heading-->
<!--begin::Section-->
<div class="mb-0">
<!--begin::Label-->
<div class="fw-bold text-start text-dark fs-6 mb-1 ms-1">Type your 4 digit security
code.</div>
<!--end::Label-->
<!--begin::Input group-->
<div class="d-flex flex-wrap flex-stack">
<input type="text" name="code_1" pattern="[1-9]{1}[0-9]{1}"
data-inputmask="'mask': '9', 'placeholder': ''" maxlength="1"
class="form-control bg-transparent h-60px w-60px fs-2qx text-center mx-1 my-2"
value="" />
<input type="text" name="code_2" pattern="[1-9]{1}[0-9]{1}"
data-inputmask="'mask': '9', 'placeholder': ''" maxlength="1"
class="form-control bg-transparent h-60px w-60px fs-2qx text-center mx-1 my-2"
value="" />
<input type="text" name="code_3" pattern="[1-9]{1}[0-9]{1}"
data-inputmask="'mask': '9', 'placeholder': ''" maxlength="1"
class="form-control bg-transparent h-60px w-60px fs-2qx text-center mx-1 my-2"
value="" />
<input type="text" name="code_4" pattern="[1-9]{1}[0-9]{1}"
data-inputmask="'mask': '9', 'placeholder': ''" maxlength="1"
class="form-control bg-transparent h-60px w-60px fs-2qx text-center mx-1 my-2"
value="" />
</div>
<!--begin::Input group-->
</div>
<div class="text-muted fw-semibold fs-6 mb-0">OTP has been sent to your Mail ID. OTP
valid
for <span id="countdown-timer">02:00</span> Sec</div>
<!--end::Section-->
<!--begin::Submit-->
<div class="d-grid mt-5 mb-5 text-center">
{{-- <a href="../index/index.php" class="text-center btn btn-primary" id="kt_sing_in_two_steps_submit">
<span class="indicator-label">Submit</span>
</a> --}}
<button type="submit" class="text-center btn btn-primary"
id="kt_sing_in_two_steps_submit">
<span class="indicator-label">Submit</span>
</button>
<button type="submit" class="text-center btn btn-primary"
id="kt_sing_in_two_steps_submit">
<span class="indicator-label">Submit</span>
</button>
</div>
<div class="alert d-none" role="alert" id="result">
<strong id="message"></strong>
</div>
<!--end::Submit-->
</form>
<!--end::Form-->
<!--begin::Notice-->
<div class="text-center fw-semibold fs-5">
<span class="text-muted me-1">Didn’t get the code ?</span>
<a href="javascript:void(0)" class="link-primary fs-5 me-1 d-none" onclick="resendOTP()"
id="resend_otp">Resend OTP</a>
</div>
<div class="alert d-none" role="alert" id="result">
<strong id="message"></strong>
</div>
<!--end::Submit-->
</form>
<!--end::Form-->
<!--begin::Notice-->
<div class="text-center fw-semibold fs-5">
<span class="text-muted me-1">Didn’t get the code ?</span>
<a href="javascript:void(0)" class="link-primary fs-5 me-1 d-none" onclick="resendOTP()"
id="resend_otp">Resend OTP</a>
<!--end::Notice-->
</div>
<!--end::Notice-->
<!--end::Content-->
</div>
<!--end::Wrapper-->
</div>
<!--end::Body-->
<!--begin::Aside-->
<div class="col-md-6 d-flex">
<!--begin::Content-->
<div class="d-flex flex-column flex-center pb-0 pb-lg-10 p-10 w-100 sign-up-logo">
<!--begin::Image-->
<img class="theme-light-show "
src="{{ asset('/public/assets/media/FrontendImages/menu-logo.png') }}" alt="" />
<img class="theme-dark-show mx-auto mw-100 w-150px w-lg-300px mb-10 mb-lg-20"
src="{{ asset('/public/assets/media/FrontendImages/menu-logo.png') }}" alt="" />
<!--end::Image-->
</div>
<!--end::Content-->
</div>
<!--end::Wrapper-->
<!--begin::Aside-->
</div>
<!--end::Body-->
<!--begin::Aside-->
<div class="col-md-6 d-flex">
<!--begin::Content-->
<div class="d-flex flex-column flex-center pb-0 pb-lg-10 p-10 w-100 sign-up-logo">
<!--begin::Image-->
<img class="theme-light-show "
src="{{ asset('/public/assets/media/FrontendImages/menu-logo.png') }}" alt="" />
<img class="theme-dark-show mx-auto mw-100 w-150px w-lg-300px mb-10 mb-lg-20"
src="{{ asset('/public/assets/media/FrontendImages/menu-logo.png') }}" alt="" />
<!--end::Image-->
</div>
<!--end::Content-->
</div>
<!--begin::Aside-->
</div>
<!--end::Authentication - Sign-in-->
</div>
@@ -200,7 +204,7 @@
// window.location.href='/dashboard';
setTimeout(() => {
// location.reload();
// window.location.href = "{{route('welcome-to-dashboard')}}";
// window.location.href = "{{ route('welcome-to-dashboard') }}";
window.location.href = result.return_to_page;
}, 1000);
}
@@ -217,7 +221,7 @@
setTimeout(function() {
$('#message').html('');
$('#result').addClass('d-none').removeclass(
'alert-warning');
'alert-warning');
}, 3000);
// toastr.warning(result.message);
}