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:
Smart 2024-09-24 16:34:26 +05:30
commit 2030df957d
2 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/Emergencypurchaseorder.php
View File

@ -372,7 +372,9 @@ class Emergencypurchaseorder extends BaseController
// redirect('purchaseorder/PurchaseOrderList', 'refresh'); // redirect('purchaseorder/PurchaseOrderList', 'refresh');
// } // }
if ($POStatus == REQ_DRAFT) { if ($POStatus == REQ_DRAFT) {
echo "<script>alert('You Have Successfully Saved the Purchase order! $PONO');</script>";
$this->session->setFlashdata('success', 'You Have Successfully Saved the Purchase order! '.$PONO); $this->session->setFlashdata('success', 'You Have Successfully Saved the Purchase order! '.$PONO);
} else { } else {
$this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO); $this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO);
} }

69
app/Views/alterpurchaseorder.php
View File

@ -1496,7 +1496,7 @@ if (!empty($INRSYMBOL)) {
$('#submitmodel').modal('hide'); $('#submitmodel').modal('hide');
if (submitoptionvalue == 0) { if (submitoptionvalue == 0) {
///alert('normal SERVICE emergency'); // alert('normal SERVICE emergency');
$('#txtSpecialservice').val(0); $('#txtSpecialservice').val(0);
Save(1) Save(1)
} else { } else {
@ -1945,7 +1945,7 @@ if (!empty($INRSYMBOL)) {
$('#purpose').on('change', function () { $('#purpose').on('change', function () {
console.log("purpose first");
$('#POType').val(this.value); $('#POType').val(this.value);
if (this.value == 'REVENUE') //Revenue po if (this.value == 'REVENUE') //Revenue po
@ -2011,17 +2011,16 @@ if (!empty($INRSYMBOL)) {
console.log("purpose Second"); console.log("purpose Second");
// $('#purpose').change(function() { // $('#purpose').change(function() {
console.log("1111111111111");
var input = ''; var input = '';
input = $("#purpose").val(); input = $("#purpose").val();
if (input == -1) { if (input == -1) {
$("#POType").val(''); $("#POType").val('');
console.log("222222222222222222");
} else { } else {
console.log("333333333333333333");
$("#POType").val(input); $("#POType").val(input);
// $('#content').loader('show'); // $('#content').loader('show');
$.ajax({ $.ajax({
@ -2031,12 +2030,9 @@ if (!empty($INRSYMBOL)) {
type: "POST", type: "POST",
url: "<?php echo base_url() ?>emergencypurchaseorder/getMaterialCode", url: "<?php echo base_url() ?>emergencypurchaseorder/getMaterialCode",
success: function (data) { success: function (data) {
console.log("4444444444444444");
if (data) { if (data) {
console.log("55555555");
console.log(data);
materialData = data; materialData = data;
console.log("material Data"); console.log("material Data");
@ -2052,7 +2048,7 @@ if (!empty($INRSYMBOL)) {
}); });
} else if (input == 'REVENUE') { } else if (input == 'REVENUE') {
console.log("777777777777777");
$('#MaterialCode').empty(); $('#MaterialCode').empty();
$("#MaterialCode").append($('<option></option>').val("0").html("Select Item Code")); $("#MaterialCode").append($('<option></option>').val("0").html("Select Item Code"));
@ -2096,7 +2092,7 @@ if (!empty($INRSYMBOL)) {
$("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0); $("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0);
} else { } else {
// $('#content').loader('hide'); // $('#content').loader('hide');
alert("Error"); //alert("Error");
} }
} }
@ -2580,7 +2576,9 @@ if (!empty($INRSYMBOL)) {
<label>Purchase Order Date</label> <label>Purchase Order Date</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$formattedDate = $dt->format('Y-m-d');
$poDt=new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$formattedDate = $poDt->format('Y-m-d');
$data = array('type' => 'date', 'name' => 'PODate', 'value' => set_value('PODate', $formattedDate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('type' => 'date', 'name' => 'PODate', 'value' => set_value('PODate', $formattedDate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
@ -2671,7 +2669,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="col-md-3" id="otheroptiondiv" style="display:none;"> <div class="col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms</label> <label>Description of Payable Terms<span class="badge mandatory">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true'); $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true');
@ -2742,7 +2740,7 @@ if (!empty($INRSYMBOL)) {
<!-- table showing line items selected --> <!-- table showing line items selected -->
<div class="row p-2"> <div class="row p-2">
<table class="table table-bordered"> <table class="table table-bordered ">
<div align="right" style="padding-right:10px"> <div align="right" style="padding-right:10px">
<!-- Model for revenue PO --> <!-- Model for revenue PO -->
@ -3117,7 +3115,7 @@ if (!empty($INRSYMBOL)) {
<h4>Add Service Purchase Order Item </h4> <h4>Add Service Purchase Order Item </h4>
</center> </center>
</div> </div>
<div align="left" style="padding: 31px;"> <div style="padding: 31px;">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
@ -4603,6 +4601,13 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<!-- modal div -->
<!-- modal div -->
<!-- modal div -->
<div class="card"> <div class="card">
@ -5037,7 +5042,7 @@ if (!empty($INRSYMBOL)) {
<?php <?php
$options = array("0" => 'Item Code'); $options = array("0" => 'Item Code');
//print_r( $options); //print_r( $options);
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"'); echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
?> ?>
@ -6055,7 +6060,7 @@ if (!empty($INRSYMBOL)) {
success: function (data) { success: function (data) {
if (data) { if (data) {
// $('#content').loader('hide'); // $('#content').loader('hide');
alert(data); // alert(data);
//$('#txtRowCount').val(''); //$('#txtRowCount').val('');
//$('#txtDeletedRow').val(''); //$('#txtDeletedRow').val('');
@ -6093,27 +6098,7 @@ if (!empty($INRSYMBOL)) {
}); });
// Initialize the DataTable // Initialize the DataTable
var table = $('#serviceTax').DataTable({
dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
buttons: [
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
],
pageLength: 10, // Default rows per page
lengthMenu: [
[10, 20, 30, 50, -1],
[10, 20, 30, 50, "All"]
], // Rows per page options
responsive: true, // Responsive table
order: [
[0, 'desc']
], // Default ordering (column index 0, descending)
language: {
paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon
previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
}
}
});
Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo")); Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
@ -7108,8 +7093,10 @@ if (!empty($INRSYMBOL)) {
success: function (data) { success: function (data) {
// Handle the server response // Handle the server response
// $('#content').loader('hide'); // $('#content').loader('hide');
alert(data); if(data){
console.log(data); alert(data);
}
$('#txtRowCount').val(''); $('#txtRowCount').val('');
$('#txtDeletedRow').val(''); $('#txtDeletedRow').val('');
$('#SpcialInstruction').val(''); $('#SpcialInstruction').val('');