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

fixing bugs

Browse Source
This commit is contained in:
YasinShaikh123
2024-05-03 19:13:20 +05:30
parent 873af30c40
commit 1addb1bc97
13 changed files with 98 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4597,6 +4597,10 @@ span.start {
margin: 0;
font-weight: 600;
}
button.swal2-confirm.btn.btn-primary.popup-button {
background-color: #c18948 !important;
border: none;
}
/*======responsive=====*/

4
public/assets/css/style.bundle.css
View File

@@ -34490,7 +34490,7 @@ html:not([data-theme=dark]) .theme-light-bg-body {
color: var(--kt-secondary-inverse)
}
.btn-check:active+.btn.btn-secondary,
/* .btn-check:active+.btn.btn-secondary,
.btn-check:checked+.btn.btn-secondary,
.btn.btn-secondary.active,
.btn.btn-secondary.show,
@@ -34501,7 +34501,7 @@ html:not([data-theme=dark]) .theme-light-bg-body {
color: var(--kt-secondary-inverse);
border-color: var(--kt-secondary-active);
background-color: var(--kt-secondary-active) !important
}
} */
.btn-check:active+.btn.btn-secondary .svg-icon,
.btn-check:active+.btn.btn-secondary i,

20
public/assets/css/style.css
View File

@@ -329,7 +329,7 @@ input.edit_label_title {
}
.add_cat button {
margin-top: 20px;
background-color: var(--kt-primary) !important;
/* background-color: var(--kt-primary) !important; */
}
.img_upload input[type="file"].custom {
border: 0;
@@ -1265,3 +1265,21 @@ nav {
position: relative;
right: 16px;
}
.chat-box {
height: 79vh;
overflow: hidden;
border: 1px solid #ccccccbd;
margin: 30px;
border-radius: 9px;
}
.chat-box div#kt_drawer_chat_messenger_footer {
position: absolute;
bottom: 0;
width: 100%;
background-color: #dfdfdf;
color: #000;
}
.chat-box .chat-msgs .card-body {
height: 66%;
overflow: scroll;
}

12
public/assets/js/FrontendJs/contact_us.js
View File

@@ -27,9 +27,9 @@ $(document).ready(function () {
messages: {
name: "Please enter your name",
mobile_number: {
required: "Please enter your phone number",
minlength: "Phone number must be 10 digits",
maxlength: "Phone number must be 10 digits",
required: "Please enter your mobile number",
minlength: "mobile number must be 10 digits",
maxlength: "mobile number must be 10 digits",
},
email: "Please enter a valid email address",
subject: "Please enter the subject",
@@ -94,9 +94,9 @@ $(document).ready(function () {
name: "Please enter your name",
representative_name: "Please enter your representative name",
mobile_number: {
required: "Please enter your phone number",
minlength: "Phone number must be 10 digits",
maxlength: "Phone number must be 10 digits",
required: "Please enter your mobile number",
minlength: "mobile number must be 10 digits",
maxlength: "mobile number must be 10 digits",
},
email: "Please enter a valid email address",
subject: "Please enter the subject",

22
resources/views/Admin/Pages/manage_chat/manage_chat.blade.php
View File

@@ -11,9 +11,10 @@
<div class="app-main flex-column flex-row-fluid" id="kt_app_main">
<div class="d-flex flex-column flex-column-fluid">
<div id="kt_app_content_container" class="app-container container-xxl">
<div class="row max-w-100">
<div class="col-md-3 p-0 users_list" style="height:45rem;overflow:auto">
<div class="card">
<div class="chat-box">
<div class="row max-w-100 h-100">
<div class="col-md-3 p-0 users_list h-100" style="height:45rem;overflow:auto">
<div class="card h-100">
<div class="card-header pt-5" id="kt_chat_contacts_header">
<form class="w-100 position-relative" autocomplete="off">
<span
@@ -34,12 +35,12 @@
</form>
</div>
<div class="card-body pt-5" id="kt_chat_contacts_body">
<div class="scroll-y me-n5 pe-5 h-200px h-lg-auto user_Detail" data-kt-scroll="true"
<div class="scroll-y me-n5 pe-5 h-lg-auto user_Detail" data-kt-scroll="true"
data-kt-scroll-activate="{default: false, lg: true}" data-kt-scroll-max-height="auto"
data-kt-scroll-dependencies="#kt_header, #kt_toolbar, #kt_footer, #kt_chat_contacts_header"
data-kt-scroll-wrappers="#kt_content, #kt_chat_contacts_body"
data-kt-scroll-offset="5px">
{{-- @foreach ($users as $user)
{{-- @foreach ($use overflow: scroll;overflow: scroll;rs as $user)
<div class="d-flex flex-stack py-4">
<div class="d-flex align-items-center">
<div class="symbol symbol-45px symbol-circle">
@@ -66,24 +67,25 @@
</div>
</div>
</div>
<div class="col-md-6 p-0 chat_screen">
<div class="col-md-6 p-0 chat_screen h-100">
<div class="card w-100 rounded-0 border-0" id="kt_drawer_chat_messenger"
style="height:45rem;overflow:auto">
<div class="chat-msgs">
style="overflow:auto;background-color: #cccccc1a;position: relative;height: 100%;">
<div class="chat-msgs h-100">
</div>
<div class="card-footer d-flex align-items-center me-2 p-0 d-none"
id="kt_drawer_chat_messenger_footer">
<textarea class="form-control form-control-flush resize-none" rows="1" data-kt-element="input" name="message"
id="message" placeholder="Type a message"></textarea>
id="message" placeholder="Type a message" style="background-color: #dfdfdf;"></textarea>
<input type="hidden" name="user_id" id="user_id">
<div class="btn" data-kt-element="send"><i class="fa-solid fa-paper-plane" title="send"
onclick="sendMsg()"></i></div>
</div>
</div>
</div>
<div class="col-md-3 p-0 active_user_details show-user">
<div class="col-md-3 p-0 active_user_details show-user" style="background-color: #fff;height: 100%;overflow: scroll;">
</div>
</div>
</div>
</div>
</div>
</div>

17
resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php
View File

@@ -60,24 +60,24 @@
<a href="#">AIF Category I<i class="fas fa-angle-right"></i></a>
<ul class="sub_menu">
<li><a href="{{ route('manage.venture-capital-fund.create') }}"
class="dropdown-item">Venture Capital Fund</a></li>
class="dropdown-item">Venture Capital Funds</a></li>
<li><a href="{{ route('manage.infrastructure-fund.create') }}"
class="dropdown-item">Infrastructure Fund</a></li>
class="dropdown-item">Infrastructure Funds</a></li>
<li><a href="{{ route('manage.angel-fund.create') }}"
class="dropdown-item">Angel Fund</a></li>
class="dropdown-item">Angel Funds</a></li>
</ul>
</li>
<li class="has_dropdown">
<a href="#">AIF Category II<i class="fas fa-angle-right"></i></a>
<ul class="sub_menu">
<li><a href="{{ route('manage.private-equity-fund.create') }}"
class="dropdown-item">Private Equity Fund</a></li>
class="dropdown-item">Private Equity Funds</a></li>
<li><a href="{{ route('manage.private-credit-fund.create') }}"
class="dropdown-item">Private Credit Fund</a></li>
class="dropdown-item">Private Credit Funds</a></li>
<li><a href="{{ route('manage.fund-for-distressed-asset.create') }}"
class="dropdown-item">Fund for Distressed <br> Asset</a></li>
class="dropdown-item">Distressed Asset Funds</a></li>
<li><a href="{{ route('manage.private-real-estate-fund.create') }}"
class="dropdown-item">Private Real Estate <br> Fund</a></li>
class="dropdown-item">Private Real Estate <br> Funds</a></li>
</ul>
</li>
<li class="has_dropdown">
@@ -86,8 +86,7 @@
<li><a href="{{ route('manage.hedge-fund.create') }}"
class="dropdown-item">Hedge Funds</a></li>
<li><a href="{{ route('manage.pipe-fund.create') }}"
class="dropdown-item">Private Investment in <br> Public
Equity Fund<br> (PIPE)</a></li>
class="dropdown-item">PIPE Funds</a></li>
<li><a href="{{ route('manage.long-only-equity-fund.create') }}"
class="dropdown-item">Long Only Equity<br> Fund</a></li>
</ul>

28
resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
View File

@@ -542,7 +542,7 @@
</label>
<select class="form-select" name="lead_status"
<!-- <select class="form-select" name="lead_status"
data-placeholder="Select a Lead Status">
<option value="New"
{{ $lead->lead_status == 'New' ? 'selected' : '' }}>New
@@ -560,6 +560,24 @@
<option value="Lost"
{{ $lead->lead_status == 'Lost' ? 'selected' : '' }}>Lost
</option>
</select> -->
<select class="form-select form-select-solid lead_status select2-hidden-accessible" data-control="select2" data-hide-search="true" data-placeholder="Select a Lead Status" name="target_assign" tabindex="-1" aria-hidden="true" data-kt-initialized="1">
<option value="New"
{{ $lead->lead_status == 'New' ? 'selected' : '' }}>New
</option>
<option value="Ongoing"
{{ $lead->lead_status == 'Ongoing' ? 'selected' : '' }}>
Ongoing
</option>
<option value="Completed"
{{ $lead->lead_status == 'Completed' ? 'selected' : '' }}>
Completed</option>
<option value="Old"
{{ $lead->lead_status == 'Old' ? 'selected' : '' }}>Old
</option>
<option value="Lost"
{{ $lead->lead_status == 'Lost' ? 'selected' : '' }}>Lost
</option>
</select>
</div>
{{-- <div class="form-box mb-5">
@@ -937,7 +955,7 @@
Filesss</a> --}}
<a type="button" class="btn btn-primary text-light w-25"
href="{{ route('lead-attachment-download', ['path' => $path]) }}">Download
Filesss</a>
File</a>
<br>By {{ $data->admin->name }} At
{{ $data->created_at->format('H:i:s d/m/y') }}
</li>
@@ -3552,6 +3570,12 @@
// }));
$(document).ready(function() {
$('.lead_status').select2();
$('.lead_source').select2();
$('.lead_owner').select2();
});
$("#add-notes").validate({
ignore: [],

2
resources/views/Admin/Pages/manage_leads/view-lead.blade.php
View File

@@ -603,7 +603,7 @@
</div>
</div>
<h4 class="fw-bold fs-2 mb-10">Product Information</h4>
<div class="col-md-6">
<div class="col-md-12 mb-5">
<div class="lead-info">
<table>
<tbody>

2
resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php
View File

@@ -22,7 +22,7 @@
<a class="get-transaction-detail" title="View detail" data-name="{{$data->name}}" data-city="{{$data->city}}" data-country="{{$data->country}}" data-email="{{$data->email_id}}" data-contact="{{$data->contact_number}}" data-seller="{{$data->seller->name}}" data-productname="{{$data->name_of_the_aif_fund ?? $data->property_name ?? $data->security_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}">
<i class="fa-regular fa-eye"></i>
</a>
<a class="edit-transaction-detail" title="Edit detail" data-id="{{$data->id}}" data-name="{{$data->name}}" data-city="{{$data->city}}" data-country="{{$data->country}}" data-email="{{$data->email_id}}" data-contact="{{$data->contact_number}}" data-seller="{{$data->seller->name}}" data-productname="{{$data->name_of_the_aif_fund ?? $data->property_name ?? $data->security_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}" data-commission_earned="{{$data->commission_earned}}" data-complete_units_sold="{{$data->complete_units_sold}}" data-complete_sale_value="{{$data->complete_sale_value}}" data-date_of_sale="{{$data->date_of_sale}}" data-platform="{{$data->platform}}" data-final_purchase_value="{{$data->final_purchase_value}}">
<a class="edit-transaction-detail mx-5" title="Edit detail" data-id="{{$data->id}}" data-name="{{$data->name}}" data-city="{{$data->city}}" data-country="{{$data->country}}" data-email="{{$data->email_id}}" data-contact="{{$data->contact_number}}" data-seller="{{$data->seller->name}}" data-productname="{{$data->name_of_the_aif_fund ?? $data->property_name ?? $data->security_name}}" data-offer_price_per_unit="{{$offerPricePerUnit}}" data-total_purchase_value="{{$totalPurchaseValue}}" data-units_to_buy="{{$data->no_of_units_you_wish_to_buy}}" data-commission_earned="{{$data->commission_earned}}" data-complete_units_sold="{{$data->complete_units_sold}}" data-complete_sale_value="{{$data->complete_sale_value}}" data-date_of_sale="{{$data->date_of_sale}}" data-platform="{{$data->platform}}" data-final_purchase_value="{{$data->final_purchase_value}}">
<svg class="svg-inline--fa fa-pen-to-square" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="pen-to-square" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg="">
<path fill="currentColor" d="M471.6 21.7c-21.9-21.9-57.3-21.9-79.2 0L362.3 51.7l97.9 97.9 30.1-30.1c21.9-21.9 21.9-57.3 0-79.2L471.6 21.7zm-299.2 220c-6.1 6.1-10.8 13.6-13.5 21.9l-29.6 88.8c-2.9 8.6-.6 18.1 5.8 24.6s15.9 8.7 24.6 5.8l88.8-29.6c8.2-2.8 15.7-7.4 21.9-13.5L437.7 172.3 339.7 74.3 172.4 241.7zM96 64C43 64 0 107 0 160V416c0 53 43 96 96 96H352c53 0 96-43 96-96V320c0-17.7-14.3-32-32-32s-32 14.3-32 32v96c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32V160c0-17.7 14.3-32 32-32h96c17.7 0 32-14.3 32-32s-14.3-32-32-32H96z"></path>
</svg>

7
resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php
View File

@@ -10,11 +10,14 @@
.dataTables_filter {
display: none;
}
}
.dt-buttons {
display: none;
}
.table tbody td a {
cursor: pointer;
}
</style>
@endsection
@section('content')
@@ -23,7 +26,7 @@
<div id="kt_app_content_container" class="app-container container-xxl">
<div class="row max-w-100 index_table">
<div class="top_header d-flex justify-content-between mt-10">
<p class='fs-2 fw-bold'>Completed Transactions cdc</p>
<p class='fs-2 fw-bold'>Completed Transactions</p>
<div class="table_right_options d-flex">
<button type="button" class="btn btn-light-primary me-3" id="ExportReporttoExcel">
<!--begin::Svg Icon | path: icons/duotune/arrows/arr078.svg-->

16
resources/views/Admin/personal-dashboard.blade.php
View File

@@ -65,11 +65,11 @@
<td>{{$task->status == 1?'Closed':'Open'}}</td>
<td>{{$task->priority}}</td>
<td>{{$task->reminder}}</td>
<td class="text-end d-flex align-items-center justify-content-around notexport">
<td class=" notexport">
<a class="action_icon edit-task-button" data-id="{{$task->id}}" data-subject="{{$task->subject}}" data-due-date="{{$task->due_date}}" data-priority="{{$task->priority}}" data-owner="{{$task->owner}}" data-reminder="{{$task->reminder}}" data-status="{{$task->status}}">
<i class="fa-solid fa-pen-to-square"></i>
</a>
<a class="action_icon delete deleteTasks" data-task-id={{$task->id}}>
<a class="action_icon delete deleteTasks mx-5" data-task-id={{$task->id}}>
<i class="fa-solid fa-trash"></i>
</a>
</td>
@@ -118,7 +118,7 @@
<th class="min-w-50px w-100px align-top ">Priority</th>
<th class="min-w-50px w-100px align-top ">Related To</th>
<th class="min-w-50px w-100px align-top ">Status</th>
<th class="text-center min-w-100px align-top notexport">Actions</th>
<th class="min-w-100px align-top notexport">Actions</th>
</tr>
</thead>
<tbody class="text-gray-600 fw-semibold">
@@ -131,13 +131,13 @@
<td>{{$meeting->priority}}</td>
<td>{{$meeting->related_to}}</td>
<td>{{$meeting->status == 1?'Closed':'Open'}}</td>
<td class="text-end d-flex align-items-center justify-content-around notexport">
<td class="notexport">
<a class="action_icon edit-meeting-button" data-meeting-id="{{$meeting->id}}" data-location="{{$meeting->location}}" data-to="{{$meeting->to}}" data-from="{{$meeting->from}}" data-host="{{$meeting->host}}" data-priority="{{$meeting->priority}}" data-participants="{{$meeting->participants}}" data-status="{{$meeting->status}}" data-related-to="{{$meeting->related_to}}">
<i class="fa-solid fa-pen-to-square"></i>
</a>
<a class="action_icon delete deleteMeetings" data-meeting-id="{{$meeting->id}}">
<a class="action_icon delete deleteMeetings mx-5" data-meeting-id="{{$meeting->id}}">
<i class="fa-solid fa-trash"></i>
</a>
</td>
@@ -187,7 +187,7 @@
<th class="min-w-50px w-75px align-top">Email</th>
<th class="min-w-50px w-100px align-top">Phone</th>
<th class="min-w-50px w-100px align-top ">Lead Source</th>
<th class="text-center min-w-100px align-top notexport">Actions</th>
<th class="min-w-100px align-top notexport">Actions</th>
</tr>
</thead>
<tbody class="text-gray-600 fw-semibold">
@@ -200,13 +200,13 @@
<td>{{$lead->email}}</td>
<td>{{$lead->mobile}}</td>
<td>{{$lead->leadSource == null ? 'No Lead Source Assigned' : $lead->leadSource->name}}</td>
<td class="text-end d-flex align-items-center justify-content-around notexport">
<td class="notexport">
<a href="{{route('edit-lead',$lead->id)}}" class="action_icon return_to_personal_dashboard" data-bs-toggle="tooltip" data-bs-custom-class="tooltip-inverse" data-bs-placement="top" data-kt-initialized="1">
<svg class="svg-inline--fa fa-pen-to-square" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="pen-to-square" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg="">
<path fill="currentColor" d="M471.6 21.7c-21.9-21.9-57.3-21.9-79.2 0L362.3 51.7l97.9 97.9 30.1-30.1c21.9-21.9 21.9-57.3 0-79.2L471.6 21.7zm-299.2 220c-6.1 6.1-10.8 13.6-13.5 21.9l-29.6 88.8c-2.9 8.6-.6 18.1 5.8 24.6s15.9 8.7 24.6 5.8l88.8-29.6c8.2-2.8 15.7-7.4 21.9-13.5L437.7 172.3 339.7 74.3 172.4 241.7zM96 64C43 64 0 107 0 160V416c0 53 43 96 96 96H352c53 0 96-43 96-96V320c0-17.7-14.3-32-32-32s-32 14.3-32 32v96c0 17.7-14.3 32-32 32H96c-17.7 0-32-14.3-32-32V160c0-17.7 14.3-32 32-32h96c17.7 0 32-14.3 32-32s-14.3-32-32-32H96z"></path>
</svg>
</a>
<a class="action_icon delete deleteLead" data-lead-id="{{$lead->id}}">
<a class="action_icon delete deleteLead mx-5" data-lead-id="{{$lead->id}}">
<i class="fa-solid fa-trash"></i>
</a>
</td>

2
resources/views/Frontend/Pages/login.blade.php
View File

@@ -61,7 +61,7 @@
<div class="form-group">
<label>Password</label>
<label>Password</label>
<input name="password" id="password" class="form-control" type="password"
placeholder="Enter your password" />

10
resources/views/Frontend/Pages/sign_in_otp.blade.php
View File

@@ -17,8 +17,8 @@
<div class="login-form-otp">
<h1>Welcome Back</h1>
<h2>Sign in to continue to Jericho Alternatives</h2>
<h3>OTP Login</h3>
<div class="form-group">
<h3 class="text-center">OTP Login</h3>
<div class="form-group text-center">
<label>Please enter the OTP sent to registered mobile number</label>
<div class="otp-field">
@@ -27,12 +27,12 @@
<input name="input_2" id="input_2" class="otp" type="text" maxlength="1" />
<input name="input_3" id="input_3" class="otp" type="text" maxlength="1" />
<input name="input_4" id="input_4" class="otp" type="text" maxlength="1" />
<button type="submit" class="yellow-btn signin">Continue</button>
<button type="submit" class="yellow-btn signin mt-4">Continue</button>
</form>
</div>
</div>
<p>OTP has been sent to your registered mobile number. OTP valid for <span id="countdown-timer">02:00</span> Sec</p>
<p class="regist">Didn't receive any OTP? <a href="#" class="d-none" id="resend_otp">Resend OTP</a></p>
<p class="text-center mb-3">OTP has been sent to your registered mobile number.<br> OTP valid for <span id="countdown-timer">02:00</span> Sec</p>
<p class="regist text-center mb-3">Didn't receive any OTP ? <a href="#" class="d-none" id="resend_otp">Resend OTP</a></p>
</div>
</div>
</div>