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

bugs fixing

Browse Source
This commit is contained in:
meghamalore
2024-07-03 17:07:43 +05:30
parent e49f0bc5c6
commit 7214133442
23 changed files with 315 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Frontend/FractionalRealEstateController.php
View File

@@ -21,7 +21,7 @@ class FractionalRealEstateController extends Controller
$fullyFundedFRE = Product::has('fractional_real_estate')->with('fractional_real_estate.companies', 'categorys')->fullyFunded()->active()->latest()->get();
$learnMore = (new FractionalRealEstateFontendController)->fractionalRealEstateQuestionAndAnswer()->getData();
// $faqs = (new FractionalRealEstateFontendController)->fractionalRealEstateQuestionAndAnswerFaqs()->getData();
// dd($openFRE);
// dd($fractionalRealEstate,$openFRE,$resaleFRE,$fullyFundedFRE,$learnMore);
return view('Frontend.Pages.fractional-real-estate.index', compact('fractionalRealEstate', 'learnMore', 'openFRE', 'resaleFRE', 'fullyFundedFRE'));
}

2
app/Http/Controllers/Frontend/HandpickedInvestmentController.php
View File

@@ -88,7 +88,7 @@ class HandpickedInvestmentController extends Controller
];
$products = Product::query()
->select(DB::raw('products.id, products.description, products.categories_id as category_id, coalesce(fre.property_name_and_location,aif.fund_name,re.property_name,funds.fund_name) as product_name'),
->select(DB::raw('products.id, products.description, fre.property_image, products.categories_id as category_id, coalesce(fre.property_name_and_location,aif.fund_name,re.property_name,funds.fund_name) as product_name'),
DB::raw('coalesce(companies.company_logo) as company_logo'), DB::raw('coalesce(fre.slug,aif.slug,re.slug, funds.slug) as slug'), DB::raw('coalesce(fre.geographic_focus,aif.geographic_focus,re.geographic_focus, funds.geographic_focus) as geographic_focus'), DB::raw('coalesce(aif.minimum_investment,fre.minimum_investment,funds.minimum_investment,re.total_price) as minimum_investment'),
// DB::raw('coalesce(aif.description,fre.property_description,re.remarks,funds.fund_description) as description'),
// DB::raw('coalesce(fre.property_description,products.description) as description'),

3
app/Imports/ImportMontlyUpdateAlternativeInvestmentFund.php
View File

@@ -43,8 +43,9 @@ class ImportMontlyUpdateAlternativeInvestmentFund implements ToCollection, With
public function collection(Collection $rows)
{
Validator::make($rows->toArray(), $this->rules(), $this->customValidationMessages($rows))->validate();
// dd($rows);
foreach ($rows as $row) {
// dd(getConvertedDate($row['date_of_initial_contribution']));
if ($row['commitment_amount'] != null && $row['contribution_amount'] != null && $row['contribution_called_amount'] != null && $row['contribution_uncalled_amount'] != null) {
$latestId = MonthlyUpdateAlternativeInvestmentFund::insertGetId([
'custom_id' => $row['custom_id'] ?? null,

9
app/helper.php
View File

@@ -57,6 +57,12 @@ function getConvertedDate($date)
$newDate = str_split($dateArray[0], 2);
return (string)$newDate[0] . '-' . (string)$newDate[1] . '-' . (string)$dateArray[1];
}
elseif(strlen($date) == 7)
{
$dateArray = str_split($date, 1);
// $newDate = str_split($dateArray[0], 1);
return '0'.(string)$dateArray[0] . '-' . (string)$dateArray[1].(string)$dateArray[2] . '-' . (string)$dateArray[3]. (string)$dateArray[4]. (string)$dateArray[5]. (string)$dateArray[6];
}
return null;
}
@@ -70,7 +76,8 @@ function imagePath($path = null)
$finalPath = "https://staging.jerichoalternatives.in/";
}
if (env('APP_ENV') == 'local') {
$finalPath = "http://localhost/jericho_28_march/";
// $finalPath = "https://jerichoalternatives.in/";
$finalPath = "http://localhost/freeu/my-freeu/";
}
return $finalPath . $path;
}

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

@@ -1292,6 +1292,12 @@ div#kt_drawer_chat_messenger {
overflow-y: scroll;
overflow-x: hidden;
}
.right-lts {
display: flex;
align-items: center;
width: 35%;
justify-content: space-between;
}
#update_lead_form .select2-container--bootstrap5 .select2-selection {
height: 50px !important;
}

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

@@ -1085,3 +1085,15 @@ label.error {
div#preview_image {
height: 270px;
}
.dataTable_area .card-header {
width: 100%;
overflow-x: auto;
}
span.text-white.opacity-75.pt-1.fw-semibold.fs-7 {
height: auto !important;
}
#alternative_view_modal button.btn.btn-secondary {
margin: 0 auto;
}

