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 2025-03-14 12:11:22 +05:30
commit 27681a4fa1
16 changed files with 152 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Controllers/Amendmentpurchaseorder.php
View File

@ -292,6 +292,8 @@ class Amendmentpurchaseorder extends BaseController
$POStatus = $this->request->getPost('txtStatus');
$updatedBy = $this->session->get('userId');
$RowCount = $this->request->getPost('txtRowCount');
$BudgetType = $this->request->getPost('Budget');
$updateddt = get_current_date_time();
$qtycheck = $this->purchaseorder_model->getqtycheck($PONO);
@ -308,8 +310,7 @@ class Amendmentpurchaseorder extends BaseController
$Otherpayment = '';
}
$AmendmentNewPoNo = generate_amendment_po_number($PONO);
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $Local_Interstate, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $changeStatus , 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult);
$POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $Local_Interstate, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $changeStatus , 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult,'CapitalRange' => $Local_Interstate,'BudgetType' => $BudgetType); // not
$file = $this->request->getFile('POFile');
$requestfilename = $file->getName();
$PrePOFile = $this->request->getPost('PrePOFile');
@ -551,7 +552,7 @@ class Amendmentpurchaseorder extends BaseController
if($itemRate != 0){
$this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); }
$POLineItemList = array('PONO' => $NewPO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'ReceivedQuantity' => $RecQtyvalue, 'Quantity' => $Quantity, 'Per' => $per, 'ServiceMaterialDescription' => $servicematerialdescription, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'CostCenterCode' => $CostCenter, 'ServiceFrequency' => $ServiceFrequency, 'AmendedDetails' => $CAD);
$POLineItemList = array('PONO' => $NewPO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'ReceivedQuantity' => $RecQtyvalue, 'Quantity' => $Quantity, 'Per' => $per, 'ServiceMaterialDescription' => $servicematerialdescription, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'CostCenterCode' => $CostCenter, 'ServiceFrequency' => $ServiceFrequency, 'AmendedDetails' => $CAD,'LineitemAuditorNotes'=>$LineitemAuditorNotes);
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
@ -597,6 +598,7 @@ class Amendmentpurchaseorder extends BaseController
*/
function UpdateAmendServicePurchaseOrder()
{
// dd($this->request->getPost());
$PONO = $this->request->getPost('txtPONO');
@ -1316,6 +1318,8 @@ class Amendmentpurchaseorder extends BaseController
*/
function EditAmendImportPO()
{
// echo "<pre>"; print_r($this->request->getPost()); echo"</pre>";
$MAD = '';
$PONO = $this->request->getPost('txtPONO');
@ -1440,7 +1444,7 @@ class Amendmentpurchaseorder extends BaseController
if (count($LastPO) > 0) {
$NewPO = $LastPO[0]['PONO'];
}
if( $changeStatus == "ST026" || $changeStatus == "ST014"){
$PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
@ -1662,8 +1666,9 @@ class Amendmentpurchaseorder extends BaseController
if (count($POLineItem) > 0) {
$LineItemNo = $POLineItem[0]['LineItemNo'];
}
$ImportTaxList = array('LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $NoOfTrip, 'FreightValue' => $Freightrate, 'AfterFreightValue' => $Freightamount, 'AssessableValue' => $Assable, 'SubTotal' => $Subtotal, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'DutyImpact' => $DutyImpact, 'NetValue' => $NetValue, 'ClearingCharge' => $ClearingCharge,'LineitemAuditorNotes' => $LineitemAuditorNotes);
$ImportTaxList = array('LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $NoOfTrip, 'FreightValue' => $Freightrate, 'AfterFreightValue' => $Freightamount, 'AssessableValue' => $Assable, 'SubTotal' => $Subtotal, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'DutyImpact' => $DutyImpact, 'NetValue' => $NetValue, 'ClearingCharge' => $ClearingCharge);
$ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
}

2
app/Controllers/Requisitionform.php
View File

@ -126,7 +126,7 @@ class Requisitionform extends BaseController
}
}
}
//print_r($POType);
// print_r($POType);
// echo 'ReqType'.$ReqPOType;
$data['ReqPOType'] = $ReqPOType == '' ? $ReqType : $ReqPOType;
$data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);

