diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php index 77fc8fb..224ea2a 100644 --- a/app/Http/Controllers/Admin/DashboardController.php +++ b/app/Http/Controllers/Admin/DashboardController.php @@ -198,6 +198,7 @@ class DashboardController extends Controller // dd(auth()->user()->id); $tasks = LeadTasksMeeting::where('owner', auth()->user()->id)->orderBy('created_at', 'desc')->tasks()->get(); + // $tasks = []; // dd($tasks, auth()->user()->id); $meetings = LeadTasksMeeting::where('host', (string)auth()->user()->id)->orderBy('created_at', 'desc')->meetings()->get(); // dd($meetings); diff --git a/app/Http/Controllers/Admin/ManageSellerProfileController.php b/app/Http/Controllers/Admin/ManageSellerProfileController.php index 138c0fa..6540125 100644 --- a/app/Http/Controllers/Admin/ManageSellerProfileController.php +++ b/app/Http/Controllers/Admin/ManageSellerProfileController.php @@ -24,7 +24,7 @@ class ManageSellerProfileController extends Controller ->withCount(['aif', 'fre', 'op']) ->latest() ->get(); - // dd($sellerProfile->toArray()); + dd($sellerProfile->toArray()); return view('Admin.Pages.pre_owned_investment.manage_seller_profile', compact('sellerProfile')); } diff --git a/app/Http/Controllers/Frontend/HomeController.php b/app/Http/Controllers/Frontend/HomeController.php index aad7a54..9a20f15 100644 --- a/app/Http/Controllers/Frontend/HomeController.php +++ b/app/Http/Controllers/Frontend/HomeController.php @@ -165,7 +165,8 @@ class HomeController extends Controller 'first_name' => auth()->guard('users')->user()->name, 'email' => auth()->guard('users')->user()->email, 'mobile' => auth()->guard('users')->user()->contact_number, - 'lead_status' => 'New' + 'lead_status' => 'New', + 'lead_source' => 'Website Visitor', ]); if ($addLead) { diff --git a/public/assets/css/style.bundle.css b/public/assets/css/style.bundle.css index 3620f3f..4a41ab9 100644 --- a/public/assets/css/style.bundle.css +++ b/public/assets/css/style.bundle.css @@ -38129,7 +38129,7 @@ html:not([data-theme="dark"]) .theme-light-bg-body { .btn.btn-active-color-primary:hover:not(.btn-active) i, .show > .btn.btn-active-color-primary .svg-icon, .show > .btn.btn-active-color-primary i { - color: #FFF; + color: #fff; } .btn-check:active + .btn.btn-active-color-primary.dropdown-toggle:after, @@ -44322,15 +44322,29 @@ code:not([class*="language-"]) { } .symbol.symbol-45px > img { - width: 45px; - height: 45px; + width: 40px; + height: 40px; } .symbol.symbol-45px .symbol-label { width: 45px; height: 45px; } +.chat-box .card .card-body { + padding: 10px; +} +.user_Detail { + padding-right: 0 !important; +} + +.user_Detail span#user_188 { + font-size: 15px; +} + +.user_Detail .fw-semibold.text-muted { + font-size: 12px; +} .symbol.symbol-45px.symbol-fixed .symbol-label { width: 45px; height: 45px; @@ -57874,22 +57888,31 @@ html:not([data-theme="dark"]) { justify-content: flex-start !important; margin: 0 auto 0 0; } -.table.gy-5 td, .table.gy-5 th { - padding: 1.25rem !important; +.table.gy-5 td, +.table.gy-5 th { + padding: 1.25rem !important; } -.tabdiv input, .tabdiv select { - border: 1px solid #e0dddd; - padding: 10px !important; - height: 40px; - border-radius: 5px; - width: 50%; +.tabdiv input, +.tabdiv select { + border: 1px solid #e0dddd; + padding: 10px !important; + height: 40px; + border-radius: 5px; + width: 50%; +} +.tabdiv input[type="checkbox"] { + border: 1px solid #e0dddd !important; + display: flex; + width: 20px; + height: 20px; + justify-content: flex-start !important; + margin: 0 auto 0 0; } -.tabdiv input[type="checkbox"] {border: 1px solid #e0dddd !important;display: flex;width: 20px;height: 20px;justify-content: flex-start !important;margin: 0 auto 0 0;} .card { - padding: 20px; + padding: 20px; } .index-box .card { - min-height: 230px !important; + min-height: 170px !important; } #statement_reports_container li { margin-bottom: 5px; @@ -57909,3 +57932,10 @@ span.remove-icon { padding: 0; margin-top: 5px; } +.index-box .card-body { + min-height: 30px !important; + padding: 5px !important; +} +tr.odd td.dataTables_empty:last-child, tr.even td.dataTables_empty:last-child { + display: revert; +} \ No newline at end of file diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 21b0d5f..ec26d4a 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -922,6 +922,7 @@ label#editor-error { .btn.btn-light-primary { color: #fff; background-color: #c18948; + height: fit-content; } .btn.btn-light-primary .svg-icon, .btn.btn-light-primary i { @@ -1376,5 +1377,15 @@ button.btn.btn-light-primary.me-3 { padding: 20px; } .index-box .card { - min-height: 230px !important; + min-height: 170px !important; } +.index-box .card-body { + min-height: 30px !important; + padding: 5px !important; +} +.top_header { + align-items: end; +} +tr.odd td.dataTables_empty:last-child, tr.even td.dataTables_empty:last-child { + display: revert; +} \ No newline at end of file diff --git a/resources/views/Admin/general-dashboard.blade.php b/resources/views/Admin/general-dashboard.blade.php index e8302da..1edc1f0 100644 --- a/resources/views/Admin/general-dashboard.blade.php +++ b/resources/views/Admin/general-dashboard.blade.php @@ -1,282 +1,318 @@ @extends('Admin.layouts.master') @section('title', 'General Dashboard') @section('style') - - + .dt-buttons { + display: none; + } + @endsection @section('content') -
-
-
-
-
- -
-
-
+
+
+
+
+
+ +
+
+
+
+ {{ $investingUserCount }} +
+
+ + + + + + +
+
- {{$investingUserCount}} -
-
- - - - - - + Total Investors
+  
-
- Total Investors
 
