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

CHANGE_TRACKER_ISSUE_7

Browse Source
This commit is contained in:
aadhavan valli 2024-09-19 17:45:32 +05:30
parent ab54ba815a
commit dcc27d262e
9 changed files with 3508 additions and 3511 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4622
app/Views/EditservicePurchaseorder.php
View File

File diff suppressed because it is too large Load Diff

3
app/Views/alterpurchaseorder.php
View File

@ -2655,7 +2655,7 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="badge mandatory">*</span></label>
<label>Description of Payable Terms</label>
<div class="form-group">
<?php
$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true');
@ -6875,6 +6875,7 @@ if (!empty($INRSYMBOL)) {
$('#OtherAmt' + userid).val(OtherAmt);
populateValueMainFormForEditServiceTax();
$('#EDITSERVICE').modal('hide');
} else {
console.log("in else part...");

8
app/Views/capitalpurchaseorder.php
View File

@ -541,7 +541,7 @@
?>
</div>
<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="text-danger">*</span></label>
<label>Description of Payable Terms</label>
<div>
<?php
$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true');
@ -4317,7 +4317,7 @@
return false;
} else {
$('#content').loader('show');
// $('#content').loader('show');
var formData = new FormData($('.CapitalPO')[0]);
formData.append('ExchangeRateOn', ExchangeRateOn);
formData.append('PaymentMethod', PaymentMethod);
@ -4332,7 +4332,7 @@
success: function(data) {
alert(data);
if (data) {
$('#content').loader('hide');
// $('#content').loader('hide');
$('#txtRowCount').val('');
$('#txtDeletedRow').val('');
@ -4344,7 +4344,7 @@
window.location = "purchaseorderListing";
} else {
$('#content').loader('hide');
// $('#content').loader('hide');
alert("Error");
}

2
app/Views/createPOfromRequistion.php
View File

@ -429,7 +429,7 @@
endDate.setHours(23, 59, 59, 999);
// Get the date from the DataTable row (assuming it's in the first column in dd-mm-yyyy format)
var dateStr = data[0];
var dateStr = data[1];
var dateParts = dateStr.split("-");
var rowDate = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]);

2069
app/Views/editCapitalPo.php
View File

File diff suppressed because it is too large Load Diff

96
app/Views/editRevenuepurchaseorder.php
View File

@ -2136,20 +2136,20 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="form-row">
<div align="form-group col-md-12" align="right">
<div class="form-group col-md-12" align="right">
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
<?php } ?>
<!-- <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a> -->
<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-primary" id="abcd">Select Line Item</button> </a>
<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
<?php } ?>
</div>
</div>
<br>
<div class="form-row">
<div class="table-responsive">
<div class="table-responsive" style="padding-bottom:30px;">
<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead>
@ -2262,7 +2262,7 @@ if (!empty($getlogpodtl)) {
}
?>
</tbody>
</table><br>
</table>
</div>
</div>
<div class="form-row">
@ -2482,7 +2482,8 @@ if (!empty($getlogpodtl)) {
<!--################################################################## -->
<?php if (!empty($update)) { ?>
<div class="form-row" id="editpodiv">
<div class="form-row"><label>Editable POScreen</label>
<!-- <div class="form-row"> -->
<label>Editable POScreen</label>
<table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
<thead style="background-color: #ddd;">
<tr>
@ -2539,7 +2540,7 @@ if (!empty($getlogpodtl)) {
?>
</tbody>
</table>
</div>
<!-- </div> -->
</div>
<?php } else {
} ?>
@ -3994,34 +3995,34 @@ if (!empty($getlogpodtl)) {
// PendingQuantity: quantity
// }));
var rowHtml = `
<tr id="${temp}">
<td align="left">${temp}</td>
<td align="left">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${materialName}</td>
<td align="right">${quantity}</td>
<td align="left">${uom}</td>
<td align="right">${itemRate}</td>
<td align="right">${PER}</td>
<td align="right">${service_description}</td>
<td align="right">${basicval}</td>
<td align="right">${TotalTaxValue}</td>
<td align="right">${TotalOrderValue}</td>
<td align="right">${quantity}</td>
<td align="right">0</td>
<td align="right">${quantity}</td>
<tr id="${temp}">
<td align="left">${temp}</td>
<td align="left">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${materialName}</td>
<td align="right">${quantity}</td>
<td align="left">${uom}</td>
<td align="right">${itemRate}</td>
<td align="right">${PER}</td>
<td align="right">${service_description}</td>
<td align="right">${basicval}</td>
<td align="right">${TotalTaxValue}</td>
<td align="right">${TotalOrderValue}</td>
<td align="right">${quantity}</td>
<td align="right">0</td>
<td align="right">${quantity}</td>
<td>
<a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
<i class="ri-pencil-fill"></i>
</a>
&nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow('${temp}')" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
<span class="ri-delete-bin-7-fill"></span>
</a>
</td>
</tr>
`;
<td>
<a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
<i class="ri-pencil-fill"></i>
</a>
&nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow('${temp}')" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
<span class="ri-delete-bin-7-fill"></span>
</a>
</td>
</tr>
`;
$('#RevenueAppend').append(rowHtml);
@ -4062,9 +4063,9 @@ if (!empty($getlogpodtl)) {
addHidden(theForm, "per" + temp, PER);
addHidden(theForm, "service_description" + temp, service_description);
$('#txtRowCount').val(temp);
// $('#REVENUE').modal('hide');
populateValueMainFormForRevenue();
clearRevenueModalFields();
$('#REVENUE').modal('hide');
}
});
@ -4170,6 +4171,9 @@ if (!empty($getlogpodtl)) {
$('#service_description' + userid).val(Service_Description);
populateValueMainFormForEditRevenueTax();
setTimeout(() => {
$('#EDITREVENUE').modal('hide');
}, 1000);
}
});
@ -4887,19 +4891,19 @@ if (!empty($getlogpodtl)) {
processData: false,
contentType: false,
success: function(data) {
console.log(data);
// if (data) {
// alert(data);
// $('#txtRowCount').val('');
// $('#txtDeletedRow').val('');
// $('#txtStatus').val('');
// $('#SpcialInstruction').val('');
// $('#txtDeliveryAddress').val('')
// window.location = "purchaseorderListing";
// console.log(data);
if (data) {
alert(data);
$('#txtRowCount').val('');
$('#txtDeletedRow').val('');
$('#txtStatus').val('');
$('#SpcialInstruction').val('');
$('#txtDeliveryAddress').val('')
window.location = "purchaseorderListing";
// } else {
// alert("Error");
// }
} else {
alert("Error");
}
},
error: function(jqXHR, textStatus, errorThrown) {

54
app/Views/editimportpo.php
View File

@ -565,7 +565,7 @@ if (!empty($getlogpodtl)) {
<label>Purchase Order Date</label>
<div >
<?php
$data = array('type' => 'date', 'name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data);
?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
</div>
@ -657,7 +657,7 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="text-danger">*</span></label>
<label>Description of Payable Terms</label>
<div >
<?php
@ -714,10 +714,6 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-3">
</div>
</div>
<div class="form-row" align="right">
<div class="col-md-4">
@ -732,8 +728,6 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<br><br><br>
<div class="box-body" style="margin-top: -3%;">
<table id="ImportTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
@ -4306,28 +4300,28 @@ if (!empty($getlogpodtl)) {
//alert('in');
var rowHtml = `
<tr id="${temp}">
<td align="left">${temp}</td>
<td align="left">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${materialName}</td>
<td align="left">${quantity}</td>
<td align="left">${uom}</td>
<td align="left">${itemRate}</td>
<td align="left">${BasicAmt}</td>
<td align="left">${receivedqty}</td>
<td align="left">${rejectedqty}</td>
<td align="left">${pendingqty}</td>
<td>
<a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
<i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i>
</a>&nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
<span class="ri-delete-bin-7-fill"></span>
</a>
</td>
</tr>
`;
<tr id="${temp}">
<td align="left">${temp}</td>
<td align="left">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${materialName}</td>
<td align="left">${quantity}</td>
<td align="left">${uom}</td>
<td align="left">${itemRate}</td>
<td align="left">${BasicAmt}</td>
<td align="left">${receivedqty}</td>
<td align="left">${rejectedqty}</td>
<td align="left">${pendingqty}</td>
<td>
<a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
<i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i>
</a>&nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
<span class="ri-delete-bin-7-fill"></span>
</a>
</td>
</tr>
`;
// Append the generated row HTML to the target element
$('#ImportAppend').append(rowHtml);

9
app/Views/purchaseorder.php
View File

@ -1981,7 +1981,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="form-group col-md-3">
<label>Revenue Type Options</label>
<label>Revenue Type Options<span class="text-danger">*</span></label>
<div>
<?php
@ -2017,7 +2017,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="badge mandatory">*</span></label>
<label>Description of Payable Terms</label>
<div>
<?php
$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control');
@ -2047,7 +2047,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="form-group col-md-3">
<label for="BudgetType">Budget Type</label>
<label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
<?php
@ -2069,7 +2069,7 @@ if (!empty($INRSYMBOL)) {
<!-- Table -->
<div class="form-row">
<div class="table-responsive">
<div class="table-responsive" style="padding-bottom: 30px;">
<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead>
<tr>
@ -2091,7 +2091,6 @@ if (!empty($INRSYMBOL)) {
</table>
</div>
</div>
</br>
<!-- /.table -->
<div class="form-row">

156
app/Views/servicePurchaseorder.php
View File

@ -561,86 +561,86 @@ if (!empty($INRSYMBOL)) {
clearTotalItemValues();
$('#Edit').click(function() {
console.log("1111111111111111111");
console.log("1111111111111111111");
// tinyMCE.triggerSave();
console.log("2222222222222222");
// tinyMCE.triggerSave();
console.log("2222222222222222");
if (validateEditServiceTax()) {
alert('inside Add');
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
var editDescription = $("#EditItemName").val();
var editUOM = $('#EditUOM').val();
var editPer = '';
if ($("#EditPer").val().trim() == '') {
editPer = $("#EditUOM").val();
} else {
editPer = $("#EditPer").val();
}
var editQuantity = $('#EditQuantity').val();
var itemRate = $("#EditRate").val();
var Cgst = $("#EditCgst").val();
var AfterCgst = $("#EditAfterCgst").val();
var Sgst = $("#EditSgst").val();
var AfterSgst = $("#EditAfterSgst").val();
var Igst = $("#EditIgst").val();
var AfterIgst = $("#EditAfterIgst").val();
var Frequency = $("#EditFrequency").val();
var FrequencyValue = $("#EditFrequencyNo").val();
var ServiceDescription = $('#EdittxtSpcialInstruction').val();
var OtherAmt = $('#EditOtherAllowances').val();
var TotalOrderValue = $("#EditTotalOrderValue ").val();
var basicval = $("#txtEditBasicValue").val();
var TotalTaxValue = calculateEditTaxValue();
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
cellval[4].innerHTML = editQuantity;
cellval[5].innerHTML = editUOM;
cellval[6].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[7].innerHTML = parseFloat(basicval).toFixed(2);
cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[9].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(editDescription);
$('#uom' + userid).val(editUOM);
$('#per' + userid).val(editPer);
$('#quantity' + userid).val(editQuantity);
$('#itemRate' + userid).val(itemRate);
$('#Cgst' + userid).val(Cgst);
$('#AfterCgst' + userid).val(AfterCgst);
$('#Sgst' + userid).val(Sgst);
$('#AfterSgst' + userid).val(AfterSgst);
$('#Igst' + userid).val(Igst);
$('#AfterIgst' + userid).val(AfterIgst);
$('#ItemDescription' + userid).val(ServiceDescription);
$('#OtherAmt' + userid).val(OtherAmt);
$('#TotalOrderValue' + userid).val(TotalOrderValue);
populateValueMainFormForEditServiceTax();
if (validateEditServiceTax()) {
alert('inside Add');
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
var editDescription = $("#EditItemName").val();
var editUOM = $('#EditUOM').val();
var editPer = '';
if ($("#EditPer").val().trim() == '') {
editPer = $("#EditUOM").val();
} else {
editPer = $("#EditPer").val();
}
var editQuantity = $('#EditQuantity').val();
var itemRate = $("#EditRate").val();
var Cgst = $("#EditCgst").val();
var AfterCgst = $("#EditAfterCgst").val();
var Sgst = $("#EditSgst").val();
var AfterSgst = $("#EditAfterSgst").val();
var Igst = $("#EditIgst").val();
var AfterIgst = $("#EditAfterIgst").val();
var Frequency = $("#EditFrequency").val();
var FrequencyValue = $("#EditFrequencyNo").val();
var ServiceDescription = $('#EdittxtSpcialInstruction').val();
var OtherAmt = $('#EditOtherAllowances').val();
var TotalOrderValue = $("#EditTotalOrderValue ").val();
var basicval = $("#txtEditBasicValue").val();
var TotalTaxValue = calculateEditTaxValue();
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
cellval[4].innerHTML = editQuantity;
cellval[5].innerHTML = editUOM;
cellval[6].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[7].innerHTML = parseFloat(basicval).toFixed(2);
cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[9].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(editDescription);
$('#uom' + userid).val(editUOM);
$('#per' + userid).val(editPer);
$('#quantity' + userid).val(editQuantity);
$('#itemRate' + userid).val(itemRate);
$('#Cgst' + userid).val(Cgst);
$('#AfterCgst' + userid).val(AfterCgst);
$('#Sgst' + userid).val(Sgst);
$('#AfterSgst' + userid).val(AfterSgst);
$('#Igst' + userid).val(Igst);
$('#AfterIgst' + userid).val(AfterIgst);
$('#ItemDescription' + userid).val(ServiceDescription);
$('#OtherAmt' + userid).val(OtherAmt);
$('#TotalOrderValue' + userid).val(TotalOrderValue);
populateValueMainFormForEditServiceTax();
}
});
});
});
</script>
@ -946,7 +946,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div><!-- 6. form-row div closed here -->
<div class="form-row">
<div class="table-responsive">
<div class="table-responsive" style="padding-bottom: 30px;">
<table id="serviceTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead>
<tr>
@ -2337,7 +2337,7 @@ if (!empty($INRSYMBOL)) {
$('#Otherpayment').focus();
return false;
}else {
} else {
return true;
}
}