From 67c9c6a1567cbe503159e4fb0f0321f2f8fae3a7 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 14 Aug 2017 15:41:06 +0530
Subject: [PATCH] import fixes

---
 application/views/Amendedimportpopdf.php | 18 +++++++--
 application/views/editimportpo.php       |  2 +-
 application/views/importpo.php           | 49 +++++++++++++++---------
 3 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/application/views/Amendedimportpopdf.php b/application/views/Amendedimportpopdf.php
index f0b1a843..8c0ce0c9 100755
--- a/application/views/Amendedimportpopdf.php
+++ b/application/views/Amendedimportpopdf.php
@@ -56,6 +56,18 @@
              //$PaymentDays=$PO->PaymentDays;
              //$PayableAT=$PO->PayableAT;
              $PlaceofOrigin=$PO->Import_PlaceofOrgin;
+
+             if($PO->DeliveryOption=='1'){
+                 $DeliveryDate =  '';
+                 $DeliverySchedule =  $PO->DeliverySchedule;
+                 $Import_DispatchDetails='';
+                    }
+                    else{
+            $dtDe = new DateTime($PO->DeliveryDate, new DateTimeZone('Asia/Kolkata'));				
+		$DeliveryDate =  $dtDe->format('d-m-Y');
+                $DeliverySchedule =  '';
+                $Import_DispatchDetails=$PO->Import_DispatchDetails;
+                    }
 	        }
         }
 //echo $SuplierName;
@@ -146,7 +158,7 @@
 </tr>
 <tr>
 <td>PO DATE :&nbsp;<?php echo $Podt?></td>
-<td> DISPATCH INSTRUCTION/SCHEDULE BY :&nbsp;<?php echo $DeliveryDate.$DeliverySchedule;?></td>
+<td>DISPATCH INSTRUCTION/ SCHEDULE BY :&nbsp;&nbsp;<?php echo $Import_DispatchDetails.$DeliverySchedule;?></td>
 <td>PLACE OF ORIGIN:&nbsp; <?php echo $PlaceofOrigin;?></td>
 </tr>
 </tbody>
@@ -234,7 +246,7 @@
 			
 			<td align="right"><?php echo $record->Rate ; ?></td>
 			<td align="right"><?php $BasicValue=($record->Quantity*$record->Rate);
-												echo number_format($BasicValue,2) ; ?></td>
+												echo number_format($BasicValue,2,'.','') ; ?></td>
 		    <!-- <td align="right"><?php echo $record->TotalOrderValue; ?></td> -->
 
 		  <!--   <td align="right"><?php $TotalOrderValue=($record->Quantity*$record->Rate);
@@ -346,7 +358,7 @@
 		<table  style="border-collapse: collapse;" cellpadding="0" cellspacing="0" border="1" width="100%">
         <tbody>
         <tr>
-        <td style="text-align: center;" ><strong>Total Amount In Words</strong><br /><br /><em><?php echo $TotalAmountInWords." "."Only.";?></em></td>
+        <td style="text-align: center;" ><strong>Total Amount In Words</strong><br /><br /><em><?php echo $TotalAmountInWords." ";?></em></td>
         <td style="text-align: center;" ><strong>Total Amount In <?php echo "$CurrencyCode ($CurrencyName)" ;?>   <?php echo "$TotalOrderValue1";?> </strong></td>
         </tr>
          
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index 1a90d9d7..c4e2569f 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -2636,7 +2636,7 @@ if($PONOStatus == PO_RELEASED)
 
         <!-- <input type="text" name="txttot" id="txtPONO"  value=<?php echo "$totalhidden";?>>  -->
             </div> 
-                <input type="hidden" name="txttot" id="txttot"  value="">
+                <input type="hidden" name="txttot" id="txttot"  value=<?php echo $totalhidden?>>
                     
 
                     <div class="col-md-12">
diff --git a/application/views/importpo.php b/application/views/importpo.php
index 86fa9391..676b38a2 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -432,34 +432,45 @@ function vaildateBeforeOpenModal()
                         
                          <?php
                                                      
-                                        $optionsPay = array("0"=>'Select Payment method');       
+                                        $options1 = array("0"=>'Select Payment method');       
                                              
-                                                   if(!empty($Payment))
-                                                   {
+                                            //        if(!empty($Payment))
+                                            //        {
                                                
-                                               foreach ($Payment as $pay2)
+                                            //    foreach ($Payment as $pay2)
                                                      
-                                                   if($Terms==$pay2->PaymentID){
-                                                        //echo "$Terms";
-                                                        //echo "$pay2->PaymentTerms";
+                                            //        if($Terms==$pay2->PaymentID){
+                                            //             //echo "$Terms";
+                                            //             //echo "$pay2->PaymentTerms";
                                                         
-                                                        ?>
-                                            <input type="hidden" name="beforePaymentTermsText" value="<?php echo $pay2->PaymentTerms?>">
-                                                        <?php
+                                            
+                                            //             <?php
                                                    
-                                                      $optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
+                                            //           $optionsPay[$pay2->PaymentID] =  $pay2->PaymentTerms;
                                                      
-                                                    }
+                                            //         }
                                                  
-                                                    foreach ($Payment as $pay1):
+                                            //         foreach ($Payment as $pay1):
                                                      
-                                                    if($Terms!=$pay1->PaymentID){
+                                            //         if($Terms!=$pay1->PaymentID){
                                                    
-                                                      $optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
+                                            //           $optionsPay[$pay1->PaymentID] =  $pay1->PaymentTerms;
                                                      
-                                                    }
-                                                   endforeach;
-                                                   }                                                                                            echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');                                                    ?>
+                                            //         }
+                                            //        endforeach;
+                                            //        }                                                                                            echo form_dropdown('PaymentTerms', $optionsPay,set_value('PaymentTerms'),'id="PaymentTerms"'  ,'required="true"' ,'class="form-control select2');      
+
+
+                                            if(!empty($Payment))
+                      {
+                       foreach ($Payment as $payment):
+
+                        $options1[$payment->PaymentID] =  $payment->PaymentTerms;
+
+                        endforeach;
+                      }
+
+                    echo form_dropdown('PaymentTerms', $options1,set_value('PaymentTerms'),'id="PaymentTerms"' ,'class="form-control"');                                              ?>
                     
            </div>
             
@@ -1891,6 +1902,8 @@ $('#drpSupplier').change(function() {
                $("#SupAddress").val(obj.Address);
         
                PaymentID = obj.PaymentID;
+               PaymentID = obj.PaymentID;
+               $('#PaymentTerms').val(obj.PaymentTerms);
                }
       
            });