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-05-09 12:58:13 +05:30
parent 4a5728be42
commit d85bf5b842
21 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Admin/ManageSubAdminController.php
View File

@@ -144,6 +144,7 @@ class ManageSubAdminController extends Controller
'email' => 'required|unique:users,email,' . $id . '',
], [
'email.unique' => 'Email is not unique',
'mobile_number.unique' => 'Mobile Number is not unique',
'name.required' => 'Name is required',
'email.required' => 'Email is required'
]);

1
app/Http/Controllers/Admin/OverviewController.php
View File

@@ -127,6 +127,7 @@ class OverviewController extends Controller
}
$backId = $id;
$backTable = $table;
// dd($backTable);
return view('Admin.Pages.pre_owned_investment.interested-buyers', compact('interestedBuyers', 'data', 'backId', 'backTable'));
}

BIN
public/excel-template/FractionalRealEstateTemplate.xlsx
View File

Binary file not shown.

BIN
public/excel-template/FundForDistressedAssetTemplate.xlsx
View File

Binary file not shown.

BIN
public/excel-template/HedgeFundsTemplate.xlsx
View File

Binary file not shown.

BIN
public/excel-template/IndianCommercialRealEstateTemplate.xlsx
View File

Binary file not shown.

BIN
public/excel-template/IndianResidentialRealEstateTemplate.xlsx
View File

Binary file not shown.

BIN
public/excel-template/InternationalCommercialRealEstateTemplate.xlsx
View File

Binary file not shown.

BIN
public/excel-template/InternationalHedgeFundTemplate.xlsx
View File

Binary file not shown.

BIN
public/excel-template/InternationalIndustrialRealEstateTemplate.xlsx
View File

Binary file not shown.

BIN
public/excel-template/InternationalResidentialRealEstateTemplate.xlsx
View File

Binary file not shown.

BIN
public/uploads/blog/images/1715152944.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 MiB

BIN
public/uploads/blog/images/1715160715.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 MiB

BIN
public/uploads/blog/images/1715160810.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 196 KiB

2
resources/views/Admin/Pages/manage_cms/manage_blog/add_new_blog.blade.php
View File

@@ -45,7 +45,7 @@
<img id="preview" src="#" alt="your image" class="mt-3 " style="display:none;width:20%;"/>
</div>
<div class="col-md-6 flex-column d-flex mt-4">
<label class="fs-6 fw-semibold form-label mt-3">
<label class="fs-6 fw-semibold form-label mt-3">web
<span class="required">Description :</span>
</label>

20
resources/views/Admin/Pages/manage_cms/manage_blog/edit_blog.blade.php
View File

