diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index b709be63..92c925fb 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -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) { diff --git a/app/Controllers/Servicepurchaseorder.php b/app/Controllers/Servicepurchaseorder.php index 0ca003b9..ab42ce4b 100755 --- a/app/Controllers/Servicepurchaseorder.php +++ b/app/Controllers/Servicepurchaseorder.php @@ -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; } diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index 116ccd80..90d8379b 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -3576,12 +3576,8 @@ if (!empty($INRSYMBOL)) {
- Cancel -    - - -   Add Revenue + Cancel   +   Add Revenue  
@@ -3874,16 +3870,11 @@ if (!empty($INRSYMBOL)) {
+ Cancel +      +   Add Service
-
-
- - -
-
+ @@ -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); diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 0d3edc65..78549ad5 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -525,7 +525,7 @@

-
+

@@ -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 ` " + str2 + " ` by " + record.FullName + + " on " + record.indian_date + " at " + record.indian_time; + } else { + sentence += record.IGR_No + " was ` CREATED ` 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+" ` "+ displayOldData + " ` was Updated into ` " + displayNewData + " ` by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time; + } } } else if (parseInt(record.is_delete) === 1) { let str = record.field;