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

Merge branch 'main' of https://github.com/Ritikeshyadav/my-freeu into RitikeshFreeu

Browse Source
This commit is contained in:
Ritikesh yadav
2024-05-08 19:07:32 +05:30
parent 79bcbc7ba9 3897593f80
commit 23fc3faa3b
7 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,7 +266,7 @@ class OverviewController extends Controller
public function listingTransfer()
{
$check = checkSidebarAccess('investment-listing-transfer');
$check = checkSidebarAccess('investment-`listing-transfer`');
if (!$check) {
abort(404);
}

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

@@ -4613,6 +4613,9 @@ button.swal2-confirm.btn.btn-primary.popup-button {
#exampleModalCenter .modal-content a.yellow-btn {
height: 42px;
}
#exampleModalCenter button.btn.btn-secondary {
background-color: #1b243d;
}
/*======responsive=====*/
@@ -4682,6 +4685,9 @@ button.swal2-confirm.btn.btn-primary.popup-button {
.investor-profile .invest-view-form .form-sec {
width: 500px;
}
.menubar .dropdown-menu{
left: -90px !important;
}
}
@media (max-width: 1024px) {
.notification-drop .item-noti .notification {
@@ -4960,6 +4966,20 @@ button.swal2-confirm.btn.btn-primary.popup-button {
height: auto;
padding: 3rem 0;
}
.menubar .dropdown-menu {
left: -10px !important;
}
.notification-drop .item-noti img {
filter: inherit;
height: 29px;
width: 28px;
}
.header-menu .page li .item-noti a {
padding-top: 0;
}
.notification-drop .item-noti .notification {
left: 0;
}
}
@media (max-width: 768px) {

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

@@ -1283,3 +1283,13 @@ nav {
height: 66%;
overflow: scroll;
}
#manage_commission_view .modal-dialog .btn.btn-active-color-primary:hover:not(.btn-active) {
background-color: inherit !important;
}
#update_user_role_form button {
background-color: #c18948;
border: none;
color: #fff;
padding: 8px 20px;
border-radius: 5px;
}

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

@@ -2,7 +2,7 @@
@section('style')
<style>
.active {
color: blue !important
color: #c18948 !important
}
</style>
@endsection

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

@@ -62,7 +62,7 @@
</div>
</div>
</div>
<div class="card-body py-4">
<div class="card-body py-4 table-responsive">
<table class="table align-middle table-row-dashed fs-6 gy-5" id="transactions">
<thead>
<tr class="text-start text-muted fw-bold fs-7 text-uppercase gs-0">
@@ -71,9 +71,9 @@
<th class="min-w-125px w-125px align-top">Contact Number</th>
<th class="min-w-125px w-200px align-top">No. Of Units Wish To Buy</th>
<th class="min-w-125px w-200px align-top">Offer Price Per Unit</th>
<th class="min-w-50px w-125px align-top">Total Purchase Value</th>
<th class="min-w-125px w-125px align-top">Total Purchase Value</th>
<th class="min-w-50px w-125px align-top ">Current Status</th>
<th class="min-w-50px w-125px align-top ">Action</th>
<th class="min-w-100px w-100px align-top text-center">Action</th>
</tr>
</thead>
<tbody class="text-gray-600 fw-semibold">

2
resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php
View File

@@ -45,7 +45,7 @@
<div class="dataTable_area my-5 mb-0">
<div class="card">
<div class="card-body py-4">
<div class="card-body py-4 table-responsive">
<ul class="nav nav-tabs nav-line-tabs nav-line-tabs-2x mb-5 fs-6">
<li class="nav-item">
<a class="nav-link active text-gray-700 fw-bold" data-bs-toggle="tab"

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

@@ -234,7 +234,7 @@
@csrf
<input type="hidden" name="buyer_id" id="edit-id">
<div class="row">
<div class="col-md-6 fv-row mb-7">
<div class="col-md-6 fv-row mb-4">
<label class=" fs-6 fw-semibold mb-2">Buyer Name</label>
<input id="edit-name" class="form-control form-control-solid" readonly>
</div>
@@ -242,7 +242,7 @@
<label class=" fs-6 fw-semibold mb-2">Seller Name</label>
<input id="edit-seller" class="form-control form-control-solid" readonly>
</div>
<div class="col-md-6 fv-row mb-7">
<div class="col-md-6 fv-row mb-4">
<label class=" fs-6 fw-semibold mb-2">Product Name</label>
<input id="edit-productname" class="form-control form-control-solid" readonly>
</div>
@@ -250,7 +250,7 @@
<label class=" fs-6 fw-semibold mb-2"><span class="required">Final Units Sold</span></label>
<input id="edit-final_units_sold" name="final_units_sold" class="form-control form-control-solid">
</div>
<div class="col-md-6 fv-row">
<div class="col-md-6 fv-row mb-4">
<label class=" fs-6 fw-semibold mb-2"><span class="required">Sale Value</span></label>
<input id="edit-final_sale_value" name="final_sale_value" class="form-control form-control-solid" />
</div>
@@ -258,7 +258,7 @@
<label class=" fs-6 fw-semibold mb-2"><span class="required">Commission Earned</span></label>
<input id="edit-commission_earned" name="commission_earned" class="form-control form-control-solid" />
</div>
<div class="col-md-6 fv-row">
<div class="col-md-6 fv-row mb-4">
<label class=" fs-6 fw-semibold mb-2"><span class="required">Date Of Sale</span></label>
<input type="date" id="edit_date_of_sale" value="12-12-2024" name="date_of_sale" class="form-control form-control-solid" />
</div>
@@ -271,14 +271,14 @@
@endforeach
</select>
</div>
<div class="col-md-6 fv-row">
<div class="col-md-6 fv-row mb-4">
<label class=" fs-6 fw-semibold mb-2"><span class="required">Final Purchase Value</span></label>
<input id="edit-final_purchase_value" name="final_purchase_value" class="form-control form-control-solid" />
</div>
</div>
<div class="submit_btn d-flex justify-content-center mt-15">
<a href="javascript:void(0)" class="btn btn-light-dark" data-bs-dismiss="modal">Close</a>
<button type="submit" class="btn btn-primary btn-hover-rise">Submit</button>
<a href="javascript:void(0)" class="btn btn-light-dark mx-2" data-bs-dismiss="modal">Close</a>
<button type="submit" class="btn btn-primary btn-hover-rise mx-2">Submit</button>
</div>
</form>
</div>