Changed by Manish on 14/03/16 for DDUK.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100430 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/ibase/webitm/ejb/wms/DockTranPos.java

@@ -417,8 +417,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 								
 								
 								String vps = "";
-								if(tokenInfo != null && tokenInfo.length() > 0)
+								if(tokenInfo != null && tokenInfo.length() > 0 && tokenInfo.indexOf("OK") > 0)
 								{
+									isReceiptGen = true ; 
 									Document dom1 = genericUtility.parseString(tokenInfo);
 									vps= genericUtility.getColumnValue("VPSTXID", dom1);
 									vps = vps.replace('{', ' ');
@@ -480,21 +481,32 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 										
 										System.out.println("After insertPayPalDetailsinDespatch--->>["+errString+"]");
 										//TRANSACTIONID
-										String tokenInfoPayPal = getColumnDescr(conn, "TOKEN_INFO", "DESPATCH", "DESP_ID", despId);
-										String vps = "";
+									//	String tokenInfoPayPal = getColumnDescr(conn, "TOKEN_INFO", "DESPATCH", "DESP_ID", despId);
+										tokenInfo = getColumnDescr(conn, "TOKEN_INFO", "DESPATCH", "DESP_ID", despId);
+										/*String vps = "";
 										if(tokenInfoPayPal != null && tokenInfoPayPal.length() > 0)
 										{
 											Document dom1 = genericUtility.parseString(tokenInfoPayPal);
 											vps= genericUtility.getColumnValue("TRANSACTIONID", dom1);
 										}
 										System.out.println("After insertPayPalDetailsinDespatch--->>["+errString+"]");
-										refNo = vps; 
+										refNo = vps; */
 									}
 									else
 									{								
 										throw new Exception("Invalid PayPal Payment.....["+payPalStatus+"]");
 									}
 								}  //Changed by manish to check token_info is present or not on 09/03/16 [end]
+								
+								String vps = "";
+								if(tokenInfo != null && tokenInfo.length() > 0 && tokenInfo.indexOf("Success") > 0)
+								{
+									isReceiptGen = true ;
+									Document dom1 = genericUtility.parseString(tokenInfo);
+									vps= genericUtility.getColumnValue("TRANSACTIONID", dom1);
+								}
+								System.out.println("After insertPayPalDetailsinDespatch--->>["+errString+"]");
+								refNo = vps; 
 							}
 							catch(Exception e)
 							{
@@ -1430,7 +1442,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 			if(sagePayInfo != null && sagePayInfo.length() > 0)
 			{
 				//
-				boolean lockSuccess = false;
+				/*boolean lockSuccess = false;
 				sql = " SELECT TOKEN_INFO FROM DESPATCH WHERE DESP_ID = ? FOR UPDATE NOWAIT";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, despId);
@@ -1453,7 +1465,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 				}
 				//
 				if(lockSuccess)
-				{
+				{*/
 					sql = "UPDATE DESPATCH SET TOKEN_INFO = ? WHERE DESP_ID = ?";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, sagePayInfo.toString());
@@ -1482,11 +1494,11 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 						}
 					}
 					// Changed by Sneha on 12-03-2016, need to commit/rollback if isCommit is true [End]
-				}
+				/*}
 				else
 				{
 					System.out.println("Despatch Table is locked");
-				}
+				}*/
 			}		
 
 		}
@@ -1510,10 +1522,13 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 					pstmt.close();
 					pstmt = null;
 				}
-				if(conn != null)
+				if(isCommit)
 				{
-					conn.close();
-					conn = null;
+					if(conn != null)
+					{
+						conn.close();
+						conn = null;
+					}
 				}
 			}
 		}
@@ -2846,7 +2861,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 			if(payPalInfo != null && payPalInfo.length() > 0)
 			{
 				//
-				boolean lockSuccess = false;
+			/*	boolean lockSuccess = false;
 				sql = " SELECT TOKEN_INFO FROM DESPATCH WHERE DESP_ID = ? FOR UPDATE NOWAIT";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, despId);
@@ -2869,7 +2884,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 				}
 				//
 				if(lockSuccess)
-				{
+				{*/
 					sql = "UPDATE DESPATCH SET TOKEN_INFO = ? WHERE DESP_ID = ?";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, payPalInfo.toString());
@@ -2898,12 +2913,12 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 							System.out.println("paypal details rollback .............");
 						}
 					}
-					// Changed by Sneha on 12-03-2016, need to commit/rollback if isCommit is true [End]
+			/*		// Changed by Sneha on 12-03-2016, need to commit/rollback if isCommit is true [End]
 				}
 				else
 				{
 					System.out.println("Despatch table is locked");
-				}
+				}*/
 			}		
 
 		}
@@ -2924,10 +2939,13 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 				pstmt.close();
 				pstmt = null;
 			}
-			if(conn != null)
+			if(isCommit)
 			{
-				conn.close();
-				conn = null;
+				if(conn != null)
+				{
+					conn.close();
+					conn = null;
+				}
 			}
 		}
 		return retString;