Added changes for confirm transaction where invoice id is null

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

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

@@ -63,7 +63,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		boolean isError = false;
 
 
-		//Changed by samadhan on 16/6/2015 for status tracking update in magento system.start						
+		//Changed by samadhan on 16/6/2015 for status tracking update in magento system.start	
+		String confString="";
 		String despId = "";
 		String saleOrder="";
 		String ptcn="";
@@ -126,6 +127,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				//Changed by samadhan on 16/6/2015 for status tracking update in magento system. end	
 				errString = confirmSalesReturn("salesreturn_retn", tranId, xtraParams, "", conn);
 				System.out.println("After confirmSalesReturn---->>["+errString+"]");
+				//Changed by samadhan on 11022016 for rcpmode other than P and S
+				confString = errString;
 				sreturnDetail.put("TRAN_ID",tranId);
 				sreturnDetail.put("INVOICE_ID",invoiceId);
 				sreturnDetail.put("SITE_CODE",siteCode);				
@@ -165,48 +168,59 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 					{						
 						refundReturnStr = ReceivableToPayableTrf(sreturnDetail, conn);
 						System.out.println("After ReceivableToPayableTrf---->>["+refundReturnStr+"]");
-						if("success".equalsIgnoreCase(refundReturnStr))
+						//Changed by Samadhan on 10/02/2016 for invoice id is blank Start
+						if(invoiceId.length() != 0 && invoiceId != null)
 						{
-							//Changed by samadhan on 16/6/2015 for status tracking update in magento system.start
-							objShipment.setOrderID(saleOrder);
-							objShipment.setStatus("refund");
-							objShipment.setTrackingNumbers(wmsUtil.getTrackingNo(ptcn, conn));
-							objShipment.setComment("Sale Order refund");
-							wmsUtil.CallTrackShipStatus(objShipment, apiShipUrl);	
-							//Changed by samadhan on 16/6/2015 for status tracking update in magento system.end   
-							conn.commit();	
-						}
-
-						refundReturnStr = generateAutoPayment(sreturnDetail, conn);
-						System.out.println("After refundReturnStr---->>["+refundReturnStr+"]");
-
-						//Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001
-						finparamCcterm = common.getfinparm("999999", "REC_PAY_AUTOCNF", conn);
-						if("Y".equalsIgnoreCase(finparamCcterm))
-						{
-							Document headerDom = null;
-							headerDom = genericUtility1.parseString(refundReturnStr);
-							tranIdPayment = genericUtility1.getColumnValue("TranID", headerDom);
-							System.out.println("tranId :::::::::: " + tranIdPayment);
-
-							if(refundReturnStr != null && refundReturnStr.indexOf("Success") > -1)
+						//Changed by Samadhan on 10/02/2016 for invoice id is blank end
+							if("success".equalsIgnoreCase(refundReturnStr))
 							{
-								System.out.println("Inside If loop :::::::::: ");
-								conn.commit();
-								System.out.println("Commited Sucessfully :::::::::: ");
-								refundReturnStr =  "success";
-
-
-								AppConnectParm appConnect = new AppConnectParm();                   
-								Properties p = appConnect.getProperty();
-								InitialContext ctx = new InitialContext(p);
-								RefundGateWayPaymentLocal locObj = (RefundGateWayPaymentLocal) ctx.lookup("ibase/RefundGateWayPayment/local");
-								errString=locObj.segPay(tranIdPayment, xtraParams, forcedFlag, conn);
-
-								//	return errString; 
+								//Changed by samadhan on 16/6/2015 for status tracking update in magento system.start
+								objShipment.setOrderID(saleOrder);
+								objShipment.setStatus("refund");
+								objShipment.setTrackingNumbers(wmsUtil.getTrackingNo(ptcn, conn));
+								objShipment.setComment("Sale Order refund");
+								wmsUtil.CallTrackShipStatus(objShipment, apiShipUrl);	
+								//Changed by samadhan on 16/6/2015 for status tracking update in magento system.end   
+								conn.commit();	
+							}
 
+							refundReturnStr = generateAutoPayment(sreturnDetail, conn);
+							System.out.println("After refundReturnStr---->>["+refundReturnStr+"]");
 
-								/*System.out.println("Calling  WSR :::::::::: ");
+							//Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001
+							finparamCcterm = common.getfinparm("999999", "REC_PAY_AUTOCNF", conn);
+							if("Y".equalsIgnoreCase(finparamCcterm))
+							{
+								Document headerDom = null;
+								headerDom = genericUtility1.parseString(refundReturnStr);
+								tranIdPayment = genericUtility1.getColumnValue("TranID", headerDom);
+								System.out.println("tranId :::::::::: " + tranIdPayment);
+
+								if(refundReturnStr != null && refundReturnStr.indexOf("Success") > -1)
+								{
+									System.out.println("Inside If loop :::::::::: ");
+									conn.commit();
+									System.out.println("Commited Sucessfully :::::::::: ");
+									refundReturnStr =  "success";
+
+
+									AppConnectParm appConnect = new AppConnectParm();                   
+									Properties p = appConnect.getProperty();
+									InitialContext ctx = new InitialContext(p);
+									RefundGateWayPaymentLocal locObj = (RefundGateWayPaymentLocal) ctx.lookup("ibase/RefundGateWayPayment/local");
+									errString=locObj.segPay(tranIdPayment, xtraParams, forcedFlag, conn);
+
+									//Changed by Samadhan on 8/02/2016 for other rcp_mode start
+									if(errString.indexOf("VTINVRCPM") > -1)
+									{
+										errString = confString;
+									}
+									//Changed by Samadhan on 8/02/2016 for other rcp_mode end
+									
+									//	return errString; 
+
+
+									/*System.out.println("Calling  WSR :::::::::: ");
 								errString = wmsUtil.callNVOComponent(tranIdPayment, xtraParams, forcedFlag, "prcm_default_1", "nvo_business_object_misc_pay", conn);
 							    System.out.println("return from WSR ::::::::::" + errString);
 
@@ -220,30 +234,38 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 									return errString;  	
 							    }*/
 
+								}
+								else
+								{
+									refundReturnStr = refundReturnStr;
+								}	
+
 							}
 							else
 							{
 								refundReturnStr = refundReturnStr;
-							}	
-
-						}
-						else
-						{
-							refundReturnStr = refundReturnStr;
+							}
 						}
 						//End by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001
 					}
 					//Changed by Samadhan on 8/02/2016 for invoice id is blank start
 					else
 					{
-						return errString;
+						refundReturnStr = ReceivableToPayableTrf(sreturnDetail, conn);
+						//return errString;
 					}
 					//Changed by Samadhan on 8/02/2016 for invoice id is blank end
 					if( "success".equalsIgnoreCase(sorderRtrStr) || "success".equalsIgnoreCase(refundReturnStr))
 					{	
-						System.out.println("Calling send mail method start");
-						SendMailforSalesReturn(invoiceId,tranId,tranType,errString,xtraParams,conn) ; //Added By Manish for send mail to customer for Refund on 02/12/2015
-						System.out.println("Calling send mail method End");
+						System.out.println("Final Error String:-"+errString);
+						//Changed by Samadhan on 8/02/2016 for invoice id is blank
+						if(invoiceId.length() != 0 && invoiceId != null)
+						{
+							System.out.println("Calling send mail method start");
+							SendMailforSalesReturn(invoiceId,tranId,tranType,errString,xtraParams,conn) ; //Added By Manish for send mail to customer for Refund on 02/12/2015
+							System.out.println("Calling send mail method End");
+						//Changed by Samadhan on 8/02/2016 for invoice id is blank
+						}
 						return errString;
 					}
 					else
