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

tracker issues fixes

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-04-13 16:22:31 +00:00
parent 3cbd076922
commit 8a76fbcf52
34 changed files with 871 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Config/Routes.php
View File

@ -204,6 +204,7 @@ $routes->post('validateDateRange', 'Monthlypay::validateDateRange');
$routes->match(['GET', 'POST'], 'leaveApplicationPDF/(:any)', 'Monthlypay::leaveApplicationPDF/$1');
$routes->match(['GET', 'POST'], 'overTimeDetails', 'Monthlypay::overTimeDetails');
$routes->get('exportMonthlyPayInputs/(:any)', 'Payslip::exportMonthlyPayInputs/$1');
$routes->get('leaveStatus/(:any)/(:any)', 'Monthlypay::leaveStatus/$1/$2');
$routes->get('emppaydate/addemppaydate', 'Emppaydate::addemppaydate');

3
app/Controllers/Inwardgateregister.php
View File

@ -299,8 +299,9 @@ class Inwardgateregister extends BaseController
$PO = $this->request->getPost('id');
$CreatedBy = $this->session->get('userId');
$this->inwardgateregister_model->UpdatePOMaster($PO, $CreatedBy,IGR_CREATED);
// $this->inwardgateregister_model->UpdatePOMaster($PO, $CreatedBy,IGR_CREATED);
$data = $this->inwardgateregister_model->viewpurchaseorder($PO);
// echo "<pre>"; print_r($data);die;
echo json_encode($data);
}

20
app/Controllers/Monthlypay.php
View File

@ -1041,6 +1041,26 @@ class Monthlypay extends BaseController
}
public function leaveStatus($leave_application_id, $status)
{
if (!empty($leave_application_id)) {
$data = [
'status' => $status,
'updated_by' => session()->get('userId')
];
$affectedRows = $this->monthlypay_model->saveleaveApplicationForm($data, $leave_application_id);
$message = ($affectedRows > 0)
? "Leave Application updated successfully."
: "No changes were made.";
return $this->response->setJSON(['status' => true, 'message' => $message]);
} else {
return $this->response->setJSON(['status' => false, 'message' => 'Invalid leave application ID.']);
}
}
public function leaveApplicationPDF($leave_application_id){

18
app/Controllers/Payslip.php
View File

@ -587,7 +587,23 @@ class Payslip extends BaseController
}
}
unset($o_item);
foreach ($finalFooter as &$topLevelArray) {
if (is_array($topLevelArray)) {
foreach ($topLevelArray as &$employeeArray) { // Changed from $finalFooter to $employeeArray
if (is_array($employeeArray)) { // Check $employeeArray instead of $x
foreach ($keysToRemove as $key) {
if (array_key_exists($key, $employeeArray)) {
unset($employeeArray[$key]);
}
}
}
}
unset($employeeArray); // Break the reference
}
}
unset($topLevelArray); // Break the reference
$xl[] = array_values($tds_info);
$xl[] = array_values($esi_or_pf_info);
$xl[] = array_values($location_info);

17
app/Controllers/Requisitionform.php
View File

