From 1addb1bc97e16079fbd2e8a5658f7bfaddef0be5 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Fri, 3 May 2024 19:13:20 +0530 Subject: [PATCH] fixing bugs --- public/assets/css/FrontendCss/style.css | 4 +++ public/assets/css/style.bundle.css | 4 +-- public/assets/css/style.css | 20 ++++++++++++- public/assets/js/FrontendJs/contact_us.js | 12 ++++---- .../Pages/manage_chat/manage_chat.blade.php | 22 ++++++++------- .../manage_freeu_investment.blade.php | 17 ++++++----- .../Pages/manage_leads/edit-lead.blade.php | 28 +++++++++++++++++-- .../Pages/manage_leads/view-lead.blade.php | 2 +- .../partial/transaction-row.blade.php | 2 +- .../transactions.blade.php | 7 +++-- .../views/Admin/personal-dashboard.blade.php | 16 +++++------ .../views/Frontend/Pages/login.blade.php | 2 +- .../Frontend/Pages/sign_in_otp.blade.php | 10 +++---- 13 files changed, 98 insertions(+), 48 deletions(-) diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css index a0aedca..2a91d82 100644 --- a/public/assets/css/FrontendCss/style.css +++ b/public/assets/css/FrontendCss/style.css @@ -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=====*/ diff --git a/public/assets/css/style.bundle.css b/public/assets/css/style.bundle.css index 5f53dbf..37408a0 100644 --- a/public/assets/css/style.bundle.css +++ b/public/assets/css/style.bundle.css @@ -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, diff --git a/public/assets/css/style.css b/public/assets/css/style.css index cd70246..969d18d 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -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; +} diff --git a/public/assets/js/FrontendJs/contact_us.js b/public/assets/js/FrontendJs/contact_us.js index c5070b4..d62757a 100644 --- a/public/assets/js/FrontendJs/contact_us.js +++ b/public/assets/js/FrontendJs/contact_us.js @@ -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", diff --git a/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php b/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php index bf53809..615d3bb 100644 --- a/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php +++ b/resources/views/Admin/Pages/manage_chat/manage_chat.blade.php @@ -11,9 +11,10 @@
-
-
-
+
+
+
+
-
- {{-- @foreach ($users as $user) + {{-- @foreach ($use overflow: scroll;overflow: scroll;rs as $user)
@@ -66,24 +67,25 @@
-
+
-
+ style="overflow:auto;background-color: #cccccc1a;position: relative;height: 100%;"> +
-
+
+
diff --git a/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php index 9f1784d..53999da 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/manage_freeu_investment.blade.php @@ -60,24 +60,24 @@ AIF Category I
  • AIF Category II
  • @@ -86,8 +86,7 @@
  • Hedge Funds
  • Private Investment in
    Public - Equity Fund
    (PIPE)
  • + class="dropdown-item">PIPE Funds
  • Long Only Equity
    Fund
  • 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 32dea80..6f507fb 100644 --- a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php +++ b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php @@ -542,7 +542,7 @@ - --> +
    {{--
    @@ -937,7 +955,7 @@ Filesss --}} Download - Filesss + File
    By {{ $data->admin->name }} At {{ $data->created_at->format('H:i:s d/m/y') }} @@ -3552,6 +3570,12 @@ // })); + + $(document).ready(function() { + $('.lead_status').select2(); + $('.lead_source').select2(); + $('.lead_owner').select2(); + }); $("#add-notes").validate({ ignore: [], diff --git a/resources/views/Admin/Pages/manage_leads/view-lead.blade.php b/resources/views/Admin/Pages/manage_leads/view-lead.blade.php index 8be1c5c..597da40 100644 --- a/resources/views/Admin/Pages/manage_leads/view-lead.blade.php +++ b/resources/views/Admin/Pages/manage_leads/view-lead.blade.php @@ -603,7 +603,7 @@

    Product Information

    -
    +
    diff --git a/resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php b/resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php index 46b1e6b..7abcb69 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/partial/transaction-row.blade.php @@ -22,7 +22,7 @@ - + diff --git a/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php b/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php index df3471c..df8a394 100644 --- a/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php +++ b/resources/views/Admin/Pages/pre_owned_investment/transactions.blade.php @@ -10,11 +10,14 @@ .dataTables_filter { display: none; - } + } .dt-buttons { display: none; } + .table tbody td a { + cursor: pointer; + } @endsection @section('content') @@ -23,7 +26,7 @@
    -

    Completed Transactions cdc

    +

    Completed Transactions

    - @@ -118,7 +118,7 @@ - + @@ -131,13 +131,13 @@ - @@ -187,7 +187,7 @@ - + @@ -200,13 +200,13 @@ - diff --git a/resources/views/Frontend/Pages/login.blade.php b/resources/views/Frontend/Pages/login.blade.php index d45c460..20ca0af 100644 --- a/resources/views/Frontend/Pages/login.blade.php +++ b/resources/views/Frontend/Pages/login.blade.php @@ -61,7 +61,7 @@
    {{$task->status == 1?'Closed':'Open'}} {{$task->priority}} {{$task->reminder}} + - id}}> + id}}> Priority Related To StatusActionsActions
    {{$meeting->priority}} {{$meeting->related_to}} {{$meeting->status == 1?'Closed':'Open'}} + - + Email Phone Lead SourceActionsActions
    {{$lead->email}} {{$lead->mobile}} {{$lead->leadSource == null ? 'No Lead Source Assigned' : $lead->leadSource->name}} + - +