@@ -321,7 +343,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		ResultSet rs = null;
 		String tranId = "" ,invoiceId = "" , xtraParams = "",siteCode = "",tranIdCrn = "";
 		String sql  ="",userId = "",confirmed = "",errCode = "",errorString = "",
-		tranIdRecAdj = "",chgTerm = "",saleOrder = "",retString = "";		
+		tranIdRecAdj = "",chgTerm = "",retString = "";		
 		String tranIdRec = "",currCode = "",custCode = "",acctCode = "",cctrCode = "",finEntity = "",
 		bankCode = "",tranSer = "",refserPay = "";
 		double exchRate = 0,totAmt = 0,adjAmt = 0;
@@ -344,33 +366,11 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 			String tranDate = simpleDateFormatObj.format(currentDate.getTime());			
 
 			System.out.println("invoiceId------->>["+invoiceId+"]");
-			sql = "SELECT COUNT(*) FROM MISC_PAYABLES WHERE REF_NO = ?";
-			pstmt = conn.prepareStatement(sql);
-			pstmt.setString(1, invoiceId);
-			rs = pstmt.executeQuery();
-			if(rs.next())
-			{
-				count = rs.getInt(1);				
-			}
-			rs.close();
-			rs = null;
-			pstmt.close();
-			pstmt = null;
-			if(count > 0)
-			{
-				errCode = "VTINVALPR"; //entered invoice not present in invoice master
-				errorString = vdt.getErrorString("invoice_id",errCode,userId);
-				return errorString;
-			}
-			if(invoiceId.length() == 0)
+			//Changed by samadhan on 10/02/2016 for invoice id blank where sales return conf start
+			if(invoiceId.length() != 0 && invoiceId != null)
 			{
-				errCode = "VTINVNN"; //invoice can not be empty
-				errorString = vdt.getErrorString("invoice_id",errCode,userId);
-				return errorString;
-			}
-			else
-			{
-				sql = "SELECT COUNT(*) FROM INVOICE WHERE INVOICE_ID = ?";
+				//Changed by samadhan on 10/02/2016 for invoice id blank where sales return conf end
+				sql = "SELECT COUNT(*) FROM MISC_PAYABLES WHERE REF_NO = ?";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, invoiceId);
 				rs = pstmt.executeQuery();
@@ -382,35 +382,64 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				rs = null;
 				pstmt.close();
 				pstmt = null;
