vijayabharathambooks/vb_book
vijayabharathambooks/vb_book
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dashboard alignment fixes : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-03-08 16:36:04 +05:30
parent 7de081f142
commit f73bf2013f
2 changed files with 274 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/Views/dashboard.php
View File

@ -1,6 +1,6 @@
<?php if ($business_id == 2 && $loggedin_person_role !== 'manager') : ?>
<?php if ($business_id == 2 && $loggedin_person_role !== 'manager') : ?>
<div class="row">
<div class="row">
<div class="col-xl-4 col-md-6">
<div class="card">
<div class="card-body">
@ -48,9 +48,6 @@
</div>
</div><!-- end col -->
<?php if (!empty($active_schemes) && isset($active_schemes[0])) : ?>
<div class="col-xl-4 col-md-6">
<div class="card">
@ -94,16 +91,12 @@
<span class="float-left"> New : <span data-toggle="tooltip" data-placement="bottom" data-original-title="Monthly Invoice Raised" data-plugin="counterup"><?= $firstScheme['nonrenewal']; ?></span><br></span>
<span class="float-right">Renewed: <span data-toggle="tooltip" data-placement="bottom" data-original-title="Yearly Invoice Raised" data-plugin="counterup"><?= $firstScheme['renewal']; ?></span><br></span>
</div>
<?php endif; ?>
</div>
</div>
</div>
</div>
</div>
</div>
</div><!-- end col -->
<?php endif; ?>
<?php if (!empty($active_schemes) && isset($active_schemes[1])) : ?>
<div class="col-xl-4 col-md-6">
@ -144,11 +137,12 @@
<span class="float-left"> New : <span data-toggle="tooltip" data-placement="bottom" data-original-title="Monthly Invoice Raised" data-plugin="counterup"><?= $firstScheme['nonrenewal']; ?></span><br></span>
<span class="float-right">Renewed: <span data-toggle="tooltip" data-placement="bottom" data-original-title="Yearly Invoice Raised" data-plugin="counterup"><?= $firstScheme['renewal']; ?></span><br></span>
</div>
<?php endif; ?>
</div>
</div>
</div>
</div><!-- end col -->
<?php endif; ?>
<?php if (!empty($active_schemes) && isset($active_schemes[9])) : ?>
<div class="col-lg-4">
<div class="card">
@ -191,7 +185,7 @@
<div class="col-sm-4 col-6">
<div class="mt-3 mt-sm-0">
<p class="mb-0">Renewed</p>
<h5 class="mb-0"><?=$firstScheme['renewal'];?> </h5>
<h5 class="mb-0"><?= $firstScheme['renewal']; ?> </h5>
</div>
</div>
</div>
@ -199,8 +193,9 @@
</div>
</div>
</div>
<?php endif; ?>
<?php if (!empty($active_schemes) && isset($active_schemes[2])) : ?>
<?php endif; ?>
<?php if (!empty($active_schemes) && isset($active_schemes[2])) : ?>
<div class="col-xl-4 col-md-6">
<div class="card">
<div class="card-body">
@ -243,16 +238,13 @@
<span class="float-left"> New : <span data-toggle="tooltip" data-placement="bottom" data-original-title="Monthly Invoice Raised" data-plugin="counterup"><?= $firstScheme['nonrenewal']; ?></span><br></span>
<span class="float-right">Renewed: <span data-toggle="tooltip" data-placement="bottom" data-original-title="Yearly Invoice Raised" data-plugin="counterup"><?= $firstScheme['renewal']; ?></span><br></span>
</div>
<?php endif; ?>
</div>
</div>
</div>
</div><!-- end col -->
</div>
<?php endif; ?>
</div>
<div class="row">
<div class="col-lg-12">
<div class="card">
<div class="card-body">
@ -284,28 +276,19 @@
<tr>
<!-- <td><?= $e['sub_id']; ?></td> -->
<td><?= ++$tempinx; ?></td>
<td>
<h5 class="mt-0 mb-1"><?= $e['customer_name']; ?></h5>
</td>
<td><h5 class="mt-0 mb-1"><?= $e['customer_name']; ?></h5></td>
<td><?= $e['customer_mobile'];?></td>
<td><?= $e['customer_email'];?></td>
<td><?= $e['short_code']; ?></td>
<td><span class="badge badge-success badge-pill"><?= $daysincountstring; ?></span> <span class="font-13"><br><?= $e['to_subscription_date_format']; ?></span></td>
<td>
<?php
$startDateTime = isset($e['notifications'][0]['start_date_time']) ? $e['notifications'][0]['start_date_time'] : '';
echo $startDateTime ? date('d-m-Y', strtotime($startDateTime)) : '';
?>
</td>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div> <!-- end table-responsive-->
@ -313,6 +296,8 @@
</div> <!-- end card-body-->
</div> <!-- end card-->
</div> <!-- end col-->
</div>
<?php endif; ?>
<?php endif; ?>

2
app/Views/template/topbar.php
View File

@ -54,7 +54,7 @@
</div>
</div>
</li> --> -->
</li> -->
<li class="dropdown notification-list topbar-dropdown">
<a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">