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

solving bugs

Browse Source
This commit is contained in:
cj201199
2024-05-17 13:12:06 +05:30
parent 812f9d065e c312bfa990
commit 9aadbbff51
17 changed files with 100 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,8 @@ class HandpickedInvestmentController extends Controller
$query->where('products.status', true);
$query->where('categories.status', true);
})
->paginate(6);
->paginate(1000000);
// ->get();
// dd($query, $categories);
$products->appends(['search' => $query, 'categories' => $this->encode_arr($categories)]);

43
public/assets/css/FrontendCss/style.css
View File

@@ -348,7 +348,7 @@ h4.inner-title {
.explore-assets {
/*background-color:#f8f4ec;*/
/*box-shadow: -1px 1px 5px #c7c4c4;*/
padding: 4rem 0;
padding: 11rem 0;
}
.dropdown-tooltip a.btn {
@@ -419,6 +419,7 @@ h4.inner-title {
display: grid;
grid-template-columns: repeat(3, 3fr);
grid-gap: 60px;
position: relative;
}
.parimay-card .card-logo img {
@@ -430,6 +431,7 @@ h4.inner-title {
.assets-card .card-logo {
text-align: center;
padding: 8px;
}
.parimay-card .blur-md {
@@ -530,10 +532,16 @@ h4.inner-title {
.assets-card .dics p {
font-size: 14px;
font-family: cambria;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 5;
-webkit-box-orient: vertical;
overflow: hidden;
}
.parimay-card .assets-card .dics {
padding: 15px;
height: 200px;
}
.card-logo.bg-white {
@@ -4053,10 +4061,10 @@ a.btn.btn-secondary.dropdown-toggle:active {
display: flex;
}
.opportunities .primary-cards {
width: 70%;
width: 75%;
}
.opportunities .primary-tabs {
width: 30%;
width: 25%;
}
.opportunities .parimay-card {
grid-gap: 22px;
@@ -4629,6 +4637,35 @@ button.swal2-confirm.btn.btn-primary.popup-button {
#exampleModalCenter button.btn.btn-secondary {
background-color: #1b243d;
}
.table-invest button .carousel-control-prev-icon {
filter: invert(1);
}
.table-invest button .carousel-control-next-icon{
filter: invert(1);
}
h3.primary-no-data {
position: absolute;
top: 95px;
left: 42%;
}
.primary-investment .parimay-card .assets-card {
height: 430px;
}
.primary-investment .opportunities .parimay-card {
height: 888px;
overflow-y: scroll;
}
.opportunities .parimay-card::-webkit-scrollbar-thumb {
background: #aba9a3;
border-radius: 5px;
}
.opportunities .parimay-card::-webkit-scrollbar-track {
border-radius: 5px;
}
.opportunities .parimay-card::-webkit-scrollbar {
width: 5px;
height: 50px;
}
/*======responsive=====*/

8
resources/views/Admin/Pages/manage_investors/kyc-pages/company.blade.php
View File

@@ -173,7 +173,7 @@
<div class="card-header">
<!--begin::Card title-->
<div class="card-title m-0">
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e Pan, Adhar</h3>
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e PAN, Aadhar</h3>
</div>
<!--end::Card title-->
</div>
@@ -439,7 +439,7 @@
<div class="card-header">
<!--begin::Card title-->
<div class="card-title m-0">
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e Pan, Adhar</h3>
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e PAN, Aadhar</h3>
</div>
<!--end::Card title-->
</div>
@@ -522,7 +522,7 @@
</div>
<div class="row mb-7">
<!--begin::Label-->
<label class="col-lg-10 fw-semibold text-muted">Pan Card</label>
<label class="col-lg-10 fw-semibold text-muted">PAN Card</label>
<!--end::Label-->
<!--begin::Col-->
<div class="col-lg-2">
@@ -605,7 +605,7 @@
@foreach($userPan as $pan)
@if($loop->first)
<div class="row mb-7">
<label class="col-lg-10 fw-semibold text-muted">Pan Card</label>
<label class="col-lg-10 fw-semibold text-muted">PAN Card</label>
@endif
<div class="col-lg-2">
<a class="fw-semibold fs-6 text-gray-800 text-hover-primary" href="{{ route('file-download',['file'=> $pan->file_name]) }}">

4
resources/views/Admin/Pages/manage_investors/kyc-pages/huf.blade.php
View File

@@ -63,7 +63,7 @@
<div class="card" id="kt_profile_details_view">
<div class="card-header">
<div class="card-title m-0">
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e Pan, Adhar</h3>
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e PAN, Aadhar</h3>
</div>
</div>
<div class="card-body p-9 pb-0">
@@ -86,7 +86,7 @@
@forelse ($user_docs as $doc)
@if($doc->doc_type == 'Pan')
<div class="row mb-7">
<label class="col-lg-10 fw-semibold text-muted">Pan Card</label>
<label class="col-lg-10 fw-semibold text-muted">PAN Card</label>
<div class="col-lg-2">
<a class="fw-semibold fs-6 text-gray-800 text-hover-primary" href="{{ route('file-download',['file'=> $doc->file_name]) }}">
<i class="fa-solid fa-download"></i>

2
resources/views/Admin/Pages/manage_investors/kyc-pages/individual.blade.php
View File

@@ -80,7 +80,7 @@
</div>
<div class="card-body p-9 pb-0">
<div class="row mb-7">
<label class="col-lg-10 fw-semibold text-muted">Pan Card</label>
<label class="col-lg-10 fw-semibold text-muted">PAN Card</label>
<div class="col-lg-2">
<a type="button" class="fw-semibold fs-6 text-gray-800 text-hover-primary" href="{{route('file-download', [ 'file' => $user->pan_card ] ) }}" >
<i class="fa-solid fa-download"></i>

4
resources/views/Admin/Pages/manage_investors/kyc-pages/nri.blade.php
View File

@@ -63,7 +63,7 @@
<div class="card" id="kt_profile_details_view">
<div class="card-header">
<div class="card-title m-0">
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e Pan, Adhar</h3>
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e PAN, Aadhar</h3>
</div>
</div>
<div class="card-body p-9 pb-0">
@@ -92,7 +92,7 @@
</div>
</div>
<div class="row mb-7">
<label class="col-lg-10 fw-semibold text-muted">Pan Card</label>
<label class="col-lg-10 fw-semibold text-muted">PAN Card</label>
<div class="col-lg-2 mt-1">
<span class="fw-bold fs-6 text-gray-800">{{$user->state_province_region}}</span>
<a class="fw-semibold fs-6 text-gray-800 text-hover-primary" href="{{ route('file-download',['file'=> $user->pan_card]) }}">

8
resources/views/Admin/Pages/manage_investors/kyc-pages/others.blade.php
View File

@@ -173,7 +173,7 @@
<div class="card-header">
<!--begin::Card title-->
<div class="card-title m-0">
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e Pan, Adhar</h3>
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e PAN, Aadhar</h3>
</div>
<!--end::Card title-->
</div>
@@ -442,7 +442,7 @@
<div class="card-header">
<!--begin::Card title-->
<div class="card-title m-0">
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e Pan, Adhar</h3>
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e PAN, Aadhar</h3>
</div>
<!--end::Card title-->
</div>
@@ -453,7 +453,7 @@
<!--begin::Input group-->
<div class="row mb-7">
<!--begin::Label-->
<label class="col-lg-10 fw-semibold text-muted">Proof Of Identity Pan Card</label>
<label class="col-lg-10 fw-semibold text-muted">Proof Of Identity PAN Card</label>
<!--end::Label-->
<!--begin::Col-->
{{-- <div class="col-lg fv-row"> --}}
@@ -566,7 +566,7 @@
@if($doc->doc_type == 'Pan')
<div class="row mb-7">
<!--begin::Label-->
<label class="col-lg-10 fw-semibold text-muted">Pan Card Of Authorized Signatory</label>
<label class="col-lg-10 fw-semibold text-muted">PAN Card Of Authorized Signatory</label>
<!--end::Label-->
<!--begin::Col-->
{{-- <div class="col-lg fv-row"> --}}

8
resources/views/Admin/Pages/manage_investors/kyc-pages/partnership.blade.php
View File

@@ -185,7 +185,7 @@
<div class="card-header">
<!--begin::Card title-->
<div class="card-title m-0">
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e Pan, Adhar</h3>
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e PAN, Aadhar</h3>
</div>
<!--end::Card title-->
</div>
@@ -387,7 +387,7 @@
<div class="card-header">
<!--begin::Card title-->
<div class="card-title m-0">
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e Pan, Adhar</h3>
<h3 class="fw-bold m-0">Personal Document ( Identity verification ) i.e PAN, Aadhar</h3>
</div>
<!--end::Card title-->
</div>
@@ -434,7 +434,7 @@
<!--begin::Input group-->
<div class="row mb-7">
<!--begin::Label-->
<label class="col-lg-10 fw-semibold text-muted">Pan Card</label>
<label class="col-lg-10 fw-semibold text-muted">PAN Card</label>
<!--end::Label-->
<!--begin::Col-->
<div class="col-lg">
@@ -571,7 +571,7 @@
@if($doc->doc_type == 'Pan')
{{-- <div class="row mb-7">
<!--begin::Label-->
<label class="col-lg-10 fw-semibold text-muted">Pan Card Of Authorized Signatory</label>
<label class="col-lg-10 fw-semibold text-muted">PAN Card Of Authorized Signatory</label>
<!--end::Label-->
<!--begin::Col-->
<div class="col-lg">

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

@@ -702,7 +702,7 @@
<!--begin::Input-->
<input type="text" class="form-control form-control-solid" readonly id="invester_name2" name="investor_name" />
</div>
<div class="form-box mb-5">
<div class="form-box mb-5 d-none">
<label class="fs-6 fw-semibold form-label mt-3">
<span>Product Category</span>
</label>
@@ -1233,7 +1233,7 @@
product_category: 'required',
investment_date: {
required: true,
digits: true,
// digits: true,
},
total_gross_repaid_amount: {
required: true,
@@ -1287,7 +1287,7 @@
product_category: 'Please enter product category',
investment_date: {
required: 'Please enter investment date',
digits: 'Please enter digits',
// digits: 'Please enter digits',
},
total_gross_repaid_amount: {
required: 'Please enter total gross repaid amount',
@@ -1773,7 +1773,7 @@
},
investment_date: {
required: true,
digits: true,
// digits: true,
},
tds: {
required: true,
@@ -1829,7 +1829,7 @@
},
investment_date: {
required: 'Please enter investment date',
digits: 'Please enter digits',
// digits: 'Please enter digits',
},
tds: {
required: 'Please enter tds',

2
resources/views/Admin/Pages/manage_users/manage_kyc_view.blade.php
View File

@@ -342,7 +342,7 @@
<div class="document-div">
<div class="doc-left fs-6 fw-bold">
<p>Pan Card :</p>
<p>PAN Card :</p>
</div>
<div class="doc-right">
<div class="pan_pic">

2
resources/views/Admin/Pages/manage_users/manage_users_view.blade.php
View File

@@ -400,7 +400,7 @@
<div class="document-div">
<div class="doc-left fs-6 fw-bold">
<p>Pan Card :</p>
<p>PAN Card :</p>
</div>
<div class="doc-right">
<div class="pan_pic">

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

@@ -17,14 +17,7 @@
@endsection
@section('content')
<div class="primary-investment">
<h2 class="page-heading">Primary Investment Opportunities</h2>
<p class="page-desc">
<i>
Invest in Individual Funds and Exotic <br> Strategies. Personalized way of finding the <br> right
investments for
you.
</i>
</p>
<div class="container-fluid">
<div class="opportunities w-100 mx-auto">
<div class="primary-tabs explore-assets">
@@ -53,6 +46,14 @@
</div>
<div class="primary-cards display-products">
<h2 class="page-heading">Primary Investment Opportunities</h2>
<p class="page-desc">
<i>
Invest in Individual Funds and Exotic <br> Strategies. Personalized way of finding the <br> right
investments for
you.
</i>
</p>
<!--<div class="parimay-card mt-4 mb-5 display-products">-->
@include('Frontend.Pages.handpicked-investment.pagination')
@@ -205,14 +206,7 @@
@endsection
@section('content')
<div class="primary-investment">
<h2 class="page-heading">Primary Investment Opportunities</h2>
<p class="page-desc">
<i>
Invest in Individual Funds and Exotic <br> Strategies. Personalized way of finding the <br> right
investments for
you.
</i>
</p>
<div class="container-fluid">
<div class="opportunities w-100 mx-auto">
<div class="primary-tabs explore-assets">
@@ -241,6 +235,14 @@
</div>
<div class="primary-cards display-products">
<h2 class="page-heading">Primary Investment Opportunities</h2>
<p class="page-desc">
<i>
Invest in Individual Funds and Exotic <br> Strategies. Personalized way of finding the <br> right
investments for
you.
</i>
</p>
<!--<div class="parimay-card mt-4 mb-5 display-products">-->
@include('Frontend.Pages.handpicked-investment.pagination')
@@ -334,7 +336,7 @@
function fetch_data(page, query, categories, assetType, geographicFocus) {
$.ajax({
type: 'get',
url: "http://localhost/jericho_28_march/primary-investment/fetch_data?page=" +
url: "/primary-investment/fetch_data?page=" +
page +
"&query=" + query + "&categories=" + categories + "&assetType=" +
assetType +

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

@@ -119,9 +119,9 @@
</a>
</div>
@empty
<h3>No Data Found</h3>
<h3 class="primary-no-data">No Data Found</h3>
@endforelse
</div>
<div class="pagination">{{ $products->links() }}</div>
{{-- <div class="pagination">{{ $products->links() }}</div> --}}
{{-- adarsh code ends --}}

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

@@ -278,7 +278,7 @@
certificate_of_incorporation: 'Certificate of Incorporation is required',
proof_of_address_of_the_company: 'Proof of address of the company is required',
cancelled_cheque: 'Cancelled Cheque is required',
'pan_card_copy_of_authorized_signatory[]': 'Pan Card is required',
'pan_card_copy_of_authorized_signatory[]': 'PAN Card is required',
'aadhar_card_copy_of_authorized_signatory[]': 'Aadhar Card is required',
'passport_photo_all_authorized_signatories_or_directors[]': 'Passport is required',
},

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

@@ -89,7 +89,7 @@
<input type="file" id="" name="list_of_authorised_signatories" class="acc-dropdown form-control p-2" accept="image/jpeg,image/png,image/jpg,application/pdf">
</div>
<div class="col-md-6 mb-4">
<label class="mandatory">Pan Card Copy of Authorized signatory</label>
<label class="mandatory">PAN Card Copy of Authorized signatory</label>
<input type="file" id="" name="pan_card_copy_of_authorized_signatory[]" multiple="" class="acc-dropdown form-control p-2" accept="image/jpeg,image/png,image/jpg,application/pdf">
</div>
<div class="col-md-6 mb-4">
@@ -189,8 +189,8 @@
gross_annual_income: 'Gross Annual Income is required',
occupation: 'Occupation / Business is required',
addressproof_bank_statement_or_utility_bill: 'Address Proof is required',
proof_of_identity_pan_card: 'Proof Of Identity - Pan Card is required',
'pan_card_copy_of_authorized_signatory[]': 'Pan Card is required',
proof_of_identity_pan_card: 'Proof Of Identity - PAN Card is required',
'pan_card_copy_of_authorized_signatory[]': 'PAN Card is required',
'aadhar_card_copy_of_authorized_signatory[]': 'Aadhar Card is required',
cml_copy: 'CML Copy is required',
cancelled_cheque: 'Cancelled Cheque is required',

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

@@ -123,7 +123,7 @@
accept="image/jpeg,image/png,image/jpg,application/pdf">
</div>
<div class="col-md-6 mb-4">
<label for="email" class="mandatory">Pan Card copy of authorized
<label for="email" class="mandatory">PAN Card copy of authorized
signatory</label>
<input type="file" id=""
name="pan_card_copy_of_authorized_signatory[]" multiple=""
@@ -262,11 +262,11 @@
occupation: 'Occupation / Business is required',
true_copy_of_partnership_deed: 'True Copy of Partnership deed is required',
registration_certificate: 'Registration certificate is required',
pan_card: 'Pan Card is required',
pan_card: 'PAN Card is required',
proof_of_address_firm: 'Proof Of Address Firm is required',
'pan_card_copy_of_authorized_signatory[]': 'Pan Card is required',
'pan_card_copy_of_authorized_signatory[]': 'PAN Card is required',
'aadhar_card_copy_of_authorized_signatory[]': 'Aadhar Card is required',
pan_card_copy_of_authorized_signatory: 'Pan Card Copy Of Authorized Signatory is required',
pan_card_copy_of_authorized_signatory: 'PAN Card Copy Of Authorized Signatory is required',
aadhar_card_copy_of_authorized_signatory: 'Aadhar Card Copy Of Authorized Signatory is required',
passport_photo_all_authorized_signatories_or_directors: 'Passport sized photo Of Authorized Signatory is required',
'passport_photo_authorized_signatories_partners[]': 'Passport sized photo Of Authorized Signatory is required',

7
resources/views/Frontend/footer.blade.php
View File

@@ -5,7 +5,7 @@
<div class="modal-content">
<div class="modal-header">
<div class="modal-header" style="border: none;">
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
@@ -238,14 +238,17 @@
</div>
<div class="modal-body">
<p>{!! riskDisclosureData() !!}</p>
<div>
<input type="checkbox" name="checked_risk_disclosure" value="true" id="checked_risk_disclosure"
required>
<label for="checked_risk_disclosure">Accept Risk Disclosure</label>
</div>
<label id="checked_risk_disclosure-error" class="error" for="checked_risk_disclosure"></label>
</div>
<div class="modal-footer" style="margin-bottom: -13px;">
{{-- <button type="button" class="btn btn-secondary close_btn"
data-bs-dismiss="modal">Close</button> --}}
<button type="submit" class="yellow-btn" style="height:30px">Accept</button>
<button type="submit" class="yellow-btn" style="height:30px;border:none">Accept</button>
</div>
</form>
</div>