tracker fixes : ps
This commit is contained in:
parent
99782747e4
commit
02635dfe1f
@ -186,7 +186,9 @@ class Driver extends BaseController
|
||||
$where_arr = ['DATE_FORMAT(t_driver_attendance.date, "%Y-%m")' =>$to_mysql_date,'t_driver_attendance.driver_id' =>$arr['empid']];
|
||||
|
||||
$data = $this->driver_model->updateDieselAndShedValuesBasedonEmpID($where_arr,$update_arr);
|
||||
return $data;
|
||||
return $this->response->setJSON($data);
|
||||
|
||||
// return $data;
|
||||
// [column] => shed_amount
|
||||
// [value] => 400
|
||||
// [date] => 21-02-2025
|
||||
|
||||
@ -1249,7 +1249,7 @@ class Emergencypurchaseorder extends BaseController
|
||||
}
|
||||
}
|
||||
if ($SkipInsert == "False") {
|
||||
$POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter);
|
||||
$POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter,'LineitemAuditorNotes' => $LineitemAuditorNotes);
|
||||
|
||||
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
|
||||
|
||||
@ -1419,7 +1419,7 @@ class Emergencypurchaseorder extends BaseController
|
||||
}
|
||||
if ($SkipInsert == "False") {
|
||||
if (strlen((string)$POLineItemNo) == 0) {
|
||||
$POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'CostCenterCode' => $CostCenter);
|
||||
$POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'CostCenterCode' => $CostCenter,'LineitemAuditorNotes' => $LineitemAuditorNotes);
|
||||
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
|
||||
if (count($POLineItem) > 0) {
|
||||
$LineItemNo = $POLineItem[0]['LineItemNo'];
|
||||
@ -1427,7 +1427,7 @@ class Emergencypurchaseorder extends BaseController
|
||||
} else {
|
||||
$LineItemNo = $POLineItemNo;
|
||||
|
||||
$POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CostCenterCode' => $CostCenter);
|
||||
$POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CostCenterCode' => $CostCenter,'LineitemAuditorNotes' => $LineitemAuditorNotes);
|
||||
$POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO, $POLineItemNo, $POLineItemList);
|
||||
}
|
||||
$isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo);
|
||||
|
||||
@ -429,7 +429,7 @@ class Purchaseorder extends BaseController
|
||||
// $html = view('pdf_view', $data);
|
||||
// $mpdf->WriteHTML($html); // Use WriteHTML() method to add body content
|
||||
$html = view('po_pdf', $data);
|
||||
// echo $html;die;
|
||||
// echo $html;die;
|
||||
$mpdf->WriteHTML($html); // Use WriteHTML() method to add body content
|
||||
|
||||
// Set HTML footer
|
||||
@ -3461,7 +3461,7 @@ class Purchaseorder extends BaseController
|
||||
$mpdf->use_kwt = true;
|
||||
|
||||
$html = view('po_pdf', $data);
|
||||
// echo $html;die;
|
||||
// echo $html;die;
|
||||
$mpdf->WriteHTML($html); // Use WriteHTML() method to add body content
|
||||
|
||||
|
||||
|
||||
@ -1251,8 +1251,8 @@ if (!empty($getlogpodtl)) {
|
||||
<th style="text-align:left !important; white-space: nowrap !important;">Item Code</th>
|
||||
<th style="white-space: nowrap !important;">Item Description</th>
|
||||
<th style="white-space: nowrap !important;">Line Item Specs</th>
|
||||
<th style="white-space: nowrap !important;">UOM</th>
|
||||
<th style="text-align: left; white-space: nowrap !important;">Quantity</th>
|
||||
<th style="white-space: nowrap !important;">UOM</th>
|
||||
<th style="text-align: right; white-space: nowrap !important;">Rate <?php echo "($INRSYM)" ?></th>
|
||||
<th style="text-align: right; white-space: nowrap !important;">Basic Amount <?php echo "($INRSYM)" ?></th>
|
||||
<th style="text-align: right; white-space: nowrap !important;">Tax Amount <?php echo "($INRSYM)" ?></th>
|
||||
@ -1607,28 +1607,41 @@ if (!empty($getlogpodtl)) {
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div> <?php } else {} ?> -->
|
||||
|
||||
|
||||
<div class="form-group col-md-12 px-4" align="left">
|
||||
|
||||
<label>Select Purchase Order File</label>
|
||||
<br>
|
||||
<input type="file" name="POFile" id="POFile">
|
||||
|
||||
</div>--> <?php } else {} ?>
|
||||
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 px-4">
|
||||
<label>Select Purchase Order File</label><br>
|
||||
<input type="file" name="POFile" id="POFile">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-12 px-4" id="deletePreviousPurchaseOrderFileDiv" align="left">
|
||||
<?php if ($PrePOFile) { ?>
|
||||
<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
|
||||
|
||||
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
|
||||
<?php if (!empty($PrePOFile)) {
|
||||
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
|
||||
if (file_exists($PrePOFilePath)) { ?>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
|
||||
<br />
|
||||
|
||||
<label><a title="previously uploaded PO File"
|
||||
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
|
||||
<span>previously uploaded purchase order file- </span>
|
||||
<small><?= $PrePOFile; ?></small></a></label>
|
||||
|
||||
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>
|
||||
|
||||
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php } ?>
|
||||
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" />
|
||||
<br>
|
||||
</div>
|
||||
|
||||
|
||||
<?php } ?>
|
||||
<!-- ends here -->
|
||||
|
||||
|
||||
<div class="form-group col-md-12 px-4">
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<span for="EmpID">Employee ID</span>
|
||||
<label for="EmpID">Employee ID</label>
|
||||
<font color="Red">*</font>
|
||||
<div class="form-group">
|
||||
|
||||
@ -51,8 +51,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
$js = array('id' => 'emp');
|
||||
echo form_dropdown('EmpID', $Employee, set_value('EmpID'), 'class="form-control"', $js);
|
||||
echo form_dropdown('EmpID', $Employee, set_value('EmpID'), 'class="form-control"', 'id="EmpID"', 'required="true"');
|
||||
|
||||
?>
|
||||
</div>
|
||||
@ -62,7 +61,7 @@
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<span for="Pay_Data_ID">Loan Amount</span>
|
||||
<label for="Pay_Data_ID">Loan Amount</label>
|
||||
<input type="text" class="form-control num" id="Loan_Amount"
|
||||
name="Loan_Amount" value="0.00" pattern="([0-9]{1,7}([.][0-9]{1,2})?)"
|
||||
title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
|
||||
@ -73,7 +72,7 @@
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<span for="Basic_Pay">No Of Due(s)</span>
|
||||
<label for="Basic_Pay">No Of Due(s)</label>
|
||||
<input type="text" value="0" class="form-control requried num"
|
||||
id="no_of_due" name="no_of_due" value="" pattern="[0-9]{1,2}"
|
||||
title="Minimum 1 digit,Maximum 2 Digit" onchange="duecalculation();">
|
||||
@ -84,7 +83,7 @@
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<span for="Basic_Pay">Monthly Due</span>
|
||||
<label for="Basic_Pay">Monthly Due</label>
|
||||
<input type="text" value="0.00" class="form-control num" id="monthly_due"
|
||||
name="monthly_due" value="" pattern="([0-9]{1,7}([.][0-9]{1,2})?)"
|
||||
title="Minimum 1 digit,Maximum 6 Digit" >
|
||||
@ -100,7 +99,7 @@
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<span for="EmpID">Loan Issue(d) Date</span>
|
||||
<label for="loan_issued_date">Loan Issue(d) Date</label>
|
||||
<input
|
||||
type="text"
|
||||
name="loan_issued_date"
|
||||
@ -115,7 +114,7 @@
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<span for="Basic_Pay">Due Started</span>
|
||||
<label for="Basic_Pay">Due Started</label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control requried"
|
||||
@ -129,13 +128,13 @@
|
||||
</div>
|
||||
|
||||
<!-- File -->
|
||||
<h4 class="header-title">Loan Documents</h4>
|
||||
<h4 class="header-title mt-2 mb-2">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>
|
||||
<label class="col-form-label" for="request_letter">Request letter</label>
|
||||
<input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="request_letter" name="request_letter" />
|
||||
</div>
|
||||
|
||||
@ -145,7 +144,7 @@
|
||||
<div class="form-group" >
|
||||
|
||||
<div class=" col-md-6">
|
||||
<span class="col-form-label" for="payment_statement">Payment Receipt</span>
|
||||
<label class="col-form-label" for="payment_statement">Payment Receipt</label>
|
||||
<input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="payment_statement" name="payment_statement" />
|
||||
</div>
|
||||
|
||||
@ -159,8 +158,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12 text-right">
|
||||
<input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white; margin-right: 15px;width: 80px;" value="Reset" />
|
||||
<input type="submit" onmouseover="finalCheck();" value="Submit" class="btn btn-success">
|
||||
<input type="reset" id="reset" class="btn btn-secondary" style="margin-right: 15px;width: 80px;" value="Reset" />
|
||||
<input type="submit" onclick="return finalCheck();" value="Submit" class="btn btn-success">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@ -212,7 +211,7 @@
|
||||
|
||||
|
||||
<!--content-wrapper closed-->
|
||||
<script src="<?php echo base_url(); ?>public/assets/js/addUser.js" type="text/javascript"></script>
|
||||
<!-- <script src="<?php echo base_url(); ?>public/assets/js/addUser.js" type="text/javascript"></script> -->
|
||||
<script>
|
||||
|
||||
|
||||
@ -295,14 +294,28 @@
|
||||
}
|
||||
|
||||
function finalCheck() {
|
||||
var loanamount = document.getElementById('Loan_Amount').value;
|
||||
if (loanamount != "" && loanamount != 0.00) {
|
||||
var idate = document.getElementById('loan_issued_date').value;
|
||||
var due = document.getElementById('monthly_due').value;
|
||||
var dsdate = document.getElementById('due_started').value;
|
||||
if (idate == "" || due == "" || due == 0.00 || dsdate == "") {
|
||||
|
||||
var loanamount = $('#Loan_Amount').val();
|
||||
var emp = $("select[name=EmpID]").val();
|
||||
|
||||
if (loanamount !== "" && loanamount != 0.00) {
|
||||
var idate = $('#loan_issued_date').val();
|
||||
var due = $('#monthly_due').val();
|
||||
var dsdate = $('#due_started').val();
|
||||
|
||||
if (idate === "" || due === "" || due == 0.00 || dsdate === "") {
|
||||
console.log(idate);
|
||||
alert("Enter All Loan Information Correctly...!");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (emp === "0" || emp === "-1") {
|
||||
alert('Please select the Employee');
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
</script>
|
||||
@ -95,6 +95,61 @@ if (!empty($INRSYMBOL)) {
|
||||
width: 100% ! important;
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
.edit-container {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.edit-input-field {
|
||||
padding: 2px;
|
||||
font-size: 14px;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 4px;
|
||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
|
||||
width: 150px;
|
||||
}
|
||||
|
||||
.edit-input-field:focus {
|
||||
outline: none;
|
||||
border-color: #007bff;
|
||||
box-shadow: 0 0 5px rgba(0, 123, 255, 0.5);
|
||||
}
|
||||
|
||||
.save-btn,
|
||||
.cancel-btn {
|
||||
border: none;
|
||||
background: none;
|
||||
cursor: pointer;
|
||||
font-size: 16px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
border-radius: 50%;
|
||||
transition: background-color 0.3s ease;
|
||||
}
|
||||
|
||||
.save-btn {
|
||||
color: #28a745;
|
||||
background-color: #e8f5e9;
|
||||
}
|
||||
|
||||
.save-btn:hover {
|
||||
background-color: #c3e6cb;
|
||||
}
|
||||
|
||||
.cancel-btn {
|
||||
color: #dc3545;
|
||||
background-color: #f8d7da;
|
||||
}
|
||||
|
||||
.cancel-btn:hover {
|
||||
background-color: #f5c6cb;
|
||||
}
|
||||
</style>
|
||||
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
|
||||
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
|
||||
<script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script>
|
||||
@ -150,6 +205,50 @@ if (!empty($INRSYMBOL)) {
|
||||
toolbar: false
|
||||
});
|
||||
</script>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
$(document).on('click', '.editable-field', function(e) {
|
||||
e.preventDefault();
|
||||
const $link = $(this);
|
||||
const value = $link.text().trim();
|
||||
|
||||
// Hide the <a> tag and show the edit container
|
||||
$link.hide();
|
||||
const $editContainer = $link.siblings('.edit-container');
|
||||
$editContainer.find('.edit-input-field').val(value);
|
||||
$editContainer.show();
|
||||
});
|
||||
|
||||
// Handle click on the tick (save) button
|
||||
$(document).on('click', '.save-btn', function(e) {
|
||||
e.preventDefault();
|
||||
const $btn = $(this);
|
||||
const $editContainer = $btn.closest('.edit-container');
|
||||
const $input = $editContainer.find('.edit-input-field');
|
||||
|
||||
const value = $input.val().trim();
|
||||
const $link = $editContainer.siblings('.editable-field');
|
||||
const LineItemNoteForAuditor = $link.data('notes');
|
||||
const id = $link.data('id');
|
||||
var theForm = $(".CreatePO");
|
||||
$("#LineItemNoteForAuditor" + id).val(value); // to update the hidden fields
|
||||
$link.text(value).show(); // to update table cell
|
||||
$editContainer.hide();
|
||||
});
|
||||
|
||||
// Handle click on the close (cancel) button
|
||||
$(document).on('click', '.cancel-btn', function(e) {
|
||||
e.preventDefault();
|
||||
const $btn = $(this);
|
||||
const $editContainer = $btn.closest('.edit-container');
|
||||
const $link = $editContainer.siblings('.editable-field');
|
||||
|
||||
// Hide the edit container and show the <a> tag
|
||||
$editContainer.hide();
|
||||
$link.show();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<script type="text/html" id="ServiceList">
|
||||
<tr id="<%=index%>">
|
||||
<td align="left"><%=index%></td>
|
||||
@ -2829,6 +2928,7 @@ if (!empty($INRSYMBOL)) {
|
||||
<th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
|
||||
<th style="white-space: nowrap !important;">Item Code</th>
|
||||
<th style="white-space: nowrap !important;">Item Description</th>
|
||||
<th style="white-space: nowrap !important;">Line Item Specs</th>
|
||||
<th style="white-space: nowrap !important;" class="text-right">Quantity</th>
|
||||
<th style="white-space: nowrap !important;">UOM</th>
|
||||
<th style="white-space: nowrap !important;" class="text-right">Rate<?php echo "($INRSYM)" ?></th>
|
||||
@ -6049,6 +6149,14 @@ if (!empty($INRSYMBOL)) {
|
||||
<td style="text-align:center !important">${Reqnumber}</td>
|
||||
<td>${materialCode}</td>
|
||||
<td>${rshorten}</td>
|
||||
<td><a href="#" class="editable-field"
|
||||
data-id="${temp}"
|
||||
data-notes="-">-</a>
|
||||
<div class="edit-container" style="display:none;">
|
||||
<input type="text" class="edit-input-field" />
|
||||
<button class="save-btn">✔</button>
|
||||
<button class="cancel-btn">✖</button>
|
||||
</div></td>
|
||||
<td align="right">${quantity}</td>
|
||||
<td>${uom}</td>
|
||||
<td align="right">${itemRate}</td>
|
||||
@ -6107,6 +6215,8 @@ if (!empty($INRSYMBOL)) {
|
||||
addHidden(theForm, "RevenueAfterSgst" + temp, AfterSgst);
|
||||
addHidden(theForm, "RevenueIgst" + temp, Igst);
|
||||
addHidden(theForm, "RevenueAfterIgst" + temp, AfterIgst);
|
||||
addHidden(theForm, "LineItemNoteForAuditor" + temp, AfterIgst);
|
||||
|
||||
$('#txtRowCount1').val(temp);
|
||||
|
||||
$('#hiddenRevenueuserid').val(temp);
|
||||
@ -6744,6 +6854,14 @@ if (!empty($INRSYMBOL)) {
|
||||
<td style="text-align:center !important">${Reqnumber}</td>
|
||||
<td>${materialCode}</td>
|
||||
<td>${sshorten}</td>
|
||||
<td><a href="#" class="editable-field"
|
||||
data-id="${temp}"
|
||||
data-notes="-">-</a>
|
||||
<div class="edit-container" style="display:none;">
|
||||
<input type="text" class="edit-input-field" />
|
||||
<button class="save-btn">✔</button>
|
||||
<button class="cancel-btn">✖</button>
|
||||
</div></td>
|
||||
<td align="right">${quantity}</td>
|
||||
<td>${uom}</td>
|
||||
<td align="right">${itemRate}</td>
|
||||
|
||||
@ -1007,7 +1007,8 @@ if (!empty($INRSYMBOL)) {
|
||||
<!--<input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" /> -->
|
||||
|
||||
|
||||
<a class="btn btn-success Save" ID="Cancel" onclick="Reset();"> <span class="bold">Reset</span></a>
|
||||
<!-- <a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();"> <span class="bold">Cancel</span></a> -->
|
||||
<a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>"> <span class="bold">Cancel</span></a>
|
||||
<a class="btn btn-success Save" ID="Save" onclick="Save(0)"> <span class="bold">Save as Draft</span></a>
|
||||
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)"> <span class="bold">Submit</span></a>
|
||||
|
||||
|
||||
@ -553,7 +553,19 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
var column = $(this).data('column'); // Get the column name (diesel or shed)
|
||||
var value = $(this).val(); // Get the updated value
|
||||
let gobal_driver_id = urlParams.get("gobal_driver_id");
|
||||
let gobal_date = urlParams.get("date");
|
||||
let gobal_date = '';
|
||||
|
||||
|
||||
if(gobal_date == ""){
|
||||
let inputDate = urlParams.get("month_year");
|
||||
let monthMap = {"Jan": "01", "Feb": "02", "Mar": "03", "Apr": "04","May": "05", "Jun": "06", "Jul": "07", "Aug": "08","Sep": "09", "Oct": "10", "Nov": "11", "Dec": "12"};
|
||||
|
||||
let [month, year] = inputDate.split('-');
|
||||
gobal_date = `01-${monthMap[month]}-${year}`;
|
||||
|
||||
}else{
|
||||
gobal_date = urlParams.get("date");
|
||||
}
|
||||
|
||||
// Send data to the server using AJAX
|
||||
$.ajax({
|
||||
|
||||
@ -1667,7 +1667,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label>Special Instructions </label> <?php
|
||||
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', $scopeofwork), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
|
||||
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($scopeofwork)), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
|
||||
echo form_textarea($data);
|
||||
?>
|
||||
</div>
|
||||
|
||||
@ -1592,12 +1592,12 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
|
||||
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) { ?>
|
||||
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>"> <span class="bold">Cancel</span></a>
|
||||
<a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>"> <span class="bold">Cancel</span></a>
|
||||
<?php if ($PONOStatus == PO_DRAFT) { ?>
|
||||
<a class="btn btn-success Save" ID="Save" onclick="Save(0)"> <span class="bold">Save as Draft</span></a>
|
||||
<?php } ?>
|
||||
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)"> <span class="bold">Submit</span></a>
|
||||
<a class="btn btn btn-soft-primary waves-effect waves-light Save" ID="Submit" onclick="Save(4)"> <span class="bold">Approve</span></a>
|
||||
<a class="btn btn-soft-primary waves-effect waves-light Save" ID="Submit" onclick="Save(4)"> <span class="bold">Approve</span></a>
|
||||
<?php } else if($PONOStatus == PO_AMENDED){ ?>
|
||||
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
|
||||
<?php } else {
|
||||
|
||||
@ -135,7 +135,7 @@ if (!empty($emppay)) {
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="page-title-box page-title-box-alt">
|
||||
<h4 class="page-title">Edit Loan Details</h4>
|
||||
<h4 class="page-title">Edit Loan Details<?php echo $Empname ? " - ".$Empname." (".$EmpID.")" : "" ?></h4>
|
||||
<a class="btn btn-secondary" href="<?php echo base_url(); ?>emppayListings"><span class="bold">Back</span></a>
|
||||
</div>
|
||||
</div>
|
||||
@ -164,7 +164,7 @@ if (!empty($emppay)) {
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<span for="EmpID">Employee ID</span>
|
||||
<label for="EmpID">Employee ID</label>
|
||||
<input type="text" class="form-control" readonly id="EmployeeID" name="EmpID" value="<?php echo $EmpID; ?>">
|
||||
</div>
|
||||
</div>
|
||||
@ -174,25 +174,23 @@ if (!empty($emppay)) {
|
||||
<div class="form-group">
|
||||
|
||||
<input type="hidden" name="loanid" value="<?php echo $loanid; ?>">
|
||||
<span for="Pay_Data_ID">Loan Amount</span>
|
||||
<label for="Pay_Data_ID">Loan Amount</label>
|
||||
<input type="text" class="form-control num" id="Loan_Amount" name="Loan_Amount" value="<?php echo $Loan_Amount; ?>" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<span for="Basic_Pay">No Of Due(s)</span>
|
||||
<label for="Basic_Pay">No Of Due(s)</label>
|
||||
<input type="text" class="form-control requried num" id="no_of_due" name="no_of_due" value="<?php echo $No_of_dues; ?>" pattern="[0-9]{1,2}" title="Minimum 1 digit,Maximum 2 Digit" onchange="duecalculation();">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<span for="Basic_Pay">Monthly Due</span>
|
||||
<label for="Basic_Pay">Monthly Due</label>
|
||||
<input type="text" class="form-control requried num" id="monthly_due" name="monthly_due" value="<?php echo $Monthly_due; ?>" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 4 digit,Maximum 6 Digit" readonly>
|
||||
</div>
|
||||
</div>
|
||||
@ -203,7 +201,7 @@ if (!empty($emppay)) {
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<span for="EmpID">Loan Issue(d) Date</span>
|
||||
<label for="EmpID">Loan Issue(d) Date</label>
|
||||
<input type="text" class="form-control num" id="loan_issued_date" name="loan_issued_date" value="<?php echo $Loan_issued_date; ?>">
|
||||
</div>
|
||||
</div>
|
||||
@ -212,7 +210,7 @@ if (!empty($emppay)) {
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<span for="Basic_Pay">Due Started</span>
|
||||
<label for="Basic_Pay">Due Started</label>
|
||||
<input type="text" class="form-control requried num" id="due_started" name="due_started" value="<?php echo $Due_start_date; ?>">
|
||||
</div>
|
||||
</div>
|
||||
@ -221,20 +219,20 @@ if (!empty($emppay)) {
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<span for="Basic_Pay">Paid Amount</span>
|
||||
<label for="Basic_Pay">Paid Amount</label>
|
||||
<input type="text" class="form-control requried num" id="Paid_Amount" name="Paid_Amount" value="<?php echo $Paid_Amount; ?>" readonly>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<span for="">Paid Due</span>
|
||||
<label for="">Paid Due</label>
|
||||
<input type="text" class="form-control requried num" id="paid_due" name="paid_due" value="<?php echo $Paid_Due; ?>" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<span for="">Remaining Due</span>
|
||||
<label for="">Remaining Due</label>
|
||||
<input type="text" class="form-control requried num" id="remaining_due" name="remaining_due" value="<?php echo $Remaining_Due; ?>" readonly>
|
||||
</div>
|
||||
</div>
|
||||
@ -242,19 +240,21 @@ if (!empty($emppay)) {
|
||||
</div>
|
||||
|
||||
<!-- File -->
|
||||
<h4 class="header-title">Loan Documents</h4>
|
||||
<h4 class="header-title mt-2 mb-2">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 class="form-group">
|
||||
<label class="d-block" for="request_letter">Request letter</label>
|
||||
<input type="file" accept=".docx,.pdf,.doc,.jpg,.png" id="request_letter" name="request_letter" style="margin-top: 5px;" />
|
||||
<input type="hidden" id="hidden_request_letter" name="hidden_request_letter" value="<?php echo $request_letter; ?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php if ($request_letter) { ?>
|
||||
<div class="form-group">
|
||||
<div class="col-md-8">
|
||||
<div class="col-md-8">
|
||||
<div class="form-group">
|
||||
<br>
|
||||
<u>
|
||||
<a href="<?php echo base_url() . 'public/uploads/images/' . $request_letter ?>">
|
||||
<span>Previously Uploaded Document - </span><small><?= $request_letter; ?></small>
|
||||
@ -263,19 +263,21 @@ if (!empty($emppay)) {
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div> <!-- 1st row div closed here -->
|
||||
|
||||
<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 class="col-md-4">
|
||||
<div class="form-group">
|
||||
<label class="d-block" for="payment_statement">Payment Receipt</label>
|
||||
<input type="file" accept=".docx,.pdf,.doc,.jpg,.png" id="payment_statement" name="payment_statement" style="margin-top: 5px;" />
|
||||
<input type="hidden" id="hidden_payment_statement" name="hidden_payment_statement" value="<?php echo $payment_statement; ?>" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php if ($payment_statement) { ?>
|
||||
<div class="form-group">
|
||||
<div class="col-md-8">
|
||||
<div class="col-md-8">
|
||||
<div class="form-group">
|
||||
<br>
|
||||
<u>
|
||||
<a href="<?php echo base_url() . 'public/uploads/images/' . $payment_statement ?>">
|
||||
<span>Previously Uploaded Document - </span><small><?= $payment_statement; ?></small>
|
||||
@ -284,8 +286,7 @@ if (!empty($emppay)) {
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
</div>
|
||||
</div> <!-- 2nd row div closed here -->
|
||||
|
||||
|
||||
|
||||
@ -323,8 +324,9 @@ if (!empty($emppay)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12 text-right">
|
||||
<input type="button" class="btn btn-success" value="Delete" id="deleteemp" style="background-color:#ee4d4d;color:white;margin-right:15px;width:80px;border:none;" />
|
||||
<input type="submit" onmouseover="finalCheck();" value="Submit" class="btn btn-success">
|
||||
<input type="button" class="btn btn-secondary" value="Delete" id="deleteemp" style="margin-right:15px;width:80px;border:none;" />
|
||||
<input type="submit" onclick="return finalCheck();" value="Submit" class="btn btn-success">
|
||||
<!-- <input type="submit" onmouseover="finalCheck();" value="Submit" class="btn btn-success"> -->
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@ -464,24 +466,55 @@ if (!empty($emppay)) {
|
||||
|
||||
}
|
||||
|
||||
function finalCheck() {
|
||||
// function finalCheck() {
|
||||
|
||||
var loanamount = document.getElementById('Loan_Amount').value;
|
||||
if (loanamount != "" && loanamount != 0.00) {
|
||||
var idate = document.getElementById('loan_issued_date').value;
|
||||
var due = document.getElementById('monthly_due').value;
|
||||
var dsdate = document.getElementById('due_started').value;
|
||||
if (idate == "" || due == "" || due == 0.00 || dsdate == "") {
|
||||
// var loanamount = document.getElementById('Loan_Amount').value;
|
||||
// if (loanamount != "" && loanamount != 0.00) {
|
||||
// var idate = document.getElementById('loan_issued_date').value;
|
||||
// var due = document.getElementById('monthly_due').value;
|
||||
// var dsdate = document.getElementById('due_started').value;
|
||||
// if (idate == "" || due == "" || due == 0.00 || dsdate == "") {
|
||||
// alert("Enter All Loan Information Correctly...!");
|
||||
// return false;
|
||||
// }
|
||||
// }
|
||||
|
||||
// if ($('#Total_Salary').val() == '' || $('#HRA_Rate').val() == '' || $('#Allowances').val() == '' || $('#PF_Rate').val() == '' || $('#ESI_Rate').val() == '' || $('#Food_Allowances').val() == '' || $('#Incentives').val() == '') {
|
||||
|
||||
// alert("Please Enter All Information Correctly..!");
|
||||
// return false;
|
||||
// }
|
||||
// }
|
||||
function finalCheck() {
|
||||
|
||||
var loanamount = $('#Loan_Amount').val();
|
||||
var emp = $("select[name=EmpID]").val();
|
||||
|
||||
if (loanamount !== "" && loanamount != 0.00) {
|
||||
var idate = $('#loan_issued_date').val();
|
||||
var due = $('#monthly_due').val();
|
||||
var dsdate = $('#due_started').val();
|
||||
|
||||
if (idate === "" || due === "" || due == 0.00 || dsdate === "") {
|
||||
console.log(idate);
|
||||
alert("Enter All Loan Information Correctly...!");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (emp === "0" || emp === "-1") {
|
||||
alert('Please select the Employee');
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($('#Total_Salary').val() == '' || $('#HRA_Rate').val() == '' || $('#Allowances').val() == '' || $('#PF_Rate').val() == '' || $('#ESI_Rate').val() == '' || $('#Food_Allowances').val() == '' || $('#Incentives').val() == '') {
|
||||
|
||||
alert("Please Enter All Information Correctly..!");
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
$("#deleteemp").click(function() {
|
||||
|
||||
@ -2918,8 +2918,7 @@ if (!empty($getlogpodtl)) {
|
||||
<span>previously uploaded purchase order file- </span>
|
||||
<small><?= $PrePOFile; ?></small></a></label>
|
||||
|
||||
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete
|
||||
</button>
|
||||
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>
|
||||
|
||||
<input type="hidden" id="PrePOFile" name="PrePOFile"
|
||||
value="<?php echo $PrePOFile; ?>" /><br>
|
||||
@ -2950,7 +2949,7 @@ if (!empty($getlogpodtl)) {
|
||||
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
|
||||
<div class="btn-container" style="text-align: right;">
|
||||
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
|
||||
<a class="btn btn-success Save" ID="Cancel"
|
||||
<a class="btn btn-secondary Save" ID="Cancel"
|
||||
href="<?php echo base_url() . 'purchaseorderListing'; ?>"> <span
|
||||
class="bold">Cancel</span></a>
|
||||
<?php if ($PONOStatus == PO_DRAFT) { ?>
|
||||
|
||||
@ -1325,7 +1325,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
<label>Description Of Service </label><span class="text-danger">*</span>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'amenddescofpo', 'value' => set_value('amenddescofpo', $DescriptionOfPo), 'id' => 'amenddescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
|
||||
$data = array('name' => 'amenddescofpo', 'value' => set_value('amenddescofpo', strip_tags($DescriptionOfPo)), 'id' => 'amenddescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
|
||||
echo form_textarea($data);
|
||||
?>
|
||||
|
||||
@ -1341,7 +1341,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
<div class="form-group col-md-12">
|
||||
<label>Scope Of Work</label>
|
||||
<textarea name="ScopeofWork" id="ScopeofWork" class="form-control" rows="8" cols="40">
|
||||
<?php echo set_value('ScopeofWork', $ServiceDescription); ?>
|
||||
<?php echo set_value('ScopeofWork', strip_tags($ServiceDescription)); ?>
|
||||
</textarea>
|
||||
|
||||
</div>
|
||||
|
||||
@ -1300,26 +1300,35 @@ if (!empty($getlogpodtl)) {
|
||||
<div class="form-row px-4">
|
||||
<label>Select Purchase Order File</label>
|
||||
<div class="form-group col-md-12" align="left">
|
||||
|
||||
<input type="file" class="" name="POFile" id="POFile">
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-row px-4">
|
||||
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
|
||||
<div>
|
||||
<?php if ($PrePOFile) { ?>
|
||||
<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previously Uploaded Purchase Order File- </span><small><?= $PrePOFile; ?></small></a></label>
|
||||
|
||||
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
|
||||
<?php } ?>
|
||||
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" />
|
||||
<?php if (!empty($PrePOFile)) {
|
||||
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
|
||||
if (file_exists($PrePOFilePath)) { ?>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
|
||||
<br />
|
||||
|
||||
<label><a title="previously uploaded PO File"
|
||||
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
|
||||
<span>previously uploaded purchase order file- </span>
|
||||
<small><?= $PrePOFile; ?></small></a></label>
|
||||
|
||||
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>
|
||||
|
||||
<input type="hidden" id="PrePOFile" name="PrePOFile"
|
||||
value="<?php echo $PrePOFile; ?>" /><br>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
|
||||
<?php } ?>
|
||||
|
||||
<div class="form-row px-4 ">
|
||||
|
||||
@ -1337,13 +1346,13 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
|
||||
|
||||
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>"> <span class="bold">Cancel</span></a>
|
||||
<a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>"> <span class="bold">Cancel</span></a>
|
||||
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) {
|
||||
if ($PONOStatus == PO_DRAFT) { ?>
|
||||
<a class="btn btn-success Save" ID="Save" onclick="Save(0)"> <span class="bold">Save as Draft</span></a>
|
||||
<a class="btn btn-secondary Save" ID="Save" onclick="Save(0)"> <span class="bold">Save as Draft</span></a>
|
||||
<?php } ?>
|
||||
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)"> <span class="bold">Submit</span></a>
|
||||
<a class="btn btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)"> <span class="bold">Approve</span></a>
|
||||
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)"> <span class="bold">Approve</span></a>
|
||||
<?php } else if($PONOStatus == PO_AMENDED){ ?>
|
||||
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
|
||||
<?php } else { ?>
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
<td style="text-align: left;"><?php echo $record->EmpID ?>-<?php echo $record->FirstName; ?></td>
|
||||
<td><?php echo $record->TotalSalary; ?></td>
|
||||
<td><?php echo $record->Loan_Amount; ?></td>
|
||||
<td><?php echo $record->Loan_Issued_Date; ?></td>
|
||||
<td><?php echo get_date_time_dynamical_format('Y-m-d','d-m-Y',"$record->Loan_Issued_Date"); ?></td>
|
||||
<td><?php echo $record->Monthly_Due; ?></td>
|
||||
<td><?php echo $record->No_of_Dues; ?></td>
|
||||
<td><?php echo $record->Paid_Due; ?></td>
|
||||
|
||||
@ -998,7 +998,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
||||
|
||||
<!-- <a class="btn btn-success Save" ID="Cancel" onclick="Reset();"> <span class="bold">Reset</span></a> -->
|
||||
<!-- <input type="reset" class="btn btn-success" value="Reset" onclick="window.location.reload()"> -->
|
||||
<a class="btn btn-success Save" ID="Cancel" onclick="Reset();"> <span class="bold">Reset</span></a>
|
||||
<a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();"> <span class="bold">Reset</span></a>
|
||||
<a class="btn btn-success Save" ID="Save" onclick="Save(0)"> <span class="bold">Save as Draft</span></a>
|
||||
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)"> <span class="bold">Submit</span></a>
|
||||
|
||||
|
||||
@ -2311,7 +2311,7 @@ if (!empty($INRSYMBOL)) {
|
||||
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
|
||||
<input type="hidden" name="Budget" id="Budget" />
|
||||
<div class="btn-container" style="text-align: right;">
|
||||
<a class="btn btn-success Save" ID="Cancel" onclick="Reset();"> <span class="bold">Reset</span></a>
|
||||
<a class="btn btn-success Save" ID="Cancel" onclick="Reset();"> <span class="bold">Cancel</span></a>
|
||||
<a class="btn btn-success Save" ID="Save" onclick="Save(0)"> <span class="bold">Save as Draft</span></a>
|
||||
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)"> <span class="bold">Submit</span></a>
|
||||
</div>
|
||||
|
||||
@ -85,8 +85,9 @@
|
||||
placeholder="Select To Date" autocomplete="off">
|
||||
|
||||
<!-- New Category Field -->
|
||||
<div class="form-group">
|
||||
<label for="category">Category:</label>
|
||||
<div class="form-row">
|
||||
<label for="category" style="align-content: center !important;">Category:</label>
|
||||
<div class="form-group" style="width:180px !important; margin: 12px !important;">
|
||||
<select class="form-control category-search" autocomplete="off" id="category" name="category">
|
||||
<option value="">Select Category </option>
|
||||
<?php
|
||||
@ -97,6 +98,7 @@
|
||||
<?php } } ?>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true"
|
||||
|
||||
@ -170,7 +170,7 @@ if (!empty($Status)) {
|
||||
<td align="center"> <?php echo $record->newLineItem ?></td>
|
||||
|
||||
|
||||
<td align="center"><?php echo $record->StatusName ?></td>
|
||||
<td align="center"><?php echo strtoupper($record->StatusName); ?></td>
|
||||
|
||||
<td> <a data-toggle="tooltip"
|
||||
href="<?php echo base_url() . 'EditRequisitionForm?ReqNo=' . $record->ReqNo . '&ReqType=' . $record->ReqType; ?>"><i
|
||||
|
||||
@ -214,7 +214,7 @@ span.highlight1{
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Vechicle Number :</label>
|
||||
<label>Vehicle Number :</label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<?php
|
||||
|
||||
Loading…
Reference in New Issue
Block a user