-
-
-
-
- -
-
-
+ +
+
+ +
+
+
+
+ {{ $userCount }} +
+
+ + + + + + +
+
- {{$userCount}} -
-
- - - - - - + Total Registered Users +
 
-
- Total Registered Users
 
-
-
-
-
- -
-
-
+ +
+
+ +
+
+
+
+ {{ $companyCount }} +
+
+ + + + + + +
+
- {{$companyCount}} -
-
- - - - - - + Total Manufactures + (Investment Companies)
-
- Total Manufactures (Investment Companies) -
-
-
-
- -
- -
-
-
-

Commission earned

-
-
-
- ₹ 0.0 - Gross Earn -
-
-
-
- ₹ 0.0 - Net Received -
-
-
+
+
+
+

Commission earned

+
- From - + ₹ 0.0 + Gross Earn
- To - + ₹ 0.0 + Net Received
-
- +
+
+
+ From + +
+
+
+
+ To + +
+
+
+ +
-
-
-
- +
+
+ +
-
-
-
-
-

₹ 0.0

+
+
+
+

₹ 0.0

+
+

Total Investment

-

Total Investment

-
@endsection @section('scripts') - - - + + - + + today = yyyy + '-' + mm + '-' + dd; -@endsection \ No newline at end of file + // Set max attribute for both inputs to prevent selecting future dates + document.getElementById("from-date").setAttribute("max", today); + document.getElementById("to-date").setAttribute("max", today); + + +@endsection diff --git a/resources/views/Frontend/Pages/profile/dashboard.blade.php b/resources/views/Frontend/Pages/profile/dashboard.blade.php index 01f18b7..cd12c0b 100644 --- a/resources/views/Frontend/Pages/profile/dashboard.blade.php +++ b/resources/views/Frontend/Pages/profile/dashboard.blade.php @@ -385,7 +385,7 @@ - + @endforeach