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

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
vadivelJ96 2024-12-20 18:07:10 +05:30
commit d1a546b2e6
3 changed files with 188 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
app/Controllers/Emppaydate.php
View File

@ -92,6 +92,33 @@ class Emppaydate extends BaseController
$CreateBy = $this->session->get('userId');
$loandetails = array('EmpID' => $EmpID, 'Loan_Amount' => $Loan_Amount, 'Loan_Issued_Date' => $Load_Issued_date, 'Monthly_Due' => $Due_Amount, 'Due_Start_Date' => $Due_Started, 'No_of_Dues' => $No_Of_Dues, 'Paid_Due' => $Paid_due, 'Remaining_Due' => $Remaining_Due, 'Paid_Amount' => $Paid_Amount, 'is_Active' => 1, 'Created_By' => $CreateBy);
$path = ROOTPATH.'public/uploads/images/';
$file2 = $this->request->getFile('request_letter');
if ($file2 && $file2->isValid() && !$file2->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$request_letter = $file2->getName().rand(00,99);
$file2->move($path,$request_letter);
$loandetails['request_letter'] = $request_letter;
}
else{
$loandetails['request_letter'] = NULL;
}
$file1 = $this->request->getFile('payment_statement');
if ($file1 && $file1->isValid() && !$file1->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$payment_statement = $file1->getName().rand(00,99);
$file1->move($path,$payment_statement);
$loandetails['payment_statement'] = $payment_statement;
}
else{
$loandetails['payment_statement'] = NULL;
}
if ($Loan_Amount != 0) {
$result2 = $this->emppaydate_model->addLoanInfo($loandetails, 'add');
@ -145,6 +172,32 @@ class Emppaydate extends BaseController
$loandetails = array('Loan_ID' => $loan_ID, 'EmpID' => $EmpID, 'Loan_Amount' => $Loan_Amount, 'Loan_Issued_Date' => $Load_Issued_date, 'Monthly_Due' => $Due_Amount, 'Due_Start_Date' => $Due_Started, 'No_of_Dues' => $No_Of_Dues, 'Paid_Due' => $Paid_due, 'Remaining_Due' => $Remaining_Due, 'Paid_Amount' => $Paid_Amount, 'is_Active' => 1, 'Last_Mod_By' => $Last_Mod_By);
$path = ROOTPATH.'public/uploads/images/';
$file2 = $this->request->getFile('request_letter');
if ($file2 && $file2->isValid() && !$file2->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$request_letter = $file2->getName().rand(00,99);
$file2->move($path,$request_letter);
$loandetails['request_letter'] = $request_letter;
}
else{
$loandetails['request_letter'] = $this->request->getPost('hidden_request_letter') ? $this->request->getPost('hidden_request_letter') : NULL;
}
$file1 = $this->request->getFile('payment_statement');
if ($file1 && $file1->isValid() && !$file1->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$payment_statement = $file1->getName().rand(00,99);
$file1->move($path,$payment_statement);
$loandetails['payment_statement'] = $payment_statement;
}
else{
$loandetails['payment_statement'] = $this->request->getPost('hidden_payment_statement') ? $this->request->getPost('hidden_payment_statement') : NULL;
}
if ($Loan_Amount != 0 and $loan_ID != '') {
$result2 = $this->emppaydate_model->addLoanInfo($loandetails, 'update');
if ($result2 > 0) {

115
app/Views/addemppaydate.php
View File

@ -29,7 +29,7 @@
<div class="row">
<div class="col-12">
<div class="p-2">
<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" enctype="multipart/form-data">
<div class="box-body">
<!-- Supplier Information -->
<div class="col-md-12" style="margin-bottom: 27px;">
@ -97,48 +97,65 @@
<div class="row">
<div class="col-md-3">
<div class="form-group">
<div class="col-md-3">
<div class="form-group">
<span for="EmpID">Loan Issue(d) Date</span>
<input
type="text"
name="loan_issued_date"
id="loan_issued_date"
class="form-control mt-2"
data-provide="datepicker"
data-date-format="M-yyyy"
data-date-min-view-mode="1"
value=""
/>
<div class="form-group">
<span for="EmpID">Loan Issue(d) Date</span>
<input
type="text"
name="loan_issued_date"
id="loan_issued_date"
class="form-control"
/>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for="Basic_Pay">Due Started</span>
<input type="date" class="form-control requried num" id="due_started"
name="due_started" value="" >
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for="Basic_Pay">Paid Amount</span>
<input type="text" value="0.00" class="form-control requried num"
id="Paid_Amount" name="Paid_Amount" value="0"
pattern="([0-9]{1,7}([.][0-9]{1,2})?)"
title="Minimum 1 digit,Maximum 2 Digit" readonly>
<input
type="text"
class="form-control requried"
id="due_started"
name="due_started"/>
</div>
</div>
</div>
</div>
<!-- File -->
<h4 class="header-title">Loan Documents</h4>
<!-- Text input-->
<div class="row">
<div class="form-group" >
<div class="col-md-6">
<span class="col-form-label" for="request_letter">Request letter</span>
<input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="request_letter" name="request_letter" />
</div>
</div>
</div>
<div class="row">
<div class="form-group" >
<div class=" col-md-6">
<span class="col-form-label" for="payment_statement">Payment Receipt</span>
<input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="payment_statement" name="payment_statement" />
</div>
</div>
</div>
<input type="hidden" id="remaining_due" name="remaining_due" value="0">
<input type="hidden" id="paid_due" name="paid_due" value="0">
<input type="hidden" id="Paid_Amount" name="Paid_Amount" value="0">
</div>
</div>
<div class="col-md-12 text-right">
@ -202,23 +219,31 @@
$(document).ready(function() {
// Get the current date
const currentDate = new Date();
// $('#loan_issued_date').datepicker({
// format: "M-yyyy",
// minViewMode: 1,
// autoclose: true, // Ensures the datepicker closes after selection
// }).on('changeDate', function (e) {
// $(this).val(e.format('M-yyyy')); // Explicitly set the value to the input field
// });
// Format the date as "M-yyyy"
const options = { month: 'short', year: 'numeric' };
const formattedDate = currentDate.toLocaleDateString('en-US', options).replace(' ', '-');
$("#due_started").datepicker({
minDate: 'now',
//maxDate : 'now',
dateFormat: 'dd-mm-yy',
changeMonth: true,
changeYear: true,
yearRange: '-100:+1'
});
// Set the value of the input field
document.getElementById('due_started').value = formattedDate;
document.getElementById('loan_issued_date').value = formattedDate;
$('#loan_issued_date').datepicker({
format: "M-yyyy",
minViewMode: 1, // Month selection only
orientation: "bottom auto", // Ensures it opens downward
autoclose: true
});
$('#due_started').datepicker({
format: "M-yyyy",
minViewMode: 1, // Month selection only
orientation: "bottom auto", // Ensures it opens downward
autoclose: true
});
});

110
app/Views/editOldemppay.php
View File

@ -2,53 +2,23 @@
$(document).ready(function() {
$("#loan_issued_date").datepicker({
minDate: 'now',
// maxDate : 'now',
dateFormat: 'dd-mm-yy',
changeMonth: true,
changeYear: true,
yearRange: '-100:+0'
$('#loan_issued_date').datepicker({
format: "M-yyyy",
minViewMode: 1, // Month selection only
orientation: "bottom auto", // Ensures it opens downward
autoclose: true
});
$("#due_started").datepicker({
minDate: 'now',
//maxDate : 'now',
dateFormat: 'dd-mm-yy',
changeMonth: true,
changeYear: true,
yearRange: '-100:+1'
$('#due_started').datepicker({
format: "M-yyyy",
minViewMode: 1, // Month selection only
orientation: "bottom auto", // Ensures it opens downward
autoclose: true
});
});
// window.onload = function(){
// loanReset();
// function loanReset(){
// //alert("hi");
// var loan=$("#Loan_Amount").val();//document.getElementById('Loan_Amount').value;
// var paid=$("#Paid_Amount").val();//document.getElementById('Paid_Amount').value;
// if(loan !=0){
// if (loan == paid)
// {
// //alert("loan reset");
// $("#Loan_Amount").val(0.00);
// $("#Paid_Amount").val(0.00);
// $("#monthly_due").val(0.00);
// $("#no_of_due").val(0);
// $("#remaining_due").val(0);
// $("#paid_due").val(0);
// $("#loan_issued_date").val("");
// $("#due_started").val("");
// }else
// {
// //alert("loan pending");
// }
// }
// }
// };
</script>
<?php
@ -110,7 +80,7 @@ if (!empty($emppay)) {
}
if (!empty($ep->Loan_Issued_Date)) {
$Loan_issued_date = new DateTime($ep->Loan_Issued_Date, new DateTimeZone('Asia/Kolkata'));
$Loan_issued_date = $Loan_issued_date->format('d-m-Y');
$Loan_issued_date = $Loan_issued_date->format('M-Y');
} else {
$Loan_issued_date = null;
}
@ -121,7 +91,7 @@ if (!empty($emppay)) {
}
if (!empty($ep->Due_Start_Date)) {
$Due_start_date = new DateTime($ep->Due_Start_Date, new DateTimeZone('Asia/Kolkata'));
$Due_start_date = $Due_start_date->format('d-m-Y');
$Due_start_date = $Due_start_date->format('M-Y');
} else {
$Due_start_date = null;
}
@ -146,6 +116,8 @@ if (!empty($emppay)) {
$Last_Mod_By = $ep->Last_Mod_By;
$Last_Mod_Time = $ep->Last_Mod_Time;
$loanid = $ep->Loan_ID;
$request_letter = $ep->request_letter;
$payment_statement = $ep->payment_statement;
}
}
@ -180,7 +152,7 @@ if (!empty($emppay)) {
<div class="row">
<div class="col-12">
<div class="p-2">
<form role="form" id="edit" action="<?php echo base_url() ?>emppaydate/editemppay" method="post">
<form role="form" id="edit" action="<?php echo base_url() ?>emppaydate/editemppay" method="post" enctype="multipart/form-data">
<div class="box-body">
<!-- Supplier Information -->
<div class="col-md-12" style="margin-bottom: 27px;">
@ -235,7 +207,7 @@ if (!empty($emppay)) {
<div class="form-group">
<div class="form-group">
<span for="EmpID">Loan Issue(d) Date</span>
<input type="text" class="form-control num" id="loan_issued_date" name="loan_issued_date" value="<?php echo $Loan_issued_date; ?>" onchange="dateCalulation();">
<input type="text" class="form-control num" id="loan_issued_date" name="loan_issued_date" value="<?php echo $Loan_issued_date; ?>" >
</div>
</div>
</div>
@ -244,7 +216,7 @@ if (!empty($emppay)) {
<div class="form-group">
<div class="form-group">
<span for="Basic_Pay">Due Started</span>
<input type="text" class="form-control requried num" id="due_started" name="due_started" value="<?php echo $Due_start_date; ?>" onchange="dateCalulation();">
<input type="text" class="form-control requried num" id="due_started" name="due_started" value="<?php echo $Due_start_date; ?>" >
</div>
</div>
</div>
@ -272,6 +244,54 @@ if (!empty($emppay)) {
</div>
<!-- File -->
<h4 class="header-title">Loan Documents</h4>
<!-- Text input-->
<div class="row">
<div class="form-group" >
<div class="col-md-4">
<span class="col-form-label" for="request_letter">Request letter</span>
<input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="request_letter" name="request_letter" />
<input type="hidden" id="hidden_request_letter" name="hidden_request_letter" value="<?php echo $request_letter; ?>" />
</div>
</div>
<?php if ($request_letter) { ?>
<div class="form-group" >
<div class="col-md-8">
<u>
<a href="<?php echo base_url() . 'public/uploads/images/' . $request_letter ?>">
<span>Previously Uploaded Document - </span><small><?= $request_letter; ?></small>
</a>
</u>
</div>
</div>
<?php } ?>
</div>
<div class="row">
<div class="form-group" >
<div class=" col-md-4">
<span class="col-form-label" for="payment_statement">Payment Receipt</span>
<input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="payment_statement" name="payment_statement" />
<input type="hidden" id="hidden_payment_statement" name="hidden_payment_statement" value="<?php echo $payment_statement; ?>" />
</div>
</div>
<?php if ($payment_statement) { ?>
<div class="form-group" >
<div class="col-md-8">
<u>
<a href="<?php echo base_url() . 'public/uploads/images/' . $payment_statement ?>">
<span>Previously Uploaded Document - </span><small><?= $payment_statement; ?></small>
</a>
</u>
</div>
</div>
<?php } ?>
</div>
</div>
</div>
<div class="col-md-12 text-right">