FIX_IGR issues and PO alignment
This commit is contained in:
parent
84cf062161
commit
7bf4e6488c
@ -335,24 +335,19 @@ class Inwardgateregister extends BaseController
|
||||
|
||||
#Step 2 Master File and Its Details Gathering
|
||||
$MasterFile = $this->request->getFile('MasterFile');
|
||||
$requestMasterFileName = NULL;
|
||||
if (!empty($MasterFile)) {
|
||||
$requestMasterFileName = $MasterFile->getName();
|
||||
|
||||
if (!empty($requestMasterFileName)) {
|
||||
if ($MasterFile && $MasterFile->isValid() && !$MasterFile->hasMoved()) {
|
||||
if (!empty($this->inwardgateregister_model->isFileExistsInIGRmaster($requestMasterFileName))) {
|
||||
log_message('error', 'File already exists in the database'.$requestMasterFileName);
|
||||
$requestMasterFileName = NULL;
|
||||
}
|
||||
else{
|
||||
$MasterFile->move($path, $requestMasterFileName);
|
||||
$fileupdated_count++;
|
||||
$fileupdated_name[] = $requestMasterFileName;
|
||||
}
|
||||
}else{
|
||||
$requestMasterFileName = NULL;
|
||||
}
|
||||
}else{
|
||||
$requestMasterFileName = NULL;
|
||||
}
|
||||
|
||||
#Step 3 Master Details Gathering to Save In DB
|
||||
@ -595,10 +590,11 @@ function viewIGRDetails()
|
||||
$IGRNo = $this->request->getPost('igr');
|
||||
|
||||
$DeliveryChellan = $this->request->getPost('invdate');
|
||||
$DeliveryChellanDate = get_date_time_format($DeliveryChellan);
|
||||
$DeliveryChellanDate = !$DeliveryChellan || $DeliveryChellan === null ? NULL : get_date_time_format($DeliveryChellan);
|
||||
|
||||
$Mat_Rcvd_Dt = $this->request->getPost('mrc');
|
||||
$MaterialRcvdDt = get_date_time_format($Mat_Rcvd_Dt);
|
||||
$MaterialRcvdDt = !$Mat_Rcvd_Dt || $Mat_Rcvd_Dt === null ? NULL : get_date_time_format($Mat_Rcvd_Dt);
|
||||
|
||||
|
||||
$VehicleNo = $this->request->getPost('vehicle_no');
|
||||
$DriverName = $this->request->getPost('driver');
|
||||
@ -618,9 +614,9 @@ function viewIGRDetails()
|
||||
$igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby);
|
||||
|
||||
$MasterFile = $this->request->getfile('MasterFile');
|
||||
$requestMasterFileName = $MasterFile->getName();
|
||||
|
||||
if (!empty($requestMasterFileName)) {
|
||||
if ($MasterFile) {
|
||||
$requestMasterFileName = $MasterFile->getName();
|
||||
if ($MasterFile && $MasterFile->isValid() && !$MasterFile->hasMoved()) {
|
||||
if (!empty($this->inwardgateregister_model->isFileExistsInIGRmaster($requestMasterFileName))) {
|
||||
log_message('error', 'File already exists in the database'.$requestMasterFileName);
|
||||
@ -700,8 +696,8 @@ function viewIGRDetails()
|
||||
$tareWeightDate = $row['TareWeightDate'];
|
||||
$netWeight = $row['NetWeight'];
|
||||
$igrItemNo = $row['IGRItemNo'];
|
||||
$GrossWtDt = get_date_time_format($grossWeightDate);
|
||||
$TareWtDt = get_date_time_format($tareWeightDate);
|
||||
$GrossWtDt = !empty($grossWeightDate) && strtolower($grossWeightDate) !== 'null' ? get_date_time_format($grossWeightDate) : NULL;
|
||||
$TareWtDt = !empty($tareWeightDate) && strtolower($tareWeightDate) !== 'null' ? get_date_time_format($tareWeightDate) : NULL;
|
||||
|
||||
$igrline = array(
|
||||
'QuantityAsPerInvoice' => $quantityAsPerInvoice,
|
||||
@ -901,9 +897,11 @@ function viewIGRDetails()
|
||||
$requestdata = $this->request->getPost('data');
|
||||
$updateby = $this->session->get('userId');
|
||||
$GrossWeightDate = (string)$this->request->getPost('GrossWeightDate');
|
||||
$GrossWtDt = get_date_time_format($GrossWeightDate);
|
||||
$GrossWtDt = !empty($GrossWeightDate) ? get_date_time_format($GrossWeightDate) : NULL;
|
||||
|
||||
$TareWeightDate = (string)$this->request->getPost('TareWeightDate');
|
||||
$TareWtDt = get_date_time_format($TareWeightDate);
|
||||
$TareWtDt = !empty($TareWeightDate) ? get_date_time_format($TareWeightDate) : NULL;
|
||||
|
||||
|
||||
|
||||
// Check if request data is not null and is a string
|
||||
@ -1168,7 +1166,10 @@ function updateIGRWeight(){
|
||||
$IGRItemNo = $this->request->getPost('IGRlineitem');
|
||||
$updateby = $this->session->get('userId');
|
||||
$WeightFile = $this->request->getfile('WeightFile');
|
||||
$requestWeightFileName = $WeightFile->getName();
|
||||
$GrossWtDt = !empty($GrossWeightDate) ? get_date_time_format($GrossWeightDate) : null;
|
||||
$TareWtDt = !empty($TareWeightDate) ? get_date_time_format($TareWeightDate) : null;
|
||||
|
||||
|
||||
$path = ROOTPATH.'public/uploads/Igrfiles/';
|
||||
if(!is_dir($path)) { mkdir($path, 0777, true); }
|
||||
|
||||
@ -1230,7 +1231,7 @@ function updateIGRWeight(){
|
||||
log_message('error', "History updated successfully. History id: " . $history_id);
|
||||
}
|
||||
}
|
||||
if($GrossWeightDate){
|
||||
if($GrossWtDt){
|
||||
$grossdate = $this->inwardgateregister_model->get_igr_history('GrossWeightDate',$IGRNO, $IGRItemNo);
|
||||
if(!empty($grossdate)){
|
||||
$old_data = NULL;
|
||||
@ -1239,17 +1240,17 @@ function updateIGRWeight(){
|
||||
$old_data = $row->new_data;
|
||||
}
|
||||
}
|
||||
$igr_history = array('field' => 'GrossWeightDate','new_data' => $GrossWeightDate,'old_data' => $old_data,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo);
|
||||
$igr_history = array('field' => 'GrossWeightDate','new_data' => $GrossWtDt,'old_data' => $old_data,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo);
|
||||
($old_data != NULL) ? $igr_history['is_edit'] = 1 : $igr_history['is_add'] = 1 ;
|
||||
$history_id = $this->inwardgateregister_model->igr_history($igr_history);
|
||||
log_message('error', "History updated successfully. History id: " . $history_id);
|
||||
} else{
|
||||
$igr_history = array('field' => 'GrossWeightDate','is_edit' => 1,'new_data' => $GrossWeightDate,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo);
|
||||
$igr_history = array('field' => 'GrossWeightDate','is_edit' => 1,'new_data' => $GrossWtDt,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo);
|
||||
$history_id = $this->inwardgateregister_model->igr_history($igr_history);
|
||||
log_message('error', "History updated successfully. History id: " . $history_id);
|
||||
}
|
||||
}
|
||||
if($TareWeightDate){
|
||||
if($TareWtDt){
|
||||
$taredate = $this->inwardgateregister_model->get_igr_history('TareWeightDate',$IGRNO, $IGRItemNo);
|
||||
|
||||
if(!empty($taredate)){
|
||||
@ -1259,12 +1260,12 @@ function updateIGRWeight(){
|
||||
$old_data = $row->new_data;
|
||||
}
|
||||
}
|
||||
$igr_history = array('field' => 'TareWeightDate','new_data' => $TareWeightDate,'old_data' => $old_data,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo);
|
||||
$igr_history = array('field' => 'TareWeightDate','new_data' => $TareWtDt,'old_data' => $old_data,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo);
|
||||
($old_data != NULL) ? $igr_history['is_edit'] = 1 : $igr_history['is_add'] = 1 ;
|
||||
$history_id = $this->inwardgateregister_model->igr_history($igr_history);
|
||||
log_message('error', "History updated successfully. History id: " . $history_id);
|
||||
} else{
|
||||
$igr_history = array('field' => 'TareWeightDate','is_edit' => 1,'new_data' => $TareWeightDate,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo);
|
||||
$igr_history = array('field' => 'TareWeightDate','is_edit' => 1,'new_data' => $TareWtDt,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$IGRItemNo);
|
||||
$history_id = $this->inwardgateregister_model->igr_history($igr_history);
|
||||
log_message('error', "History updated successfully. History id: " . $history_id);
|
||||
}
|
||||
@ -1272,8 +1273,9 @@ function updateIGRWeight(){
|
||||
|
||||
|
||||
$IGRItemNo = $this->request->getPost('IGRlineitem');
|
||||
$igr_lineitem = array('GrossWeight' => $GrossWeight,'GrossWeightDate' => $GrossWeightDate,'TareWeightDate' => $TareWeightDate,'TareWeight' => $TareWeight,'NetWeight' => $NetWeight,'UpdateBY' => $updateby);
|
||||
|
||||
$igr_lineitem = array('GrossWeight' => $GrossWeight,'GrossWeightDate' => $GrossWtDt,'TareWeightDate' => $TareWtDt,'TareWeight' => $TareWeight,'NetWeight' => $NetWeight,'UpdateBY' => $updateby);
|
||||
$requestWeightFileName =null ;
|
||||
if($WeightFile){
|
||||
if (!empty($requestWeightFileName)) {
|
||||
if ($WeightFile && $WeightFile->isValid() && !$WeightFile->hasMoved()) {
|
||||
if (!empty($this->inwardgateregister_model->isFileExistsInIGRdetails($requestWeightFileName))) {
|
||||
@ -1285,6 +1287,8 @@ function updateIGRWeight(){
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$update = $this->inwardgateregister_model->updateIGRLineItem($igr_lineitem, $IGRItemNo);
|
||||
|
||||
if ($update) {
|
||||
|
||||
@ -1102,10 +1102,10 @@ $mpdf->use_kwt = true;
|
||||
|
||||
|
||||
$file = $this->request->getFile('POFile');
|
||||
$requestfilename = $file->getName();
|
||||
if (!empty($requestfilename)) {
|
||||
|
||||
$requestfilename = NULL;
|
||||
if (!empty($file)) {
|
||||
if ($file->isValid() && !$file->hasMoved()) {
|
||||
$requestfilename = $file->getName();
|
||||
$path = ROOTPATH.'public/uploads/POfiles/';
|
||||
if(!is_dir($path)) { mkdir($path, 0777, true); }
|
||||
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
|
||||
@ -1284,9 +1284,11 @@ $mpdf->use_kwt = true;
|
||||
$POList['ReleasedBy'] = $this->session->get('userId');
|
||||
}
|
||||
$file = $this->request->getFile('POFile');
|
||||
$requestfilename = $file->getName();
|
||||
if (!empty($requestfilename)) {
|
||||
$requestfilename = NULL;
|
||||
if (!empty($file)) {
|
||||
if ($file && $file->isValid() && !$file->hasMoved()) {
|
||||
$requestfilename = $file->getName();
|
||||
|
||||
$path = ROOTPATH.'public/uploads/POfiles/';
|
||||
if(!is_dir($path)) { mkdir($path, 0777, true); }
|
||||
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
|
||||
@ -1905,10 +1907,11 @@ $mpdf->use_kwt = true;
|
||||
$lastPONO = $this->purchaseorder_model->lastPONO();
|
||||
$newPONO = generate_po_number($lastPONO);
|
||||
$file = $this->request->getFile('POFile');
|
||||
$requestfilename = $file->getName();
|
||||
if (!empty($requestfilename)) {
|
||||
$requestfilename = NULL;
|
||||
if (!empty($file)) {
|
||||
|
||||
if ($file->isValid() && !$file->hasMoved()) {
|
||||
$requestfilename = $file->getName();
|
||||
$path = ROOTPATH.'public/uploads/POfiles/';
|
||||
if(!is_dir($path)) { mkdir($path, 0777, true); }
|
||||
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
|
||||
@ -2131,9 +2134,11 @@ $mpdf->use_kwt = true;
|
||||
$POList['ReleasedBy'] = $this->session->get('userId');
|
||||
}
|
||||
$file = $this->request->getFile('POFile');
|
||||
$requestfilename = $file->getName();
|
||||
if (!empty($requestfilename)) {
|
||||
$requestfilename = NULL;
|
||||
|
||||
if (!empty($file)) {
|
||||
if ($file && $file->isValid() && !$file->hasMoved()) {
|
||||
$requestfilename = $file->getName();
|
||||
$path = ROOTPATH.'public/uploads/POfiles/';
|
||||
if(!is_dir($path)) { mkdir($path, 0777, true); }
|
||||
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
|
||||
@ -2564,10 +2569,11 @@ try{
|
||||
$lastPONO = $this->purchaseorder_model->lastPONO();
|
||||
$newPONO = generate_po_number($lastPONO);
|
||||
$file = $this->request->getFile('POFile');
|
||||
$requestfilename = $file->getName();
|
||||
if (!empty($requestfilename)) {
|
||||
$requestfilename = NULL;
|
||||
if (!empty($file)) {
|
||||
|
||||
if ($file->isValid() && !$file->hasMoved()) {
|
||||
$requestfilename = $file->getName();
|
||||
$path = ROOTPATH.'public/uploads/POfiles/';
|
||||
if(!is_dir($path)) { mkdir($path, 0777, true); }
|
||||
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
|
||||
@ -2851,9 +2857,10 @@ try{
|
||||
$POList['ReleasedBy'] = $this->session->get('userId');
|
||||
}
|
||||
$file = $this->request->getFile('POFile');
|
||||
$requestfilename = $file->getName();
|
||||
if (!empty($requestfilename)) {
|
||||
$requestfilename = NULL;
|
||||
if (!empty($file)) {
|
||||
if ($file && $file->isValid() && !$file->hasMoved()) {
|
||||
$requestfilename = $file->getName();
|
||||
$path = ROOTPATH.'public/uploads/POfiles/';
|
||||
if(!is_dir($path)) { mkdir($path, 0777, true); }
|
||||
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
|
||||
|
||||
@ -36,7 +36,7 @@ $ServiceTypeOptions = '';
|
||||
$DescriptionOfPo = '';
|
||||
$BudgetType = '';
|
||||
$PrePOFile = '';
|
||||
$parentPO= '';
|
||||
$parentPO = '';
|
||||
|
||||
|
||||
if (!empty($INRSYMBOL)) {
|
||||
@ -54,11 +54,11 @@ if (!empty($MaxPODate)) {
|
||||
if (!empty($POMaster)) {
|
||||
|
||||
foreach ($POMaster as $Req) {
|
||||
$parentPO =$Req->ParentPO;
|
||||
$parentPO = $Req->ParentPO;
|
||||
|
||||
$SupId = $Req->SupplierID;
|
||||
$SupName = $Req->SupplierName;
|
||||
$Address = $Req->MSME ? "MSME : ".$Req->MSME."\n".$Req->Address :$Req->Address ;
|
||||
$Address = $Req->MSME ? "MSME : " . $Req->MSME . "\n" . $Req->Address : $Req->Address;
|
||||
$pdt = new DateTime($Req->PODate);
|
||||
$PODate = $pdt->format('d-m-Y');
|
||||
$DeliverOption = $Req->DeliveryOption;
|
||||
@ -123,9 +123,9 @@ if (!empty($getlogpodtl)) {
|
||||
foreach ($getlogpodtl as $values) {
|
||||
$update = $values->FirstName;
|
||||
}
|
||||
}else{
|
||||
$update= [];
|
||||
}
|
||||
} else {
|
||||
$update = [];
|
||||
}
|
||||
|
||||
// foreach ($POSTATUS as $PST )
|
||||
// {
|
||||
@ -145,7 +145,6 @@ if (!empty($getlogpodtl)) {
|
||||
var minDate = $(this).datepicker("getDate");
|
||||
var maxDate = new Date(minDate.getFullYear() + 1, minDate.getMonth(), minDate.getDate());
|
||||
});
|
||||
|
||||
</script>
|
||||
<script type="text/javascript">
|
||||
tinymce.init({
|
||||
@ -379,11 +378,14 @@ if (!empty($getlogpodtl)) {
|
||||
}
|
||||
var d = $('#drpSupplier').val();
|
||||
$.ajax({
|
||||
url:"<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||
type: 'POST',
|
||||
data: {supplierid : d, materialcode: id },
|
||||
data: {
|
||||
supplierid: d,
|
||||
materialcode: id
|
||||
},
|
||||
success: function(response) {
|
||||
if(response) alert(response);
|
||||
if (response) alert(response);
|
||||
}
|
||||
});
|
||||
|
||||
@ -420,11 +422,14 @@ if (!empty($getlogpodtl)) {
|
||||
}
|
||||
var d = $('#drpSupplier').val();
|
||||
$.ajax({
|
||||
url:"<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||
type: 'POST',
|
||||
data: {supplierid : d, materialcode: id },
|
||||
data: {
|
||||
supplierid: d,
|
||||
materialcode: id
|
||||
},
|
||||
success: function(response) {
|
||||
if(response) alert(response);
|
||||
if (response) alert(response);
|
||||
}
|
||||
});
|
||||
|
||||
@ -718,6 +723,7 @@ if (!empty($getlogpodtl)) {
|
||||
.num {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.header-container {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
@ -730,32 +736,40 @@ if (!empty($getlogpodtl)) {
|
||||
text-align: center;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.centered {
|
||||
display: flex;
|
||||
/* justify-content: center; */
|
||||
align-items: center;
|
||||
height: 10vh;
|
||||
}
|
||||
.centered label, .centered input {
|
||||
|
||||
.centered label,
|
||||
.centered input {
|
||||
margin: 0 5px;
|
||||
}
|
||||
.mandatory { color:red;text-align:right;background-color: white;}
|
||||
|
||||
.mandatory {
|
||||
color: red;
|
||||
text-align: right;
|
||||
background-color: white;
|
||||
}
|
||||
</style>
|
||||
<div class="content-wrapper">
|
||||
<?php
|
||||
$attributes = array('class' => 'form-label-left ServicePO ', 'name' => 'ServicePO', 'id' => 'ServicePO','enctype' => 'multipart/form-data');
|
||||
$attributes = array('class' => 'form-label-left ServicePO ', 'name' => 'ServicePO', 'id' => 'ServicePO', 'enctype' => 'multipart/form-data');
|
||||
|
||||
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
|
||||
|
||||
<section class="content">
|
||||
<div id="content"></div>
|
||||
<div style="border:2px solid #333">
|
||||
<div class="box">
|
||||
<div id="content"></div>
|
||||
<div class="header-container">
|
||||
<?php if ($parentPO == '') { ?>
|
||||
<h2> Edit Service Purchase Order-<?php echo "$PONO"?></h2>
|
||||
<?php } else {?>
|
||||
<h2> Amended Service Purchase Order-<?php echo "$PONO"?></h2>
|
||||
<h2> Edit Service Purchase Order-<?php echo "$PONO" ?></h2>
|
||||
<?php } else { ?>
|
||||
<h2> Amended Service Purchase Order-<?php echo "$PONO" ?></h2>
|
||||
<?php } ?>
|
||||
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-cancel" id="back" value="Back">Back</a>
|
||||
</div>
|
||||
@ -794,7 +808,7 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
if (!empty($Suplist)) {
|
||||
foreach ($Suplist as $SID) :
|
||||
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName ;
|
||||
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
|
||||
endforeach;
|
||||
}
|
||||
|
||||
@ -848,7 +862,7 @@ if (!empty($getlogpodtl)) {
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<b><u>Select Delivery By<span class="badge mandatory" >*</span></u></b><br />
|
||||
<b><u>Select Delivery By<span class="badge mandatory">*</span></u></b><br />
|
||||
<div class="centered">
|
||||
<?php echo form_label('Date', 'Date') . " " . form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
|
||||
|
||||
@ -856,8 +870,8 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3" id="Deliverydtdiv" ><br />
|
||||
<label>Delivery Date<span class="badge mandatory" >*</span></label>
|
||||
<div class="col-md-3" id="Deliverydtdiv"><br />
|
||||
<label>Delivery Date<span class="badge mandatory">*</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;');
|
||||
@ -907,7 +921,7 @@ if (!empty($getlogpodtl)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" >
|
||||
<div class="col-md-3">
|
||||
<label>Contact Reference</label>
|
||||
<div class="form-group">
|
||||
|
||||
@ -917,7 +931,7 @@ if (!empty($getlogpodtl)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" >
|
||||
<div class="col-md-3">
|
||||
<label>Supplier's Offer No</label>
|
||||
<div class="form-group">
|
||||
|
||||
@ -932,7 +946,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3" >
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-12" style="padding:0px;">
|
||||
|
||||
<label>Our Reference(S)</label>
|
||||
@ -1000,7 +1014,7 @@ if (!empty($getlogpodtl)) {
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-3" id="otheroptiondiv" style="display:none;">
|
||||
<label>Description of Payable Terms<span class="badge mandatory" >*</span></label>
|
||||
<label>Description of Payable Terms<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true');
|
||||
@ -1077,12 +1091,12 @@ if (!empty($getlogpodtl)) {
|
||||
<div align="right">
|
||||
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
|
||||
<div class="col-md-12">
|
||||
<?php if($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
|
||||
<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
|
||||
<div class="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>
|
||||
<div class="col-md-1" align="right">
|
||||
<?php }else{ ?>
|
||||
<?php } else { ?>
|
||||
<div class="col-md-12" align="right">
|
||||
<?php } ?>
|
||||
<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
|
||||
@ -1399,7 +1413,7 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Req No<span class="badge mandatory" >*</span></label>
|
||||
<label>Req No<span class="badge mandatory">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
|
||||
@ -1441,7 +1455,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Item Code<span class="badge mandatory" >*</span></label>
|
||||
<label>Item Code<span class="badge mandatory">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
$options = array("0" => 'Item Code');
|
||||
@ -1502,7 +1516,7 @@ if (!empty($getlogpodtl)) {
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="col-md-3">
|
||||
<label>Quantity<span class="badge mandatory" >*</span></label>
|
||||
<label>Quantity<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
|
||||
@ -1511,7 +1525,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory" >*</span></label>
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
|
||||
@ -1648,7 +1662,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
|
||||
<label>Service Description<span class="badge mandatory" >*</span></label> <?php
|
||||
<label>Service Description<span class="badge mandatory">*</span></label> <?php
|
||||
$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
|
||||
echo form_textarea($data);
|
||||
?> <input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
|
||||
@ -1690,7 +1704,7 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Req No<span class="badge mandatory" >*</span></label>
|
||||
<label>Req No<span class="badge mandatory">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
|
||||
@ -1732,7 +1746,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Item Code<span class="badge mandatory" >*</span></label>
|
||||
<label>Item Code<span class="badge mandatory">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
//$options = array("0"=>'Item Code');
|
||||
@ -1793,7 +1807,7 @@ if (!empty($getlogpodtl)) {
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="col-md-3">
|
||||
<label>Quantity<span class="badge mandatory" >*</span></label>
|
||||
<label>Quantity<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'ViewQuantity', 'value' => set_value('ViewQuantity'), 'id' => 'ViewQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
|
||||
@ -1802,7 +1816,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory" >*</span></label>
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'ViewRate', 'value' => set_value('ViewRate'), 'id' => 'ViewRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
|
||||
@ -1939,7 +1953,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
|
||||
<label>Service Description<span class="badge mandatory" >*</span></label> <?php
|
||||
<label>Service Description<span class="badge mandatory">*</span></label> <?php
|
||||
$data = array('name' => 'ViewtxtSpcialInstruction', 'value' => set_value('ViewtxtSpcialInstruction'), 'id' => 'ViewtxtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40', 'readonly' => 'true');
|
||||
echo form_textarea($data);
|
||||
?>
|
||||
@ -2159,7 +2173,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
<!--start new fields 1 sep-->
|
||||
<div class="col-md-12">
|
||||
<label>Description Of Service <span class="badge mandatory" >*</label>
|
||||
<label>Description Of Service <span class="badge mandatory">*</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'editdescofpo', 'value' => set_value('editdescofpo', strip_tags($DescriptionOfPo)), 'id' => 'editdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
|
||||
@ -2289,7 +2303,8 @@ if (!empty($getlogpodtl)) {
|
||||
// $logdate = date('d-m-Y', strtotime($oldpo->logDate));
|
||||
// } else {
|
||||
// $logdate = '-';
|
||||
// } ?>
|
||||
// }
|
||||
?>
|
||||
-->
|
||||
<td><?php echo $oldpo->LineItemNos; ?></td>
|
||||
<td><?php echo $oldpo->entity ?></td>
|
||||
@ -2334,7 +2349,8 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
<div class="modal-content" style="width:950px;">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Update Bill <!-- <?php //echo $getdata[0]->BillNo ?> --> <span id="bill"><span> Details</h4>
|
||||
<h4 class="modal-title">Update Bill <!-- <?php //echo $getdata[0]->BillNo
|
||||
?> --> <span id="bill"><span> Details</h4>
|
||||
</div>
|
||||
<form class="tagForm" id="tag-form" method="post" enctype="multipart/form-data">
|
||||
<div class="modal-body" style="padding:0px;">
|
||||
@ -2387,10 +2403,10 @@ if (!empty($getlogpodtl)) {
|
||||
<div align="right"><br />
|
||||
<div>
|
||||
<input type="file" name="POFile" id="POFile">
|
||||
<?php if($PrePOFile){ ?>
|
||||
<label><a title="previously uploaded PO File" href="<?php echo base_url().'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
|
||||
<?php if ($PrePOFile) { ?>
|
||||
<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
|
||||
<?php } ?>
|
||||
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>"/><br>
|
||||
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
|
||||
</div> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
|
||||
<input type="hidden" name="txtStatus" id="txtStatus" />
|
||||
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index; ?>">
|
||||
@ -3076,7 +3092,7 @@ if (!empty($getlogpodtl)) {
|
||||
stat = '<?php echo PO_AWAITING_RELEASE; ?>';
|
||||
} else if (status == '3') {
|
||||
stat = '<?php echo SPECIAL_PO; ?>';
|
||||
} else if (status == '4'){
|
||||
} else if (status == '4') {
|
||||
stat = '<?php echo PO_RELEASED; ?>';
|
||||
}
|
||||
var splinstr = $('#txtSpcialInstruction').val();
|
||||
@ -3761,5 +3777,5 @@ if (!empty($getlogpodtl)) {
|
||||
$('#ServiceQuantity').attr('required', true);
|
||||
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -938,14 +938,14 @@ if (!empty($INRSYMBOL)) {
|
||||
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
|
||||
|
||||
<section class="content">
|
||||
<div style="border:2px solid #333">
|
||||
<div class="box">
|
||||
<div>
|
||||
<center><b>
|
||||
</b></center>
|
||||
</div>
|
||||
<div class="header-container">
|
||||
<h2>Amendment Revenue Purchase Order- <?php echo $PONO; ?></h2>
|
||||
<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a>
|
||||
<!-- <a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a> -->
|
||||
</div>
|
||||
|
||||
<div class="container-fluid">
|
||||
@ -1281,9 +1281,9 @@ 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" ID="PackagingOption" onclick="SetFreightOption();" style="margin-top: -24px;"> <span class="bold">Ok</span></a>
|
||||
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1318,8 +1318,8 @@ 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" ID="ExciseOption" onclick="SetExciseCalculation();" style="margin-top: -24px;"> <span class="bold">Ok</span></a>
|
||||
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1349,8 +1349,8 @@ 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" ID="VatOption" onclick="SetVatCalculation();" style="margin-top: -24px;"> <span class="bold">Ok</span></a>
|
||||
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1378,8 +1378,8 @@ 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" ID="CSTOption" onclick="SetCSTCalculation();" style="margin-top: -24px;"> <span class="bold">Ok</span></a>
|
||||
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1757,8 +1757,8 @@ if (!empty($INRSYMBOL)) {
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3 col-md-offset-9">
|
||||
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||
<a class="btn btn-success EditRevenue" ID="EditRevenue"> <span class="bold">Edit Revenue</span></a>
|
||||
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -2012,6 +2012,7 @@ if (!empty($INRSYMBOL)) {
|
||||
<?php } ?>
|
||||
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
|
||||
</div>
|
||||
<input type="button" class="btn btn-cancel" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
|
||||
<input type="hidden" name="txtPoRange" id="txtPoRange" />
|
||||
<input type="hidden" name="isEdit" id="isEdit" value="0" />
|
||||
<input type="hidden" name="txtStatus" id="txtStatus" />
|
||||
@ -2021,7 +2022,6 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
<!-- <a class="btn btn-success Save" ID="Save" onclick="Save(0)" > <span class="bold">Save</span></a> -->
|
||||
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)"> <span class="bold">Submit</span></a>
|
||||
<input type="button" class="btn btn-success" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
|
||||
|
||||
<!-- <input type="reset" class="btn btn-success" value = "OK"> -->
|
||||
|
||||
@ -2567,7 +2567,7 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
$('#Scheduleby').val('');
|
||||
|
||||
}); <!-- script
|
||||
}); < !--script
|
||||
for table, It works uned the datatable plugin-- >
|
||||
$(function() {
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ $otherref = '';
|
||||
$revenuesubtype = '';
|
||||
$insurencestatus = '';
|
||||
$insurenceno = '';
|
||||
$parentPO= '';
|
||||
$parentPO = '';
|
||||
if (!empty($MaxPODate)) {
|
||||
foreach ($MaxPODate as $date) {
|
||||
$MaxPoDate = $date->PODate;
|
||||
@ -66,10 +66,10 @@ if (!empty($POMaster)) {
|
||||
//print_r($POMaster);
|
||||
//print_r($POItem);
|
||||
foreach ($POMaster as $Req) {
|
||||
$parentPO =$Req->ParentPO;
|
||||
$parentPO = $Req->ParentPO;
|
||||
$SupId = $Req->SupplierID;
|
||||
$SupName = $Req->SupplierName;
|
||||
$Address = $Req->MSME ? "MSME : ".$Req->MSME."\n".$Req->Address :$Req->Address ;
|
||||
$Address = $Req->MSME ? "MSME : " . $Req->MSME . "\n" . $Req->Address : $Req->Address;
|
||||
|
||||
$Pdt = new DateTime($Req->PODate);
|
||||
$PODate = $Pdt->format('d-m-Y');
|
||||
@ -117,7 +117,7 @@ if (!empty($RequistionDetails)) {
|
||||
// $Pdt = new DateTime($Req->PODate);
|
||||
// $PODate = $Pdt->format('Y-m-d');
|
||||
$Requestedby = $ReqDet->Requestedby;
|
||||
$RequesterName = isset($ReqDet->FirstName)?$ReqDet->FirstName:'';
|
||||
$RequesterName = isset($ReqDet->FirstName) ? $ReqDet->FirstName : '';
|
||||
//$Status=$ReqDet->Status;
|
||||
}
|
||||
}
|
||||
@ -132,9 +132,9 @@ if (!empty($getlogpodtl)) {
|
||||
foreach ($getlogpodtl as $values) {
|
||||
$update = $values->FirstName;
|
||||
}
|
||||
}else{
|
||||
$update= [];
|
||||
}
|
||||
} else {
|
||||
$update = [];
|
||||
}
|
||||
?>
|
||||
<style>
|
||||
#packagingcalmodel {
|
||||
@ -418,11 +418,14 @@ if (!empty($getlogpodtl)) {
|
||||
}
|
||||
var d = $('#drpSupplier').val();
|
||||
$.ajax({
|
||||
url:"<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||
type: 'POST',
|
||||
data: {supplierid : d, materialcode: id },
|
||||
data: {
|
||||
supplierid: d,
|
||||
materialcode: id
|
||||
},
|
||||
success: function(response) {
|
||||
if(response) alert(response);
|
||||
if (response) alert(response);
|
||||
}
|
||||
});
|
||||
|
||||
@ -456,11 +459,14 @@ if (!empty($getlogpodtl)) {
|
||||
}
|
||||
var d = $('#drpSupplier').val();
|
||||
$.ajax({
|
||||
url:"<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||
type: 'POST',
|
||||
data: {supplierid : d, materialcode: id },
|
||||
data: {
|
||||
supplierid: d,
|
||||
materialcode: id
|
||||
},
|
||||
success: function(response) {
|
||||
if(response) alert(response);
|
||||
if (response) alert(response);
|
||||
}
|
||||
});
|
||||
|
||||
@ -1837,6 +1843,7 @@ if (!empty($getlogpodtl)) {
|
||||
.num {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.header-container {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
@ -1867,7 +1874,6 @@ if (!empty($getlogpodtl)) {
|
||||
text-align: right;
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
</style>
|
||||
<div class="content-wrapper">
|
||||
<?php
|
||||
@ -1876,12 +1882,12 @@ if (!empty($getlogpodtl)) {
|
||||
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
|
||||
|
||||
<section class="content">
|
||||
<div style="border:2px solid #333">
|
||||
<div class="box">
|
||||
<div id="content"></div>
|
||||
<div class="header-container">
|
||||
<?php if ($parentPO == '') { ?>
|
||||
<h2> Edit Revenue Purchase Order - <?php echo $PONO; ?></h2>
|
||||
<?php } else {?>
|
||||
<?php } else { ?>
|
||||
<h2> Amended Revenue Purchase Order - <?php echo $PONO; ?></h2>
|
||||
<?php } ?>
|
||||
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-cancel" id="back" value="Back">Back</a>
|
||||
@ -1915,7 +1921,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label>Select Supplier<span class="badge mandatory" >*</span></label>
|
||||
<label>Select Supplier<span class="badge mandatory">*</span></label>
|
||||
<?php
|
||||
$options = array("0" => 'Select Supplier');
|
||||
//print_r( $options);
|
||||
@ -1957,7 +1963,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<b><u>Select Delivery By<span class="badge mandatory" >*</span></u></b><br />
|
||||
<b><u>Select Delivery By<span class="badge mandatory">*</span></u></b><br />
|
||||
<div class="centered">
|
||||
|
||||
<?php echo form_label('Date', 'Date') . " " . form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
|
||||
@ -1967,7 +1973,7 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
</div>
|
||||
<div class="col-md-3" id="Deliverydtdiv">
|
||||
<label>Delivery Date<span class="badge mandatory" >*</span></label>
|
||||
<label>Delivery Date<span class="badge mandatory">*</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;');
|
||||
@ -1977,7 +1983,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" id="Schedulediv" style="display:none;">
|
||||
<label>Schedule By<span class="badge mandatory" >*</span></label>
|
||||
<label>Schedule By<span class="badge mandatory">*</span></label>
|
||||
<?php
|
||||
$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverSchedule), 'id' => 'Scheduleby', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
|
||||
echo Form_textarea($data);
|
||||
@ -2261,13 +2267,13 @@ if (!empty($getlogpodtl)) {
|
||||
<div class="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{ ?>
|
||||
<?php } else { ?>
|
||||
<div class="col-md-3 col-md-offset-7" align="right" style="padding:5px">
|
||||
</div>
|
||||
<?php } ?>
|
||||
<div class="col-md-1" align="right">
|
||||
<!-- <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>
|
||||
<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-primary" id="abcd">Select Line Item</button> </a>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
@ -2333,7 +2339,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-2">
|
||||
<label>Item Code<span class="badge mandatory" >*</span></label>
|
||||
<label>Item Code<span class="badge mandatory">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
$options = array("0" => 'Item Code');
|
||||
@ -2364,7 +2370,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
<div class="col-md-6" style="padding:0px;">
|
||||
<div class="col-md-3">
|
||||
<label>Quantity<span class="badge mandatory" >*</span></label>
|
||||
<label>Quantity<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
|
||||
@ -2373,7 +2379,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory" >*</span></label>
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
|
||||
@ -2652,7 +2658,7 @@ if (!empty($getlogpodtl)) {
|
||||
<div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Req No<span class="badge mandatory" >*</span></label>
|
||||
<label>Req No<span class="badge mandatory">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
|
||||
@ -2692,7 +2698,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-2">
|
||||
<label>Item Code<span class="badge mandatory" >*</span></label>
|
||||
<label>Item Code<span class="badge mandatory">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
$options = array("0" => 'Item Code');
|
||||
@ -2723,7 +2729,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
<div class="col-md-6" style="padding: 0px;">
|
||||
<div class="col-md-3">
|
||||
<label>Quantity<span class="badge mandatory" >*</span></label>
|
||||
<label>Quantity<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?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;');
|
||||
@ -2732,7 +2738,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory" >*</span></label>
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?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;');
|
||||
@ -3019,7 +3025,7 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Req No<span class="badge mandatory" >*</span></label>
|
||||
<label>Req No<span class="badge mandatory">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
|
||||
@ -3059,7 +3065,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-2">
|
||||
<label>Item Code<span class="badge mandatory" >*</span></label>
|
||||
<label>Item Code<span class="badge mandatory">*</span></label>
|
||||
<div>
|
||||
|
||||
<?php
|
||||
@ -3089,7 +3095,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
<div class="col-md-6" style="padding:0px;">
|
||||
<div class="col-md-3">
|
||||
<label>Quantity<span class="badge mandatory" >*</span></label>
|
||||
<label>Quantity<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'ViewQuantity', 'value' => set_value('ViewQuantity'), 'id' => 'ViewQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'readonly' => 'true');
|
||||
@ -3098,7 +3104,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory" >*</span></label>
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'ViewRate', 'value' => set_value('ViewRate'), 'id' => 'ViewRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'style' => 'text-align:right;');
|
||||
@ -3122,9 +3128,9 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- --------------------------------------- -->
|
||||
<!-- --------------------------------------- -->
|
||||
|
||||
<!-- --------------------------------------- -->
|
||||
<!-- --------------------------------------- -->
|
||||
<div class="col-md-12" style="padding:0px;">
|
||||
|
||||
<div class="col-md-12">
|
||||
@ -3768,8 +3774,8 @@ if (!empty($getlogpodtl)) {
|
||||
<div id="EditRevenueSplPOModel" class="modal fade" data-backdrop-limit="1" role="dialog" aria-labelledby="myModalLabel">
|
||||
<div class="modal-dialog">
|
||||
<?php
|
||||
$date = isset($getdata[0]->DeliveryChellanDate) ? format_date($getdata[0]->DeliveryChellanDate, 0,'d-m-Y') : null;
|
||||
$mrcdate = isset($getdata[0]->MaterialRcvdDate) ? format_date($getdata[0]->MaterialRcvdDate, 0,'d-m-Y') : null;
|
||||
$date = isset($getdata[0]->DeliveryChellanDate) ? format_date($getdata[0]->DeliveryChellanDate, 0, 'd-m-Y') : null;
|
||||
$mrcdate = isset($getdata[0]->MaterialRcvdDate) ? format_date($getdata[0]->MaterialRcvdDate, 0, 'd-m-Y') : null;
|
||||
?>
|
||||
|
||||
<div class="modal-content" style="width:950px;">
|
||||
@ -3780,7 +3786,7 @@ if (!empty($getlogpodtl)) {
|
||||
<div class="modal-body" style="padding:0px;">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4 pad"><strong>Delivery Challan /Inv No</strong>
|
||||
<input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12" class="form-control" value="<?php echo isset($getdata[0]->DeliveryChellanOrInvoiceNo) ?$getdata[0]->DeliveryChellanOrInvoiceNo : null ?>" onkeypress="return isNumberKey(event)">
|
||||
<input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12" class="form-control" value="<?php echo isset($getdata[0]->DeliveryChellanOrInvoiceNo) ? $getdata[0]->DeliveryChellanOrInvoiceNo : null ?>" onkeypress="return isNumberKey(event)">
|
||||
</div>
|
||||
<div class="col-md-4 pad"><strong>Delivery Challan /Inv Date</strong>
|
||||
|
||||
@ -3803,10 +3809,10 @@ if (!empty($getlogpodtl)) {
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="col-md-4 pad"><strong>Vehicle No</strong>
|
||||
<input type="text" name="VehicleNo" id="VehicleNo" maxlength="13" class="form-control" value="<?php echo isset($getdata[0]->VehicleNo)?$getdata[0]->VehicleNo:null; ?>">
|
||||
<input type="text" name="VehicleNo" id="VehicleNo" maxlength="13" class="form-control" value="<?php echo isset($getdata[0]->VehicleNo) ? $getdata[0]->VehicleNo : null; ?>">
|
||||
</div>
|
||||
<div class="col-md-4 pad"><strong>Courier No</strong>
|
||||
<input type="text" name="CourierNo" id="CourierNo" maxlength="12" class="form-control" value="<?php echo isset($getdata[0]->CourierNo)?$getdata[0]->CourierNo:null; ?>">
|
||||
<input type="text" name="CourierNo" id="CourierNo" maxlength="12" class="form-control" value="<?php echo isset($getdata[0]->CourierNo) ? $getdata[0]->CourierNo : null; ?>">
|
||||
</div>
|
||||
<div class="col-md-4" id="QualityChecked"><strong>Is Quality Check Required</strong>
|
||||
<div class="radio">
|
||||
@ -3880,10 +3886,10 @@ if (!empty($getlogpodtl)) {
|
||||
<div class="col-md-5 col-md-offset-7" align="right"><br />
|
||||
<div>
|
||||
<input type="file" name="POFile" id="POFile">
|
||||
<?php if($PrePOFile){ ?>
|
||||
<label><a title="previously uploaded PO File" href="<?php echo base_url().'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
|
||||
<?php if ($PrePOFile) { ?>
|
||||
<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
|
||||
<?php } ?>
|
||||
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>"/><br>
|
||||
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
|
||||
</div>
|
||||
<input type="hidden" name="txtPoRange" id="txtPoRange" />
|
||||
<input type="hidden" name="isEdit" id="isEdit" value="0" />
|
||||
@ -3940,8 +3946,8 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
<script type="text/html" id="RevenueList">
|
||||
<tr id="<%=index%>">
|
||||
@ -4707,8 +4713,7 @@ if (!empty($getlogpodtl)) {
|
||||
stat = '<?php echo PO_CREATED; ?>';
|
||||
} else if (status == '4') {
|
||||
stat = '<?php echo PO_RELEASED; ?>';
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
stat = '<?php echo $PONOStatus; ?>';
|
||||
}
|
||||
var deladd = $('#DeliveryAddr').val();
|
||||
@ -4770,7 +4775,8 @@ if (!empty($getlogpodtl)) {
|
||||
alert("Error");
|
||||
}
|
||||
|
||||
},error: function(jqXHR, textStatus, errorThrown) {
|
||||
},
|
||||
error: function(jqXHR, textStatus, errorThrown) {
|
||||
console.error("AJAX Error: " + textStatus + ": " + errorThrown);
|
||||
alert("Error: " + textStatus);
|
||||
}
|
||||
@ -5424,5 +5430,5 @@ if (!empty($getlogpodtl)) {
|
||||
$('#Quantity').removeAttr('readonly');
|
||||
$('#Quantity').attr('required', true);
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@ -58,7 +58,7 @@ if (!empty($POMaster)) {
|
||||
|
||||
$SupId = $Req->SupplierID;
|
||||
$SupName = $Req->SupplierName;
|
||||
$Address = $Req->MSME ? "MSME : ".$Req->MSME."\n".$Req->Address :$Req->Address ;
|
||||
$Address = $Req->MSME ? "MSME : " . $Req->MSME . "\n" . $Req->Address : $Req->Address;
|
||||
$pdt = new DateTime($Req->PODate);
|
||||
$PODate = $pdt->format('d-m-Y');
|
||||
$DeliverOption = $Req->DeliveryOption;
|
||||
@ -86,7 +86,6 @@ if (!empty($POMaster)) {
|
||||
$DescriptionOfPo = $Req->Description_Of_Service;
|
||||
$BudgetType = $Req->BudgetType;
|
||||
$PrePOFile = $Req->POFile;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -257,7 +256,8 @@ foreach ($PaymentTerms as $TER) {
|
||||
$("#SupAddress").val("MSME :" + obj.MSME + "\n" + obj.Address);
|
||||
} else {
|
||||
$("#SupAddress").val(obj.Address);
|
||||
} $("#PaymentTerms").val(obj.PaymentID);
|
||||
}
|
||||
$("#PaymentTerms").val(obj.PaymentID);
|
||||
|
||||
|
||||
|
||||
@ -405,11 +405,14 @@ foreach ($PaymentTerms as $TER) {
|
||||
}
|
||||
var d = $('#drpSupplier').val();
|
||||
$.ajax({
|
||||
url:"<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||
type: 'POST',
|
||||
data: {supplierid : drpSupplier, materialcode: id },
|
||||
data: {
|
||||
supplierid: drpSupplier,
|
||||
materialcode: id
|
||||
},
|
||||
success: function(response) {
|
||||
if(response) alert(response);
|
||||
if (response) alert(response);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@ -445,11 +448,14 @@ foreach ($PaymentTerms as $TER) {
|
||||
|
||||
var d = $('#drpSupplier').val();
|
||||
$.ajax({
|
||||
url:"<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||
url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
|
||||
type: 'POST',
|
||||
data: {supplierid : d, materialcode: id },
|
||||
data: {
|
||||
supplierid: d,
|
||||
materialcode: id
|
||||
},
|
||||
success: function(response) {
|
||||
if(response) alert(response);
|
||||
if (response) alert(response);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@ -644,6 +650,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
.num {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.header-container {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
@ -656,32 +663,38 @@ foreach ($PaymentTerms as $TER) {
|
||||
text-align: center;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.centered {
|
||||
display: flex;
|
||||
/* justify-content: center; */
|
||||
align-items: center;
|
||||
height: 10vh;
|
||||
}
|
||||
.centered label, .centered input {
|
||||
|
||||
.centered label,
|
||||
.centered input {
|
||||
margin: 0 5px;
|
||||
}
|
||||
.mandatory { color:red;text-align:right;background-color: white;}
|
||||
|
||||
.mandatory {
|
||||
color: red;
|
||||
text-align: right;
|
||||
background-color: white;
|
||||
}
|
||||
</style>
|
||||
<div class="content-wrapper">
|
||||
<?php
|
||||
$attributes = array('class' => 'form-label-left ServicePO ', 'name' => 'ServicePO', 'id' => 'ServicePO','enctype' => 'multipart/form-data');
|
||||
$attributes = array('class' => 'form-label-left ServicePO ', 'name' => 'ServicePO', 'id' => 'ServicePO', 'enctype' => 'multipart/form-data');
|
||||
|
||||
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
|
||||
|
||||
<section class="content">
|
||||
<div style="border:2px solid #333">
|
||||
<div class="box">
|
||||
<div id="content"></div>
|
||||
<div class="header-container">
|
||||
<?php if ($parentPO == '') { ?>
|
||||
<h2> Edit Service Purchase Order-<?php echo "$PONO"?></h2>
|
||||
<?php } else {?>
|
||||
<h2> Amended Service Purchase Order-<?php echo "$PONO"?></h2>
|
||||
<?php } ?>
|
||||
|
||||
<h2> Amended Service Purchase Order-<?php echo "$PONO" ?></h2>
|
||||
|
||||
<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a>
|
||||
</div>
|
||||
<div class="container-fluid">
|
||||
@ -717,7 +730,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
|
||||
if (!empty($Suplist)) {
|
||||
foreach ($Suplist as $SID) :
|
||||
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName ;
|
||||
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
|
||||
endforeach;
|
||||
}
|
||||
|
||||
@ -740,7 +753,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Work Status<span class="badge mandatory" >*</span></label>
|
||||
<label>Work Status<span class="badge mandatory">*</span></label>
|
||||
<?php
|
||||
if (!empty($WorkStatus)) {
|
||||
//print_r($WorkStatus);
|
||||
@ -768,7 +781,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" id="Deliverydtdiv">
|
||||
<label>Delivery Date<span class="badge mandatory" >*</span></label>
|
||||
<label>Delivery Date<span class="badge mandatory">*</span></label>
|
||||
<?php if ($DeliverOption == 1) {
|
||||
$Deliverydt = null;
|
||||
} ?>
|
||||
@ -781,7 +794,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" id="Schedulediv" style="display:none;">
|
||||
<label>Schedule By<span class="badge mandatory" >*</span></label>
|
||||
<label>Schedule By<span class="badge mandatory">*</span></label>
|
||||
<input type="hidden" name="beforeScheduleby" value="<?php echo $DeliverSchedule ?>">
|
||||
<?php
|
||||
$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverSchedule), 'id' => 'Scheduleby', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
|
||||
@ -909,7 +922,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-3" id="otheroptiondiv" style="display:none;">
|
||||
<label>Description of Payable Terms<span class="badge mandatory" >*</span></label>
|
||||
<label>Description of Payable Terms<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true');
|
||||
@ -954,7 +967,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" id="insuranceTxtDiv" style="display:block;">
|
||||
<label>Insurance No / Insurance Details<span class="badge mandatory" >*</span></label>
|
||||
<label>Insurance No / Insurance Details<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber', $InsuranceNumber), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true');
|
||||
@ -1000,7 +1013,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Req No<span class="badge mandatory" >*</span></label>
|
||||
<label>Req No<span class="badge mandatory">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
|
||||
@ -1042,7 +1055,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Item Code<span class="badge mandatory" >*</span></label>*</span></label>
|
||||
<label>Item Code<span class="badge mandatory">*</span></label>*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
$options = array("0" => 'Item Code');
|
||||
@ -1106,7 +1119,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="col-md-3">
|
||||
<label>Quantity<span class="badge mandatory" >*</span></label>*</span></label>
|
||||
<label>Quantity<span class="badge mandatory">*</span></label>*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
|
||||
@ -1115,7 +1128,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory" >*</span></label>*</span></label>
|
||||
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
|
||||
@ -1487,7 +1500,7 @@ foreach ($PaymentTerms as $TER) {
|
||||
</div>
|
||||
<!--start new fields 1 sep-->
|
||||
<div class="col-md-12">
|
||||
<label>Description Of Service<span class="badge mandatory" >*</span></label>*</label>
|
||||
<label>Description Of Service<span class="badge mandatory">*</span></label>*</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'amenddescofpo', 'value' => set_value('amenddescofpo', $DescriptionOfPo), 'id' => 'amenddescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
|
||||
@ -1510,10 +1523,10 @@ foreach ($PaymentTerms as $TER) {
|
||||
<div align="right" style="padding-right:10px">
|
||||
<div>
|
||||
<input type="file" name="POFile" id="POFile">
|
||||
<?php if($PrePOFile){ ?>
|
||||
<label><a title="previously uploaded PO File" href="<?php echo base_url().'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
|
||||
<?php if ($PrePOFile) { ?>
|
||||
<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
|
||||
<?php } ?>
|
||||
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>"/><br>
|
||||
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
|
||||
</div>
|
||||
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
|
||||
<input type="hidden" name="txtStatus" id="txtStatus" />
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -50,7 +50,7 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
||||
$AvlAmount = number_format($AvlimportBudAmt, 2, '.', '');
|
||||
}else{
|
||||
} else {
|
||||
$AvlAmount = 0;
|
||||
}
|
||||
|
||||
@ -228,6 +228,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
||||
.num {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.header-container {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
@ -258,7 +259,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
||||
text-align: right;
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
@ -272,7 +272,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
||||
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
|
||||
|
||||
|
||||
<div style="border:2px solid #333">
|
||||
<div class="box">
|
||||
<div class="header-container">
|
||||
<h2>Import Purchase Order</h2>
|
||||
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-cancel" id="back" value="Back">Back</a>
|
||||
@ -316,7 +316,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
||||
//print_r( $options);
|
||||
if (!empty($Suplist)) {
|
||||
foreach ($Suplist as $SID) :
|
||||
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName ;
|
||||
$options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
|
||||
endforeach;
|
||||
}
|
||||
|
||||
@ -396,6 +396,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
|
||||
@ -1734,16 +1734,24 @@ if (!empty($INRSYMBOL)) {
|
||||
text-align: center;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.centered {
|
||||
display: flex;
|
||||
/* justify-content: center; */
|
||||
align-items: center;
|
||||
height: 10vh;
|
||||
}
|
||||
.centered label, .centered input {
|
||||
|
||||
.centered label,
|
||||
.centered input {
|
||||
margin: 0 5px;
|
||||
}
|
||||
.mandatory { color:red;text-align:right;background-color: white;}
|
||||
|
||||
.mandatory {
|
||||
color: red;
|
||||
text-align: right;
|
||||
background-color: white;
|
||||
}
|
||||
</style>
|
||||
<div class="content-wrapper">
|
||||
<?php
|
||||
@ -1751,7 +1759,7 @@ if (!empty($INRSYMBOL)) {
|
||||
|
||||
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
|
||||
<section class="content">
|
||||
<div style="border:2px solid #333">
|
||||
<div class="box">
|
||||
<div id="content"></div>
|
||||
<div class="header-container">
|
||||
<h2>Revenue Purchase Order</h2>
|
||||
@ -1836,7 +1844,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<b><u>Select Delivery By<span class="badge mandatory" >*</span></u></b><br />
|
||||
<b><u>Select Delivery By<span class="badge mandatory">*</span></u></b><br />
|
||||
<div class="centered">
|
||||
<?php echo form_label('Date', 'Date') . " " . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "0", "checked" => "checked")); ?>
|
||||
<?php echo form_label('Schedule', 'Schedule') . " " . form_radio(array("name" => "DateRange", "id" => "Schedule", "value" => "1")); ?>
|
||||
@ -1852,7 +1860,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" id="Schedulediv" style="display:none;">
|
||||
<label>Schedule By<span class="badge mandatory" >*</span></label>
|
||||
<label>Schedule By<span class="badge mandatory">*</span></label>
|
||||
<?php
|
||||
$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby'), 'id' => 'Scheduleby', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
|
||||
echo Form_textarea($data);
|
||||
@ -1962,7 +1970,7 @@ if (!empty($INRSYMBOL)) {
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-3" id="otheroptiondiv" style="display:none;">
|
||||
<label>Description of Payable Terms<span class="badge mandatory" >*</span></label>
|
||||
<label>Description of Payable Terms<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true');
|
||||
@ -1984,7 +1992,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" id="InsuranceNumberdiv" style="display:block;">
|
||||
<label>Insurance No / Insurance Details<span class="badge mandatory" >*</span></label>
|
||||
<label>Insurance No / Insurance Details<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'InsuranceNumber', 'InsuranceNumber' => set_value('InsuranceNumber'), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true');
|
||||
|
||||
@ -593,6 +593,7 @@ if (!empty($INRSYMBOL)) {
|
||||
.num {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.header-container {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
@ -605,17 +606,24 @@ if (!empty($INRSYMBOL)) {
|
||||
text-align: center;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.centered {
|
||||
display: flex;
|
||||
/* justify-content: center; */
|
||||
align-items: center;
|
||||
height: 10vh;
|
||||
}
|
||||
.centered label, .centered input {
|
||||
|
||||
.centered label,
|
||||
.centered input {
|
||||
margin: 0 5px;
|
||||
}
|
||||
.mandatory { color:red;text-align:right;background-color: white;}
|
||||
|
||||
.mandatory {
|
||||
color: red;
|
||||
text-align: right;
|
||||
background-color: white;
|
||||
}
|
||||
</style>
|
||||
<div class="content-wrapper">
|
||||
<?php
|
||||
@ -624,7 +632,7 @@ if (!empty($INRSYMBOL)) {
|
||||
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
|
||||
|
||||
<section class="content">
|
||||
<div style="border:2px solid #333">
|
||||
<div class="box">
|
||||
<div id="content"></div>
|
||||
<div class="header-container">
|
||||
<h2>Service Purchase Order</h2>
|
||||
@ -714,14 +722,14 @@ if (!empty($INRSYMBOL)) {
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<b><u>Select Delivery By<span class="badge mandatory" >*</span></u></b><br />
|
||||
<b><u>Select Delivery By<span class="badge mandatory">*</span></u></b><br />
|
||||
<div class="centered">
|
||||
<?php echo form_label('Date', 'Date') . " " . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "0", 'checked' => set_radio('DateRange', '0', TRUE))); ?>
|
||||
<?php echo form_label('Schedule', 'Schedule') . " " . form_radio(array("name" => "DateRange", "id" => "Schedule", "value" => "1", 'checked' => set_radio('DateRange', '1', FALSE))); ?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" id="Deliverydtdiv">
|
||||
<label>Delivery Date<span class="badge mandatory" >*</span></label>
|
||||
<label>Delivery Date<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $CurrentDate), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
|
||||
|
||||
@ -1,13 +1,22 @@
|
||||
<style>
|
||||
.table-bordered>thead>tr>th, .table-bordered>tbody>tr>th, .table-bordered>tfoot>tr>th, .table-bordered>thead>tr>td, .table-bordered>tbody>tr>td, .table-bordered>tfoot>tr>td {border: 1px solid #333;}
|
||||
</style>
|
||||
.table-bordered>thead>tr>th,
|
||||
.table-bordered>tbody>tr>th,
|
||||
.table-bordered>tfoot>tr>th,
|
||||
.table-bordered>thead>tr>td,
|
||||
.table-bordered>tbody>tr>td,
|
||||
.table-bordered>tfoot>tr>td {
|
||||
border: 1px solid #333;
|
||||
}
|
||||
</style>
|
||||
<div class="content-wrapper">
|
||||
|
||||
|
||||
<section class="content">
|
||||
|
||||
<div style="border:2px solid #333">
|
||||
<center><b><h2>Service Purchase Order.</h2></b></center>
|
||||
<div class="box">
|
||||
<center><b>
|
||||
<h2>Service Purchase Order.</h2>
|
||||
</b></center>
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
@ -15,20 +24,19 @@
|
||||
<label>Requistion No</label>
|
||||
<div class="form-control">
|
||||
<?php
|
||||
$options = array("0"=>'Requistion No');
|
||||
$options = array("0" => 'Requistion No');
|
||||
//print_r( $options);
|
||||
|
||||
if(!empty($POType))
|
||||
{
|
||||
foreach ($SupplierName as $SID):
|
||||
if (!empty($POType)) {
|
||||
foreach ($SupplierName as $SID) :
|
||||
|
||||
|
||||
$options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
|
||||
$options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName;
|
||||
|
||||
endforeach;
|
||||
}
|
||||
|
||||
echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"');
|
||||
echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control required"', 'required="true"');
|
||||
|
||||
?>
|
||||
</div>
|
||||
@ -37,7 +45,7 @@
|
||||
<label>PO Date</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -46,7 +54,7 @@
|
||||
<label>Purchase Order Type</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -55,20 +63,19 @@
|
||||
<label>Supplier</label>
|
||||
<div class="form-control">
|
||||
<?php
|
||||
$options = array("0"=>'Supplier');
|
||||
$options = array("0" => 'Supplier');
|
||||
//print_r( $options);
|
||||
|
||||
if(!empty($POType))
|
||||
{
|
||||
foreach ($SupplierName as $SID):
|
||||
if (!empty($POType)) {
|
||||
foreach ($SupplierName as $SID) :
|
||||
|
||||
|
||||
$options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
|
||||
$options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName;
|
||||
|
||||
endforeach;
|
||||
}
|
||||
|
||||
echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"');
|
||||
echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control required"', 'required="true"');
|
||||
|
||||
?>
|
||||
</div>
|
||||
@ -77,7 +84,7 @@
|
||||
<label>Address</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -86,7 +93,7 @@
|
||||
<label>City</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -98,13 +105,13 @@
|
||||
<div class="container-fluid">
|
||||
<table class="table table-bordered" style="border:1px solid #333">
|
||||
<div align="right" style="padding-right:10px">
|
||||
<div align="right">
|
||||
<div align="right">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3 col-md-offset-7" align="right" style="padding:10px">
|
||||
<!-- <input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
|
||||
</div>
|
||||
<div class="col-md-1" align="right">
|
||||
<a data-toggle="modal" data-target="#myModal1"><button type="button" class="btn btn-success" data-dismiss="modal" >Add Line Item</button> </a>
|
||||
<a data-toggle="modal" data-target="#myModal1"><button type="button" class="btn btn-success" data-dismiss="modal">Add Line Item</button> </a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -115,7 +122,9 @@
|
||||
<div class="modal-content" style="width:900px;">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
<center><h4>Add Item </h4></center>
|
||||
<center>
|
||||
<h4>Add Item </h4>
|
||||
</center>
|
||||
</div>
|
||||
<div align="left">
|
||||
|
||||
@ -124,20 +133,19 @@
|
||||
<label>Req No</label>
|
||||
<div class="form-control">
|
||||
<?php
|
||||
$options = array("0"=>'Req No');
|
||||
$options = array("0" => 'Req No');
|
||||
//print_r( $options);
|
||||
|
||||
if(!empty($POType))
|
||||
{
|
||||
foreach ($SupplierName as $SID):
|
||||
if (!empty($POType)) {
|
||||
foreach ($SupplierName as $SID) :
|
||||
|
||||
|
||||
$options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
|
||||
$options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName;
|
||||
|
||||
endforeach;
|
||||
}
|
||||
|
||||
echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"');
|
||||
echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control required"', 'required="true"');
|
||||
|
||||
?>
|
||||
</div>
|
||||
@ -147,7 +155,7 @@
|
||||
<label>Department Name</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -156,7 +164,7 @@
|
||||
<label>Cost Center Name</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -165,7 +173,7 @@
|
||||
<label>Available Budget Amount</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -176,20 +184,19 @@
|
||||
<label>Item Code</label>
|
||||
<div class="form-control">
|
||||
<?php
|
||||
$options = array("0"=>'Item Code');
|
||||
$options = array("0" => 'Item Code');
|
||||
//print_r( $options);
|
||||
|
||||
if(!empty($POType))
|
||||
{
|
||||
foreach ($SupplierName as $SID):
|
||||
if (!empty($POType)) {
|
||||
foreach ($SupplierName as $SID) :
|
||||
|
||||
|
||||
$options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName;
|
||||
$options[$SID->SupplierID] = $SID->SupplierID . ' ' . ' - ' . ' ' . $SID->SupplierName;
|
||||
|
||||
endforeach;
|
||||
}
|
||||
|
||||
echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"');
|
||||
echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control required"', 'required="true"');
|
||||
|
||||
?>
|
||||
</div>
|
||||
@ -199,7 +206,7 @@
|
||||
<label>Item Name</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -208,7 +215,7 @@
|
||||
<label>UOM</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -217,7 +224,7 @@
|
||||
<label>Quantity</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -226,7 +233,7 @@
|
||||
<label>Rate Per unit</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -235,7 +242,7 @@
|
||||
<label>Total Amount</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -250,7 +257,7 @@
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -259,7 +266,7 @@
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'placeholder' => 'After Service Tax','required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'placeholder' => 'After Service Tax', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -275,7 +282,7 @@
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -284,7 +291,7 @@
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'placeholder' => 'After Edu.','required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'placeholder' => 'After Edu.', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -301,7 +308,7 @@
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -310,7 +317,7 @@
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'placeholder' => 'After High Edu.','required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'placeholder' => 'After High Edu.', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -325,7 +332,7 @@
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -334,7 +341,7 @@
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'placeholder' => 'After Other Taxes','required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'placeholder' => 'After Other Taxes', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -346,7 +353,7 @@
|
||||
<label>Total Order value</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'placeholder' => 'Total value','required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'placeholder' => 'Total value', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -365,10 +372,10 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<br/>
|
||||
<br />
|
||||
<!-- <thead style="background-color:#fff"> -->
|
||||
<thead>
|
||||
<tr>
|
||||
@ -420,7 +427,7 @@
|
||||
|
||||
<div class="form-group">
|
||||
<label>Total Order Value :</label> <?php
|
||||
$data = array('name' => 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
|
||||
$data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity', 'class' => 'form-control', 'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
@ -430,7 +437,7 @@
|
||||
<button type="button" class="btn btn-success">Cancel</button>
|
||||
|
||||
</div>
|
||||
<br/>
|
||||
<br />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -258,9 +258,9 @@
|
||||
</div>
|
||||
|
||||
<div class="buttonContainer">
|
||||
<a class="btn btn-cancel" data-dismiss="modal" value="Close">Close</a>
|
||||
<a class="btn btn-primary" id="draftIGR" value="draftIGR">Draft IGR</a>
|
||||
<a class="btn btn-primary" id="generateIGR" value="generateIGR">Generate IGR</a>
|
||||
<a class="btn btn-primary" data-dismiss="modal" value="Close">Close</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -345,7 +345,7 @@
|
||||
<div class="modal-footer">
|
||||
<center>
|
||||
<a class="btn btn-primary" onclick="modalSave()" id="modalsave"> <span class="bold">Save</span>
|
||||
<a class="btn btn-primary" data-dismiss="modal" value="Close">Close</a>
|
||||
<a class="btn btn-cancel" data-dismiss="modal" value="Close">Close</a>
|
||||
</center>
|
||||
</div><!-- footer div closed -->
|
||||
</div><!-- modal content div closed-->
|
||||
@ -365,7 +365,7 @@
|
||||
</div>
|
||||
<div style="margin:20px;" id="HisStatement"></div>
|
||||
<div style="text-align: right; margin:5px;">
|
||||
<a class="btn btn-success" data-dismiss="modal" value="Close">Close</a>
|
||||
<a class="btn btn-cancel" data-dismiss="modal" value="Close">Close</a>
|
||||
</div>
|
||||
<br />
|
||||
</div>
|
||||
@ -386,7 +386,7 @@
|
||||
|
||||
<div style="margin:20px;" id="CCStatement"></div>
|
||||
<div style="text-align: right; margin:5px;">
|
||||
<a class="btn btn-success" data-dismiss="modal" value="Close">Close</a>
|
||||
<a class="btn btn-cancel" data-dismiss="modal" value="Close">Close</a>
|
||||
</div>
|
||||
<br />
|
||||
</div>
|
||||
@ -430,7 +430,7 @@
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="modal-footer">
|
||||
<a class="btn btn-primary" data-dismiss="modal" value="close">Close</a>
|
||||
<a class="btn btn-cancel" data-dismiss="modal" value="close">Close</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@ -468,7 +468,6 @@
|
||||
<div class="col-md-12 text-right">
|
||||
<div class="col-md-4 col-md-offset-8">
|
||||
<a class="btn btn-success" onclick="fileupdate()"> <span class="bold">Update</span>
|
||||
|
||||
<a class="btn btn-success" data-dismiss="modal" value="Close">Close</a>
|
||||
</div>
|
||||
</div>
|
||||
@ -607,10 +606,10 @@
|
||||
var dcd2 = (String(dcd.getDate()).padStart(2, '0') + '-' + (String(dcd.getMonth() + 1).padStart(2, '0')) + '-' + dcd.getFullYear());
|
||||
$("#Invoice_Date").val(dcd2);
|
||||
console.log(item.MaterialRcvdDate)
|
||||
var Mat_rcv_date = (item.MaterialRcvdDate === null) ? ' ' : formatDateTime(new Date(item.MaterialRcvdDate));
|
||||
$("#MaterialRcvdDate").val(GrossWeightDate);
|
||||
var Mat_rcv_date = (item.MaterialRcvdDate === null) ? ' ' : formatDateTime(item.MaterialRcvdDate,1);
|
||||
$("#MaterialRcvdDate").val(Mat_rcv_date);
|
||||
console.log(item.MaterialRcvdDate)
|
||||
var gross_rcv_date = (item.GrossWeightDate === null) ? ' ' : formatDateTime(new Date(item.GrossWeightDate));
|
||||
var gross_rcv_date = (item.GrossWeightDate === null) ? ' ' : formatDateTime(item.GrossWeightDate,2);
|
||||
$("#ser").val(item.ServiceDescription);
|
||||
|
||||
i = i + 1;
|
||||
@ -869,7 +868,7 @@
|
||||
function constructSentence(record) {
|
||||
let str = record.field;
|
||||
let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2');
|
||||
let sentence = record.FullName + ' on ' + formatDateTime(record.history_dated) + " " + fieldName + " ";
|
||||
let sentence = record.FullName + ' on ' + formatDateTime(record.history_dated,2) + " " + fieldName + " ";
|
||||
if (parseInt(record.is_add) === 1) {
|
||||
sentence += record.new_data + " was added.";
|
||||
} else if (parseInt(record.is_edit) === 1) {
|
||||
@ -1150,9 +1149,9 @@ function deleteBill(Billno,i){
|
||||
|
||||
// Set modal inputs with the retrieved values
|
||||
$("#GrossWeight").val(v1);
|
||||
$("#GrossWeightDate").val(v2);
|
||||
$("#GrossWeightDate").val(formatDateTime(v2,2));
|
||||
$("#TareWeight").val(v3);
|
||||
$("#TareWeightDate").val(v4);
|
||||
$("#TareWeightDate").val(formatDateTime(v4,2) );
|
||||
$("#NetWeight").val(v5);
|
||||
$("#CurrentInx").val(inx);
|
||||
|
||||
@ -1257,13 +1256,32 @@ function deleteBill(Billno,i){
|
||||
|
||||
</script>
|
||||
<script>
|
||||
function formatDateTime(dateString) {
|
||||
// Check if the date string is null
|
||||
if (dateString === null) {
|
||||
return ' ';
|
||||
function formatDateTime(dateString,flag) {
|
||||
// Note 1 means DATE only
|
||||
// 2 means DATE and Time
|
||||
// Check if the date string is null or empty
|
||||
if (!dateString || dateString === null || dateString === '0000-00-00 00:00:00') {
|
||||
return '';
|
||||
} else {
|
||||
// Create a new Date object from the date string
|
||||
var date = new Date(dateString);
|
||||
|
||||
console.log("Received date string:", dateString);
|
||||
|
||||
// Split the date string into date and time components
|
||||
var dateTimeParts = dateString.split(' ');
|
||||
var dateParts = dateTimeParts[0].split('-');
|
||||
var timeParts = dateTimeParts[1].split(':');
|
||||
|
||||
// Extract individual components
|
||||
var year = parseInt(dateParts[0], 10);
|
||||
var month = parseInt(dateParts[1], 10) - 1; // Months are zero-based in JavaScript
|
||||
var day = parseInt(dateParts[2], 10);
|
||||
|
||||
var hours = parseInt(timeParts[0], 10);
|
||||
var minutes = parseInt(timeParts[1], 10);
|
||||
var seconds = parseInt(timeParts[2], 10);
|
||||
|
||||
// Create a new Date object
|
||||
var date = new Date(year, month, day, hours, minutes, seconds);
|
||||
|
||||
// Extract date components
|
||||
var day = date.getDate().toString().padStart(2, '0');
|
||||
@ -1274,13 +1292,16 @@ function deleteBill(Billno,i){
|
||||
var hours = date.getHours().toString().padStart(2, '0');
|
||||
var minutes = date.getMinutes().toString().padStart(2, '0');
|
||||
var seconds = date.getSeconds().toString().padStart(2, '0');
|
||||
|
||||
var formattedDate = '';
|
||||
// Format the date and time in DD-MM-YYYY HH:MM:SS format
|
||||
var formattedDate = `${day}-${month}-${year} ${hours}:${minutes}:${seconds}`;
|
||||
|
||||
if(flag == 1){
|
||||
formattedDate = `${day}-${month}-${year}`;
|
||||
}else if (flag == 2){
|
||||
formattedDate = `${day}-${month}-${year} ${hours}:${minutes}:${seconds}`;
|
||||
}
|
||||
return formattedDate;
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<script>
|
||||
function SetRemarks(RowId) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user