2
app/Models/Requistion_model.php
View File

@ -14,7 +14,7 @@ class Requistion_model extends Model
{
$builder = $this->db->table('t_supplierdetailsn')
->select('SupplierID, SupplierName,ADeleteRequistionLineItemddress');
//->where('roleId !=', 1);
// ->where('roleId !=', 1);
$query = $builder->get();
return $query->getResult();

14
app/Views/EditservicePurchaseorder.php
View File

@ -1453,7 +1453,9 @@ if (!empty($getlogpodtl)) {
<label>Description Of Service <span class="text-danger">*</label>
<?php
$data = array('name' => 'editdescofpo', 'value' => set_value('editdescofpo', strip_tags($DescriptionOfPo)), 'id' => 'editdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
$DescriptionOfPo = html_entity_decode($DescriptionOfPo);
$DescriptionOfPo = strip_tags($DescriptionOfPo);
$data = array('name' => 'editdescofpo', 'value' => set_value('editdescofpo', $DescriptionOfPo), 'id' => 'editdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data);
?>
@ -1467,7 +1469,9 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-12">
<label>Scope Of Work</label>
<?php
$data = array('name' => 'ScopeofWork', 'value' => set_value('ScopeofWork', strip_tags($ServiceDescription)), 'id' => 'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
$ServiceDescription = html_entity_decode($ServiceDescription);
$ServiceDescription = strip_tags($ServiceDescription);
$data = array('name' => 'ScopeofWork', 'value' => set_value('ScopeofWork', $ServiceDescription), 'id' => 'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
echo form_textarea($data);
?>
</div>
@ -1662,7 +1666,7 @@ if (!empty($getlogpodtl)) {
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-secondary" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
@ -2253,7 +2257,7 @@ if (!empty($getlogpodtl)) {
</div>
<div class="modal-footer">
<div class="form-row">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin:10px;">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin:10px;">Cancel</a>
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
</div>
</div>
@ -2501,7 +2505,7 @@ if (!empty($getlogpodtl)) {
</div><br>
<div class="modal-footer">
<div class="form-row">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
</div>

2
app/Views/editCapitalPo.php
View File

@ -1597,7 +1597,7 @@ if (!empty($getlogpodtl)) {
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if($PONOStatus == PO_AMENDED){ ?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<?php } else {

10
app/Views/editImportAmendPO.php
View File

@ -1234,7 +1234,7 @@ if (!empty($RequistionDetails)) {
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:15px">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:15px">Cancel</a>
<a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
<!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
</div>
@ -2793,10 +2793,10 @@ if (!empty($RequistionDetails)) {
var cellval = tr.cells;
cellval[3].innerHTML = editQuantity;
cellval[4].innerHTML = editUOM;
cellval[5].innerHTML = itemRate;
cellval[6].innerHTML = BasicValue;
cellval[4].innerHTML = editQuantity;
cellval[5].innerHTML = editUOM;
cellval[6].innerHTML = itemRate;
cellval[7].innerHTML = BasicValue;
$('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(edititemname);

4
app/Views/editRawmaterial.php
View File

@ -113,7 +113,7 @@ if ($total <= $reorder) {
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Material - <?php echo $MaterialCode; ?> Details</h4>
<button type="button" class="btn btn-secondary" onclick="history.back()">
<button type="button" class="btn btn-secondary" onclick="window.location.href='<?= base_url() ?>rawmaterialListing'">
<span class="bold">Cancel</span>
</button>
</div>
@ -307,7 +307,7 @@ if ($total <= $reorder) {
</div>
</div>
<div class="box-footer text-right">
<button type="button" class="btn btn-secondary" onclick="history.back()">
<button type="button" class="btn btn-secondary" onclick="window.location.href='<?= base_url() ?>rawmaterialListing'">
<span class="bold">Cancel</span>
</button>
<input type="button" id="editRawMaterialBtnId" class="btn btn-success" value="Submit" />

64
app/Views/editRevenueAmendPO.php
View File

@ -143,7 +143,6 @@ if (!empty($POMaster)) {
$POStatus = $Req->StatusName;
$PONO = $Req->PONO;
$taxrange = $Req->PORange;
//echo $taxrange . "t";
$ServiceDescription = $Req->ServiceDescription;
$modeofshipment = $Req->Mode_Of_Shipment;
$supplierref = $Req->Supplier_Reference;
@ -1670,10 +1669,11 @@ if (!empty($INRSYMBOL)) {
value="<?php echo $RowCount; ?>" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<input type="button" class="btn btn-secondary" value="Cancel"
onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-primary Save" onclick="Save(0)">&nbsp;&nbsp;<span
<a class="btn btn-success Save" onclick="Save(0)">&nbsp;&nbsp;<span
class="bold">Save as Draft</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Approve</span></a>
@ -2074,30 +2074,31 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
<div class="form-row" id="IGSTModel" style="display:none;">
<div class="form-group col-md-6"></div>
<div class="form-group col-md-3">
<label>IGST in %</label>
<div>
<?php
$data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;');
echo form_input($data);
?>
<div id="IGSTModel" style="display:none;">
<div class="form-row">
<div class="form-group col-md-3 offset-md-6">
<label>IGST in %</label>
<div>
<?php
$data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-group col-md-3">
<label>IGST Amt <?php echo "($INRSYM)" ?></label>
<div>
<?php
$data = array('name' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
<div class="form-group col-md-3">
<label>IGST Amt <?php echo "($INRSYM)" ?></label>
<div>
<?php
$data = array('name' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-9"></div>
<div class="form-group col-md-3">
@ -2345,7 +2346,7 @@ if (!empty($INRSYMBOL)) {
$('#EditRate').val($('#itemRate' + userid).val());
$('#txtEditBasicValue').val(parseFloat(cellval[6].innerHTML).toFixed(2));
$('#txtEditBasicValue').val(parseFloat(cellval[7].innerHTML).toFixed(2));
RequistQuantity = $('#quantity' + userid).val();
$('#txtEditDiscount').val($('#DisVal' + userid).val());
$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
@ -2463,14 +2464,15 @@ if (!empty($INRSYMBOL)) {
var tr = document.getElementById(userid);
var cellval = tr.cells;
var shorten = editDescription.length > 13 ? editDescription.slice(0, 13) + "..." : editDescription;
cellval[2].innerHTML = shorten;
cellval[2].innerHTML = editDescription;
cellval[3].innerHTML = parseFloat(editQuantity).toFixed(2);
cellval[4].innerHTML = editUOM;
cellval[5].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[6].innerHTML = parseFloat(basicval).toFixed(2);
cellval[7].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[8].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
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);
$('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(editDescription);

6
app/Views/editRevenuepurchaseorder.php
View File

@ -2958,7 +2958,7 @@ if (!empty($getlogpodtl)) {
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Save" ID="Submit"
<a class="btn btn-success Save" ID="Submit"
onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span
@ -5497,7 +5497,7 @@ if (!empty($getlogpodtl)) {
} else {
$('#EditPer').val($('#per' + userid).val());
}
$('#txtEditBasicValue').val(cellval[7].innerHTML);
$('#txtEditBasicValue').val(parseFloat(cellval[8].innerHTML).toFixed(2));
RequistQuantity = $('#quantity' + userid).val();
$('#txtEditDiscount').val($('#DisVal' + userid).val());
$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
@ -5599,7 +5599,7 @@ if (!empty($getlogpodtl)) {
$('#ViewQuantity').val($('#quantity' + userid).val());
$('#ViewRate').val($('#itemRate' + userid).val());
$('#ViewPer').val($('#per' + userid).val());
$('#txtViewBasicValue').val(cellval[7].innerHTML);
$('#txtViewBasicValue').val(parseFloat(cellval[8].innerHTML).toFixed(2));
RequistQuantity = $('#quantity' + userid).val();
$('#txtViewDiscount').val($('#DisVal' + userid).val());
$('#txtViewAfterDiscount').val($('#AfterDisVal' + userid).val());

32
app/Views/editServiceAmendPO.php
View File

@ -1325,7 +1325,9 @@ foreach ($PaymentTerms as $TER) {
<label>Description Of Service </label><span class="text-danger">*</span>
<?php
$data = array('name' => 'amenddescofpo', 'value' => set_value('amenddescofpo', strip_tags($DescriptionOfPo)), 'id' => 'amenddescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
$DescriptionOfPo = html_entity_decode($DescriptionOfPo);
$DescriptionOfPo = strip_tags($DescriptionOfPo);
$data = array('name' => 'amenddescofpo', 'value' => set_value('amenddescofpo', $DescriptionOfPo), 'id' => 'amenddescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data);
?>
@ -1341,7 +1343,10 @@ foreach ($PaymentTerms as $TER) {
<div class="form-group col-md-12">
<label>Scope Of Work</label>
<textarea name="ScopeofWork" id="ScopeofWork" class="form-control" rows="8" cols="40">
<?php echo set_value('ScopeofWork', strip_tags($ServiceDescription)); ?>
<?php
$ServiceDescription = html_entity_decode($ServiceDescription);
$ServiceDescription = strip_tags($ServiceDescription);
echo set_value('ScopeofWork', $ServiceDescription); ?>
</textarea>
</div>
@ -1392,7 +1397,7 @@ foreach ($PaymentTerms as $TER) {
<input class="btn btn-secondary" type="button" class="btn btn-success mr-2 " value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-primary Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Save " ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>
</div>
@ -1755,7 +1760,7 @@ foreach ($PaymentTerms as $TER) {
<div class="modal-footer" align="right">
<div class="form-group col-md-12">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
</div>
</div>
@ -1879,7 +1884,7 @@ foreach ($PaymentTerms as $TER) {
$('#EditQuantity').val($('#quantity' + userid).val());
RequistQuantity = $('#quantity' + userid).val();
$('#EditRate').val($('#itemRate' + userid).val());
$('#txtEditBasicValue').val(cellval[7].innerHTML);
$('#txtEditBasicValue').val(cellval[8].innerHTML);
$('#EditCgst').val($('#Cgst' + userid).val());
$('#EditSgst').val($('#Sgst' + userid).val());
$('#EditIgst').val($('#Igst' + userid).val());
@ -2002,12 +2007,12 @@ foreach ($PaymentTerms as $TER) {
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
cellval[4].innerHTML = editQuantity;
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 = editQuantity;
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);
@ -2027,8 +2032,10 @@ foreach ($PaymentTerms as $TER) {
$('#otherallowance' + userid).val(otherallowance);
$('#TotalOrderValue' + userid).val(TotalOrderValue);
populateValueMainFormForEditServiceTax();
setTimeout(() => {
$('#EDITSERVICE').modal('hide');
}, 1000);
}
});
@ -2410,6 +2417,7 @@ foreach ($PaymentTerms as $TER) {
console.log("error occurred" , error);
},
complete : function (){
$('#loader').hide();
// setTimeout(function() { enableButtons(); }, 2000);
console.log("Ajax call is completed ..!!");
}

106
app/Views/editconfig.php
View File

@ -247,45 +247,45 @@ if (!empty($master)) {
<!-- modal_sec_starts -->
<!-- modal_sec_starts -->
<!-- Modal For Add Configuration -->
<div class="modal fade" id="AddConfiguration" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<!-- Modal Header -->
<div class="modal-header">
<h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
</div>
<!-- Modal For Add Configuration -->
<div class="modal fade" id="AddConfiguration" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<!-- Modal Header -->
<div class="modal-header">
<h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
</div>
<!-- Modal Body -->
<div class="modal-body">
<form class="form-horizontal" role="form">
<div class="form-group">
<div class="row">
<div class="col-md-4">
Configuration Value :
</div>
<div class="col-md-5">
<input class="form-control" name="AddConfigValue" id="AddConfigValue"
type="text">
</div>
<!-- Modal Body -->
<div class="modal-body">
<form class="form-horizontal" role="form">
<div class="form-group">
<div class="row">
<div class="col-md-4">
Configuration Value :
</div>
<div class="col-md-5">
<input class="form-control" name="AddConfigValue" id="AddConfigValue"
type="text">
</div>
</div>
</form>
</div>
</div>
</form>
</div>
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px"
data-dismiss="modal">Cancel</a>
<button type="button" class="btn btn-success font " id="tempClickAdd"> Add </button>
</div>
<!-- Modal Footer -->
<div class="modal-footer">
<a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px"
data-dismiss="modal">Cancel</a>
<button type="button" class="btn btn-success font " id="tempClickAdd"> Add </button>
</div>
</div>
</div>
</div>
<!-- Modal For Edit Configuration -->
<div class="modal fade" id="EditConfiguration" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
@ -360,25 +360,25 @@ if (!empty($master)) {
</div>
<!-- Material listing Modal -->
<div class="modal fade" id="scrollable-modal" tabindex="-1" role="dialog" aria-labelledby="scrollableModalTitle" aria-hidden="true" style="max-width: 100%;">
<div class="modal-dialog modal-dialog-scrollable" role="document" style="max-width: 50%;">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="scrollableModalTitle"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<!-- Table will be dynamically inserted here -->
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<!-- Material listing Modal -->
<div class="modal fade" id="scrollable-modal" tabindex="-1" role="dialog" aria-labelledby="scrollableModalTitle" aria-hidden="true" style="max-width: 100%;">
<div class="modal-dialog modal-dialog-scrollable" role="document" style="max-width: 50%;">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="scrollableModalTitle"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<!-- Table will be dynamically inserted here -->
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
@ -554,9 +554,15 @@ if (!empty($master)) {
//this click function is used for showing material codes in modal window , MC created using a particular configuration value
$(".config-category").click(function () {
const key_id = $(this).data("key");
const value = $(this).data("value");
console.log(value);
$('#loader').show();
$('#scrollableModalTitle').text(`List of Materials created using ${value} `);

14
app/Views/editimportpo.php
View File

@ -1349,10 +1349,10 @@ if (!empty($getlogpodtl)) {
<a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) {
if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-secondary Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<?php } ?>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn-success waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if($PONOStatus == PO_AMENDED){ ?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<?php } else { ?>
@ -1360,7 +1360,7 @@ if (!empty($getlogpodtl)) {
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<?php } else { ?>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
<?php } ?>
<?php } ?>
@ -2010,7 +2010,7 @@ if (!empty($getlogpodtl)) {
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-success font AddImport" ID="AddImport"> &nbsp;&nbsp;<span class="bold">Add Import</span></a>
</div>
@ -2563,7 +2563,7 @@ if (!empty($getlogpodtl)) {
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
</div>
</form>
@ -2738,7 +2738,7 @@ if (!empty($getlogpodtl)) {
<label> Basic Price (<?php echo $INR ?>)</label>
</div>
<div class="form-group col-md-4">
<div>
<div style="display:none;">
<?php
$data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
@ -3024,7 +3024,7 @@ if (!empty($getlogpodtl)) {
<div class="modal-footer">
<!-- <a class="btn btn-success font EditImport" ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a> -->
<!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
<!-- <a class="btn btn-success font UpdateImport" ID="UpdateImport"> &nbsp;&nbsp;<span class="bold">Update</span></a> -->
</div>
</form>

2
app/Views/editrequisitionform.php
View File

@ -45,7 +45,7 @@ if (!empty($ReqPOType)) {
}
.btn-soft-primary:hover {
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
border-color: rgb(32, 176, 130);
}

2
app/Views/purchaseorder.php
View File

@ -2311,7 +2311,7 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" />
<div class="btn-container" style="text-align: right;">
<a class="btn btn-success Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>

2
app/Views/requisitionform.php
View File

@ -33,7 +33,7 @@ if (!empty($Emp)) {
</style>
<div class="content-page">
<div class="content">
<!-- Start Content-->
<!-- Start Content -->
<div class="container-fluid">
<!-- start page title -->
<div class="row">

2
app/Views/requisitionlisting.php
View File

@ -7,7 +7,7 @@ if (!empty($Status)) {
$DraftCount = $St->cnt;
$ReqNo = $St->ReqNo;
}
//echo $ReqNo;
// echo $ReqNo;
} ?>
<style>
#Requisition_filter {