salesvspurchase and final accounts pages change
This commit is contained in:
Sampanna Rimal
@ -14,51 +14,64 @@ $BIBAccounts = new BIBAccounts();
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
.group-name {
|
||||
width: 40%;
|
||||
}
|
||||
|
||||
.group-total {
|
||||
width: 10%;
|
||||
}
|
||||
|
||||
.table-gray {
|
||||
background-color: #eee;
|
||||
}
|
||||
|
||||
.table td,
|
||||
.table th {
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
.bg-darker {
|
||||
background-color: #ddd;
|
||||
}
|
||||
|
||||
td .table {
|
||||
border: 0px !important;
|
||||
margin-bottom: 0rem;
|
||||
}
|
||||
|
||||
table td:first-child {
|
||||
padding-left: 5px;
|
||||
}
|
||||
|
||||
.table-bordered.vertical-borders td,
|
||||
.table-bordered.vertical-borders th {
|
||||
border-left: 1px solid #dee2e6;
|
||||
border-right: 1px solid #dee2e6;
|
||||
}
|
||||
|
||||
.table-bordered.vertical-borders thead th {
|
||||
padding: 0.25rem;
|
||||
border-top: none;
|
||||
border-bottom: 2px solid #dee2e6;
|
||||
}
|
||||
|
||||
.table-bordered.vertical-borders tfoot th {
|
||||
padding: 0.25rem;
|
||||
border-top: 2px solid #dee2e6;
|
||||
border-bottom: none;
|
||||
}
|
||||
.currency{
|
||||
font-weight: normal !important;
|
||||
}
|
||||
.underline{
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.currency {
|
||||
font-weight: normal !important;
|
||||
}
|
||||
|
||||
.underline {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.form-control {
|
||||
display: block;
|
||||
width: 100%;
|
||||
@ -79,72 +92,90 @@ $BIBAccounts = new BIBAccounts();
|
||||
<div class="content-wrapper">
|
||||
<div class="content">
|
||||
<div class="container-fluid">
|
||||
<div class="card card-primary ">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title"><?php echo $pageTitle; ?> <?php myLang("Report"); ?></h3>
|
||||
<div class="card card-primary card-outline">
|
||||
<div class="card-header">
|
||||
<h2 class="card-title"><?php echo $pageTitle; ?> <?php myLang("Report"); ?></h2>
|
||||
|
||||
<div class="card-tools">
|
||||
<button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-plus"></i>
|
||||
</button>
|
||||
</div>
|
||||
<!-- /.card-tools -->
|
||||
</div>
|
||||
<div class="card-tools">
|
||||
<form method="post" action="" id="FilterForm">
|
||||
|
||||
<!-- button with a dropdown -->
|
||||
<div class="btn-group">
|
||||
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown" data-offset="-52">
|
||||
Filters
|
||||
</button>
|
||||
<div class="dropdown-menu" role="menu">
|
||||
|
||||
|
||||
<div class="form-group p-2 pb-0">
|
||||
<div class="col">
|
||||
<div class="form-group">
|
||||
<label for="fromDate"><?php myLang("Starting Period"); ?></label>
|
||||
<input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<form method="post" action="" id="FilterForm">
|
||||
<div class="row align-items-end">
|
||||
<div class="col-2">
|
||||
<div class="form-group">
|
||||
<label for="fromDate"><?php myLang("Starting Period"); ?></label>
|
||||
<input type="text" class="form-control nepaliDatePicker" name="fromDate" value="<?php echo (isset($_POST['fromDate'])) ? $_POST['fromDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>" id="fromDate" aria-describedby="helpId_fromDate" placeholder="Starting Period">
|
||||
|
||||
<div class="form-group">
|
||||
<label for="toDate"><?php myLang("Ending Period"); ?></label>
|
||||
<input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
|
||||
</div>
|
||||
</div>
|
||||
<div class="dropdown-divider"></div>
|
||||
<div class="form-check">
|
||||
|
||||
<input class="form-check-input" type="checkbox">
|
||||
<label class="form-check-label">Select
|
||||
All</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input type="hidden" name="showOB" value="not">
|
||||
<input type="checkbox" class="form-check-input " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
|
||||
<!-- <input class="form-check-input" type="checkbox"> -->
|
||||
<label class="form-check-label">Opening</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<!-- <input class="form-check-input" type="checkbox"> -->
|
||||
<input type="checkbox" class="form-check-input " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
|
||||
<label class="form-check-label">Closing</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<!-- <input class="form-check-input" type="checkbox" checked> -->
|
||||
<input type="checkbox" class="form-check-input" name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
|
||||
<label class="form-check-label">Period</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dropdown-divider"></div>
|
||||
<button type="submit" class="btn btn-primary mr-2 text-center">Search Now</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="form-group">
|
||||
<label for="toDate"><?php myLang("Ending Period"); ?></label>
|
||||
<input type="text" class="form-control nepaliDatePicker" name="toDate" value="<?php echo (isset($_POST['toDate'])) ? $_POST['toDate'] : NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>" id="toDate" aria-describedby="helpId_toDate" placeholder="Ending Period">
|
||||
</div>
|
||||
<div class="btn-group">
|
||||
<button type="submit" class="btn btn-danger btn-sm " data-toggle="dropdown" data-offset="-52">
|
||||
Export
|
||||
</button>
|
||||
|
||||
|
||||
<!-- <div class="dropdown-menu" role="menu">
|
||||
<a href="#" class="dropdown-item">Export</a>
|
||||
<a href="#" class="dropdown-item">Pdf</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
<a href="#" class="dropdown-item">View calendar</a>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="col-1 text-center">
|
||||
<div class="form-group">
|
||||
<label for="showOB"><?php myLang("Opening"); ?></label>
|
||||
<input type="checkbox" class="form-control " name="showOB" id="showOB" aria-describedby="helpId_showOB" placeholder="Show Opening Balance" <?php echo (isset($_POST['showOB'])) ? "CHECKED" : ""; ?>>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-1 text-center">
|
||||
<div class="form-group">
|
||||
<label for="showClosing"><?php myLang("Closing"); ?></label>
|
||||
<input type="checkbox" class="form-control " name="showClosing" id="showClosing" aria-describedby="helpId_showClosing" placeholder="Show Closing Balance" <?php echo (isset($_POST['showClosing'])) ? "CHECKED" : ""; ?>>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-1 text-center">
|
||||
<div class="form-group">
|
||||
<label for="showPeriod"><?php myLang("Period"); ?></label>
|
||||
<input type="checkbox" class="form-control " name="showPeriod" id="showPeriod" aria-describedby="helpId_showPeriod" placeholder="Show Periodic Balance" <?php echo (isset($_POST['showPeriod'])) ? "CHECKED" : "CHECKED"; ?>>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col">
|
||||
<div class="form-group d-flex justify-content-end">
|
||||
<button class="btn btn-secondary toggle-collapse mr-2" id="toggleShowAll">Toggle Collapse</button>
|
||||
<button type="submit" class="btn btn-primary mr-2">Filter</button>
|
||||
<button type="submit" class="btn btn-success mr-2">Export</button>
|
||||
<button type="button" class="btn btn-warning" onclick="resetForm()">Reset</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
<script>
|
||||
function resetForm() {
|
||||
document.getElementById("fromDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>";
|
||||
document.getElementById("toDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>";
|
||||
document.getElementById("showOB").checked = <?php echo "false"; ?>;
|
||||
document.getElementById("showClosing").checked = <?php echo "false"; ?>;
|
||||
document.getElementById("FilterForm").submit();
|
||||
}
|
||||
</script>
|
||||
<button type="button" class="btn btn-warning btn-sm" onclick="resetForm()">Reset</button>
|
||||
|
||||
<button class="btn btn-secondary toggle-collapse btn-sm" id="toggleShowAll">Toggle Collapse</button>
|
||||
|
||||
</form>
|
||||
<script>
|
||||
function resetForm() {
|
||||
document.getElementById("fromDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_from); ?>";
|
||||
document.getElementById("toDate").value = "<?php echo NepaliDate($this->session->FiscalYear->fiscalyear_to); ?>";
|
||||
document.getElementById("showOB").checked = <?php echo "false"; ?>;
|
||||
document.getElementById("showClosing").checked = <?php echo "false"; ?>;
|
||||
document.getElementById("FilterForm").submit();
|
||||
}
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -158,108 +189,115 @@ $BIBAccounts = new BIBAccounts();
|
||||
<h5 class="m-0"><?php echo $pageTitle; ?> </h5>
|
||||
</div> -->
|
||||
<div class="card-body p-0">
|
||||
<?php
|
||||
// echo $_POST['showClosing'];
|
||||
$ReportOptions = array(
|
||||
'showZeroBalances' => true,
|
||||
'showOB' => (isset($_POST['showOB'])) ? true : false,
|
||||
'showClosing' => (isset($_POST['showClosing'])) ? true : false,
|
||||
'showPeriod' => (isset($_POST['showPeriod'])) ? true : true,
|
||||
);
|
||||
$showZeroBalances = false;
|
||||
?>
|
||||
<?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(); ?>
|
||||
<table class="table table-bordered vertical-borders" id="TrialBalanceTable">
|
||||
<thead class="bg-gray">
|
||||
<tr>
|
||||
<th rowspan="2">Particulars</th>
|
||||
<?php if ($ReportOptions['showOB']) : ?>
|
||||
<th colspan="2" class="text-center">Opening</th>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showPeriod']) : ?>
|
||||
<th colspan="2" class="text-center">Current Period</th>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showClosing']) : ?>
|
||||
<th colspan="2" class="text-center">Closing</th>
|
||||
<?php endif; ?>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
<?php if ($ReportOptions['showOB']) : ?>
|
||||
<th class="dr opening-dr text-center">Dr</th>
|
||||
<th class="cr opening-cr text-center">Cr</th>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showPeriod']) : ?>
|
||||
<th class="dr this-year-dr text-center">Dr</th>
|
||||
<th class="cr this-year-cr text-center">Cr</th>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showClosing']) : ?>
|
||||
<th class="dr closing-dr text-center">Dr</th>
|
||||
<th class="cr closing-cr text-center">Cr</th>
|
||||
<?php endif; ?>
|
||||
</tr>
|
||||
</thead>
|
||||
<?php
|
||||
// echo $_POST['showClosing'];
|
||||
$ReportOptions = array(
|
||||
'showZeroBalances' => true,
|
||||
'showOB' => (isset($_POST['showOB'])) ? true : false,
|
||||
'showClosing' => (isset($_POST['showClosing'])) ? true : false,
|
||||
'showPeriod' => (isset($_POST['showPeriod'])) ? true : true,
|
||||
);
|
||||
$showZeroBalances = false;
|
||||
// Initialize variables for column totals
|
||||
$totalOpeningDr = 0;
|
||||
$totalOpeningCr = 0;
|
||||
$totalThisYearDr = 0;
|
||||
$totalThisYearCr = 0;
|
||||
$totalClosingDr = 0;
|
||||
$totalClosingCr = 0;
|
||||
?>
|
||||
<?php $AccountGroups = $BIBAccounts->getAccountGroupsWithBalances(); ?>
|
||||
<table class="table table-bordered vertical-borders" id="TrialBalanceTable">
|
||||
<thead class="bg-gray">
|
||||
<tr>
|
||||
<th rowspan="2">Particulars</th>
|
||||
<?php if ($ReportOptions['showOB']) : ?>
|
||||
<th colspan="2" class="text-center">Opening</th>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showPeriod']) : ?>
|
||||
<th colspan="2" class="text-center">Current Period</th>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showClosing']) : ?>
|
||||
<th colspan="2" class="text-center">Closing</th>
|
||||
<?php endif; ?>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
<?php if ($ReportOptions['showOB']) : ?>
|
||||
<th class="dr opening-dr text-center" >Dr</th>
|
||||
<th class="cr opening-cr text-center">Cr</th>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showPeriod']) : ?>
|
||||
<th class="dr this-year-dr text-center">Dr</th>
|
||||
<th class="cr this-year-cr text-center">Cr</th>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showClosing']) : ?>
|
||||
<th class="dr closing-dr text-center">Dr</th>
|
||||
<th class="cr closing-cr text-center">Cr</th>
|
||||
<?php endif; ?>
|
||||
</tr>
|
||||
</thead>
|
||||
<?php foreach ($AccountGroups as $group) : ?>
|
||||
<tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
|
||||
<td class="group-name"><b><?php // echo $group->acgroup_name;
|
||||
?></b></td>
|
||||
<?php if ($ReportOptions['showOB']) : ?>
|
||||
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->opening_balance : 0);
|
||||
?></td>
|
||||
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->opening_balance : 0);
|
||||
?></td>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showPeriod']) : ?>
|
||||
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->regular_balance : 0);
|
||||
?></td>
|
||||
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->regular_balance : 0);
|
||||
?></td>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showClosing']) : ?>
|
||||
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0);
|
||||
?></td>
|
||||
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0);
|
||||
?></td>
|
||||
<?php endif; ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="7" class="group-details p-0">
|
||||
<div id="group_<?php echo $group->acgroup_id; ?>" class=" ">
|
||||
<?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
|
||||
<?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
// Initialize variables for column totals
|
||||
$totalOpeningDr = 0;
|
||||
$totalOpeningCr = 0;
|
||||
$totalThisYearDr = 0;
|
||||
$totalThisYearCr = 0;
|
||||
$totalClosingDr = 0;
|
||||
$totalClosingCr = 0;
|
||||
// Update column totals
|
||||
$totalOpeningDr += ($group->posting_side == "DR") ? $group->opening_balance : 0;
|
||||
$totalOpeningCr += ($group->posting_side == "CR") ? $group->opening_balance : 0;
|
||||
$totalThisYearDr += ($group->posting_side == "DR") ? $group->regular_balance : 0;
|
||||
$totalThisYearCr += ($group->posting_side == "CR") ? $group->regular_balance : 0;
|
||||
$totalClosingDr += ($group->posting_side == "DR") ? $group->closing_balance : 0;
|
||||
$totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0;
|
||||
?>
|
||||
<?php foreach ($AccountGroups as $group) : ?>
|
||||
<tr class="group-heading" data-toggle="collapse" data-target="#group_<?php echo $group->acgroup_id; ?>">
|
||||
<td class="group-name"><b><?php // echo $group->acgroup_name; ?></b></td>
|
||||
<?php if ($ReportOptions['showOB']) : ?>
|
||||
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->opening_balance : 0); ?></td>
|
||||
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->opening_balance : 0); ?></td>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showPeriod']) : ?>
|
||||
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->regular_balance : 0); ?></td>
|
||||
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->regular_balance : 0); ?></td>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showClosing']) : ?>
|
||||
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "DR") ? $group->closing_balance : 0); ?></td>
|
||||
<td class="group-total"><?php // echo myCurrency(($group->posting_side == "CR") ? $group->closing_balance : 0); ?></td>
|
||||
<?php endif; ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="7" class="group-details p-0">
|
||||
<div id="group_<?php echo $group->acgroup_id; ?>" class="collapse ">
|
||||
<?php $Accountcategories = $BIBAccounts->getRootCategoriesWithBalances($group->acgroup_id); ?>
|
||||
<?php $BIBAccounts->renderAccountCategoriesTable($Accountcategories, $ReportOptions, false, array()); ?>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
// Update column totals
|
||||
$totalOpeningDr += ($group->posting_side == "DR") ? $group->opening_balance : 0;
|
||||
$totalOpeningCr += ($group->posting_side == "CR") ? $group->opening_balance : 0;
|
||||
$totalThisYearDr += ($group->posting_side == "DR") ? $group->regular_balance : 0;
|
||||
$totalThisYearCr += ($group->posting_side == "CR") ? $group->regular_balance : 0;
|
||||
$totalClosingDr += ($group->posting_side == "DR") ? $group->closing_balance : 0;
|
||||
$totalClosingCr += ($group->posting_side == "CR") ? $group->closing_balance : 0;
|
||||
?>
|
||||
<?php endforeach; ?>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<th>Total Amount</th>
|
||||
<?php if ($ReportOptions['showOB']) : ?>
|
||||
<th class="dr opening-dr"><?php echo myCurrency($totalOpeningDr); ?></th>
|
||||
<th class="cr opening-cr"><?php echo myCurrency($totalOpeningCr); ?></th>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showPeriod']) : ?>
|
||||
<th class="dr this-year-dr"><?php echo myCurrency($totalThisYearDr); ?></th>
|
||||
<th class="cr this-year-cr"><?php echo myCurrency($totalThisYearCr); ?></th>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showClosing']) : ?>
|
||||
<th class="dr closing-dr"><?php echo myCurrency($totalClosingDr); ?></th>
|
||||
<th class="cr closing-cr"><?php echo myCurrency($totalClosingCr); ?></th>
|
||||
<?php endif; ?>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
<?php endforeach; ?>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<th>Total Amount</th>
|
||||
<?php if ($ReportOptions['showOB']) : ?>
|
||||
<th class="dr opening-dr"><?php echo myCurrency($totalOpeningDr); ?></th>
|
||||
<th class="cr opening-cr"><?php echo myCurrency($totalOpeningCr); ?></th>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showPeriod']) : ?>
|
||||
<th class="dr this-year-dr"><?php echo myCurrency($totalThisYearDr); ?></th>
|
||||
<th class="cr this-year-cr"><?php echo myCurrency($totalThisYearCr); ?></th>
|
||||
<?php endif; ?>
|
||||
<?php if ($ReportOptions['showClosing']) : ?>
|
||||
<th class="dr closing-dr"><?php echo myCurrency($totalClosingDr); ?></th>
|
||||
<th class="cr closing-cr"><?php echo myCurrency($totalClosingCr); ?></th>
|
||||
<?php endif; ?>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -291,6 +329,7 @@ function footerfunctions()
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
function exportTableToCSV(filename) {
|
||||
var csv = [];
|
||||
var rows = document.querySelectorAll("table tr:not(.hide)");
|
||||
|
||||
Reference in New Issue
Block a user