Merge : GWM

app/Controllers/Purchaseorder.php

@@ -545,7 +545,7 @@ class Purchaseorder extends BaseController
     $ReqType =  $this->request->getVar('ReqType');
 
     $Req = $this->purchaseorder_model->getRequistionNoFromPO($PONO);
-
+  
     $data['ReqList'] = $Req;
 
     $result = array();
@@ -554,6 +554,8 @@ class Purchaseorder extends BaseController
     foreach ($Req as $SID) :
       $ReqArray[]     =  $SID->ReqNo;
       $result[] = $this->purchaseorder_model->getRawPOMaterialList($SID->ReqNo);
+      // echo "<pre>";
+      // print_r($result);die;
     endforeach;
 
     $data['MaterialList'] = $result; //$this->purchaseorder_model->getRawMaterialList($ReqType,$ReqArray);
@@ -1213,8 +1215,6 @@ class Purchaseorder extends BaseController
   //This used to Edit the Revenue Purchase Order
   function EditRevenuePurchaseOrder()
   {
-
-   
     $PONO = $this->request->getPost('txtPONO');
     $POdt = $this->request->getPost('PODate');
     $PODate =  get_date_time_format($POdt);
@@ -2030,9 +2030,8 @@ class Purchaseorder extends BaseController
 
   function EditImportPurchaseOrder()
   {
+    // print_r($this->request->getPost());die;
 
-    //echo "dfds";
-    //die();
     $PONO = $this->request->getPost('txtPONO');
     $POdt = '';
     $createddt = '';
@@ -2158,11 +2157,10 @@ class Purchaseorder extends BaseController
         }
       }
     }
+   
+    // echo $PONO;
+    // echo $TotalOrder;
 
-    //echo $PONO;
-    //echo $TotalOrder;
-    //print_r($POList);
-    //die();
 
     $POMaster  = $this->purchaseorder_model->updatePOMaster($PONO, $POList);
     //echo "sdasds";
@@ -2192,7 +2190,8 @@ class Purchaseorder extends BaseController
     }
 
 
-    //echo $RowCount;
+    // echo $RowCount;
+    // die;
     for ($i = 1; $i <= $RowCount; $i++) {
 
       $MaterialCode = $this->request->getPost('materialCode' . $i);
@@ -2364,13 +2363,13 @@ class Purchaseorder extends BaseController
           $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO, $POLineItemNo, $POLineItemList);
         }
         $isExists = $this->purchaseorder_model->LineItemExistsinImportTax($LineItemNo);
-        //echo $isExists;
+        // print_r($isExists);
 
