CHANGE_TRACKER_ISSUE_6

app/Controllers/Amendmentpurchaseorder.php

@@ -127,6 +127,8 @@ class Amendmentpurchaseorder extends BaseController
 
       $data['POSTATUS'] = $this->purchaseorder_model->GetPOStatus($PONO);
       $data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO);
+      // echo "<pre>";
+      // print_r($data['POItem']);die;
       $data['PaymentTerms'] = $this->purchaseorder_model->GetPaymentTerms($PONO);
       $this->global['pageTitle'] = 'Edit Revenue Purchase order form';
       $this->loadViews("editRevenueAmendPO", $this->global,  $data, NULL);
@@ -209,7 +211,6 @@ class Amendmentpurchaseorder extends BaseController
    */
   function EditRevenuePurchaseOrder()
   {
-    // print_r($this->request->getPost());die;
     $NewPO = '';
     $MAD = '';
     $PONO = $this->request->getPost('txtPONO');
@@ -313,7 +314,7 @@ class Amendmentpurchaseorder extends BaseController
     // print_r($POMaster);die;
 
     $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
-    // dd($LastPO);
+
     if(!empty($LastPO)){
       if (count($LastPO) > 0) {
         $NewPO =  $LastPO[0]['PONO'];
@@ -494,11 +495,10 @@ class Amendmentpurchaseorder extends BaseController
         }
       }
 
-      if (($FreightValue - $preFreightValue) != 0) {
+      if (((int)$FreightValue - $preFreightValue) != 0) {
         $rowspanvalue++;
         $CAD .= "<tr><td>Current Freight : " . $preFreightValue . "</td><td>Revised Freight : " . $FreightValue . "</td></tr>";
       }
-
       if (($AfterFreightValue - $beforeAfterFreightValue) != 0) {
         $rowspanvalue++;
         $CAD .= "<tr><td>Current Freight Value : " . $beforeAfterFreightValue . "</td><td>Revised Freight Value : " . $AfterFreightValue . "</td></tr>";
@@ -567,7 +567,6 @@ class Amendmentpurchaseorder extends BaseController
    */
   function UpdateAmendServicePurchaseOrder()
   {
-
     $PONO = $this->request->getPost('txtPONO');
 
     $MAD = '';
@@ -651,7 +650,7 @@ class Amendmentpurchaseorder extends BaseController
     $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'POType' => $POType, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $scopeofwork, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $updateddt, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'ServiceWorkStatus' => $WorkStatus, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => strip_tags((string)$DescriptionOfPo), 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
     $file = $this->request->getFile('POFile');
     $PrePOFile = $this->request->getPost('PrePOFile');
-    $requestfilename = $file->getName();
+    $requestfilename = $file ? $file->getName() : null;
     if (!empty($requestfilename)) {
       if ($file && $file->isValid() && !$file->hasMoved()) {
         $path = ROOTPATH . 'public/uploads/POfiles/';
@@ -671,7 +670,6 @@ class Amendmentpurchaseorder extends BaseController
     } else {
       $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
     }
-
     $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
 
     $NewPO = '';
@@ -971,7 +969,7 @@ class Amendmentpurchaseorder extends BaseController
     $AmendmentNewPoNo = generate_amendment_po_number($PONO);
     $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $FinalTotalOrder, 'POType' => $POType, 'PODate' => $PODate, 'Status' => PO_RELEASED, 'CapitalRange' => $PoRange, 'ExchangeRate' => $ExchangeRate, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'PaymentTerms' => $PaymentMethod, 'PaymentOtherDescription' => $Otherpayment, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CurrencyType' => $currencytypeID, 'AmendedDetails' => $MAD, 'Import_DispatchDetails' => $curdispatch, 'Import_PlaceofOrgin' => $PlaceOforigin, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult);
     $file = $this->request->getFile('POFile');
-    $requestfilename = $file->getName();
+    $requestfilename = $file ? $file->getName() : null;
     $PrePOFile = $this->request->getPost('PrePOFile');
     if (!empty($requestfilename)) {
       if ($file && $file->isValid() && !$file->hasMoved()) {
@@ -993,7 +991,6 @@ class Amendmentpurchaseorder extends BaseController
       $POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
     }
 
-
     $LastPO  = $this->purchaseorder_model->addAmendPOMaster($POMaster, $CreateBy, $PONO);
 
     if (count($LastPO) > 0) {
@@ -1394,6 +1391,7 @@ class Amendmentpurchaseorder extends BaseController
     // if (count($LastPO) > 0) {
     //   $NewPO =  $LastPO[0]['PONO'];
     // }
+    // print_r($LastPO);die;
     foreach ($LastPO as $PO) :
       $NewPO = $PO['PONO'];
     endforeach;
@@ -1403,11 +1401,8 @@ class Amendmentpurchaseorder extends BaseController
 
     $LineItemStatus = REQITEM_NEW;
 
-
-
     $igrvalue =  $this->purchaseorder_model->selectigrmaster($PONO);
 
-
     $po = '';
     $igrno = '';
     // if(count($igrvalue) >0)

app/Models/Purchaseorder_model.php

@@ -822,7 +822,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 
 	function addAmendPOMaster($POMaster, $CreatedBy, $ParentPO)
 	{
-		// print_r($POMaster);
+		// print_r($POMaster);die;
 		$this->db->transStart();
 		$builder = $this->db->table('t_purchaseorder_master');
 		$builder->insert($POMaster);
@@ -1698,16 +1698,17 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
 	function GetRequesedByDetails($PONO)
 	{
 		$builder = $this->db->table('t_purchaseorder_master mast')
-			->select('mast.CreatedBy,re.FirstName,Dept.DEPCode,Dept.DepartmentName')
+			->select('mast.CreatedBy, re.FirstName, Dept.DEPCode, Dept.DepartmentName')
-			->join('tbl_users tbl', 'mast.CreatedBy=tbl.userid')
+			->join('tbl_users tbl', 'mast.CreatedBy = tbl.userid', 'left')
-			->join('t_employee_details re', 're.EmpID=tbl.EmpID')
+			->join('t_employee_details re', 're.EmpID = tbl.EmpID', 'left')
-			->join('t_departmentdetails Dept', 're.Departmentcode = Dept.DEPCode')
+			->join('t_departmentdetails Dept', 're.Departmentcode = Dept.DEPCode', 'left')
 			->where('mast.PONO', $PONO);
-		$result = $builder->get();
 		
+		$result = $builder->get();
 		return $result->getResult();
 	}
 	
+
 	// get domestic capital po list
 
 

app/Views/Report_pending_purchase.php

@@ -455,7 +455,8 @@
         format: dateFormat,
         autoclose: true,
         todayHighlight: true,
-        clearBtn: true
+        clearBtn: true,
+		orientation: 'bottom'
     }).on('changeDate', function(e) {
         // When a date is selected in #min-date, update the minDate option for #max-date
         // to.datepicker('setStartDate', e.date);
@@ -467,7 +468,8 @@
         // startDate: new Date(), // Start date cannot be in the past
         autoclose: true,
         todayHighlight: true,
-        clearBtn: true
+        clearBtn: true,
+		orientation: 'bottom'
     }).on('changeDate', function(e) {
         // When a date is selected in #max-date, update the endDate option for #min-date
         from.datepicker('setStartDate', e.date);

app/Views/capitalpurchaseorder.php

@@ -262,7 +262,7 @@
                     <div class="col-12">
                         <div class="page-title-box page-title-box-alt">
                             <h4><?= "Capital Purchase Order"; ?></h4>
-                            <a href="<?php echo base_url() ?>CreatePO" class="btn btn-success" id="back" value="Back">Back</a>
+                            <a href="<?php echo base_url() ?>CreatePO" class="btn btn-secondary" id="back" value="Back">Back</a>
                         </div>
                     </div>
                 </div>

app/Views/editCapitalAmendPO.php

@@ -6,7 +6,6 @@
         array("name" => "NO", "value" => "0"),
         array("name" => "YES", "value" => "1")
     );
-
     $requestedBy = $requestedBy[0]->FirstName;
 
     // $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
@@ -427,7 +426,7 @@
                     <div class="col-12">
                         <div class="page-title-box page-title-box-alt">
                             <h4><?= "Amended Capital Purchase Order - $PONO "; ?></h4>
-                            <a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-success" id="back" value="Back">Back</a>
+                            <a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-secondary" id="back" value="Back">Back</a>
                         </div>
                     </div>
                 </div>
@@ -784,42 +783,6 @@
                                     <div class="form-group col-md-3">
                                     </div>
                                 </div>
-
-                                <div id="editpackagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-                                    <div class="modal-dialog">
-
-                                        <!-- Modal content-->
-                                        <div class="modal-content">
-                                            <div class="modal-header">
-                                                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                                                <h4 class="modal-title">Freight Calculation On</h4>
-                                            </div>
-                                            <div class="modal-body">
-                                                <form>
-
-                                                    <div class="radio">
-                                                        <label><input type="radio" name="editoptPackaging" checked="checked" value='0' id="editoptPackaging"> Basic Amount</label>
-                                                    </div>
-                                                    <div class="radio">
-                                                        <label><input type="radio" name="editoptPackaging" id="editoptPackaging" value='1'> After Discount Amount</label>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                            <div class="modal-footer">
-                                                <a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
-                                                <a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
-                                            </div>
-                                        </div>
-
-                                    </div>
-                                </div>
-
-                                <div class="form-row">
-                                    <div align="right">
-                                        <!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a>  -->
-                                    </div>
-                                    <br>
-                                </div>
                                 <div class="form-row">
                                     <div class="table-responsive">
                                         <table id="serviceTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
@@ -1078,7 +1041,7 @@
 
 
 
-                                                            <td> <a data-target='#EDITCAPITAL' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITCAPITAL"><i class="ri-pencil-fill" data-toggle="tooltip" ></i>&nbsp;&nbsp;&nbsp;</a> <!-- <a href='#' onclick = "DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>"  id="Del" ><span class="ri-delete-bin-7-fill"></span></a> -->
+                                                            <td> <a data-target='#EDITCAPITAL' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITCAPITAL"><i class="ri-pencil-fill" data-toggle="tooltip"></i>&nbsp;&nbsp;&nbsp;</a> <!-- <a href='#' onclick = "DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>"  id="Del" ><span class="ri-delete-bin-7-fill"></span></a> -->
 
                                                                 <!-- <td>   <a    data-target='#VIEWCAPITAL'	data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWCAPITAL"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the  <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a>	  </td>  -->
 
@@ -1169,7 +1132,6 @@
                                                                 ?> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index; ?>">
                                                     <!-- first <input type="text" name="CapitalToatlOrder" id="CapitalToatlOrder"  value="<?php echo $totalCapitalOrder; ?>">-->
 
-                                                    <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
                                                     <input type="hidden" name="capitalType" id="capitalType" value="<?php echo $CapitalRange; ?>" />
 
 
@@ -1181,7 +1143,9 @@
                                         </table>
                                     </div>
                                 </div>
-<br>
+                                <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+
+                                <br>
                                 <div class="form-row" id="CAPdiv">
 
                                     <div class="form-group col-md-3">
@@ -1393,13 +1357,16 @@
                                 </div>
 
                                 <div class="form-row" style="padding:3%;">
-                                    <div class="form-group col-md-12" align="right">
+                                    <div class="form-group col-md-12" 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 } ?>
                                             <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
+                                            <input type="hidden" id="PrePOFile" name="PrePOFile" value=""><br>
                                         </div>
+                                        <div class="btn-container" style="text-align: right;">
                                             <input type="hidden" name="txtPoRange" id="txtPoRange" />
                                             <input type="hidden" name="isEdit" id="isEdit" value="0" />
                                             <input type="hidden" name="txtStatus" id="txtStatus" />
@@ -1410,9 +1377,13 @@
                                             <a class="btn btn-success Save" ID="Submit" onclick="Save()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
 
 
+                                        </div>
+
 
                                     </div>
+                                </div>
                                 <div class="form-row">
+                                    <div class="form-group col-md-12">
                                         <?php $UpdatedOn = new DateTime($UpdatedOn, new DateTimeZone('Asia/Kolkata'));
                                         $UpdatedOn = $UpdatedOn->format('d-m-Y'); ?>
                                         <label>Request On :</label><?php echo $UpdatedOn; ?><br />
@@ -1441,6 +1412,43 @@
                                         <br />
 
                                     </div>
+                                </div>
+                                <div id="editpackagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+                                    <div class="modal-dialog">
+
+                                        <!-- Modal content-->
+                                        <div class="modal-content">
+                                            <div class="modal-header">
+                                                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                                                <h4 class="modal-title">Freight Calculation On</h4>
+                                            </div>
+                                            <div class="modal-body">
+                                                <form>
+
+                                                    <div class="radio">
+                                                        <label><input type="radio" name="editoptPackaging" checked="checked" value='0' id="editoptPackaging"> Basic Amount</label>
+                                                    </div>
+                                                    <div class="radio">
+                                                        <label><input type="radio" name="editoptPackaging" id="editoptPackaging" value='1'> After Discount Amount</label>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                            <div class="modal-footer">
+                                                <a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+                                                <a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </div>
+
+                                <div class="form-row">
+                                    <div align="right">
+                                        <!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a>  -->
+                                    </div>
+                                    <br>
+                                </div>
+                               
 
 
 
@@ -3053,7 +3061,8 @@
                 $('#AmendtxtAfterFreight').attr("style", "pointer-events: none;");
                 $('#AmendNOOfTrips').attr("style", "pointer-events: none;");
                 $('#drpamendFreight').attr("style", "pointer-events: none;");
-        });});
+            });
+        });
 
 
 