@@ -40,10 +40,9 @@
<span>Image :</span>
</label>
<div id="preview_image" class="image-input image-input-empty w-100 h-100"
data-kt-image-input="true"
style="background-image: url('{{ asset('public/' . $blog->blog_image) }}');background-position:center;">
<input type="file" name="blog_image"
class="form-control form-control-solid" accept="image/*" />
style="background-position:center;">
<input type="file" name="blog_image" class="form-control form-control-solid" accept="image/*" onchange="previewImage(event)" />
<img id="image_preview" src="{{ $blog->blog_image }}" alt="Preview Image" style="width: 20%; height: 100%; object-fit: cover;">
</div>
</div>
<div class="col-md-6 flex-column d-flex mt-4">
@@ -71,6 +70,19 @@
@endsection
@section('scripts')
<script src="https://cdn.ckeditor.com/ckeditor5/39.0.1/classic/ckeditor.js"></script>
<script>
function previewImage(event) {
var input = event.target;
var reader = new FileReader();
reader.onload = function () {
var preview = document.getElementById('image_preview');
preview.src = reader.result;
}
reader.readAsDataURL(input.files[0]);
}
</script>
<script>
$("#blog_date").flatpickr();
$(document).ready(function() {

10
resources/views/Admin/Pages/manage_sub_admin/forgot-password.blade.php
View File

@@ -52,7 +52,7 @@
<span class="indicator-label">Sign In</span>
</a>--}}
<button type="submit" class="btn btn-primary">
<span class="indicator-label">Forgot</span>
<span class="indicator-label" id="forgot">Forgot</span>
</button>
</div>
<div class="alert d-none" role="alert" id="result">
@@ -105,8 +105,8 @@
},
submitHandler: function (form) {
var formData = new FormData(form);
// $("#save_btn").text("Please wait...");
// $("#save_btn").attr("disabled", true);
$("#forgot").text("Please wait...");
$("#forgot").attr("disabled", true);
$.ajax({
url: "{{route('admin.check-email')}}",
type: "POST",
@@ -121,10 +121,14 @@
$('#message').html(result.message);
setTimeout(function(){
$('#result').addClass('d-none');
$("#forgot").text("Forgot");
$("#forgot").attr("disabled", true);
},3000);
}
else{
$('#result').removeClass('d-none alert-success');
$("#forgot").text("Forgot");
$("#forgot").attr("disabled", true);
$('#result').addClass('alert-warning');
$('#message').html(result.message);
setTimeout(function(){

6
resources/views/Admin/Pages/pre_owned_investment/interested-buyers.blade.php
View File

@@ -135,7 +135,8 @@
<div class="col-md-6 fv-row mb-7">
<label class=" fs-6 fw-semibold mb-2">Email</label>
<input id="view-email" class="form-control form-control-solid" readonly>
</div>
</div>
@if($backTable == "marketplace_aif_sellers")
<div class="col-md-6 fv-row">
<label class=" fs-6 fw-semibold mb-2">No. Of Units Wish To Buy</label>
<input id="view-units_to_buy" class="form-control form-control-solid" readonly>
@@ -144,6 +145,9 @@
<label class=" fs-6 fw-semibold mb-2">Offer Price Per Unit</label>
<input id="view-offer_price_per_unit" class="form-control form-control-solid" readonly />
</div>
@endif
<div class="col-md-6 fv-row">
<label class=" fs-6 fw-semibold mb-2">Total Purchase Value</label>
<input id="view-total_purchase_value" class="form-control form-control-solid" readonly />

24
resources/views/Admin/add-sub-admin.blade.php
View File

@@ -70,9 +70,9 @@
<label class="required fw-semibold fs-6 mb-2">Mobile Number</label>
<!--end::Label-->
<!--begin::Input-->
<input type="tel" min="10" max="10" name="mobile_number"
<input type="tel" name="mobile_number"
class="form-control form-control-solid mb-3 mb-lg-0"
placeholder="Please enter mobile number" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/(\..*)\./g, '$1');"/>
placeholder="Please enter mobile number" maxlength="10"/>
<!--end::Input-->
</div>
<div class="fv-row mb-7">
@@ -1314,6 +1314,19 @@
//check all access if admin and uncheck all access if sub-admin
$(document).ready(function() {
$.validator.addMethod(
"StrongPassword",
function (value) {
// return /(?=^.{8,}$)((?=.*\d)|(?=.*\W+))(?![.\n])(?=.*[A-Z])(?=.*[a-z]).*$/.test(
// value
// );
return /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/.test(
value
);
},
// "Password must contain 8 chars(UpperCase,LowerCase,Number,SpecialChars)"
"Password must contain 8 characters at least 1 uppercase letter and symbol and a number"
);
$('.role_type').click(function() {
if ($(this).val() == true) {
checkCheckbox('input:checkbox');
@@ -1336,9 +1349,13 @@
},
mobile_number: {
required: true,
digits: true, // Ensure the value consists of digits only
minlength: 10, // Require a minimum length of 10 digits
maxlength: 10,
},
password: {
required: true,
StrongPassword: true,
},
role_type: {
required: true,
@@ -1353,6 +1370,9 @@
},
mobile_number: {
required: 'This field is required',
digits: 'Please enter only digits',
minlength: 'Please enter exactly 10 digits',
maxlength: 'Please enter exactly 10 digits',
},
password: {
required: 'This field is required',

9
resources/views/Admin/login/sign-in.blade.php
View File

@@ -28,7 +28,7 @@
</div>
<div class="d-grid mt-15 mb-10 text-center">
<button type="submit" class="btn btn-primary">
<span class="indicator-label">Sign In</span>
<span class="indicator-label" id="save_btn">Sign In</span>
</button>
</div>
<div class="alert d-none" role="alert" id="result">
@@ -76,8 +76,9 @@
},
submitHandler: function(form) {
var formData = new FormData(form);
// $("#save_btn").text("Please wait...");
// $("#save_btn").attr("disabled", true);
$("#save_btn").text("Please wait...");
$("#save_btn").attr("disabled", true);
// return 0;
$.ajax({
// url: "/admin/sign-in",
url: "{{ route('admin.signIn') }}",
@@ -104,6 +105,7 @@
$('#result').removeClass('d-none');
$('#result').addClass('alert-warning');
$('#message').html(result.message);
$("#save_btn").attr("disabled", false);
setTimeout(function() {
$('#result').addClass('d-none').html();
$('#result').removeClass('alert-warning');
@@ -111,6 +113,7 @@
}
if (result.status == 401) {
// toastr.warning(result.message);
$("#save_btn").attr("disabled", false);
$('#result').removeClass('d-none');
$('#result').addClass('alert-warning');
$('#message').html(result.message);

28
resources/views/Frontend/Pages/profile/investor-profile-edit.blade.php
View File

@@ -288,7 +288,7 @@
},
},
messages: {
newEmail: 'Please enter your email',
newEmail: 'Please enter valid email address',
},
submitHandler: function(form) {
var formData = new FormData(form);
@@ -366,19 +366,14 @@
ignore: [],
debug: false,
rules: {
// newContact_number: {
// email: true,
// required: true
// },
newContact_number: {
required: true,
digits: true,
minlength: 10,
maxlength: 10,
newcontact_number: {
required: true
},
},
newContact_number: {
newEmail: 'Please enter contact number',
messages: {
newcontact_number: {
required: 'This field is required'
}
},
submitHandler: function(form) {
var formData = new FormData(form);
@@ -395,13 +390,7 @@
$('#contactNumberModal').modal('hide');
$('#newcontact_number').val('');
$('#mobileOtpModal').modal('show');
// setTimeout(() => {
// location.replace("{{ route('investor-profile') }}");
// }, 1000);
}
if (result.status == 400) {
// $('#submit-btn').removeClass('d-none');
// $('#loaderBtn').addClass('d-none');
} else if (result.status == 400) {
toastr.warning(result.message);
}
},
@@ -409,6 +398,7 @@
},
});
// verify otp for mobile number
$('#enter_otp_for_contact_number').validate({
ignore: [],