BIN
public/assets/uploads/fractionalrealestate_images/202407031118_0121719470229 (15).png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 MiB

BIN
public/uploads/fractional_real_estate/property_image/1719989860.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 MiB

BIN
public/uploads/fractional_real_estate/property_image/1719992352.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

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

@@ -114,7 +114,7 @@
</label>
<input type="text" name="end_of_trail"
class="form-control form-control-solid end-of-trail"
value="{{ optional($product->end_of_trail)->format('Y-m-d') }}">
value="{{ optional($product->end_of_trail)->format('d-m-Y') }}">
</div>
<div class="col-md-6">
<label class="fs-6 fw-semibold form-label mt-3">
@@ -167,6 +167,8 @@
// format: 'mm/yyyy',
// format: 'M-yy',
format: 'yyyy-mm-dd',
autoclose: true,
startDate: new Date(),
// startDate: '-3d',
minViewMode: 1,
viewMode: "months",

18
resources/views/Admin/Pages/manage_commission/user_commission.blade.php
View File

@@ -23,11 +23,11 @@
<div class="row">
<div class="col-6">
<label for="">From</label>
<input type="date" name="fromDate" id="fromDate" placeholder="" class="form-control" max="{{ date('Y-m-d', strtotime('today')) }}">
<input type="date" name="fromDate" id="fromDate" placeholder="" class="form-control" >
</div>
<div class="col-6">
<label for="">To</label>
<input type="date" name="toDate" id="toDate" class="form-control" min="{{ date('Y-m-d', strtotime('tomorrow')) }}">
<input type="date" name="toDate" id="toDate" class="form-control" >
</div>
</div>
<button class="btn btn-light-primary me-2 mb-2" id="filterBtn">Filter</button>
@@ -541,4 +541,18 @@
});
</script>
<script>
// Get today's date
var today = new Date();
var dd = String(today.getDate()).padStart(2, '0');
var mm = String(today.getMonth() + 1).padStart(2, '0'); // January is 0!
var yyyy = today.getFullYear();
today = yyyy + '-' + mm + '-' + dd;
// Set max attribute for both inputs to prevent selecting future dates
document.getElementById("fromDate").setAttribute("max", today);
document.getElementById("toDate").setAttribute("max", today);
</script>
@endsection

13
resources/views/Admin/Pages/manage_freeu_investment/view-product/alternative-investment-fund.blade.php
View File

@@ -206,11 +206,7 @@
<label> <b class='fw-bold'>Hurdle Rate</b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->hurdle_rate.' %' ?? 'N/A'}}</label>
</div>
</div>
<div class="col-md-6 my-3 {{dNone($alternativeInvestmentFund->description)}}">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Description</b>: {{$alternativeInvestmentFund->description ?? 'N/A'}}</label>
</div>
</div>
<div class="col-md-6 my-3 {{dNone($alternativeInvestmentFund->alternativeInvestmentFund->other_expenses)}}">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Other Expenses</b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->other_expenses ?? 'N/A'}}</label>
@@ -277,11 +273,18 @@
<label> <b class='fw-bold'>Involved In Short Selling</b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->involved_in_short_selling ?? 'N/A'}}</label>
</div>
</div>
<div class="col-md-6 my-3 {{dNone($alternativeInvestmentFund->alternativeInvestmentFund->fund_strategy)}}">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Fund Strategy</b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->fund_strategy ?? 'N/A'}}</label>
</div>
</div>
<div class="col-md-6 my-3 {{dNone($alternativeInvestmentFund->description)}}">
<div class="veiw_detials_area" style="height: 135px; align-items: baseline;">
<label> <b class='fw-bold'>Description</b>: {{$alternativeInvestmentFund->description ?? 'N/A'}}</label>
</div>
</div>
<div class="col-md-6 my-3 {{dNone($alternativeInvestmentFund->alternativeInvestmentFund->minimum_investment)}}">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Minimum Investment </b>: {{$alternativeInvestmentFund->alternativeInvestmentFund->minimum_investment ?? 'N/A'}}</label>

30
resources/views/Admin/Pages/manage_investors/invested_products/alternative_investment_fund.blade.php
View File

