From 94d11782f9679245227e4b3878bbf2ff9d5732bd Mon Sep 17 00:00:00 2001 From: Ritikesh yadav Date: Fri, 17 May 2024 12:17:57 +0530 Subject: [PATCH 1/5] fixing changes --- .../Controllers/Frontend/HandpickedInvestmentController.php | 3 ++- .../manage_user_product/manage_user_add.blade.php | 2 +- resources/views/Frontend/Pages/handpicked-investment.blade.php | 2 +- .../Frontend/Pages/handpicked-investment/pagination.blade.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Frontend/HandpickedInvestmentController.php b/app/Http/Controllers/Frontend/HandpickedInvestmentController.php index 6331f65..23d4442 100644 --- a/app/Http/Controllers/Frontend/HandpickedInvestmentController.php +++ b/app/Http/Controllers/Frontend/HandpickedInvestmentController.php @@ -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)]); diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php index 45077ca..00fbd24 100644 --- a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php +++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php @@ -702,7 +702,7 @@ -
+
diff --git a/resources/views/Frontend/Pages/handpicked-investment.blade.php b/resources/views/Frontend/Pages/handpicked-investment.blade.php index 6698d39..6466592 100644 --- a/resources/views/Frontend/Pages/handpicked-investment.blade.php +++ b/resources/views/Frontend/Pages/handpicked-investment.blade.php @@ -334,7 +334,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 + diff --git a/resources/views/Frontend/Pages/handpicked-investment/pagination.blade.php b/resources/views/Frontend/Pages/handpicked-investment/pagination.blade.php index 3ae06d8..da5c824 100644 --- a/resources/views/Frontend/Pages/handpicked-investment/pagination.blade.php +++ b/resources/views/Frontend/Pages/handpicked-investment/pagination.blade.php @@ -122,6 +122,6 @@

No Data Found