-				if(count == 0)
+				if(count > 0)
 				{
-					errCode = "VTINVNE"; //entered invoice not present in invoice master
+					errCode = "VTINVALPR"; //entered invoice not present in invoice master
 					errorString = vdt.getErrorString("invoice_id",errCode,userId);
 					return errorString;
 				}
-			}
-			sql = "SELECT CASE WHEN CONFIRMED IS NULL THEN 'N' ELSE CONFIRMED END FROM INVOICE WHERE INVOICE_ID = ?";
-			pstmt = conn.prepareStatement(sql);
-			pstmt.setString(1, invoiceId);
-			rs = pstmt.executeQuery();
-			if(rs.next())
-			{
-				confirmed = checkNull(rs.getString(1));				
-			}
-			rs.close();
-			rs = null;
-			pstmt.close();
-			pstmt = null;
-			System.out.println("confirmed------->>["+confirmed+"]");
+				if(invoiceId.length() == 0)
+				{
+					errCode = "VTINVNN"; //invoice can not be empty
+					errorString = vdt.getErrorString("invoice_id",errCode,userId);
+					return errorString;
+				}
+				else
+				{
+					sql = "SELECT COUNT(*) FROM INVOICE WHERE INVOICE_ID = ?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, invoiceId);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						count = rs.getInt(1);				
+					}
+					rs.close();
+					rs = null;
+					pstmt.close();
+					pstmt = null;
+					if(count == 0)
+					{
+						errCode = "VTINVNE"; //entered invoice not present in invoice master
+						errorString = vdt.getErrorString("invoice_id",errCode,userId);
+						return errorString;
+					}
+				}
+				sql = "SELECT CASE WHEN CONFIRMED IS NULL THEN 'N' ELSE CONFIRMED END FROM INVOICE WHERE INVOICE_ID = ?";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, invoiceId);
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					confirmed = checkNull(rs.getString(1));				
+				}
+				rs.close();
+				rs = null;
+				pstmt.close();
+				pstmt = null;
+				System.out.println("confirmed------->>["+confirmed+"]");
 
-			if("N".equalsIgnoreCase(confirmed))
-			{
-				errCode = "VTINVN"; //invoice not confirmed
-				errorString = vdt.getErrorString("invoice_id",errCode,userId);
-				return errorString;
-			}
-			else
-			{
+				if("N".equalsIgnoreCase(confirmed))
+				{
+					errCode = "VTINVN"; //invoice not confirmed
+					errorString = vdt.getErrorString("invoice_id",errCode,userId);
+					return errorString;
+				}
+				//Changed by samadhan on 10/02/2016 for invoice id blank where sales return conf start
+				//else
+				//{
+			}	
+				//Changed by samadhan on 10/02/2016 for invoice id blank where sales return conf End
 				// select all necessary details from receivables 
 
 				sql ="SELECT TRAN_SER,TRAN_ID,REF_DATE,CURR_CODE,EXCH_RATE,CUST_CODE,ACCT_CODE,CCTR_CODE,DUE_DATE,FIN_ENTITY,"
@@ -471,8 +500,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				pstmt.close();
 				pstmt = null;
 
-
-				sql = "SELECT SALE_ORDER FROM INVOICE WHERE INVOICE_ID = ?";
+				//Changed by samadhan on 10/02/2016 for invoice id blank where sales return conf Start
+				/*sql = "SELECT SALE_ORDER FROM INVOICE WHERE INVOICE_ID = ?";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, invoiceId);
 				rs = pstmt.executeQuery();
@@ -484,7 +513,9 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				rs = null;
 				pstmt.close();
 				pstmt = null;
-				System.out.println("saleOrder====>>["+saleOrder+"]");
+				System.out.println("saleOrder====>>["+saleOrder+"]");*/
+				//Changed by samadhan on 10/02/2016 for invoice id blank where sales return conf End
+				
 				//retString= recPayGetData(siteCode,saleOrder,custCode,xtraParams,conn);				
 				// Generate misc_payables tran_id
 
@@ -574,7 +605,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 				{
 					retString = "Error";					
 				}  
-			}
+			//}
 		}
 		catch(Exception e)
 		{
@@ -2728,6 +2759,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 	{
 
 		boolean debug = false;
+		//Changed by Samadhan on 11/02/2016 for SMTP_PORT
+		String port = CommonConstants.SMTPPORT;
 		String fromAddress = CommonConstants.MAILFROM;
 		System.out.println("fromAddress-------["+fromAddress+"]");
 		String host = CommonConstants.SMTPHOST; 
@@ -2738,7 +2771,10 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
 		{
 			props.put("mail.smtp.starttls.enable", "true");
 			props.put("mail.smtp.host", host);
-			props.put("mail.smtp.port", "2587");
+			//Changed by Samadhan on 11/02/2016 for SMTP_PORT
+			//props.put("mail.smtp.port", "2587");
+			System.out.println("SMTPPORT:"+port);
+			props.put("mail.smtp.port", port);
 			props.put("mail.smtp.auth","true");
 			auth = new SMTPAuthenticator();
 		}