Changes made for Group scheme in Sales Order html wizard screen

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

webitm-wms/ibase/webitm/bean/wms/SorderWizBean.java

@@ -213,7 +213,7 @@ public class SorderWizBean
 		return details;
 	}*/
 
-	public String SaveSorderDetail(String str,String xmlStringFile) throws ITMException 
+	public String SaveSorderDetail(String str,String xmlStringFile, UserInfoBean userInfo) throws ITMException 
 	{
 		String details = null;
 		SorderWizardEJBRemote sorderWizRemote = null;
@@ -221,6 +221,7 @@ public class SorderWizBean
 		{
 			InitialContext ctx = new InitialContext( new AppConnectParm().getProperty() );
 			sorderWizRemote = (SorderWizardEJBRemote) ctx.lookup("ibase/SorderWizardEJB/remote");
+			sorderWizRemote.setUserInfo(userInfo);
 			details = sorderWizRemote.SaveSorderDetail(str,xmlStringFile);
 		}	
 		catch (Exception e)

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

@@ -6,10 +6,6 @@
 
 package ibase.webitm.ejb.wms;
 
-import ibase.system.config.ConnDriver;
-import ibase.utility.EMail;
-import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.utility.GenericUtility;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -17,6 +13,12 @@ import java.util.ArrayList;
 
 import javax.ejb.Stateless;
 
+import ibase.system.config.ConnDriver;
+import ibase.utility.EMail;
+import ibase.utility.UserInfoBean;
+import ibase.webitm.ejb.ValidatorEJB;
+import ibase.webitm.utility.GenericUtility;
+
 @Stateless
 public class ResetPasswordEJB extends ValidatorEJB implements ResetPasswordEJBLocal, ResetPasswordEJBRemote
 {
@@ -26,7 +28,7 @@ public class ResetPasswordEJB extends ValidatorEJB implements ResetPasswordEJBLo
 	}
 	GenericUtility genericUtility = GenericUtility.getInstance();
 	
-	public boolean validateUser(String userCode, String password, String passwordStr, String firstLogin)
+	public boolean validateUser(String userCode, String password, String passwordStr, String firstLogin, UserInfoBean userInfo)
 	{
 		System.out.println(" **** Inside validateUser ****** ");
 		String sql = "";
@@ -69,7 +71,7 @@ public class ResetPasswordEJB extends ValidatorEJB implements ResetPasswordEJBLo
 				if (count != 0)
 				{
 					
-					sendMail(mailInfo);
+					sendMail(mailInfo, userInfo);
 					isValidate = true;
 				}
 				if (pstmt1 != null)
@@ -139,7 +141,7 @@ public class ResetPasswordEJB extends ValidatorEJB implements ResetPasswordEJBLo
 		return isValidate;
 	}
 
-	public void sendMail(ArrayList<String> mailInfo)
+	public void sendMail(ArrayList<String> mailInfo, UserInfoBean userInfo)
 	{
 		EMail email = new EMail();
 		StringBuffer commInfo = new StringBuffer();
@@ -159,7 +161,7 @@ public class ResetPasswordEJB extends ValidatorEJB implements ResetPasswordEJBLo
 			commInfo.append("</ROOT>");
 			
 			System.out.println(" calling sendMail method() form for Reset Password. ");
-			email.sendMail(commInfo.toString(), "ITM", null);
+			email.sendMail(commInfo.toString(), "ITM", userInfo);
 			System.out.println(" ******** Email send succesfully for Reset Password. ***********");
 		}
 		catch (Exception e)

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

@@ -5,15 +5,13 @@
  */
 
 package ibase.webitm.ejb.wms;
-import ibase.webitm.ejb.ValidatorLocal;
-import ibase.webitm.utility.ITMException;
-
-import java.rmi.RemoteException;
-
 import javax.ejb.Local;
 
+import ibase.utility.UserInfoBean;
+import ibase.webitm.ejb.ValidatorLocal;
+
 @Local
 public interface ResetPasswordEJBLocal  extends ValidatorLocal
 {
-	public boolean validateUser(String userCode, String newPwdSHA256, String passwordStr, String firstLogin);
+	public boolean validateUser(String userCode, String newPwdSHA256, String passwordStr, String firstLogin, UserInfoBean userInfo);
 }

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

@@ -5,15 +5,13 @@
  */
 
 package ibase.webitm.ejb.wms;
-import ibase.webitm.ejb.ValidatorRemote;
-import ibase.webitm.utility.ITMException;
-
-import java.rmi.RemoteException;
-
 import javax.ejb.Remote;
 
+import ibase.utility.UserInfoBean;
+import ibase.webitm.ejb.ValidatorRemote;
+
 @Remote
 public interface ResetPasswordEJBRemote  extends ValidatorRemote
 {
-	public boolean validateUser(String userCode, String newPwdSHA256, String passwordStr, String firstLogin);
+	public boolean validateUser(String userCode, String newPwdSHA256, String passwordStr, String firstLogin, UserInfoBean userInfo);
 }

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

@@ -4127,7 +4127,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 		ResultSet rs = null,rsSel = null;
 		Connection conn = null;
 		
-		String dlvDate = "";
+		String dlvDate = "", taxClass = "", taxEnv = "", taxChap = "", taxAmt = "", discount = "";
 		boolean isError = false;
 		try
 		{
@@ -4146,15 +4146,6 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 			
 			System.out.println("itemCode2"+itemCode);
 			
-			//Added By Kaustubh on 14 Dec 2017 Start
-			
-			String taxClass = checkNullAndTrim(detail[10]);
-			String taxEnv = checkNullAndTrim(detail[11]);
-			String taxChap = checkNullAndTrim(detail[9]);
-			String taxAmt= checkNullAndTrim(detail[12]);
-		
-			//Added By Kaustubh on 14 Dec 2017 End
-			
 			//Added By Kaustubh on 02 Jan 2018 start
 			String taxXml= taxXmlFile;
 			//Added By Kaustubh on 02 JAn 2018 End
@@ -4162,7 +4153,6 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 			String saleOrderHdr = "";
 			
 			System.out.println("Status["+status+"]");
-			System.out.println("taxClass::="+taxClass+"taxEnv:=>"+taxEnv+"taxChap::="+taxChap+"taxAmt:="+taxAmt);
 			System.out.println("taxXml["+taxXml+"]");
 			
 			if("A".equalsIgnoreCase(status))		// Status
@@ -4312,7 +4302,15 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 			//if(!("").equalsIgnoreCase(quantity) && Integer.parseInt(quantity) > 0)
 			if(!("").equalsIgnoreCase(quantity) && Double.parseDouble(quantity) > 0)			
 			{
-				String discount = checkNullAndTrim(detail[8]);
+				//Added By Kaustubh on 14 Dec 2017 Start
+				discount = checkNullAndTrim(detail[8]);
+				taxClass = checkNullAndTrim(detail[10]);
+				taxEnv = checkNullAndTrim(detail[11]);
+				taxChap = checkNullAndTrim(detail[9]);
+				taxAmt= checkNullAndTrim(detail[12]);
+			
+				System.out.println("taxClass::="+taxClass+"taxEnv:=>"+taxEnv+"taxChap::="+taxChap+"taxAmt:="+taxAmt);
+				//Added By Kaustubh on 14 Dec 2017 End
 				
 				//sql = "SELECT ITEM_CODE FROM SORDDET_TEMP WHERE SALE_ORDER = ? AND ITEM_CODE = ? ";
 				sql = "SELECT ITEM_CODE FROM SORDDET_TEMP WHERE SALE_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ?";

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

 package ibase.webitm.ejb.wms;
 
-import ibase.system.config.AppConnectParm;
-import ibase.utility.CommonConstants;
-import ibase.utility.E12GenericUtility;
-import ibase.webitm.ejb.ActionHandlerEJB;
-import ibase.webitm.ejb.ITMDBAccessEJB;
-import ibase.webitm.ejb.MasterStatefulLocal;
-import ibase.webitm.ejb.dis.DistCommon;
-import ibase.webitm.ejb.dis.InvAllocTraceBean;
-import ibase.webitm.ejb.fin.FinCommon;
-import ibase.webitm.ejb.fin.adv.ReceiptAdvConfLocal;
-import ibase.webitm.utility.ITMException;
-import ibase.webitm.utility.TransIDGenerator;
-import ibase.webitm.utility.wms.CommonWmsUtil;
-
 import java.io.File;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -47,11 +33,26 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import ibase.system.config.AppConnectParm;
+import ibase.utility.CommonConstants;
+import ibase.utility.E12GenericUtility;
+import ibase.utility.UserInfoBean;
+import ibase.webitm.ejb.ActionHandlerEJB;
+import ibase.webitm.ejb.ITMDBAccessEJB;
+import ibase.webitm.ejb.MasterStatefulLocal;
+import ibase.webitm.ejb.dis.DistCommon;
+import ibase.webitm.ejb.dis.InvAllocTraceBean;
+import ibase.webitm.ejb.fin.FinCommon;
+import ibase.webitm.ejb.fin.adv.ReceiptAdvConfLocal;
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.utility.TransIDGenerator;
+import ibase.webitm.utility.wms.CommonWmsUtil;
+
 @Stateless
 public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLocal,UploadOrderEJBRemote
 {
 	String siteCodeG = "";
-	public String uploadSalesOrder(String xmlString,String xtraParams) throws Exception
+	public String uploadSalesOrder(String xmlString, UserInfoBean userInfo, String xtraParams) throws Exception
 	{
 		Connection conn = null;
 		PreparedStatement pstmt = null;		
@@ -385,7 +386,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 										if(retString != null && retString.length() > 0)
 										{	
 											isError = true;
-											writeLogAndSendMail(saleOrderNo,retString,conn);
+											writeLogAndSendMail(saleOrderNo,retString, userInfo, conn);
 											//return retString;
 											return "Success "+saleOrderNo+" Error on Confirm ";  // change by manish on 05/03/2016 to return success msg to ERP if order is not confirm.
 										}
@@ -404,7 +405,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 								else
 								{
 									isError = true;
-									writeLogAndSendMail(saleOrderNo,retString,conn);
+									writeLogAndSendMail(saleOrderNo,retString, userInfo, conn);
 									//return retString; //Error could not return to Magento server
 									return "Success "+saleOrderNo+ " Error on Confirm ";  // change by manish on 05/03/2016 to return success msg to ERP if order is not confirm.
 								}
@@ -414,7 +415,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 								isError = true;
 								System.out.println("Unconfimed order generated, Tax Amount does not match with magento server.");								
 								retString = itmDBAccessEJB.getErrorString("","VTTAXMGTO","","",conn);
-								writeLogAndSendMail(saleOrderNo,retString,conn);
+								writeLogAndSendMail(saleOrderNo,retString, userInfo, conn);
 								//return retString; //Error could not return to Magento server
 								return "Success "+saleOrderNo+ " Error on Confirm ";  // change by manish on 05/03/2016 to return success msg to ERP if order is not confirm.
 							}
@@ -424,7 +425,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 							isError = true;
 							System.out.println("Unconfirmed order generated,Total amount and net amount not matched.");								
 							retString = itmDBAccessEJB.getErrorString("","VTTOTNETNM","","",conn);
-							writeLogAndSendMail(saleOrderNo,retString,conn);
+							writeLogAndSendMail(saleOrderNo,retString, userInfo, conn);
 						}
 
 
@@ -472,7 +473,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 				}
 				else
 				{
-					writeLogAndSendMail(ErrSaleOrder,retString,conn);
+					writeLogAndSendMail(ErrSaleOrder,retString, userInfo, conn);
 					System.out.println("Sale order not save...............rollback");
 					isError = true;
 					conn.rollback();					
@@ -491,7 +492,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 		catch(Exception e)
 		{
 			isError = true;
-			writeLogAndSendMail(ErrSaleOrder,retString,conn);
+			writeLogAndSendMail(ErrSaleOrder,retString, userInfo, conn);
 			System.out.println("Exception in  UploadSorderBean  : uploadSalesOrder---------");
 			e.printStackTrace();
 			e.printStackTrace(new PrintWriter(errors));
@@ -523,7 +524,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 		}
 		return "";
 	}
-	private void writeLogAndSendMail(String saleOrderNo,String errorString,Connection conn) throws Exception
+	private void writeLogAndSendMail(String saleOrderNo,String errorString, UserInfoBean userInfo, Connection conn) throws Exception
 	{
 		String mailFlag = "",attachFlag = "",formatCode = "",attachPath = "",fileName1 = "";
 		CommonWmsUtil commonWmsUtil = CommonWmsUtil.getInstance();
@@ -576,7 +577,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 			fh.close();	    
 
 
-			commonWmsUtil.sendMail(mailFlag,attachFlag,formatCode,attachPath +fileName1,errorString,conn);		
+			commonWmsUtil.sendMail(mailFlag,attachFlag,formatCode,attachPath +fileName1,errorString, userInfo, conn);		
 		}
 		catch(Exception e)
 		{

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

 package ibase.webitm.ejb.wms;
 
-import ibase.webitm.ejb.ActionHandlerLocal;
-
 import javax.ejb.Local;
 
+import ibase.utility.UserInfoBean;
+import ibase.webitm.ejb.ActionHandlerLocal;
+
 @Local
 public interface UploadOrderEJBLocal extends ActionHandlerLocal
 {
-	public String uploadSalesOrder( String xmlString,String xtraParams) throws Exception;
+	public String uploadSalesOrder( String xmlString, UserInfoBean userInfo, String xtraParams) throws Exception;
 }

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

 package ibase.webitm.ejb.wms;
 
-import ibase.webitm.ejb.ActionHandlerLocal;
-import ibase.webitm.ejb.ActionHandlerRemote;
-
 import javax.ejb.Remote;
 
+import ibase.utility.UserInfoBean;
+import ibase.webitm.ejb.ActionHandlerRemote;
+
 @Remote
 public interface UploadOrderEJBRemote extends ActionHandlerRemote
 {
-	public String uploadSalesOrder( String xmlString,String xtraParams) throws Exception;
+	public String uploadSalesOrder( String xmlString, UserInfoBean userInfo, String xtraParams) throws Exception;
 }

webitm-wms/ibase/webitm/servlet/wms/ResetPasswordServlet.java

@@ -65,6 +65,8 @@ public class ResetPasswordServlet extends HttpServlet
 			System.out.println("userCode=========>>" + userCode);
 			System.out.println("password=========>>" + password);
 			System.out.println("firstLogin=========>>" + firstLogin);*/
+			
+			ibase.utility.UserInfoBean userInfo = ( ibase.utility.UserInfoBean )session.getAttribute( "USER_INFO" );
 
 
 			context = new InitialContext(appConnectParm.getProperty());
@@ -72,7 +74,7 @@ public class ResetPasswordServlet extends HttpServlet
 			
 			if(actionName.equalsIgnoreCase("RESET_PASSWORD")) 
 			{
-				boolean retStr = resetPasswordEJBLocal.validateUser(userCode, newPwdSHA256, password, firstLogin);
+				boolean retStr = resetPasswordEJBLocal.validateUser(userCode, newPwdSHA256, password, firstLogin, userInfo);
 				
 				System.out.println("retStr from EJB ===>>"+retStr);
 				if (retStr) 

webitm-wms/ibase/webitm/servlet/wms/SorderIntegrateServlet.java

@@ -213,7 +213,7 @@ public class SorderIntegrateServlet extends ITMAuthenticateServlet
 				if(dataBuff != null)
 				{
 					UploadOrderEJBLocal uploadSalesOrderLocalObj = (UploadOrderEJBLocal) ctx.lookup("ibase/UploadOrderEJB/local");
-					retString = uploadSalesOrderLocalObj.uploadSalesOrder(dataBuff, xtraParams);
+					retString = uploadSalesOrderLocalObj.uploadSalesOrder(dataBuff, userInfo, xtraParams);
 					System.out.println(" SorderIntegrateServlet retString@#----->>["+retString+"]@@@$%");
 					if(retString != null && retString.length() > 0 && retString.indexOf("Success") > -1)
 					{

webitm-wms/ibase/webitm/servlet/wms/SorderWizHandlerServlet.java

@@ -76,6 +76,7 @@ public class SorderWizHandlerServlet extends HttpServlet
 			{
 				sordICObj = (SalesOrderICRemote) ctx.lookup("ibase/SalesOrderIC/remote");
 				sordICObj.setUserInfo(userInfo);
+				sordBeanObj.setUserInfo(userInfo);
 				action = checkNullAndTrim(request.getParameter("ACTION"));
 				
 				System.out.println("Action ["+action+"]");

webitm-wms/ibase/webitm/utility/wms/CommonWmsUtil.java

 package ibase.webitm.utility.wms;
-import ibase.system.config.ConnDriver;
-import ibase.utility.CommonConstants;
-import ibase.utility.E12GenericUtility;
-import ibase.utility.EMail;
-import ibase.webitm.bean.wms.Attribute;
-import ibase.webitm.bean.wms.PaypalParameters;
-import ibase.webitm.bean.wms.PaypalRefundParams;
-import ibase.webitm.bean.wms.Product;
-import ibase.webitm.bean.wms.ShipmentStatus;
-import ibase.webitm.utility.ITMException;
-import ibase.webitm.utility.TransIDGenerator;
-
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -25,14 +13,12 @@ import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.security.SecureRandom;
-import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -53,6 +39,19 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+
+import ibase.system.config.ConnDriver;
+import ibase.utility.CommonConstants;
+import ibase.utility.E12GenericUtility;
+import ibase.utility.EMail;
+import ibase.utility.UserInfoBean;
+import ibase.webitm.bean.wms.Attribute;
+import ibase.webitm.bean.wms.PaypalParameters;
+import ibase.webitm.bean.wms.PaypalRefundParams;
+import ibase.webitm.bean.wms.Product;
+import ibase.webitm.bean.wms.ShipmentStatus;
+import ibase.webitm.utility.ITMException;
+import ibase.webitm.utility.TransIDGenerator;
 public  class CommonWmsUtil {
 
 	public static  int ALL_PTCN_EX_COUNT;
@@ -2093,7 +2092,7 @@ public  class CommonWmsUtil {
 
 	//Changed By Samadhan on 07/07/2015 D15CKAT015 for calling payPal Authorization End
 
-	public void sendMail(String mailFlag,String attachFlag,String formatCode,String attachPath,String errorString,Connection conn) throws Exception,SQLException   
+	public void sendMail(String mailFlag,String attachFlag,String formatCode,String attachPath,String errorString, UserInfoBean userInfo, Connection conn) throws Exception,SQLException   
 	{
 		System.out.println("----------in sendingMail--------------------");				
 		StringBuffer commInfo = new StringBuffer();
@@ -2143,7 +2142,7 @@ public  class CommonWmsUtil {
 				commInfo.append("</MAILINFO>");
 				commInfo.append("</ROOT>");		
 				System.out.println(" calling sendMail  method()");
-				email.sendMail(commInfo.toString(), "ITM", null);
+				email.sendMail(commInfo.toString(), "ITM", userInfo);
 				System.out.println(" ********Email send succesfully ***********");
 			}
 

webitm-wms/ibase/webitm/utility/wms/SorderInsertSchedule.java

@@ -1300,7 +1300,7 @@ public class SorderInsertSchedule implements Schedule{
 		}
 	}
 	
-	public void sendingMail(String attachFilePath,Connection conn)
+	/*public void sendingMail(String attachFilePath,Connection conn)
 	{
 		System.out.println("----------in sendingMail--------------------");
 		StringBuffer commInfo = new StringBuffer();
@@ -1346,7 +1346,7 @@ public class SorderInsertSchedule implements Schedule{
 			System.out.println("Exception :SorderInsertSchedule :sendMail : " + e.getMessage());
 		}
 		email = null;
-	}
+	}*/
 	public String getSaleOrderNumber(String ordDate,Connection conn) throws SQLException,ITMException
 	{
 		ResultSet rs=null;