SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

datefilter and cashbook reports in bankid

Browse Source
This commit is contained in:
gayathri1990 2018-10-31 16:46:45 +05:30
parent 7f89ba407d
commit 66944e82c4
5 changed files with 1244 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/cashbook.php
View File

@ -1055,7 +1055,7 @@ class cashbook extends BaseController
else else
{ {
$data['balancetoclear'] =$_GET['balancetoclear']; $data['balancetoclear'] =$_GET['balancetoclear'];
$data['mappingcashbook']=$this->cashbook_model->mappingcash($SupplierName,$fdate,$tdate,$bankid); $data['mappingcashbook']=$this->cashbook_model->mappingcashbankid($bankid);
$data['mapping'] = $this->cashbook_model->debitpolist($bankid); $data['mapping'] = $this->cashbook_model->debitpolist($bankid);
$data['paidcbook'] = $this->cashbook_model->cashbookamount($bankid); $data['paidcbook'] = $this->cashbook_model->cashbookamount($bankid);
$data['paidpoamount'] = $this->cashbook_model->poamonut($bankid); $data['paidpoamount'] = $this->cashbook_model->poamonut($bankid);
@ -1077,7 +1077,7 @@ class cashbook extends BaseController
$data['clearbalance']=$_GET['cb']; $data['clearbalance']=$_GET['cb'];
$data['balancetoclear']=$_GET['btc']; $data['balancetoclear']=$_GET['btc'];
$data['mappingcashbook']=$this->cashbook_model->mappingcash($SupplierName,$fdate,$tdate,$bankid); $data['mappingcashbook']=$this->cashbook_model->mappingcashcreditbankid($bankid);
$data['mappingiv'] = $this->cashbook_model->creditinvoicelist($bankid); $data['mappingiv'] = $this->cashbook_model->creditinvoicelist($bankid);
$data['paidcbook'] = $this->cashbook_model->cashbookamount($bankid); $data['paidcbook'] = $this->cashbook_model->cashbookamount($bankid);
$data['invoiceramount'] = $this->cashbook_model->invoiceamonut($bankid); $data['invoiceramount'] = $this->cashbook_model->invoiceamonut($bankid);

1142
application/logs/log-2018-10-31.php
View File

File diff suppressed because it is too large Load Diff

26
application/models/cashbook_model.php
View File

@ -1247,6 +1247,32 @@ function receiptdata()
$query = $this->db->get(); $query = $this->db->get();
return $query->result(); return $query->result();
}
function mappingcashbankid($bankid)
{
$this->db->select('ie.date,ie.bankid,ie.cashtype,ie.amounttype,ie.total,ac.name,totalbankamount,ie.id');
$this->db->from ('t_income_expense as ie');
$this->db->join ('t_accountcode ac ','ac.code = ie.account_code','left');
$this->db->where('ie.bankid',$bankid);
$this->db->where('ie.amounttype','DEBIT');
$this->db->where('IsActive',1);
//$this->db->group_by('mid');
$query = $this->db->get();
return $query->result();
}
function mappingcashcreditbankid($bankid)
{
$this->db->select('ie.date,ie.bankid,ie.cashtype,ie.amounttype,ie.total,ac.name,totalbankamount,ie.id');
$this->db->from ('t_income_expense as ie');
$this->db->join ('t_accountcode ac ','ac.code = ie.account_code','left');
$this->db->where('ie.bankid',$bankid);
$this->db->where('ie.amounttype','CREDIT');
$this->db->where('IsActive',1);
//$this->db->group_by('mid');
$query = $this->db->get();
return $query->result();
} }
function mappingcashreceived($accountcode) function mappingcashreceived($accountcode)
{ {

37
application/views/banksettlementcash.php
View File

@ -440,4 +440,41 @@ function pono(i)
}); });
} }
$( 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 ) );
});
function getDate( element ) {
var date;
try {
date = $.datepicker.parseDate( dateFormat, element.value );
} catch( error ) {
date = null;
}
return date;
}
} );
</script> </script>

37
application/views/banksettlementcredit.php
View File

@ -441,4 +441,41 @@ function pono(i)
}); });
} }
$( 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 ) );
});
function getDate( element ) {
var date;
try {
date = $.datepicker.parseDate( dateFormat, element.value );
} catch( error ) {
date = null;
}
return date;
}
} );
</script> </script>