@@ -3188,7 +3197,7 @@
 
                     //alert('else');
 
-                    $('#content').loader('show');
+                    // $('#content').loader('show');
                     //salert('ss');
                     //alert('before Ajax');
                     var formData = new FormData($('.CapitalPO')[0]);
@@ -3205,9 +3214,10 @@
                         processData: false,
                         contentType: false,
                         success: function(data) {
+                            // console.log(data);
                             if (data) {
                                 alert(data);
-                                $('#content').loader('hide');
+                                // $('#content').loader('hide');
 
                                 $('#txtRowCount').val('');
                                 $('#txtDeletedRow').val('');
@@ -3216,7 +3226,7 @@
                                 window.location = "amendmentpurchaseorder";
 
                             } else {
-                                $('#content').loader('hide');
+                                // $('#content').loader('hide');
                                 alert("Error");
                             }
 

app/Views/editImportAmendPO.php

@@ -298,7 +298,7 @@ if (!empty($RequistionDetails)) {
                 <div class="col-12">
                     <div class="page-title-box page-title-box-alt">
                         <h4><?= "Amended Import Purchase Order - $PONO "; ?></h4>
-                        <a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-success" id="back" value="Back">Back</a>
+                        <a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-secondary" id="back" value="Back">Back</a>
                     </div>
                 </div>
             </div>
@@ -2931,8 +2931,7 @@ if (!empty($RequistionDetails)) {
                 $('#Deliverydt').focus();
                 return false;
             } else {
-
+                // $('#content').loader('show');
-                $('#content').loader('show');
                 var formData = new FormData($('.ImportPO')[0]);
 
                 $.ajax({
@@ -2944,8 +2943,9 @@ if (!empty($RequistionDetails)) {
                     type: "POST",
                     url: "<?php echo base_url() ?>amendmentpurchaseorder/EditAmendImportPO",
                     success: function(data) {
+                        //console.log(data);
                         if (data) {
-                            $('#content').loader('hide');
+                            // $('#content').loader('hide');
                             alert(data);
                             $('#txtRowCount').val('');
                             $('#txtDeletedRow').val('');

app/Views/editRevenueAmendPO.php

@@ -160,7 +160,7 @@ if (!empty($INRSYMBOL)) {
 	var InsuranceNumber = '<?php echo $insurenceno; ?>';
 	$(document).ready(function() {
 
-		$('#RequistionNo').attr("style", "pointer-events: none;");
+		// $('#RequistionNo').attr("style", "pointer-events: none;");
 		$('#drpSupplier').attr("style", "pointer-events: none;");
 		$('#PoTypeOptions').attr("style", "pointer-events: none;");
 		$('#insurancestatus').attr("style", "pointer-events: none;");
@@ -333,7 +333,12 @@ if (!empty($INRSYMBOL)) {
 			$('#txtEditAfterFreight').val('');
 			if (selValue == PercentageType) {
 				var PackagingCalculation = '';
+				// $('#freightmodel').modal('show');
+				$('#EDITREVENUE').modal('hide');
+				setTimeout(() => {
 					$('#freightmodel').modal('show');
+				}, 1000);
+
 				$('#txtEditFreight').removeAttr('readonly', 'true');
 			} else if (selValue == NilType) {
 
@@ -734,6 +739,10 @@ if (!empty($INRSYMBOL)) {
 		FreightCalculation = $("input:radio[name='optfreight']:checked").val();
 		// alert("this is value taken as before after radio value"+FreightCalculation);
 		$('#freightmodel').modal('hide');
+		setTimeout(() => {
+			$('#EDITREVENUE').modal('show');
+		}, 1000);
+		// $('#EDITREVENUE').modal('show');
 		calculateFreight();
 	}
 
@@ -911,6 +920,7 @@ if (!empty($INRSYMBOL)) {
 				<div class="col-12">
 					<div class="page-title-box page-title-box-alt">
 					<h4><?= "Amendment Revenue Purchase Order - $PONO "; ?></h4>
+					<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-secondary" id="back" value="Back">Back</a>
 					</div>
 				</div>
 			</div>
@@ -1242,7 +1252,7 @@ if (!empty($INRSYMBOL)) {
 														<input type="hidden" name="<?php echo 'quantity' . $index ?>" id="<?php echo 'quantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
 
 														<input type="hidden" name="<?php echo 'itemRate' . $index ?>" id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
-														<input type="hidden" name="<?php echo'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
+														<input type="hidden" name="<?php echo 'per' . $index ?>" id="<?php echo 'per' . $index ?>" value="<?php echo $record->Per; ?>" />
 														<input type="hidden" name="<?php echo 'service_description' . $index ?>" id="<?php echo 'service_description' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
 
 														<input type="hidden" name="<?php echo 'DisType' . $index ?>" id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->DiscountType; ?>" />
@@ -1908,10 +1918,10 @@ if (!empty($INRSYMBOL)) {
 			<div class="modal-body p-4">
 				<form>
 
-					<div class="radio">
+					<div>
 						<label><input type="radio" name="optfreight" checked="checked" value='0' id="optFreight"> Basic Amount</label>
 					</div>
-					<div class="radio">
+					<div>
 						<label><input type="radio" name="optfreight" id="optFreight" value='1'> After Discount Amount</label>
 					</div>
 				</form>
@@ -2011,7 +2021,7 @@ if (!empty($INRSYMBOL)) {
 </script> -->
 <script>
 	$(document).ready(function() {
-
+		var tempUserId = 0;
 		var index = '1';
 		var userid = '';
 		$("#EDITREVENUE").on("shown.bs.modal", function(e) {
@@ -2021,7 +2031,9 @@ if (!empty($INRSYMBOL)) {
 			AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
 			userid = $(e.relatedTarget).data('userid');
 			$('#isEdit').val(1);
-			//alert(userid);
+			$('#isEdit').val(1);
+			alert(tempUserId);
+			if (tempUserId == 0) {
 				var tr = document.getElementById(userid);
 				var cellval = tr.cells;
 				var id = $('#Reqnumber' + userid).val();
@@ -2096,6 +2108,13 @@ if (!empty($INRSYMBOL)) {
 				$("input:radio[name='optExcise'][value='" + $('#ExciseOption' + userid).val() + "']").prop('checked', 'checked');
 				$("input:radio[name='optVat'][value='" + $('#VatOption' + userid).val() + "']").prop('checked', 'checked');
 				$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
+			}
+
+			if (userid) {
+				tempUserId = userid;
+			} else {
+				userid = tempUserId;
+			}
 		});
 		$('#BudgetType').attr("style", "pointer-events: none;");
 
@@ -2452,6 +2471,7 @@ if (!empty($INRSYMBOL)) {
 					processData: false,
 					contentType: false,
 					success: function(data) {
+						// console.log(data);
 						if (data) {
 							// $('.content').loader('hide');
 							alert(data);

app/Views/editRevenuepurchaseorder.php

@@ -4832,8 +4832,8 @@ if (!empty($getlogpodtl)) {
 	});
 
 	function Save(status) {
-		console.log("status");
+		// console.log("status");
-		console.log(status);
+		// console.log(status);
 
 		if (status == '0') {
 			stat = '<?php echo PO_DRAFT; ?>';
@@ -5103,7 +5103,7 @@ if (!empty($getlogpodtl)) {
 		}
 
 	});
-	$("#Date").datepicker();
+	// $("#Date").datepicker();
 
 	function splpoupdate() {
 		var formData = new FormData();

app/Views/editServiceAmendPO.php

@@ -93,7 +93,6 @@ if (!empty($POMaster)) {
 
 
 
-
 if (!empty($RequistionDetails)) {
 
 	foreach ($RequistionDetails as $ReqDet) {
@@ -190,6 +189,7 @@ foreach ($PaymentTerms as $TER) {
 
 		} else {
 			$('#insuranceTxtDiv').hide();
+			$('#insuranceTxtDiv').prop('required', false);
 		}
 		if (DelOpt == "0") {
 			$('#Deliverydtdiv').show();
@@ -687,7 +687,7 @@ foreach ($PaymentTerms as $TER) {
 				<div class="col-12">
 					<div class="page-title-box page-title-box-alt">
 						<h4><?= "Amended Service Purchase Order- $PONO "; ?></h4>
-						<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-success" id="back" value="Back">Back</a>
+						<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-secondary" id="back" value="Back">Back</a>
 					</div>
 				</div>
 			</div>
@@ -999,347 +999,6 @@ foreach ($PaymentTerms as $TER) {
 							</div>
 
 
-
-
-
-								</div>
-							</div>
-							</div>
-							</div>
-						
-
-							<div class="form-row">
-						
-							</div>
-
-							<div class="form-row">
-						
-							</div>
-
-						
-						
-
-							<div >
-								<!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a> -->
-
-								<!-- Model for servicepo -->
-
-								<div class="modal fade" id="EDITSERVICE" role="dialog">
-									<div class="modal-dialog modal-full-width">
-										<!-- Modal content-->
-										<form>
-											<div class="modal-content" >
-												<div class="modal-header">
-													<center>
-														<h4 class="modal-title w-100">Edit Service Purchase Order Item  </h4>
-													</center>
-													<button type="button" class="close" data-dismiss="modal"
-                                                     aria-hidden="true"> × </button>
-												</div>
-												<div >
-
-												<br>
-
-												<div class="form-row px-3 ">
-											
-														<div class="form-group col-md-3">
-															<label>Req No<span class="text-danger">*</span></label>
-															<div>
-																<?php
-
-																$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
-																echo form_input($data);
-																?>
-
-															</div>
-														</div>
-
-														<div class="form-group col-md-3">
-															<label>Department Name</label>
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-														<div class="form-group col-md-3">
-															<label>Cost Center Code</label>
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
-																echo form_input($data);
-
-																?>
-															</div>
-														</div>
-														<div class="form-group col-md-3">
-															<label>Avail Budget Amount <?php echo $INRSYM ?></label>
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-													
-												</div>
-													
-													<div class="form-row px-3">
-														<div class="form-group col-md-3">
-															<label>Item Code<span class="text-danger">*</span></label>
-															<div>
-																<?php
-																$options = array("0" => 'Item Code');
-																//print_r(  $options);
-
-																echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
-
-																?>
-															</div>
-														</div>
-														<div class="form-group col-md-3">
-															<label>Item Name</label>
-															<div class="form-group">
-																<?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-3" id=EditotherDescription>
-															<label>Item Description</label>
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'EditOtheritemDescription', 'value' => set_value('EditOtheritemDescription'), 'id' => 'EditOtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-
-
-
-
-
-														<div class="form-group col-md-3">
-															<label>UOM</label>
-															<div class="form-group">
-																<?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-3">
-															<label>Service Schedule Type</label>
-															<div>
-																<?php
-																$data = array('name' => 'EditFrequency', 'value' => set_value('EditFrequency'), 'id' => 'EditFrequency',  'class' => 'form-control', 'readonly' => 'true');
-																echo form_input($data);
-																?>
-																<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />
-															</div>
-														</div>
-
-
-
-													</div>
-													<div class="form-row px-3">
-
-														<div class="form-group col-md-3">
-															<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 num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-														<div class="form-group col-md-3">
-															<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 num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-														<div class="form-group col-md-3">
-															<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">
-															<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-
-													</div>
-
-													<div class="form-row px-3">
-														<div class="form-group col-md-6" >
-
-															CGST In %
-														</div>
-
-														<div class="form-group col-md-3">
-															<div class="form-group">
-
-																<?php
-																$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'onkeypress' => 'return isNumberKey(event);',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()');
-																echo form_input($data);
-																?>
-															</div>
-
-														</div>
-														<div class="form-group col-md-3">
-															<div class="form-group">
-
-																<?php
-																$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
-																echo form_input($data);
-																?>
-															</div>
-
-														</div>
-
-													</div>
-													<div class="form-row px-3">
-														<div class="form-group col-md-6" >
-
-															SGST In %
-														</div>
-
-														<div class="form-group col-md-3">
-															<div class="form-group">
-
-																<?php
-																$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'SGSTchange()');
-																echo form_input($data);
-																?>
-															</div>
-
-														</div>
-														<div class="form-group col-md-3">
-															<div class="form-group">
-
-																<?php
-																$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
-																echo form_input($data);
-																?>
-															</div>
-
-														</div>
-
-													</div>
-
-													<div class="form-row px-3">
-														<div class="form-group col-md-6" >
-
-															IGST In %
-														</div>
-
-														<div class="form-group col-md-3">
-															<div class="form-group">
-
-																<?php
-																$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'IGSTchange()');
-																echo form_input($data);
-																?>
-															</div>
-
-														</div>
-														<div class="form-group col-md-3">
-															<div class="form-group">
-
-																<?php
-																$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
-																echo form_input($data);
-																?>
-															</div>
-
-														</div>
-
-													</div>
-													<div class="form-row px-3">
-														<div class="form-group col-md-3" >
-															<label>Other Allowances <?php echo $INRSYM ?></label>
-														</div>
-														<div class="form-group col-md-3">
-															
-														</div>
-														<div class="form-group col-md-3">
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'otherallowance', 'value' => set_value('otherallowance'), 'id' => 'otherallowance', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'onchange' => 'EditRatechange()');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-													</div>
-													<div class="form-row px-3">
-														
-														<div class="form-group col-md-3 " >
-															<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
-														</div>
-														<div class="form-group col-md-3">
-
-														</div>
-														<div class="form-group col-md-3">
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-													</div>
-													<div class="form-row pl-3" >
-														<div class="form-group col-md-2">
-														<label>Service Description </label>
-														
-														</div>
-														<div class="form-group col-md-3">																							
-															<?php $data = array('name' => 'EdittxtSpcialInstruction', 
-															'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription), 
-															'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control ', 'rows' => '3', 'cols' => '40');
-															echo form_textarea($data);
-															?>
-															<input type="hidden" name="beforeEdittxtSpcialInstruction" id="beforeSpcialInstruction" 
-															value="<?php echo $ServiceMaterialDescription; ?>" >
-															
-													    </div>
-													</div>
-													
-													
-													<br />
-
-													<div class="modal-footer" align="right">
-														<div class="form-group col-md-12">
-															<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
-															<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
-														</div>
-													</div>
-												</div>
-										</form>
-
-									</div>
-								</div>
-							</div>
-
 							<br />
 							<table id="ServiceTable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
 								<thead>
@@ -1386,15 +1045,15 @@ foreach ($PaymentTerms as $TER) {
 												<td><?php echo $record->ReqNo ?> </td>
 												<td><?php echo $record->MaterialCode ?></td>
 												<td><?php echo $record->MaterialName ?></td>
-												<td ><?php echo $record->Quantity ?></td>
+												<td><?php echo $record->Quantity ?></td>
 												<td><?php echo $record->UOM ?></td>
 												<td><?php echo $record->Rate ?></td>
-												<td ><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
+												<td><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
-												<td ><?php echo $record->Taxamount ?></td>
+												<td><?php echo $record->Taxamount ?></td>
-												<td ><?php echo $record->TotalValue ?></td>
+												<td><?php echo $record->TotalValue ?></td>
-												<td ><?php echo $record->Quantity ?></td>
+												<td><?php echo $record->Quantity ?></td>
-												<td ><?php echo $record->ReceivedQuantity ?></td>
+												<td><?php echo $record->ReceivedQuantity ?></td>
-												<td ><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
+												<td><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
 
 
 												<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
@@ -1583,18 +1242,16 @@ foreach ($PaymentTerms as $TER) {
 								</div>
 							</div>
 							<br>
-                            <label>Purchase Order File</label>
+							<!-- <label>Purchase Order File</label> -->
 							<div class="form-row">
-								
+								<div class="form-group col-md-12" align="right"><br>
-								<div class="col-md-9">
+									<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 } ?>
 									</div>
-							<div class="col-md-3">
+									<div class="btn-container" style="text-align: right;">
-										
 										<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
 
 										<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
@@ -1604,15 +1261,13 @@ foreach ($PaymentTerms as $TER) {
 
 										<!-- <a class="btn btn-success Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
 										<a class="btn btn-success Save " ID="Submit" onclick="Save()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-
+									</div>
 								</div>
 							</div>
 
 							<br>
 							<div class="row">
-                            <div class="form-group col-md-9">
 								
-							</div>
 								<div class="form-group col-md-3">
 									<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
 									$Reqon = $Reqon->format('d-m-Y'); ?>
@@ -1643,13 +1298,356 @@ foreach ($PaymentTerms as $TER) {
 							</div>
 
 
+						</div>
+					</div>
+				</div>
+			</div>
+
+
+			<div class="form-row">
+
+			</div>
+
+			<div class="form-row">
+
+			</div>
+
+
+
+
+			<div>
+				<!-- <a data-toggle="modal" ><button type="submit"  onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a> -->
+
+				<!-- Model for servicepo -->
+
+				<div class="modal fade" id="EDITSERVICE" role="dialog">
+					<div class="modal-dialog modal-full-width">
+						<!-- Modal content-->
+						<form>
+							<div class="modal-content">
+								<div class="modal-header">
+									<center>
+										<h4 class="modal-title w-100">Edit Service Purchase Order Item </h4>
+									</center>
+									<button type="button" class="close" data-dismiss="modal"
+										aria-hidden="true"> × </button>
+								</div>
+								<div>
+
+									<br>
+
+									<div class="form-row px-3 ">
+
+										<div class="form-group col-md-3">
+											<label>Req No<span class="text-danger">*</span></label>
+											<div>
+												<?php
+
+												$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
+												echo form_input($data);
+												?>
+
+											</div>
+										</div>
+
+										<div class="form-group col-md-3">
+											<label>Department Name</label>
+											<div class="form-group">
+												<?php
+												$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
+												echo form_input($data);
+												?>
+											</div>
+										</div>
+										<div class="form-group col-md-3">
+											<label>Cost Center Code</label>
+											<div class="form-group">
+												<?php
+												$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
+												echo form_input($data);
+
+												?>
+											</div>
+										</div>
+										<div class="form-group col-md-3">
+											<label>Avail Budget Amount <?php echo $INRSYM ?></label>
+											<div class="form-group">
+												<?php
+												$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+												echo form_input($data);
+												?>
+											</div>
+										</div>
+
+									</div>
+
+									<div class="form-row px-3">
+										<div class="form-group col-md-3">
+											<label>Item Code<span class="text-danger">*</span></label>
+											<div>
+												<?php
+												$options = array("0" => 'Item Code');
+												//print_r(  $options);
+
+												echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control"');
+
+												?>
+											</div>
+										</div>
+										<div class="form-group col-md-3">
+											<label>Item Name</label>
+											<div class="form-group">
+												<?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-3" id=EditotherDescription>
+											<label>Item Description</label>
+											<div class="form-group">
+												<?php
+												$data = array('name' => 'EditOtheritemDescription', 'value' => set_value('EditOtheritemDescription'), 'id' => 'EditOtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
+												echo form_input($data);
+												?>
+											</div>
+										</div>
+
+
+
+
+
+										<div class="form-group col-md-3">
+											<label>UOM</label>
+											<div class="form-group">
+												<?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-3">
+											<label>Service Schedule Type</label>
+											<div>
+												<?php
+												$data = array('name' => 'EditFrequency', 'value' => set_value('EditFrequency'), 'id' => 'EditFrequency',  'class' => 'form-control', 'readonly' => 'true');
+												echo form_input($data);
+												?>
+												<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />
+											</div>
+										</div>
+
+
+
+									</div>
+									<div class="form-row px-3">
+
+										<div class="form-group col-md-3">
+											<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 num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+												echo form_input($data);
+												?>
+											</div>
+										</div>
+										<div class="form-group col-md-3">
+											<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 num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+												echo form_input($data);
+												?>
+											</div>
+										</div>
+										<div class="form-group col-md-3">
+											<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">
+											<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
+											<div class="form-group">
+												<?php
+												$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+												echo form_input($data);
+												?>
+											</div>
+										</div>
+
+									</div>
+
+									<div class="form-row px-3">
+										<div class="form-group col-md-6">
+
+											CGST In %
+										</div>
+
+										<div class="form-group col-md-3">
+											<div class="form-group">
+
+												<?php
+												$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'onkeypress' => 'return isNumberKey(event);',  'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()');
+												echo form_input($data);
+												?>
+											</div>
+
+										</div>
+										<div class="form-group col-md-3">
+											<div class="form-group">
+
+												<?php
+												$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
+												echo form_input($data);
+												?>
+											</div>
+
+										</div>
+
+									</div>
+									<div class="form-row px-3">
+										<div class="form-group col-md-6">
+
+											SGST In %
+										</div>
+
+										<div class="form-group col-md-3">
+											<div class="form-group">
+
+												<?php
+												$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'SGSTchange()');
+												echo form_input($data);
+												?>
+											</div>
+
+										</div>
+										<div class="form-group col-md-3">
+											<div class="form-group">
+
+												<?php
+												$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
+												echo form_input($data);
+												?>
+											</div>
+
+										</div>
+
+									</div>
+
+									<div class="form-row px-3">
+										<div class="form-group col-md-6">
+
+											IGST In %
+										</div>
+
+										<div class="form-group col-md-3">
+											<div class="form-group">
+
+												<?php
+												$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'IGSTchange()');
+												echo form_input($data);
+												?>
+											</div>
+
+										</div>
+										<div class="form-group col-md-3">
+											<div class="form-group">
+
+												<?php
+												$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
+												echo form_input($data);
+												?>
+											</div>
+
+										</div>
+
+									</div>
+									<div class="form-row px-3">
+										<div class="form-group col-md-3">
+											<label>Other Allowances <?php echo $INRSYM ?></label>
+										</div>
+										<div class="form-group col-md-3">
+
+										</div>
+										<div class="form-group col-md-3">
+											<div class="form-group">
+												<?php
+												$data = array('name' => 'otherallowance', 'value' => set_value('otherallowance'), 'id' => 'otherallowance', 'onkeypress' => 'return isNumberKey(event);', 'class' => 'form-control num', 'onchange' => 'EditRatechange()');
+												echo form_input($data);
+												?>
+											</div>
+										</div>
+									</div>
+									<div class="form-row px-3">
+
+										<div class="form-group col-md-3 ">
+											<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
+										</div>
+										<div class="form-group col-md-3">
+
+										</div>
+										<div class="form-group col-md-3">
+											<div class="form-group">
+												<?php
+												$data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
+												echo form_input($data);
+												?>
+											</div>
+										</div>
+									</div>
+									<div class="form-row pl-3">
+										<div class="form-group col-md-2">
+											<label>Service Description </label>
+
+										</div>
+										<div class="form-group col-md-3">
+											<?php $data = array(
+												'name' => 'EdittxtSpcialInstruction',
+												'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription),
+												'id' => 'EdittxtSpcialInstruction',
+												'class' => 'form-control ',
+												'rows' => '3',
+												'cols' => '40'
+											);
+											echo form_textarea($data);
+											?>
+											<input type="hidden" name="beforeEdittxtSpcialInstruction" id="beforeSpcialInstruction"
+												value="<?php echo $ServiceMaterialDescription; ?>">
+
+										</div>
+									</div>
+
+
+									<br />
+
+									<div class="modal-footer" align="right">
+										<div class="form-group col-md-12">
+											<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
+											<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
+										</div>
+									</div>
+								</div>
+						</form>
+
+					</div>
+				</div>
+			</div>
+
 
 		</div> <!-- end card body-->
 	</div> <!-- end card -->
-				</div><!-- end col-->
+</div><!-- end col-->
-			</div>
+</div>
-		</div> <!-- container -->
+</div> <!-- container -->
-	</div> <!-- content -->
+</div> <!-- content -->
 </div>
 
 
@@ -2178,10 +2176,10 @@ foreach ($PaymentTerms as $TER) {
 </script>
 <script>
 	function Save() {
-		//alert("worked");
 		stat = '<?php echo PO_CREATED; ?>';
 		// stat = '<?php echo PO_RELEASED; ?>';
 		tinyMCE.triggerSave();
+
 		var splinstr = $('#ScopeofWork').val();
 		var deladd = $('#DeliveryAddr').val();
 		$('#txtStatus').val(stat);
@@ -2191,8 +2189,10 @@ foreach ($PaymentTerms as $TER) {
 		$('#txtDeliveryAddress').val(deladd);
 		AvlBudAmt = '<?php echo number_format($AvlAmount + $TotalBasicAmount, 2, '.', '') ?>';
 		var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
+		// alert("worked");
+
+		// if (validate()) {
 
-		if (validate()) {
 		// if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) {
 		// alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
 
@@ -2207,7 +2207,7 @@ foreach ($PaymentTerms as $TER) {
 			$('#amenddescofpo').focus();
 			return false;
 		} else {
-				$('#content').loader('show');
+			// $('#content').loader('show');
 			var formData = new FormData($('.ServicePO')[0]);
 			$.ajax({
 				// data: $('.ServicePO').serialize(),
@@ -2218,8 +2218,7 @@ foreach ($PaymentTerms as $TER) {
 				contentType: false,
 				success: function(data) {
 					if (data) {
-
+						// $('#content').loader('hide');
-							$('#content').loader('hide');
 						alert(data);
 						$('#txtRowCount').val('');
 						$('#txtDeletedRow').val('');
@@ -2227,19 +2226,16 @@ foreach ($PaymentTerms as $TER) {
 						$('#SpcialInstruction').val('');
 						$('#txtDeliveryAddress').val('')
 						window.location = "amendmentpurchaseorder";
-
 					} else {
 						$('#content').loader('hide');
 						alert("Error");
 					}
-
 				}
-
 			});
 		}
 
 
-		}
+		// }
 	}
 	// this function is used to clear data changing schedule option
 	$('#Scheduleby').change(function() {

app/Views/servicePurchaseorder.php

@@ -678,7 +678,7 @@ if (!empty($INRSYMBOL)) {
 				<div class="col-12">
 					<div class="page-title-box page-title-box-alt">
 						<h4><?= "Service Purchase Order"; ?></h4>
-						<a href="<?php echo base_url() ?>CreatePO" class="btn btn-success" id="back" value="Back">Back</a>
+						<a href="<?php echo base_url() ?>CreatePO" class="btn btn-secondary" id="back" value="Back">Back</a>
 					</div>
 				</div>
 			</div>
@@ -1343,7 +1343,7 @@ if (!empty($INRSYMBOL)) {
 				</div>
 				<div class="modal-footer">
 					<div class="form-row">
-						<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>
+						<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel" style="margin-right: 10px;">Cancel</a>
 						<a class="btn btn-info waves-effect waves-light font AddService" id="AddService"> &nbsp;&nbsp;<span class="bold">Add Service</span></a>
 					</div>
 				</div><!-- SERVICE modal-footer closed here -->
@@ -1897,7 +1897,7 @@ if (!empty($INRSYMBOL)) {
 			clearServiceModalFields();
 
 			$('#otherdescription').hide();
-
+			$('#SERVICE').modal('hide');
 		}
 
 	});
@@ -2332,7 +2332,12 @@ if (!empty($INRSYMBOL)) {
 			$('#PoTypeOptions').focus();
 			return false;
 
-		} else {
+		} else if ($('#Otherpayment').val() == '') {
+			alert('Please Enter the Payable Terms');
+			$('#Otherpayment').focus();
+			return false;
+
+		}else {
 			return true;
 		}
 	}