Added Changes for get transaction id of paypal tokan info for refNo of misc_payment.

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

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

@@ -700,13 +700,47 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 			pstmt.close();
 			pstmt = null;
 			System.out.println("saleOrder--->>["+saleOrder+"] tokenInfo---->>["+tokenInfo+"]");
+			//Changed by Samadhan on 11/01/2015 for received paypal transaction id. Start 
+			System.out.println("saleOrder====>>["+saleOrder+"]");
+			sql = "SELECT RCP_MODE,CURR_CODE FROM SORDER WHERE SALE_ORDER = ?";				
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1,saleOrder);
+			rs = pstmt.executeQuery();
+			if (rs.next())
+			{
+				rcpMode= checkNull(rs.getString(1));				
+				currCodeS= checkNull(rs.getString(2));
 
+			}	
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt = null;
+			System.out.println("rcpMode----->>["+rcpMode+"]");
+			//Changed by Samadhan on 11/01/2015 for received paypal transaction id. End
+		
 			if(tokenInfo != null && tokenInfo.length() > 0)
 			{
 				Document dom1 = genericUtility.parseString(tokenInfo);
-				vpsTxId= genericUtility.getColumnValue("VPSTXID", dom1);
+				//Changed by Samadhan on 11/12/2015 for paypal transaction id start
+				/*vpsTxId= genericUtility.getColumnValue("VPSTXID", dom1);
 				vpsTxId = vpsTxId.replace('{', ' ');
-				vpsTxId = vpsTxId.replace('}', ' ');
+				vpsTxId = vpsTxId.replace('}', ' ');*/
+				//Changed by Samadhan on 11/12/2015 for paypal transaction id End
+				if("P".equalsIgnoreCase(rcpMode))
+				{
+					vpsTxId= genericUtility.getColumnValue("TRANSACTIONID", dom1);
+				}
+				else if("S".equalsIgnoreCase(rcpMode))
+				{
+					vpsTxId= genericUtility.getColumnValue("VPSTXID", dom1);
+					vpsTxId = vpsTxId.replace('{', ' ');
+					vpsTxId = vpsTxId.replace('}', ' ');
+				}
+				else if("C".equalsIgnoreCase(rcpMode))
+				{
+					vpsTxId= "";//Need to confirm for bank transfer.
+				}
 				vpsTxId = vpsTxId == null ? "" : vpsTxId.trim();
 			}			
 			refNo = vpsTxId;
@@ -716,8 +750,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 			payMode = "R";
 			String tranType = "A";
 			System.out.println("tranSer--->>["+tranSer+"] payMode---->>["+payMode+"]");
-
-			System.out.println("saleOrder====>>["+saleOrder+"]");
+			//Changed by Samadhan on 11/01/2015 for received paypal transaction id. Start 
+			/*System.out.println("saleOrder====>>["+saleOrder+"]");
 			sql = "SELECT RCP_MODE,CURR_CODE FROM SORDER WHERE SALE_ORDER = ?";				
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,saleOrder);
@@ -732,7 +766,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 			rs = null;
 			pstmt.close();
 			pstmt = null;
-			System.out.println("rcpMode----->>["+rcpMode+"]");
+			System.out.println("rcpMode----->>["+rcpMode+"]");*/
+			//Changed by Samadhan on 11/01/2015 for received paypal transaction id. End
 			if("P".equalsIgnoreCase(rcpMode))
 			{
 				modName = "W_PAYPAL";