-        //die();
+        // die();
-        if (count($isExists) == 0) {
+        if (is_array($isExists) && count($isExists) == 0) {
           // print_r(count($isExists));
-          //echo $isExists;
+          // echo $isExists;
-          //die();
+          // die();
           $ImportTaxList = array('LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'UpdatedOn' => $updateddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $Nosoftrip, 'FreightValue' => $FreightRate, 'AfterFreightValue' => $FreightAmount, 'AssessableValue' => $AssessableValue, 'SubTotal' => $Subtotal, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'DutyImpact' => $Dutyimpact, 'ClearingCharge' => $Clearingcharge, 'NetValue' => $Nettvalue);
 
 

app/Controllers/Servicepurchaseorder.php

@@ -560,8 +560,7 @@ class Servicepurchaseorder extends BaseController
 
 				if (trim((string)$POType) == SERVICE) {
 					$isExists = $this->purchaseorder_model->LineItemExists($LineItemNo);
-
+					if (is_array($isExists) && count($isExists) == 0) {
-					if (count($isExists) == 0) {
 						$ServiceTaxList = array('LineItemNo' => $LineItemNo, 'CGST' => $Cgst, 'After_CGST' => $AfterCgst, 'SGST' => $Sgst, 'After_SGST' => $AfterSgst, 'IGST' => $Igst, 'After_IGST' => $AfterIgst, 'TotalValue' => $TotalOrderValue, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'otherallowance' => $OtherAmt);
 
 						$this->purchaseorder_model->addServiceTax($ServiceTaxList);

app/Models/Purchaseorder_model.php

@@ -141,11 +141,11 @@ Where IGRM.PONO = ? ';
 	}
 	///////////////////end this function used to pono reset financeyear configuration 
 	public function isFileExists($filename)
-    {
+	{
 		$result = $this->db->table('t_purchaseorder_master')->where('POFile', $filename);
 		$query = $result->get();
 		return $query->getResult();
-    }
+	}
 
 
 
@@ -458,7 +458,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 	function getRawPOMaterialList($ReqNo, $IsArray = '')
 	{
 
-		
+
 		$result =   $this->db->query("CALL P_GET_REQUISTIONLIST('" . $ReqNo . "')"); //  or die(mysql_error());
 
 		// $result ->next_result();
@@ -593,7 +593,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 	{
 
 		$ReqDeatis = $this->GetRequistionMasterUsingReqNo($ReqNoList);
-		
+
 		foreach ($ReqDeatis as $SID) :
 			$ReqBy     =  $SID->Requestedby;
 		endforeach;
@@ -604,7 +604,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 								Dept.DEPCode,Dept.DepartmentName,mast.ReqDate,mast.CostCenterCode,mast.Status')
 				->join('t_departmentdetails Dept', 'mast.RequestedDept = Dept.DEPCode')
 				->whereIn('mast.ReqNo', $ReqNoList);
-		} else if ($ReqBy != '') {			
+		} else if ($ReqBy != '') {
 			$builder = $this->db->table('t_requestion_master  mast')->distinct()
 				->select('ReqNo,ReqType,Status,Requestedby,mast.CreatedDate,mast.Schedule_Type,mast.NumberOfService,mast.Service_Period,emp.FirstName,emp.EmpID,emp.Designation, Dept.DEPCode,Dept.DepartmentName,mast.ReqDate,mast.CostCenterCode,mast.Status')
 				->join('t_employee_details emp', 'mast.Requestedby = emp.EmpID')
@@ -787,38 +787,38 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 	 * This function is used to add New Purchase order to  the system
 	 */
 	function addPOMaster($POMaster, $POType, $revenuetype)
-		{
+	{
-			// print_r($POMaster);die;
+		// print_r($POMaster);die;
-			try {
+		try {
-				$this->db->transStart();
+			$this->db->transStart();
-				$builder = $this->db->table('t_purchaseorder_master');
+			$builder = $this->db->table('t_purchaseorder_master');
-				$builder->insert($POMaster);
+			$builder->insert($POMaster);
-				$aff_row = $this->db->affectedRows();
+			$aff_row = $this->db->affectedRows();
-				$insertId = $this->db->insertId();
+			$insertId = $this->db->insertId();
-				log_message('error', 'addPOMaster POID : ' . $insertId);
+			log_message('error', 'addPOMaster POID : ' . $insertId);
-				$this->db->transComplete();
+			$this->db->transComplete();
-				if ($aff_row > 0) {
+			if ($aff_row > 0) {
-				
-					// log_message('error', 'Error inside if now insertId: ' . $this->db->insertId());
 
-					$subQuery = 'SELECT PONO FROM t_purchaseorder_master 
+				// log_message('error', 'Error inside if now insertId: ' . $this->db->insertId());
+
+				$subQuery = 'SELECT PONO FROM t_purchaseorder_master 
 								WHERE POID = ? AND ParentPO IS NULL 
 								ORDER BY CreatedDate DESC LIMIT 1';
 
-					$query = $this->db->query($subQuery, [$insertId]);
+				$query = $this->db->query($subQuery, [$insertId]);
-					$result = $query->getResultArray();
+				$result = $query->getResultArray();
-					log_message('error', 'addPOMaster subQuery: ' . $this->db->getLastQuery()->getQuery());
+				log_message('error', 'addPOMaster subQuery: ' . $this->db->getLastQuery()->getQuery());
-					log_message('error', 'addPOMaster subQuery result : ' . json_encode($result));
+				log_message('error', 'addPOMaster subQuery result : ' . json_encode($result));
-					return $result;
+				return $result;
-				}
-				return [];
-			} catch (\Exception $e) {
-				$this->db->transRollback();
-				log_message('error', 'not inserted in addPOMaster due to : ' . $e->getMessage());
-				throw $e;
-				return false;
 			}
+			return [];
+		} catch (\Exception $e) {
+			$this->db->transRollback();
+			log_message('error', 'not inserted in addPOMaster due to : ' . $e->getMessage());
+			throw $e;
+			return false;
 		}
+	}
 
 	function addAmendPOMaster($POMaster, $CreatedBy, $ParentPO)
 	{
@@ -837,7 +837,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 			$query = $this->db->query($subQuery, array($CreatedBy, $ParentPO));
 
 			return $query->getResultArray();
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -862,9 +862,9 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 			$result = $query->getResultArray();
 			log_message('error', 'addPOLineItem subQuery: ' . $this->db->getLastQuery()->getQuery());
 			log_message('error', 'addPOLineItem subQuery result : ' . json_encode($result));
-					
+
 			return $query->getResultArray();
-		}else{
+		} else {
 			return [];
 		}
 	}
@@ -882,18 +882,18 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 		$insertId = $this->db->insertId();
 		$aff_row = $this->db->affectedRows();
 		$this->db->transComplete();
-		
+
 		log_message('error', 'addRevenueTax query: ' . $this->db->getLastQuery()->getQuery());
 		log_message('error', 'addRevenueTax affrow : ' . $aff_row);
 		log_message('error', 'addRevenueTax insertId : ' . $insertId);
-		return $insertId ;
+		return $insertId;
 	}
 	/**
 	 *  This function is used to add Service Tax  to  the system      
 	 */
 	function addServiceTax($ServiceTaxList)
 	{
-		
+
 		log_message('error', 'addServiceTax Requested : ' . json_encode($ServiceTaxList));
 
 		$this->db->transStart();
@@ -902,11 +902,11 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 		$insertId = $this->db->insertId();
 		$aff_row = $this->db->affectedRows();
 		$this->db->transComplete();
-		
+
 		log_message('error', 'addServiceTax query: ' . $this->db->getLastQuery()->getQuery());
 		log_message('error', 'addServiceTax affrow : ' . $aff_row);
 		log_message('error', 'addServiceTax insertId : ' . $insertId);
-		return $insertId ;
+		return $insertId;
 	}
 
 
@@ -914,7 +914,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 	 *  This function is used to add Service Tax  to  the system      
 	 */
 	function addImportTax($ImportTaxList)
-	{	
+	{
 		log_message('error', 'addImportTax Requested : ' . json_encode($ImportTaxList));
 
 		$this->db->transStart();
@@ -923,11 +923,11 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 		$insertId = $this->db->insertId();
 		$aff_row = $this->db->affectedRows();
 		$this->db->transComplete();
-		
+
 		log_message('error', 'addImportTax query: ' . $this->db->getLastQuery()->getQuery());
 		log_message('error', 'addImportTax affrow : ' . $aff_row);
 		log_message('error', 'addImportTax insertId : ' . $insertId);
-		return $insertId ;
+		return $insertId;
 	}
 
 
@@ -1239,31 +1239,37 @@ where LineItem.PONO =?';
 
 	function GetImportPurchaseOrderDetails($PONO = '')
 	{
-
+		$subQuery = 'SELECT DISTINCT LineItem.LineItemNo, Req.ReqNo, Mat.MaterialCode, Mat.MaterialName, 
-		$subQuery = 'SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,
+		Mat.UOM, Quantity, Rate, Req.Status, ROUND((Quantity * Rate), 2) AS BasicValue, 
-Mat.UOM,Quantity,Rate,Req.Status,ROUND((Quantity *Rate),2 ) as BasicValue,ReceivedQuantity,
+		ReceivedQuantity, QuantityRejected, ROUND(Quantity - ReceivedQuantity) AS PendingQty, Per, 
-QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
+		ROUND((RMCIncludingCustomersPerKG * Quantity), 2) AS Taxamount, LandingCharge, HighSeasSalesCharge, 
- ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess,
+		CustomDuty, ExciseDuty, ExciseDutyEdCess, CustomEdCess, POMast.ExchangeRate, AfterLandingCharge, 
- AfterCustomEdCess,ROUND((Quantity *Rate),2)as TotalOrderValue,ROUND((POMast.ExchangeRate*BasicPriceInMTon),2) as BasicINRValue,TotalValue,CurrencyType,ReceivedQuantity,Tax.*,LineItem.ServiceMaterialDescription,
+		AfterHighSeasSalesCharge, AfterCustomDuty, AfterExciseDuty, AfterExciseDutyEdCess, AddlExciseDuty, 
- 
+		AfterAddlExciseDuty, Grossdutypayable, AvailableModvat, Grossexpensesduetocustomduty, 
- Req.CostCenterCode,Dept.DepartmentName FROM t_purchaseorder_lineitem LineItem 
+		purchaseratePerKG, CustomDutyExpensesPerKG, RMCIncludingCustomersPerKG, QuantityKG, 
- join t_purchaseorder_master POMast on POMast.PONO = LineItem.PONO
+		BasicPriceInMTon, ProductPrice, CustomSHCess, AfterCustomSHCess, AfterExciseDutySHCess, 
- join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode 
+		ExciseDutySHCess, AfterCustomEdCess, ROUND((Quantity * Rate), 2) AS TotalOrderValue, 
- join t_import_tax Tax on Tax.LineItemNo = LineItem.LineItemNo 
+		ROUND((POMast.ExchangeRate * BasicPriceInMTon), 2) AS BasicINRValue, TotalValue, CurrencyType, 
- join t_requestion_master Req on Req.ReqNo = LineItem.ReqNo 
+		ReceivedQuantity, Tax.*, LineItem.ServiceMaterialDescription, Req.CostCenterCode, 
- left join t_employee_details emp on Req.Requestedby = emp.EmpID 
+		Dept.DepartmentName 
- 
+	
- left join t_mrir_master Mast on POMast.PONO=Mast.PONO
+		FROM t_purchaseorder_lineitem LineItem 
- 
+		LEFT JOIN t_purchaseorder_master POMast ON POMast.PONO = LineItem.PONO 
- left join t_mrir_details Det on Det.MaterialCode=LineItem.MaterialCode and Mast.MRIRNO=Det.MRIRNO
+		LEFT JOIN t_materialmaster Mat ON Mat.MaterialCode = LineItem.MaterialCode 
- 
+		LEFT JOIN t_import_tax Tax ON Tax.LineItemNo = LineItem.LineItemNo 
- join t_departmentdetails Dept on Req.RequestedDept = Dept.DEPCode where LineItem.PONO =?';
+		LEFT JOIN t_requestion_master Req ON Req.ReqNo = LineItem.ReqNo 
-		//print_r($subQuery);
+		LEFT JOIN t_employee_details emp ON Req.Requestedby = emp.EmpID 
-
+		LEFT JOIN t_mrir_master Mast ON POMast.PONO = Mast.PONO 
+		LEFT JOIN t_mrir_details Det ON Det.MaterialCode = LineItem.MaterialCode AND Mast.MRIRNO = Det.MRIRNO 
+		LEFT JOIN t_departmentdetails Dept ON Req.RequestedDept = Dept.DEPCode 
+		
+		WHERE LineItem.PONO = ?';
+	
 		$query = $this->db->query($subQuery, array($PONO));
-
+	
 		return $query->getResult();
 	}
+	
 
 
 
@@ -1585,7 +1591,7 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
 			->select('mast.PODate,mast.PONO,mast.TotalOrderValue,st.StatusCode,st.StatusName,emp.FirstName,mast.CreatedDate,ccm.CostCenterName,ccm.CostCenterCode,mast.POType as RType,mast.Remarks,DepartmentName,mast.ApprovedBy,(select EmpID from tbl_users where userId=mast.ApprovedBy )as EID,rmast.ReqType,mast.Status,mast.CapitalRange,
 		  (select FirstName from t_employee_details where EmpID=EID)as Approver,sup.SupplierName,sup.MSME')
 			// ->orderBy('mast.Status',"PO_CREATED");
-			
+
 			->join('t_supplierdetailsn sup', 'sup.SupplierID = mast.SupplierID')
 			->join('t_status st', 'st.StatusCode=mast.Status')
 			->join('t_purchaseorder_lineitem req', 'req.PONO= mast.PONO')
@@ -1623,8 +1629,8 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
 			$builder->orWhere('mast.Status', REQITEM_Emergency_PO_CREATED);
 			// $builder->orderBy('mast.Status');
 		}
-		$builder->orderBy('mast.CreatedDate','DESC');
+		$builder->orderBy('mast.CreatedDate', 'DESC');
-		
+
 		$result = $builder->get();
 
 		return $result->getResult();
@@ -1703,11 +1709,11 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
 			->join('t_employee_details re', 're.EmpID = tbl.EmpID', 'left')
 			->join('t_departmentdetails Dept', 're.Departmentcode = Dept.DEPCode', 'left')
 			->where('mast.PONO', $PONO);
-		
+
 		$result = $builder->get();
 		return $result->getResult();
 	}
-	
+
 
 	// get domestic capital po list
 
@@ -1760,7 +1766,7 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
 
 				$Details['RequestedDept'] = $Reqresult->getResult()[0]->shortName;
 				$Details['CostCenterCode'] = $Reqresult->getResult()[0]->CostCenterCode;
-				$retDate = format_date($Reqresult->getResult()[0]->ReqDate,0,$format = 'd-m-Y');
+				$retDate = format_date($Reqresult->getResult()[0]->ReqDate, 0, $format = 'd-m-Y');
 				$Details['ReqDate'] = $retDate;
 				$ScheduleType = $Reqresult->getResult()[0]->Schedule_Type;
 				if ($ScheduleType != 'Recurring') {
@@ -2463,31 +2469,32 @@ st.CGST,st.SGST,st.IGST,st.otherallowance FROM t_service_tax st
 		$subQuery = 'select  bill.BillNo,IGR.IGRNO, IGR.PONO  FROM t_igr_master IGR
    join t_purchaseorder_billupload bill on  bill.IGRNO = IGR.IGRNO 
    where bill.BillNO = ? ';
-   
+
 
 		$query = $this->db->query($subQuery, array($bill));
 
 		return $query->getResultArray();
 	}
 
-	function VerifyWithSupplierForPendingPO($supplierid,$materialcode){
+	function VerifyWithSupplierForPendingPO($supplierid, $materialcode)
+	{
 
 		$subQuery = 'SELECT COUNT(t_purchaseorder_master.PONO) AS PO_count,GROUP_CONCAT(t_purchaseorder_master.PONO) AS PONO,t_purchaseorder_lineitem.MaterialCode 
 		FROM t_purchaseorder_lineitem
 		LEFT JOIN t_purchaseorder_master  ON t_purchaseorder_lineitem.PONO = t_purchaseorder_master .PONO
 		WHERE t_purchaseorder_master.SupplierID != ? AND t_purchaseorder_lineitem.MaterialCode = ? AND t_purchaseorder_master.Status = "ST014"
 		GROUP BY t_purchaseorder_lineitem.MaterialCode';
-        //    -- and t_purchaseorder_master.Status != "ST026"
+		//    -- and t_purchaseorder_master.Status != "ST026"
-		$query = $this->db->query($subQuery, array($supplierid,$materialcode));
+		$query = $this->db->query($subQuery, array($supplierid, $materialcode));
 
 		return $query->getResultArray();
-
 	}
 
-	function lastPONO(){
+	function lastPONO()
+	{
 		$query   = $this->db->table('t_purchaseorder_master')->select('PONO')->orderBy('PONO', 'DESC')->limit(1)->get();
 		$lastPONO = $query->getRow()->PONO;
 		return $lastPONO;
 	}
 	/***       -----------------------------            */
-}
+}

app/Views/editCapitalAmendPO.php

@@ -2145,7 +2145,6 @@
 
 
             var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
-            //alert(capital);   
             if (capital == 0) {
                 $('#CAPdiv').hide();
                 $('#ADDCAPdiv').hide();
@@ -2904,14 +2903,12 @@
 
 
                 $('#isEdit').val(1);
-                //alert(userid);
                 var tr = document.getElementById(userid);
 
                 var cellval = tr.cells;
 
                 var id = $('#Reqnumber' + userid).val();
                 var disc = $('#DisType' + userid).val();
-                //alert(disc);
                 if (disc != 'NIL') {
                     //alert('removed');
                     $('#txtEditDiscount').removeAttr('readonly');

app/Views/editImportAmendPO.php

@@ -2943,7 +2943,6 @@ if (!empty($RequistionDetails)) {
                     type: "POST",
                     url: "<?php echo base_url() ?>amendmentpurchaseorder/EditAmendImportPO",
                     success: function(data) {
-                        //console.log(data);
                         if (data) {
                             // $('#content').loader('hide');
                             alert(data);

app/Views/editRevenueAmendPO.php

@@ -2032,7 +2032,6 @@ if (!empty($INRSYMBOL)) {
 			userid = $(e.relatedTarget).data('userid');
 			$('#isEdit').val(1);
 			$('#isEdit').val(1);
-			alert(tempUserId);
 			if (tempUserId == 0) {
 				var tr = document.getElementById(userid);
 				var cellval = tr.cells;
@@ -2119,28 +2118,22 @@ if (!empty($INRSYMBOL)) {
 		$('#BudgetType').attr("style", "pointer-events: none;");
 
 		$('#EditRevenue').click(function() {
-
-			// alert('inside Functioon');
 			tinyMCE.triggerSave();
 			if (validateEditRevenueTax() && validateEditExceedLimit()) {
-				// alert('inside IF');			
 				var CostCode = $("#EditCostCenter").val();
 				var AvilBudget = $('#EditAvlBudAmt').val();
 				var editMaterialCode = $("#EditMaterialCode").val();
 				var editDescription = $("#EditItemName").val();
 				var editUOM = $('#EditUOM').val();
 				var editQuantity = $('#EditQuantity').val();
-
 				var itemRate = $("#EditRate").val();
 				var per = $("#EditAmendPer").val();
 				if (per == '') {
 					per = $('#EditUOM').val();
 				}
-
 				var DisType = $("#EditDiscountType").val();
 				var DisVal = $("#txtEditDiscount").val();
 				var AfterDisVal = $("#txtEditAfterDiscount").val();
-
 				var PackOption = PackagingCalculation;
 				var PackType = $("#EditPackagingType").val();
 				var PackVal = $("#txtEditPackaging").val();
@@ -2160,30 +2153,21 @@ if (!empty($INRSYMBOL)) {
 
 				var GSTVal = $("#txtEditGST").val(); //CGST
 				var AfterGSTVal = $("#txtEditAfterGST").val();
-
 				var OtherTaxVal = $("#txtEditOtherTax").val(); //IGST
 				var AfterOtherTaxVal = $("#txtEditAfterOtherTax").val();
 				var Trips = $('#EditNOOfTrips').val();
-
 				// var FreightOption = FreightCalculation ;
 				var FreightType = $("#drpEditFreight").val();
 				var FreightVal = $("#txtEditFreight").val();
 				var AfterFreightVal = $("#txtEditAfterFreight").val();
-
 				var basicval = $("#txtEditBasicValue").val();
 				var Insval = $("#txtEditInsurance").val();
 				var TotalOrderValue = $("#txtEditTotalOrderValue").val();
 				var Service_Description = $("#Edit_Service_Description").val();
 				var TotalTaxValue = calculateEditTaxValue();
-				//alert(TotalTaxValue);
-
-
-
-				// console.log(userid);
 
 				var tr = document.getElementById(userid);
 				var cellval = tr.cells;
-				// console.log(tr);
 
 				cellval[2].innerHTML = editDescription;
 				cellval[3].innerHTML = parseFloat(editQuantity).toFixed(2);
@@ -2193,7 +2177,6 @@ if (!empty($INRSYMBOL)) {
 				cellval[7].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
 				cellval[8].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
 
-				// alert("late");
 				$('#materialCode' + userid).val(editMaterialCode);
 				$('#materialName' + userid).val(editDescription);
 				$('#uom' + userid).val(editUOM);
@@ -2237,14 +2220,11 @@ if (!empty($INRSYMBOL)) {
 				}, 1000);
 			}
 			// alert('outside IF');			
-
 		});
 
 		function populateValueMainFormForRevenue() {
 			var Packaging = $('#txtAfterPackaging').val() == '' ? '0.00' : $('#txtAfterPackaging').val();
-
 			var Vat = $('#txtAfterVat').val() == '' ? '0.00' : $('#txtAfterVat').val(); //SGST
-
 			var GST = $('#txtAfterGST').val() == '' ? '0.00' : $('#txtAfterGST').val(); //CGST
 			var OtherTax = $('#txtAfterOtherTax').val() == '' ? '0.00' : $('#txtAfterOtherTax').val(); //IGST
 			var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val();
@@ -2252,16 +2232,11 @@ if (!empty($INRSYMBOL)) {
 			var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
 			var BasicVal = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val();
 			var TotalVal = $('#txtTotalOrderValue').val() == '' ? '0.00' : $('#txtTotalOrderValue').val();
-
 			var TotalOrderValueSummary = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
-
 			var totBasicAmt = $('#txtTotBasicAmount').val() == '' ? '0.00' : $('#txtTotBasicAmount').val();
-			alert(totBasicAmt);
 			var totDiscountAmt = $('#txtTotalDiscount').val() == '' ? '0.00' : $('#txtTotalDiscount').val();
 			var totPackagingAmt = $('#txtTotalPackaing').val() == '' ? '0.00' : $('#txtTotalPackaing').val();
-
 			var totVATAmt = $('#txtTotalVat').val() == '' ? '0.00' : $('#txtTotalVat').val(); //SGST
-
 			var totGSTAmt = $('#txtTotalGST').val() == '' ? '0.00' : $('#txtTotalGST').val(); //CGST
 			var totOtherTaxAmt = $('#txtTotalOtherTaxes').val() == '' ? '0.00' : $('#txtTotalOtherTaxes').val(); //IGST
 			var totFreightAmt = $('#txtTotalFreight').val() == '' ? '0.00' : $('#txtTotalFreight').val();
@@ -2271,27 +2246,20 @@ if (!empty($INRSYMBOL)) {
 			$('#txtTotBasicAmount').val(parseFloat(totBasicAmt) + parseFloat(BasicVal));
 			$('#txtTotalDiscount').val(parseFloat(totDiscountAmt) + parseFloat(Discount));
 			$('#txtTotalPackaing').val(parseFloat(totPackagingAmt) + parseFloat(Packaging));
-
 			$('#txtTotalVat').val(parseFloat(totVATAmt) + parseFloat(Vat)); //SGST
-
 			$('#txtTotalGST').val(parseFloat(totGSTAmt) + parseFloat(GST)); //CGST
 			$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt) + parseFloat(OtherTax)); //IGST
 			$('#txtTotalFreight').val(parseFloat(totFreightAmt) + parseFloat(Freight));
 			$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt) + parseFloat(Insurance));
 			$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt) + parseFloat(TotalVal));
-
 		}
 
 		function populateValueMainFormForEditRevenueTax() {
-
 			var rows = document.getElementById('revenueTax').rows.length;
-			// alert(rows);
 			var totBasicAmt = 0;
 			var totDiscountAmt = 0;
 			var totPackagingAmt = 0;
-
 			var totVATAmt = 0; //SGST
-
 			var totGSTAmt = 0; //CGST
 			var totOtherTaxAmt = 0; //IGST
 			var totFreightAmt = 0;
@@ -2300,20 +2268,12 @@ if (!empty($INRSYMBOL)) {
 			var i = 0;
 			do {
 				i += 1;
-
-
 				var tr = document.getElementById(i);
-				//alert(tr);
 				if (tr != null) {
 					cells = tr.getElementsByTagName('td');
-
-
 					var rowid = cells[0].innerHTML;
-					// alert(rowid);
 					var Packaging = $('#AfterPackVal' + rowid).val() == '' ? '0.00' : $('#AfterPackVal' + rowid).val();
-
 					var Vat = $('#AfterVatVal' + rowid).val() == '' ? '0.00' : $('#AfterVatVal' + rowid).val(); //SGST
-
 					var GST = $('#AfterGSTVal' + rowid).val() == '' ? '0.00' : $('#AfterGSTVal' + rowid).val(); //CGST
 					var OtherTax = $('#AfterOtherTaxVal' + rowid).val() == '' ? '0.00' : $('#AfterOtherTaxVal' + rowid).val(); //IGST
 					var Freight = $('#AfterFreightVal' + rowid).val() == '' ? '0.00' : $('#AfterFreightVal' + rowid).val();
@@ -2321,15 +2281,11 @@ if (!empty($INRSYMBOL)) {
 					var Discount = $('#AfterDisVal' + rowid).val() == '' ? '0.00' : $('#AfterDisVal' + rowid).val();
 					var BasicVal = $('#basicval' + rowid).val() == '' ? '0.00' : $('#basicval' + rowid).val();
 					var TotalVal = $('#TotalOrderValue' + rowid).val() == '' ? '0.00' : $('#TotalOrderValue' + rowid).val();
-					//alert(TotalVal);
-
 
 					totBasicAmt = parseFloat(totBasicAmt) + parseFloat(BasicVal);
 					totDiscountAmt = parseFloat(totDiscountAmt) + parseFloat(Discount);
 					totPackagingAmt = parseFloat(totPackagingAmt) + parseFloat(Packaging);
-
 					totVATAmt = parseFloat(totVATAmt) + parseFloat(Vat); //SGST
-
 					totGSTAmt = parseFloat(totGSTAmt) + parseFloat(GST); //CGST
 					totOtherTaxAmt = parseFloat(totOtherTaxAmt) + parseFloat(OtherTax); //IGST
 					totFreightAmt = parseFloat(totFreightAmt) + parseFloat(Freight);
@@ -2338,20 +2294,15 @@ if (!empty($INRSYMBOL)) {
 				}
 
 			} while (i < rows);
-
-			// alert(totOrderSummaryAmt);
 			$('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2));
 			$('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2));
 			$('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2));
-
 			$('#txtTotalVat').val(parseFloat(totVATAmt).toFixed(2)); //SGST
-
 			$('#txtTotalGST').val(parseFloat(totGSTAmt).toFixed(2)); //CGST
 			$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt).toFixed(2)); //IGST
 			$('#txtTotalFreight').val(parseFloat(totFreightAmt).toFixed(2));
 			$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt).toFixed(2));
 			$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt).toFixed(2));
-
 		}
 
 		function validateEditRevenueTax() {
@@ -2382,7 +2333,6 @@ if (!empty($INRSYMBOL)) {
 		//alert('inside validateBudgetExceedLimit function');
 		var rows = document.getElementById('revenueTax').rows.length;
 		var ReqType = '<?php echo REVENUE ?>';
-		//alert(rows);
 		for (i = 1; i < rows; i++) {
 			var costcode = $('#costCode' + i).val();
 			var basicAmountRate = parseFloat($('#basicval' + i).val());
@@ -2398,7 +2348,6 @@ if (!empty($INRSYMBOL)) {
 				url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
 				success: function(data) {
 					if (data) {
-						//alert(data);
 						avalbudAmt = parseFloat(data);
 						// if(basicAmountRate > avalbudAmt || totalAmount > avalbudAmt)
 						// {
@@ -2474,7 +2423,6 @@ if (!empty($INRSYMBOL)) {
 						// console.log(data);
 						if (data) {
 							// $('.content').loader('hide');
-							alert(data);
 							$('#txtRowCount').val('');
 							$('#txtDeletedRow').val('');
 							$('#txtStatus').val('');

app/Views/editServiceAmendPO.php

@@ -2040,7 +2040,7 @@ foreach ($PaymentTerms as $TER) {
 					url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
 					success: function(data) {
 						if (data) {
-							$('#content').loader('hide');
+							// $('#content').loader('hide');
 							alert(data);
 						} else {
 							alert("Error");
@@ -2227,7 +2227,7 @@ foreach ($PaymentTerms as $TER) {
 						$('#txtDeliveryAddress').val('')
 						window.location = "amendmentpurchaseorder";
 					} else {
-						$('#content').loader('hide');
+						// $('#content').loader('hide');
 						alert("Error");
 					}
 				}