@endforelse
- +{{-- --}} {{-- adarsh code ends --}} \ No newline at end of file From dea2c392651c6f0d4d72eacf7f0ab3e3b7ab8013 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Fri, 17 May 2024 12:20:28 +0530 Subject: [PATCH 2/5] bug fixing --- public/assets/css/FrontendCss/style.css | 25 +++++++++++--- .../kyc-pages/company.blade.php | 8 ++--- .../manage_investors/kyc-pages/huf.blade.php | 4 +-- .../kyc-pages/individual.blade.php | 2 +- .../manage_investors/kyc-pages/nri.blade.php | 4 +-- .../kyc-pages/others.blade.php | 8 ++--- .../kyc-pages/partnership.blade.php | 10 +++--- .../manage_users/manage_kyc_view.blade.php | 2 +- .../manage_users/manage_users_view.blade.php | 2 +- .../Pages/handpicked-investment.blade.php | 34 ++++++++++--------- .../pagination.blade.php | 2 +- .../Frontend/Pages/profile/company.blade.php | 2 +- .../Frontend/Pages/profile/others.blade.php | 6 ++-- .../Pages/profile/partnership.blade.php | 8 ++--- resources/views/Frontend/footer.blade.php | 7 ++-- 15 files changed, 73 insertions(+), 51 deletions(-) diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css index 2a4a855..7a084e2 100644 --- a/public/assets/css/FrontendCss/style.css +++ b/public/assets/css/FrontendCss/style.css @@ -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 { @@ -530,10 +531,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 +4060,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,7 +4636,17 @@ 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%; +} /*======responsive=====*/ @media (max-width: 2560px) { diff --git a/resources/views/Admin/Pages/manage_investors/kyc-pages/company.blade.php b/resources/views/Admin/Pages/manage_investors/kyc-pages/company.blade.php index 7c8c1f6..2fadc2d 100644 --- a/resources/views/Admin/Pages/manage_investors/kyc-pages/company.blade.php +++ b/resources/views/Admin/Pages/manage_investors/kyc-pages/company.blade.php @@ -173,7 +173,7 @@
-

Personal Document ( Identity verification ) i.e Pan, Adhar

+

Personal Document ( Identity verification ) i.e PAN, Aadhar

@@ -439,7 +439,7 @@
-

Personal Document ( Identity verification ) i.e Pan, Adhar

+

Personal Document ( Identity verification ) i.e PAN, Aadhar

@@ -522,7 +522,7 @@
- +
@@ -605,7 +605,7 @@ @foreach($userPan as $pan) @if($loop->first)
- + @endif
diff --git a/resources/views/Admin/Pages/manage_investors/kyc-pages/huf.blade.php b/resources/views/Admin/Pages/manage_investors/kyc-pages/huf.blade.php index 0c76bcb..4b45714 100644 --- a/resources/views/Admin/Pages/manage_investors/kyc-pages/huf.blade.php +++ b/resources/views/Admin/Pages/manage_investors/kyc-pages/huf.blade.php @@ -63,7 +63,7 @@
-

Personal Document ( Identity verification ) i.e Pan, Adhar

+

Personal Document ( Identity verification ) i.e PAN, Aadhar

@@ -86,7 +86,7 @@ @forelse ($user_docs as $doc) @if($doc->doc_type == 'Pan')
- +
- +
diff --git a/resources/views/Admin/Pages/manage_investors/kyc-pages/nri.blade.php b/resources/views/Admin/Pages/manage_investors/kyc-pages/nri.blade.php index 0bd4833..ff8fcf0 100644 --- a/resources/views/Admin/Pages/manage_investors/kyc-pages/nri.blade.php +++ b/resources/views/Admin/Pages/manage_investors/kyc-pages/nri.blade.php @@ -63,7 +63,7 @@
-

Personal Document ( Identity verification ) i.e Pan, Adhar

+

Personal Document ( Identity verification ) i.e PAN, Aadhar

@@ -92,7 +92,7 @@
- +
{{$user->state_province_region}} diff --git a/resources/views/Admin/Pages/manage_investors/kyc-pages/others.blade.php b/resources/views/Admin/Pages/manage_investors/kyc-pages/others.blade.php index 91e715d..5716747 100644 --- a/resources/views/Admin/Pages/manage_investors/kyc-pages/others.blade.php +++ b/resources/views/Admin/Pages/manage_investors/kyc-pages/others.blade.php @@ -173,7 +173,7 @@
-

Personal Document ( Identity verification ) i.e Pan, Adhar

+

Personal Document ( Identity verification ) i.e PAN, Aadhar

@@ -442,7 +442,7 @@
-

Personal Document ( Identity verification ) i.e Pan, Adhar

+

Personal Document ( Identity verification ) i.e PAN, Aadhar

@@ -453,7 +453,7 @@
- + {{--
--}} @@ -566,7 +566,7 @@ @if($doc->doc_type == 'Pan')
- + {{--
--}} diff --git a/resources/views/Admin/Pages/manage_investors/kyc-pages/partnership.blade.php b/resources/views/Admin/Pages/manage_investors/kyc-pages/partnership.blade.php index 4a5fae4..cb1fdc2 100644 --- a/resources/views/Admin/Pages/manage_investors/kyc-pages/partnership.blade.php +++ b/resources/views/Admin/Pages/manage_investors/kyc-pages/partnership.blade.php @@ -185,7 +185,7 @@
-

Personal Document ( Identity verification ) i.e Pan, Adhar

+

Personal Document ( Identity verification ) i.e PAN, Aadhar

@@ -387,7 +387,7 @@
-

Personal Document ( Identity verification ) i.e Pan, Adhar

+

Personal Document ( Identity verification ) i.e PAN, Aadhar

@@ -434,7 +434,7 @@
- +
@@ -466,7 +466,7 @@
- +
@@ -571,7 +571,7 @@ @if($doc->doc_type == 'Pan')
- +
diff --git a/resources/views/Admin/Pages/manage_users/manage_kyc_view.blade.php b/resources/views/Admin/Pages/manage_users/manage_kyc_view.blade.php index 054e0f8..0795529 100644 --- a/resources/views/Admin/Pages/manage_users/manage_kyc_view.blade.php +++ b/resources/views/Admin/Pages/manage_users/manage_kyc_view.blade.php @@ -342,7 +342,7 @@
-

Pan Card :

+

PAN Card :

diff --git a/resources/views/Admin/Pages/manage_users/manage_users_view.blade.php b/resources/views/Admin/Pages/manage_users/manage_users_view.blade.php index f834fe1..a7c1118 100644 --- a/resources/views/Admin/Pages/manage_users/manage_users_view.blade.php +++ b/resources/views/Admin/Pages/manage_users/manage_users_view.blade.php @@ -400,7 +400,7 @@
-

Pan Card :

+

PAN Card :

diff --git a/resources/views/Frontend/Pages/handpicked-investment.blade.php b/resources/views/Frontend/Pages/handpicked-investment.blade.php index 6466592..8ed139c 100644 --- a/resources/views/Frontend/Pages/handpicked-investment.blade.php +++ b/resources/views/Frontend/Pages/handpicked-investment.blade.php @@ -17,14 +17,7 @@ @endsection @section('content')
-

Primary Investment Opportunities

-

- - Invest in Individual Funds and Exotic
Strategies. Personalized way of finding the
right - investments for - you. -
-

+
@@ -53,6 +46,14 @@
+

Primary Investment Opportunities

+

+ + Invest in Individual Funds and Exotic
Strategies. Personalized way of finding the
right + investments for + you. +
+

@include('Frontend.Pages.handpicked-investment.pagination') @@ -205,14 +206,7 @@ @endsection @section('content')
-

Primary Investment Opportunities

-

- - Invest in Individual Funds and Exotic
Strategies. Personalized way of finding the
right - investments for - you. -
-

+
@@ -241,6 +235,14 @@
+

Primary Investment Opportunities

+

+ + Invest in Individual Funds and Exotic
Strategies. Personalized way of finding the
right + investments for + you. +
+

@include('Frontend.Pages.handpicked-investment.pagination') diff --git a/resources/views/Frontend/Pages/handpicked-investment/pagination.blade.php b/resources/views/Frontend/Pages/handpicked-investment/pagination.blade.php index 3ae06d8..64d9798 100644 --- a/resources/views/Frontend/Pages/handpicked-investment/pagination.blade.php +++ b/resources/views/Frontend/Pages/handpicked-investment/pagination.blade.php @@ -119,7 +119,7 @@
@empty -

No Data Found

+

No Data Found

@endforelse
diff --git a/resources/views/Frontend/Pages/profile/company.blade.php b/resources/views/Frontend/Pages/profile/company.blade.php index 361c708..90536ed 100644 --- a/resources/views/Frontend/Pages/profile/company.blade.php +++ b/resources/views/Frontend/Pages/profile/company.blade.php @@ -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', }, diff --git a/resources/views/Frontend/Pages/profile/others.blade.php b/resources/views/Frontend/Pages/profile/others.blade.php index 345601d..d38ad99 100644 --- a/resources/views/Frontend/Pages/profile/others.blade.php +++ b/resources/views/Frontend/Pages/profile/others.blade.php @@ -89,7 +89,7 @@
- +
@@ -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', diff --git a/resources/views/Frontend/Pages/profile/partnership.blade.php b/resources/views/Frontend/Pages/profile/partnership.blade.php index 1ef5a7b..ff3c9f8 100644 --- a/resources/views/Frontend/Pages/profile/partnership.blade.php +++ b/resources/views/Frontend/Pages/profile/partnership.blade.php @@ -123,7 +123,7 @@ accept="image/jpeg,image/png,image/jpg,application/pdf">
-