RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issues fixed

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-03-15 20:23:32 +05:30
parent c3233bbd13
commit ef7c0ca459
7 changed files with 877 additions and 736 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
application/config/constants.php
View File

@ -41,7 +41,7 @@ define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
define('ROLE_ADMIN', '1'); define('ROLE_ADMIN', '1');
define('ROLE_MANAGER', '2'); define('ROLE_MANAGER', '2');
define('ROLE_EMPLOYEE', '3'); define('ROLE_EMPLOYEE', '3');
/*define('ROLE_PRODUCTION', '4'); /*define('ROLE_PRODUCTION', '4');
define('ROLE_QUALITY', '5'); define('ROLE_QUALITY', '5');
define('ROLE_SECURITY', '6'); define('ROLE_SECURITY', '6');
define('ROLE_SALES', '7'); define('ROLE_SALES', '7');
@ -49,7 +49,7 @@ define('ROLE_ACCOUNTS', '8');*/
/***** USER DESIGNATION ******/ /***** USER DESIGNATION ******/
define('SECURITY', 'SECURITY'); //define('SECURITY', 'SECURITY');
define('SEGMENT', 2); define('SEGMENT', 2);
@ -65,28 +65,28 @@ define('REQ_ONHOLD', 'ST008');
define('REQITEM_ONHOLD', 'ST009'); define('REQITEM_ONHOLD', 'ST009');
define('REQITEM_PARTIALLY_DELIVERED', 'ST010'); define('REQITEM_PARTIALLY_DELIVERED', 'ST010');
define('REQITEM_DELIVERED', 'ST011'); define('REQITEM_DELIVERED', 'ST011');
define('REQ_DELETED', 'ST013'); define('REQ_DELETED', 'ST013');
define('REQITEM_POCREATED', 'ST022'); define('REQITEM_POCREATED', 'ST022');
define('REQITEM_PARTIALLY_PO_CREATED', 'ST023'); define('REQITEM_PARTIALLY_PO_CREATED', 'ST023');
define('REQITEM_Emergency_PO_CREATED', 'ST024'); define('REQITEM_Emergency_PO_CREATED', 'ST024');
define('POLINEITEM_IGR_CREATED', 'ST040'); define('POLINEITEM_IGR_CREATED', 'ST040');
define('REQ_READYFORDELIVERY', 'ST049'); define('REQ_READYFORDELIVERY', 'ST049');
define('REQ_DELIVERED', 'ST050'); define('REQ_DELIVERED', 'ST050');
/*IGR Status */ /*IGR Status */
define('IGR_CREATED', 'ST027'); define('IGR_CREATED', 'ST027');
define('IGR_CLOSED', 'ST028'); define('IGR_CLOSED', 'ST028');
define('IGR_CANCELLED', 'ST029'); define('IGR_CANCELLED', 'ST029');
define('POLINEITEM_IGRPARTIAL_CREATED', 'ST042'); define('POLINEITEM_IGRPARTIAL_CREATED', 'ST042');
/*IGR Status*/ /*IGR Status*/
/*MRIR Status */ /*MRIR Status */
define('MRIR_CREATED', 'ST041'); define('MRIR_CREATED', 'ST041');
define('MRIR_APPROVED', 'ST044'); define('MRIR_APPROVED', 'ST044');
define('MRIR_REJECTED', 'ST045'); define('MRIR_REJECTED', 'ST045');
define('PARTIAL_MRIRAPPROVED', 'ST054'); define('PARTIAL_MRIRAPPROVED', 'ST054');
define('REQUISTSTATUS', '0'); define('REQUISTSTATUS', '0');
define('REQUISTITEMSTATUS', '1'); define('REQUISTITEMSTATUS', '1');
/* Purchase Order Status */ /* Purchase Order Status */
@ -98,17 +98,17 @@ define('PO_DELIVERED', 'ST018');
define('PO_CANCELLED', 'ST019'); define('PO_CANCELLED', 'ST019');
define('PO_ONHOLD', 'ST020'); define('PO_ONHOLD', 'ST020');
define('PO_CLOSED', 'ST021'); define('PO_CLOSED', 'ST021');
define('PO_AMENDED', 'ST030'); define('PO_AMENDED', 'ST030');
define('PO_RELEASED', 'ST026'); define('PO_RELEASED', 'ST026');
define('PO_AWAITING_RELEASE', 'ST025'); define('PO_AWAITING_RELEASE', 'ST025');
define('PO_APPROVED', 'ST025'); define('PO_APPROVED', 'ST025');
define('PO_APPROVER_ONHOLD', 'ST051'); define('PO_APPROVER_ONHOLD', 'ST051');
define('PO_RELEASER_ONHOLD', 'ST052'); define('PO_RELEASER_ONHOLD', 'ST052');
define('SPECIAL_PO', 'ST056'); define('SPECIAL_PO', 'ST056');
/*store Status*/ /*store Status*/
define('STORE_DRAFT', 'ST043'); define('STORE_DRAFT', 'ST043');
define('STORE_CREATED', 'ST015'); define('STORE_CREATED', 'ST015');
/*store requisition*/ /*store requisition*/
define('STORE REQUISTION STATUS', '6'); define('STORE REQUISTION STATUS', '6');
@ -122,8 +122,8 @@ define('STORE_REJECT', 'ST039');
/* Work status code */ /* Work status code */
define('SERVICE_COMPLETED', 'ST046'); define('SERVICE_COMPLETED', 'ST046');
define('PO_SERVICE_COMPLETED', 'ST053'); define('PO_SERVICE_COMPLETED', 'ST053');
/* Department Code */ /* Department Code */
define('ADMIN', 'DEP01'); define('ADMIN', 'DEP01');
@ -137,8 +137,9 @@ define('COATING', 'DEP08');
define('MAINTENANANCE', 'DEP09'); define('MAINTENANANCE', 'DEP09');
define('FINANCE', 'DEP10'); define('FINANCE', 'DEP10');
define('PURCHASE', 'DEP11'); define('PURCHASE', 'DEP11');
define('MANAGEMENT', 'DEP12'); define('MANAGEMENT', 'DEP12');
define('HR', 'DEP13'); define('HR', 'DEP13');
define('SECURITY', 'DEP14');
define('SYSTEM_ADMIN', '1'); define('SYSTEM_ADMIN', '1');
/* PO Type */ /* PO Type */
define('REVENUE', 'REVENUE'); define('REVENUE', 'REVENUE');
@ -147,7 +148,7 @@ define('IMPORT', 'IMPORT');
define('CAPITAL', 'CAPITAL'); define('CAPITAL', 'CAPITAL');
// Tax Type // Tax Type
define('PERCENTAGE', 'PERCENTAGE'); define('PERCENTAGE', 'PERCENTAGE');
define('LUMPSUM', 'LUMP SUM'); define('LUMPSUM', 'LUMP SUM');
define('NILTYPE', 'NIL'); define('NILTYPE', 'NIL');