@ -130,18 +130,7 @@ class Requisitionform extends BaseController
// echo 'ReqType'.$ReqPOType;
$data['ReqPOType'] = $ReqPOType == '' ? $ReqType : $ReqPOType;
$data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);
$data['description'] = '';
foreach ($data['LineItem'] as $key => $line) {
$description = isset($line->MaterialDescription) ? $line->MaterialDescription : null;
$data['LineItem'][$key]->CategoryName = $line->MaterialCode
? $this->requistion_model->getCategoryName($line->MaterialCode)
: "";
}
$data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID);
// $data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType); // Old Based on Type..
$data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo);
@ -163,7 +152,7 @@ class Requisitionform extends BaseController
}
$this->requistion_model->DeleteRequistionLineItem($ReqNo, $MaterialCode);
return $this->response->setJSON("Successfully Deleted the Line item" . $ReqNo);
return $this->response->setJSON("Successfully Deleted the Line item " . $ReqNo);
}
/**
@ -298,7 +287,9 @@ class Requisitionform extends BaseController
for ($j = 0; $j < count($MaterialCode); $j++) {
$Code = $MaterialCode[$j]['MaterialCode'];
$Name = $MaterialCode[$j]['MaterialName'];
$HTML .= "<option value='" . $Code . "'>" . $Code . "-" . $Name . "</option>";
$HSN = $MaterialCode[$j]['HSNCODE'] ? $MaterialCode[$j]['HSNCODE']." - " : "";
// $HTML .= "<option value='" . $Code . "'>" . $HSN . "-" . $Name . "</option>";
$HTML .= "<option value='" . $Code . "'>" . $HSN . $Name . " ( ".$Code." ) "."</option>";
}
$MaterialName = $MaterialCode[0]['MaterialName'];
$UOM = $MaterialCode[0]['UOM'];

1
app/Models/Config_model.php
View File

@ -337,6 +337,7 @@ return $result;
$result = $this->db->table('t_configdetails')
->where('Config_ID','C023')
->where('isActive',1)
->get()
->getResultArray();

3
app/Models/Employeedetails_model.php
View File

@ -264,7 +264,8 @@ class Employeedetails_model extends Model
->join('t_employee_details as emp', 'emp.empid=tbl.empid', 'left')
->join('tbl_users as tbl1', ' ed.UpdatedBy = tbl1.userid', 'left')
->join('t_employee_details as emp1', 'emp1.empid=tbl1.empid', 'left')
->join('t_emp_pay_data', 'ed.EmpID=t_emp_pay_data.EmpID', 'left');
->join('t_emp_pay_data', 'ed.EmpID=t_emp_pay_data.EmpID', 'left')
->groupBy('ed.EmpID');
return $builder->get()->getResultArray();

4
app/Models/Inwardgateregister_model.php
View File

@ -195,7 +195,7 @@ class Inwardgateregister_model extends Model
function viewpurchaseorder($PO)
{
$subQuery = 'SELECT distinct POM.PONO, POL.MaterialCode, POL.Quantity, POL.ReceivedQuantity, (POL.Quantity - POL.ReceivedQuantity) as PendingQty, QuantityRejected, POL.PONO, MM.MaterialName, MM.UOM,POL.Rate
$subQuery = 'SELECT distinct POM.PONO, POL.MaterialCode, POL.Quantity, POL.ReceivedQuantity, (POL.Quantity - POL.ReceivedQuantity) as PendingQty, QuantityRejected, POL.PONO, MM.MaterialName, MM.UOM,MM.HSNCODE,POL.Rate
FROM t_purchaseorder_master POM
LEFT JOIN t_purchaseorder_lineitem POL ON POL.PONO = POM.PONO
LEFT JOIN t_igr_master IGM ON IGM.PONO = POL.PONO
@ -568,7 +568,7 @@ class Inwardgateregister_model extends Model
->distinct()
->select("
igr.IGRNO,igr.*,igrd.*,
MM.MaterialName,MM.UOM,
MM.MaterialName,MM.UOM,MM.HSNCODE,
sup.Address,sup.SupplierName,
POL.Rate,
POM.ServiceDescription,POL.Quantity,POM.POType,POM.IsOpenOrder,

10
app/Models/Purchaseorder_model.php
View File

@ -1096,7 +1096,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
{
$subQuery = 'SELECT distinct LineItem.LineitemAuditorNotes,LineItem.LineItemNo,LineItem.ReqNo,LineItem.Per,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,LineItem.Quantity,ReceivedQuantity,Rate,LineItem.Status,(LineItem.Quantity *Rate) as BasicValue ,(After_CGST + After_SGST + After_IGST) as Taxamount,Dept.DepartmentName
,TotalValue,CGST,After_CGST,SGST,After_SGST,IGST,After_IGST,otherallowance,LineItem.CostCenterCode,LineItem.ServiceFrequency,LineItem.ServiceMaterialDescription,Req.Schedule_Type,Req.NumberOfService,Req.Service_Period,ReqDet.MaterialDescription
,TotalValue,CGST,After_CGST,SGST,After_SGST,IGST,After_IGST,otherallowance,LineItem.CostCenterCode,LineItem.ServiceFrequency,LineItem.ServiceMaterialDescription,Req.Schedule_Type,Req.NumberOfService,Req.Service_Period,ReqDet.MaterialDescription,Mat.HSNCODE
FROM t_purchaseorder_lineitem LineItem
left join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode
left join t_service_tax Tax on Tax.LineItemNo = LineItem.LineItemNo
@ -1142,7 +1142,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
{
$subQuery = 'SELECT distinct LineItem.LineitemAuditorNotes,LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity,Per,ServiceMaterialDescription,ReceivedQuantity,Rate,Req.Status,(Quantity *Rate) as BasicValue , (( AfterSGST + AfterCGST +
AfterIGST )) as Taxamount ,TotalValue,Tax.*,Req.CostCenterCode,Dept.DepartmentName,LineItem.LineitemAuditorNotes
AfterIGST )) as Taxamount ,TotalValue,Tax.*,Req.CostCenterCode,Dept.DepartmentName,LineItem.LineitemAuditorNotes,Mat.HSNCODE
FROM t_purchaseorder_lineitem LineItem
join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode
left join t_revenue_tax Tax on Tax.LineItemNo = LineItem.LineItemNo
@ -1337,7 +1337,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
ExciseDutySHCess, AfterCustomEdCess, ROUND((Quantity * Rate), 2) AS TotalOrderValue,
ROUND((POMast.ExchangeRate * BasicPriceInMTon), 2) AS BasicINRValue, TotalValue, CurrencyType,
ReceivedQuantity, Tax.*, LineItem.ServiceMaterialDescription, Req.CostCenterCode,
Dept.DepartmentName
Dept.DepartmentName,Mat.HSNCODE
FROM t_purchaseorder_lineitem LineItem
LEFT JOIN t_purchaseorder_master POMast ON POMast.PONO = LineItem.PONO
@ -1743,7 +1743,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
$subQuery = 'SELECT distinct LineItem.LineItemNo,LineItem.Per,LineItem.ServiceMaterialDescription,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,Tax.*,
ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess,AfterCustomEdCess,ROUND((POMast.ExchangeRate*BasicPriceInMTon*Quantity),2) as BasicINRValue,Tax.TotalValue as ImportTotalValue,Tax.FreightType,Tax.NoOfTrip,Tax.FreightValue,Tax.AfterFreightValue,POMast.CurrencyType,
LineItem.LineitemAuditorNotes,
LineItem.LineitemAuditorNotes,Mat.HSNCODE,
Req.CostCenterCode,Dept.DepartmentName FROM t_purchaseorder_lineitem LineItem
join t_purchaseorder_master POMast on POMast.PONO = LineItem.PONO
join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode
@ -1802,7 +1802,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,ROUND((ServiceTax.After_CGST + ServiceTax.After_SGST + ServiceTax.After_IGST),2) as ServiceTaxamount
,ServiceTax.TotalValue,ServiceTax.CGST,ServiceTax.After_CGST,ServiceTax.SGST,ServiceTax.After_SGST,ServiceTax.IGST,ServiceTax.After_IGST,ServiceTax.otherallowance,ServiceTax.discount,ServiceTax.discountval,ServiceTax.Afterdiscountval,
POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,ROUND((POMast.TotalOrderValue),2) as BasicINRValue,POMast.CurrencyType,FreightType as Ftype,NoOfTrip as NoTrip,FreightValue as Fvalue,AfterFreightValue as Afvalue,
LineItem.LineitemAuditorNotes,
LineItem.LineitemAuditorNotes,Mat.HSNCODE,
Req.CostCenterCode,Dept.DepartmentName FROM t_purchaseorder_lineitem LineItem
join t_purchaseorder_master POMast on POMast.PONO = LineItem.PONO
join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode

2
app/Models/Rawmaterialdetails_model.php
View File

@ -444,7 +444,7 @@ where (CurrentStock+OpeningStock)<reorder";
$builder = $this->db->table('t_materialmaster MM')
->select('MM.MaterialCode,MM.MaterialName,MM.MaterialType,MM.Category,MM.IsActive,MM.UOM')
->select('MM.MaterialCode,MM.MaterialName,MM.MaterialType,MM.Category,MM.IsActive,MM.UOM,MM.HSNCODE')
->where('MM.Category' , $configKey);
$query = $builder->get();

8
app/Models/Requistion_model.php
View File

@ -155,7 +155,7 @@ class Requistion_model extends Model
// This function also called in store req. also $reqType not removed.....
function EditMaterialCode($ReqNo, $ReqType = NULL){
$subQuery = 'SELECT Mat.MaterialCode, Mat.MaterialName, Mat.UOM FROM t_materialmaster Mat
$subQuery = 'SELECT Mat.MaterialCode, Mat.MaterialName, Mat.UOM,Mat.HSNCODE FROM t_materialmaster Mat
WHERE Mat.MaterialCode NOT IN (
SELECT Req.MaterialCode FROM t_requestion_details Req
JOIN t_requestion_master mast ON Req.ReqNo = mast.ReqNo
@ -175,7 +175,7 @@ class Requistion_model extends Model
function GetMaterialCode($ReqType,$NotArray='')
{
$builder = $this->db->table('t_materialmaster')
->select('MaterialCode, MaterialName,UOM,material_rate')
->select('MaterialCode, MaterialName,UOM,material_rate,HSNCODE')
->where('IsActive',1);
//->where('MaterialType',$ReqType );
@ -197,7 +197,7 @@ class Requistion_model extends Model
function getRawMaterialList($MaterialCode)
{
$builder = $this->db->table('t_materialmaster MM')
->select('MM.MaterialName,MM.UOM,MM.Category,CD.ConfigValue as CategoryName')
->select('MM.MaterialName,MM.UOM,MM.Category,CD.ConfigValue as CategoryName,MM.HSNCODE')
->join('t_configdetails CD', 'CD.Key = MM.Category', 'left')
->where('MM.MaterialCode',$MaterialCode );
$query = $builder->get();
@ -587,7 +587,7 @@ class Requistion_model extends Model
function getCategoryName($materialCode){
$subQuery ='SELECT MM.MaterialCode,MM.MaterialName,MM.MaterialType,MM.Category,MM.IsActive,CD.ConfigValue
from t_materialmaster as MM
left join t_configdetails as CD on CD.Key = MM.Category
left join t_configdetails as CD on CD.Key = MM.Category
where MM.MaterialCode = '.$materialCode;
$categoryName = $this->db->query($subQuery)->getRow()->ConfigValue;

71
app/Views/EditservicePurchaseorder.php
View File

@ -861,7 +861,7 @@ if (!empty($getlogpodtl)) {
$('#EditAfterServiceTax').val('');
$('#EditAfterKrishiTax').val('');
$('#EditAfterSwachhTax').val('');
$('#EditTotalOrderValue ').val('');
$('#EditTotalOrderValue').val('');
$('#EditRate').val('');
$("#EditItemName").val('');
@ -1274,6 +1274,7 @@ if (!empty($getlogpodtl)) {
<th style="text-align:center !important; white-space: nowrap !important;">Requisition No</th>
<th style="text-align:left !important; white-space: nowrap !important;">Item Code</th>
<th style="white-space: nowrap !important;">Item Description</th>
<th style="text-align:center !important; white-space: nowrap !important;">HSN/SAC</th>
<th style="white-space: nowrap !important;">Line Item Specs</th>
<th style="text-align: left; white-space: nowrap !important;">Quantity</th>
<th style="white-space: nowrap !important;">UOM</th>
@ -1309,6 +1310,7 @@ if (!empty($getlogpodtl)) {
<td style="text-align:left !important;"><?php echo $record->MaterialCode ?></td>
<td style="text-align:left !important;"><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "...");
echo $shortName; ?></td>
<td style="text-align:center !important;"><?php echo $record->HSNCODE ?></td>
<td style="text-align:left !important;">
<?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?>
<a href="#"
@ -2547,7 +2549,7 @@ if (!empty($getlogpodtl)) {
$('input[type="file"], input[type="radio"], input[type="checkbox"]').attr('disabled', true);
$("#PaymentTerms,#drpSupplier,#insuranceStatus,#PoTypeOptions,#workstatus").prop("disabled", true);
}
var openOrder = <?php echo $IsOpenOrder; ?>;
var openOrder = <?php echo $IsOpenOrder ? $IsOpenOrder : 0 ; ?>;
if(openOrder){
$('#Quantity').val(0);
$('#Quantity').removeAttr('required');
@ -2583,7 +2585,7 @@ if (!empty($getlogpodtl)) {
$('#EditotherDescription').hide();
$('#otherdescription').hide()
$('#otherdescription').hide();
@ -2597,6 +2599,14 @@ if (!empty($getlogpodtl)) {
var AvilBudget = $('#AvlBudAmt').val();
var costCode = $('#CostCenter').val();
var materialCode = $('#MaterialCode').val();
var selectedText = $('#MaterialCode option:selected').text();
var parts = selectedText.split('-');
var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim())
? parts[0].trim()
: '';
var materialName = $("#ItemName").val();
var uom = $("#UOM").val();
var addPer = '';
@ -2666,7 +2676,8 @@ if (!empty($getlogpodtl)) {
<td align="left">${temp}</td>
<td align="center">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${shorten}</td>`;
<td align="left">${shorten}</td>
<td align="center">${HSN}</td>`;
if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
rowHtml += `<td><a href="#" class="editable-field"
data-id="${temp}"
@ -2781,8 +2792,13 @@ if (!empty($getlogpodtl)) {
var FrequencyValue = $("#EditFrequencyNo").val();
var ServiceDescription = $('#EdittxtSpcialInstruction').val();
var OtherAmt = $('#EditOtherAllowances').val();
var TotalOrderValue = $("#EditTotalOrderValue ").val();
var TotalOrderValue = $("#EditTotalOrderValue").val();
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var basicval = $("#txtEditBasicValue").val();
@ -2795,12 +2811,13 @@ if (!empty($getlogpodtl)) {
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
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);
cellval[4].innerHTML = editHSN;
cellval[6].innerHTML = editQuantity;
cellval[7].innerHTML = editUOM;
cellval[8].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[9].innerHTML = parseFloat(basicval).toFixed(2);
cellval[10].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[11].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode);
@ -3118,7 +3135,7 @@ if (!empty($getlogpodtl)) {
$('#txtSpcialInstruction').focus();
return false;
} else {
var openOrder = <?php echo $IsOpenOrder; ?>;
var openOrder = <?php echo $IsOpenOrder ? $IsOpenOrder : 0; ?>;
if(!openOrder){
if ($('#Quantity').val() == '') {
alert('Please Enter the Quantity value');
@ -3356,6 +3373,7 @@ if (!empty($getlogpodtl)) {
//If others is the payment terms to display mandatory field
$(document).ready(function() {
$('#otherdescription').hide();
$("#PaymentTerms").change(function() {
var otherPayment = '<?php echo $otherPayment; ?>';
if ($('#PaymentTerms').val().trim() == 'PT08') {
@ -3417,8 +3435,8 @@ if (!empty($getlogpodtl)) {
if (obj.materialCode == materialCode) {
$("#MaterialCode").val('');
} else {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
@ -3469,8 +3487,9 @@ if (!empty($getlogpodtl)) {
if (isAdded == "0") {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
// $("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
}
@ -3514,7 +3533,7 @@ if (!empty($getlogpodtl)) {
RateValue = $('#itemRate' + userid).val();
RateValue = parseFloat(RateValue).toFixed(2)
$('#EditRate').val(RateValue);
$('#txtEditBasicValue').val(cellval[8].innerHTML);
$('#txtEditBasicValue').val(cellval[9].innerHTML);
$('#EditCgst').val($('#Cgst' + userid).val());
$('#EditSgst').val($('#Sgst' + userid).val());
$('#EditIgst').val($('#Igst' + userid).val());
@ -3544,7 +3563,7 @@ if (!empty($getlogpodtl)) {
$("#EditFrequencyNo").val($('#FrequencyValue' + userid).val());
}
$('#EditTotalOrderValue').val(cellval[10].innerHTML);
$('#EditTotalOrderValue').val(cellval[11].innerHTML);
$('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
RequistQuantity = $('#quantity' + userid).val();
@ -3552,9 +3571,14 @@ if (!empty($getlogpodtl)) {
$("#EditMaterialCode").empty();
var P0 = cellval[4].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>')
.val($('#materialCode' + userid).val())
.html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())
.html(P3)
.prop('selected', true)
);
// Make the select element read-only (disable it)
@ -3589,8 +3613,9 @@ if (!empty($getlogpodtl)) {
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
// $("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
@ -3627,7 +3652,7 @@ if (!empty($getlogpodtl)) {
RateValue = $('#itemRate' + userid).val();
RateValue = parseFloat(RateValue).toFixed(2)
$('#ViewRate').val(RateValue);
$('#txtViewBasicValue').val(cellval[8].innerHTML);
$('#txtViewBasicValue').val(cellval[9].innerHTML);
$('#ViewCgst').val($('#Cgst' + userid).val());
$('#ViewSgst').val($('#Sgst' + userid).val());
$('#ViewIgst').val($('#Igst' + userid).val());
@ -3654,7 +3679,7 @@ if (!empty($getlogpodtl)) {
$("#ViewFrequencyNo").val($('#FrequencyValue' + userid).val());
}
$('#ViewTotalOrderValue').val(cellval[10].innerHTML);
$('#ViewTotalOrderValue').val(cellval[11].innerHTML);
$('#ViewOtherAllowances').val($('#OtherAmt' + userid).val());
tinyMCE.get('ViewtxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());

8
app/Views/accountsDashboard.php
View File

@ -209,7 +209,7 @@
if(!empty($draft)){
?>
<tr id="<?php echo $index ?>" >
<td align="right"><?php echo $date; ?></td>
<td align="left" style="padding-left:0.4%;"><?php echo $date; ?></td>
<td style="cursor:pointer; color:#0bb2b5" ><a data-toggle="modal" data-target="#Igrshow" data-id="<?php echo $index;?>" data-inx="<?php echo $index;?>" data-userid="<?php echo $record->IGRNO ?>" data-igrstatus="<?php echo $record->IGRStatus ?>">
<?php echo $record->IGRNO ?></a>
</td>
@ -218,7 +218,7 @@
</td>
<td><?php echo $record->SupplierName ?></td>
<td><?php echo $record->DeliveryChellanOrInvoiceNo ?></td>
<td align="right"><?php
<td align="left" style="padding-left:0.4%;"><?php
$invdate = $record->DeliveryChellanDate;
if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
echo "";
@ -427,6 +427,7 @@
<th style="width: 50px;">SNo</th>
<th style="width: 100px;">Item Code</th>
<th style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">Item Description</th>
<th style="width: 50px;">HSN/SAC</th>
<th style="width: 50px;">UOM</th>
<th style="width: 100px;">Ordered Qty</th>
<th style="width: 100px;">Received Qty</th>
@ -804,6 +805,7 @@
'<td style="width: 50px;" align="right">' + i + '</td>' +
'<td style="width: 100px;" name="MaterialName" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
'<td style="width: 200px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
'<td style="width: 50px;" name="HSNCODE">' + ((item.HSNCODE) ? item.HSNCODE : '') + '</td>' +
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
'<td style="width: 100px;" align="right" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>' +
'<td style="width: 100px;" align="right" data-name="sel" ><input type="text" onchange="validateReceivedQuantity(' + i + ',' + isOpenOrder + ')"id="QuantityAsPerInvoice' + i + '" name="QuantityAsPerInvoice' + i + '" value="' + parseInt(item.QuantityAsPerInvoice) + '" onkeypress="return isNumberKey(event);" style="width: 75px;"></td>' +
@ -843,6 +845,7 @@
'<td style="width: 50px;" align="right">' + i + '</td>' +
'<td style="width: 100px;" name="MaterialName" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
'<td style="width: 200px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
'<td style="width: 50px;" name="HSNCODE">' + ((item.HSNCODE) ? item.HSNCODE : '') + '</td>' +
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
'<td style="width: 100px;" align="right" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>' +
'<td style="width: 100px;" align="right" data-name="sel" ><input type="text" onchange="validateReceivedQuantity(' + i + ',' + isOpenOrder + ')"id="QuantityAsPerInvoice' + i + '" name="QuantityAsPerInvoice' + i + '" value="' + parseInt(item.QuantityAsPerInvoice) + '" onkeypress="return isNumberKey(event);" style="width: 75px;"></td>' +
@ -878,6 +881,7 @@
'<td style="width: 50px;" align="right">' + i + '</td>' +
'<td style="width: 100px;" name="MaterialName" id="MaterialCode" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
'<td style="width: 200px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
'<td style="width: 50px;" name="HSNCODE">' + ((item.HSNCODE) ? item.HSNCODE : '') + '</td>' +
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
'<td style="width: 100px;" align="right" name="Quantity">' + item.Quantity + '</td>' +
'<td style="width: 100px;" align="right" data-name="sel" >' + item.QuantityAsPerInvoice + '</td>' +

97
app/Views/alterpurchaseorder.php
View File

@ -2222,8 +2222,8 @@ if (!empty($INRSYMBOL)) {
$("#ServiceMaterialCode").append($('<option></option>').val("0").html("Select Item Code"));
$.each(JSON.parse(data), function (index, value) {
$("#ServiceMaterialCode").append($('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
var HSNCODE = value.HSNCODE ? value.HSNCODE+" - " : "";
$("#ServiceMaterialCode").append($('<option></option>').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+value.MaterialCode+" ) "));
});
} else if (input == 'REVENUE') {
@ -2233,9 +2233,8 @@ if (!empty($INRSYMBOL)) {
$("#MaterialCode").append($('<option></option>').val("0").html("Select Item Code"));
$.each(JSON.parse(data), function (index, value) {
$("#MaterialCode").append($('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
var HSNCODE = value.HSNCODE ? value.HSNCODE+"-" : "";
$("#MaterialCode").append($('<option></option>').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+value.MaterialCode+" ) "));
});
} else {
@ -2366,7 +2365,8 @@ if (!empty($INRSYMBOL)) {
//This function is used to add material list after delete
$.each(JSON.parse(materialData), function (index, value) {
if (value.MaterialCode == materialCode) {
$("#MaterialCode").append($('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
var HSNCODE = value.HSNCODE ? value.HSNCODE+"-" : "";
$("#MaterialCode").append($('<option></option>').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+value.MaterialCode+" ) "));
}
});
@ -2950,6 +2950,7 @@ if (!empty($INRSYMBOL)) {
<th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
<th style="white-space: nowrap !important;">Item Code</th>
<th style="white-space: nowrap !important;">Item Description</th>
<th style="white-space: nowrap !important; text-align:center !important">HSN/SAC</th>
<th style="white-space: nowrap !important;">Line Item Specs</th>
<th style="white-space: nowrap !important;" class="text-right">Quantity</th>
<th style="white-space: nowrap !important;">UOM</th>
@ -6080,6 +6081,12 @@ if (!empty($INRSYMBOL)) {
// $('#ReqNo').val(Reqnumber).remove();
// $('#ReqNo option[value='+Reqnumber+']').remove();
var selectedRText = $('#MaterialCode option:selected').text();
var Rparts = selectedRText.split('-');
var RHSN = selectedRText.includes('-') && /^\d+$/.test(Rparts[0].trim())
? Rparts[0].trim()
: '';
$('#MaterialCode option[value=' + materialCode + ']').remove();
@ -6100,6 +6107,7 @@ if (!empty($INRSYMBOL)) {
<td style="text-align:center !important">${Reqnumber}</td>
<td>${materialCode}</td>
<td>${rshorten}</td>
<td style="text-align:center !important">${RHSN}</td>
<td><a href="#" class="editable-field"
data-id="${temp}"
data-notes="-">-</a>
@ -6748,6 +6756,12 @@ if (!empty($INRSYMBOL)) {
var AvilBudget = $('#AvalBuget').val();
var costCode = $('#CostCenterName').val();
var materialCode = $('#ServiceMaterialCode').val();
var SselectedText = $('#ServiceMaterialCode option:selected').text();
var Sparts = SselectedText.split('-');
var SHSN = SselectedText.includes('-') && /^\d+$/.test(Sparts[0].trim())
? Sparts[0].trim()
: '';
var materialName = $("#ServiceDescription").val();
var uom = $("#ServiceUOM").val();
var addPer = '';
@ -6804,6 +6818,7 @@ if (!empty($INRSYMBOL)) {
<td style="text-align:center !important">${Reqnumber}</td>
<td>${materialCode}</td>
<td>${sshorten}</td>
<td style="text-align:center !important">${SHSN}</td>
<td><a href="#" class="editable-field"
data-id="${temp}"
data-notes="-">-</a>
@ -7007,14 +7022,14 @@ if (!empty($INRSYMBOL)) {
$('#EditEmergPer').val($('#Serviceper' + userid).val());
$('#EditQuantity').val($('#quantity' + userid).val());
$('#EditRate').val($('#itemRate' + userid).val());
$('#txtEditBasicValue').val(cellval[8].innerHTML);
$('#txtEditBasicValue').val(cellval[9].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[10].innerHTML);
$('#EditTotalOrderValue').val(cellval[11].innerHTML);
$('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
tinyMCE.get('EdittxtSpcialInstructionSingle').setContent($('#ItemServiceDescription' + userid).val());
@ -7026,7 +7041,11 @@ if (!empty($INRSYMBOL)) {
$("#EditMaterialCode").empty();
// $('#EditMaterialCode').val("").select2();
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var P0 = cellval[4].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html(P3));
if (typeof materialData !== 'undefined' && materialData !== null && materialData !== '') {
var parsedMaterialData = JSON.parse(materialData);
@ -7034,7 +7053,9 @@ if (!empty($INRSYMBOL)) {
$.each(parsedMaterialData, function (index, value) {
// Assuming userid is defined somewhere in your code
if ($('#materialCode' + userid).val() != value.MaterialCode) {
$("#EditMaterialCode").append($('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
// $("#EditMaterialCode").append($('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+value.MaterialCode+" ) "));
}
});
} else {
@ -7127,17 +7148,23 @@ if (!empty($INRSYMBOL)) {
var TotalTaxValue = calculateEditTaxValue();
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
cellval[5].innerHTML = editQuantity;
cellval[6].innerHTML = editUOM;
cellval[7].innerHTML = itemRate;
cellval[8].innerHTML = basicval;
cellval[9].innerHTML = TotalTaxValue;
cellval[10].innerHTML = TotalOrderValue;
cellval[4].innerHTML = editHSN;
cellval[6].innerHTML = editQuantity;
cellval[7].innerHTML = editUOM;
cellval[8].innerHTML = itemRate;
cellval[9].innerHTML = basicval;
cellval[10].innerHTML = TotalTaxValue;
cellval[11].innerHTML = TotalOrderValue;
$('#materialCode' + userid).val(editMaterialCode);
@ -7674,7 +7701,7 @@ if (!empty($INRSYMBOL)) {
$('#EditRevenueQuantity').val($('#quantity' + userid).val());
$('#EditRevenueRate').val($('#itemRate' + userid).val());
$('#editrevenueEmergPer').val($('#per' + userid).val());
$('#txtEditRevenueBasicValue').val(cellval[8].innerHTML);
$('#txtEditRevenueBasicValue').val(cellval[9].innerHTML);
RequistQuantity = $('#quantity' + userid).val();
$('#txtEditDiscount').val($('#DisVal' + userid).val());
$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
@ -7708,14 +7735,18 @@ if (!empty($INRSYMBOL)) {
$("#EditRevenueMaterialCode").empty();
$("#EditRevenueMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var P0 = cellval[4].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditRevenueMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html(P3));
if (typeof materialData !== 'undefined' && materialData !== null && materialData !== '') {
var parsedMaterialData = JSON.parse(materialData);
$.each(parsedMaterialData, function (index, value) {
if ($('#materialCode' + userid).val() != value.MaterialCode) {
$("#EditRevenueMaterialCode").append($('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
var HSNCODE = value.HSNCODE ? value.HSNCODE+" - " : "";
$("#EditRevenueMaterialCode").append($('<option></option>').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
});
} else {
@ -7733,6 +7764,12 @@ if (!empty($INRSYMBOL)) {
var editselectedMaterialCode = '';
editselectedMaterialCode = $("#EditRevenueMaterialCode").val();
var selectedRevenuText = $('#EditRevenueMaterialCode option:selected').text();
var editRevenuparts = selectedRevenuText.split('-');
var editRevenueHSN = editselectedText.includes('-') && /^\d+$/.test(editRevenuparts[0].trim())
? editRevenuparts[0].trim()
: '';
$.each(JSON.parse(materialData), function (index, value) {
if (editselectedMaterialCode == value.MaterialCode) {
@ -7806,15 +7843,23 @@ if (!empty($INRSYMBOL)) {
var userid = $("#hiddenRevenueuserid").val();
var tr = document.getElementById(userid);
var editRselectedText = $('#EditRevenueMaterialCode option:selected').text();
var editRparts = editRselectedText.split('-');
var editRHSN = editRselectedText.includes('-') && /^\d+$/.test(editRparts[0].trim())
? editRparts[0].trim()
: '';
var cellval = tr.cells;
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
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);
cellval[4].innerHTML = editRHSN;
cellval[6].innerHTML = parseFloat(editQuantity).toFixed(2);
cellval[7].innerHTML = editUOM;
cellval[8].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[9].innerHTML = parseFloat(basicval).toFixed(2);
cellval[10].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[11].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode);

51
app/Views/capitalpurchaseorder.php
View File

@ -804,6 +804,7 @@ if (!empty($INRSYMBOL)) {
<th style="white-space: nowrap !important;" align="center">Requisition No</th>
<th style="white-space: nowrap !important;">Item Code</th>
<th style="white-space: nowrap !important;">Item Description</th>
<th style="white-space: nowrap !important; text-align:center !important">HSN/SAC</th>
<th style="white-space: nowrap !important;">Line Item Specs</th>
<th style="white-space: nowrap !important;" align="right">Quantity</th>
<th style="white-space: nowrap !important;">UOM</th>
@ -2643,8 +2644,9 @@ if (!empty($INRSYMBOL)) {
if (isAdded == "0") {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
// $("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
}
@ -3443,6 +3445,11 @@ if (!empty($INRSYMBOL)) {
var selectedText = $('#MaterialCode option:selected').text();
var parts = selectedText.split('-');
var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim())
? parts[0].trim()
: '';
$('#MaterialCode option[value=' + materialCode + ']').remove();
@ -3484,6 +3491,7 @@ if (!empty($INRSYMBOL)) {
<td align="center">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${shorten}</td>
<td align="center">${HSN}</td>
<td align="left">
<a href="#" class="editable-field"
data-notes = "-" data-id ="${temp}">-</a>
@ -3992,8 +4000,8 @@ if (!empty($INRSYMBOL)) {
if (value.MaterialCode == materialCode) {
$("#MaterialCode").append($('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
var HSNCODE = value.HSNCODE ? value.HSNCODE+"-" : "";
$("#MaterialCode").append($('<option></option>').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+value.MaterialCode+" ) "));
}
@ -4298,7 +4306,7 @@ if (!empty($INRSYMBOL)) {
console.log($('#Igst' + userid).val());
$('#EdittxtTotalOrderValue').val(cellval[10].innerHTML);
$('#EdittxtTotalOrderValue').val(cellval[11].innerHTML);
$('#EditCgst').val($('#Cgst' + userid).val());
$('#EditAfterCgst').val($('#AfterCgst' + userid).val());
$('#EditSgst').val($('#Sgst' + userid).val());
@ -4375,13 +4383,23 @@ if (!empty($INRSYMBOL)) {
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
$("#EditMaterialCode").empty();
var P0 = cellval[4].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
$("#EditMaterialCode").append($('<option></option>')
.val($('#materialCode' + userid).val())
.html(P3)
.prop('selected', true)
);
// $("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
$('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EditUOM + ')');
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function(idx, obj) {
if (obj.MaterialCode != $('#materialCode' + userid).val()) {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
});
@ -4923,6 +4941,12 @@ if (!empty($INRSYMBOL)) {
$('#ClearingCharges' + userid).val(Clearing);
$('#Subtotal' + userid).val(Subtotal);
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
if (capitalType == 'International') {
TotalTaxValue = 0.00;
Total = basicval;
@ -4930,13 +4954,14 @@ if (!empty($INRSYMBOL)) {
cellval[2].innerHTML = materialCode;
cellval[3].innerHTML = materialName;
cellval[4].innerHTML = editHSN;
cellval[5].innerHTML = quantity;
cellval[6].innerHTML = uom;
cellval[7].innerHTML = itemRate;
cellval[8].innerHTML = basicval;
cellval[9].innerHTML = TotalTaxValue;
cellval[10].innerHTML = Total;
cellval[6].innerHTML = quantity;
cellval[7].innerHTML = uom;
cellval[8].innerHTML = itemRate;
cellval[9].innerHTML = basicval;
cellval[10].innerHTML = TotalTaxValue;
cellval[11].innerHTML = Total;
$('#EDITCAPITAL').modal('hide');

143
app/Views/driverPayslipGeneratePrint.php
View File

@ -19,65 +19,88 @@
</tr>
<tr>
<td colspan="11">
<table>
<tbody>
<tr >
<td width="160px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Name </td>
<td width="200px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo ':&nbsp;'.$PayDetails[0]->driver_name; ?></td>
<td><?= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' ?></td>
<td width="160px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Employee ID </td>
<td width="152px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo ':&nbsp;'.$PayDetails[0]->EmpID ?></td>
</tr>
<tr>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Designation </td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;" > <?php echo ':&nbsp;'.$PayDetails[0]->Designation ?></td>
<td><?= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' ?></td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Department </td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo ':&nbsp;'.$PayDetails[0]->DeptName ?></td>
</tr>
<tr>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Date Of Joining </td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"> <?php echo ':&nbsp;'.date('d-m-Y', strtotime($PayDetails[0]->DOJ)) ?></td>
<td><?= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' ?></td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">No Of Loads </td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"> <?php echo ':&nbsp;'.$PayDetails[0]->no_of_loads ?></td>
</tr>
<tr>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Bank Name </td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo ':&nbsp;'.$PayDetails[0]->BankName ?></td>
<td><?= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' ?></td>
<td width="100px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">PAN Number </td>
<td width="100px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo ':&nbsp;'.$PayDetails[0]->Pan;?> </td>
</tr>
<tr>
<td width="100px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Bank Acc No </td>
<td width="100px;" style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"> <?php echo ':&nbsp;'.$PayDetails[0]->BankAccountNumber ?></td>
<td><?= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' ?></td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"> Aadhar Number</td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo ':&nbsp;'.str_replace(' ', '', $PayDetails[0]->AadharNo);?></td>
</tr>
<tr>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Bank IFSC </td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo ':&nbsp;'.$PayDetails[0]->IFSCCode ?></td>
<td><?= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' ?></td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Loan Balance </td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;" ><?php echo ':&nbsp;Rs&nbsp;'.$PayDetails[0]->BalanceAdvance ?></td>
</tr>
<tr>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"> </td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo '&nbsp;' ?></td>
<td><?= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' ?></td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Diesel </td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;" ><?php echo ':&nbsp;Rs&nbsp;'.$PayDetails[0]->diesel_amount; ?></td>
</tr>
<tr>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"> </td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;"><?php echo '&nbsp;'; ?></td>
<td><?= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' ?></td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;">Shed Duty Amount </td>
<td style="border-left: 0px ;border-bottom: 0px; border-right: 0px ;border-top: 0px ; white-space: nowrap;" ><?php echo ':&nbsp;Rs&nbsp;'.$PayDetails[0]->shed_amount; ?></td>
</tr>
</tbody>
<table style="width: 100%; border-collapse: collapse;">
<tbody>
<tr>
<td style="width: 14%; border: none; white-space: nowrap;">Name</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;"><?php echo $PayDetails[0]->driver_name; ?></td>
<td style="width: 2%; border: none;"></td>
<td style="width: 14%; border: none; white-space: nowrap;">Employee ID</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;"><?php echo $PayDetails[0]->EmpID ?></td>
</tr>
<tr>
<td style="width: 14%; border: none; white-space: nowrap;">Designation</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;"><?php echo $PayDetails[0]->Designation ?></td>
<td style="width: 2%; border: none;"></td>
<td style="width: 14%; border: none; white-space: nowrap;">Department</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;"><?php echo $PayDetails[0]->DeptName ?></td>
</tr>
<tr>
<td style="width: 14%; border: none; white-space: nowrap;">Date Of Joining</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;"><?php echo date('d-m-Y', strtotime($PayDetails[0]->DOJ)) ?></td>
<td style="width: 2%; border: none;"></td>
<td style="width: 14%; border: none; white-space: nowrap;">No Of Loads</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;"><?php echo $PayDetails[0]->no_of_loads ?></td>
</tr>
<tr>
<td style="width: 14%; border: none; white-space: nowrap;">Bank Name</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;"><?php echo $PayDetails[0]->BankName ?></td>
<td style="width: 2%; border: none;"></td>
<td style="width: 14%; border: none; white-space: nowrap;">PAN Number</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;"><?php echo $PayDetails[0]->Pan; ?></td>
</tr>
<tr>
<td style="width: 14%; border: none; white-space: nowrap;">Bank Acc No</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;"><?php echo $PayDetails[0]->BankAccountNumber ?></td>
<td style="width: 2%; border: none;"></td>
<td style="width: 14%; border: none; white-space: nowrap;">Aadhar Number</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;"><?php echo str_replace(' ', '', $PayDetails[0]->AadharNo); ?></td>
</tr>
<tr>
<td style="width: 14%; border: none; white-space: nowrap;">Bank IFSC</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;"><?php echo $PayDetails[0]->IFSCCode ?></td>
<td style="width: 2%; border: none;"></td>
<td style="width: 14%; border: none; white-space: nowrap;">Loan Balance</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;">&#8377;<?php echo '&nbsp;' . $PayDetails[0]->BalanceAdvance ?></td>
</tr>
<tr>
<td style="width: 14%; border: none;"></td>
<td style="width: 1%; border: none;"></td>
<td style="width: 34%; border: none;"></td>
<td style="width: 2%; border: none;"></td>
<td style="width: 14%; border: none; white-space: nowrap;">Diesel Amount</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;">&#8377;<?php echo '&nbsp;' . $PayDetails[0]->diesel_amount; ?></td>
</tr>
<tr>
<td style="width: 14%; border: none;"></td>
<td style="width: 1%; border: none;"></td>
<td style="width: 34%; border: none;"></td>
<td style="width: 2%;border: none;"></td>
<td style="width: 14%; border: none; white-space: nowrap;">Shed Duty Amount</td>
<td style="width: 1%; border: none; white-space: nowrap;">:</td>
<td style="width: 34%; border: none; white-space: nowrap;">&#8377;<?php echo '&nbsp;' . $PayDetails[0]->shed_amount; ?></td>
</tr>
</tbody>
</table>
</td>
</tr>
@ -85,7 +108,7 @@
<table style="border-collapse: collapse;border-top:#fff;" cellpadding="0" cellspacing="0" border="1" width="100%" >
<tr><th>Earnings</th><th>Amount <span style="font-family: DejaVu Sans; sans-serif;">&#8377;</span></th><th>Deductions</th><th>Amount <span style="font-family: DejaVu Sans; sans-serif;">&#8377;</span></th></tr>
<tr>
<td width="25%;">&nbsp;BASIC</td>
<td width="25%;">&nbsp;BASIC</td>
<td width="20%;" style="text-align: right;" ><?php echo $PayDetails[0]->BASIC; ?>&nbsp;</td>
<td width="25%;">&nbsp;PF</td>
<td width="30%;" style="text-align: right;" ><?php echo $pf_amount; ?>&nbsp;</td>

42
app/Views/editCapitalAmendPO.php
View File

@ -888,6 +888,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
<th style="white-space: nowrap !important; text-align:left !important">SNo</th>
<th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
<th style="white-space: nowrap !important; text-align:left !important">Item Description</th>
<th style="white-space: nowrap !important; text-align:center !important">HSN/SAC</th>
<th style="white-space: nowrap !important; text-align:left !important">Line Item Specs</th>
<th style="white-space: nowrap !important; text-align:right !important">Quantity</th>
<th style="white-space: nowrap !important; text-align:left !important">UOM</th>
@ -913,6 +914,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
<td style="text-align:center !important"><?php echo $record->ReqNo ?></td>
<td style="text-align:left !important"><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "...");
echo $shortName; ?></td>
<td style="text-align:center !important"><?php echo $record->HSNCODE ?></td>
<td style="text-align:left !important;">
<a href="#"
class="editable-field"
@ -2681,8 +2683,9 @@ if (!empty($POItem) && $CapitalRange == '1') {
if (isAdded == "0") {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
// $("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
}
@ -3345,7 +3348,7 @@ Calculate Landing charge
$('#EditOtherAllowances').val($('#otherallowance' + userid).val());
//$('#Editservicetotalordervaue').val($('#totalservicevalue'+userid).val());
$('#Editservicetotalordervaue').val(cellval[9].innerHTML);
$('#Editservicetotalordervaue').val(cellval[10].innerHTML);
@ -3433,12 +3436,22 @@ Calculate Landing charge
$("#EditMaterialCode").empty();
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var P0 = cellval[3].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>')
.val($('#materialCode' + userid).val())
.html(P3)
.prop('selected', true)
);
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function (idx, obj) {
if (obj.MaterialCode != $('#materialCode' + userid).val()) {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSN = (obj.HSNCODE) ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(HSN + obj.MaterialName + " ( "+obj.MaterialCode+" ) "));
}
});
@ -4056,19 +4069,26 @@ Calculate Landing charge
$('#DisVal' + userid).val(DisVal);
$('#AfterDisVal' + userid).val(AfterDisVal);
var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
cellval[2].innerHTML = shorten;
//alert(materialName);
cellval[4].innerHTML = parseFloat(quantity).toFixed(2);
cellval[4].innerHTML = editHSN;
cellval[5].innerHTML = parseFloat(quantity).toFixed(2);
//alert(quantity);
cellval[5].innerHTML = uom;
cellval[6].innerHTML = uom;
//alert(uom);
cellval[6].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[7].innerHTML = parseFloat(itemRate).toFixed(2);
//alert(itemRate);
cellval[7].innerHTML = parseFloat(basicval).toFixed(2);
cellval[8].innerHTML = parseFloat(basicval).toFixed(2);
//alert(basicval);
cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
//alert(TotalTaxValue);
cellval[9].innerHTML = parseFloat(totalservicevalue).toFixed(2);
cellval[10].innerHTML = parseFloat(totalservicevalue).toFixed(2);
//alert(basicval);

61
app/Views/editCapitalPo.php
View File

@ -943,6 +943,7 @@ $(document).ready(function () {
<th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
<th style="white-space: nowrap !important;">Item Code</th>
<th style="white-space: nowrap !important;">Item Description</th>
<th style="white-space: nowrap !important; text-align:center !important">HSN/SAC</th>
<th style="white-space: nowrap !important;">Line Item Specs</th>
<th style="white-space: nowrap !important; text-align:right !important">Quantity</th>
<th style="white-space: nowrap !important;">UOM</th>
@ -976,6 +977,7 @@ $(document).ready(function () {
<td><?php echo $record->MaterialCode ?></td>
<td><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "...");
echo $shortName; ?></td>
<td style="text-align:center !important"><?php echo $record->HSNCODE ?></td>
<td>
<?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?>
<a href="#"
@ -4061,8 +4063,8 @@ $(document).ready(function () {
if (isAdded == "0") {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
@ -4802,6 +4804,14 @@ $(document).ready(function () {
var costCode = $('#CostCenter').val();
var materialCode = $('#MaterialCode').val();
var selectedText = $('#MaterialCode option:selected').text();
var parts = selectedText.split('-');
var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim())
? parts[0].trim()
: '';
var materialName = $("#CapitalItemName").val();
var uom = $("#CPUOM").val();
var addPer = '';
@ -4942,7 +4952,8 @@ $(document).ready(function () {
<td align="left">${temp}</td>
<td align="center">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${shorten}</td>`;
<td align="left">${shorten}</td>
<td align="center">${HSN}</td>`;
if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
rowHtml += `<td><a href="#" class="editable-field"
data-id="${temp}"
@ -5466,9 +5477,8 @@ $(document).ready(function () {
if (value.MaterialCode == materialCode) {
$("#MaterialCode").append($('<option></option>').val(value.MaterialCode).html(value.MaterialCode + "-" + value.MaterialName));
var HSNCODE = value.HSNCODE ? value.HSNCODE+"-" : "";
$("#MaterialCode").append($('<option></option>').val(value.MaterialCode).html( HSNCODE + value.MaterialName+ " ( "+value.MaterialCode+" ) "));
}
@ -5835,7 +5845,7 @@ $(document).ready(function () {
$('#EditCustomDutyExpenses').val($('#CustomDutyExpenses' + userid).val());
//$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val());
$('#EdittxtTotalOrderValue').val(cellval[10].innerHTML);
$('#EdittxtTotalOrderValue').val(cellval[11].innerHTML);
@ -5887,13 +5897,25 @@ $(document).ready(function () {
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
$("#EditMaterialCode").empty();
var P0 = cellval[4].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
$("#EditMaterialCode").append($('<option></option>')
.val($('#materialCode' + userid).val())
.html(P3)
.prop('selected', true)
);
// $("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function(idx, obj) {
if (obj.MaterialCode != $('#materialCode' + userid).val()) {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
// $("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSN = (obj.HSNCODE) ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(HSN + obj.MaterialName + " ( "+obj.MaterialCode+" ) "));
}
});
@ -5942,7 +5964,7 @@ $(document).ready(function () {
$('#ViewAfterSgst').val($('#AfterSgst' + userid).val());
$('#ViewAfterIgst').val($('#AfterIgst' + userid).val());
$('#ViewOtherAllowances').val($('#OtherAmt' + userid).val());
$('#ViewTotalAmountlocal').val(cellval[10].innerHTML);
$('#ViewTotalAmountlocal').val(cellval[11].innerHTML);
$('#drpFreightviewloc').val($("#Ftype" + userid).val());
@ -6715,19 +6737,24 @@ $(document).ready(function () {
$('#DutyImpact' + userid).val(DutyImpact);
$('#NetValue' + userid).val(Nett);
$('#ClearingCharge' + userid).val(ClearingCharges);
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;
cellval[2].innerHTML = materialCode;
cellval[3].innerHTML = shorten;
cellval[5].innerHTML = quantity;
cellval[6].innerHTML = uom;
cellval[7].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[8].innerHTML = parseFloat(basicval).toFixed(2);
cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2); // what should i display here ?? if international means
cellval[10].innerHTML = parseFloat(Total).toFixed(2);
cellval[4].innerHTML = editHSN;
cellval[6].innerHTML = quantity;
cellval[7].innerHTML = uom;
cellval[8].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[9].innerHTML = parseFloat(basicval).toFixed(2);
cellval[10].innerHTML = parseFloat(TotalTaxValue).toFixed(2); // what should i display here ?? if international means
cellval[11].innerHTML = parseFloat(Total).toFixed(2);

36
app/Views/editImportAmendPO.php
View File

@ -1279,6 +1279,7 @@ if (!empty($RequistionDetails)) {
<th style="white-space: nowrap !important; text-align:left !important">SNo</th>
<th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
<th style="white-space: nowrap !important; text-align:left !important">Item Description</th>
<th style="white-space: nowrap !important; text-align:center !important">HSN/SAC</th>
<th style="white-space: nowrap !important; text-align:left !important">Line Item Specs</th>
<th style="white-space: nowrap !important; text-align:right !important">Quantity</th>
<th style="white-space: nowrap !important; text-align:left !important">UOM</th>
@ -1304,6 +1305,7 @@ if (!empty($RequistionDetails)) {
<td style="text-align:center !important"><?php echo $record->ReqNo ?></td>
<td><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "...");
echo $shortName; ?></td>
<td style="text-align:center !important"><?php echo $record->HSNCODE ?></td>
<td style="text-align:left !important;">
<a href="#"
class="editable-field"
@ -1998,8 +2000,8 @@ if (!empty($RequistionDetails)) {
if (isAdded == "0") {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
@ -2678,10 +2680,19 @@ if (!empty($RequistionDetails)) {
$('#EditTotalOrderValue').val(cellval[6].innerHTML);
$('#EditTotalOrderValue').val(cellval[7].innerHTML);
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var P0 = cellval[3].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>')
.val($('#materialCode' + userid).val())
.html(P3)
.prop('selected', true)
);
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function(idx, obj) {
@ -2724,6 +2735,13 @@ if (!empty($RequistionDetails)) {
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var edititemname = $("#EditItemName").val();
var editUOM = $('#EditUOM').val();
var editQuantity = $('#EditQuantity').val();
@ -2799,11 +2817,11 @@ if (!empty($RequistionDetails)) {
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[4].innerHTML = editQuantity;
cellval[5].innerHTML = editUOM;
cellval[6].innerHTML = itemRate;
cellval[7].innerHTML = BasicValue;
cellval[4].innerHTML = editHSN;
cellval[5].innerHTML = editQuantity;
cellval[6].innerHTML = editUOM;
cellval[7].innerHTML = itemRate;
cellval[8].innerHTML = BasicValue;
$('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(edititemname);

46
app/Views/editRevenueAmendPO.php
View File

@ -1316,6 +1316,7 @@ if (!empty($INRSYMBOL)) {
<th style="white-space: nowrap !important;">SNo</th>
<th class="text-center" style="white-space: nowrap !important;">Requisition No</th>
<th style="white-space: nowrap !important;">Item Description</th>
<th class="text-center" style="white-space: nowrap !important;">HSN/SAC</th>
<th style="white-space: nowrap !important;">Line Item Specs</th>
<th class="text-right" style="white-space: nowrap !important;">Quantity</th>
<th style="white-space: nowrap !important;">UOM</th>
@ -1341,6 +1342,7 @@ if (!empty($INRSYMBOL)) {
<td class="text-center"><?php echo $record->ReqNo ?></td>
<td><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "...");
echo $shortName; ?></td>
<td style="text-align:center !important"><?php echo $record->HSNCODE ?></td>
<td style="text-align:left !important;">
<a href="#"
class="editable-field"
@ -2344,16 +2346,16 @@ if (!empty($INRSYMBOL)) {
$(document).ready(function () {
var tempUserId = 0;
var index = '1';
var userid = '';
var userid = '';
$("#EDITREVENUE").on("shown.bs.modal", function (e) {
var AvlBudAmt = '<?php echo $AvlAmount ?>';
AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
userid = $(e.relatedTarget).data('userid');
$('#isEdit').val(1);
$('#isEdit').val(1);
if (tempUserId == 0) {
var tr = document.getElementById(userid);
var cellval = tr.cells;
var id = $('#Reqnumber' + userid).val();
@ -2364,6 +2366,7 @@ if (!empty($INRSYMBOL)) {
$('#EditAvlBudAmt').val(AvlBudAmt);
$('#EditMaterialCode').val($('#materialCode' + userid).val());
$('#EditItemName').val($('#materialName' + userid).val());
$('#EditUOM').val($('#uom' + userid).val());
$('#EditQuantity').val($('#quantity' + userid).val());
@ -2372,7 +2375,7 @@ if (!empty($INRSYMBOL)) {
var EdititemRate = parseFloat($('#itemRate' + userid).val()).toFixed(2);
$('#EditRate').val(EdititemRate);
$('#txtEditBasicValue').val(parseFloat(cellval[7].innerHTML).toFixed(2));
$('#txtEditBasicValue').val(parseFloat(cellval[8].innerHTML).toFixed(2));
RequistQuantity = $('#quantity' + userid).val();
$('#txtEditDiscount').val($('#DisVal' + userid).val());
$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
@ -2400,7 +2403,16 @@ if (!empty($INRSYMBOL)) {
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
// For Binding Material list center for the selected Requistion Number
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var P0 = cellval[3].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>')
.val($('#materialCode' + userid).val())
.html(P3)
.prop('selected', true)
);
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function (idx, obj) {
@ -2416,7 +2428,8 @@ if (!empty($INRSYMBOL)) {
}
});
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
});
@ -2428,7 +2441,7 @@ if (!empty($INRSYMBOL)) {
$("input:radio[name='optExcise'][value='" + $('#ExciseOption' + userid).val() + "']").prop('checked', 'checked');
$("input:radio[name='optVat'][value='" + $('#VatOption' + userid).val() + "']").prop('checked', 'checked');
$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
}
if (userid) {
tempUserId = userid;
@ -2487,18 +2500,23 @@ if (!empty($INRSYMBOL)) {
var TotalOrderValue = $("#txtEditTotalOrderValue").val();
var Service_Description = $("#Edit_Service_Description").val();
var TotalTaxValue = calculateEditTaxValue();
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var tr = document.getElementById(userid);
var cellval = tr.cells;
var shorten = editDescription.length > 13 ? editDescription.slice(0, 13) + "..." : editDescription;
cellval[2].innerHTML = shorten;
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[3].innerHTML = editHSN;
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);
$('#materialName' + userid).val(editDescription);
@ -2865,7 +2883,7 @@ if (!empty($INRSYMBOL)) {
<script>
$(document).ready(function () {
var openOrder = <?php echo $IsOpenOrder; ?>;
var openOrder = <?php echo $IsOpenOrder ? $IsOpenOrder : 0 ; ?>;
if(openOrder){
$('#EditQuantity').removeAttr('required');
$('#EditQuantity').attr('readonly', true);

64
app/Views/editRevenuepurchaseorder.php
View File

@ -379,7 +379,7 @@ if (!empty($getlogpodtl)) {
var InsuranceNumber = '<?php echo $insurenceno; ?>';
var statuscheck = '<?php echo $PONOStatus; ?>';
$(document).ready(function () {
var openOrder = <?php echo $IsOpenOrder; ?>;
var openOrder = <?php echo $IsOpenOrder ? $IsOpenOrder : 0 ; ?>;
if(openOrder){
$('#Quantity').val(0);
$('#Quantity').removeAttr('required');
@ -2375,6 +2375,7 @@ if (!empty($getlogpodtl)) {
<th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
<th style="white-space: nowrap !important; text-align:left !important">Item Code</th>
<th style="white-space: nowrap !important; text-align:left !important">Item Description</th>
<th style="white-space: nowrap !important; text-align:center !important">HSN/SAC</th>
<th style="white-space: nowrap !important; text-align:left !important">Line Item Specs</th>
<th style="white-space: nowrap !important; text-align:right !important">Quantity</th>
<th style="white-space: nowrap !important; text-align:left !important">UOM</th>
@ -2409,6 +2410,7 @@ if (!empty($getlogpodtl)) {
<td align="left"><?php echo $record->MaterialCode ?></td>
<td align="left"><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "...");
echo $shortName; ?></td>
<td style="text-align:center !important"><?php echo $record->HSNCODE ?></td>
<td align="left">
<?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?>
<a href="#"
@ -4465,6 +4467,13 @@ if (!empty($getlogpodtl)) {
var AvilBudget = $('#AvlBudAmt').val();
var costCode = $('#CostCenter').val();
var materialCode = $('#MaterialCode').val();
var selectedText = $('#MaterialCode option:selected').text();
var parts = selectedText.split('-');
var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim())
? parts[0].trim()
: '';
var materialName = $("#ItemName").val();
var uom = $("#UOM").val();
var quantity = parseFloat($("#Quantity").val()).toFixed(2);
@ -4545,7 +4554,8 @@ if (!empty($getlogpodtl)) {
<td align="left">${temp}</td>
<td align="center">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${shorten}</td>`;
<td align="left">${shorten}</td>
<td align="left">${HSN}</td>`;
if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
rowHtml += `<td align="left"><a href="#" class="editable-field"
data-id="${temp}"
@ -4669,21 +4679,24 @@ if (!empty($getlogpodtl)) {
var TotalOrderValue = $("#txtEditTotalOrderValue").val();
var Service_Description = $("#Edit_Service_Description").val();
var TotalTaxValue = calculateEditTaxValue();
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var tr = document.getElementById(userid);
var cellval = tr.cells;
var shorten = editDescription.length > 13 ? editDescription.slice(0, 13) + "..." : editDescription;
cellval[2].innerHTML = shorten;
cellval[3].innerHTML = editDescription;
cellval[5].innerHTML = editQuantity;
cellval[6].innerHTML = editUOM;
cellval[7].innerHTML = itemRate;
cellval[8].innerHTML = basicval;
cellval[9].innerHTML = TotalTaxValue;
cellval[10].innerHTML = TotalOrderValue;
cellval[3].innerHTML = shorten;
cellval[4].innerHTML = editHSN;
cellval[6].innerHTML = editQuantity;
cellval[7].innerHTML = editUOM;
cellval[8].innerHTML = itemRate;
cellval[9].innerHTML = basicval;
cellval[10].innerHTML = TotalTaxValue;
cellval[11].innerHTML = TotalOrderValue;
$('#materialCode' + userid).val(editMaterialCode);
@ -4756,7 +4769,7 @@ if (!empty($getlogpodtl)) {
var cellval = tr.cells;
cellval[9].innerHTML = TotalOrderValue;
cellval[10].innerHTML = TotalOrderValue;
@ -5371,8 +5384,8 @@ if (!empty($getlogpodtl)) {
if (isAdded == "0") {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
@ -5514,7 +5527,7 @@ if (!empty($getlogpodtl)) {
} else {
$('#EditPer').val($('#per' + userid).val());
}
$('#txtEditBasicValue').val(parseFloat(cellval[8].innerHTML).toFixed(2));
$('#txtEditBasicValue').val(parseFloat(cellval[9].innerHTML).toFixed(2));
RequistQuantity = $('#quantity' + userid).val();
$('#txtEditDiscount').val($('#DisVal' + userid).val());
$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
@ -5548,7 +5561,16 @@ if (!empty($getlogpodtl)) {
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
// For Binding Material list center for the selected Requistion Number
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var P0 = cellval[4].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>')
.val($('#materialCode' + userid).val())
.html(P3)
.prop('selected', true)
);
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function (idx, obj) {
@ -5573,8 +5595,8 @@ if (!empty($getlogpodtl)) {
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
@ -5616,7 +5638,7 @@ if (!empty($getlogpodtl)) {
$('#ViewQuantity').val($('#quantity' + userid).val());
$('#ViewRate').val($('#itemRate' + userid).val());
$('#ViewPer').val($('#per' + userid).val());
$('#txtViewBasicValue').val(parseFloat(cellval[8].innerHTML).toFixed(2));
$('#txtViewBasicValue').val(parseFloat(cellval[9].innerHTML).toFixed(2));
RequistQuantity = $('#quantity' + userid).val();
$('#txtViewDiscount').val($('#DisVal' + userid).val());
$('#txtViewAfterDiscount').val($('#AfterDisVal' + userid).val());

50
app/Views/editServiceAmendPO.php
View File

@ -390,7 +390,9 @@ foreach ($PaymentTerms as $TER) {
if (obj.materialCode == materialCode) {
$("#MaterialCode").val('');
} else {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
@ -441,8 +443,8 @@ foreach ($PaymentTerms as $TER) {
if (isAdded == "0") {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
@ -1117,6 +1119,7 @@ foreach ($PaymentTerms as $TER) {
<th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
<th style="white-space: nowrap !important;">Item Code</th>
<th style="white-space: nowrap !important;">Item Description</th>
<th style="white-space: nowrap !important;">HSN/SAC</th>
<th style="white-space: nowrap !important; text-align:left !important">Line Item Specs</th>
<th style="white-space: nowrap !important; text-align:right !important">Quantity</th>
<th style="white-space: nowrap !important;">UOM</th>
@ -1157,6 +1160,7 @@ foreach ($PaymentTerms as $TER) {
<td><?php echo $record->MaterialCode ?></td>
<td><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "...");
echo $shortName; ?></td>
<td><?php echo $record->HSNCODE; ?></td>
<td style="text-align:left !important;">
<a href="#"
class="editable-field"
@ -1880,7 +1884,7 @@ foreach ($PaymentTerms as $TER) {
$('#EditotherDescription').hide();
$(document).ready(function() {
var openOrder = <?php echo $IsOpenOrder; ?>;
var openOrder = <?php echo $IsOpenOrder ? $IsOpenOrder : 0 ; ?>;
if(openOrder){
$('#EditQuantity').removeAttr('required');
$('#EditQuantity').attr('readonly', true);
@ -1910,7 +1914,7 @@ foreach ($PaymentTerms as $TER) {
RateValue = $('#itemRate' + userid).val();
RateValue = parseFloat(RateValue).toFixed(2);
$('#EditRate').val(RateValue);
$('#txtEditBasicValue').val(cellval[8].innerHTML);
$('#txtEditBasicValue').val(cellval[9].innerHTML);
$('#EditCgst').val($('#Cgst' + userid).val());
$('#EditSgst').val($('#Sgst' + userid).val());
$('#EditIgst').val($('#Igst' + userid).val());
@ -1937,7 +1941,7 @@ foreach ($PaymentTerms as $TER) {
$("#EditFrequencyNo").val($('#FrequencyValue' + userid).val());
}
$('#EditTotalOrderValue').val(cellval[9].innerHTML);
$('#EditTotalOrderValue').val(cellval[11].innerHTML);
RequistQuantity = $('#quantity' + userid).val();
@ -1947,7 +1951,16 @@ foreach ($PaymentTerms as $TER) {
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
// For Binding Material list center for the selected Requistion Number
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var P0 = cellval[4].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>')
.val($('#materialCode' + userid).val())
.html(P3)
.prop('selected', true)
);
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
@ -1974,7 +1987,9 @@ foreach ($PaymentTerms as $TER) {
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
// $("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
@ -2026,19 +2041,24 @@ foreach ($PaymentTerms as $TER) {
var TotalTaxValue = calculateEditTaxValue();
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
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);
cellval[4].innerHTML = editHSN;
cellval[6].innerHTML = editQuantity;
cellval[7].innerHTML = editUOM;
cellval[8].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[9].innerHTML = parseFloat(basicval).toFixed(2);
cellval[10].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[11].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode);

27
app/Views/editconfig.php
View File

@ -370,8 +370,9 @@ if (!empty($master)) {
<!-- 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-dialog modal-dialog-scrollable" role="document" style="max-width: 50%;"> -->
<div class="modal-dialog" role="document" style="max-width: 50%;">
<div class="modal-content" style="width:1060px;">
<div class="modal-header">
<h5 class="modal-title" id="scrollableModalTitle"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
@ -585,14 +586,14 @@ if (!empty($master)) {
if (response.length > 0) {
let tableHtml = `
<table class="table table-bordered">
<table class="table table-bordered" style="table-layout: auto; width: 100%;">
<thead style="background-color: #539754; color: white; font-size: 12px;">
<tr>
<th style="text-align: center;" >Material Code</th>
<th style="text-align: center;" >Material Name</th>
<th style="text-align: center;" >Material Type</th>
<th style="text-align: center;" >Material Status</th>
<th style="text-align: center;">Material Code</th>
<th style="text-align: center;">Material Name</th>
<th style="text-align: center;">Material Type</th>
<th style="text-align: center;">Material Status</th>
</tr>
</thead>
<tbody>
@ -607,16 +608,16 @@ if (!empty($master)) {
data-materialCode="${item.MaterialCode}"
data-materialType="${item.MaterialType}"
data-uom="${item.UOM}"
style="cursor: pointer; color: #4d3a6d;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
style="cursor: pointer; color: #02a8b5; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;" onmouseover="this.style.color='#016269';">
<u>${item.MaterialCode}</u>
</td>
<td style="text-align:left; overflow: hidden;text-overflow: ellipsis; word-wrap: break-word !important;
white-space: normal !important; width: 100px !important; ">${item.MaterialName}</td>
<td style="text-align:left; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">${item.MaterialType}</td>
<td style="text-align:left; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">${item.IsActive == 1 ?"Active":"InActive"}</td>
<td style="text-align: center; white-space: normal;">${item.MaterialName}</td>
<td style="text-align: left; white-space: nowrap;">${item.MaterialType}</td>
<td style="text-align: left; white-space: nowrap;">${item.IsActive == 1 ? "Active" : "InActive"}</td>
</tr>
`;
// <td>${item.HSNCODE}</td>
});
tableHtml += `

61
app/Views/editimportpo.php
View File

@ -853,6 +853,7 @@ if (!empty($getlogpodtl)) {
<th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
<th style="white-space: nowrap !important; text-align:left !important">Item Code</th>
<th style="white-space: nowrap !important; text-align:left !important">Item Description</th>
<th style="white-space: nowrap !important; text-align:center !important">HSN/SAC</th>
<th style="white-space: nowrap !important; text-align:left !important">Line Item Specs</th>
<th style="white-space: nowrap !important; text-align:right !important">Quantity</th>
<th style="white-space: nowrap !important; text-align:left !important">UOM</th>
@ -882,6 +883,7 @@ if (!empty($getlogpodtl)) {
<td align="left"><?php echo $record->MaterialCode ?></td>
<td align="left"><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "...");
echo $shortName; ?></td>
<td align="center"><?php echo $record->HSNCODE ?></td>
<td align="left">
<?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?>
<a href="#"
@ -3365,8 +3367,9 @@ if (!empty($getlogpodtl)) {
if (isAdded == "0") {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
// $("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
}
@ -4241,6 +4244,12 @@ if (!empty($getlogpodtl)) {
var AvilBudget = $('#AvlBudAmt').val();
var costCode = $('#CostCenter').val();
var materialCode = $('#MaterialCode').val();
var selectedText = $('#MaterialCode option:selected').text();
var parts = selectedText.split('-');
var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim())
? parts[0].trim()
: '';
var materialName = $("#ItemName").val();
var uom = $("#UOM").val();
var quantity = $("#Quantity").val();
@ -4325,7 +4334,8 @@ if (!empty($getlogpodtl)) {
<td align="left">${temp}</td>
<td align="center">${Reqnumber}</td>
<td align="left">${materialCode}</td>
<td align="left">${shorten}</td>`;
<td align="left">${shorten}</td>
<td align="center">${HSN}</td>`;
if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
rowHtml += `<td><a href="#" class="editable-field"
data-id="${temp}"
@ -4451,7 +4461,7 @@ if (!empty($getlogpodtl)) {
var tr = document.getElementById(userid);
//alert(tr);
var cellval = tr.cells;
//alert(cellval);
var id = $('#Reqnumber' + userid).val();
//alert(id);
//var a=$('#Reqnumber'+userid).val();
@ -4537,7 +4547,7 @@ if (!empty($getlogpodtl)) {
$('#ViewPer').val($("#Per" + userid).val());
$('#ViewTotalOrderValue').val(cellval[7].innerHTML);
$('#ViewTotalOrderValue').val(cellval[8].innerHTML);
$("#ViewMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
$("#ViewMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
@ -4562,8 +4572,8 @@ if (!empty($getlogpodtl)) {
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
@ -4808,7 +4818,7 @@ if (!empty($getlogpodtl)) {
var tr = document.getElementById(userid);
//alert(tr);
var cellval = tr.cells;
//alert(cellval);
var id = $('#Reqnumber' + userid).val();
//alert(id);
$('#EditReqNo').val($('#Reqnumber' + userid).val());
@ -4907,10 +4917,19 @@ if (!empty($getlogpodtl)) {
$('#EditTotalOrderValue').val(cellval[7].innerHTML);
$('#EditTotalOrderValue').val(cellval[8].innerHTML);
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var P0 = cellval[4].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>')
.val($('#materialCode' + userid).val())
.html(P3)
.prop('selected', true)
);
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function(idx, obj) {
@ -4932,8 +4951,8 @@ if (!empty($getlogpodtl)) {
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
@ -4944,7 +4963,7 @@ if (!empty($getlogpodtl)) {
});
});
$('.EditImport').click(function() {
// alert('inside edit');
@ -4952,6 +4971,12 @@ if (!empty($getlogpodtl)) {
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var edititemname = $("#EditItemName").val();
var editUOM = $('#EditUOM').val();
var editQuantity = $('#EditQuantity').val();
@ -5015,12 +5040,12 @@ if (!empty($getlogpodtl)) {
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[4].innerHTML = editHSN;
cellval[5].innerHTML = editQuantity;
cellval[6].innerHTML = editUOM;
cellval[7].innerHTML = itemRate;
cellval[8].innerHTML = BasicValue;
cellval[6].innerHTML = editQuantity;
cellval[7].innerHTML = editUOM;
cellval[8].innerHTML = itemRate;
cellval[9].innerHTML = BasicValue;
$('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(edititemname);

46
app/Views/editrequisitionform.php
View File

@ -76,18 +76,18 @@ td {
.th-materialCode{
text-align:center !important;
width:15%;
width:12%;
}
.th-requestedQuantity{
text-align:right !important;
width:15%;
width:11%;
}
.th-PoQuantity{
text-align:right !important;
width:15%;
width:11%;
}
.th-Sno{
@ -106,6 +106,10 @@ td {
}
.hidden-column { display: none; }
.th-HSNCode{
text-align:center !important;
width:10%;
}
</style>
<script type="text/javascript">
window.onload = function() {
@ -216,6 +220,7 @@ td {
<th class="th th-Sno" >SNo</th>
<th class="th th-materialCode">Material Code</th>
<th class="th th-materialName">Material Name</th>
<th class="th th-HSNCode">HSN/SAC</th>
<th class="th th-uom">Uom</th>
<th class="th th-requestedQuantity">RequestedQuantity</th>
<th class="th th-PoQuantity">PoQuantity</th>
@ -239,6 +244,7 @@ td {
<input type="hidden" name="<?php echo 'te' . $index ?>" id="<?php echo 'tes' . $index ?>" value="<?php echo $record->Quantity; ?>" />
<td align="center"><?php echo $record->MaterialCode; ?></td>
<td align="left"><?php echo $record->MaterialName; ?></td>
<td align="center"><?php echo $record->HSNCODE; ?></td>
<td align="left"><?php echo $record->UOM; ?></td>
<td align="right"><?php echo $record->Quantity; ?></td>
<td align="right"><?php echo $record->POQTY; ?></td>
@ -324,7 +330,9 @@ td {
$options = array("0" => 'Material Code');
if (!empty($MaterialCode)) {
foreach ($MaterialCode as $MID) :
$options[$MID->MaterialCode] = $MID->MaterialCode . ' ' . ' - ' . ' ' . $MID->MaterialName;
// $options[$MID->MaterialCode] = $MID->MaterialCode . ' ' . ' - ' . ' ' . $MID->MaterialName;
$HSN = $MID->HSNCODE ? $MID->HSNCODE.' - ' : '';
$options[$MID->MaterialCode] = $HSN . $MID->MaterialName.' ( '.$MID->MaterialCode.' )';
endforeach;
}
echo form_dropdown('drpMaterial', $options, set_value('drpMaterial'), 'id="drpMaterial" class="form-control searchabledropdown"');
@ -409,8 +417,9 @@ td {
<div class="col-md-12">
<div class="form-group">
<label for="EditMaterialCode" class="control-label">Material Code</label>
<input type="hidden" name="EditMaterialCode" id="EditMaterialCode" />
<?php
$data = array('name' => 'EditMaterialCode', 'value' => set_value('EditMaterialCode'), 'id' => 'EditMaterialCode', 'class' => 'form-control searchabledropdown', 'readonly' => 'true');
$data = array('name' => 'EditMaterialType', 'value' => set_value('EditMaterialType'), 'id' => 'EditMaterialType', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
@ -818,6 +827,12 @@ td {
var quantity = $("#Quantity").val();
var materialdescription = $('#otherD').val();
var categoryName = $('#AddCategory').val();
var selectedText = $('#drpMaterial option:selected').text();
var parts = selectedText.split('-');
var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim())
? parts[0].trim()
: '';
$('#drpMaterial option[value=' + materialCode + ']').remove();
$('#Description').val('');
@ -832,6 +847,7 @@ td {
<td align="center">${temp}</td>
<td align="center">${materialCode}</td>
<td align="left">${materialName}</td>
<td align="center">${HSN}</td>
<td align="left">${uom}</td>
<td align="right">${quantity}</td>
<td align="right">0.00</td>
@ -939,13 +955,15 @@ td {
}
$('#EditMaterialCode').val($cells.eq(1).text());
$('#EditDescription').val($cells.eq(2).text());
$('#EditUOM').val($cells.eq(3).text());
$('#EditQuantity').val($cells.eq(4).text());
$('#EditCategory').val($cells.eq(8).text());
$('#EditUOM').val($cells.eq(4).text());
$('#EditQuantity').val($cells.eq(5).text());
$('#EditCategory').val($cells.eq(9).text());
$('#Edituserid').val(userid);
var HSN = $cells.eq(3).text()?$cells.eq(3).text()+'-':'';
var MaterialType = HSN+$cells.eq(2).text()+' ( '+$cells.eq(1).text()+ ' ) ';
$('#EditMaterialType').val(MaterialType);
});
});
@ -967,13 +985,19 @@ td {
var editUOM = $('#EditUOM').val();
var editQuantity = $('#EditQuantity').val();
var edituserid = $("#Edituserid").val();
var editMaterialType = $('#EditMaterialType').val();
var editparts = editMaterialType.split('-');
var editHSN = editMaterialType.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var tr = $('#' + edituserid);
var cells = tr.find('td');
cells.eq(1).text(editMaterialCode);
cells.eq(2).text(editDescription);
cells.eq(3).text(editUOM);
cells.eq(4).text(editQuantity);
cells.eq(3).text(editHSN);
cells.eq(4).text(editUOM);
cells.eq(5).text(editQuantity);
$('#MaterialCode' + edituserid).val(editMaterialCode);
$('#Description' + edituserid).val(editDescription);

75
app/Views/employeeLeaveApplicationForm.php
View File

@ -89,7 +89,7 @@
<tbody>
<?php
if (!empty($leave_info)) :
foreach ($leave_info as $d) {
foreach ($leave_info as $i => $d) {
$createdat = new DateTime($d['created_on']);
$crdate = $createdat->format('d-m-Y');
$crtime = $createdat->format('h:i A');
@ -105,7 +105,24 @@
<td><?= esc($stdate) ?></td>
<td><?= esc($eddate) ?></td>
<td><?= esc($d['no_of_days']) ?></td>
<td><?= esc($d['status']) ?></td>
<td><?php if($d['status'] !== "Approved"){ ?>
<select
class="form-control"
name="drpStatus"
id="drpStatus_<?php echo $d['leave_application_id'] ?>"
onchange="callLeaveStatus('<?php echo $d['leave_application_id'] ?>', this.value, this)"
style="width: 193px;">
<option value="">Select</option>
<option value="Approved">Approve</option>
<option value="Draft">Draft</option>
</select>
<?php }else{
echo esc($d['status']);
} ?>
</td>
<td><?php if($d['leave_application_id']){ ?>
<a data-toggle="modal" href="#applicationModal" data-arr='<?php echo json_encode($d); ?>' data-id='<?= esc($d['leave_application_id']) ?>' title="<?php echo $d['emp_id']; ?> - Click here to View/Edit Employee Leave Details">
<i class="fas fa-edit"></i>&nbsp;&nbsp;&nbsp;
@ -555,3 +572,57 @@ function validateDateRange() {
}
</script>
<script>
function callLeaveStatus(leaveid, Status, selectElem) {
// $("#drpStatus").val(Status); // not working
// $('#drpStatus_'+leaveid).val(Status);
// selectElem.value = Status;
// $(selectElem).val(Status).trigger('change');
// if (drpStatusElem) {
// drpStatusElem.;
// } else {
// console.error("Element with ID 'drpStatus' not found");
// return;
// }
if (Status == '') {
alert('Please select a valid status!');
selectElem.value = ''; // reset to default
return;
}else{
$('#drpStatus_'+leaveid).val(Status).select2();
}
var strMsg = '';
if (Status === 'Approved') {
strMsg = 'Do you want to Approve?';
} else if (Status === 'Draft') {
strMsg = 'Do you want to change to Draft?';
}
if (confirm(strMsg)) {
$.ajax({
type: "GET",
url: `<?= base_url('leaveStatus') ?>/${leaveid}/${Status}`,
success: function(response) {
alert(response.message);
location.reload();
},
error: function() {
alert('Error occurred while updating leave status.');
}
});
} else {
// reset dropdown to default if cancelled
selectElem.value = '';
}
}
</script>

47
app/Views/importpo.php
View File

@ -322,10 +322,19 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
$('#editTripsValue').hide();
}
$('#EditPer').val($('#Per' + userid).val());
$('#EditTotalOrderValue').val(cellval[9].innerHTML);
$('#EditTotalOrderValue').val(cellval[10].innerHTML);
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var P0 = cellval[4].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>')
.val($('#materialCode' + userid).val())
.html(P3)
.prop('selected', true)
);
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function(idx, obj) {
@ -341,7 +350,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
}
});
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
// $("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
}
});
@ -842,6 +853,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
<th style="white-space: nowrap !important;">Item Code</th>
<th style="white-space: nowrap !important;">Item Description</th>
<th style="white-space: nowrap !important; text-align:center !important">HSN/SAC</th>
<th style="white-space: nowrap !important;">Line Item Specs</th>
<th style="white-space: nowrap !important; text-align:right !important">Quantity</th>
<th style="white-space: nowrap !important;">UOM</th>
@ -2355,8 +2367,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
if (isAdded == "0") {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
@ -3439,6 +3452,14 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
var AvilBudget = $('#AvlBudAmt').val();
var costCode = $('#CostCenter').val();
var materialCode = $('#MaterialCode').val();
var selectedText = $('#MaterialCode option:selected').text();
var parts = selectedText.split('-');
var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim())
? parts[0].trim()
: '';
var materialName = $("#ItemName").val();
var uom = $("#UOM").val();
var quantity = $("#Quantity").val();
@ -3533,6 +3554,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<td style="text-align:center !important">${Reqnumber}</td>
<td style="text-align:left !important">${materialCode}</td>
<td style="text-align:left !important">${shorten}</td>
<td style="text-align:center !important">${HSN}</td>
<td style="text-align:left !important">
<a href="#" class="editable-field"
data-notes = "-" data-id ="${temp}">-</a>
@ -3873,13 +3895,20 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
if (FreightTypename != "PER TRIP") {
Nooftrip = '';
}
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[5].innerHTML = editQuantity;
cellval[6].innerHTML = editUOM;
cellval[7].innerHTML = itemRate;
cellval[8].innerHTML = BasicValue;
cellval[4].innerHTML = editHSN;
cellval[6].innerHTML = editQuantity;
cellval[7].innerHTML = editUOM;
cellval[8].innerHTML = itemRate;
cellval[9].innerHTML = BasicValue;
$('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(edititemname);

49
app/Views/inwardgateregister.php
View File

@ -160,6 +160,7 @@
<th>#</th>
<th>Item Code</th>
<th>Item Description</th>
<th>HSN/SAC</th>
<th>Rate</th>
<th>UOM</th>
<th>Ordered Quantity</th>
@ -297,13 +298,35 @@
$(".searchabledropdown").select2();
$('#IGRLink').on('click', function() {
filecheck(1);
function debounce(func, timeout = 300) {
let timer;
return (...args) => {
clearTimeout(timer);
timer = setTimeout(() => { func.apply(this, args); }, timeout);
};
}
$('#IGRLink, #IGRDraftLink').on('click', function(e) {
e.preventDefault();
const $btn = $(this);
const strMsg = $btn.is('#IGRLink')
? 'Generate IGR?'
: 'Save as draft IGR?';
if (confirm('Are you sure? ' + strMsg)) {
$btn.prop("disabled", true)
.html('<i class="fa fa-spinner fa-spin"></i> Processing...');
filecheck($btn.is('#IGRLink') ? 1 : 0);
}
});
$('#IGRDraftLink').on('click', function() {
filecheck(0);
});
// $('#IGRLink').on('click', function() {
// filecheck(1);
// });
// $('#IGRDraftLink').on('click', function() {
// filecheck(0);
// });
function filecheck(status) {
$('#hideIGRStatus').val(status);
@ -320,9 +343,19 @@
// }
// }
function Save() {
$("#IGRLink, #IGRDraftLink").prop("disabled", true);
$("#IGRLink, #IGRDraftLink")
.prop("disabled", true)
.html('<i class="fa fa-spinner fa-spin"></i> Processing...');
if (validate()) { $("#IGRForm").submit(); }
else { $("#IGRLink, #IGRDraftLink").prop("disabled", false); }
else {
// Re-enable buttons and restore original text
$("#IGRLink, #IGRDraftLink")
.prop("disabled", false)
.text(function() {
return $(this).attr('id') === 'IGRLink' ? 'Generate IGR' : 'Save as Draft IGR';
});
}
}
});
</script>
@ -466,6 +499,7 @@
'<td align="right">' + j + '</td>' +
'<td name="MaterialName" id="MaterialCode" >' + item.MaterialCode + '</td>' +
'<td>' + item.MaterialName + '</td>' +
'<td>' + ((item.HSNCODE) ? item.HSNCODE : '') + '</td>' +
'<td>' + Number(item.Rate).toFixed(2) + '</td>' +
'<td name="UOM">' + item.UOM + '</td>' +
'<td name="Quantity1' + i + '" id="Quantity_1' + i + '">' + item.Quantity + '</td>' +
@ -898,6 +932,7 @@
'<td align="right">' + j + '</td>' +
'<td name="MaterialName" id="MaterialCode" >' + item.MaterialCode + '</td>' +
'<td>' + item.MaterialName + '</td>' +
'<td>' + ((item.HSNCODE) ? item.HSNCODE : '') + '</td>' +
'<td>' + Number(item.Rate).toFixed(2) + '</td>' +
'<td name="UOM">' + item.UOM + '</td>' +
'<td name="Quantity1' + i + '" id="Quantity_1' + i + '">' + item.Quantity + '</td>' +

51
app/Views/purchaseorder.php
View File

@ -406,8 +406,9 @@ if (!empty($INRSYMBOL)) {
if (isAdded == "0") {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
// $("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
}
@ -2191,6 +2192,7 @@ if (!empty($INRSYMBOL)) {
<th style="white-space: nowrap !important; text-align:left !important">Requisition No</th>
<th style="white-space: nowrap !important;">Item Code</th>
<th style="white-space: nowrap !important;">Item Description</th>
<th style="white-space: nowrap !important; text-align:center !important">HSN/SAC</th>
<th style="white-space: nowrap !important;">Line Item Specs</th>
<th style="white-space: nowrap !important; text-align:right !important">Quantity</th>
<th style="white-space: nowrap !important;">UOM</th>
@ -3311,7 +3313,7 @@ if (!empty($INRSYMBOL)) {
} else {
$('#EditPer').val($('#uom' + userid).val());
}
$('#txtEditBasicValue').val(cellval[8].innerHTML);
$('#txtEditBasicValue').val(cellval[9].innerHTML);
RequistQuantity = $('#quantity' + userid).val();
$('#txtEditDiscount').val($('#DisVal' + userid).val());
$('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
@ -3346,7 +3348,17 @@ if (!empty($INRSYMBOL)) {
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
// For Binding Material list center for the selected Requistion Number
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
// $("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var P0 = cellval[4].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>')
.val($('#materialCode' + userid).val())
.html(P3)
.prop('selected', true)
);
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
@ -3373,7 +3385,9 @@ if (!empty($INRSYMBOL)) {
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
// $("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
}
@ -3443,6 +3457,12 @@ if (!empty($INRSYMBOL)) {
// $('#ReqNo').val(Reqnumber).remove();
// $('#ReqNo option[value='+Reqnumber+']').remove();
var selectedText = $('#MaterialCode option:selected').text();
var parts = selectedText.split('-');
var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim())
? parts[0].trim()
: '';
$('#MaterialCode option[value=' + materialCode + ']').remove();
@ -3485,6 +3505,7 @@ if (!empty($INRSYMBOL)) {
<td style="text-align:left !important">${Reqnumber}</td>
<td style="text-align:left !important">${materialCode}</td>
<td style="text-align:left !important">${shorten}</td>
<td style="text-align:left !important">${HSN}</td>
<td style="text-align:left !important">
<a href="#" class="editable-field"
data-notes = "-" data-id ="${temp}">-</a>
@ -3602,17 +3623,23 @@ if (!empty($INRSYMBOL)) {
var Service_Description = $("#Edit_Service_Description").val();
var TotalTaxValue = calculateEditTaxValue();
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
cellval[5].innerHTML = editQuantity;
cellval[6].innerHTML = editUOM;
cellval[7].innerHTML = itemRate;
cellval[8].innerHTML = basicval;
cellval[9].innerHTML = TotalTaxValue;
cellval[10].innerHTML = TotalOrderValue;
cellval[4].innerHTML = editHSN;
cellval[6].innerHTML = editQuantity;
cellval[7].innerHTML = editUOM;
cellval[8].innerHTML = itemRate;
cellval[9].innerHTML = basicval;
cellval[10].innerHTML = TotalTaxValue;
cellval[11].innerHTML = TotalOrderValue;
$('#materialCode' + userid).val(editMaterialCode);

8
app/Views/rawmaterialListing.php
View File

@ -315,7 +315,7 @@ $(document).ready(function () {
let result = JSON.parse(response);
if (result.length > 0) {
let tableHtml = `
<table class="table table-bordered">
<table class="table table-bordered" style="table-layout: auto; width: 100%;">
<thead style="background-color: #539754; color: white; font-size: 13px;">
<tr>
<th style="text-align: center;" > Date</th>
@ -337,12 +337,12 @@ $(document).ready(function () {
tableHtml += `
<tr>
<td>${CreatedDate}</td>
<td style="text-align: left; padding-left: 1.5%;">${CreatedDate}</td>
<td>${item.SupplierName}</td>
<td class="pono-cell" data-pono="${item.PONO}" data-potype="${item.POType}" data-capitalrange="${item.CapitalRange}" style="cursor: pointer; color: #4d3a6d;">
<td class="pono-cell" data-pono="${item.PONO}" data-potype="${item.POType}" data-capitalrange="${item.CapitalRange}" style="cursor: pointer; color: #02a8b5;" onmouseover="this.style.color='#016269';">
${item.PONO}
</td>
<td style="text-align: right;">${item.POType}</td>
<td style="text-align: left; padding-left: 1.5%;">${item.POType}</td>
<td style="text-align: right;">${TotalOrderValue}</td>
<td style="text-align: center;">
<a data-toggle="tooltip" href=${href} target="_blank">

32
app/Views/requisitionform.php
View File

@ -155,6 +155,7 @@ if (!empty($Emp)) {
<th class="th">Material Code</th>
<th class="th" style="text-align:left !important;">Material Name</th>
<th class="th" style="text-align:left !important;">Material Category</th>
<th class="th">HSN/SAC</th>
<th class="th" style="text-align:left !important;">Uom</th>
<th class="th" style="text-align:right !important;">Quantity</th>
<th class="th">Action</th>
@ -205,6 +206,7 @@ if (!empty($Emp)) {
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×</button>
</div>
<div class="modal-body p-4">
<div class="row">
<div class="col-md-12">
@ -215,7 +217,7 @@ if (!empty($Emp)) {
//print_r( $options);
if (!empty($MaterialList)) {
foreach ($MaterialList as $MID) :
$options[$MID->MaterialCode] = $MID->MaterialCode . ' ' . ' - ' . ' ' . $MID->MaterialName;
$options[$MID->MaterialCode] = $MID->HSNCODE . ' ' . ' - ' . ' ' . $MID->MaterialName.' ( '.$MID->MaterialCode.' )';
endforeach;
}
echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode" class="form-control searchabledropdown" ');
@ -299,9 +301,10 @@ if (!empty($Emp)) {
<div class="row">
<div class="col-md-12">
<div class="form-group">
<input type="hidden" name="EditMaterialCode" id="EditMaterialCode" />
<label for="EditMaterialCode" class="control-label">Material Code</label>
<?php
$data = array('value' => set_value('EditMaterialCode'), 'id' => 'EditMaterialCode', 'class' => 'form-control', 'readonly' => 'true');
$data = array('value' => set_value('EditMaterialType'), 'id' => 'EditMaterialType', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
@ -677,6 +680,11 @@ if (!empty($Emp)) {
var uom = $("#UOM").val();
var quantity = $("#Quantity").val();
var materialdescription = $('#otherD').val();
var selectedText = $('#MaterialCode option:selected').text();
var parts = selectedText.split('-');
var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim())
? parts[0].trim()
: '';
$('#MaterialCode option[value=' + materialCode + ']').remove();
@ -695,6 +703,7 @@ if (!empty($Emp)) {
<td align="center">${materialCode}</td>
<td align="left">${materialName}</td>
<td align="left">${categoryName}</td>
<td align="center">${HSN}</td>
<td align="left">${uom}</td>
<td align="right">${quantity}</td>
<td align="center">
@ -760,11 +769,14 @@ if (!empty($Emp)) {
var userid = $triggerElement.data('userid');
var $tr = $('#' + userid);
var $cells = $tr.find('td');
var HSN = $cells.eq(4).text()?$cells.eq(4).text()+'-':'';
var MaterialType = HSN+$cells.eq(2).text()+' ( '+$cells.eq(1).text()+ ' ) ';
$('#EditMaterialCode').val($cells.eq(1).text());
$('#EditMaterialType').val(MaterialType);
$('#EditDescription').val($cells.eq(2).text());
$('#EditCategory').val($cells.eq(3).text());
$('#EditUOM').val($cells.eq(4).text());
$('#EditQuantity').val($cells.eq(5).text());
$('#EditUOM').val($cells.eq(5).text());
$('#EditQuantity').val($cells.eq(6).text());
$('#Edituserid').val(userid);
});
});
@ -783,6 +795,13 @@ if (!empty($Emp)) {
var editMaterialCode = $("#EditMaterialCode").val();
var editDescription = $("#EditDescription").val();
var editCategory = $("#EditCategory").val();
var editMaterialType = $('#EditMaterialType').val();
var editparts = editMaterialType.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var editUOM = $('#EditUOM').val();
var editQuantity = $('#EditQuantity').val();
@ -791,8 +810,9 @@ if (!empty($Emp)) {
cells.eq(1).text(editMaterialCode);
cells.eq(2).text(editDescription);
cells.eq(3).text(editCategory);
cells.eq(4).text(editUOM);
cells.eq(5).text(editQuantity);
cells.eq(4).text(editHSN);
cells.eq(5).text(editUOM);
cells.eq(6).text(editQuantity);
$('#MaterialCode' + edituserid).val(editMaterialCode);
$('#Description' + edituserid).val(editDescription);

2
app/Views/requisitionlisting.php
View File

@ -170,7 +170,7 @@ if (!empty($Status)) {
<td align="center"> <?php echo $record->newLineItem ?></td>
<td align="center"><?php echo strtoupper($record->StatusName); ?></td>
<td align="left" style="padding-left: 3%;"><?php echo strtoupper($record->StatusName); ?></td>
<td> <a data-toggle="tooltip"
href="<?php echo base_url() . 'EditRequisitionForm?ReqNo=' . $record->ReqNo . '&ReqType=' . $record->ReqType; ?>"><i

46
app/Views/servicePurchaseorder.php
View File

@ -336,8 +336,8 @@ if (!empty($INRSYMBOL)) {
if (isAdded == "0") {
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#MaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
@ -686,6 +686,13 @@ if (!empty($INRSYMBOL)) {
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
var selectedText = $('#EditMaterialCode option:selected').text();
var editselectedText = $('#EditMaterialCode option:selected').text();
var editparts = editselectedText.split('-');
var editHSN = editselectedText.includes('-') && /^\d+$/.test(editparts[0].trim())
? editparts[0].trim()
: '';
var editDescription = $("#EditItemName").val();
var editUOM = $('#EditUOM').val();
var editPer = '';
@ -725,12 +732,13 @@ if (!empty($INRSYMBOL)) {
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
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);
cellval[4].innerHTML = editHSN;
cellval[6].innerHTML = editQuantity;
cellval[7].innerHTML = editUOM;
cellval[8].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[9].innerHTML = parseFloat(basicval).toFixed(2);
cellval[10].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[11].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode);
@ -1069,6 +1077,7 @@ if (!empty($INRSYMBOL)) {
<th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
<th style="white-space: nowrap !important;">Item Code</th>
<th style="white-space: nowrap !important;">Item Description</th>
<th style="white-space: nowrap !important;">HSN/SAC</th>
<th style="white-space: nowrap !important;">Line Item Specs</th>
<th style="white-space: nowrap !important; text-align:right !important">Quantity</th>
<th style="white-space: nowrap !important;">UOM</th>
@ -1824,7 +1833,7 @@ if (!empty($INRSYMBOL)) {
$('#EditQuantity').val($('#quantity' + userid).val());
RequistQuantity = $('#quantity' + userid).val();
$('#EditRate').val($('#itemRate' + userid).val());
$('#txtEditBasicValue').val(cellval[7].innerHTML);
$('#txtEditBasicValue').val(cellval[9].innerHTML);
$('#EditCgst').val($('#Cgst' + userid).val());
$('#EditAfterCgst').val($('#AfterCgst' + userid).val());
$('#EditSgst').val($('#Sgst' + userid).val());
@ -1842,7 +1851,7 @@ if (!empty($INRSYMBOL)) {
$("#EditFrequencyNo").val($('#FrequencyValue' + userid).val());
}
$('#EditTotalOrderValue').val(cellval[9].innerHTML);
$('#EditTotalOrderValue').val(cellval[11].innerHTML);
$('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
$('#EditOtheritemDescription').val($('#OtherServiceDescription' + userid).val());
@ -1863,7 +1872,12 @@ if (!empty($INRSYMBOL)) {
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
// For Binding Material list center for the selected Requistion Number
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var P0 = cellval[4].innerHTML;
var P1 = (P0) ? P0 + " - " : "";
var P2 = P1 + $('#materialName' + userid).val() ;
var P3 = P2 + " ( " + $('#materialCode' + userid).val() + ' ) ';
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html(P3));
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function(idx, obj) {
@ -1891,8 +1905,8 @@ if (!empty($INRSYMBOL)) {
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
var HSNCODE = obj.HSNCODE ? obj.HSNCODE+" - " : "";
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html( HSNCODE + obj.MaterialName+ " ( "+obj.MaterialCode+" ) "));
}
}
@ -1919,6 +1933,11 @@ if (!empty($INRSYMBOL)) {
var AvilBudget = $('#AvlBudAmt').val();
var costCode = $('#CostCenter').val();
var materialCode = $('#MaterialCode').val();
var selectedText = $('#MaterialCode option:selected').text();
var parts = selectedText.split('-');
var HSN = selectedText.includes('-') && /^\d+$/.test(parts[0].trim())
? parts[0].trim()
: '';
var materialName = $("#ItemName").val();
var uom = $("#UOM").val();
@ -1991,6 +2010,7 @@ if (!empty($INRSYMBOL)) {
<td style="text-align:center !important">${Reqnumber}</td>
<td>${materialCode}</td>
<td>${shorten}</td>
<td>${HSN}</td>
<td>
<a href="#" class="editable-field"
data-notes = "-" data-id ="${temp}">-</a>

8
app/Views/viewinwardgateregister.php
View File

@ -248,7 +248,7 @@
$time = $createddate->format('h:i A');
?>
<tr id="<?php echo $index ?>" >
<td align="center"><?php echo $date; ?></td>
<td align="left" style="padding-left: 0.4%"><?php echo $date; ?></td>
<td align="center"><?php echo $time; ?></td>
<td style="cursor:pointer; color:#0bb2b5" >
@ -267,7 +267,7 @@
</td>
<td><?php echo $record->SupplierName ?></td>
<td><?php echo $record->DeliveryChellanOrInvoiceNo ?></td>
<td align="right"><?php
<td align="left" style="padding-left: 0.4%"><?php
$invdate = $record->DeliveryChellanDate;
if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
echo "";
@ -497,6 +497,7 @@
<th style="width: 50px;">SNo</th>
<th style="width: 100px;">Item Code</th>
<th style="width: 150px;">Item Description</th>
<th style="width: 50px;">HSN/SAC</th>
<th style="width: 50px;">UOM</th>
<th style="width: 100px;">Ordered Qty</th>
<th style="width: 100px;">Received Qty</th>
@ -1253,6 +1254,7 @@
'<td style="width: 50px;" >' + i + '</td>' +
'<td style="width: 100px;" name="MaterialName" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
'<td style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
'<td style="width: 50px;" name="HSNCODE">' + ((item.HSNCODE) ? item.HSNCODE : '') + '</td>' +
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
'<td style="width: 100px;" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>' +
'<td style="width: 100px;" data-name="sel" ><input type="text" onchange="validateReceivedQuantity(' + i + ',' + isOpenOrder + ')"id="QuantityAsPerInvoice' + i + '" name="QuantityAsPerInvoice' + i + '" value="' + parseInt(item.QuantityAsPerInvoice) + '" onkeypress="return isNumberKey(event);" style="width: 75px;"></td>' +
@ -1307,6 +1309,7 @@
'<td style="width: 50px;" >' + i + '</td>' +
'<td style="width: 100px;" name="MaterialName" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
'<td style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
'<td style="width: 50px;" name="HSNCODE">' + ((item.HSNCODE) ? item.HSNCODE : '') + '</td>' +
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
'<td style="width: 100px;" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>';
if (userRole == 5) { // 5 - lab staff
@ -1367,6 +1370,7 @@
'<td style="width: 50px;" >' + i + '</td>' +
'<td style="width: 100px;" name="MaterialName" id="MaterialCode" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
'<td style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
'<td style="width: 50px;" name="HSNCODE">' + ((item.HSNCODE) ?item.HSNCODE : '') + '</td>' +
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
'<td style="width: 100px;" name="Quantity">' + item.Quantity + '</td>' ;
if (userRole == 5) { // 5 - lab staff