diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php index 6c0e1e9..330277a 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestmentController.php @@ -40,6 +40,7 @@ use App\Models\MonthlyUpdateMaster; use Illuminate\Support\Str; use App\Models\ProductPhotoDocuments; use Illuminate\Support\Facades\Validator; +use File; class ManageFreeUInvestmentController extends Controller { diff --git a/app/Http/Controllers/Admin/ManageUserProductController.php b/app/Http/Controllers/Admin/ManageUserProductController.php index 7a450c4..10560cf 100644 --- a/app/Http/Controllers/Admin/ManageUserProductController.php +++ b/app/Http/Controllers/Admin/ManageUserProductController.php @@ -402,7 +402,7 @@ class ManageUserProductController extends Controller public function editProduct(Request $request) { - // dd($request->all()); + dd($request->all()); // return $request->update_id; $update_data = MonthlyUpdateMaster::where('id', $request->eid)->update([ "users_id" => $request->euserid, diff --git a/app/Http/Requests/StoreCompanyKYC.php b/app/Http/Requests/StoreCompanyKYC.php index f262753..e1a78fa 100644 --- a/app/Http/Requests/StoreCompanyKYC.php +++ b/app/Http/Requests/StoreCompanyKYC.php @@ -28,9 +28,9 @@ class StoreCompanyKYC extends FormRequest 'mobile_number' => 'required|regex:/^(\+\d{1,3}[- ]?)?\d{10,12}$/|unique:user_kycs,mobile_number,' . auth()->guard('users')->user()->id . ',users_id', 'email' => 'required|regex:/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/|unique:user_kycs,email,' . auth()->guard('users')->user()->id . ',users_id', 'dob' => 'required', - 'occupation' => 'required|regex:/^[a-zA-Z\s]+$/', - 'place_of_birth' => 'required|regex:/^[a-zA-Z\s]+$/', - 'gross_annual_income' => 'required|regex:/^[0-9]+$/', + 'occupation' => 'regex:/^[a-zA-Z\s]+$/', + 'place_of_birth' => 'regex:/^[a-zA-Z\s]+$/', + 'gross_annual_income' => 'regex:/^[0-9]+$/', 'memorandum_or_articles_of_association' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'company_pan' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'certificate_of_incorporation' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', diff --git a/app/Http/Requests/StoreIndividualKYC.php b/app/Http/Requests/StoreIndividualKYC.php index 4530937..19bff59 100644 --- a/app/Http/Requests/StoreIndividualKYC.php +++ b/app/Http/Requests/StoreIndividualKYC.php @@ -28,11 +28,11 @@ class StoreIndividualKYC extends FormRequest 'mobile_number' => 'required|regex:/^(\+\d{1,3}[- ]?)?\d{10,12}$/|unique:user_kycs,mobile_number,'.auth()->guard('users')->user()->id.',users_id', 'email' => 'required|regex:/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/|unique:user_kycs,email,'.auth()->guard('users')->user()->id.',users_id', 'dob' => 'required', - 'occupation' => 'required|regex:/^[a-zA-Z\s]+$/', + 'occupation' => 'regex:/^[a-zA-Z\s]+$/', 'father_name' => 'required|regex:/^[a-zA-Z\s]+$/', 'mother_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'place_of_birth' => 'required|regex:/^[a-zA-Z\s]+$/', - 'gross_annual_income' => 'required|regex:/^[0-9]+$/', + 'place_of_birth' => 'regex:/^[a-zA-Z\s]+$/', + 'gross_annual_income' => 'regex:/^[0-9]+$/', 'pan_card' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'proof_of_address' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'Photograph' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', diff --git a/app/Http/Requests/StoreNRIKYC.php b/app/Http/Requests/StoreNRIKYC.php index 1242230..ddc4e03 100644 --- a/app/Http/Requests/StoreNRIKYC.php +++ b/app/Http/Requests/StoreNRIKYC.php @@ -25,14 +25,14 @@ class StoreNRIKYC extends FormRequest { return [ 'name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'mobile_number' => 'required|regex:/^(\+\d{1,3}[- ]?)?\d{10,12}$/|unique:user_kycs,mobile_number,'.auth()->guard('users')->user()->id.',users_id', - 'email' => 'required|regex:/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/|unique:user_kycs,email,'.auth()->guard('users')->user()->id.',users_id', + 'mobile_number' => 'required|regex:/^(\+\d{1,3}[- ]?)?\d{10,12}$/|unique:user_kycs,mobile_number,' . auth()->guard('users')->user()->id . ',users_id', + 'email' => 'required|regex:/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/|unique:user_kycs,email,' . auth()->guard('users')->user()->id . ',users_id', 'dob' => 'required', - 'father_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'mother_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'occupation' => 'required|regex:/^[a-zA-Z\s]+$/', - 'place_of_birth' => 'required|regex:/^[a-zA-Z\s]+$/', - 'gross_annual_income' => 'required|regex:/^[0-9]+$/', + 'father_name' => 'regex:/^[a-zA-Z\s]+$/', + 'mother_name' => 'regex:/^[a-zA-Z\s]+$/', + 'occupation' => 'regex:/^[a-zA-Z\s]+$/', + 'place_of_birth' => 'regex:/^[a-zA-Z\s]+$/', + 'gross_annual_income' => 'regex:/^[0-9]+$/', 'passport' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'pio_oci_card' => 'mimes:jpeg,png,jpg,pdf|max:2048', // 'tin' => 'required', @@ -41,7 +41,7 @@ class StoreNRIKYC extends FormRequest 'utility' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'rental_agreement' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'passport_size_photograph' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', - 'cancelled_cheque' => 'mimes:jpeg,png,jpg,pdf|max:2048', + 'cancelled_cheque' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'copy_of_cml' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'trc_copy' => 'mimes:jpeg,png,jpg,pdf|max:2048', 'form_10f' => 'mimes:jpeg,png,jpg,pdf|max:2048', @@ -49,7 +49,8 @@ class StoreNRIKYC extends FormRequest ]; } - public function messages(){ + public function messages() + { return [ 'required' => 'This :attribute field is required', 'unique' => "This :attribute field must be unique", diff --git a/app/Http/Requests/StoreOtherKYC.php b/app/Http/Requests/StoreOtherKYC.php index 7a7bf54..019a845 100644 --- a/app/Http/Requests/StoreOtherKYC.php +++ b/app/Http/Requests/StoreOtherKYC.php @@ -28,11 +28,11 @@ class StoreOtherKYC extends FormRequest 'mobile_number' => 'required|regex:/^(\+\d{1,3}[- ]?)?\d{10,12}$/|unique:user_kycs,mobile_number,'.auth()->guard('users')->user()->id.',users_id', 'email' => 'required|regex:/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/|unique:user_kycs,email,'.auth()->guard('users')->user()->id.',users_id', 'dob' => 'required', - 'father_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'mother_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'occupation' => 'required|regex:/^[a-zA-Z\s]+$/', - 'place_of_birth' => 'required|regex:/^[a-zA-Z\s]+$/', - 'gross_annual_income' => 'required|regex:/^[0-9]+$/', + 'father_name' => 'regex:/^[a-zA-Z\s]+$/', + 'mother_name' => 'regex:/^[a-zA-Z\s]+$/', + 'occupation' => 'regex:/^[a-zA-Z\s]+$/', + 'place_of_birth' => 'regex:/^[a-zA-Z\s]+$/', + 'gross_annual_income' => 'regex:/^[0-9]+$/', 'proof_of_identity_pan_card' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'addressproof_bank_statement_or_utility_bill' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'certificate_of_registration' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', diff --git a/app/Http/Requests/StorePartnerShipKYC.php b/app/Http/Requests/StorePartnerShipKYC.php index cbfb579..15f7268 100644 --- a/app/Http/Requests/StorePartnerShipKYC.php +++ b/app/Http/Requests/StorePartnerShipKYC.php @@ -28,11 +28,11 @@ class StorePartnerShipKYC extends FormRequest 'mobile_number' => 'required|regex:/^(\+\d{1,3}[- ]?)?\d{10,12}$/|unique:user_kycs,mobile_number,'.auth()->guard('users')->user()->id.',users_id', 'email' => 'required|regex:/^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/|unique:user_kycs,email,'.auth()->guard('users')->user()->id.',users_id', 'dob' => 'required', - 'father_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'mother_name' => 'required|regex:/^[a-zA-Z\s]+$/', - 'occupation' => 'required|regex:/^[a-zA-Z\s]+$/', - 'place_of_birth' => 'required|regex:/^[a-zA-Z\s]+$/', - 'gross_annual_income' => 'required|regex:/^[0-9]+$/', + 'father_name' => 'regex:/^[a-zA-Z\s]+$/', + 'mother_name' => 'regex:/^[a-zA-Z\s]+$/', + 'occupation' => 'regex:/^[a-zA-Z\s]+$/', + 'place_of_birth' => 'regex:/^[a-zA-Z\s]+$/', + 'gross_annual_income' => 'regex:/^[0-9]+$/', 'true_copy_of_partnership_deed' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'registration_certificate' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'pan_card' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', diff --git a/public/assets/uploads/real-estate_images/202406101241_login-img.png b/public/assets/uploads/real-estate_images/202406101241_login-img.png new file mode 100644 index 0000000..ae0d698 Binary files /dev/null and b/public/assets/uploads/real-estate_images/202406101241_login-img.png differ diff --git a/public/uploads/product/fact_sheet/1718003682_factsheet.pdf b/public/uploads/product/fact_sheet/1718003682_factsheet.pdf new file mode 100644 index 0000000..36464c7 Binary files /dev/null and b/public/uploads/product/fact_sheet/1718003682_factsheet.pdf differ diff --git a/public/uploads/product/presentation/1718003682_presentation.pdf b/public/uploads/product/presentation/1718003682_presentation.pdf new file mode 100644 index 0000000..36464c7 Binary files /dev/null and b/public/uploads/product/presentation/1718003682_presentation.pdf differ diff --git a/public/uploads/real_estate/documents/1718002762.documents1jpg b/public/uploads/real_estate/documents/1718002762.documents1jpg new file mode 100644 index 0000000..5c9d211 Binary files /dev/null and b/public/uploads/real_estate/documents/1718002762.documents1jpg differ diff --git a/public/uploads/real_estate/photos/1718002699.photos1jpg b/public/uploads/real_estate/photos/1718002699.photos1jpg new file mode 100644 index 0000000..5c9d211 Binary files /dev/null and b/public/uploads/real_estate/photos/1718002699.photos1jpg differ diff --git a/resources/views/Admin/Pages/manage_freeu_investment/edit-product/real-estate.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/edit-product/real-estate.blade.php index 00d9ad9..497c029 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/edit-product/real-estate.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/edit-product/real-estate.blade.php @@ -1119,7 +1119,7 @@ -
+ {{--
-
+
--}} + {{--
+
--}}
- {{--
+
+ +
+
+ +
-
--}} +
+ +
+ +
+
{{-- @endforeach --}} @@ -416,7 +428,7 @@ - @@ -424,20 +436,20 @@
-
-
-
@@ -456,16 +468,16 @@ -
-
@@ -473,12 +485,12 @@ - -
+
@@ -734,6 +746,17 @@ }) }); + function hideDiv(assignData,divId,assignId) + { + if(assignData == ''); + { + $(divId).addClass('d-none'); + } + if(assignData != ''){ + $(assignId).val(assignData); + } + } + $(document).ready(function() { // alert("hello"); $('.action_edit').click(function() { diff --git a/resources/views/Frontend/Pages/indian-real-estate/product.blade.php b/resources/views/Frontend/Pages/indian-real-estate/product.blade.php index fdf00fc..ffcf0be 100644 --- a/resources/views/Frontend/Pages/indian-real-estate/product.blade.php +++ b/resources/views/Frontend/Pages/indian-real-estate/product.blade.php @@ -53,12 +53,13 @@

@endif + @if($realEstate->property_location || $realEstate->project_type ||$realEstate->current_status )
-
property_location)}}> +

