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

webitm-dis/ibase/webitm/ejb/dis/ChargeBackLoc.java

@@ -1011,7 +1011,12 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 					    	{
 					    		Double limitAmount=Double.parseDouble(limitAmt);
 					    		Double freeValue1=Double.parseDouble(freeValue);
-					    		if(freeValue1>limitAmount)
+					    		if(freeValue1 < 0)
+					    		{
+					    			errList.add("INFREEVAL");
+					    			errFields.add(childNodeName.toLowerCase());
+					    		}
+					    		else if(freeValue1 > limitAmount)
 					    		{
 					    			errList.add("MAXFREEVAL");
 					    			errFields.add(childNodeName.toLowerCase());
@@ -1044,6 +1049,38 @@ public class ChargeBackLoc extends ValidatorEJB implements ChargeBackLocLocal, C
 								errFields.add(childNodeName.toLowerCase());
 					    	}
 					    }
+					    else if(childNodeName.equalsIgnoreCase("offer"))
+					    {
+					    	settlemth=genericUtility.getColumnValue("settle_mth", dom2,"1");
+					    	custCode = genericUtility.getColumnValue("cust_code", dom2,"1");
+					    	String offer = E12GenericUtility.checkNull(genericUtility.getColumnValue("offer", dom));
+					    	
+					    	System.out.println("offer settlemth :  P : "+settlemth);
+					    	System.out.println("offer custCode: P : "+custCode);
+					    	
+					    	if(offer != null && offer.trim().length() <= 0)
+					    	{
+					    		errList.add("VMNOOFFER");
+								errFields.add(childNodeName.toLowerCase());
+					    	}
+					    	else
+					    	{
+					    		String offerSql = "SELECT COUNT(1) FROM SCHEME_APPRV WHERE APRV_STATUS= ? and CUST_CODE__BILL = ? ";
+					    		PreparedStatement pStmt1 = conn.prepareStatement(offerSql);
+					    		pStmt1.setString(1, "A");
+					    		pStmt1.setString(2, custCode);
+					    		rs = pStmt1.executeQuery();
+					    		if(rs.next())
+					    		{
+					    			int count = rs.getInt(1);
+					    			if(count <= 0)
+					    			{
+					    				errList.add("VMINVOFFER");
+					    				errFields.add(childNodeName.toLowerCase());
+					    			}
+					    		}
+					    	}
+					    }
 						
 					}// End of for loop CASE3
 

webitm-dis/module-resource/sql/D18HMES002.sql

@@ -74,7 +74,20 @@ create table SCHEME_TRACE
 Insert into TRANSETUP (TRAN_WINDOW,SAVE_FLAG,VAL_FLAG,KEY_FLAG,KEY_STRING,UDF_1,UDF_2,UDF_3,UDF_4,UDF_5,REPEATE_ADD,CHG_DATE,CHG_USER,CHG_TERM,EDI_OPTION,SITE_ACC_COL,CONFIRM_COL,CONFIRM_VAL,REPEAT_ADD_DET,REPEATADDDET,LOAD_MODE,AUTO_CONFIRM,LEDG_POST_CONF,CHG_DATE_ON_CONF,TRAN_ID_COL,MAIL_OPTION,CONFIRM_MODE,GARBAGE_OPT,VAL_FLAG_EDI,VERIFY_PASSWORD,CUST_ACC_COL,SALES_PERS_ACC_COL,SUPP_ACC_COL,ITEM_SER_ACC_CODE,EMP_ACC_COL,ITEM_SER_ACC_COL,WORKFLOW_OPT,TABLE_NAME,APPLICATION,TABLE_DESC,TRAN_DATE_COL,TRAN_ID__FROM,TRAN_ID__TO,TABLE_NAME_DET1,TABLE_NAME_DET2,TABLE_NAME_DET3,MULTITIRE_OPT,REF_SER,VIEW_MODE,TAX_FORMS,SIGN_STATUS,USER_TRAN_WINDOW,CUSTOM_PREVIEW_OBJ,IGNOREERRLIST_ONLOAD,CHILDDATA_ARGOPT,EDIT_TMPLT,WRKFLW_INIT,EDITTAX,FORMAL_ARGS,AUDIT_TRAIL_OPT,EDIT_OPT,CACHE_OPT,OPTIMIZE_MODE,EDIT_EXPR,RATE_COL,QTY_COL,EDIT_EXPR_INP,RCP_CACHE_STATUS,PRINT_CONTROL,TRANSFER_MODE,PROFILE_ID__RES,TRAN_COMPL_MSG,PERIOD_OPTION,WRKFLW_PRIORITY,EXEC_TYPE,DISP_META_DATA,ALLOW_ATTACH,START_FORM,ISATTACHMENT,HEADER_FORM_NO,CONFIRM_DATE_COL,CONFIRM_BY_COL,BROW_DATA_DEF,DEF_VIEW,VIEW_OPTS,ISGWTINITIATED,FUNCTION_TYPE,COMPL_ACTION,CANCEL_COL,CANCEL_VAL,IN_WF_COL,IN_WF_VAL,THUMB_OBJ,THUMB_IMAGE_COL,THUMB_ALT_COL,DEFAULT_DATA_ROW,ATTACH_COUNT_MIN,MSG_ONSAVE,WF_STATUS,CMS_PATH,RESTART_FORM,DEFAULT_EDITOR,MSG_NO,OBJ_TYPE,ENABLE_EDITOR) 
 values ('w_scheme_trace','2','2','A','seq10',null,null,null,null,null,'N',SYSDATE,'BASE','BASE','0',null,null,null,null,null,null,null,null,null,'TRAN_ID',null,null,null,null,null,null,null,null,null,null,null,null,'SCHEME_TRACE','SCM',null,null,null,null,null,null,null,'2','S-TRC','F',null,null,null,null,null,null,null,null,null,null,'0',null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,'compact',null,'T',null);
 
+----------------04-MAR-19-------------[START]-------------
 
+update messages set MSG_STR = 'Free value should be less than limit amt', MSG_DESCR = 'Free value should be less than limit amt' where msg_no = 'MAXFREEVAL';
 
+update pophelp set SQL_INPUT = ':0.cust_code', SQL_STR='SELECT DISTINCT(SCHEME_CODE) FROM SCHEME_APPRV WHERE APRV_STATUS=''A'' and CUST_CODE__BILL =''?''' where MOD_NAME = 'W_CHARGE_BACK_LOC' and FIELD_NAME ='OFFER';
 
+INSERT INTO MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) 
+VALUES ('VMNOOFFER','Offer should not be blank','Offer should not be blank','E','Y',NULL,NULL,NULL,SYSDATE,'Base      ','Base           ',NULL,NULL);
 
+INSERT INTO MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) 
+VALUES ('VMINVOFFER','Invalid Offer!','Invalid Offer, offer not approved','E','Y',NULL,NULL,NULL,sysdate,'Base      ','Base           ',NULL,NULL);
+
+INSERT INTO MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) 
+VALUES ('INFREEVAL','Invalid Free Value!','Free value should not be less than zero','E','Y',NULL,NULL,NULL,SYSDATE,'Base      ','Base           ',NULL,NULL);
+
+
+----------------04-MAR-19-------------[END]-------------