From 2f2ee5f7c6351f5b85137df3215c0a6e28f55a91 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Fri, 8 Sep 2017 11:54:48 +0530
Subject: [PATCH] edit import per

---
 application/controllers/purchaseorder.php  |  8 +++++---
 application/models/purchaseorder_model.php |  2 +-
 application/views/editimportpo.php         | 23 +++++++++++++++++++++-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php
index b1388df3..dc4a1989 100755
--- a/application/controllers/purchaseorder.php
+++ b/application/controllers/purchaseorder.php
@@ -1664,7 +1664,9 @@ function addNewImportPurchaseOrder()
                                 $Nosoftrip=$this->input->post('NoOfTrip'.$i);
                                 $FreightRate=$this->input->post('FreightValue'.$i);
                                 $FreightAmount=$this->input->post('AfterFreightValue'.$i);
-                                 // echo $Totalvalueitem;
+
+                                $per=$this->input->post('Per'.$i);
+                                  echo $per;
                                 //die();
                                 $LineItemNo = '';
                                //echo "sdsfsd";
@@ -1690,7 +1692,7 @@ function addNewImportPurchaseOrder()
                                     {
                                 if(strlen($POLineItemNo) == 0)
                                 {
-                                    $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
+                                    $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Per'=>$per);
                                     $POLineItem=$this->purchaseorder_model->addPOLineItem($POLineItemList);
                                     if(count($POLineItem)>0)
                                     {
@@ -1707,7 +1709,7 @@ function addNewImportPurchaseOrder()
                                     //echo $LineItemNo;
                                     //die();    
                             
-                                    $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter);
+                                    $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter,'Per'=>$per);
                                     $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList);    
                             
                                 }
diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php
index c487e986..ad9fe6e7 100755
--- a/application/models/purchaseorder_model.php
+++ b/application/models/purchaseorder_model.php
@@ -863,7 +863,7 @@ function GetImportPurchaseOrderDetails($PONO = '')
 	     
 	$subQuery ='SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,
 Mat.UOM,Quantity,Rate,Req.Status,ROUND((Quantity *Rate),2 ) as BasicValue,ReceivedQuantity,
-QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,
+QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
  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,
  AfterCustomEdCess,ROUND((Quantity *Rate),2)as TotalOrderValue,ROUND((POMast.ExchangeRate*BasicPriceInMTon),2) as BasicINRValue,TotalValue,CurrencyType,ReceivedQuantity,Tax.*,
  
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 0f6f1db1..0cda3a3e 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -2731,6 +2731,10 @@ if($PONOStatus == PO_RELEASED)
 
 <input type="hidden" name="<?php echo 'AfterFreightValue'.$index ?>" id="<?php echo 'AfterFreightValue'.$index ?>" value="<?php echo $record->AfterFreightValue; ?>" />
 
+<input type="hidden" name="<?php echo 'Per'.$index ?>" id="<?php echo 'Per'.$index ?>" value="<?php echo $record->Per; ?>" />
+
+
+
                    <?php 
                             
                             if($PONOStatus != PO_RELEASED) 
@@ -4511,7 +4515,13 @@ $('.AddImport').click(function()
     var Nooftrip=$('#addNOOfTrips').val();
     var Freightrate=$('#addtxtFreight').val();
     var AfterFreightAmount=$('#addtxtAfterFreight').val();
+    
 
+    var per=$('#AddPer').val();
+    if(per=='')
+    {
+      var per=$('#UOM').val();
+    }
     // console.log(FreightType);
     // console.log(Nooftrip);
     // console.log(Freightrate);
@@ -4604,6 +4614,8 @@ $('.AddImport').click(function()
           addHidden(theForm,"FreightValue"+temp,Freightrate);
           addHidden(theForm,"AfterFreightValue"+temp,AfterFreightAmount);
 
+          addHidden(theForm,"Per"+temp,per.trim());
+
           //var a=parseFloat($('#AfterCustomEDcess').val());
           //console.log(a);
 
@@ -4726,7 +4738,7 @@ $("#viewimportmodal").on("shown.bs.modal", function(e) {
             $('#ViewTripsValue').hide();
         }
 
-
+        $('#ViewPer').val($("#Per"+userid).val());
      
         $('#ViewTotalOrderValue').val(cellval[6].innerHTML);
         $("#ViewMaterialCode").empty();
@@ -5110,6 +5122,8 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) {
         $('#edittxtFreight').val($("#FreightValue"+userid).val());
         $('#edittxtAfterFreight').val($("#AfterFreightValue"+userid).val());
 
+        $('#EditPer').val($("#Per"+userid).val());
+
 
         var FreightType = $('#drpeditFreight').val();
 
@@ -5237,7 +5251,12 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck()&&EditQtyZerocheck())
    // console.log(FreightRate);
    // console.log(FreightRateAmount);
    
+   var per=$('#EditPer').val();
 
+   if(per=='')
+    {
+      var per=$('#EditUOM').val();
+    }
 
    var tr= document.getElementById(userid);
    var cellval = tr.cells; 
@@ -5291,6 +5310,8 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck()&&EditQtyZerocheck())
           $('#NoOfTrip'+userid).val(Nooftrip);
           $('#FreightValue'+userid).val(FreightRate);
           $('#AfterFreightValue'+userid).val(FreightRateAmount);
+
+          $('#Per'+userid).val(per.trim());
           // var a=parseFloat($('#ProductPrice'+userid).val());
           // console.log(a);
          // var a=$('#FreightType'+userid).val();