Property Location

{{ $realEstate->property_location ?? '-' }}
@@ -162,8 +163,9 @@
@endif
+ @if($realEstate->no_of_bedrooms || $realEstate->no_of_restrooms || $realEstate->no_of_floors || $realEstate->total_towers || $realEstate->builder_details || $realEstate->landmarks || $realEstate->completed_in || $realEstate->total_units || $realEstate->unit_type )
- @if($realEstate->no_of_bedrooms || $realEstate->no_of_restrooms || $realEstate->no_of_floors) +

No. Of Bedrooms

@@ -183,8 +185,8 @@ {{ $realEstate->slug ?? '-' }}
--}}
- @endif - @if($realEstate->total_towers || $realEstate->builder_details || $realEstate->landmarks ) + +

Total Towers

@@ -199,8 +201,7 @@ {{ $realEstate->landmarks ?? '-' }}
- @endif - @if($realEstate->completed_in || $realEstate->total_units || $realEstate->unit_type ) +

Completed In

@@ -210,14 +211,16 @@

Total Units

{{ $realEstate->total_units ?? '-' }}
-
+

Unit Type

{{ $realEstate->unit_type ?? '-' }}
- @endif +
+ @endif
+
@if($realEstate->electricity_status || $realEstate->fire_safety_measures || $realEstate->water_facility ) diff --git a/resources/views/Frontend/Pages/profile/company.blade.php b/resources/views/Frontend/Pages/profile/company.blade.php index 1228ebe..949fb8b 100644 --- a/resources/views/Frontend/Pages/profile/company.blade.php +++ b/resources/views/Frontend/Pages/profile/company.blade.php @@ -69,21 +69,21 @@ max="2006-01-11">
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -66,15 +66,15 @@
- +
- +
- +
@@ -82,11 +82,11 @@
- +
- +
@@ -124,15 +124,15 @@
- +
- +
- +
@@ -182,16 +182,16 @@ required: true, ValidEmail: true, }, - father_name: 'required', - mother_name: 'required', + // father_name: 'required', + // mother_name: 'required', dob: 'required', - place_of_birth: 'required', - gross_annual_income: 'required', - occupation: 'required', + // place_of_birth: 'required', + // gross_annual_income: 'required', + // occupation: 'required', passport: 'required', pan_card: 'required', proof_of_address_of_india: 'required', - // proof_of_address_of_foreign: 'required', + proof_of_address_of_foreign: 'required', utility: 'required', rental_agreement: 'required', passport_size_photograph: 'required', diff --git a/resources/views/Frontend/Pages/profile/others.blade.php b/resources/views/Frontend/Pages/profile/others.blade.php index df69dd4..d267d99 100644 --- a/resources/views/Frontend/Pages/profile/others.blade.php +++ b/resources/views/Frontend/Pages/profile/others.blade.php @@ -49,11 +49,11 @@
- +
- +
@@ -61,15 +61,15 @@
- +
- +
- +
@@ -89,11 +89,11 @@
- +
- +
@@ -113,7 +113,7 @@
-
- +
- +
- +
- +
- +