Compare commits
No commits in common. "78670b1b95fea73dd19233e35872e937f9f8afd1" and "f488c286bdfd659c412aa48cbb21f6b63660d0ec" have entirely different histories.
78670b1b95
...
f488c286bd
@ -117,7 +117,7 @@
|
||||
<table class="table table-bordered table-striped longdataTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th width="5%" class="text-center"><?php myLang('S.N'); ?></th>
|
||||
<th width="5%"><?php myLang('S.N'); ?></th>
|
||||
<th width="25%"><?php myLang('Name'); ?></th>
|
||||
<th width="10%"><?php myLang('Code'); ?></th>
|
||||
<th width="10%"><?php myLang('Units'); ?></th>
|
||||
@ -134,7 +134,7 @@
|
||||
<?php foreach ($TableRow as $cols) : $id = $cols;
|
||||
break;
|
||||
endforeach; ?><tr>
|
||||
<td class="text-center"><?php echo $a; ?></td>
|
||||
<td><?php echo $a; ?></td>
|
||||
<td><?php echo $TableRow->title; ?></td>
|
||||
<td><?php echo $TableRow->item_code; ?></td>
|
||||
<td><?php echo getFieldfromValue("tbl_units", "title", "unit_id", $TableRow->units_id); ?></td>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<div class="col">
|
||||
<div class="card card-primary card-outline">
|
||||
<div class="card-header">
|
||||
<h5 class="m-0 card-title"><?php echo $pageTitle; ?> </h5><a href="<?php echo site_url($this->uri->segment(1) . "/" . $this->uri->segment(2) . "/create"); ?>" class="btn btn-sm btn-primary float-right">Create New <?php echo $pageTitle; ?></a>
|
||||
<h5 class="m-0"><?php echo $pageTitle; ?> <a href="<?php echo site_url($this->uri->segment(1) . "/" . $this->uri->segment(2) . "/create"); ?>" class="btn btn-sm btn-primary float-right">Create New <?php echo $pageTitle; ?></a></h5>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<?php $TableData = $this->db->query("select * from tbl_sales where status=1")->result(); ?>
|
||||
@ -16,7 +16,7 @@
|
||||
<th class="col-1"><?php myLang('Date'); ?></th>
|
||||
<th><?php myLang('Transaction'); ?></th>
|
||||
<th class="table-col col-1 text-center"><?php myLang('Amount'); ?></th>
|
||||
<th class="text-center" width="5%"> <?php myLang('Action'); ?></th>
|
||||
<th class="text-center col-1"><?php myLang('Action'); ?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -24,7 +24,9 @@
|
||||
<tr>
|
||||
<td class="text-center"><?php echo $TableRow->sales_id; ?></td>
|
||||
<td><?php echo $TableRow->sales_date; ?></td>
|
||||
<td><?php echo $this->myaccounts->getAccountDetails($TableRow->accounts_id)->account_name; ?>
|
||||
<td><?php echo $this->myaccounts->getAccountDetails($TableRow->accounts_id)->account_name; ?>
|
||||
|
||||
|
||||
</td>
|
||||
<td><?php echo myCurrency($TableRow->totalsales); ?></td>
|
||||
<td class="text-center"><?php showDetailsButton($this->uri->segment(1) . "/" . $this->uri->segment(2) . "/details/$TableRow->sales_id"); ?>
|
||||
|
||||
@ -2,14 +2,21 @@
|
||||
<!-- <div class="content">
|
||||
<div class="container-fluid">
|
||||
<div class="card card-primary ">
|
||||
|
||||
|
||||
<div class="card-header">
|
||||
<h3 class="card-title"><?php //echo $pageTitle;
|
||||
?> </h3>
|
||||
|
||||
<div class="card-tools">
|
||||
<button type="button" class="btn btn-tool" data-card-widget="collapse"><i class="fas fa-plus"></i>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="card-body">
|
||||
<form method="post" action="" id="FilterForm">
|
||||
<div class="row align-items-end">
|
||||
@ -55,6 +62,7 @@
|
||||
</div>
|
||||
<div class="col">
|
||||
<div class="form-group d-flex justify-content-end">
|
||||
|
||||
<button type="submit" class="btn btn-primary mr-2">Choose</button>
|
||||
<button type="submit" class="btn btn-primary mr-2">Filter</button>
|
||||
<button type="submit" class="btn btn-success mr-2">Export</button>
|
||||
@ -62,6 +70,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
<script>
|
||||
function resetForm() {
|
||||
@ -80,7 +89,10 @@
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="content">
|
||||
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
@ -88,11 +100,15 @@
|
||||
<div class="card-header">
|
||||
<h5 class="card-title">
|
||||
<?php echo $pageTitle; ?>
|
||||
|
||||
|
||||
|
||||
<!-- <?php //echo $pageTitle;
|
||||
?> <a href="<?php //echo site_url("inventory/purchases/add");
|
||||
?>" class="btn btn-sm btn-primary float-right">Create New <?php //echo $pageTitle;
|
||||
?></a> -->
|
||||
</h5>
|
||||
|
||||
<div class="card-tools">
|
||||
<form method="post" action="" id="FilterForm">
|
||||
<!-- button with a dropdown -->
|
||||
@ -174,13 +190,18 @@
|
||||
<tr>
|
||||
<th rowspan="2" width="40" style="vertical-align: middle;"><?php myLang('S.No.'); ?></th>
|
||||
<th rowspan="2" style="vertical-align: middle;"> <?php myLang('Item'); ?></th>
|
||||
|
||||
<th rowspan="2" width="80" style="vertical-align: middle;"><?php myLang('Units'); ?></th>
|
||||
|
||||
<th colspan="3" class="text-center"><?php myLang('Opening'); ?></th>
|
||||
<th colspan="3" class="text-center"><?php myLang('Purchase'); ?></th>
|
||||
<th colspan="3" class="text-center"><?php myLang('Sales'); ?></th>
|
||||
<th colspan="3" class="text-center"><?php myLang('Closing'); ?></th>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
|
||||
<th class="text-center" width="80"><?php myLang('Qty'); ?></th>
|
||||
<th class="text-center" width="80"><?php myLang('Avg. Rate'); ?></th>
|
||||
<th class="text-center" width="80"><?php myLang('Amount'); ?></th>
|
||||
@ -193,6 +214,7 @@
|
||||
<th class="text-center" width="80"><?php myLang('Qty'); ?></th>
|
||||
<th class="text-center" width="80"><?php myLang('Avg. Rate'); ?></th>
|
||||
<th class="text-center" width="80"><?php myLang('Amount'); ?></th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -221,12 +243,14 @@
|
||||
<td class="text-right"><?php echo $TableRow->Summary->Closing->rate; ?></td>
|
||||
<td><?php echo myCurrency($cTotal = $TableRow->Summary->Closing->amount);
|
||||
$CTotal += $cTotal; ?></td>
|
||||
|
||||
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
<tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="5" class="text-right"><b><?php echo myLang("Total"); ?></b></td>
|
||||
<td colspan="4" class="text-right"><b><?php echo myLang("Total"); ?></b></td>
|
||||
<td><?php echo myCurrency($Total); ?></td>
|
||||
<td colspan="2"></td>
|
||||
<td><?php echo myCurrency($PTotal); ?></td>
|
||||
@ -234,7 +258,6 @@
|
||||
<td><?php echo myCurrency($STotal); ?></td>
|
||||
<td colspan="2"></td>
|
||||
<td><?php echo myCurrency($CTotal); ?></td>
|
||||
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<div class="col-3">
|
||||
<div class="card card-primary card-outline">
|
||||
<div class="card-header">
|
||||
<h5 class="m-0 card-title"><?php echo isset($unit) ? 'Edit' : 'Add'; ?>
|
||||
<h5 class="m-0"><?php echo isset($unit) ? 'Edit' : 'Add'; ?>
|
||||
<?php myLang('Inventory Unit'); ?>
|
||||
<?php //echo $pageTitle; ?>
|
||||
<?php //showListButton($this->uri->segment(1) . "/" . $this->uri->segment(2) . "/list","List ".$pageTitle); ?>
|
||||
@ -59,7 +59,7 @@
|
||||
<div class="col-9">
|
||||
<div class="card card-primary card-outline">
|
||||
<div class="card-header">
|
||||
<h5 class="m-0 card-title"> <?php myLang(' List Inventory Units'); ?> <?php //echo $pageTitle; ?>
|
||||
<h5 class="m-0"> <?php myLang(' List Inventory Units'); ?> <?php //echo $pageTitle; ?>
|
||||
<?php //showCreateButton($this->uri->segment(1) . "/" . $this->uri->segment(2) . "/add", "Create New " . $pageTitle); ?>
|
||||
</h5>
|
||||
</div>
|
||||
@ -68,10 +68,10 @@
|
||||
<table class="table table-bordered table-striped longdataTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center" width="5%"><?php myLang('S.N'); ?></th>
|
||||
<th class="col-5" width="30%"><?php myLang('Unit Name '); ?></th>
|
||||
<th class="col-5" width="57%"><?php myLang('Unit Code'); ?></th>
|
||||
<th class="col-1 text-center" >Action</th>
|
||||
<th class="col-1"><?php myLang('S.N'); ?></th>
|
||||
<th class="col-5"><?php myLang('Unit Name '); ?></th>
|
||||
<th class="col-5"><?php myLang('Unit Code'); ?></th>
|
||||
<th class="col-1 text-center">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -80,7 +80,7 @@
|
||||
<?php foreach ($TableRow as $cols) : $id = $cols;
|
||||
break;
|
||||
endforeach; ?><tr>
|
||||
<td class="text-center"><?php echo $a; ?></td>
|
||||
<td><?php echo $a; ?></td>
|
||||
<td><?php echo $TableRow->title; ?></td>
|
||||
<td><?php echo $TableRow->description; ?></td>
|
||||
<td class="text-center"><?php showEditButton($this->uri->segment(1) . "/" . $this->uri->segment(2) . "/edit/$id"); ?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user