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:
Gowtham M 2024-12-21 09:16:08 +05:30
commit 6846386fc7
7 changed files with 90 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Purchaseorder_model.php
View File

@ -851,8 +851,6 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
$result = $query->getResultArray(); $result = $query->getResultArray();
//print_r($result);die;
return $result; return $result;
} else { } else {
return []; return [];

7
app/Views/EditservicePurchaseorder.php
View File

@ -1548,7 +1548,7 @@ if (!empty($getlogpodtl)) {
<!-- Model for servicepo --> <!-- Model for servicepo -->
<div id="SERVICE" class="modal fade" tabindex="-1" role="dialog" <div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width" style="width: 1060px; !important"> <div class="modal-dialog modal-full-width" style="width: 1060px important;">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Add Service Purchase Order Item</h4> <h4 class="modal-title">Add Service Purchase Order Item</h4>
@ -1826,7 +1826,7 @@ if (!empty($getlogpodtl)) {
<!-- Edit Service Modal content Starts Here--> <!-- Edit Service Modal content Starts Here-->
<div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog" <div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width" style="width: 1060px; !important"> <div class="modal-dialog modal-full-width" style="width: 1060px !important;">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Service Purchase Order Item</h4> <h4 class="modal-title">Edit Service Purchase Order Item</h4>
@ -3129,7 +3129,9 @@ if (!empty($getlogpodtl)) {
return TAXval; // $('#AfterServiceTax').val(TAXval); return TAXval; // $('#AfterServiceTax').val(TAXval);
} }
//If others is the payment terms to display mandatory field //If others is the payment terms to display mandatory field
$(document).ready(function () {
$("#PaymentTerms").change(function() { $("#PaymentTerms").change(function() {
var otherPayment = '<?php echo $otherPayment; ?>'; var otherPayment = '<?php echo $otherPayment; ?>';
if ($('#PaymentTerms').val().trim() == 'PT08') { if ($('#PaymentTerms').val().trim() == 'PT08') {
@ -3140,6 +3142,7 @@ if (!empty($getlogpodtl)) {
$('#Otherpayment').val(''); $('#Otherpayment').val('');
} }
}); });
})
$('#ReqNo').change(function() { $('#ReqNo').change(function() {

5
app/Views/editRevenuepurchaseorder.php
View File

@ -5146,7 +5146,8 @@ if (!empty($getlogpodtl)) {
return tot; return tot;
} }
//If others is the payment terms to display mandatory field //If others is the payment terms to display mandatory field
$("#PaymentTerms").change(function () { $(document).ready(function () {
$("#PaymentTerms").change(function () {
if ($('#PaymentTerms').val().trim() == 'PT08') { if ($('#PaymentTerms').val().trim() == 'PT08') {
$('#otheroptiondiv').show(); $('#otheroptiondiv').show();
} else { } else {
@ -5154,6 +5155,8 @@ if (!empty($getlogpodtl)) {
$('#Otherpayment').val(''); $('#Otherpayment').val('');
} }
}); });
})
$('#ReqNo').change(function () { $('#ReqNo').change(function () {
var id = $('#ReqNo').val(); var id = $('#ReqNo').val();

2
app/Views/editServiceAmendPO.php
View File

@ -2323,6 +2323,7 @@ foreach ($PaymentTerms as $TER) {
return TAXval; // $('#AfterServiceTax').val(TAXval); return TAXval; // $('#AfterServiceTax').val(TAXval);
} }
$(document).ready(function () {
$("#PaymentTerms").change(function() { $("#PaymentTerms").change(function() {
if ($('#PaymentTerms').val().trim() == 'PT08') { if ($('#PaymentTerms').val().trim() == 'PT08') {
$('#otheroptiondiv').show(); $('#otheroptiondiv').show();
@ -2330,4 +2331,5 @@ foreach ($PaymentTerms as $TER) {
$('#otheroptiondiv').hide(); $('#otheroptiondiv').hide();
} }
}); });
})
</script> </script>

4
app/Views/importpo.php
View File

@ -4158,6 +4158,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
// } ); // } );
$(document).ready(function () {
$("#PaymentTerms").change(function() { $("#PaymentTerms").change(function() {
//console.log($('#PaymentTerms').val().trim()); //console.log($('#PaymentTerms').val().trim());
if ($('#PaymentTerms').val().trim() == 'PT08') if ($('#PaymentTerms').val().trim() == 'PT08')
@ -4169,6 +4171,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
$('#otheroptiondiv').hide(); $('#otheroptiondiv').hide();
} }
}); });
})
$('#drpFreight').change(function() { $('#drpFreight').change(function() {
var FreightType = $('#drpFreight').val(); var FreightType = $('#drpFreight').val();

187
app/Views/incomingSilicaSandDetails.php
View File

@ -349,8 +349,17 @@
</td> </td>
<!-- 'td:eq(7)' --> <!-- 'td:eq(7)' -->
<td class="celda_normal" contenteditable="true" > <td class="celda_normal" style="color:#02d0eb; background:white;" contenteditable="true">
<?php echo $record['gradeCondition']??''; ?> <select class="status grade-condition" style="width:100px;">
<option value="">Select</option>
<option value="wet"
<?php echo ($record['gradeCondition'] == 'wet') ? "selected":''; ?>
>Wet</option>
<option value="dry"
<?php echo ($record['gradeCondition'] == 'dry') ? "selected":''; ?>
>Dry</option>
</select>
</td> </td>
<!-- 'td:eq(8)' --> <!-- 'td:eq(8)' -->
@ -516,7 +525,7 @@
<td class="celda_normal" style="color:#02d0eb; background:white;"> <td class="celda_normal" style="color:#02d0eb; background:white;">
<i <i
class="fas fa-download download-lab-report" style="cursor:pointer;"></i> class="fas fa-download download-lab-report" style="cursor:pointer;"></i>
</td> </td>
</tr> </tr>
<?php } ?> <?php } ?>
@ -571,130 +580,9 @@
<div class="modal-body"> <div class="modal-body">
<form action="<?php echo base_url('/updateLabReport')?>" method="POST"> <form action="<?php echo base_url('/updateLabReport')?>" method="POST">
<div class="row">
<div class="col-md-3">
<div class="form-group">
<label for="10Mm">10Mm</label>
<input type="text" class="form-control" name="10Mm" id="10Mm" value="0.00">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="20Mm">20Mm</label>
<input type="text" class="form-control" name="20Mm" id="20Mm" value="0.00">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="30Mm">30Mm</label>
<input type="text" class="form-control" name="30Mm" id="30Mm" value="0.00">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="40Mm">40Mm</label>
<input type="text" class="form-control" name="40Mm" id="40Mm" value="0.00">
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="form-group">
<label for="50Mm">50Mm</label>
<input type="text" class="form-control" name="50Mm" id="50Mm" value="0.00">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="70Mm">70Mm</label>
<input type="text" class="form-control" name="70Mm" id="70Mm" value="0.00">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="100Mm">100Mm</label>
<input type="text" class="form-control" name="100Mm" id="100Mm" value="0.00">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="140Mm">140Mm</label>
<input type="text" class="form-control" name="140Mm" id="140Mm" value="0.00">
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="form-group">
<label for="200Mm">200Mm</label>
<input type="text" class="form-control" name="200Mm" id="200Mm" value="0.00">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="300Mm">300Mm</label>
<input type="text" class="form-control" name="300Mm" id="300Mm" value="0.00">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="pan">Pan</label>
<input type="text" class="form-control" name="pan" id="pan" value="0.00" >
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="total">Total</label>
<input type="text" class="form-control" name="total" id="total" value="0.00" readonly>
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="form-group">
<label for="moistureSpec">Moisture % spec</label>
<input type="text" class="form-control" name="moistureSpec" id="moistureSpec" value="0.00">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="moistureActual">Moisture Actual</label>
<input type="text" class="form-control" name="moistureActual" id="moistureActual" value="0.00">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="moistureLoss">Moisture Loss </label>
<input type="text" class="form-control" name="moistureLoss" id="moistureLoss" value="0.00" readonly>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="moistureLossQty">Moisture Loss Qty</label>
<input type="text" class="form-control" name="moistureLossQty" id="moistureLossQty" value="0.00" readonly>
</div>
</div>
</div>
<!-- hidden fields section -->
<input type="hidden" name="id" id="issdId" value="">
<input type="hidden" name="igrNo" id="igrNo" value="">
<input type="hidden" name="materialCode" id="materialCode" value="">
<input type="hidden" name="qty" id="qty" value="">
<input type="hidden" name="plus20Loss" id="plus20Loss" value="">
<input type="hidden" name="plus30Loss" id="plus30Loss" value="">
<input type="hidden" name="sieveLossQty" id="sieveLossQty" value="">
<input type="hidden" name="salableQty" id="salableQty" value="">
</div> </div>
@ -720,7 +608,8 @@
</div> </div>
<div class="modal-body p-4" id="content"> <div class="modal-body p-4" id="content">
<div style="text-align: right;"><small>REF:RIPL/DAD/R02</small></div> <div style="text-align: right;"><small>REF:RIPL/DAD/R02</small></div>
<form>
<form action="<?php echo base_url('/updateLabReport')?>" method="POST">
<header class="clearfix"> <header class="clearfix">
<div class="row"> <div class="row">
<div class="col-3" width="100px;"> <div class="col-3" width="100px;">
@ -976,8 +865,37 @@
<b><small> * This is a system generated </small></b> <b><small> * This is a system generated </small></b>
</main> </main>
</div> </div>
<!-- hidden fields section -->
<input type="hidden" name="id" id="issdId" value="">
<input type="hidden" name="igrNo" id="igrNo" value="">
<input type="hidden" name="materialCode" id="materialCode" value="">
<input type="hidden" name="qty" id="qty" value="">
<input type="hidden" class="form-control" name="10Mm" id="10Mm" value="0.00">
<input type="hidden" class="form-control" name="20Mm" id="20Mm" value="0.00">
<input type="hidden" class="form-control" name="30Mm" id="30Mm" value="0.00">
<input type="hidden" class="form-control" name="40Mm" id="40Mm" value="0.00">
<input type="hidden" class="form-control" name="50Mm" id="50Mm" value="0.00">
<input type="hidden" class="form-control" name="70Mm" id="70Mm" value="0.00">
<input type="hidden" class="form-control" name="100Mm" id="100Mm" value="0.00">
<input type="hidden" class="form-control" name="140Mm" id="140Mm" value="0.00">
<input type="hidden" class="form-control" name="200Mm" id="200Mm" value="0.00">
<input type="hidden" class="form-control" name="300Mm" id="300Mm" value="0.00">
<input type="hidden" class="form-control" name="pan" id="pan" value="0.00" >
<input type="hidden" class="form-control" name="total" id="total" value="0.00" readonly>
<input type="hidden" class="form-control" name="moistureSpec" id="moistureSpec" value="0.00">
<input type="hidden" class="form-control" name="moistureActual" id="moistureActual" value="0.00">
<input type="hidden" class="form-control" name="moistureLoss" id="moistureLoss" value="0.00" readonly>
<input type="hidden" class="form-control" name="moistureLossQty" id="moistureLossQty" value="0.00" readonly>
<input type="hidden" name="plus20Loss" id="plus20Loss" value="">
<input type="hidden" name="plus30Loss" id="plus30Loss" value="">
<input type="hidden" name="sieveLossQty" id="sieveLossQty" value="">
<input type="hidden" name="salableQty" id="salableQty" value="">
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success" data-dismiss="modal">Save</button>
<button type="button" id="pdfGenerateId" class="btn btn-primary">Download</button> <button type="button" id="pdfGenerateId" class="btn btn-primary">Download</button>
</div> </div>
</form> </form>
@ -986,7 +904,7 @@
</div> </div>
<!-- download pdf punction -->
<script> <script>
@ -1233,6 +1151,15 @@
}) })
</script> </script>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$('#10Mm , #20Mm, #30Mm, #40Mm, #50Mm, #70Mm, #100Mm, #1400Mm, #200Mm, #300Mm , #pan , #moistureSpec ,#moistureActual').change(function(){ $('#10Mm , #20Mm, #30Mm, #40Mm, #50Mm, #70Mm, #100Mm, #1400Mm, #200Mm, #300Mm , #pan , #moistureSpec ,#moistureActual').change(function(){
@ -1296,6 +1223,11 @@
}) })
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
@ -1315,6 +1247,7 @@
// Get the selected values from dropdowns // Get the selected values from dropdowns
row['Remark'] = $(this).find('.sand-status').val(); row['Remark'] = $(this).find('.sand-status').val();
row['Grade Condition'] = $(this).find('.grade-condition').val()
}); });

39
app/Views/purchaseorder.php
View File

@ -62,34 +62,6 @@ if (!empty($INRSYMBOL)) {
<style> <style>
.modal { overflow: auto !important; } .modal { overflow: auto !important; }
/* #packagingcalmodel {
margin-top: 200px;
z-index: 1080 !important;
}
#freightcalmodel {
margin-top: 200px;
z-index: 1080 !important;
}
#ExciseDutyCalModel {
margin-top: 200px;
z-index: 1080 !important;
} */
/* #VatCalModel {
margin-top: 200px;
z-index: 1080 !important;
}
#CSTCalModel {
margin-top: 200px;
z-index: 1080 !important;
}
.modal {
padding-right: 30% ! important;
} */
</style> </style>
<!-- Rich text --> <!-- Rich text -->
@ -2047,7 +2019,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;"> <div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms</label> <label>Description of Payable Terms<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control'); $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control');
@ -4106,7 +4078,8 @@ if (!empty($INRSYMBOL)) {
} }
//If others is the payment terms to display mandatory field //If others is the payment terms to display mandatory field
$("#PaymentTerms").change(function() { $(document).ready(function(){
$("#PaymentTerms").change(function() {
if ($('#PaymentTerms').val().trim() == 'PT08') { if ($('#PaymentTerms').val().trim() == 'PT08') {
$('#otheroptiondiv').show(); $('#otheroptiondiv').show();
$('#Otherpayment').prop('required', true); $('#Otherpayment').prop('required', true);
@ -4116,7 +4089,9 @@ if (!empty($INRSYMBOL)) {
$('#Otherpayment').val(''); $('#Otherpayment').val('');
} }
}); });
// set default null value })
function clearTotalItemValues() { function clearTotalItemValues() {
@ -4138,4 +4113,6 @@ if (!empty($INRSYMBOL)) {
location.reload(); location.reload();
} }
</script> </script>