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-18 12:18:29 +05:30
commit 50cd3c0d19
4 changed files with 74 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Controllers/Inwardgateregister.php
View File

@ -617,20 +617,43 @@ class Inwardgateregister extends BaseController
$finalstatement = "Successfully Created IGR Number: $IGRNO \n";
# Step 5 Shifted Here
// if($IGRNO){
// $igr_history = [
// 'field' => NULL,
// 'history_dated' => get_current_date_time(),
// 'by' => $this->session->get('userId'),
// 'IGR_No' => $IGRNO,
// 'is_add' => 1
// ];
// // Insert history entry
// $history_id = $this->inwardgateregister_model->igr_history($igr_history);
// if ($history_id) {
// log_message('error', "History Newly Created for IGR No: $IGRNO. History ID: $history_id. ");
// }
// }
if($IGRNO){
if($IGRStatus !== ""){
$NamedIGRStatus = $this->inwardgateregister_model->get_status($IGRStatus);
$igr_history = [
'field' => NULL,
'field' => "IGRStatus",
'new_data' => $NamedIGRStatus,
'old_data' => "",
'history_dated' => get_current_date_time(),
'by' => $this->session->get('userId'),
'IGR_No' => $IGRNO,
'is_add' => 1
];
// Insert history entry
$history_id = $this->inwardgateregister_model->igr_history($igr_history);
if ($history_id) {
log_message('error', "History Newly Created for IGR No: $IGRNO. History ID: $history_id. ");
}
}
}
}
if ($fileupdated_count > 0) {

6
app/Controllers/Servicepurchaseorder.php
View File

@ -344,7 +344,7 @@ class Servicepurchaseorder extends BaseController
}
$message = 'Service Purchase Order Created Successfully! PO Number Is: ' . $PONO;
if($POStatus == 'ST015'){
if($POStatus == 'ST014'){
$message = 'Service Purchase Order Saved as Draft! PO Number Is: ' . $PONO;
} else if($POStatus == 'ST026'){
$message = 'Service Purchase Order Approved Successfully! PO Number Is: ' . $PONO;
@ -616,9 +616,9 @@ class Servicepurchaseorder extends BaseController
}
$message = 'Service Purchase Order Updated Successfully! PO Number Is: ' . $PONO;
if($POStatus == 'ST014'){
$message = 'Service Purchase Order Created Successfully! PO Number Is: ' . $PONO;
} else if($POStatus == 'ST015'){
$message = 'Service Purchase Order Saved as Draft! PO Number Is: ' . $PONO;
} else if($POStatus == 'ST015'){
$message = 'Service Purchase Order Created Successfully! PO Number Is: ' . $PONO;
} else if($POStatus == 'ST026'){
$message = 'Service Purchase Order Approved Successfully! PO Number Is: ' . $PONO;
}

56
app/Views/alterpurchaseorder.php
View File

@ -3576,12 +3576,8 @@ if (!empty($INRSYMBOL)) {
<br>
<div class="col-12 text-right">
<a class="btn btn-secondary waves-effect"
data-dismiss="modal" value="Cancel">Cancel</a>
&nbsp;&nbsp;
<a class="btn btn-success font AddRevenue" ID="AddRevenue">
&nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin:10px;">Cancel</a>&nbsp;&nbsp;
<a class="btn btn-success font AddRevenue" ID="AddRevenue">&nbsp;&nbsp;<span class="bold">Add Revenue</span></a>&nbsp;&nbsp;
</div>
@ -3874,16 +3870,11 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="modal-footer">
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-success font AddService" ID="AddService"> &nbsp;&nbsp;<span class="bold">Add Service</span></a>
</div>
<div class="modal-footer">
<div class="col-md-12 text-right">
<button type="button" class="btn btn-secondary waves-effect"
data-dismiss="modal" value="Cancel">Cancel</button>
<button type="button"
class="btn btn-info waves-effect waves-light font AddService"
ID="PackagingOption" ID="AddService">Save</button>
</div>
</div>
<!-- <div class="col-md-12 text-right"></div> -->
</div>
</form>
@ -7035,6 +7026,7 @@ if (!empty($INRSYMBOL)) {
var EditGetMaterialData;
$("#EDITSERVICE").on("shown.bs.modal", function (e) {
// alert("mistake on here check it");
tinyMCE.triggerSave();
var userid = $(e.relatedTarget).data('userid');
console.log("userid:", userid);
@ -7055,14 +7047,14 @@ if (!empty($INRSYMBOL)) {
$('#EditEmergPer').val($('#Serviceper' + userid).val());
$('#EditQuantity').val($('#quantity' + userid).val());
$('#EditRate').val($('#itemRate' + userid).val());
$('#txtEditBasicValue').val(cellval[7].innerHTML);
$('#txtEditBasicValue').val(cellval[8].innerHTML);
$('#EditAfterCgst').val($('#AfterCgst' + userid).val());
$('#EditAfterSgst').val($('#AfterSgst' + userid).val());
$('#EditAfterIgst').val($('#AfterIgst' + userid).val());
$('#EditCgst').val($('#Cgst' + userid).val());
$('#EditSgst').val($('#Sgst' + userid).val());
$('#EditIgst').val($('#Igst' + userid).val());
$('#EditTotalOrderValue').val(cellval[9].innerHTML);
$('#EditTotalOrderValue').val(cellval[10].innerHTML);
$('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
tinyMCE.get('EdittxtSpcialInstructionSingle').setContent($('#ItemServiceDescription' + userid).val());
@ -7177,14 +7169,14 @@ if (!empty($INRSYMBOL)) {
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[3].innerHTML = editMaterialCode;
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
cellval[4].innerHTML = editQuantity;
cellval[5].innerHTML = editUOM;
cellval[6].innerHTML = itemRate;
cellval[7].innerHTML = basicval;
cellval[8].innerHTML = TotalTaxValue;
cellval[9].innerHTML = TotalOrderValue;
cellval[5].innerHTML = editQuantity;
cellval[6].innerHTML = editUOM;
cellval[7].innerHTML = itemRate;
cellval[8].innerHTML = basicval;
cellval[9].innerHTML = TotalTaxValue;
cellval[10].innerHTML = TotalOrderValue;
$('#materialCode' + userid).val(editMaterialCode);
@ -7720,7 +7712,7 @@ if (!empty($INRSYMBOL)) {
$('#EditRevenueQuantity').val($('#quantity' + userid).val());
$('#EditRevenueRate').val($('#itemRate' + userid).val());
$('#editrevenueEmergPer').val($('#per' + userid).val());
$('#txtEditRevenueBasicValue').val(cellval[7].innerHTML);
$('#txtEditRevenueBasicValue').val(cellval[8].innerHTML);
RequistQuantity = $('#quantity' + userid).val();
$('#txtEditDiscount').val($('#DisVal' + userid).val());
$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
@ -7854,14 +7846,14 @@ if (!empty($INRSYMBOL)) {
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[3].innerHTML = editMaterialCode;
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
cellval[4].innerHTML = parseFloat(editQuantity).toFixed(2);
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);
cellval[5].innerHTML = parseFloat(editQuantity).toFixed(2);
cellval[6].innerHTML = editUOM;
cellval[7].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[8].innerHTML = parseFloat(basicval).toFixed(2);
cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[10].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode);

24
app/Views/viewinwardgateregister.php
View File

@ -525,7 +525,7 @@
<div class="row text-left">
<br>
<div class="form-group col-md-12">
<div class="form-group col-md-5">
<label> Master IGR file</label>
<br>
<input type="file" name="MasterFile" id="MasterFile" onchange="filenames(this.name); ">
@ -1689,12 +1689,30 @@
// let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
let sentence = " ";
if (parseInt(record.is_add) === 1) {
sentence += record.IGR_No + " was Created by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
// sentence += record.IGR_No + " was Created by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
if (record.field === "IGRStatus") {
str1 = record.new_data;
str2 = str1.replace(/\bIGR\b/i, '').trim();
sentence += record.IGR_No + " was <b> ` " + str2 + " ` </b> by " + record.FullName +
" on " + record.indian_date + " at " + record.indian_time;
} else {
sentence += record.IGR_No + " was <b> ` CREATED ` </b> by " + record.FullName +
" on " + record.indian_date + " at " + record.indian_time;
}
} else if (parseInt(record.is_edit) === 1) {
let str = record.field;
if (str !== "UpdateBY" && str !== "MaterialRcvdDate" && str !== "DeliveryChellanDate") {
let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
sentence += ((record.IGRItem_No) ? record.MaterialName+" ( "+ record.MaterialCode + " ) - " : "")+fieldName+" "+record.old_data + " was Updated into " + record.new_data + " by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
let displayOldData = record.old_data === null || record.old_data === "" ? " " : record.old_data;
let displayNewData = record.new_data === null || record.new_data === "" ? " " : record.new_data;
if (record.field === "IGRStatus") {
displayOldData = displayOldData.replace(/\bIGR\b/i, '').trim();
displayNewData = displayNewData.replace(/\bIGR\b/i, '').trim();
}
if(displayNewData || displayOldData ){
sentence += ((record.IGRItem_No) ? record.MaterialName+" ( "+ record.MaterialCode + " ) - " : "")+fieldName+" <b> ` "+ displayOldData + " ` </b> was Updated into <b> ` " + displayNewData + " ` </b> by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time;
}
}
} else if (parseInt(record.is_delete) === 1) {
let str = record.field;