@@ -249,7 +249,7 @@
</label>
<!--end::Label-->
<!--begin::Input-->
<div class="form-control form-control-solid">{{$data->date_of_initial_contribution}}</div>
<div class="form-control form-control-solid">{{ date('d-m-Y', strtotime($data->date_of_initial_contribution)) }}</div>
</div>
<div class="form-box mb-5">
<label class="fs-6 fw-semibold form-label mt-3">
@@ -269,15 +269,7 @@
<!--begin::Input-->
<div class="form-control form-control-solid">{{$data->principal_capital_repaid}}</div>
</div>
<div class="form-box mb-5">
<label class="fs-6 fw-semibold form-label mt-3">
<span>Gross Income</span>
<!-- <i class="fas fa-exclamation-circle ms-1 fs-7" data-bs-toggle="tooltip" title="Enter the contact's name."></i> -->
</label>
<!--end::Label-->
<!--begin::Input-->
<div class="form-control form-control-solid">{{$data->gross_income}}</div>
</div>
<!--end::Input-->
</div>
<div class="col-md-6">
@@ -289,7 +281,14 @@
</label>
<!--end::Label-->
<!--begin::Input-->
<div class="form-control form-control-solid">{{$data->total_fees_paid}}</div>
<div class="form-control form-control-solid">
@if($data->getRawOriginal('total_fees_paid'))
₹{{$data->getRawOriginal('total_fees_paid')}}
@else
N/A
@endif
</div>
</div>
<div class="form-box mb-5">
<label class="fs-6 fw-semibold form-label mt-3">
@@ -345,6 +344,15 @@
<!--begin::Input-->
<div class="form-control form-control-solid">{{$data->no_of_units_redeemed}}</div>
</div>
<div class="form-box mb-5">
<label class="fs-6 fw-semibold form-label mt-3">
<span>Gross Income</span>
<!-- <i class="fas fa-exclamation-circle ms-1 fs-7" data-bs-toggle="tooltip" title="Enter the contact's name."></i> -->
</label>
<!--end::Label-->
<!--begin::Input-->
<div class="form-control form-control-solid">{{$data->gross_income}}</div>
</div>
</div>
</div>
</div>

6
resources/views/Admin/Pages/manage_investors/invested_products/index.blade.php
View File

@@ -1,6 +1,9 @@
@extends('Admin.layouts.master')
@section('title','Investment Details')
@section('content')
@php
$id = request('id');
@endphp
<div class="app-main flex-column flex-row-fluid" id="kt_app_main">
<!--begin::Content wrapper-->
<div class="d-flex flex-column flex-column-fluid">
@@ -8,6 +11,9 @@
<div class="row max-w-100 index_table mt-10">
<div class="top_header d-flex justify-content-between">
<p class='fs-2 m-0 fw-bold'>Investment Dashboard For {{$monthlyUpdateMaster->categories}}</p>
<div class="table_right_options d-flex">
<a class="btn btn-primary me-3" href="{{ route('view_investors_details', ['id' => $id]) }}">Back</a>
</div>
</div>
@php($ifaValues = ['Invoice Discounting' ,'Clean And Green Assets' ,'Venture Debt' ,'High Yield Finance','Securitized Debt Instrument','Lease Based Financing','Revenue Based Financing'])

10
resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/alternative_investment_fund.blade.php
View File

@@ -515,11 +515,11 @@
"No statement reports found.");
}
},
error: function(xhr, status, error) {
console.error(xhr.responseText); // Log the error message
$('#statement_reports_container').empty().text(
"Error fetching statement reports. Please try again later.");
}
// error: function(xhr, status, error) {
// console.error(xhr.responseText); // Log the error message
// $('#statement_reports_container').empty().text(
// "Error fetching statement reports. Please try again later.");
// }
});
}

10
resources/views/Admin/Pages/manage_investors/manage_user_product/edit_monthly_update/fractional_real_estate.blade.php
View File

@@ -169,7 +169,7 @@
</div>
</div>
<div class="col-md-6 fv-row">
<label class=" fs-6 fw-semibold mb-2">Tds</label>
<label class=" fs-6 fw-semibold mb-2">TDS</label>
<div class="form-control form-control-solid "><span id="tds"></span></div>
</div>
@@ -470,10 +470,10 @@
$('#statement_reports_container').empty().text("No statement reports found.");
}
},
error: function(xhr, status, error) {
console.error(xhr.responseText); // Log the error message
$('#statement_reports_container').empty().text("Error fetching statement reports. Please try again later.");
}
// error: function(xhr, status, error) {
// console.error(xhr.responseText); // Log the error message
// $('#statement_reports_container').empty().text("Error fetching statement reports. Please try again later.");
// }
});
}

24
resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
View File

