date edit in igr list screen and daywise report in cashbook list screen
This commit is contained in:
venbatechnologies@gmail.com
parent
2d1e629f2a
commit
c3439d9d41
@ -68,10 +68,40 @@ class cashbook extends BaseController
|
||||
}
|
||||
|
||||
}else{
|
||||
$data['list'] = $this->cashbook_model->getIncomeExpenseList();
|
||||
$this->global['pageTitle'] = 'Siddharth : Cash Book: Listing';
|
||||
// $data['list'] = $this->cashbook_model->getIncomeExpenseList();
|
||||
// $this->global['pageTitle'] = 'Siddharth : Cash Book: Listing';
|
||||
|
||||
$this->loadViews("income_expense_list", $this->global, $data , NULL);
|
||||
// $this->loadViews("income_expense_list", $this->global, $data , NULL);
|
||||
$this->global['pageTitle'] = 'Siddharth : Cash Book: Listing';
|
||||
|
||||
if ($this->input->post('btn_submit')) {
|
||||
|
||||
$fromdt = $this->input->post('from_date');
|
||||
$todt = $this->input->post('to_date');
|
||||
$ab=$this->input->post('financialyear');
|
||||
|
||||
$fromyear=substr($ab,0,-5);
|
||||
$toyear=substr($ab,5,5);
|
||||
|
||||
|
||||
$data['finyear']=$this->cashbook_model->finyear();
|
||||
$data['list'] = $this->cashbook_model->getIncomeExpense($fromyear,$toyear,$fromdt,$todt);
|
||||
|
||||
}
|
||||
else{
|
||||
|
||||
if (date('m') <= 3) {
|
||||
$preyear = (date('Y')-1);
|
||||
$currentyear = date('Y');
|
||||
} else {
|
||||
$preyear = date('Y') ;
|
||||
$currentyear = (date('Y') + 1);
|
||||
}
|
||||
|
||||
$data['list'] = $this->cashbook_model->getIncomeExpense($preyear,$currentyear);
|
||||
$data['finyear']=$this->cashbook_model->finyear();
|
||||
}
|
||||
$this->loadViews("income_expense_list", $this->global, $data , NULL);
|
||||
}
|
||||
|
||||
|
||||
@ -115,10 +145,40 @@ class cashbook extends BaseController
|
||||
}
|
||||
|
||||
}else{
|
||||
$data['list'] = $this->cashbook_model->getIncomeExpenseList();
|
||||
$this->global['pageTitle'] = 'Siddharth : Cash Book: Listing';
|
||||
// $data['list'] = $this->cashbook_model->getIncomeExpenseList();
|
||||
// $this->global['pageTitle'] = 'Siddharth : Cash Book: Listing';
|
||||
|
||||
$this->loadViews("income_expense_list", $this->global, $data , NULL);
|
||||
// $this->loadViews("income_expense_list", $this->global, $data , NULL);
|
||||
$this->global['pageTitle'] = 'Siddharth : Cash Book: Listing';
|
||||
|
||||
if ($this->input->post('btn_submit')) {
|
||||
|
||||
$fromdt = $this->input->post('from_date');
|
||||
$todt = $this->input->post('to_date');
|
||||
$ab=$this->input->post('financialyear');
|
||||
|
||||
$fromyear=substr($ab,0,-5);
|
||||
$toyear=substr($ab,5,5);
|
||||
|
||||
|
||||
$data['finyear']=$this->cashbook_model->finyear();
|
||||
$data['list'] = $this->cashbook_model->getIncomeExpense($fromyear,$toyear,$fromdt,$todt);
|
||||
|
||||
}
|
||||
else{
|
||||
|
||||
if (date('m') <= 3) {
|
||||
$preyear = (date('Y')-1);
|
||||
$currentyear = date('Y');
|
||||
} else {
|
||||
$preyear = date('Y') ;
|
||||
$currentyear = (date('Y') + 1);
|
||||
}
|
||||
|
||||
$data['list'] = $this->cashbook_model->getIncomeExpense($preyear,$currentyear);
|
||||
$data['finyear']=$this->cashbook_model->finyear();
|
||||
}
|
||||
$this->loadViews("income_expense_list", $this->global, $data , NULL);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -412,6 +412,38 @@ class inwardgateregister extends BaseController
|
||||
echo json_encode($data);
|
||||
|
||||
}
|
||||
|
||||
|
||||
function UpdateIGR()
|
||||
{
|
||||
|
||||
$IGRNo = $this->input->post('igr');
|
||||
|
||||
$DeliveryChellan = $this->input->post('invdate');
|
||||
$DeliveryChellanDate = $this->getDateformat($DeliveryChellan);
|
||||
|
||||
$Mat_Rcvd_Dt = $this->input->post('mrc');
|
||||
$MaterialRcvdDt = $this->getDateformat($Mat_Rcvd_Dt);
|
||||
|
||||
$updateby = $this->session->userdata('userId');
|
||||
|
||||
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
|
||||
$updatedon = $dt->format('Y-m-d H:i:s');
|
||||
|
||||
|
||||
$igrarr = array('DeliveryChellanDate'=>$DeliveryChellanDate,'MaterialRcvdDate'=>$MaterialRcvdDt,'UpdateBY'=>$updateby,'UpdatedOn'=>$updatedon);
|
||||
|
||||
$data = $this->inwardgateregister_model->updateigr($igrarr,$IGRNo);
|
||||
|
||||
if($data > 0){
|
||||
echo "Updated Succefully!";
|
||||
}
|
||||
else{
|
||||
echo "Not Updated!";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function pageNotFound()
|
||||
{
|
||||
$this->global['pageTitle'] = 'Siddharth : 404 - Page Not Found';
|
||||
|
||||
@ -55,7 +55,43 @@ class cashbook_model extends CI_Model
|
||||
$r = $this->db->get();
|
||||
return $r->result();
|
||||
}
|
||||
|
||||
function getIncomeExpense($firstyear,$secondyear,$frmdt,$todt)
|
||||
{
|
||||
$this->db->select('t_accountcode.name,cashtype,T_Employee_Details.FirstName,T_Employee_Details.LastName,t_income_expense.*');
|
||||
$this->db->from('t_income_expense');
|
||||
$this->db->join('t_accountcode','t_income_expense.account_code=t_accountcode.code','left');
|
||||
$this->db->join('tbl_users','t_income_expense.Created_By=tbl_users.userId','left');
|
||||
$this->db->join('T_Employee_Details','tbl_users.EmpID=T_Employee_Details.EmpID','left');
|
||||
|
||||
if ($firstyear and $secondyear != ''){
|
||||
$finyear = "t_income_expense.date >= '".$firstyear."-04-01' and t_income_expense.date <= '".$secondyear."-03-31'";
|
||||
$this->db->where($finyear);
|
||||
}
|
||||
if ($frmdt and $todt != ''){
|
||||
$fromdate= date("Y-m-d",strtotime($frmdt));
|
||||
$todate=date("Y-m-d",strtotime($todt));
|
||||
$date = "date(t_income_expense.date) >= '".$fromdate."'
|
||||
and date(t_income_expense.date) <= '".$todate."'";
|
||||
$this->db->where($date);
|
||||
}
|
||||
$this->db->order_by("date","desc");
|
||||
$r = $this->db->get();
|
||||
return $r->result();
|
||||
}
|
||||
|
||||
function finyear(){
|
||||
|
||||
|
||||
$sql="SELECT
|
||||
CASE WHEN MONTH(date)>=4 THEN
|
||||
concat(YEAR(date), '-',YEAR(date)+1)
|
||||
ELSE concat(YEAR(date)-1,'-', YEAR(date)) END AS financial_year
|
||||
FROM t_income_expense
|
||||
GROUP BY financial_year";
|
||||
$query = $this->db->query($sql);
|
||||
return $query->result();
|
||||
|
||||
}
|
||||
function getCompany()
|
||||
{
|
||||
$r = $this->db->get('T_Company_Details');
|
||||
|
||||
@ -698,4 +698,13 @@ function getPOmaterial($PONO)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
function updateigr($igrarr,$IGRNo){
|
||||
|
||||
//$this->db->where('PONO',$PONO);
|
||||
$this->db->where('IGRNO',$IGRNo);
|
||||
$this->db->update('T_IGR_Master',$igrarr);
|
||||
$r = $this->db->affected_rows();
|
||||
return $r;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,5 +1,30 @@
|
||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||
|
||||
<style>
|
||||
.dataTables_filter input {padding: 4px;}
|
||||
.dataTables_filter {
|
||||
width: 50%;
|
||||
float: right;
|
||||
text-align: right;
|
||||
}
|
||||
.dataTables_paginate {
|
||||
width: 50%;
|
||||
float: right;
|
||||
text-align: right;
|
||||
}
|
||||
div.dt-buttons {
|
||||
position: relative;
|
||||
float: right;
|
||||
|
||||
}
|
||||
.btn-success {
|
||||
background-color: #3c8dbc;
|
||||
border-color: #3c8dbc;
|
||||
}
|
||||
</style>
|
||||
|
||||
<?php
|
||||
// print_r($list);
|
||||
//print_r($list);
|
||||
// ?>
|
||||
<!-- <CENTER><strong><h3 class="box-title">Siddharth Industries - Receipt and Payment List</h3></strong></CENTER> -->
|
||||
<div class="content-wrapper">
|
||||
@ -16,8 +41,74 @@
|
||||
<a href="addNewIncomeExpense" class="btn btn-primary" align="right"style="padding-right:10px" >Add New</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="box-body">
|
||||
<!-- <form role="form" id="Datewisecashbookreport" action="<?php echo base_url() ?>Datewisecashbookreport" enctype="multipart/form-data" method="post"> -->
|
||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||
|
||||
<div class="row">
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="col-md-3">
|
||||
<b><label for="From Date">From Date:</label></b>
|
||||
<div class="input-group">
|
||||
<input name="from_date" id="max-date" class="form-control datepicker">
|
||||
<span class="input-group-addon">
|
||||
<i class="fa fa-calendar fa-fw"></i>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-3">
|
||||
<b><label for="To Date">To Date:</label></b>
|
||||
<div class="input-group">
|
||||
<input name="to_date" id="min-date" class="form-control datepicker">
|
||||
<span class="input-group-addon">
|
||||
<i class="fa fa-calendar fa-fw"></i>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
|
||||
<b><label for="year">Year:</label></b>
|
||||
|
||||
<select class="form-control" id="financialyear" name="financialyear">
|
||||
<option value="">Select Year</option>
|
||||
<?php
|
||||
foreach($finyear as $item):
|
||||
|
||||
{?>
|
||||
|
||||
<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ; ?></option>
|
||||
|
||||
|
||||
<?php } endforeach; ?>
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-3">
|
||||
<div style="padding-right:10px;padding-top: 20px;" align="right">
|
||||
|
||||
|
||||
<input type="submit" class="btn btn-success" name="btn_submit" value="View Report">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
<table id="inexlist" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
|
||||
@ -78,23 +169,145 @@
|
||||
</div>
|
||||
</div> </section>
|
||||
</div>
|
||||
<script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
|
||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
|
||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
|
||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
||||
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
|
||||
<script>
|
||||
|
||||
|
||||
// Bootstrap datepicker
|
||||
// Set up your table
|
||||
$(document).ready(function() {
|
||||
$.fn.dataTable.moment( 'DD-MM-YYYY' );
|
||||
table = $('#inexlist').DataTable( {
|
||||
|
||||
|
||||
"autoWidth": false,
|
||||
//"columnDefs" : [{"targets":1, "type":"date-eu"}],
|
||||
orderCellsTop: true,
|
||||
|
||||
|
||||
|
||||
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
|
||||
"<'row'<'col-md-6'><'col-md-6'>>" +
|
||||
"<'row'<'col-md-12't>><'row'<'col-md-2'i><'col-md-10'p>>",
|
||||
buttons: [
|
||||
|
||||
// {
|
||||
// extend: 'excelHtml5',
|
||||
// footer: 'true',
|
||||
// messageTop: 'Cashbook Report',
|
||||
// title: $('h3').text(),
|
||||
// exportOptions: {
|
||||
// columns: ':visible'
|
||||
|
||||
// }
|
||||
// },
|
||||
|
||||
// 'colvis'
|
||||
]
|
||||
|
||||
} );
|
||||
} );
|
||||
|
||||
|
||||
// jQuery.extend( jQuery.fn.dataTableExt.oSort, {
|
||||
// "date-uk-pre": function ( a ) {
|
||||
// var ukDatea = a.split('-');
|
||||
// return (ukDatea[2] + ukDatea[1] + ukDatea[0]) * 1;
|
||||
// },
|
||||
|
||||
// "date-uk-asc": function ( a, b ) {
|
||||
// return ((a < b) ? -1 : ((a > b) ? 1 : 0));
|
||||
// },
|
||||
|
||||
// "date-uk-desc": function ( a, b ) {
|
||||
// return ((a < b) ? 1 : ((a > b) ? -1 : 0));
|
||||
// }
|
||||
// } );
|
||||
|
||||
// $('#mySelect').on('change',function(){
|
||||
|
||||
// table
|
||||
// .column(4)
|
||||
// .search(this.value)
|
||||
// .draw();
|
||||
// });
|
||||
|
||||
$( function() {
|
||||
//var dateFormat = "mm/dd/yy",
|
||||
from = $( "#min-date" )
|
||||
.datepicker({
|
||||
dateFormat: "dd-mm-yy",
|
||||
defaultDate: "+0d",
|
||||
changeMonth: true,
|
||||
//numberOfMonths: 1
|
||||
|
||||
})
|
||||
.on( "change", function() {
|
||||
to.datepicker("option", "minDate", getDate( this ) );
|
||||
}),
|
||||
to = $( "#max-date" ).datepicker({
|
||||
dateFormat: "dd-mm-yy",
|
||||
defaultDate: "+0d",
|
||||
changeMonth: true,
|
||||
//numberOfMonths: 1
|
||||
|
||||
})
|
||||
.on( "change", function() {
|
||||
from.datepicker( "option", "maxDate", getDate( this ) );
|
||||
});
|
||||
|
||||
} );
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- <script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script>
|
||||
<script>
|
||||
|
||||
$(function () {
|
||||
|
||||
|
||||
$('#inexlist').DataTable({
|
||||
"paging": true,
|
||||
"lengthChange": true,
|
||||
"searching": true,
|
||||
"aaSorting": [[ 0, "desc" ]],
|
||||
"ordering": true,
|
||||
"columnDefs" : [{"targets":1, "type":"date-eu"}],
|
||||
"info": true,
|
||||
"autoWidth": true
|
||||
// $('#inexlist').DataTable({
|
||||
// "paging": true,
|
||||
// "lengthChange": true,
|
||||
// "searching": true,
|
||||
// "aaSorting": [[ 0, "desc" ]],
|
||||
// "ordering": true,
|
||||
//
|
||||
// "info": true,
|
||||
// "autoWidth": true
|
||||
|
||||
});
|
||||
// });
|
||||
from = $( "#min-date" )
|
||||
.datepicker({
|
||||
dateFormat: "dd-mm-yy",
|
||||
defaultDate: "+0d",
|
||||
changeMonth: true,
|
||||
//numberOfMonths: 1
|
||||
|
||||
})
|
||||
.on( "change", function() {
|
||||
to.datepicker("option", "minDate", getDate( this ) );
|
||||
}),
|
||||
to = $( "#max-date" ).datepicker({
|
||||
dateFormat: "dd-mm-yy",
|
||||
defaultDate: "+0d",
|
||||
changeMonth: true,
|
||||
//numberOfMonths: 1
|
||||
|
||||
})
|
||||
.on( "change", function() {
|
||||
from.datepicker( "option", "maxDate", getDate( this ) );
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
-->
|
||||
|
||||
@ -11,6 +11,24 @@
|
||||
width: 800px ! important;
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
$(function() {
|
||||
var d = new Date();
|
||||
|
||||
var month = d.getMonth();
|
||||
var day = d.getDate();
|
||||
var year = d.getFullYear() ;
|
||||
var SIAStartYear = year - 2015;
|
||||
var mindt = year-70;
|
||||
var maxdt = year-15;
|
||||
|
||||
$("#Invoice_Date , #MaterialRcvdDate ").datepicker({
|
||||
minDate : new Date(year-SIAStartYear,1,1),
|
||||
maxDate :'now',
|
||||
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<div class="content-wrapper">
|
||||
|
||||
<section class="content"><br/>
|
||||
@ -165,15 +183,14 @@
|
||||
<div class="col-md-4">
|
||||
<label>Delivery Challan / Invoice Date </label>
|
||||
<?php
|
||||
$data = array('name' => 'DeliveryChallan/InvoiceDate','value' => set_value('DeliveryChallan/InvoiceDate'),'id'=>'Invoice_Date', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' );
|
||||
|
||||
$data = array('name' => 'DeliveryChallan/InvoiceDate','value' => set_value('DeliveryChallan/InvoiceDate'),'id'=>'Invoice_Date', 'class' => 'form-control', 'required=>"true"');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label>Material Received Date </label>
|
||||
<?php
|
||||
$data = array('name' => 'MaterialRcvdDate','value' => set_value('MaterialRcvdDate'),'id'=>'MaterialRcvdDate', 'class' => 'form-control' , 'readonly'=>'true' );
|
||||
$data = array('name' => 'MaterialRcvdDate','value' => set_value('MaterialRcvdDate'),'id'=>'MaterialRcvdDate', 'class' => 'form-control');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -198,6 +215,7 @@
|
||||
</table>
|
||||
|
||||
<div class="modal-footer">
|
||||
<a class="btn btn-primary" id="update" value="Update">Update</a>
|
||||
<a class="btn btn-primary" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||
</div>
|
||||
</div>
|
||||
@ -289,5 +307,21 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
|
||||
}
|
||||
});
|
||||
});
|
||||
$('#update').click(function(){
|
||||
//alert('updated function entered');
|
||||
$('#content').loader('show');
|
||||
var igrno = $("#IGRNO1").val();
|
||||
var materialrcv_date = $("#MaterialRcvdDate").val();
|
||||
var inv_date = $("#Invoice_Date").val();
|
||||
|
||||
$.ajax({
|
||||
data:{igr:igrno,mrc:materialrcv_date,invdate:inv_date},
|
||||
type:"POST",
|
||||
url:"<?php echo base_url() ?>inwardgateregister/UpdateIGR",
|
||||
success:function(data) {
|
||||
$('#content').loader('hide');
|
||||
alert(data);
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
Loading…
Reference in New Issue
Block a user