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

CHANGE_TRACKER_ISSUE

Browse Source
This commit is contained in:
aadhavan valli 2024-09-12 12:25:06 +05:30
parent d108028a19
commit deb4b84350
10 changed files with 758 additions and 760 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Views/addemppaydate.php
View File

@ -4,6 +4,7 @@
$("#loan_issued_date").datepicker({ $("#loan_issued_date").datepicker({
minDate: 'now', minDate: 'now',
orientation: 'bottom',
// maxDate : 'now', // maxDate : 'now',
dateFormat: 'dd-mm-yy', dateFormat: 'dd-mm-yy',
changeMonth: true, changeMonth: true,
@ -55,24 +56,6 @@
<form role="form" id="addemppaydate" action="<?php echo base_url() ?>emppaydate/addNewemppay" method="post" name="addform"> <form role="form" id="addemppaydate" action="<?php echo base_url() ?>emppaydate/addNewemppay" method="post" name="addform">
<div class="box-body"> <div class="box-body">
<!-- Supplier Information --> <!-- Supplier Information -->
<div class="col-md-12" style="margin-bottom: 27px;">
<div class="row">
<div class="col-md-3">
</div>
</div>
</div>
<div class="col-md-12" style="margin-bottom: 27px;">
<div class="row">
<div class="col-md-3">
</div>
</div>
</div>
<div class="col-md-12" style="margin-bottom: 27px;">
<div class="row">
<div class="col-md-3">
</div>
</div>
</div>
<div class="col-md-12" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">

200
app/Views/approvalstorerequisitionslip.php
View File

@ -1,6 +1,5 @@
<?php <?php
//print_r($AppList); //print_r($AppList);
?> ?>
<div class="content-wrapper"> <div class="content-wrapper">
@ -10,13 +9,15 @@
<div class="box"> <div class="box">
<div class="box-header"> <div class="box-header">
<center><h3 class="box-title"> Store Requisition Approval List</h3></center> <center>
<h3 class="box-title"> Store Requisition Approval List</h3>
</center>
</div> </div>
<?php <?php
$attributes = array('class' => 'form-label-left Approve ','name' => 'Approve','id' => 'Approve'); $attributes = array('class' => 'form-label-left Approve ', 'name' => 'Approve', 'id' => 'Approve');
echo form_open(base_url().'storerequisitionlist/SearchRequistLists',$attributes); ?> echo form_open(base_url() . 'storerequisitionlist/SearchRequistLists', $attributes); ?>
<div class="container-fluid"> <div class="container-fluid">
<!-- popup for view store requisition detail --> <!-- popup for view store requisition detail -->
@ -27,7 +28,9 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4> Store Requisition Details - <span id="StReqno"></span></h4></center> <center>
<h4> Store Requisition Details - <span id="StReqno"></span></h4>
</center>
</div> </div>
<div align="left"> <div align="left">
@ -36,7 +39,7 @@
<label>Requistion Type</label> <label>Requistion Type</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ReqType','value' => set_value('ReqType'),'id'=>'ReqType', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'ReqType', 'value' => set_value('ReqType'), 'id' => 'ReqType', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -46,7 +49,7 @@
<label>Requested By</label> <label>Requested By</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Requestedby','value' => set_value('Requestedby'),'id'=>'Requestedby', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'Requestedby', 'value' => set_value('Requestedby'), 'id' => 'Requestedby', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -55,7 +58,7 @@
<label>Department Name</label> <label>Department Name</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Desigination','value' => set_value('Desigination'),'id'=>'Desigination', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'Desigination', 'value' => set_value('Desigination'), 'id' => 'Desigination', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -67,7 +70,7 @@
<label>Requested Date</label> <label>Requested Date</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ReqDate','value' => set_value('ReqDate'),'id'=>'ReqDate', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'ReqDate', 'value' => set_value('ReqDate'), 'id' => 'ReqDate', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -79,7 +82,7 @@
<?php <?php
$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -91,7 +94,7 @@
<label>Avl Budget Amt</label>&nbsp;<img id="AlertImg" src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image" width="25px" style="display:none"/> <label>Avl Budget Amt</label>&nbsp;<img id="AlertImg" src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image" width="25px" style="display:none"/>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'AvlBudgetAmount','value' => set_value('AvlBudgetAmount'),'id'=>'AvlBudgetAmount', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'AvlBudgetAmount', 'value' => set_value('AvlBudgetAmount'), 'id' => 'AvlBudgetAmount', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> --> </div> -->
@ -123,7 +126,8 @@
</div> </div>
</div> </div>
</table> </table>
<div class="modal-footer"> <div class="col-md-12"> <div class="modal-footer">
<div class="col-md-12">
<a class="btn btn-info" data-dismiss="modal" value="Cancel">Ok</a> <a class="btn btn-info" data-dismiss="modal" value="Cancel">Ok</a>
</div> </div>
</div> </div>
@ -140,7 +144,7 @@
<table id="Requisition" class="table table-bordered table-hover editabletable" style="background-color:#fff;font-size:12px;"> <table id="Requisition" class="table table-bordered table-hover editabletable" style="background-color:#fff;font-size:12px;">
<div align="right" style="padding-right:10px"> <div align="right" style="padding-right:10px">
<div id="content" > </div> <div id="content"> </div>
<div class="modal fade" role="dialog"> <div class="modal fade" role="dialog">
<thead> <thead>
@ -157,28 +161,25 @@
<tbody id="ApprovalList"> <tbody id="ApprovalList">
<?php <?php
if(!empty($AppList)) if (!empty($AppList)) {
{
//print_r($AppList); //print_r($AppList);
$index = 0; $index = 0;
foreach($AppList as $record) foreach ($AppList as $record) {
{ $index = $index + 1;
$index = $index +1;
?> ?>
<tr id="<?php echo $index ?>" > <tr id="<?php echo $index ?>">
<td><a data-toggle="modal" data-target="#myModal" data-id="<%=index%>" data-userid="<?php echo $record->StoreReqNo ?>" ><u><?php echo $record->StoreReqNo ?></u></a></td> <td><a data-toggle="modal" data-target="#myModal" data-id="<%=index%>" data-userid="<?php echo $record->StoreReqNo ?>"><u><?php echo $record->StoreReqNo ?></u></a></td>
<td><?php echo $record->FirstName?></td> <td><?php echo $record->FirstName ?></td>
<td ><?php $Cdt = new DateTime($record->ReqDate); <td><?php $Cdt = new DateTime($record->ReqDate);
$ReqDate= $Cdt->format('d-m-Y'); $ReqDate = $Cdt->format('d-m-Y');
echo $ReqDate; echo $ReqDate;
?></td> ?></td>
<td><?php echo $record->StatusName ?></td> <td><?php echo $record->StatusName ?></td>
<?php if (($record->Status) == STORE_PENDINGAPPROVAL) <?php if (($record->Status) == STORE_PENDINGAPPROVAL) {
{
?> ?>
<!-- <td contenteditable="true"><input type="text" id="Remarks<?php echo $index ?>" name="Remarks<?php echo $index ?>"class="form-control" maxlength="100"></td> --> <!-- <td contenteditable="true"><input type="text" id="Remarks<?php echo $index ?>" name="Remarks<?php echo $index ?>"class="form-control" maxlength="100"></td> -->
<!-- <td data-name="sel" id="Action<?php echo $index ?>" onchange="saveToDatabase(this.options[this.selectedIndex].value,'question','<?php echo $record->StoreReqNo ; ?>','<?php echo $index ; ?>')"> <!-- <td data-name="sel" id="Action<?php echo $index ?>" onchange="saveToDatabase(this.options[this.selectedIndex].value,'question','<?php echo $record->StoreReqNo; ?>','<?php echo $index; ?>')">
<select name="status<?php echo $index ?>" id="status<?php echo $index ?>"> <select name="status<?php echo $index ?>" id="status<?php echo $index ?>">
@ -189,23 +190,22 @@
</select> </select>
</td> --> </td> -->
<td> <select name="selectId" id="selectId" title="Select Your Option" onchange="saveToDatabase('<?php echo $record->StoreReqNo ?>','<?php echo $index ; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Comments ?>');"> <td> <select name="selectId" id="selectId" title="Select Your Option" onchange="saveToDatabase('<?php echo $record->StoreReqNo ?>','<?php echo $index; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Comments ?>');">
<option value="-1" >Select Option</option> <option value="-1">Select Option</option>
<option value="1">Approve</option> <option value="1">Approve</option>
<option value="2">Reject</option> <option value="2">Reject</option>
</select></td> </select></td>
<?php <?php
} } else {
else
{
?> ?>
<td><?php echo "---";//$record->Comments ?></td> <td><?php echo "---"; //$record->Comments
?></td>
<!-- <td><?php echo $record->StatusName ?></td> --> <!-- <td><?php echo $record->StatusName ?></td> -->
<?php <?php
} }
?> ?>
<td contenteditable="true" id="newcomments<?php echo $index ; ?>" ><?php echo $record->Comments ?></td> <td contenteditable="true" id="newcomments<?php echo $index; ?>"><?php echo $record->Comments ?></td>
</tr> </tr>
<?php <?php
} }
@ -222,20 +222,19 @@
<br> <br>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
<script> <script>
var startDate = ''; var startDate = '';
var endDate = ''; var endDate = '';
function Reset() function Reset() {
{
$('#RequisitionStatus').val("-1"); $('#RequisitionStatus').val("-1");
$('#SearchDate').val(''); $('#SearchDate').val('');
} }
$("#myModal").on("shown.bs.modal", function(e) { $("#myModal").on("shown.bs.modal", function(e) {
var ReqId = $(e.relatedTarget).data('userid'); var ReqId = $(e.relatedTarget).data('userid');
$("#StReqno").html(ReqId); $("#StReqno").html(ReqId);
@ -247,16 +246,17 @@ function Reset()
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({
data:{id:ReqId}, data: {
type:"POST", id: ReqId
},
type: "POST",
dataType: 'json', dataType: 'json',
url:"<?php echo base_url() ?>storerequisitionlist/ViewRequest", url: "<?php echo base_url() ?>storerequisitionlist/ViewRequest",
success:function(json) { success: function(json) {
//success:function(data) { //success:function(data) {
$('#content').loader('hide'); $('#content').loader('hide');
//alert(json.Requist); //alert(json.Requist);
if(json.Requist != '') if (json.Requist != '') {
{
//alert(json.Requist[0]['Requestedby']) ; //alert(json.Requist[0]['Requestedby']) ;
$("#Requestedby").val(json.Requist[0]['FirstName']); $("#Requestedby").val(json.Requist[0]['FirstName']);
$("#ReqDate").val(json.Requist[0]['ReqDate']); $("#ReqDate").val(json.Requist[0]['ReqDate']);
@ -267,103 +267,92 @@ function Reset()
} }
}); });
}); });
function saveToDatabase(ReqId,Index,option,com) function saveToDatabase(ReqId, Index, option, com) {
{
var newcomments=document.getElementById('newcomments'+Index+'').innerHTML; var newcomments = document.getElementById('newcomments' + Index + '').innerHTML;
var id=ReqId; var id = ReqId;
var Status= ''; var Status = '';
if (option == -1 ) if (option == -1) {
{
alert("Please Select Approve/Reject option"); alert("Please Select Approve/Reject option");
return false; return false;
} } else if (option == 1) {
else if (option == 1 )
{
// alert(' The Approval '); // alert(' The Approval ');
Status='<?php echo STORE_APPROVAL;?>'; Status = '<?php echo STORE_APPROVAL; ?>';
var strMsg='Do You want to Approve this requisition?'; var strMsg = 'Do You want to Approve this requisition?';
} } else {
else
{
Status='<?php echo STORE_REJECT;?>'; Status = '<?php echo STORE_REJECT; ?>';
var strMsg='Do You want to Reject this requisition?'; var strMsg = 'Do You want to Reject this requisition?';
} }
var answer = confirm(strMsg); var answer = confirm(strMsg);
if (answer) if (answer) {
{
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({
data:{id:id,newcomments:newcomments}, data: {
type:"POST", id: id,
url:"<?php echo base_url() ?>storerequisitionlist/ApproveRequest?Status="+Status, newcomments: newcomments
success:function(data) { },
if(data) type: "POST",
{ url: "<?php echo base_url() ?>storerequisitionlist/ApproveRequest?Status=" + Status,
success: function(data) {
if (data) {
$('#content').loader('hide'); $('#content').loader('hide');
alert(data); alert(data);
location.reload(); location.reload();
} } else {
else
{
alert("Error"); alert("Error");
} }
} }
}); });
} } else {
else return;
{ }
return;
}
} }
$(function() { $(function() {
var d = new Date(); var d = new Date();
var month = d.getMonth(); var month = d.getMonth();
var day = d.getDate(); var day = d.getDate();
var year = d.getFullYear() ; var year = d.getFullYear();
var SIAStartYear = year - 2015; var SIAStartYear = year - 2015;
var mindt = year-70; var mindt = year - 70;
var maxdt = year-15; var maxdt = year - 15;
$( ".datePicker" ).datepicker( $(".datePicker").datepicker({
{ minDate: new Date(year - SIAStartYear, 1, 1),
minDate : new Date(year-SIAStartYear,1,1), maxDate: 'now',
maxDate :'now', dateFormat: 'mm/dd/yy',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true, changeMonth: true,
} changeYear: true,
); });
//$('#SearchDate').daterangepicker( ); //$('#SearchDate').daterangepicker( );
//Initialize Select2 Elements //Initialize Select2 Elements
$(".select2").select2(); $(".select2").select2();
//$('#SearchDate').val(''); //$('#SearchDate').val('');
$('#SearchDate').daterangepicker( $('#SearchDate').daterangepicker({
{
locale: { locale: {
format: 'DD-MM-YYYY' format: 'DD-MM-YYYY'
}, },
showDropdowns: true showDropdowns: true
}, },
function(start, end, label) { function(start, end, label) {
startDate = start.format('DD-MM-YYYY'); startDate = start.format('DD-MM-YYYY');
endDate = end.format('DD-MM-YYYY'); endDate = end.format('DD-MM-YYYY');
@ -372,12 +361,12 @@ function(start, end, label) {
//alert("A new date range was chosen: " + start.format('DD-MM-YYYY') + ' to ' + end.format('DD-MM-YYYY')); //alert("A new date range was chosen: " + start.format('DD-MM-YYYY') + ' to ' + end.format('DD-MM-YYYY'));
}); });
}); });
$(function () { $(function() {
$('#Items').DataTable({ $('#Items').DataTable({
"paging": false, "paging": false,
@ -388,19 +377,20 @@ $(function () {
"autoWidth": false "autoWidth": false
}); });
$.fn.dataTable.moment( 'DD-MM-YYYY' ); $.fn.dataTable.moment('DD-MM-YYYY');
$('#Requisition').DataTable({ $('#Requisition').DataTable({
"paging": true, "paging": true,
"lengthChange": true, "lengthChange": true,
"searching": true, "searching": true,
"ordering": true, "ordering": true,
// "columnDefs" : [{"targets":2, "type":"date-eu"}], // "columnDefs" : [{"targets":2, "type":"date-eu"}],
"aaSorting": [[ 2, "desc" ]], "aaSorting": [
[2, "desc"]
],
"info": true, "info": true,
"autoWidth": true "autoWidth": true
}); });
}); });
</script> </script>
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script> <script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>

61
app/Views/capitalpurchaseorder.php
View File

@ -149,14 +149,13 @@
// changeYear: true, // changeYear: true,
// yearRange: '0:+10' // yearRange: '0:+10'
// }); // });
// $("#Exchangerateon").datepicker({ $("#Exchangerateon").datepicker({
// //minDate : d, format: 'dd-mm-yyyy',
// maxDate: 'now', startDate: new Date(),
// dateFormat: 'dd-mm-yy', autoclose: true,
// changeMonth: true, todayHighlight: true,
// changeYear: true, clearBtn: true
// yearRange: '-100:+0' });
// });
$('#Date').click(function() { $('#Date').click(function() {
//for Dispatch range selection //for Dispatch range selection
@ -395,8 +394,8 @@
<label>Delivery Date<span class="text-danger">*</span></label> <label>Delivery Date<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
$formattedDate = $dt->format('Y-m-d'); $formattedDate = $dt->format('d-m-Y');
$data = array('type' => 'date', 'name' => 'Deliverydate', 'value' => set_value('Deliverydate', $formattedDate), 'id' => 'Deliverydate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type' => 'text', 'name' => 'Deliverydate', 'value' => set_value('Deliverydate', $formattedDate), 'id' => 'Deliverydate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -420,8 +419,8 @@
<label>Exchange Rate On</label> <label>Exchange Rate On</label>
<div> <div>
<?php <?php
$formattedDate = $dt->format('Y-m-d'); $formattedDate = $dt->format('d-m-Y');
$data = array('type' => 'date', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $formattedDate), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type' => 'text', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $formattedDate), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -454,8 +453,8 @@
<label>Purchase Order Date</label> <label>Purchase Order Date</label>
<div> <div>
<?php <?php
$formattedDate = $dt->format('Y-m-d'); $formattedDate = $dt->format('d-m-Y');
$data = array('type' => "date", 'name' => 'PODate', 'value' => set_value('PODate', $formattedDate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type' => "text", 'name' => 'PODate', 'value' => set_value('PODate', $formattedDate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -2254,21 +2253,20 @@
$(function() { $(function() {
// $("#PODate").datepicker({ $("#PODate").datepicker({
// minDate: d, format: 'dd-mm-yyyy',
// maxDate: 'now', startDate: new Date(),
// dateFormat: 'dd-mm-yy', autoclose: true,
// changeMonth: true, todayHighlight: true,
// changeYear: true, clearBtn: true
// yearRange: '-100:+0' });
// }); $("#Deliverydate").datepicker({
// $("#Deliverydate").datepicker({ format: 'dd-mm-yyyy',
// minDate: 'now', startDate: new Date(),
// dateFormat: 'dd-mm-yy', autoclose: true,
// changeMonth: true, todayHighlight: true,
// changeYear: true, clearBtn: true
// yearRange: '0:+10' });
// });
var a = parseFloat($('#optcapital').val()); var a = parseFloat($('#optcapital').val());
@ -3312,7 +3310,7 @@
</td> </td>
</tr>`; </tr>`;
$('#capitalAppend').append(rowHtml); $('#capitalAppend').append(rowHtml);
//clearCapitalModalFields(); //clearCapitalModalFields();
var theForm = $(".CapitalPO"); var theForm = $(".CapitalPO");
@ -4175,7 +4173,8 @@ $('#capitalAppend').append(rowHtml);
}); });
} }
}); }); });
});
/*get edit material list*/ /*get edit material list*/
$('#EditMaterialCode').change(function() { $('#EditMaterialCode').change(function() {

5
app/Views/dashboard.php
View File

@ -11,6 +11,7 @@ if (!empty($EmpCount)) {
?> ?>
<style> <style>
@media (min-width: 991.98px) { @media (min-width: 991.98px) {
.avatar-title.bg-soft-primary.rounded { .avatar-title.bg-soft-primary.rounded {
background-color: 'black'; background-color: 'black';
@ -640,10 +641,8 @@ if (!empty($EmpCount)) {
<!-- </section> --> <!-- </section> -->
<!-- Main content --> <!-- Main content -->
<section class="content"> <section class="content">
<br><br>
<br><br>
<div class="row"> <div class="row">
<div class="col-12 text-right" style="height: 75px;"> <div class="col-12 text-right synczohobooks_button" style="height: 75px;">
<a href="javascript:void(0)" type="button" title="Sync With Zoho Books" class="btn btn-success" onclick="synczohobooks()"> <a href="javascript:void(0)" type="button" title="Sync With Zoho Books" class="btn btn-success" onclick="synczohobooks()">
<i class="fas fa-sync-alt"></i> <!-- <img src="<?php echo base_url(); ?>public/new_assets/images/zoho_sync.png" alt="Sync Icon" style="width: 20px; height: 20px;"> --> <i class="fas fa-sync-alt"></i> <!-- <img src="<?php echo base_url(); ?>public/new_assets/images/zoho_sync.png" alt="Sync Icon" style="width: 20px; height: 20px;"> -->
</a> </a>

4
app/Views/importpo.php
View File

@ -202,7 +202,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
return false; return false;
} else if ($('#Importoption').val() == "0") { } else if ($('#Importoption').val() == "0") {
alert('Please Select POType'); alert('Please Select Import Type');
$('#Importoption').focus(); $('#Importoption').focus();
return false; return false;
@ -4196,7 +4196,7 @@ $('#ImportAppend').append(rowHtml);
} else if ($('#Importoption').val() == "0") { } else if ($('#Importoption').val() == "0") {
alert('Please Select POType'); alert('Please Select Import Type');
$('#Importoption').focus(); $('#Importoption').focus();
return false; return false;

8
app/Views/includes/new_footer.php
View File

@ -111,6 +111,14 @@
} }
}); });
} }
// $("#hdate").datepicker({
// format: 'dd-mm-yyyy', // Correct format for Bootstrap Datepicker
// startDate: new Date(), // Replace `d` with `new Date()` if `d` is not defined
// autoclose: true,
// todayHighlight: true,
// clearBtn: true
// });
</script> </script>
</body> </body>

6
app/Views/includes/new_header.php
View File

@ -120,6 +120,12 @@
margin-top: 55px; margin-top: 55px;
} }
} }
@media (max-width: 992px) {
.synczohobooks_button {
margin-top: 55px;
}
}
.topnav .navbar-nav .nav-link { .topnav .navbar-nav .nav-link {
line-height: 15px; line-height: 15px;

116
app/Views/publicholidays.php
View File

@ -1,61 +1,3 @@
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.13.6/underscore-min.js"></script>
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js"></script>
<script>
$(document).ready(function() {
// Initialize the datepicker with onSelect event
$("#hdate").datepicker({
minDate: null,
dateFormat: 'dd-mm-yy',
changeMonth: true,
changeYear: true,
yearRange: '-100:+0',
});
function isValidDateFormat(date) {
var datePattern = /^\d{2}-\d{2}-\d{4}$/;
var altDatePattern = /^\d{2}\/\d{2}\/\d{4}$/;
return datePattern.test(date) || altDatePattern.test(date);
}
function convertToDDMMYY(date) {
if (date.includes("/")) {
var parts = date.split("/");
return parts[1] + '-' + parts[0] + '-' + parts[2];
}
return date;
}
// Handle manual input change for the date
$("#hdate").on('change', function() {
var selectedDate = $(this).val(); // Get the date entered manually (string)
if (selectedDate) {
if (isValidDateFormat(selectedDate)) {
selectedDate = convertToDDMMYY(selectedDate);
var dateParts = selectedDate.split("-");
var year = dateParts[2];
var yearNumber = parseInt(year, 10);
console.log("Year as a number: " + yearNumber);
$('#page-title-year-selected').html(yearNumber);
} else {
console.log("Invalid date format. Please enter in 'dd-mm-yy' format.");
}
} else {
console.log("No date selected or entered.");
}
});
});
$('html').bind('keypress', function(e) {
//alert('Key Pressed');
if (e.keyCode == 13) {
return false;
}
});
</script>
<style type="text/css"> <style type="text/css">
.num { .num {
text-align: right; text-align: right;
@ -79,7 +21,6 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<br>
<div class="row" style="padding-left: 26px;"> <div class="row" style="padding-left: 26px;">
<div class="col-md-3"> <div class="col-md-3">
<span>Holiday Name : </span> <span>Holiday Name : </span>
@ -224,3 +165,60 @@
// $('#page-title-year-selected') // $('#page-title-year-selected')
</script> </script>
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.13.6/underscore-min.js"></script>
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js"></script>
<script>
$(document).ready(function() {
$("#hdate").datepicker({
format: 'dd-mm-yyyy', // Correct format for Bootstrap Datepicker
startDate: new Date(), // Replace `d` with `new Date()` if `d` is not defined
autoclose: true,
todayHighlight: true,
clearBtn: true
});
function isValidDateFormat(date) {
var datePattern = /^\d{2}-\d{2}-\d{4}$/;
var altDatePattern = /^\d{2}\/\d{2}\/\d{4}$/;
return datePattern.test(date) || altDatePattern.test(date);
}
function convertToDDMMYY(date) {
if (date.includes("/")) {
var parts = date.split("/");
return parts[1] + '-' + parts[0] + '-' + parts[2];
}
return date;
}
// Handle manual input change for the date
$("#hdate").on('change', function() {
var selectedDate = $(this).val(); // Get the date entered manually (string)
if (selectedDate) {
if (isValidDateFormat(selectedDate)) {
selectedDate = convertToDDMMYY(selectedDate);
var dateParts = selectedDate.split("-");
var year = dateParts[2];
var yearNumber = parseInt(year, 10);
console.log("Year as a number: " + yearNumber);
$('#page-title-year-selected').html(yearNumber);
} else {
console.log("Invalid date format. Please enter in 'dd-mm-yy' format.");
}
} else {
console.log("No date selected or entered.");
}
});
});
$('html').bind('keypress', function(e) {
//alert('Key Pressed');
if (e.keyCode == 13) {
return false;
}
});
</script>

8
app/Views/purchaseorder.php
View File

@ -135,7 +135,7 @@ if (!empty($INRSYMBOL)) {
$('#Deliverydate').focus(); $('#Deliverydate').focus();
return false; return false;
} else if ($('#PoTypeOptions').val() == "0") { } else if ($('#PoTypeOptions').val() == "0") {
alert('Please Select POType'); alert('Please Select Revenue Type');
$('#PoTypeOptions').focus(); $('#PoTypeOptions').focus();
return false; return false;
} else if ($('#BudgetType').val() == "0") { } else if ($('#BudgetType').val() == "0") {
@ -1868,7 +1868,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-3" id="Deliverydtdiv"> <div class="form-group col-md-3" id="Deliverydtdiv">
<label>Delivery Date<span class="badge mandatory">*</span></label> <label>Delivery Date<span class="badge mandatory">*</span></label>
<input class="form-control num" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="Deliverydt" name="Deliverydt" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off" value="<?= date('d/m/Y'); ?>"> <input class="form-control num" data-provide="datepicker" data-date-format="dd-mm-yyyy" data-date-autoclose="true" id="Deliverydt" name="Deliverydt" data-date-start-date="<?= date('d-m-Y'); ?>" required autocomplete="off" value="<?= date('d-m-Y'); ?>">
<!-- <div> <!-- <div>
<?php <?php
@ -1898,7 +1898,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Purchase Order Date</label> <label>Purchase Order Date</label>
<input class="form-control num" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="PODate" name="PODate" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off" value="<?= date('d/m/Y'); ?>"> <input class="form-control num" data-provide="datepicker" data-date-format="dd-mm-yyyy" data-date-autoclose="true" id="PODate" name="PODate" data-date-start-date="<?= date('d-m-Y'); ?>" required autocomplete="off" value="<?= date('d-m-Y'); ?>">
<!-- <div> <!-- <div>
<?php <?php
@ -3768,7 +3768,7 @@ $('#RevenueAppend').append(rowHtml);
$('#insurance').focus(); $('#insurance').focus();
return false; return false;
} else if ($('#PoTypeOptions').val() == "0") { } else if ($('#PoTypeOptions').val() == "0") {
alert('Please Select POType'); alert('Please Select Revenue Type');
$('#PoTypeOptions').focus(); $('#PoTypeOptions').focus();
return false; return false;

53
app/Views/servicePurchaseorder.php
View File

@ -160,7 +160,7 @@ if (!empty($INRSYMBOL)) {
alert('Please select a Supplier.'); alert('Please select a Supplier.');
return false; return false;
} }
}); });
$('#ReqNo').change(function() { $('#ReqNo').change(function() {
@ -536,7 +536,16 @@ if (!empty($INRSYMBOL)) {
} }
$(document).ready(function() { $(document).ready(function() {
$("#Deliverydt").datepicker({
format: 'dd-mm-yyyy',
startDate: new Date(),
clearBtn: true
});
$("#PODate").datepicker({
format: 'dd-mm-yyyy',
startDate: new Date(),
clearBtn: true
});
$("#PaymentTerms").select2(); $("#PaymentTerms").select2();
$('#Date').click(function() { $('#Date').click(function() {
@ -635,17 +644,17 @@ if (!empty($INRSYMBOL)) {
<?php <?php
$options = array("0" => 'Select Supplier'); $options = array("0" => 'Select Supplier');
if (!empty($Suplist)) { if (!empty($Suplist)) {
foreach ($Suplist as $SID) : foreach ($Suplist as $SID) :
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName; $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
endforeach; endforeach;
} }
echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSupplier" required="true" class="form-control select2"'); echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSupplier" required="true" class="form-control select2"');
?> ?>
</div> <!-- 1.3. col-md-3 div closed here --> </div> <!-- 1.3. col-md-3 div closed here -->
@ -689,7 +698,8 @@ echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSu
</div> </div>
<div class="form-group col-md-3" id="Deliverydtdiv"> <!-- // $CurrentDate --> <div class="form-group col-md-3" id="Deliverydtdiv"> <!-- // $CurrentDate -->
<label>Delivery Date<span class="text-danger">*</span></label> <label>Delivery Date<span class="text-danger">*</span></label>
<input type="date" class="form-control num" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="Deliverydt" name="Deliverydt" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off" value="<?= date('d/m/Y'); ?>"> <!-- <input type="text" class="form-control num" data-provide="" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="Deliverydt" name="Deliverydt" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off" value="<?= date('d/m/Y'); ?>"> -->
<input type="text" class="form-control num" data-provide="" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="Deliverydt" name="Deliverydt" required autocomplete="off" value="<?= date('d-m-Y'); ?>">
</div> </div>
<div class="form-group col-md-3" id="Schedulediv" style="display:none;"> <div class="form-group col-md-3" id="Schedulediv" style="display:none;">
<label>Schedule By<span class="text-danger">*</span></label> <label>Schedule By<span class="text-danger">*</span></label>
@ -713,7 +723,7 @@ echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSu
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Purchase Order Date</label> <label>Purchase Order Date</label>
<input type="date" class="form-control num" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="PODate" name="PODate" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off" value="<?= date('d/m/Y'); ?>"> <input type="text" class="form-control num" data-date-format="dd-mm-yyyy" data-date-autoclose="true" id="PODate" name="PODate" required autocomplete="off" value="<?= date('d-m-Y'); ?>">
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Mode Of Shipment</label> <label>Mode Of Shipment</label>
@ -807,15 +817,15 @@ echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSu
<?php <?php
$optionsInsurance = array(); // Initialize the options array $optionsInsurance = array(); // Initialize the options array
if (!empty($insuranceStatus)) { if (!empty($insuranceStatus)) {
foreach ($insuranceStatus as $INS) { foreach ($insuranceStatus as $INS) {
$optionsInsurance[$INS['value']] = $INS['name']; $optionsInsurance[$INS['value']] = $INS['name'];
} }
} }
echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus" required="true" class="form-control select2"'); echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus" required="true" class="form-control select2"');
?> ?>
@ -1244,7 +1254,7 @@ echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceSta
<?php <?php
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?> echo form_textarea($data); ?>
</div> </div>
</div><!-- SERVICE --> </div><!-- SERVICE -->
</div> </div>
@ -1766,8 +1776,8 @@ echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceSta
</tr> </tr>
`; `;
// Append the generated HTML to your table body // Append the generated HTML to your table body
$('#ServiceAppend').append(rowHtml); $('#ServiceAppend').append(rowHtml);
@ -2173,12 +2183,17 @@ $('#ServiceAppend').append(rowHtml);
// this function is used to clear data changing schedule option // this function is used to clear data changing schedule option
$('#Scheduleby').change(function() { $('#Scheduleby').change(function() {
// $("#Deliverydt").datepicker({
// minDate: 'now',
// dateFormat: 'mm/dd/yy',
// });
$("#Deliverydt").datepicker({ $("#Deliverydt").datepicker({
minDate: 'now', format: 'dd-mm-yyyy',
dateFormat: 'mm/dd/yy', startDate: new Date(),
yearRange: '0:+10',
changeMonth: true, changeMonth: true,
changeYear: true, changeYear: true,
yearRange: '0:+10' clearBtn: true
}); });
}); });