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 2025-03-05 11:08:09 +05:30
commit 1b89275eab
14 changed files with 124 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Views/EditservicePurchaseorder.php
View File

@ -2813,7 +2813,7 @@ if (!empty($getlogpodtl)) {
function populateValueMainFormForEditServiceTax() { function populateValueMainFormForEditServiceTax() {
var rows = document.getElementById('ServiceTable').rows.length; var rows = $('#ServiceTable tbody tr').length;
// alert(rows); // alert(rows);
var editrow = parseFloat(rows) - 1; var editrow = parseFloat(rows) - 1;
var TotCgst = 0; var TotCgst = 0;
@ -3336,7 +3336,7 @@ if (!empty($getlogpodtl)) {
AvlBudAmt = '<?php echo number_format($AvlAmount + $TotalBasicAmount, 2, '.', '') ?>'; AvlBudAmt = '<?php echo number_format($AvlAmount + $TotalBasicAmount, 2, '.', '') ?>';
//ServiceTable //ServiceTable
var rows = document.getElementById('ServiceTable').rows.length; var rows = $('#ServiceTable tbody tr').length;
if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') { if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') {

2
app/Views/capitalpurchaseorder.php
View File

@ -4070,7 +4070,7 @@ if (!empty($INRSYMBOL)) {
*/ */
function populateValueMainFormForDeleteServiceTax(deletedRow) { function populateValueMainFormForDeleteServiceTax(deletedRow) {
var rows = document.getElementById('serviceTax').rows.length; var rows = $('#serviceTax tbody tr').length;
var TotalOrderValueSummary = 0; var TotalOrderValueSummary = 0;

2
app/Views/editCapitalAmendPO.php
View File

@ -4055,7 +4055,7 @@ Calculate Landing charge
*/ */
function populateValueMainFormForEditCapitalTax() { function populateValueMainFormForEditCapitalTax() {
var rows = document.getElementById('serviceTax').rows.length; var rows = $('#serviceTax tbody tr').length;
var TotalOrderValueSummary = 0; var TotalOrderValueSummary = 0;
var basicfordometic = 0; var basicfordometic = 0;
var qty = 0; var qty = 0;

8
app/Views/editCapitalPo.php
View File

@ -5380,7 +5380,7 @@ if (!empty($getlogpodtl)) {
*/ */
function populateValueMainFormForDeleteServiceTax(deletedRow) { function populateValueMainFormForDeleteServiceTax(deletedRow) {
var rows = document.getElementById('serviceTax').rows.length; var rows = $('#serviceTax tbody tr').length;
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>; var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
var TotalOrderValueSummary = 0; var TotalOrderValueSummary = 0;
@ -6767,7 +6767,7 @@ if (!empty($getlogpodtl)) {
*/ */
function populateValueMainFormForEditCapitalTax() { function populateValueMainFormForEditCapitalTax() {
var rows = document.getElementById('serviceTax').rows.length; var rows = $('#serviceTax tbody tr').length;
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>; var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
var TotalOrderValueSummary = 0; var TotalOrderValueSummary = 0;
@ -6917,7 +6917,7 @@ if (!empty($getlogpodtl)) {
function populateValueMainFormForViewCapitalTax() { function populateValueMainFormForViewCapitalTax() {
var rows = document.getElementById('serviceTax').rows.length; var rows = $('#serviceTax tbody tr').length;
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>; var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
var TotalOrderValueSummary = 0; var TotalOrderValueSummary = 0;
@ -8108,7 +8108,7 @@ if (!empty($getlogpodtl)) {
function populateValueMainFormForupdateCapitalTax() { function populateValueMainFormForupdateCapitalTax() {
var rows = document.getElementById('serviceTax').rows.length; var rows = $('#serviceTax tbody tr').length;
var TotalFreight = 0; var TotalFreight = 0;
var i = 0; var i = 0;
do { do {

2
app/Views/editImportAmendPO.php
View File

@ -2786,7 +2786,7 @@ if (!empty($RequistionDetails)) {
function populateValueMainFormForEditImportTax() { function populateValueMainFormForEditImportTax() {
var rows = document.getElementById('ImportTax').rows.length; var rows = $('#ImportTax tbody tr').length;
var TotalLanding = 0; var TotalLanding = 0;
var TotalCustom = 0; var TotalCustom = 0;
var TotalCustomED = 0; var TotalCustomED = 0;

30
app/Views/editOldemppay.php
View File

@ -16,9 +16,6 @@
autoclose: true autoclose: true
}); });
}); });
</script> </script>
<?php <?php
@ -161,8 +158,8 @@ if (!empty($emppay)) {
<input type="hidden" class="form-control required" id="Created_Time" name="Created_Time" value="<?php echo $Created_Time; ?>"> <input type="hidden" class="form-control required" id="Created_Time" name="Created_Time" value="<?php echo $Created_Time; ?>">
<input type="hidden" class="form-control required" id="CreatedBy" name="CreatedBy" value="<?php echo $Created_By; ?>"> <input type="hidden" class="form-control required" id="CreatedBy" name="CreatedBy" value="<?php echo $Created_By; ?>">
<input type="hidden" readonly id="Pay_Data_ID" name="Pay_Data_ID" value="<?php echo $Pay_Data_ID; ?>"> <input type="hidden" readonly id="Pay_Data_ID" name="Pay_Data_ID" value="<?php echo $Pay_Data_ID; ?>">
<input type="hidden" class="form-control num" id="Old_Loan_Amount" value="<?php echo $Loan_Amount; ?>" > <input type="hidden" class="form-control num" id="Old_Loan_Amount" value="<?php echo $Loan_Amount; ?>">
<input type="hidden" class="form-control num" id="Old_monthly_due" value="<?php echo $Monthly_due; ?>" > <input type="hidden" class="form-control num" id="Old_monthly_due" value="<?php echo $Monthly_due; ?>">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
@ -207,7 +204,7 @@ if (!empty($emppay)) {
<div class="form-group"> <div class="form-group">
<div class="form-group"> <div class="form-group">
<span for="EmpID">Loan Issue(d) Date</span> <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; ?>" > <input type="text" class="form-control num" id="loan_issued_date" name="loan_issued_date" value="<?php echo $Loan_issued_date; ?>">
</div> </div>
</div> </div>
</div> </div>
@ -216,7 +213,7 @@ if (!empty($emppay)) {
<div class="form-group"> <div class="form-group">
<div class="form-group"> <div class="form-group">
<span for="Basic_Pay">Due Started</span> <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; ?>" > <input type="text" class="form-control requried num" id="due_started" name="due_started" value="<?php echo $Due_start_date; ?>">
</div> </div>
</div> </div>
</div> </div>
@ -248,7 +245,7 @@ if (!empty($emppay)) {
<h4 class="header-title">Loan Documents</h4> <h4 class="header-title">Loan Documents</h4>
<!-- Text input--> <!-- Text input-->
<div class="row"> <div class="row">
<div class="form-group" > <div class="form-group">
<div class="col-md-4"> <div class="col-md-4">
<span class="col-form-label" for="request_letter">Request letter</span> <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 style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="request_letter" name="request_letter" />
@ -256,7 +253,7 @@ if (!empty($emppay)) {
</div> </div>
</div> </div>
<?php if ($request_letter) { ?> <?php if ($request_letter) { ?>
<div class="form-group" > <div class="form-group">
<div class="col-md-8"> <div class="col-md-8">
<u> <u>
<a href="<?php echo base_url() . 'public/uploads/images/' . $request_letter ?>"> <a href="<?php echo base_url() . 'public/uploads/images/' . $request_letter ?>">
@ -269,7 +266,7 @@ if (!empty($emppay)) {
</div> </div>
<div class="row"> <div class="row">
<div class="form-group" > <div class="form-group">
<div class=" col-md-4"> <div class=" col-md-4">
<span class="col-form-label" for="payment_statement">Payment Receipt</span> <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 style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="payment_statement" name="payment_statement" />
@ -277,7 +274,7 @@ if (!empty($emppay)) {
</div> </div>
</div> </div>
<?php if ($payment_statement) { ?> <?php if ($payment_statement) { ?>
<div class="form-group" > <div class="form-group">
<div class="col-md-8"> <div class="col-md-8">
<u> <u>
<a href="<?php echo base_url() . 'public/uploads/images/' . $payment_statement ?>"> <a href="<?php echo base_url() . 'public/uploads/images/' . $payment_statement ?>">
@ -292,7 +289,7 @@ if (!empty($emppay)) {
<div class="container"> <div class="container">
<h3>Loan History</h3> <h3>Loan History</h3>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
@ -308,7 +305,8 @@ if (!empty($emppay)) {
<tr> <tr>
<td><?php echo number_format($history->Due_Amount, 2); ?></td> <td><?php echo number_format($history->Due_Amount, 2); ?></td>
<td><?php echo number_format($history->Balance_Amount, 2); ?></td> <td><?php echo number_format($history->Balance_Amount, 2); ?></td>
<td><?php $entryDate = new DateTime($history->Entry_Date); echo $entryDate->format('F j, Y, g:i A'); ?></td> <td><?php $entryDate = new DateTime($history->Entry_Date);
echo $entryDate->format('F j, Y, g:i A'); ?></td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
<?php else: ?> <?php else: ?>
@ -318,7 +316,7 @@ if (!empty($emppay)) {
<?php endif; ?> <?php endif; ?>
</tbody> </tbody>
</table> </table>
</div> </div>
@ -383,10 +381,6 @@ if (!empty($emppay)) {
</div> <!-- content --> </div> <!-- content -->
<script> <script>
// function duecalculation() { // function duecalculation() {
// var totaldue = 0; // var totaldue = 0;
// var loan = document.getElementById('Loan_Amount').value; // var loan = document.getElementById('Loan_Amount').value;

8
app/Views/editRevenueAmendPO.php
View File

@ -1554,7 +1554,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12" align="right"><br /> <div class="form-group col-md-12"><br />
<div> <div>
<input type="file" name="POFile" id="POFile"> <input type="file" name="POFile" id="POFile">
<?php if ($PrePOFile) { ?> <?php if ($PrePOFile) { ?>
@ -2270,6 +2270,7 @@ if (!empty($INRSYMBOL)) {
$('#BudgetType').attr("style", "pointer-events: none;"); $('#BudgetType').attr("style", "pointer-events: none;");
$('#EditRevenue').click(function () { $('#EditRevenue').click(function () {
console.log("####");
tinyMCE.triggerSave(); tinyMCE.triggerSave();
if (validateEditRevenueTax() && validateEditExceedLimit()) { if (validateEditRevenueTax() && validateEditExceedLimit()) {
var CostCode = $("#EditCostCenter").val(); var CostCode = $("#EditCostCenter").val();
@ -2407,7 +2408,7 @@ if (!empty($INRSYMBOL)) {
} }
function populateValueMainFormForEditRevenueTax() { function populateValueMainFormForEditRevenueTax() {
var rows = document.getElementById('revenueTax').rows.length; var rows = $('#revenueTax tbody tr').length;
var totBasicAmt = 0; var totBasicAmt = 0;
var totDiscountAmt = 0; var totDiscountAmt = 0;
var totPackagingAmt = 0; var totPackagingAmt = 0;
@ -2483,7 +2484,8 @@ if (!empty($INRSYMBOL)) {
<script> <script>
function validateBudgetExceedLimit() { function validateBudgetExceedLimit() {
//alert('inside validateBudgetExceedLimit function'); //alert('inside validateBudgetExceedLimit function');
var rows = document.getElementById('revenueTax').rows.length; // var rows = document.getElementById('revenueTax').rows.length;
var rows = $('#revenueTax tbody tr').length;
var ReqType = '<?php echo REVENUE ?>'; var ReqType = '<?php echo REVENUE ?>';
for (i = 1; i < rows; i++) { for (i = 1; i < rows; i++) {
var costcode = $('#costCode' + i).val(); var costcode = $('#costCode' + i).val();

4
app/Views/editRevenuepurchaseorder.php
View File

@ -4792,7 +4792,7 @@ if (!empty($getlogpodtl)) {
function populateValueMainFormForEditRevenueTax() { function populateValueMainFormForEditRevenueTax() {
var rows = document.getElementById('revenueTax').rows.length; var rows = $('#revenueTax tbody tr').length;
//alert(rows); //alert(rows);
var editrow = parseFloat(rows) - 1; var editrow = parseFloat(rows) - 1;
//alert(editrow); //alert(editrow);
@ -4979,7 +4979,7 @@ if (!empty($getlogpodtl)) {
} }
function validateBudgetExceedLimit() { function validateBudgetExceedLimit() {
var rows = document.getElementById('revenueTax').rows.length; var rows = $('#revenueTax tbody tr').length;
var ReqType = '<?php echo REVENUE ?>'; var ReqType = '<?php echo REVENUE ?>';
for (i = 1; i < rows; i++) { for (i = 1; i < rows; i++) {

4
app/Views/editServiceAmendPO.php
View File

@ -293,7 +293,7 @@ foreach ($PaymentTerms as $TER) {
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>; var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
var AvlBudAmt = '<?php echo $AvlAmount ?>'; var AvlBudAmt = '<?php echo $AvlAmount ?>';
//ServiceTable //ServiceTable
var rows = document.getElementById('ServiceTable').rows.length; var rows = $('#ServiceTable tbody tr').length;
if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') { if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') {
@ -1876,7 +1876,7 @@ foreach ($PaymentTerms as $TER) {
function populateValueMainFormForEditServiceTax() { function populateValueMainFormForEditServiceTax() {
var rows = document.getElementById('ServiceTable').rows.length; var rows = $('#ServiceTable tbody tr').length;
var TotCgst = 0; var TotCgst = 0;
var TotSgst = 0; var TotSgst = 0;

6
app/Views/editimportpo.php
View File

@ -4626,7 +4626,7 @@ if (!empty($getlogpodtl)) {
//$('#txtToatlOrder').val(parseFloat(TotalOrderValue)).toFixed(2); //$('#txtToatlOrder').val(parseFloat(TotalOrderValue)).toFixed(2);
//var Aft=$('#AfterLandingCharge').val(); //var Aft=$('#AfterLandingCharge').val();
//console.log(Aft); //console.log(Aft);
var rows = document.getElementById('ImportTax').rows.length; var rows = $('#ImportTax tbody tr').length;
var i = 0; var i = 0;
do { do {
i += 1; i += 1;
@ -5051,7 +5051,7 @@ if (!empty($getlogpodtl)) {
}); });
function populateValueMainFormForEditImportTax() { function populateValueMainFormForEditImportTax() {
var rows = document.getElementById('ImportTax').rows.length; var rows = $('#ImportTax tbody tr').length;
var TotalLanding = 0; var TotalLanding = 0;
var TotalCustom = 0; var TotalCustom = 0;
@ -5219,7 +5219,7 @@ if (!empty($getlogpodtl)) {
function populateValueMainFormForupdateImportTax() { function populateValueMainFormForupdateImportTax() {
var rows = document.getElementById('ImportTax').rows.length; var rows = $('#ImportTax tbody tr').length;
var TotalFreight = 0; var TotalFreight = 0;
var i = 0; var i = 0;
do { do {

1
app/Views/expense_list.php
View File

@ -315,6 +315,7 @@
<select name="status" id="non_igr_status" class="form-control"> <select name="status" id="non_igr_status" class="form-control">
<option value="Draft">Draft</option> <option value="Draft">Draft</option>
<option value="Completed">Completed</option> <option value="Completed">Completed</option>
<option value="Canceled">Canceled</option>
</select> </select>
</div> </div>
</div> </div>

2
app/Views/importpo.php
View File

@ -3923,7 +3923,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
}); });
function populateValueMainFormForEditImportTax() { function populateValueMainFormForEditImportTax() {
var rows = document.getElementById('ImportTax').rows.length; var rows = $('#ImportTax tbody tr').length;
var TotalLanding = 0; var TotalLanding = 0;
var TotalHighseas = 0; var TotalHighseas = 0;
var TotalCustom = 0; var TotalCustom = 0;

2
app/Views/purchaseorder.php
View File

@ -3683,7 +3683,7 @@ if (!empty($INRSYMBOL)) {
function populateValueMainFormForEditRevenueTax() { function populateValueMainFormForEditRevenueTax() {
var rows = document.getElementById('revenueTax').rows.length; var rows = $('#revenueTax tbody tr').length;
//alert(rows); //alert(rows);
var totBasicAmt = 0; var totBasicAmt = 0;
var totDiscountAmt = 0; var totDiscountAmt = 0;

2
app/Views/servicePurchaseorder.php
View File

@ -2096,7 +2096,7 @@ if (!empty($INRSYMBOL)) {
function populateValueMainFormForEditServiceTax() { function populateValueMainFormForEditServiceTax() {
var rows = document.getElementById('serviceTax').rows.length; var rows = $('#serviceTax tbody tr').length;
var TotCgst = 0; var TotCgst = 0;
var TotSgst = 0; var TotSgst = 0;