55
application/views/addnewIncomeExpense.php
View File

@ -197,8 +197,8 @@
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<b><span for="Description">File Upload:</span></b> <b><span for="Description">File Upload:</span></b>
<img id="slip" alt="your image" style="width: 139px;"/><br/> <img id="receiptslip" alt="your image" style="width: 139px;"/><br/>
<input type='file' input accept=".JPG,.PNG" onchange="readURL(this);" id="file" name="myfile" accept="image/*"/> <input type='file' input accept=".JPG,.PNG" onchange="readURL(this,this.id);" id="receiptfile" name="myfile" accept="image/*"/>
</div> </div>
</div> </div>
</div> </div>
@ -302,8 +302,8 @@
</div></div> </div></div>
<div class="col-md-3"><div class="form-group"> <div class="col-md-3"><div class="form-group">
<b><span for="Decription"><b>Account Description:</b></span><span style="color:red">*</span> <b><span for="Decription"><b>Account Description:</b></span>
<input type="text" class="form-control" required style="text-align:right;" id="subdescription1" name="mydata1[subdescription1]" requried> <input type="text" class="form-control" style="text-align:right;" id="subdescription1" name="mydata1[subdescription1]" requried>
</div></div> </div></div>
<div class="col-md-3"><div class="form-group"> <div class="col-md-3"><div class="form-group">
@ -338,10 +338,12 @@
<textarea class="form-control" id="Paymentdescription" name="Paymentdescription" > <textarea class="form-control" id="Paymentdescription" name="Paymentdescription" >
</textarea> </textarea>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<b><span for="fileupload">File Upload:</span></b> <!-- <b><span for="fileupload">File Upload:</span></b> -->
<img id="slip" alt="your image" style="width: 139px;"/><br/> <b><span for="Description">File Upload:</span></b>
<input type='file' input accept=".JPG,.PNG" onchange="readURL(this);" id="file" name="myfile" accept="image/*"/> <img id="paymentslip" alt="your image" style="width: 139px;"/><br/>
<input type='file' input accept=".JPG,.PNG" onchange="readURL(this,this.id);" id="paymentfile" name="myfile" accept="image/*"/>
</div> </div>
</div> </div>
</div> </div>
@ -423,25 +425,39 @@ $("#PaymentDate").datepicker({
}); });
function readURL(input) { function readURL(input,id) {
//alert(id);
if (input.files && input.files[0]) { if (input.files && input.files[0]) {
var reader = new FileReader(); var reader = new FileReader();
reader.onload = function (e) { reader.onload = function (e) {
$('#slip')
if(id == "receiptfile"){
$('#receiptslip')
.attr('src', e.target.result) .attr('src', e.target.result)
.width(100) .width(100)
.height(100); .height(100);
//alert(e.target.result); }
else{
$('#paymentslip')
.attr('src', e.target.result)
.width(100)
.height(100);
}
// alert(e.target.result);
}; };
reader.readAsDataURL(input.files[0]); reader.readAsDataURL(input.files[0]);
$('#slip').val(input.files[0]['name']); if(id == "receiptfile"){
$('#receiptslip').val(input.files[0]['name']);}
else{
$('#paymentslip').val(input.files[0]['name']);}
} }
} }
function isNumberKey(evt) function isNumberKey(evt)
{ {
var charCode = (evt.which) ? evt.which : evt.keyCode; var charCode = (evt.which) ? evt.which : evt.keyCode;
@ -718,13 +734,12 @@ function add_more()
$('#Paymentaccode1').focus(); $('#Paymentaccode1').focus();
return false; return false;
} }
else if($('#subdescription1').val() == '') // else if($('#subdescription1').val() == '')
{ // {
alert("Provide Account description..!"); // alert("Provide Account description..!");
$('#subdescription1').focus(); // $('#subdescription1').focus();
return false; // return false;
// }
}
else if($('#Paymentamount1').val() == '') else if($('#Paymentamount1').val() == '')
{ {
alert("Provide Amount data..!"); alert("Provide Amount data..!");

69
application/views/editincomeexpenses.php
View File

@ -213,12 +213,12 @@ if(!empty($PaymentMultiple))
</div> </div>
<div class="col-md-4" style="border:0px solid;"> <div class="col-md-4" style="border:0px solid;">
<img id="receipt" src="<?php echo $final ?>" alt="No Receipt Available" style="width: 139px;height:139px;"/><br/> <img id="receiptslip" src="<?php echo $final ?>" alt="No Receipt Available" style="width: 139px;height:139px;"/><br/>
<input type="button" onclick="DeleteRow();"class="btn btn-primary" value="Delete" /> <input type="button" onclick="DeleteRow();"class="btn btn-primary" value="Delete" />
<b><span for="Description">File Upload:</span></b> <b><span for="Description">File Upload:</span></b>
<input type='file' input accept=".JPG,.PNG" onchange="readURL(this);" id="file" name="myfile" accept="image/*"/ value="<?php echo $document; ?>"> <input type='file' input accept=".JPG,.PNG" onchange="readURL(this);" id="recepitfile" name="myfile" accept="image/*"/ value="<?php echo $document; ?>">
</div> </div>
<div> <div>
@ -442,10 +442,10 @@ if(!empty($PaymentMultiple))
</div> </div>
<div class="col-md-4" style="border:0px solid;"> <div class="col-md-4" style="border:0px solid;">
<img id="receipt" src="<?php echo $final ?>" alt="No Receipt Available" style="width: 139px;height:139px;"/><br/> <img id="paymentslip" src="<?php echo $final ?>" alt="No Receipt Available" style="width: 139px;height:139px;"/><br/>
<input type="button" onclick="DeleteRow();"class="btn btn-primary" value="Delete" /> <input type="button" onclick="DeleteRow();"class="btn btn-primary" value="Delete" />
<b><span for="Description">File Upload:</span></b> <b><span for="Description">File Upload:</span></b>
<input type='file' input accept=".JPG,.PNG" onchange="readURL(this);" id="file" name="myfile" accept="image/*"/ value="<?php echo $document; ?>"> <input type='file' input accept=".JPG,.PNG" onchange="paymentreadURL(this);" id="paymentfile" name="myfile" accept="image/*"/ value="<?php echo $document; ?>">
</div> </div>
<div> <div>
@ -573,25 +573,58 @@ if(type == "RECEIPT")
}); });
function readURL(input) { function readURL(input,id) {
//alert(id);
if (input.files && input.files[0]) { if (input.files && input.files[0]) {
var reader = new FileReader(); var reader = new FileReader();
reader.onload = function (e) { reader.onload = function (e) {
$('#receipt')
if(id == "receiptfile"){
$('#receiptslip')
.attr('src', e.target.result) .attr('src', e.target.result)
.width(100) .width(100)
.height(100); .height(100);
//alert(e.target.result); }
else{
$('#paymentslip')
.attr('src', e.target.result)
.width(100)
.height(100);
}
// alert(e.target.result);
}; };
reader.readAsDataURL(input.files[0]); reader.readAsDataURL(input.files[0]);
$('#receipt').val(input.files[0]['name']); if(id == "receiptfile"){
$('#receiptslip').val(input.files[0]['name']);}
else{
$('#paymentslip').val(input.files[0]['name']);}
} }
} }
function paymentreadURL(input) {
if (input.files && input.files[0]) {
var reader = new FileReader();
reader.onload = function (e) {
$('#payment')
.attr('src', e.target.result)
.width(100)
.height(100);
//alert(e.target.result);
};
reader.readAsDataURL(input.files[0]);
$('#payment').val(input.files[0]['name']);
}
}
function isNumberKey(evt) function isNumberKey(evt)
{ {
var charCode = (evt.which) ? evt.which : evt.keyCode; var charCode = (evt.which) ? evt.which : evt.keyCode;
@ -793,7 +826,7 @@ $.ajax({
{ {
$('#content').loader('hide'); $('#content').loader('hide');
alert('Delete Successfully'); alert('Delete Successfully');
$('#receipt').attr('src', ''); $('#receiptslip').attr('src', '');
//window.location ="cashbook/incomeExpenseList"; //window.location ="cashbook/incomeExpenseList";
} }
@ -901,13 +934,13 @@ function add_more()
$('#Paymentaccode1').focus(); $('#Paymentaccode1').focus();
return false; return false;
} }
else if($('#subdescription1').val() == '') // else if($('#subdescription1').val() == '')
{ // {
alert("Provide Account description..!"); // alert("Provide Account description..!");
$('#subdescription1').focus(); // $('#subdescription1').focus();
return false; // return false;
} // }
else if($('#Paymentamount1').val() == '') else if($('#Paymentamount1').val() == '')
{ {
alert("Provide Amount data..!"); alert("Provide Amount data..!");
@ -934,7 +967,7 @@ div.innerHTML='<div class="col-md-12"><div class="col-md-3"><div class="form-gro
'</div></div>'+ '</div></div>'+
'<div class="col-md-3"><div class="form-group">'+ '<div class="col-md-3"><div class="form-group">'+
'<span for="Decription"><b>Account Description:</b></span> '+ '<span for="Decription"><b>Account Description:</b></span> '+
'<input type="text" class="form-control required" style="text-align:right;" id="subdescription'+counterConstant+'" name="mydata'+counterConstant+'[subdescription'+counterConstant+']">'+ '<input type="text" class="form-control" style="text-align:right;" id="subdescription'+counterConstant+'" name="mydata'+counterConstant+'[subdescription'+counterConstant+']">'+
'</div></div>'+ '</div></div>'+
'<div class="col-md-3"><div class="form-group">'+ '<div class="col-md-3"><div class="form-group">'+
'<span for="amount"><b>Amount(&#8377;):</b></span> '+ '<span for="amount"><b>Amount(&#8377;):</b></span> '+

1404
application/views/includes/header.php
View File

File diff suppressed because it is too large Load Diff

34
application/views/income_expense_list.php
View File

@ -40,23 +40,23 @@
{ {
?> ?>
<tr> <tr>
<td><?php echo '<a href="'.$base.'cashbook/incomeExpenseList/'.$l->id.'">'.$l->type.'</a>';?></td> <td><?php echo '<a href="'.$base.'cashbook/incomeExpenseList/'.$l->id.'">'.$l->type.'</a>';?></td>
<td style="text-align:right;"><?php echo date_format(date_create($l->date),'d-m-Y');?></td> <td style="text-align:right;"><?php echo date_format(date_create($l->date),'d-m-Y');?></td>
<td><?php if($l->type == 'PAYMENT' && $l->account_code == '999') { echo " "; } else {echo $l->name;}?></td> <td><?php if($l->type == 'PAYMENT' && $l->account_code == '999') { echo $l->description; } else {echo $l->name;}?></td>
<td style="text-align:right;"><?php echo $l->total;?></td> <td style="text-align:right;"><?php echo $l->total;?></td>
<td><?php echo $l->description;?></td> <td><?php echo $l->description;?></td>
<td> <td>
<a href="<?php echo base_url(); ?>cashbook/editcashbook?sid=<?php echo $l->id;?>"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the RECEIPT OR PAYMENT"></i>&nbsp;&nbsp;&nbsp;</a> <a href="<?php echo base_url(); ?>cashbook/editcashbook?sid=<?php echo $l->id;?>"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the RECEIPT OR PAYMENT"></i>&nbsp;&nbsp;&nbsp;</a>
<!-- <span data-toggle="modal" data-target="#myModal" data-id="<?php echo $l->id; ?>" > <!-- <span data-toggle="modal" data-target="#myModal" data-id="<?php echo $l->id; ?>" >
<a data-toggle="tooltip" title="Click here to view multiple payment details"><i class="fa fa-clone"></i></a></span> --> <a data-toggle="tooltip" title="Click here to view multiple payment details"><i class="fa fa-clone"></i></a></span> -->
<?php if($l->type == 'PAYMENT' && $l->account_code == '999') { ?> <?php if($l->type == 'PAYMENT' && $l->account_code == '999') { ?>
<span data-toggle="tooltip" title="Click here to view multiple payment details"> <span data-toggle="tooltip" title="Click here to view multiple payment details">
<a data-toggle="modal" onclick="inex(<?php echo $l->id; ?>)" data-id="<?php echo $l->id; ?>"><i class="fa fa-clone"></i></a></span> <a data-toggle="modal" onclick="inex(<?php echo $l->id; ?>)" data-id="<?php echo $l->id; ?>"><i class="fa fa-clone"></i></a></span>
<?php } ?> <?php } ?>
</td> </td>
</tr> </tr>
<?php <?php
} }

BIN
uploads/Igrfiles/avatar.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
uploads/cashbook/avatar.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB