Merge pull request #190 from Ritikeshyadav/RitikeshFreeu

Ritikesh freeu

public/assets/css/FrontendCss/style.css

@@ -4668,10 +4668,6 @@ h3.primary-no-data {
   width: 5px;
   height: 50px;
 }
-.welcome-dash-logo img {
-  width: 150px;
-  height: 150px;
-}
 .company-img img {
   width: 150px;
 }

public/assets/css/style.css

@@ -1279,11 +1279,13 @@ nav {
   background-color: #dfdfdf;
   color: #000;
 }
-.chat-box  .chat-msgs .card-body {
+.chat-box .chat-msgs .card-body {
   height: 66%;
   overflow: scroll;
 }
-#manage_commission_view .modal-dialog .btn.btn-active-color-primary:hover:not(.btn-active) {
+#manage_commission_view
+  .modal-dialog
+  .btn.btn-active-color-primary:hover:not(.btn-active) {
   background-color: inherit !important;
 }
 #update_user_role_form button {
@@ -1293,3 +1295,8 @@ nav {
   padding: 8px 20px;
   border-radius: 5px;
 }
+
+.welcome-dash-logo img {
+  width: 150px;
+  height: 150px;
+}

resources/views/Admin/Pages/manage_commission/trail_commission.blade.php

@@ -74,7 +74,7 @@
                                         <td>
                                             <div class="badge badge-light fw-bold">{{$trail->commission_date->format('d/M/Y')}}</div>
                                         </td>
-                                        <td>{{$trail->products->return_type}}</td>
+                                        <td>{{$trail->products->return_type ?? '--'}}</td>
                                         <td>
                                             @if($trail->commission_earned == 'Yes')
                                             <span class="badge badge-primary p-3">Received</span>