@@ -583,6 +583,19 @@
</select>
</div>
<div class="form-box mb-5">
<label class="fs-6 fw-semibold form-label mt-3">
<span>Industry</span>
</label>
<input type="text" class="form-control form-control-solid"
name="industry" value='{{ $lead->industry }}' />
</div>
</div>
@@ -660,18 +673,7 @@
name="annual_revenue" value='{{ $lead->annual_revenue }}' />
</div>
<div class="form-box mb-5">
<label class="fs-6 fw-semibold form-label mt-3">
<span>Industry</span>
</label>
<input type="text" class="form-control form-control-solid"
name="industry" value='{{ $lead->industry }}' />
</div>
{{-- <div class="form-box mb-5">
<label class="fs-6 fw-semibold form-label mt-3">

4
resources/views/Admin/Pages/pre_owned_investment/pending_investment_view.blade.php
View File

@@ -59,7 +59,7 @@
</div>
<div class="col-md-6 my-3">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Date of investment</b>: {{$data->date_of_investment}}</label>
<label> <b class='fw-bold'>Date of investment</b>: {{ \Carbon\Carbon::parse($data->date_of_investment)->format('d-m-Y') }}</label>
</div>
</div>
<div class="col-md-6 my-3">
@@ -165,7 +165,7 @@
</div>
<div class="col-md-6 my-3">
<div class="veiw_detials_area">
<label> <b class='fw-bold'>Date of Final Close</b>: {{$data->date_of_final_close}}</label>
<label> <b class='fw-bold'>Date of Final Close</b>: {{\Carbon\Carbon::parse($data->date_of_final_close)->format('d-m-Y') }}</label>
</div>
</div>
<div class="col-md-6 my-3">

2
resources/views/Admin/Pages/pre_owned_investment/pre_owned_investment.blade.php
View File

@@ -23,7 +23,7 @@
<div class="card-header pt-5">
<div class="card-title d-flex flex-column">
<span class="fs-2x fw-bold text-white me-2 lh-1 ls-n2">{{$totalInvestmentListed}}</span>
<span class="text-white opacity-75 pt-1 fw-semibold fs-7" style="height:60px">Total Number of Investments<br>Requested By Users For Listing</span>
<span class="text-white opacity-75 pt-1 fw-semibold fs-7" >Total Number of Investments<br>Requested By Users For Listing</span>
</div>
<div class="title_icon_area">
<span class="svg-icon svg-icon-1">

380
resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php
View File

@@ -21,27 +21,34 @@
<div class="app-main flex-column flex-row-fluid" id="kt_app_main">
<div class="d-flex flex-column flex-column-fluid">
<div id="kt_app_content_container" class="app-container container-xxl">
<div class="row max-w-100 index_table m-4">
<div class="d-flex justify-content-between">
<div class="top_header d-flex justify-content-between">
<p class='fs-2 fw-bold'>Investment Listing Transfer</p>
<div class="table_right_options d-flex">
</div>
</div>
<div class="d-flex align-items-center position-relative">
<!--begin::Svg Icon | path: icons/duotune/general/gen021.svg-->
<span class="svg-icon svg-icon-1 position-absolute ms-6">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect opacity="0.5" x="17.0365" y="15.1223" width="8.15546" height="2" rx="1" transform="rotate(45 17.0365 15.1223)" fill="currentColor" />
<path d="M11 19C6.55556 19 3 15.4444 3 11C3 6.55556 6.55556 3 11 3C15.4444 3 19 6.55556 19 11C19 15.4444 15.4444 19 11 19ZM11 5C7.53333 5 5 7.53333 5 11C5 14.4667 7.53333 17 11 17C14.4667 17 17 14.4667 17 11C17 7.53333 14.4667 5 11 5Z" fill="currentColor" />
</svg>
</span>
<!--end::Svg Icon-->
<!-- <div id="newSearchPlace"></div> -->
<input type="text" data-kt-user-table-filter="search" class="form-control bg-white form-control-solid w-250px ps-14" placeholder="Search Investments" id="searchbox" />
</div>
<div class="right-lts">
<div class="d-flex align-items-center position-relative">
<!--begin::Svg Icon | path: icons/duotune/general/gen021.svg-->
<span class="svg-icon svg-icon-1 position-absolute ms-6">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none"
xmlns="http://www.w3.org/2000/svg">
<rect opacity="0.5" x="17.0365" y="15.1223" width="8.15546" height="2"
rx="1" transform="rotate(45 17.0365 15.1223)" fill="currentColor" />
<path
d="M11 19C6.55556 19 3 15.4444 3 11C3 6.55556 6.55556 3 11 3C15.4444 3 19 6.55556 19 11C19 15.4444 15.4444 19 11 19ZM11 5C7.53333 5 5 7.53333 5 11C5 14.4667 7.53333 17 11 17C14.4667 17 17 14.4667 17 11C17 7.53333 14.4667 5 11 5Z"
fill="currentColor" />
</svg>
</span>
<!--end::Svg Icon-->
<!-- <div id="newSearchPlace"></div> -->
<input type="text" data-kt-user-table-filter="search"
class="form-control bg-white form-control-solid w-250px ps-14"
placeholder="Search Investments" id="searchbox" />
</div>
<div class="table_right_options d-flex">
<a class="btn btn-primary me-3" href="{{ route('overview-index') }}">Back</a>
</div>
</div>
</div>
@@ -71,11 +78,13 @@
class="text-start align-top text-muted fw-bold fs-7 text-uppercase gs-0">
<th class="w-60px pe-2 align-top">Sr no</th>
<th class="min-w-125px w-200px align-top">Product</th>
<th class="min-w-135px w-135px align-top">Expected Selling Price</th>
<th class="min-w-135px w-135px align-top">Expected Selling Price
</th>
<th class="min-w-50px w-125px align-top">Seller Name</th>
<th class="min-w-50px w-100px align-top ">Email</th>
<th class="min-w-50px w-100px align-top">Contact</th>
<th class="min-w-100px w-200px align-top">Latest Valuation Date</th>
<th class="min-w-100px w-200px align-top">Latest Valuation Date
</th>
<th class="min-w-100px w-100px align-top">Date</th>
<th class="text-center min-w-100px align-top">Actions</th>
</tr>
@@ -113,7 +122,7 @@
@php($approvedTable = false)
@php($rejectedTable = false)
@foreach ($combinedData as $data)
@php($table =$data->table)
@php($table = $data->table)
@if ($data->status == 'Pending')
@include('Admin.Pages.pre_owned_investment.partial.overview-row')
@php($iteration++)
@@ -134,11 +143,13 @@
class="text-start align-top text-muted fw-bold fs-7 text-uppercase gs-0">
<th class="w-60px pe-2 align-top">Sr no</th>
<th class="min-w-125px w-200px align-top">Product</th>
<th class="min-w-135px w-135px align-top">Expected Selling Price</th>
<th class="min-w-135px w-135px align-top">Expected Selling Price
</th>
<th class="min-w-50px w-125px align-top">Seller Name</th>
<th class="min-w-50px w-100px align-top ">Email</th>
<th class="min-w-50px w-100px align-top">Contact</th>
<th class="min-w-100px w-200px align-top">Latest Valuation Date</th>
<th class="min-w-100px w-200px align-top">Latest Valuation Date
</th>
<th class="min-w-100px w-100px align-top">Date</th>
<th class="text-center min-w-100px align-top">Actions</th>
</tr>
@@ -176,7 +187,7 @@
@php($approvedTable = true)
@php($rejectedTable = false)
@foreach ($combinedData as $data)
@php($table =$data->table)
@php($table = $data->table)
@if ($data->status == 'Approved')
@include('Admin.Pages.pre_owned_investment.partial.overview-row')
@php($iteration++)
@@ -196,11 +207,13 @@
class="text-start align-top text-muted fw-bold fs-7 text-uppercase gs-0">
<th class="w-60px pe-2 align-top">Sr no</th>
<th class="min-w-125px w-200px align-top">Product</th>
<th class="min-w-135px w-135px align-top">Expected Selling Price</th>
<th class="min-w-135px w-135px align-top">Expected Selling Price
</th>
<th class="min-w-50px w-125px align-top">Seller Name</th>
<th class="min-w-50px w-100px align-top ">Email</th>
<th class="min-w-50px w-100px align-top">Contact</th>
<th class="min-w-100px w-200px align-top">Latest Valuation Date</th>
<th class="min-w-100px w-200px align-top">Latest Valuation Date
</th>
<th class="min-w-100px w-100px align-top">Date</th>
<th class="text-center min-w-100px align-top">Actions</th>
</tr>
@@ -239,7 +252,7 @@
@php($approvedTable = false)
@php($rejectedTable = true)
@foreach ($combinedData as $data)
@php($table =$data->table)
@php($table = $data->table)
@if ($data->status == 'Rejected')
@include('Admin.Pages.pre_owned_investment.partial.overview-row')
@php($iteration++)
@@ -259,91 +272,90 @@
</div>
{{-- reply mail popup start --}}
<div class="modal fade" tabindex="-1" id="send_mail_reply">
<div class="modal-dialog modal-dialog-centered mw-750px">
<div class="modal-content">
<div class="modal-header">
<h2 class="fw-bold fs-2 mb-0">Email Reply</h2>
<div class="btn btn-icon btn-sm btn-active-icon-primary" data-bs-dismiss="modal"
aria-label="Close">
<span class="svg-icon svg-icon-1">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none"
xmlns="http://www.w3.org/2000/svg">
<rect opacity="0.5" x="6" y="17.3137" width="16" height="2" rx="1"
transform="rotate(-45 6 17.3137)" fill="currentColor" />
<rect x="7.41422" y="6" width="16" height="2" rx="1"
transform="rotate(45 7.41422 6)" fill="currentColor" />
</svg>
</span>
{{-- reply mail popup start --}}
<div class="modal fade" tabindex="-1" id="send_mail_reply">
<div class="modal-dialog modal-dialog-centered mw-750px">
<div class="modal-content">
<div class="modal-header">
<h2 class="fw-bold fs-2 mb-0">Email Reply</h2>
<div class="btn btn-icon btn-sm btn-active-icon-primary" data-bs-dismiss="modal" aria-label="Close">
<span class="svg-icon svg-icon-1">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none"
xmlns="http://www.w3.org/2000/svg">
<rect opacity="0.5" x="6" y="17.3137" width="16" height="2" rx="1"
transform="rotate(-45 6 17.3137)" fill="currentColor" />
<rect x="7.41422" y="6" width="16" height="2" rx="1"
transform="rotate(45 7.41422 6)" fill="currentColor" />
</svg>
</span>
</div>
</div>
</div>
<div class="modal-body">
<form id="reply_mail_form">
@csrf
<input type="hidden" name="contact_us_id" id="contact_us_id">
<div class="d-flex flex-column scroll-y me-n7 pe-7" id="kt_modal_update_role_scroll"
data-kt-scroll="true">
<div class="fv-row row p-5 modal-rounded">
<div class="col-md-12 mb-8">
<div class="row">
<div class="col-md-3 d-flex justify-content-start align-items-center">
<label class="fs-5 fw-bold form-label mb-0 d-block">To</label>
</div>
<input type="text" hidden class="form-control" id="email_send"
name="email_send" value="" placeholder="Enter subject here">
<input type="hidden" id="username" name="username">
<div class="col-md-9">
<label class="fs-5 fw-bold form-label mb-0 d-block" id="to_email">Email
Address of Lead</label>
<div class="modal-body">
<form id="reply_mail_form">
@csrf
<input type="hidden" name="contact_us_id" id="contact_us_id">
<div class="d-flex flex-column scroll-y me-n7 pe-7" id="kt_modal_update_role_scroll"
data-kt-scroll="true">
<div class="fv-row row p-5 modal-rounded">
<div class="col-md-12 mb-8">
<div class="row">
<div class="col-md-3 d-flex justify-content-start align-items-center">
<label class="fs-5 fw-bold form-label mb-0 d-block">To</label>
</div>
<input type="text" hidden class="form-control" id="email_send"
name="email_send" value="" placeholder="Enter subject here">
<input type="hidden" id="username" name="username">
<div class="col-md-9">
<label class="fs-5 fw-bold form-label mb-0 d-block" id="to_email">Email
Address of Lead</label>
</div>
</div>
</div>
</div>
<div class="col-md-12 mb-8">
<div class="row">
<div class="col-md-3 d-flex justify-content-start align-items-center">
<label class="fs-5 fw-bold form-label mb-0 d-block">Subject</label>
</div>
<div class="col-md-9">
{{-- <label class="fs-5 fw-bold form-label mb-0 d-block" id="subject">Email Address of Lead</label> --}}
<input type="text" class="form-control" name="subject" id="subject"
placeholder="Enter subject here">
<div class="col-md-12 mb-8">
<div class="row">
<div class="col-md-3 d-flex justify-content-start align-items-center">
<label class="fs-5 fw-bold form-label mb-0 d-block">Subject</label>
</div>
<div class="col-md-9">
{{-- <label class="fs-5 fw-bold form-label mb-0 d-block" id="subject">Email Address of Lead</label> --}}
<input type="text" class="form-control" name="subject" id="subject"
placeholder="Enter subject here">
</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="row">
<div class="col-md-3 d-flex justify-content-start align-items-start">
<label class="fs-5 fw-bold form-label mb-0 d-block">Reply</label>
</div>
<div class="col-md-9">
<textarea class="form-control form-control-solid resize-none" name="reply" placeholder="Enter your reply...."
cols="30" rows="5"></textarea>
<div class="col-md-12">
<div class="row">
<div class="col-md-3 d-flex justify-content-start align-items-start">
<label class="fs-5 fw-bold form-label mb-0 d-block">Reply</label>
</div>
<div class="col-md-9">
<textarea class="form-control form-control-solid resize-none" name="reply" placeholder="Enter your reply...."
cols="30" rows="5"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="submit" id="send_mail" class="btn btn-primary btn-hove-rise">Send</button>
<div class="modal-footer">
<button type="submit" id="send_mail" class="btn btn-primary btn-hove-rise">Send</button>
</div>
</form>
</div>
</form>
</div>
</div>
</div>
<input type="hidden" id="back_url" value="{{Request::url()}}">
{{-- reply mail popup end --}}
<input type="hidden" id="back_url" value="{{ Request::url() }}">
{{-- reply mail popup end --}}
<!-- </div> -->
@endsection
@section('scripts')
<script>
$(document).ready(function(){
$(document).ready(function() {
sessionStorage.removeItem("back_url");
$('.back_route').on('click',function(){
$('.back_route').on('click', function() {
sessionStorage.removeItem("back_url");
sessionStorage.setItem("back_url",$('#back_url').val());
sessionStorage.setItem("back_url", $('#back_url').val());
// url = sessionStorage.getItem("back_url");
})
})
@@ -360,43 +372,43 @@
// dom: "Bfrtip",
// });
$('#reply_mail_form').validate({
ignore: [],
debug: false,
rules: {
subject: 'required',
reply: 'required',
},
message: {
subject: "Please enter subject field",
reply: "Please enter reply field",
},
submitHandler: function(form) {
var formData = new FormData(form)
$.ajax({
url: "{{ route('reply-investor-mail') }}",
type: "POST",
data: formData,
processData: false,
contentType: false,
dataType: "json",
success: function(result) {
if (result.status == 200) {
$('#send_mail_reply').modal('hide');
toastr.success(result.message);
window.location.reload();
}
if (result.status == 201) {
toastr.warning(result.message);
}
},
// error: function(jqXHR) {
// $("#request_callback_btn").removeClass("d-none");
// $("#loaderContactBtn").addClass("d-none");
// warning(jqXHR.responseJSON);
// },
})
}
})
ignore: [],
debug: false,
rules: {
subject: 'required',
reply: 'required',
},
message: {
subject: "Please enter subject field",
reply: "Please enter reply field",
},
submitHandler: function(form) {
var formData = new FormData(form)
$.ajax({
url: "{{ route('reply-investor-mail') }}",
type: "POST",
data: formData,
processData: false,
contentType: false,
dataType: "json",
success: function(result) {
if (result.status == 200) {
$('#send_mail_reply').modal('hide');
toastr.success(result.message);
window.location.reload();
}
if (result.status == 201) {
toastr.warning(result.message);
}
},
// error: function(jqXHR) {
// $("#request_callback_btn").removeClass("d-none");
// $("#loaderContactBtn").addClass("d-none");
// warning(jqXHR.responseJSON);
// },
})
}
})
function listingStatus(id, status, table, email = null, username = null) {
Swal.fire({
@@ -420,10 +432,9 @@
success: function(result) {
if (result.status == 200) {
toastr.success(result.message);
if(status != 'Rejected')
{
if (status != 'Rejected') {
location.reload();
}else{
} else {
// alert(email);
$('#to_email').html(email);
$('#email_send').val(email);
@@ -445,61 +456,60 @@
}
$(function() {
var approveTable = $('#approve_investors_list').DataTable({
dom: "Bfrtip",
buttons: [{
extend: "excel",
title: "Marketplace Investment List",
text: "Export Search Results",
searchable: false,
className: "btn btn-default",
exportOptions: {
columns: ":not(.notexport)",
},
}],
});
$("#searchbox").keyup(function() {
approveTable.search($(this).val()).draw();
});
});
var approveTable = $('#approve_investors_list').DataTable({
dom: "Bfrtip",
buttons: [{
extend: "excel",
title: "Marketplace Investment List",
text: "Export Search Results",
searchable: false,
className: "btn btn-default",
exportOptions: {
columns: ":not(.notexport)",
},
}],
});
$("#searchbox").keyup(function() {
approveTable.search($(this).val()).draw();
});
});
$(function() {
var pendingTable = $('#pending_investors_list').DataTable({
dom: "Bfrtip",
buttons: [{
extend: "excel",
title: "Marketplace Investment List",
text: "Export Search Results",
searchable: false,
className: "btn btn-default",
exportOptions: {
columns: ":not(.notexport)",
},
}],
});
$("#searchbox").keyup(function() {
pendingTable.search($(this).val()).draw();
});
});
$(function() {
var rejectedTable = $('#rejected_table').DataTable({
dom: "Bfrtip",
buttons: [{
extend: "excel",
title: "Marketplace Investment List",
text: "Export Search Results",
searchable: false,
className: "btn btn-default",
exportOptions: {
columns: ":not(.notexport)",
},
}],
});
$("#searchbox").keyup(function() {
rejectedTable.search($(this).val()).draw();
});
});
$(function() {
var pendingTable = $('#pending_investors_list').DataTable({
dom: "Bfrtip",
buttons: [{
extend: "excel",
title: "Marketplace Investment List",
text: "Export Search Results",
searchable: false,
className: "btn btn-default",
exportOptions: {
columns: ":not(.notexport)",
},
}],
});
$("#searchbox").keyup(function() {
pendingTable.search($(this).val()).draw();
});
});
$(function() {
var rejectedTable = $('#rejected_table').DataTable({
dom: "Bfrtip",
buttons: [{
extend: "excel",
title: "Marketplace Investment List",
text: "Export Search Results",
searchable: false,
className: "btn btn-default",
exportOptions: {
columns: ":not(.notexport)",
},
}],
});
$("#searchbox").keyup(function() {
rejectedTable.search($(this).val()).draw();
});
});
</script>
@endsection

6
resources/views/Admin/view-sub-admin.blade.php
View File

@@ -55,7 +55,7 @@
{{-- <h5>Hello</h5> --}}
<div class="col-md-4 fv-row mb-7">
<!--begin::Label-->
<label class="required fw-semibold fs-6 mb-2">Full Name</label>
<label class=" fw-semibold fs-6 mb-2">Full Name</label>
<!--end::Label-->
<!--begin::Input-->
<input readonly type="text" name="name"
@@ -65,7 +65,7 @@
</div>
<div class="col-md-4 fv-row mb-7">
<!--begin::Label-->
<label class="required fw-semibold fs-6 mb-2">Email</label>
<label class=" fw-semibold fs-6 mb-2">Email</label>
<!--end::Label-->
<!--begin::Input-->
<input readonly type="email" name="email"
@@ -75,7 +75,7 @@
</div>
<div class="col-md-4 fv-row mb-7">
<!--begin::Label-->
<label class="required fw-semibold fs-6 mb-2">Mobile Number</label>
<label class=" fw-semibold fs-6 mb-2">Mobile Number</label>
<!--end::Label-->
<!--begin::Input-->
<input readonly type="number" name="mobile_number"

6
resources/views/Frontend/Pages/handpicked-investment/pagination.blade.php
View File

@@ -75,14 +75,16 @@
@endforelse
</div>
<div class="parimay-card mt-4 mb-5 display-products">
{{-- @dd($products->toArray()) --}}
@forelse($products as $product)
<div class="assets-card">
<a href="{{ auth()->guard('users')->check() == true ? route(routeForHandpickedInvestment($product->category_id), $product->slug ?? 'abc') : route('login') }}"
data-route="{{ route(routeForHandpickedInvestment($product->category_id), $product->slug ?? 'abc') }}"
class="redirect_to_page">
<div class="card-logo">
@if ($product->company_logo)
<img src="{{ $product->company_logo }}">
{{-- @php($productImage = ) --}}
@if ($product->company_logo || $product->property_image)
<img src="{{ $product->company_logo ?? $product->property_image}}">
@else
<img src="{{ asset('public/assets/media/FrontendImages/menu-logo.png') }}">
@endif

3
resources/views/components/fractional-real-estate-product.blade.php
View File

@@ -9,7 +9,8 @@
<a href="{{ auth()->guard('users')->check() == true ? route('fractional-real-estate.product', $freData->fractional_real_estate->slug) : route('login')}}" data-route="{{route('fractional-real-estate.product', $freData->fractional_real_estate->slug)}}" class="redirect_to_page">
@php($img = $freData->fractional_real_estate->getAttributes()['property_image'] == null ? imagePath('public/assets/media/FrontendImages/menu-logo.png') : $freData->fractional_real_estate->property_image)
@if ($freData->fractional_real_estate->getAttributes()['property_image'] != null)
<div class="card-logo bg-images">
<div class="card-logo bg-images">
<img src="{{ $img }}"
alt="{{ $freData->fractional_real_estate->property_name_and_location }}">
</div>