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

issues fixes

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-03-24 12:30:28 +00:00
parent 0493755d64
commit 1354c45d2d
4 changed files with 292 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/Emergencypurchaseorder.php
View File

@ -208,7 +208,9 @@ class Emergencypurchaseorder extends BaseController
$newPONO = generate_po_number($lastPONO); $newPONO = generate_po_number($lastPONO);
// PO Master // PO Master
$POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'ServiceWorkStatus' => $ServiceWorkStatus, 'POType' => $POType, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder); $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'ServiceWorkStatus' => $ServiceWorkStatus, 'POType' => $POType, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder);
$file = $this->request->getFile('POFile'); $file = null;
if($POType == "SERVICE"){ $file = $this->request->getFile('ServiceFile');}
if($POType == "REVENUE"){ $file = $this->request->getFile('RevenueFile');}
if($file !== null){ if($file !== null){
$requestfilename = $file->getName(); $requestfilename = $file->getName();
if (!empty($requestfilename)) { if (!empty($requestfilename)) {

2
app/Controllers/Inwardgateregister.php
View File

@ -1442,6 +1442,8 @@ function updateIGRWeight(){
if ($value1 != $value && $key1 == $key) { if ($value1 != $value && $key1 == $key) {
$value = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value) : $value; $value = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value) : $value;
$value1 = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value1) : $value1; $value1 = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value1) : $value1;
$value = ($key1 == "TransporterId") ? $this->inwardgateregister_model->get_TransporterId($value) : $value;
$value1 = ($key1 == "TransporterId") ? $this->inwardgateregister_model->get_TransporterId($value1) : $value1;
// Store each changed field in an array // Store each changed field in an array
$history_entries[] = [ $history_entries[] = [
'field' => $key1, 'field' => $key1,

11
app/Models/Inwardgateregister_model.php
View File

@ -1361,5 +1361,16 @@ $builder = $this->db->table('t_igr_history')
return $StatusName; return $StatusName;
} }
public function get_TransporterId($value){
$builder = $this->db->table('t_transporter')
->select('id,name')
->where('id', $value);
$query = $builder->get()->getRow();
$transportername = $query ? $query->name : null;
return $transportername;
}
} }

118
app/Views/alterpurchaseorder.php
View File

@ -3049,7 +3049,7 @@ if (!empty($INRSYMBOL)) {
<label> <label>
Select Purchase Order File Select Purchase Order File
</label><br> </label><br>
<input type="file" name="POFiles" id="POFiles"><br> <input type="file" name="RevenueFile" id="RevenueFile"><br>
</div> </div>
</div> </div>
@ -3155,7 +3155,7 @@ if (!empty($INRSYMBOL)) {
<label> <label>
Select Purchase Order File Select Purchase Order File
</label><br> </label><br>
<input type="file" name="POFile" id="POFile"><br> <input type="file" name="ServiceFile" id="ServiceFile"><br>
</div> </div>
</div> </div>
@ -5208,6 +5208,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<!-- Modal for CST Calculation --> <!-- Modal for CST Calculation -->
<div class="modal fade" id="CSTCalModel" role="dialog"> <div class="modal fade" id="CSTCalModel" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
@ -5240,19 +5241,25 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<!-- Edit Service Modal content--> <!-- Edit Service Modal content-->
<div class="modal fade" id="EDITSERVICE" role="dialog" style="overflow-y:scroll !important"> <div align="center">
<div class="modal fade" id="EDITSERVICE" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content--> <!-- Modal content-->
<form> <form>
<div class="modal-content" style="width:1000px;"> <div class="modal-content" style="width:1060px;">
<div class="modal-header"> <div class="modal-header">
<center> <center>
<h4>Edit Service Purchase Order Item </h4> <h4>Edit Service Purchase Order Item </h4>
</center> </center>
<button type="button" class="close" data-dismiss="modal"
aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div> </div>
<div class="modal-body p-4">
<div align="left" style="padding: 31px;">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
@ -5266,7 +5273,6 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Department Name</label> <label>Department Name</label>
<div class="form-group"> <div class="form-group">
@ -5296,7 +5302,6 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
@ -5311,7 +5316,6 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Item Name</label> <label>Item Name</label>
<div class="form-group"> <div class="form-group">
@ -5341,62 +5345,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="col-md-12">
<div class="col-md-4" id="EditDisplayScheduleDiv" style="display:none;">
<label>Select Service Schedule Type</label>
<div class="form-group">
<?php
$Schdule = array("One Time", "Recurring");
if (!empty($Schdule)) {
foreach ($Schdule as $Sch):
$SchType[$Sch] = $Sch;
endforeach;
}
echo form_dropdown('EditScheduleType', $SchType, set_value('EditScheduleType'), 'id="EditScheduleType"', 'class = "form-control"');
?>
</div>
</div>
<div class="col-md-4" id="EditServicePeriodOption" style="display:none;">
<label>Select Service Period Option</label>
<div class="form-group">
<?php
if (!empty($ServiceOption)) {
foreach ($ServiceOption as $SerOption):
$ServiceOptions[$SerOption->ConfigValue] = $SerOption->ConfigValue;
endforeach;
}
echo form_dropdown('EditServiceOptions', $ServiceOptions, set_value('EditServiceOptions'), 'id="EditServiceOptions"', 'class = "form-control"');
?>
</div>
</div>
<div class="col-md-4" id="EditNoServices" style="display:none;">
<label>Number of Services</label>
<div class="form-group">
<?php
$data = array('name' => 'EditServiceNo', 'value' => set_value('EditServiceNo'), 'id' => 'EditServiceNo', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
echo form_input($data);
?>
</div>
</div>
</div> -->
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<label>Quantity<span class="badge mandatory">*</span></label> <label>Quantity<span class="badge mandatory">*</span></label>
<div class="form-group"> <div class="form-group">
@ -5552,15 +5502,10 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<input type="hidden" id="hiddenServiceuserid" name="hiddenServiceuserid" /> <input type="hidden" id="hiddenServiceuserid" name="hiddenServiceuserid" />
<div class="modal-footer"> <div class="modal-footer">
<div class="col-md-12 text-right"> <a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a> &nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span <a class="btn btn-success font EditService" ID="Edit"> &nbsp;&nbsp;<span class="bold">Update Service</span></a>
class="bold">Update Service</span></a>
</div> </div>
</div> </div>
</div> </div>
@ -5569,6 +5514,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<!-- Edit Revenue Modal --> <!-- Edit Revenue Modal -->
<div align="center"> <div align="center">
<div id="EDITREVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" <div id="EDITREVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
@ -5584,7 +5531,7 @@ if (!empty($INRSYMBOL)) {
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div><!-- modal header -->
<div class="modal-body p-4" align="left"> <div class="modal-body p-4" align="left">
<!-- first row --> <!-- first row -->
<div class="row"> <div class="row">
@ -5975,7 +5922,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div><!-- /.modal-body -->
<input type="hidden" id="hiddenRevenueuserid" name="hiddenRevenueuserid" /> <input type="hidden" id="hiddenRevenueuserid" name="hiddenRevenueuserid" />
<!-- footer for revenue po --> <!-- footer for revenue po -->
@ -5985,27 +5932,18 @@ if (!empty($INRSYMBOL)) {
<a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit <a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit
Revenue</span></a> Revenue</span></a>
</div> </div>
</div> </div><!-- /.modal-footer -->
</div>
</div> </div>
</div> </form><!-- /.modal-content -->
</div> </div><!-- /.dialogModal -->
</div>
</form>
</div>
</form>
</div> </div>
</div> </div>
</div> <!-- </div>
</form> </form>
@ -6016,7 +5954,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div> -->
<!-- </section> --> <!-- </section> -->
<!-- <script type="text/html" id="RevenueList"> <!-- <script type="text/html" id="RevenueList">
@ -7392,6 +7330,7 @@ if (!empty($INRSYMBOL)) {
$('#PoTypeOptions').focus(); $('#PoTypeOptions').focus();
return false; return false;
} else { } else {
// console.log("Data :", Object.fromEntries(formData));return;
// Submit the form using AJAX // Submit the form using AJAX
$('#loader').show(); $('#loader').show();
// disableButtons(); // disableButtons();
@ -7485,7 +7424,8 @@ if (!empty($INRSYMBOL)) {
formData.append(inputName, file); // Append the file to FormData formData.append(inputName, file); // Append the file to FormData
} }
}); });
console.log("Data before AJAX call:", Object.fromEntries(formData));
return;
// Perform form validation // Perform form validation
if (validate()) { if (validate()) {
@ -7503,7 +7443,7 @@ if (!empty($INRSYMBOL)) {
return false; return false;
} else { } else {
// Submit the form using AJAX // Submit the form using AJAX
// console.log("Data :", Object.fromEntries(formData));return;
$('#loader').show(); $('#loader').show();
$.ajax({ $.ajax({
url: "<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder", url: "<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder",