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({
minDate: 'now',
orientation: 'bottom',
// maxDate : 'now',
dateFormat: 'dd-mm-yy',
changeMonth: true,
@ -55,24 +56,6 @@
<form role="form" id="addemppaydate" action="<?php echo base_url() ?>emppaydate/addNewemppay" method="post" name="addform">
<div class="box-body">
<!-- 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="row">
<div class="col-md-3">

90
app/Views/approvalstorerequisitionslip.php
View File

@ -1,4 +1,3 @@
<?php
//print_r($AppList);
?>
@ -10,7 +9,9 @@
<div class="box">
<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>
<?php
@ -27,7 +28,9 @@
<div class="modal-content">
<div class="modal-header">
<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 align="left">
@ -123,7 +126,8 @@
</div>
</div>
</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>
</div>
</div>
@ -157,12 +161,10 @@
<tbody id="ApprovalList">
<?php
if(!empty($AppList))
{
if (!empty($AppList)) {
//print_r($AppList);
$index = 0;
foreach($AppList as $record)
{
foreach ($AppList as $record) {
$index = $index + 1;
?>
<tr id="<?php echo $index ?>">
@ -173,8 +175,7 @@
echo $ReqDate;
?></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> -->
@ -195,11 +196,10 @@
<option value="2">Reject</option>
</select></td>
<?php
}
else
{
} else {
?>
<td><?php echo "---";//$record->Comments ?></td>
<td><?php echo "---"; //$record->Comments
?></td>
<!-- <td><?php echo $record->StatusName ?></td> -->
<?php
@ -231,8 +231,7 @@
var startDate = '';
var endDate = '';
function Reset()
{
function Reset() {
$('#RequisitionStatus').val("-1");
$('#SearchDate').val('');
}
@ -247,7 +246,9 @@ function Reset()
$('#content').loader('show');
$.ajax({
data:{id:ReqId},
data: {
id: ReqId
},
type: "POST",
dataType: 'json',
url: "<?php echo base_url() ?>storerequisitionlist/ViewRequest",
@ -255,8 +256,7 @@ function Reset()
//success:function(data) {
$('#content').loader('hide');
//alert(json.Requist);
if(json.Requist != '')
{
if (json.Requist != '') {
//alert(json.Requist[0]['Requestedby']) ;
$("#Requestedby").val(json.Requist[0]['FirstName']);
$("#ReqDate").val(json.Requist[0]['ReqDate']);
@ -272,30 +272,23 @@ function Reset()
});
function saveToDatabase(ReqId,Index,option,com)
{
function saveToDatabase(ReqId, Index, option, com) {
var newcomments = document.getElementById('newcomments' + Index + '').innerHTML;
var id = ReqId;
var Status = '';
if (option == -1 )
{
if (option == -1) {
alert("Please Select Approve/Reject option");
return false;
}
else if (option == 1 )
{
} else if (option == 1) {
// alert(' The Approval ');
Status = '<?php echo STORE_APPROVAL; ?>';
var strMsg = 'Do You want to Approve this requisition?';
}
else
{
} else {
Status = '<?php echo STORE_REJECT; ?>';
var strMsg = 'Do You want to Reject this requisition?';
@ -303,22 +296,21 @@ function saveToDatabase(ReqId,Index,option,com)
}
var answer = confirm(strMsg);
if (answer)
{
if (answer) {
$('#content').loader('show');
$.ajax({
data:{id:id,newcomments:newcomments},
data: {
id: id,
newcomments: newcomments
},
type: "POST",
url: "<?php echo base_url() ?>storerequisitionlist/ApproveRequest?Status=" + Status,
success: function(data) {
if(data)
{
if (data) {
$('#content').loader('hide');
alert(data);
location.reload();
}
else
{
} else {
alert("Error");
}
@ -327,9 +319,7 @@ function saveToDatabase(ReqId,Index,option,com)
});
}
else
{
} else {
return;
}
@ -344,19 +334,18 @@ $(function() {
var SIAStartYear = year - 2015;
var mindt = year - 70;
var maxdt = year - 15;
$( ".datePicker" ).datepicker(
{
$(".datePicker").datepicker({
minDate: new Date(year - SIAStartYear, 1, 1),
maxDate: 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,
}
);
dateFormat: 'mm/dd/yy',
changeMonth: true,
changeYear: true,
});
//$('#SearchDate').daterangepicker( );
//Initialize Select2 Elements
$(".select2").select2();
//$('#SearchDate').val('');
$('#SearchDate').daterangepicker(
{
$('#SearchDate').daterangepicker({
locale: {
format: 'DD-MM-YYYY'
},
@ -395,7 +384,9 @@ $(function () {
"searching": true,
"ordering": true,
// "columnDefs" : [{"targets":2, "type":"date-eu"}],
"aaSorting": [[ 2, "desc" ]],
"aaSorting": [
[2, "desc"]
],
"info": true,
"autoWidth": true
@ -403,4 +394,3 @@ $(function () {
});
</script>
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>

59
app/Views/capitalpurchaseorder.php
View File

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

5
app/Views/dashboard.php
View File

@ -11,6 +11,7 @@ if (!empty($EmpCount)) {
?>
<style>
@media (min-width: 991.98px) {
.avatar-title.bg-soft-primary.rounded {
background-color: 'black';
@ -640,10 +641,8 @@ if (!empty($EmpCount)) {
<!-- </section> -->
<!-- Main content -->
<section class="content">
<br><br>
<br><br>
<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()">
<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>

4
app/Views/importpo.php
View File

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

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

@ -120,6 +120,12 @@
margin-top: 55px;
}
}
@media (max-width: 992px) {
.synczohobooks_button {
margin-top: 55px;
}
}
.topnav .navbar-nav .nav-link {
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">
.num {
text-align: right;
@ -79,7 +21,6 @@
<div class="row">
<div class="col-12">
<div class="card">
<br>
<div class="row" style="padding-left: 26px;">
<div class="col-md-3">
<span>Holiday Name : </span>
@ -224,3 +165,60 @@
// $('#page-title-year-selected')
</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();
return false;
} else if ($('#PoTypeOptions').val() == "0") {
alert('Please Select POType');
alert('Please Select Revenue Type');
$('#PoTypeOptions').focus();
return false;
} else if ($('#BudgetType').val() == "0") {
@ -1868,7 +1868,7 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="form-group col-md-3" id="Deliverydtdiv">
<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>
<?php
@ -1898,7 +1898,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-row">
<div class="form-group col-md-3">
<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>
<?php
@ -3768,7 +3768,7 @@ $('#RevenueAppend').append(rowHtml);
$('#insurance').focus();
return false;
} else if ($('#PoTypeOptions').val() == "0") {
alert('Please Select POType');
alert('Please Select Revenue Type');
$('#PoTypeOptions').focus();
return false;

27
app/Views/servicePurchaseorder.php
View File

@ -536,7 +536,16 @@ if (!empty($INRSYMBOL)) {
}
$(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();
$('#Date').click(function() {
@ -689,7 +698,8 @@ echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSu
</div>
<div class="form-group col-md-3" id="Deliverydtdiv"> <!-- // $CurrentDate -->
<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 class="form-group col-md-3" id="Schedulediv" style="display:none;">
<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-group col-md-3">
<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 class="form-group col-md-3">
<label>Mode Of Shipment</label>
@ -2173,12 +2183,17 @@ $('#ServiceAppend').append(rowHtml);
// this function is used to clear data changing schedule option
$('#Scheduleby').change(function() {
// $("#Deliverydt").datepicker({
// minDate: 'now',
// dateFormat: 'mm/dd/yy',
// });
$("#Deliverydt").datepicker({
minDate: 'now',
dateFormat: 'mm/dd/yy',
format: 'dd-mm-yyyy',
startDate: new Date(),
yearRange: '0:+10',
changeMonth: true,
changeYear: true,
yearRange: '0:+10'
clearBtn: true
});
});