Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme
This commit is contained in:
bitbucket
commit
6211f22766
@ -122,7 +122,7 @@ class Emergencypurchaseorder extends BaseController
|
||||
//This used to Create Service Purchase Order
|
||||
function addNewServicePurchaseOrder()
|
||||
{
|
||||
|
||||
// print_r($this->request->getPost());die;
|
||||
$txtRowCount = $this->request->getPost('txtRowCount');
|
||||
$POdt = $this->request->getPost('PODate');
|
||||
$PODate = get_date_time_format($POdt);
|
||||
@ -130,7 +130,7 @@ class Emergencypurchaseorder extends BaseController
|
||||
$DeliveryAddr = $this->request->getPost('DeliveryAddr');
|
||||
$CostCenterName = $this->request->getPost('CostCenterName');
|
||||
$DeliveryOption = $this->request->getPost('DateRange');
|
||||
$DeliverySchedule = '';
|
||||
$DeliverySchedule = $this->request->getPost('Scheduleby');
|
||||
$Deliverydt = get_date_time_format($POdt);
|
||||
|
||||
$txtsplservice = $this->request->getPost('txtSpecialservice');
|
||||
@ -141,9 +141,9 @@ class Emergencypurchaseorder extends BaseController
|
||||
|
||||
$SpcialInstruction = $this->request->getPost('ScopeOfWork');
|
||||
$RequistionComments = "Created Emergency Service PO";
|
||||
// $TotalOrderValueSummary = $this->request->getPost('TextTotalOrderValueSummaryService');
|
||||
$TotalOrderValueSummary = $this->request->getPost('TextTotalOrderValueSummaryService');
|
||||
|
||||
$TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummaryService');
|
||||
// $TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummaryService');
|
||||
|
||||
//$POStatus = $this->request->getPost('TextStatus');
|
||||
$CreateBy = $this->session->get('userId');
|
||||
@ -161,7 +161,7 @@ class Emergencypurchaseorder extends BaseController
|
||||
|
||||
$comma_separated = explode(':', (string)$DeletedRow);
|
||||
|
||||
$BudgetType = $this->request->getPost('Budget');
|
||||
$BudgetType = $this->request->getPost('BudgetType');
|
||||
|
||||
$createddt = get_current_date_time();
|
||||
//$PaymentTerms=$this->request->getPost('PaymentMethod');
|
||||
@ -209,6 +209,7 @@ class Emergencypurchaseorder extends BaseController
|
||||
// PO Master
|
||||
$POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'ServiceWorkStatus' => $ServiceWorkStatus, 'POType' => $POType, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder);
|
||||
$file = $this->request->getFile('POFile');
|
||||
if($file !== null){
|
||||
$requestfilename = $file->getName();
|
||||
if (!empty($requestfilename)) {
|
||||
|
||||
@ -228,7 +229,7 @@ class Emergencypurchaseorder extends BaseController
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
$POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $ServiceTypeOptions);
|
||||
$PONO = $POMaster ? $newPONO : "";
|
||||
// if (count($POMaster) > 0) {
|
||||
@ -239,7 +240,6 @@ class Emergencypurchaseorder extends BaseController
|
||||
|
||||
// PO Line Items
|
||||
$LineItemStatus = REQITEM_NEW;
|
||||
|
||||
for ($i = 1; $i <= $RowCount; $i++) {
|
||||
$Per = $this->request->getPost('Serviceper' . $i);
|
||||
$MaterialCode = $this->request->getPost('materialCode' . $i);
|
||||
@ -376,7 +376,8 @@ class Emergencypurchaseorder extends BaseController
|
||||
} else {
|
||||
$this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO);
|
||||
}
|
||||
return redirect()->route('purchaseorderListing');
|
||||
return true;
|
||||
// return redirect()->route('purchaseorderListing');
|
||||
}
|
||||
|
||||
|
||||
@ -385,7 +386,7 @@ class Emergencypurchaseorder extends BaseController
|
||||
function addNewRevenuePurchaseOrder()
|
||||
{
|
||||
|
||||
|
||||
print_r($this->request->getPost());die;
|
||||
$txtspl = $this->request->getPost('txtSpecial');
|
||||
|
||||
|
||||
@ -421,7 +422,7 @@ class Emergencypurchaseorder extends BaseController
|
||||
|
||||
$SpcialInstruction = $this->request->getPost('txtSpcialInstruction');
|
||||
$RequistionComments = "Created Emergency Revenue PO";
|
||||
$TotalOrderValueSummary = $this->request->getPost('txtTotalOrderValueSummary');
|
||||
$TotalOrderValueSummary = $this->request->getPost('TextTotalOrderValueSummaryService');
|
||||
|
||||
if ($txtspl == 0) {
|
||||
$POStatus = REQITEM_Emergency_PO_CREATED;
|
||||
@ -436,7 +437,7 @@ class Emergencypurchaseorder extends BaseController
|
||||
|
||||
$RowCount = $this->request->getPost('txtRowCount1');
|
||||
|
||||
$BudgetType = $this->request->getPost('Budget');
|
||||
$BudgetType = $this->request->getPost('BudgetType');
|
||||
|
||||
//echo $RowCount;
|
||||
// $DeletedRow = $this->request->getPost('TextDeletedRowCount');
|
||||
@ -483,24 +484,29 @@ class Emergencypurchaseorder extends BaseController
|
||||
$newPONO = generate_po_number($lastPONO);
|
||||
$POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'PORange' => $Local_Interstate, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'CapitalRange' => $Local_Interstate, 'PaymentOtherDescription' => $OtherPayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Offer_No' => $supplieroffno, 'Supplier_Reference' => $supplierreference, 'Other_Reference' => $otherreference, 'InsuranceNumber' => $InsuranceNumber, 'InsuranceStatus' => $insurancestatus, 'Fincap' => $fincap, 'POSubType' => $revenuetype, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder);
|
||||
$file = $this->request->getFile('POFiles');
|
||||
$requestfilename = $file->getName();
|
||||
if (!empty($requestfilename)) {
|
||||
|
||||
if ($file->isValid() && !$file->hasMoved()) {
|
||||
$path = ROOTPATH.'public/uploads/POfiles/';
|
||||
if(!is_dir($path)) { mkdir($path, 0777, true); }
|
||||
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
|
||||
log_message('error', 'File already exists in the database'.$requestfilename);
|
||||
$POList['POFile'] = NULL;
|
||||
if($file !== null){
|
||||
$requestfilename = $file->getName();
|
||||
if (!empty($requestfilename)) {
|
||||
|
||||
if ($file->isValid() && !$file->hasMoved()) {
|
||||
$path = ROOTPATH.'public/uploads/POfiles/';
|
||||
if(!is_dir($path)) { mkdir($path, 0777, true); }
|
||||
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
|
||||
log_message('error', 'File already exists in the database'.$requestfilename);
|
||||
$POList['POFile'] = NULL;
|
||||
}else{
|
||||
$file->move($path, $requestfilename);
|
||||
$POList['POFile'] = $requestfilename;
|
||||
}
|
||||
}else{
|
||||
$file->move($path, $requestfilename);
|
||||
$POList['POFile'] = $requestfilename;
|
||||
$POList['POFile'] = NULL;
|
||||
}
|
||||
}else{
|
||||
$POList['POFile'] = NULL;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}else{
|
||||
|
||||
}
|
||||
// print_r($POList);die;
|
||||
$POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $revenuetype);
|
||||
$PONO = $POMaster ? $newPONO : "";
|
||||
// $PONO = '';
|
||||
@ -862,7 +868,8 @@ class Emergencypurchaseorder extends BaseController
|
||||
|
||||
|
||||
$this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO);
|
||||
return redirect()->route('purchaseorderListing');
|
||||
// return redirect()->route('purchaseorderListing');
|
||||
return json_encode("111111111");
|
||||
|
||||
// echo "<script>alert('You Have Successfully created the Purchase order! $PONO');</script>";
|
||||
// redirect('purchaseorder/PurchaseOrderList', 'refresh');
|
||||
|
||||
@ -114,7 +114,8 @@ class Purchaseorder extends BaseController
|
||||
$this->purchaseorder_model->UpdateRequistionStatus();
|
||||
|
||||
$data['POData'] = $this->purchaseorder_model->purchaseorderListing();
|
||||
|
||||
// echo "<pre>";
|
||||
// print_r($data['POData']);die;
|
||||
$this->global['pageTitle'] = 'Purchase Orders';
|
||||
|
||||
|
||||
|
||||
@ -788,6 +788,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
|
||||
*/
|
||||
function addPOMaster($POMaster, $POType, $revenuetype)
|
||||
{
|
||||
// print_r($POMaster);die;
|
||||
try {
|
||||
$this->db->transStart();
|
||||
$builder = $this->db->table('t_purchaseorder_master');
|
||||
|
||||
@ -869,7 +869,7 @@ if (!empty($getlogpodtl)) {
|
||||
<label>Delivery Date<span class="text-danger">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type'=>'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -1497,7 +1497,7 @@ if (!empty($getlogpodtl)) {
|
||||
<!-- Model for servicepo -->
|
||||
<div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Add Service Purchase Order Item</h4>
|
||||
@ -1740,7 +1740,7 @@ if (!empty($getlogpodtl)) {
|
||||
<!-- Service Special PO Modal Starts Here -->
|
||||
<div id="EditServiceSplPOModel" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Update Bill <span id="bill"><span> Details</h4>
|
||||
@ -1775,7 +1775,7 @@ if (!empty($getlogpodtl)) {
|
||||
<!-- Edit Service Modal content Starts Here-->
|
||||
<div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Edit Service Purchase Order Item</h4>
|
||||
@ -2038,7 +2038,7 @@ if (!empty($getlogpodtl)) {
|
||||
<!-- View Service Modal content Starts Here-->
|
||||
<div id="VIEWSERVICE" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">View Service Purchase Order Item</h4>
|
||||
@ -2319,7 +2319,7 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
|
||||
|
||||
<script type="text/html" id="ServiceList">
|
||||
<!-- <script type="text/html" id="ServiceList">
|
||||
<tr id="<%=index%>">
|
||||
<td align="left"><%=index%></td>
|
||||
<td align="left"><%=ReqNo%></td>
|
||||
@ -2335,7 +2335,7 @@ if (!empty($getlogpodtl)) {
|
||||
<a data-target='#EDITSERVICE' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#EDITSERVICE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the <%=ReqNo%> Requisition details"></i> </a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
|
||||
</td>
|
||||
</tr>
|
||||
</script>
|
||||
</script> -->
|
||||
<script>
|
||||
var index = <?php echo $index; ?>;
|
||||
var userid = '';
|
||||
@ -2421,21 +2421,48 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
index = parseInt(index) + 1;
|
||||
|
||||
var template = jQuery("#ServiceList").html();
|
||||
// var template = jQuery("#ServiceList").html();
|
||||
|
||||
|
||||
$('#ServiceAppend').append(_.template(template, {
|
||||
index: temp,
|
||||
ReqNo: Reqnumber,
|
||||
MaterialCode: materialCode,
|
||||
MaterialName: materialName,
|
||||
Quantity: quantity,
|
||||
UOM: uom,
|
||||
Rate: itemRate,
|
||||
BasicAmount: basicval,
|
||||
Taxvalue: TotalTaxValue,
|
||||
TotalValue: TotalOrderValue
|
||||
}));
|
||||
// $('#ServiceAppend').append(_.template(template, {
|
||||
// index: temp,
|
||||
// ReqNo: Reqnumber,
|
||||
// MaterialCode: materialCode,
|
||||
// MaterialName: materialName,
|
||||
// Quantity: quantity,
|
||||
// UOM: uom,
|
||||
// Rate: itemRate,
|
||||
// BasicAmount: basicval,
|
||||
// Taxvalue: TotalTaxValue,
|
||||
// TotalValue: TotalOrderValue
|
||||
// }));
|
||||
var rowHtml = `
|
||||
<tr id="${temp}">
|
||||
<td align="left">${temp}</td>
|
||||
<td align="left">${Reqnumber}</td>
|
||||
<td align="left">${materialCode}</td>
|
||||
<td align="left">${materialName}</td>
|
||||
<td align="left">${quantity}</td>
|
||||
<td align="left">${uom}</td>
|
||||
<td align="left">${itemRate}</td>
|
||||
<td align="left">${basicval}</td>
|
||||
<td align="left">${TotalTaxValue}</td>
|
||||
<td align="left">${TotalOrderValue}</td>
|
||||
<td>
|
||||
<a data-target='#EDITSERVICE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITSERVICE">
|
||||
<i class="ri-pencil-fill" data-toggle="tooltip" ></i>
|
||||
</a>
|
||||
|
||||
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
|
||||
<span class="ri-delete-bin-7-fill"></span>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
`;
|
||||
|
||||
// Append the generated HTML to your table body
|
||||
$('#ServiceAppend').append(rowHtml);
|
||||
|
||||
|
||||
|
||||
|
||||
@ -3195,6 +3222,7 @@ if (!empty($getlogpodtl)) {
|
||||
id = '';
|
||||
|
||||
});
|
||||
$(document).ready(function() {
|
||||
$("#EDITSERVICE").on("shown.bs.modal", function(e) {
|
||||
|
||||
|
||||
@ -3393,7 +3421,7 @@ if (!empty($getlogpodtl)) {
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
});});
|
||||
$("#insuranceStatus").change(function() {
|
||||
var InsNo = '<?php echo $InsuranceNumber; ?>';
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -134,29 +134,29 @@
|
||||
$("#MaterialCode").select2();
|
||||
$("#currencytype").select2();
|
||||
|
||||
$("#PODate").datepicker({
|
||||
//minDate : d,
|
||||
maxDate: 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '-100:+0'
|
||||
});
|
||||
$("#Deliverydt").datepicker({
|
||||
minDate: 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '0:+10'
|
||||
});
|
||||
$("#Exchangerateon").datepicker({
|
||||
//minDate : d,
|
||||
maxDate: 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '-100:+0'
|
||||
});
|
||||
// $("#PODate").datepicker({
|
||||
// //minDate : d,
|
||||
// maxDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '-100:+0'
|
||||
// });
|
||||
// $("#Deliverydt").datepicker({
|
||||
// minDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '0:+10'
|
||||
// });
|
||||
// $("#Exchangerateon").datepicker({
|
||||
// //minDate : d,
|
||||
// maxDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '-100:+0'
|
||||
// });
|
||||
$('#Date').click(function() {
|
||||
|
||||
//for Dispatch range selection
|
||||
@ -395,7 +395,7 @@
|
||||
<label>Delivery Date<span class="text-danger">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type'=>'date','name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -452,7 +452,7 @@
|
||||
<label>Purchase Order Date</label>
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'PODate', 'value' => set_value('PODate', $CurrentDate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type'=>"date",'name' => 'PODate', 'value' => set_value('PODate', $CurrentDate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
|
||||
@ -372,29 +372,29 @@
|
||||
$("#MaterialCode").select2();
|
||||
$("#currencytype").select2();
|
||||
|
||||
$("#PODate").datepicker({
|
||||
//minDate : d,
|
||||
maxDate: 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '-100:+0'
|
||||
});
|
||||
$("#Deliverydate").datepicker({
|
||||
minDate: 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '0:+10'
|
||||
});
|
||||
// $("#PODate").datepicker({
|
||||
// //minDate : d,
|
||||
// maxDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '-100:+0'
|
||||
// });
|
||||
// $("#Deliverydate").datepicker({
|
||||
// minDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '0:+10'
|
||||
// });
|
||||
|
||||
$("#Exchangerateon").datepicker({
|
||||
minDate: 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '0:+10'
|
||||
});
|
||||
// $("#Exchangerateon").datepicker({
|
||||
// minDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '0:+10'
|
||||
// });
|
||||
$('#Date').click(function() {
|
||||
//for Date range selection
|
||||
$('#Schedulediv').hide();
|
||||
@ -575,7 +575,7 @@
|
||||
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Deliverydate', 'value' => set_value('Deliverydate', $Deliverydt), 'id' => 'Deliverydate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type'=>'date','name' => 'Deliverydate', 'value' => set_value('Deliverydate', $Deliverydt), 'id' => 'Deliverydate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -613,7 +613,7 @@
|
||||
<label>Exchange Rate On</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type'=>'date','name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -647,7 +647,7 @@
|
||||
<label>Purchase Order Date</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type'=>'date','name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -857,9 +857,12 @@
|
||||
</div>
|
||||
<br>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
|
||||
<thead>
|
||||
<div class="form-row">
|
||||
<div class="table-responsive">
|
||||
<table id="serviceTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
|
||||
<thead>
|
||||
|
||||
|
||||
<tr>
|
||||
<th>SNo</th>
|
||||
<th>Requisition No</th>
|
||||
@ -1213,6 +1216,7 @@
|
||||
?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-fluid">
|
||||
<table class="table table-bordered" style="border:1px solid #333">
|
||||
@ -2252,7 +2256,7 @@
|
||||
</div> <!-- content -->
|
||||
</div>
|
||||
<script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script>
|
||||
<script type="text/html" id="CapitalList">
|
||||
<!-- <script type="text/html" id="CapitalList">
|
||||
<tr id="<%=index%>">
|
||||
<td align="left"><%=index%></td>
|
||||
<td align="left"><%=ReqNo%></td>
|
||||
@ -2271,7 +2275,7 @@
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</script>
|
||||
</script> -->
|
||||
<script>
|
||||
var RequistQuantity = '';
|
||||
var AvilBudAmt = '';
|
||||
|
||||
@ -382,41 +382,41 @@
|
||||
$("#MaterialCode").select2();
|
||||
$("#currencytype").select2();
|
||||
|
||||
$("#PODate").datepicker({
|
||||
//minDate : d,
|
||||
// maxDate : 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true
|
||||
}); //,yearRange: '-100:+0'
|
||||
$("#Deliverydt").datepicker({
|
||||
minDate: 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '0:+10'
|
||||
});
|
||||
$("#Exchangerateon").datepicker({
|
||||
//minDate : d,
|
||||
maxDate: 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '-100:+0'
|
||||
});
|
||||
// $("#PODate").datepicker({
|
||||
// //minDate : d,
|
||||
// // maxDate : 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true
|
||||
// }); //,yearRange: '-100:+0'
|
||||
// $("#Deliverydt").datepicker({
|
||||
// minDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '0:+10'
|
||||
// });
|
||||
// $("#Exchangerateon").datepicker({
|
||||
// //minDate : d,
|
||||
// maxDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '-100:+0'
|
||||
// });
|
||||
$('#Date').click(function() {
|
||||
//for Dispatch range selection
|
||||
$('#Schedulediv').hide();
|
||||
$('#Deliverydtdiv').show();
|
||||
$('#deliverydateby').hide();
|
||||
});
|
||||
$("#Deliverydate").datepicker({
|
||||
minDate: 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '0:+10'
|
||||
});
|
||||
// $("#Deliverydate").datepicker({
|
||||
// minDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '0:+10'
|
||||
// });
|
||||
|
||||
$('#Schedule').click(function() {
|
||||
//for schedule range selection
|
||||
@ -578,7 +578,7 @@
|
||||
<label>Delivery Date<span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type'=>'date','name' => 'Deliverydate', 'value' => set_value('Deliverydate', $CurrentDate), 'id' => 'Deliverydate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -614,7 +614,7 @@
|
||||
<label>Exchange Rate On</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type'=>'date','name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -649,7 +649,7 @@
|
||||
<label>PO Date</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type'=>'date','name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
echo form_input($data);
|
||||
?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
|
||||
</div>
|
||||
@ -3806,7 +3806,7 @@
|
||||
</div> <!-- content -->
|
||||
</div>
|
||||
<script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script>
|
||||
<script type="text/html" id="CapitalList">
|
||||
<!-- <script type="text/html" id="CapitalList">
|
||||
<tr id="<%=index%>">
|
||||
<td align="left"><%=index%></td>
|
||||
<td align="left"><%=ReqNo%></td>
|
||||
@ -3827,7 +3827,7 @@
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</script>
|
||||
</script> -->
|
||||
<script>
|
||||
var RequistQuantity = '';
|
||||
var AvilBudAmt = '';
|
||||
@ -3868,21 +3868,21 @@
|
||||
|
||||
$(function() {
|
||||
|
||||
$("#PODate").datepicker({
|
||||
minDate: d,
|
||||
maxDate: 'now',
|
||||
dateFormat: 'mm/dd/yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '-100:+0'
|
||||
});
|
||||
$("#Deliverydt").datepicker({
|
||||
minDate: 'now',
|
||||
dateFormat: 'mm/dd/yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '0:+10'
|
||||
});
|
||||
// $("#PODate").datepicker({
|
||||
// minDate: d,
|
||||
// maxDate: 'now',
|
||||
// dateFormat: 'mm/dd/yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '-100:+0'
|
||||
// });
|
||||
// $("#Deliverydt").datepicker({
|
||||
// minDate: 'now',
|
||||
// dateFormat: 'mm/dd/yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '0:+10'
|
||||
// });
|
||||
|
||||
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
|
||||
//alert(capital);
|
||||
@ -4880,24 +4880,52 @@
|
||||
|
||||
index = parseInt(index) + 1;
|
||||
|
||||
var template = jQuery("#CapitalList").html();
|
||||
// var template = jQuery("#CapitalList").html();
|
||||
|
||||
|
||||
$('#capitalAppend').append(_.template(template, {
|
||||
index: temp,
|
||||
ReqNo: Reqnumber,
|
||||
MaterialCode: materialCode,
|
||||
MaterialName: materialName,
|
||||
Quantity: quantity,
|
||||
UOM: uom,
|
||||
Rate: itemRate,
|
||||
BasicAmount: basicval,
|
||||
Taxvalue: TotalTaxValue,
|
||||
TotalValue: Total,
|
||||
ActualQuantity: quantity,
|
||||
ReceivedQuantity: 0,
|
||||
PendingQuantity: quantity
|
||||
}));
|
||||
// $('#capitalAppend').append(_.template(template, {
|
||||
// index: temp,
|
||||
// ReqNo: Reqnumber,
|
||||
// MaterialCode: materialCode,
|
||||
// MaterialName: materialName,
|
||||
// Quantity: quantity,
|
||||
// UOM: uom,
|
||||
// Rate: itemRate,
|
||||
// BasicAmount: basicval,
|
||||
// Taxvalue: TotalTaxValue,
|
||||
// TotalValue: Total,
|
||||
// ActualQuantity: quantity,
|
||||
// ReceivedQuantity: 0,
|
||||
// PendingQuantity: quantity
|
||||
// }));
|
||||
var rowHtml = `
|
||||
<tr id="${temp}">
|
||||
<td align="left">${temp}</td>
|
||||
<td align="left">${Reqnumber}</td>
|
||||
<td align="left">${materialCode}</td>
|
||||
<td align="left">${materialName}</td>
|
||||
<td align="left">${quantity}</td>
|
||||
<td align="left">${uom}</td>
|
||||
<td align="left">${itemRate}</td>
|
||||
<td align="left">${basicval}</td>
|
||||
<td align="left">${TotalTaxValue}</td>
|
||||
<td align="left">${Total}</td>
|
||||
<td align="left">${quantity}</td>
|
||||
<td align="left">0</td>
|
||||
<td align="left">${quantity}</td>
|
||||
<td>
|
||||
<a data-target='#EDITCAPITAL' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
|
||||
<i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i>
|
||||
</a>
|
||||
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
|
||||
<span class="glyphicon glyphicon-trash"></span>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
`;
|
||||
|
||||
// Append the generated row HTML to the target element
|
||||
$('#capitalAppend').append(rowHtml);
|
||||
|
||||
|
||||
var theForm = $(".CapitalPO");
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -965,7 +965,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Supplier Address</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress', 'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
|
||||
echo Form_textarea($data);
|
||||
@ -998,9 +998,9 @@ if (!empty($INRSYMBOL)) {
|
||||
?>
|
||||
<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt; ?>">
|
||||
<label>Delivery Date<span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type' => 'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;','min' => date('d-m-Y'),);
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -1015,7 +1015,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Delivery Address</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'DeliveryAddr', 'value' => set_value('DeliveryAddr', $DeliveryAddress), 'id' => 'DeliveryAddr', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'readonly' => 'true');
|
||||
echo Form_textarea($data);
|
||||
@ -1033,7 +1033,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Mode Of Shipment</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'addmodeofshipment', 'value' => set_value('addmodeofshipment', $modeofshipment), 'id' => 'addmodeofshipment', 'class' => 'form-control', 'readonly' => 'readonly');
|
||||
@ -1046,7 +1046,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Contact Reference</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'amendsupplierreference', 'value' => set_value('amendsupplierreference', $supplierref), 'id' => 'amendsupplierreference', 'class' => 'form-control', 'readonly' => 'readonly', 'maxlength' => '40');
|
||||
@ -1056,7 +1056,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Supplier's Offer No</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'amendsupplierofferno', 'value' => set_value('amendsupplierofferno', $suppofferno), 'id' => 'amendsupplierofferno', 'class' => 'form-control', 'readonly' => 'readonly');
|
||||
@ -1069,7 +1069,7 @@ if (!empty($INRSYMBOL)) {
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Other Reference(S)</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'amendotherreference', 'value' => set_value('amendotherreference', $otherref), 'id' => 'amendotherreference', 'class' => 'form-control', 'readonly' => 'readonly');
|
||||
@ -1079,7 +1079,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Revenue Type Options<span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
|
||||
<?php
|
||||
|
||||
@ -1153,7 +1153,6 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-3">
|
||||
<label for="insurance">Insurance<span class="text-danger">*</span></label>
|
||||
<?php
|
||||
@ -1163,7 +1162,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-3" id="InsuranceNumberdiv" style="display:block;">
|
||||
<label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber', $insurenceno), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
@ -1190,8 +1189,8 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<div class="form-row">
|
||||
<div class="table-responsive">
|
||||
<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
|
||||
@ -1290,7 +1289,7 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
|
||||
|
||||
<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to Amend the <?php echo $record->ReqNo; ?> Requisition details"></i></a>
|
||||
<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="ri-pencil-fill" data-toggle="tooltip"></i></a>
|
||||
|
||||
<!-- <td> <a data-toggle="tooltip" href="#"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="<?php //echo $record->ReqNo;
|
||||
?> - Click here to view Requistion details"></i> </a> </td> -->
|
||||
@ -1445,12 +1444,13 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
|
||||
$Reqon = $Reqon->format('d-m-Y'); ?>
|
||||
<label>Request On :</label><?php echo $Reqon; ?><br>
|
||||
<?php if ($RequesterName != '' || $RequesterName != null) { ?>
|
||||
<label>Request By : </label><?php echo $RequesterName; ?>
|
||||
<?php } ?><br />
|
||||
<label>Request By : </label><?php echo $RequesterName; ?><br />
|
||||
<?php } ?>
|
||||
<label>Status : </label><?php
|
||||
$statusMappings = [
|
||||
'PO APPROVED' => 'AWAITING APPROVE',
|
||||
@ -1469,6 +1469,7 @@ if (!empty($INRSYMBOL)) {
|
||||
echo "Status not provided";
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div> <!-- end card body-->
|
||||
@ -1499,7 +1500,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
|
||||
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
|
||||
<a class="btn btn-success" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;"> <span class="bold">Ok</span></a>
|
||||
</div>
|
||||
</div>
|
||||
@ -1534,7 +1535,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div><!-- /.modal -->
|
||||
<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
|
||||
@ -1560,7 +1561,7 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<label>Department Name</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName', 'class' => 'form-control', 'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
@ -1569,7 +1570,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Cost Center Code</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter', 'class' => 'form-control', 'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
@ -1579,7 +1580,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Avl Bud Amt</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
@ -1605,26 +1606,25 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
<div class="form-group col-md-2">
|
||||
<label>Item Name</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName', 'class' => 'form-control', 'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<div class="form-group col-md-1">
|
||||
<label>UOM</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM', 'class' => 'form-control', 'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-6" style="padding:0px;">
|
||||
<div class="form-group col-md-3">
|
||||
<div class="form-group col-md-2">
|
||||
<label>Quantity<span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
@ -1632,37 +1632,36 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<div class="form-group col-md-2">
|
||||
<label>Rate <?php echo "($INRSYM)" ?><span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<div class="form-group col-md-1">
|
||||
<label>Per</label> <?php
|
||||
$data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer', 'class' => 'form-control');
|
||||
echo form_input($data); ?>
|
||||
</div>
|
||||
<div class="form-group col-md-3" style="padding-left: 0px;">
|
||||
<div class="form-group col-md-2" style="padding-left: 0px;">
|
||||
<label>Basic Amt <?php echo "($INRSYM)" ?></label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-4"></div>
|
||||
<div class="form-group col-md-4">
|
||||
<label>Discount Type </label>
|
||||
<div>
|
||||
|
||||
<?php
|
||||
$options = array("0" => 'Select Discount Type');
|
||||
//print_r( $options);
|
||||
@ -1679,25 +1678,24 @@ if (!empty($INRSYMBOL)) {
|
||||
echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"');
|
||||
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>Discount Rate </label>
|
||||
<div class="form-group">
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount();', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
|
||||
<div class="form-group">
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
@ -1725,7 +1723,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-2" id="EditTripsValue" style="display:none;">
|
||||
<label>NO Of Trips</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight();');
|
||||
echo form_input($data);
|
||||
@ -1734,7 +1732,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>Freight Rate </label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight();', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
@ -1743,7 +1741,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>Freight Amt <?php echo "($INRSYM)" ?></label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
@ -1776,7 +1774,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>Packaging Rate </label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'txtEditPackaging', 'value' => set_value('txtEditPackaging'), 'id' => 'txtEditPackaging', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging();', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
@ -1785,63 +1783,54 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'txtEditAfterPackaging', 'value' => set_value('txtEditAfterPackaging'), 'id' => 'txtEditAfterPackaging', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row" id="CGSTArea">
|
||||
<div class="form-group col-md-8"></div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>CGST in %</label>
|
||||
<div class="form-group">
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'txtEditGST', 'value' => set_value('txtEditGST'), 'id' => 'txtEditGST', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(1);', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>CGST Amt <?php echo "($INRSYM)" ?></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'txtEditAfterGST', 'value' => set_value('txtEditAfterGST'), 'id' => 'txtEditAfterGST', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row" id="SGSTModel">
|
||||
<div class="form-group col-md-8"></div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>SGST in %</label>
|
||||
<div class="form-group">
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'txtEditVat', 'value' => set_value('txtEditVat'), 'id' => 'txtEditVat', 'class' => 'form-control num', 'onchange' => 'calculateVat();', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>SGST Amt <?php echo "($INRSYM)" ?></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'txtEditAfterVat', 'value' => set_value('txtEditAfterVat'), 'id' => 'txtEditAfterVat', 'class' => 'form-control num', 'readonly' => 'true', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row" id="IGSTModel" style="display:none;">
|
||||
<div class="form-group col-md-8"></div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>IGST in %</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
@ -1850,7 +1839,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>IGST Amt <?php echo "($INRSYM)" ?></label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
@ -1865,7 +1854,7 @@ if (!empty($INRSYMBOL)) {
|
||||
<div class="form-group col-md-8"></div>
|
||||
<div class="form-group col-md-4">
|
||||
<label> Insurance Amt <?php echo "($INRSYM)" ?>(if Any)</label>
|
||||
<div class="form-group">
|
||||
<div>
|
||||
<?php
|
||||
$data = array('name' => 'txtEditInsurance', 'value' => set_value('txtEditInsurance'), 'id' => 'txtEditInsurance', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateEditTotalValue(1);', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
@ -1874,21 +1863,18 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
|
||||
<div class="col-md-4 col-md-offset-8">
|
||||
<div class="form-group col-md-12">
|
||||
<label>Total Order Amt <?php echo "($INRSYM)" ?></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'txtEditTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
|
||||
<label><?php echo "Revenue Description"; ?></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100');
|
||||
echo form_textarea($data);;
|
||||
@ -2027,6 +2013,7 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
|
||||
$("#EDITREVENUE").on("shown.bs.modal", function(e) {
|
||||
|
||||
var AvlBudAmt = '<?php echo $AvlAmount ?>';
|
||||
|
||||
AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
|
||||
|
||||
@ -1958,7 +1958,7 @@ if (!empty($getlogpodtl)) {
|
||||
<label>Delivery Date<span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type' => 'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
|
||||
@ -1986,7 +1986,7 @@ if (!empty($getlogpodtl)) {
|
||||
<label>Purchase Order Date</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type'=>'date','name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
echo form_input($data);
|
||||
?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
|
||||
</div>
|
||||
@ -2136,27 +2136,23 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div align="right">
|
||||
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
|
||||
|
||||
<div align="form-group col-md-12" align="right">
|
||||
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
|
||||
<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
|
||||
<div class="form-group col-md-3 col-md-offset-7" align="right" style="padding:5px">
|
||||
<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
|
||||
</div>
|
||||
<?php } else { ?>
|
||||
<div class="form-group col-md-3 col-md-offset-7" align="right" style="padding:5px">
|
||||
</div>
|
||||
<?php } ?>
|
||||
<div class="form-group" align="right">
|
||||
|
||||
<?php } ?>
|
||||
<!-- <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a> -->
|
||||
<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-primary" id="abcd">Select Line Item</button> </a>
|
||||
</div>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<div class="form-row">
|
||||
<table id="revenueTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
|
||||
<thead style="background-color: #ddd;">
|
||||
<div class="table-responsive">
|
||||
<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
|
||||
<thead>
|
||||
|
||||
<tr>
|
||||
<th>SNo</th>
|
||||
<th>Requisition No</th>
|
||||
@ -2236,7 +2232,9 @@ if (!empty($getlogpodtl)) {
|
||||
<?php
|
||||
|
||||
if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
|
||||
<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->ReqNo; ?> Requisition details"></i> </a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
|
||||
<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fas fa-pencil-alt" data-toggle="tooltip" ></i></a>
|
||||
|
||||
<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
|
||||
<?php
|
||||
} else { ?>
|
||||
<td> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the <?php echo $record->ReqNo; ?> Requisition details"></i> </a> </td>
|
||||
@ -2264,7 +2262,7 @@ if (!empty($getlogpodtl)) {
|
||||
}
|
||||
?>
|
||||
</tbody>
|
||||
</table>
|
||||
</table><br></div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-3">
|
||||
@ -2618,7 +2616,7 @@ if (!empty($getlogpodtl)) {
|
||||
<!-- Add Model for revenue po -->
|
||||
<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
|
||||
@ -2963,7 +2961,7 @@ if (!empty($getlogpodtl)) {
|
||||
<!-- Edit Model for revenue po -->
|
||||
<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
|
||||
@ -3328,7 +3326,7 @@ if (!empty($getlogpodtl)) {
|
||||
<!-- View Model for revenue po -->
|
||||
<div id="VIEWREVENUE" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">View Revenue Purchase Order Line Item</h4>
|
||||
@ -3850,7 +3848,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div><!-- /.modal -->
|
||||
<!-- Revenue Special PO Modal Ends Here -->
|
||||
<script type="text/html" id="RevenueList">
|
||||
<!-- <script type="text/html" id="RevenueList">
|
||||
<tr id="<%=index%>">
|
||||
<td align="left"><%=index%></td>
|
||||
<td align="left"><%=ReqNo%></td>
|
||||
@ -3870,7 +3868,7 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</tr> -->
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
@ -3974,26 +3972,57 @@ if (!empty($getlogpodtl)) {
|
||||
});
|
||||
index = parseInt(index) + 1;
|
||||
|
||||
var template = jQuery("#RevenueList").html();
|
||||
// var template = jQuery("#RevenueList").html();
|
||||
|
||||
|
||||
$('#RevenueAppend').append(_.template(template, {
|
||||
index: temp,
|
||||
ReqNo: Reqnumber,
|
||||
MaterialCode: materialCode,
|
||||
MaterialName: materialName,
|
||||
Quantity: quantity,
|
||||
UOM: uom,
|
||||
Rate: itemRate,
|
||||
AddPer: PER,
|
||||
Add_Service_Description: service_description,
|
||||
BasicAmount: basicval,
|
||||
Taxvalue: TotalTaxValue,
|
||||
TotalValue: TotalOrderValue,
|
||||
ActualQuantity: quantity,
|
||||
ReceivedQuantity: 0,
|
||||
PendingQuantity: quantity
|
||||
}));
|
||||
// $('#RevenueAppend').append(_.template(template, {
|
||||
// index: temp,
|
||||
// ReqNo: Reqnumber,
|
||||
// MaterialCode: materialCode,
|
||||
// MaterialName: materialName,
|
||||
// Quantity: quantity,
|
||||
// UOM: uom,
|
||||
// Rate: itemRate,
|
||||
// AddPer: PER,
|
||||
// Add_Service_Description: service_description,
|
||||
// BasicAmount: basicval,
|
||||
// Taxvalue: TotalTaxValue,
|
||||
// TotalValue: TotalOrderValue,
|
||||
// ActualQuantity: quantity,
|
||||
// ReceivedQuantity: 0,
|
||||
// PendingQuantity: quantity
|
||||
// }));
|
||||
var rowHtml = `
|
||||
<tr id="${temp}">
|
||||
<td align="left">${temp}</td>
|
||||
<td align="left">${Reqnumber}</td>
|
||||
<td align="left">${materialCode}</td>
|
||||
<td align="left">${materialName}</td>
|
||||
<td align="right">${quantity}</td>
|
||||
<td align="left">${uom}</td>
|
||||
<td align="right">${itemRate}</td>
|
||||
<td align="right">${PER}</td>
|
||||
<td align="right">${service_description}</td>
|
||||
<td align="right">${basicval}</td>
|
||||
<td align="right">${TotalTaxValue}</td>
|
||||
<td align="right">${TotalOrderValue}</td>
|
||||
<td align="right">${quantity}</td>
|
||||
<td align="right">0</td>
|
||||
<td align="right">${quantity}</td>
|
||||
|
||||
<td>
|
||||
<a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
|
||||
<i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i>
|
||||
</a>
|
||||
|
||||
<a href='#' onclick="DeleteRow('${temp}')" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
|
||||
<span class="ri-delete-bin-7-fill"></span>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
`;
|
||||
$('#RevenueAppend').append(rowHtml);
|
||||
|
||||
|
||||
|
||||
var theForm = $(".CreatePO");
|
||||
@ -4540,7 +4569,6 @@ if (!empty($getlogpodtl)) {
|
||||
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
|
||||
success: function(data) {
|
||||
if (data) {
|
||||
$('#content').loader('hide');
|
||||
alert(data);
|
||||
|
||||
} else {
|
||||
@ -4653,7 +4681,6 @@ if (!empty($getlogpodtl)) {
|
||||
return false;
|
||||
} else {
|
||||
var formData = new FormData($('.CreatePO')[0]);
|
||||
$('#content').loader('show');
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "<?php echo base_url() ?>purchaseorder/EditRevenuePurchaseOrder",
|
||||
@ -4662,7 +4689,6 @@ if (!empty($getlogpodtl)) {
|
||||
contentType: false,
|
||||
success: function(data) {
|
||||
if (data) {
|
||||
$('#content').loader('hide');
|
||||
alert(data);
|
||||
$('#txtRowCount').val('');
|
||||
$('#txtDeletedRow').val('');
|
||||
@ -4672,7 +4698,6 @@ if (!empty($getlogpodtl)) {
|
||||
window.location = "purchaseorderListing";
|
||||
|
||||
} else {
|
||||
$('#content').loader('hide');
|
||||
alert("Error");
|
||||
}
|
||||
|
||||
@ -4703,21 +4728,6 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
});
|
||||
|
||||
$(function() {
|
||||
|
||||
$('#revenueTax').DataTable({
|
||||
"paging": false,
|
||||
"lengthChange": false,
|
||||
"searching": false,
|
||||
//"ordering": true,
|
||||
// "info": true,
|
||||
"autoWidth": false
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
function RevenueChangeSgst() {
|
||||
var getTypeOfTax = $("input:radio[name='Range']:checked").val();
|
||||
if (getTypeOfTax == 0) {
|
||||
@ -4896,6 +4906,8 @@ if (!empty($getlogpodtl)) {
|
||||
id = '';
|
||||
|
||||
});
|
||||
$(document).ready(function() {
|
||||
|
||||
$("#EDITREVENUE").on("shown.bs.modal", function(e) {
|
||||
var AvlBudAmt = '<?php echo $AvlAmount ?>';
|
||||
|
||||
@ -5072,6 +5084,7 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<script>
|
||||
$('#insurancestatus').change(function() {
|
||||
@ -5101,7 +5114,6 @@ if (!empty($getlogpodtl)) {
|
||||
formData.append('param2', param2);
|
||||
|
||||
|
||||
$('.content').loader('show');
|
||||
$.ajax({
|
||||
data: formData,
|
||||
type: "POST",
|
||||
@ -5113,7 +5125,6 @@ if (!empty($getlogpodtl)) {
|
||||
if (data) {
|
||||
alert(data);
|
||||
window.location.reload();
|
||||
$('.content').loader('hide');
|
||||
// $('#spl').find('td').eq(5).text(filename[2]);
|
||||
$('#billModel').modal('hide');
|
||||
}
|
||||
@ -5146,7 +5157,6 @@ if (!empty($getlogpodtl)) {
|
||||
formData.append('param7', param7);
|
||||
|
||||
|
||||
$('.content').loader('show');
|
||||
$.ajax({
|
||||
data: formData,
|
||||
type: "POST",
|
||||
@ -5158,7 +5168,6 @@ if (!empty($getlogpodtl)) {
|
||||
if (data) {
|
||||
alert(data);
|
||||
window.location.reload();
|
||||
$('.content').loader('hide');
|
||||
// $('#spl').find('td').eq(5).text(filename[2]);
|
||||
$('#EditRevenueSplPOModel').modal('hide');
|
||||
}
|
||||
@ -5181,7 +5190,6 @@ if (!empty($getlogpodtl)) {
|
||||
formData.append('count', counter);
|
||||
formData.append('igr', igr);
|
||||
|
||||
$('.content').loader('show');
|
||||
$.ajax({
|
||||
data: formData,
|
||||
type: "POST",
|
||||
@ -5193,7 +5201,6 @@ if (!empty($getlogpodtl)) {
|
||||
if (data) {
|
||||
alert(data);
|
||||
window.location.reload();
|
||||
$('.content').loader('hide');
|
||||
// $('#spl').find('td').eq(5).text(filename[2]);
|
||||
$('#billModel').modal('hide');
|
||||
}
|
||||
|
||||
@ -225,21 +225,21 @@ foreach ($PaymentTerms as $TER) {
|
||||
Mat: []
|
||||
};
|
||||
$(function() {
|
||||
$("#PODate").datepicker({
|
||||
minDate: d,
|
||||
maxDate: 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '-100:+0'
|
||||
});
|
||||
$("#Deliverydt").datepicker({
|
||||
minDate: 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '0:+10'
|
||||
});
|
||||
// $("#PODate").datepicker({
|
||||
// minDate: d,
|
||||
// maxDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '-100:+0'
|
||||
// });
|
||||
// $("#Deliverydt").datepicker({
|
||||
// minDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '0:+10'
|
||||
// });
|
||||
|
||||
$('#drpSupplier').change(function() {
|
||||
|
||||
@ -792,7 +792,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt ?>">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
$data = array('type'=>'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -1002,7 +1002,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
<!-- Model for servicepo -->
|
||||
|
||||
<div class="modal fade" id="EDITSERVICE" role="dialog">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<!-- Modal content-->
|
||||
<form>
|
||||
<div class="modal-content" style="width:900px;">
|
||||
@ -1577,7 +1577,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
</div>
|
||||
|
||||
|
||||
<script type="text/html" id="ServiceList">
|
||||
<!-- <script type="text/html" id="ServiceList">
|
||||
<tr id="<%=index%>">
|
||||
<td align="left"><%=index%></td>
|
||||
<td align="left"><%=ReqNo%></td>
|
||||
@ -1599,7 +1599,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</script>
|
||||
</script> -->
|
||||
<script>
|
||||
var index = $('#txtRowCount').val();;
|
||||
var userid = '';
|
||||
@ -1614,7 +1614,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
|
||||
|
||||
$('#EditotherDescription').hide();
|
||||
|
||||
$(document).ready(function() {
|
||||
$("#EDITSERVICE").on("shown.bs.modal", function(e) {
|
||||
var AvlBudAmt = '<?php echo $AvlAmount ?>';
|
||||
|
||||
@ -1711,7 +1711,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
||||
$('.EditService').click(function() {
|
||||
@ -2168,13 +2168,13 @@ foreach ($PaymentTerms as $TER) {
|
||||
// this function is used to clear data changing schedule option
|
||||
$('#Scheduleby').change(function() {
|
||||
|
||||
$("#Deliverydt").datepicker({
|
||||
minDate: 'now',
|
||||
dateFormat: 'mm-dd-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '0:+10'
|
||||
});
|
||||
// $("#Deliverydt").datepicker({
|
||||
// minDate: 'now',
|
||||
// dateFormat: 'mm-dd-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '0:+10'
|
||||
// });
|
||||
|
||||
|
||||
});
|
||||
|
||||
@ -3072,39 +3072,6 @@ if (!empty($getlogpodtl)) {
|
||||
</div> <!-- content -->
|
||||
</div>
|
||||
|
||||
<script type="text/html" id="ImportList">
|
||||
<tr id="<%=index%>">
|
||||
<td align="left"><%=index%></td>
|
||||
<td align="left"><%=ReqNo%></td>
|
||||
<td align="left"><%=MaterialCode%></td>
|
||||
|
||||
<td align="left"><%=Description%></td>
|
||||
<td align="left"><%=Quantity%></td>
|
||||
<td align="left"><%=UOM%></td>
|
||||
<td align="left"><%=Rate%></td>
|
||||
<td align="left"><%=BasicAmount%></td>
|
||||
<td align="left"><%=ReceivedQty%></td>
|
||||
<td align="left"><%=RejectedQty%></td>
|
||||
<td align="left"><%=PendingQty%></td>
|
||||
<!-- <td align="left"><%=index%></td>
|
||||
<td align="left"><%=ReqNo%></td>
|
||||
|
||||
<td align="left"><%=ItemName%></td>
|
||||
<td align="left"><%=Quantity%></td>
|
||||
<td align="left"><%=UOM%></td>
|
||||
<td align="left"><%=Rate%></td>
|
||||
<td align="left"><%=BasicAmount%></td> -->
|
||||
<!-- <td align="left"><%=Taxvalue%></td>
|
||||
<td align="left"><%=TotalValue%></td> -->
|
||||
|
||||
<td>
|
||||
<a data-target='#editimportpomodel' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#editimportpomodel"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the <%=ReqNo%> Requisition details"></i> </a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
|
||||
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
@ -4370,29 +4337,32 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
|
||||
//alert('in');
|
||||
var template = jQuery("#ImportList").html();
|
||||
$('#ImportAppend').append(_.template(template, {
|
||||
index: temp,
|
||||
ReqNo: Reqnumber,
|
||||
MaterialCode: materialCode,
|
||||
Description: materialName,
|
||||
Quantity: quantity,
|
||||
UOM: uom,
|
||||
Rate: itemRate,
|
||||
BasicAmount: BasicAmt,
|
||||
Taxvalue: taxamt,
|
||||
TotalValue: totalexp,
|
||||
ReceivedQty: receivedqty,
|
||||
RejectedQty: rejectedqty,
|
||||
PendingQty: pendingqty
|
||||
}));
|
||||
//alert(JSON.strigify(BasicAmt));
|
||||
var rowHtml = `
|
||||
<tr id="${temp}">
|
||||
<td align="left">${temp}</td>
|
||||
<td align="left">${Reqnumber}</td>
|
||||
<td align="left">${materialCode}</td>
|
||||
<td align="left">${materialName}</td>
|
||||
<td align="left">${quantity}</td>
|
||||
<td align="left">${uom}</td>
|
||||
<td align="left">${itemRate}</td>
|
||||
<td align="left">${BasicAmt}</td>
|
||||
<td align="left">${receivedqty}</td>
|
||||
<td align="left">${rejectedqty}</td>
|
||||
<td align="left">${pendingqty}</td>
|
||||
<td>
|
||||
<a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
|
||||
<i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i>
|
||||
</a>
|
||||
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
|
||||
<span class="glyphicon glyphicon-trash"></span>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
`;
|
||||
|
||||
|
||||
//$('#ImportAppend').append(_.template(template,{index:temp,ReqNo:Reqnumber,ItemName:materialName,Quantity:quantity,UOM:uom,Rate:itemRate,BasicAmount:BasicAmt,Taxvalue:taxamt,TotalValue:totalexp}));
|
||||
//clearTaxField();
|
||||
|
||||
//from above defined variables
|
||||
// Append the generated row HTML to the target element
|
||||
$('#ImportAppend').append(rowHtml);
|
||||
|
||||
var theForm = $(".ImportPO");
|
||||
|
||||
|
||||
@ -714,7 +714,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
||||
</div>
|
||||
<div id="IMPORT" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Add Import Purchase Order Item</h4>
|
||||
@ -1290,7 +1290,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
||||
</div><!-- /.modal -->
|
||||
<div id="editimportpomodel" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Edit Import Purchase Order Item</h4>
|
||||
@ -1878,30 +1878,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
||||
</div>
|
||||
</div><!-- /.modal -->
|
||||
|
||||
<script type="text/html" id="ImportList">
|
||||
<tr id="<%=index%>">
|
||||
<td align="left"><%=index%></td>
|
||||
<td align="left"><%=ReqNo%></td>
|
||||
<td align="left"><%=MaterialCode%></td>
|
||||
|
||||
<td align="left"><%=Description%></td>
|
||||
<td align="left"><%=Quantity%></td>
|
||||
<td align="left"><%=UOM%></td>
|
||||
<td align="left"><%=Rate%></td>
|
||||
<td align="left"><%=BasicAmount%></td>
|
||||
<td align="left"><%=ReceivedQty%></td>
|
||||
<td align="left"><%=RejectedQty%></td>
|
||||
<td align="left"><%=PendingQty%></td>
|
||||
<!-- <td align="left"><%=Taxvalue%></td>
|
||||
<td align="left"><%=TotalValue%></td> -->
|
||||
|
||||
<td>
|
||||
<a data-target='#editimportpomodel' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <%=ReqNo%> Requisition details"></i> </a> <a href='#' onclick="DeleteRow(<%=index%>)" class="link" data-id="<%=index%>" data-userid="<%=index%>" id="Del"><span class="glyphicon glyphicon-trash"></span></a>
|
||||
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
@ -3315,22 +3291,51 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
||||
|
||||
index = parseInt(index) + 1;
|
||||
//alert('in');
|
||||
var template = jQuery("#ImportList").html();
|
||||
$('#ImportAppend').append(_.template(template, {
|
||||
index: temp,
|
||||
ReqNo: Reqnumber,
|
||||
MaterialCode: materialCode,
|
||||
Description: materialName,
|
||||
Quantity: quantity,
|
||||
UOM: uom,
|
||||
Rate: itemRate,
|
||||
BasicAmount: BasicAmt,
|
||||
Taxvalue: taxexp,
|
||||
TotalValue: totalexp,
|
||||
ReceivedQty: receivedqty,
|
||||
RejectedQty: rejectedqty,
|
||||
PendingQty: pendingqty
|
||||
}));
|
||||
// var template = jQuery("#ImportList").html();
|
||||
// $('#ImportAppend').append(_.template(template, {
|
||||
// index: temp,
|
||||
// ReqNo: Reqnumber,
|
||||
// MaterialCode: materialCode,
|
||||
// Description: materialName,
|
||||
// Quantity: quantity,
|
||||
// UOM: uom,
|
||||
// Rate: itemRate,
|
||||
// BasicAmount: BasicAmt,
|
||||
// Taxvalue: taxexp,
|
||||
// TotalValue: totalexp,
|
||||
// ReceivedQty: receivedqty,
|
||||
// RejectedQty: rejectedqty,
|
||||
// PendingQty: pendingqty
|
||||
// }));
|
||||
var rowHtml = `
|
||||
<tr id="${temp}">
|
||||
<td align="left">${temp}</td>
|
||||
<td align="left">${Reqnumber}</td>
|
||||
<td align="left">${materialCode}</td>
|
||||
<td align="left">${materialName}</td>
|
||||
<td align="left">${quantity}</td>
|
||||
<td align="left">${uom}</td>
|
||||
<td align="left">${itemRate}</td>
|
||||
<td align="left">${BasicAmt}</td>
|
||||
<td align="left">${taxexp}</td>
|
||||
<td align="left">${totalexp}</td>
|
||||
<td align="left">${receivedqty}</td>
|
||||
<td align="left">${rejectedqty}</td>
|
||||
<td align="left">${pendingqty}</td>
|
||||
<td>
|
||||
<a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
|
||||
<i class="fas fa-pencil-alt" data-toggle="tooltip"></i>
|
||||
</a>
|
||||
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
|
||||
<span class="glyphicon glyphicon-trash"></span>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
`;
|
||||
|
||||
// Append the generated row HTML to the target element
|
||||
$('#ImportAppend').append(rowHtml);
|
||||
|
||||
//alert(JSON.strigify(BasicAmt));
|
||||
|
||||
|
||||
|
||||
@ -2183,7 +2183,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div> <!-- content -->
|
||||
</div>
|
||||
<!-- Modal for Packing Calculation -->
|
||||
<div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog"
|
||||
<div id="packagingcalmodel" class="modal fade" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
@ -2212,7 +2212,7 @@ if (!empty($INRSYMBOL)) {
|
||||
<!-- Modal for freight Calculation-->
|
||||
<div id="freightcalmodel" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Freight Calculation On</h4>
|
||||
@ -2242,7 +2242,7 @@ if (!empty($INRSYMBOL)) {
|
||||
<!-- Modal for Excise Duty Calculation-->
|
||||
<div id="ExciseDutyCalModel" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Excise Duty Calculation On</h4>
|
||||
@ -2277,7 +2277,7 @@ if (!empty($INRSYMBOL)) {
|
||||
<!-- Modal for Vat Calculation -->
|
||||
<div id="VatCalModel" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Vat Calculation On</h4>
|
||||
@ -2306,7 +2306,7 @@ if (!empty($INRSYMBOL)) {
|
||||
<!-- Modal for CST Calculation -->
|
||||
<div id="CSTCalModel" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">CST Calculation On</h4>
|
||||
@ -2334,7 +2334,7 @@ if (!empty($INRSYMBOL)) {
|
||||
<!-- Model for revenue po -->
|
||||
<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
|
||||
@ -2348,7 +2348,7 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
|
||||
<label>Req No<span class="text-danger">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
$RL = array("0" => 'Select Req No');
|
||||
@ -2393,7 +2393,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-2">
|
||||
<label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
|
||||
<label>Item Code<span class="text-danger">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
$options = array("0" => 'Item Code');
|
||||
@ -2423,14 +2423,14 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<label>Qty<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
|
||||
<label>Qty<span class="text-danger">*</span></label>
|
||||
<?php
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
<div class="form-group col-md-1">
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="text-danger">*</span></label>
|
||||
<!-- <label>Rate</label> -->
|
||||
<?php
|
||||
$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
|
||||
@ -2686,7 +2686,7 @@ if (!empty($INRSYMBOL)) {
|
||||
<!-- Edit Model for revenue po -->
|
||||
<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Edit Revenue Purchase Order Line Item </h4>
|
||||
@ -2738,7 +2738,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-2">
|
||||
<label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
|
||||
<label>Item Code<span class="text-danger">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
$options = array("0" => 'Item Code');
|
||||
@ -2758,7 +2758,7 @@ if (!empty($INRSYMBOL)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<div class="form-group col-md-1">
|
||||
<label>UOM</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -2767,8 +2767,8 @@ if (!empty($INRSYMBOL)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
|
||||
<div class="form-group col-md-2">
|
||||
<label>Quantity<span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
|
||||
@ -2776,8 +2776,8 @@ if (!empty($INRSYMBOL)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label><?php echo "Rate ($INRSYM)" ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
|
||||
<div class="form-group col-md-2">
|
||||
<label><?php echo "Rate ($INRSYM)" ?><span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
|
||||
@ -2785,12 +2785,12 @@ if (!empty($INRSYMBOL)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<div class="form-group col-md-1">
|
||||
<label>Per</label> <?php
|
||||
$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control');
|
||||
echo form_input($data); ?>
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<div class="form-group col-md-2">
|
||||
<label><?php echo "Basic Amt ($INRSYM)" ?></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -3106,7 +3106,7 @@ if (!empty($INRSYMBOL)) {
|
||||
});
|
||||
|
||||
|
||||
|
||||
$(document).ready(function() {
|
||||
$("#EDITREVENUE").on("shown.bs.modal", function(e) {
|
||||
|
||||
userid = $(e.relatedTarget).data('userid');
|
||||
@ -3213,7 +3213,7 @@ if (!empty($INRSYMBOL)) {
|
||||
$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
|
||||
|
||||
|
||||
});
|
||||
});});
|
||||
$('.AddRevenue').click(function() {
|
||||
tinyMCE.triggerSave();
|
||||
if (validateRevenueTax() && ExceedQuantityCheck()) {
|
||||
@ -3749,7 +3749,7 @@ $('#RevenueAppend').append(rowHtml);
|
||||
var finalBasicAmount = txtTotBasicAmount - txtTotalDiscount;
|
||||
//alert(txtTotBasicAmount+"--"+txtTotalDiscount+"--"+finalBasicAmount+"--"+AvlBudAmt);
|
||||
if (validate()) {
|
||||
if (document.getElementById('revenueTax').rows.length < 3) {
|
||||
if (document.getElementById('revenueTax').rows.length < 1) {
|
||||
alert('Please Select Line item to Create PO');
|
||||
$('#Deliverydt').focus();
|
||||
return false;
|
||||
@ -3776,7 +3776,7 @@ $('#RevenueAppend').append(rowHtml);
|
||||
|
||||
var formData = new FormData($('.CreatePO')[0]);
|
||||
|
||||
$('#content').loader('show');
|
||||
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: "<?php echo base_url() ?>purchaseorder/addNewPurchaseOrder",
|
||||
@ -3785,7 +3785,7 @@ $('#RevenueAppend').append(rowHtml);
|
||||
contentType: false,
|
||||
success: function(data) {
|
||||
if (data) {
|
||||
$('#content').loader('hide');
|
||||
|
||||
alert(data);
|
||||
$('#txtRowCount').val('');
|
||||
$('#txtDeletedRow').val('');
|
||||
|
||||
@ -2232,7 +2232,6 @@ $('#ServiceAppend').append(rowHtml);
|
||||
return false;
|
||||
|
||||
} else {
|
||||
$('#content').loader('show');
|
||||
var formData = new FormData($('.ServicePO')[0]);
|
||||
|
||||
$.ajax({
|
||||
@ -2244,7 +2243,6 @@ $('#ServiceAppend').append(rowHtml);
|
||||
contentType: false,
|
||||
success: function(data) {
|
||||
if (data) {
|
||||
$('#content').loader('hide');
|
||||
alert(data);
|
||||
$('#txtRowCount').val('');
|
||||
$('#txtDeletedRow').val('');
|
||||
@ -2253,7 +2251,6 @@ $('#ServiceAppend').append(rowHtml);
|
||||
window.location = "purchaseorderListing";
|
||||
|
||||
} else {
|
||||
$('#content').loader('hide');
|
||||
alert("Error");
|
||||
}
|
||||
|
||||
|
||||
@ -267,6 +267,8 @@ if (! function_exists('form_dropdown')) {
|
||||
*/
|
||||
function form_dropdown($data = '', $options = [], $selected = [], $extra = ''): string
|
||||
{
|
||||
|
||||
|
||||
$defaults = [];
|
||||
if (is_array($data)) {
|
||||
if (isset($data['selected'])) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user