diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index 77fc8fb..d45b654 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -369,7 +369,7 @@ class DashboardController extends Controller $leadAssigned .= $this->notificationData($message, $created_at, $id, $read_at); } } - $notificationStatus = array('newUser' => $newUser, 'submittedKyc' => $submittedKyc, 'sellerForm' => $sellerForm, 'buyerForm' => $buyerForm, 'contactUs' => $contactUs, 'leadAssigned' => $leadAssigned); + $notificationStatus = array('newUser' => $newUser, 'submittedKyc' => $submittedKyc, 'sellerForm' => $sellerForm, 'buyerForm' => $buyerForm, 'contactUs' => $contactUs, 'leadAssigned' => $leadAssigned, 'unreadnotification' => \Auth::user()->unreadnotifications()->count()); return response()->json(['status' => 200, 'message' => "marked as read", 'data' => $notificationStatus]); // } } diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index 9fd07cb..37d07c0 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -713,10 +713,8 @@ class DashboardController extends Controller $validator = Validator::make($request->all(), [ 'property_name' => 'required', 'property_address' => 'required', - 'property_grade' => 'required', 'asset_type' => 'required', 'annual_rental_yield_earned' => 'required', - 'rental_escalation' => 'required', 'fractional_real_estate_platform' => 'required', 'date_of_investment' => 'required', 'original_amount_invested' => 'required', diff --git a/app/Http/Requests/StoreCompanyKYC.php b/app/Http/Requests/StoreCompanyKYC.php index 6a43ca5..f262753 100644 --- a/app/Http/Requests/StoreCompanyKYC.php +++ b/app/Http/Requests/StoreCompanyKYC.php @@ -35,14 +35,14 @@ class StoreCompanyKYC extends FormRequest 'company_pan' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'certificate_of_incorporation' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'tan_allotment_letter' => 'mimes:jpeg,png,jpg,pdf|max:2048', - 'List_of_directors_or_authorized_signatories' => 'mimes:jpeg,png,jpg,pdf|max:2048', + 'List_of_directors_or_authorized_signatories' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', // 'pan_card_copy_of_authorized_signatory' => ', - 'pan_card_copy_of_authorized_signatory' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', + 'pan_card_copy_of_authorized_signatory' => 'required|required|mimes:jpeg,png,jpg,pdf|max:2048', // 'aadhar_card_copy_of_authorized_signatory' => ', 'aadhar_card_copy_of_authorized_signatory' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'proof_of_address_of_the_company' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'latest_income_tax_return_of_the_company_Of_last_2_years' => 'mimes:jpeg,png,jpg,pdf|max:2048', - 'copy_of_cml' => 'mimes:jpeg,png,jpg,pdf|max:2048', + 'copy_of_cml' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'copy_of_audited_balance_sheet_for_the_last_2_f_y' => 'mimes:jpeg,png,jpg,pdf|max:2048', // 'passport_photo_all_authorized_signatories_or_directors' => ', 'passport_photo_all_authorized_signatories_or_directors' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', diff --git a/app/Http/Requests/StoreNRIKYC.php b/app/Http/Requests/StoreNRIKYC.php index 0c043be..1242230 100644 --- a/app/Http/Requests/StoreNRIKYC.php +++ b/app/Http/Requests/StoreNRIKYC.php @@ -35,7 +35,7 @@ class StoreNRIKYC extends FormRequest 'gross_annual_income' => 'required|regex:/^[0-9]+$/', 'passport' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'pio_oci_card' => 'mimes:jpeg,png,jpg,pdf|max:2048', - 'tin' => 'required', + // 'tin' => 'required', 'pan_card' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'proof_of_address_of_india' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'utility' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', diff --git a/app/Http/Requests/StoreOtherKYC.php b/app/Http/Requests/StoreOtherKYC.php index 573555e..7a7bf54 100644 --- a/app/Http/Requests/StoreOtherKYC.php +++ b/app/Http/Requests/StoreOtherKYC.php @@ -35,14 +35,14 @@ class StoreOtherKYC extends FormRequest 'gross_annual_income' => 'required|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' => 'mimes:jpeg,png,jpg,pdf|max:2048', - 'list_of_authorised_signatories' => 'mimes:jpeg,png,jpg,pdf|max:2048', + 'certificate_of_registration' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', + 'list_of_authorised_signatories' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', // 'pan_card_copy_of_authorized_signatory' => ', 'pan_card_copy_of_authorized_signatory.*' => 'mimes:jpeg,png,jpg,pdf|max:2048', // 'aadhar_card_copy_of_authorized_signatory' => ', 'aadhar_card_copy_of_authorized_signatory.*' => 'mimes:jpeg,png,jpg,pdf|max:2048', - 'cancelled_cheque' => 'mimes:jpeg,png,jpg,pdf|max:2048', - 'cml_copy' => 'mimes:jpeg,png,jpg,pdf|max:2048', + 'cancelled_cheque' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', + 'cml_copy' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'latest_income_tax_return' => 'mimes:jpeg,png,jpg,pdf|max:2048', 'copy_of_audited_balance_sheet_for_the_last_2_F_Y' => 'mimes:jpeg,png,jpg,pdf|max:2048', // 'passport_photo_signed_authorized_signatories_or_directors' => 'required', diff --git a/app/Http/Requests/StorePartnerShipKYC.php b/app/Http/Requests/StorePartnerShipKYC.php index 54fe033..cbfb579 100644 --- a/app/Http/Requests/StorePartnerShipKYC.php +++ b/app/Http/Requests/StorePartnerShipKYC.php @@ -36,15 +36,15 @@ class StorePartnerShipKYC extends FormRequest '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', - 'list_of_partners_and_authorised_signatories' => 'mimes:jpeg,png,jpg,pdf|max:2048', + 'list_of_partners_and_authorised_signatories' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', // 'pan_card_copy_of_authorized_signatory' => ', - 'pan_card_copy_of_authorized_signatory.*' => 'mimes:jpeg,png,jpg,pdf|max:2048', + 'pan_card_copy_of_authorized_signatory.*' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', // 'aadhar_card_copy_of_authorized_signatory' => ', - 'aadhar_card_copy_of_authorized_signatory.*' => 'mimes:jpeg,png,jpg,pdf|max:2048', + 'aadhar_card_copy_of_authorized_signatory.*' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'tan_allotment_letter' => 'mimes:jpeg,png,jpg,pdf|max:2048', - 'proof_of_address_firm' => 'mimes:jpeg,png,jpg,pdf|max:2048', + 'proof_of_address_firm' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'latestIincome_tax_return_of_the_firm' => 'mimes:jpeg,png,jpg,pdf|max:2048', - 'copy_of_cml' => 'mimes:jpeg,png,jpg,pdf|max:2048', + 'copy_of_cml' => 'required|mimes:jpeg,png,jpg,pdf|max:2048', 'copy_of_audited_balance_sheet_for_last' => 'mimes:jpeg,png,jpg,pdf|max:2048', // 'passport_photo_authorized_signatories_partners' => ', 'passport_photo_authorized_signatories_partners.*' => 'mimes:jpeg,png,jpg,pdf|max:2048', diff --git a/config/app.php b/config/app.php index 5248bc4..f07cc05 100644 --- a/config/app.php +++ b/config/app.php @@ -52,7 +52,7 @@ return [ | */ - 'url' => env('APP_URL', 'http://localhost'), + 'url' => env('APP_URL', 'http://localhost/new_freeu/my-freeu/'), 'asset_url' => env('ASSET_URL', null), diff --git a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php index 6645d7f..6241191 100644 --- a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php +++ b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php @@ -1858,7 +1858,7 @@ --> - + @@ -1868,7 +1868,7 @@ - + @@ -1924,7 +1924,7 @@ - + @@ -2019,7 +2019,7 @@ - + @@ -2027,7 +2027,7 @@ - + @@ -2035,7 +2035,7 @@ - + @@ -2047,7 +2047,7 @@ - + @@ -2085,7 +2085,7 @@ - + @@ -2093,7 +2093,7 @@ - + diff --git a/resources/views/Admin/footer.blade.php b/resources/views/Admin/footer.blade.php index b7cf2e7..973220b 100644 --- a/resources/views/Admin/footer.blade.php +++ b/resources/views/Admin/footer.blade.php @@ -91,6 +91,10 @@ $url_name = request()->segment(count(request()->segments())); if (result.data.leadAssigned) { $('#leads').empty().html(result.data.leadAssigned); } + if(result.data.unreadnotification) + { + $('#notification_count').empty().html(result.data.unreadnotification); + } } else { toastr.warning(result.message); } diff --git a/resources/views/Admin/header.blade.php b/resources/views/Admin/header.blade.php index ec4d253..edd0e82 100644 --- a/resources/views/Admin/header.blade.php +++ b/resources/views/Admin/header.blade.php @@ -112,8 +112,8 @@
- - {{Auth::user()->notifications()->count()}} + + {{Auth::user()->unreadnotifications()->count()}}
diff --git a/resources/views/Frontend/Pages/profile/company.blade.php b/resources/views/Frontend/Pages/profile/company.blade.php index 65cae30..1228ebe 100644 --- a/resources/views/Frontend/Pages/profile/company.blade.php +++ b/resources/views/Frontend/Pages/profile/company.blade.php @@ -116,7 +116,7 @@ accept="image/jpeg,image/png,image/jpg,application/pdf">
- +
- + @@ -256,9 +256,11 @@ occupation: 'required', memorandum_or_articles_of_association: 'required', company_pan: 'required', + List_of_directors_or_authorized_signatories:'required', certificate_of_incorporation: 'required', proof_of_address_of_the_company: 'required', cancelled_cheque: 'required', + copy_of_cml:'required', 'pan_card_copy_of_authorized_signatory[]': 'required', 'aadhar_card_copy_of_authorized_signatory[]': 'required', 'passport_photo_all_authorized_signatories_or_directors[]': 'required', @@ -278,6 +280,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', + copy_of_cml:"Copy of CML 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/market-list/fractional-real-estate.blade.php b/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php index 88281ad..dba7922 100644 --- a/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php +++ b/resources/views/Frontend/Pages/profile/market-list/fractional-real-estate.blade.php @@ -166,10 +166,8 @@ rules: { property_name: "required", property_address: "required", - property_grade: "required", asset_type: "required", annual_rental_yield_earned: "required", - rental_escalation: "required", fractional_real_estate_platform: "required", date_of_investment: "required", original_amount_invested: "required", diff --git a/resources/views/Frontend/Pages/profile/nri.blade.php b/resources/views/Frontend/Pages/profile/nri.blade.php index 2ffb71f..c82fe86 100644 --- a/resources/views/Frontend/Pages/profile/nri.blade.php +++ b/resources/views/Frontend/Pages/profile/nri.blade.php @@ -189,7 +189,6 @@ gross_annual_income: 'required', occupation: 'required', passport: 'required', - tin: 'required', pan_card: 'required', proof_of_address_of_india: 'required', // proof_of_address_of_foreign: 'required', @@ -197,7 +196,7 @@ rental_agreement: 'required', passport_size_photograph: 'required', copy_of_cml: 'required', - // cancelled_cheque: 'required', + cancelled_cheque: 'required', // trc_copy: 'required', // form_10f: 'required', // no_pe_declaration: 'required', @@ -221,7 +220,7 @@ rental_agreement: 'Proof Of Address (Foreign) Rental Agreement is required', passport_size_photograph: 'Recent Passport Size Photograph is required', copy_of_cml: 'Copy of CML is required', - // cancelled_cheque: 'Cancelled Cheque (NRO/NRE Account) is required', + cancelled_cheque: 'Cancelled Cheque (NRO/NRE Account) is required', // trc_copy: 'TRC Copy is required', // form_10f: 'Form 10F is required', // no_pe_declaration: 'No PE Declaration is required', diff --git a/resources/views/Frontend/Pages/profile/others.blade.php b/resources/views/Frontend/Pages/profile/others.blade.php index 2dcd4b3..df69dd4 100644 --- a/resources/views/Frontend/Pages/profile/others.blade.php +++ b/resources/views/Frontend/Pages/profile/others.blade.php @@ -81,11 +81,11 @@
- +
- +
@@ -170,13 +170,15 @@ place_of_birth: 'required', gross_annual_income: 'required', occupation: 'required', + certificate_of_registration:'required', addressproof_bank_statement_or_utility_bill: 'required', proof_of_identity_pan_card: 'required', 'pan_card_copy_of_authorized_signatory[]': 'required', 'aadhar_card_copy_of_authorized_signatory[]': 'required', cml_copy: 'required', cancelled_cheque: 'required', - 'passport_photo_signed_authorized_signatories_or_directors[]': 'required' + 'passport_photo_signed_authorized_signatories_or_directors[]': 'required', + list_of_authorised_signatories:"required" }, messages: { name: 'Name is required', @@ -194,7 +196,11 @@ 'aadhar_card_copy_of_authorized_signatory[]': 'Aadhar Card is required', cml_copy: 'CML Copy is required', cancelled_cheque: 'Cancelled Cheque is required', - passport_photo_signed_authorized_signatories_or_directors: 'Passport is required' + passport_photo_signed_authorized_signatories_or_directors: 'Passport is required', + certificate_of_registration:'Certificate of Registration is required', + list_of_authorised_signatories:'Latest Income Tax Return is required', + 'passport_photo_signed_authorized_signatories_or_directors[]':'Passport size is required' + }, submitHandler: function(form) { var formData = new FormData(form); diff --git a/resources/views/Frontend/Pages/profile/partnership.blade.php b/resources/views/Frontend/Pages/profile/partnership.blade.php index 0e3f5bf..50aec75 100644 --- a/resources/views/Frontend/Pages/profile/partnership.blade.php +++ b/resources/views/Frontend/Pages/profile/partnership.blade.php @@ -116,7 +116,7 @@ accept="image/jpeg,image/png,image/jpg,application/pdf">
- +
- + @@ -243,12 +243,14 @@ true_copy_of_partnership_deed: 'required', registration_certificate: 'required', pan_card: 'required', + list_of_partners_and_authorised_signatories:'required', proof_of_address_firm: 'required', 'pan_card_copy_of_authorized_signatory[]': 'required', 'aadhar_card_copy_of_authorized_signatory[]': 'required', pan_card_copy_of_authorized_signatory: 'required', 'passport_photo_authorized_signatories_partners[]': 'required', cancelled_cheque: 'required', + copy_of_cml:'required' }, messages: { name: 'Name is required',