F17ABAS001 GST API calling web part commit

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

webitm-gst/module-resource/web/js/GSTDataSubmitWiz.js

@@ -393,7 +393,8 @@ function generateOTP()
 	var periodCode = document.getElementById("yearMonthInput").value.trim();
 	var siteCode = document.getElementById("Detail1.1.site_code").value.trim();
 	var recType = document.getElementById("Detail1.1.returns_type").value.trim();
-	var url = "/ibase/GSTDataSubmitWizServlet?action=GENERATE_OTP&user_name="+escape(userName)+"&state_code="+stateCode+"&gstin_no="+escape(gstinNo)+"&period_code="+escape(periodCode)+"&site_code="+escape(siteCode)+"&rec_type="+escape(recType)+"";
+	var dataAction = document.getElementById("Detail1.1.action").value.trim();;
+	var url = "/ibase/GSTDataSubmitWizServlet?action=GENERATE_OTP&user_name="+escape(userName)+"&state_code="+stateCode+"&gstin_no="+escape(gstinNo)+"&period_code="+escape(periodCode)+"&site_code="+escape(siteCode)+"&rec_type="+escape(recType)+"&data_action="+escape(dataAction)+"";
 
 	setTimeout(function (){makeRequest( url, OTPGenerated);},100);
 }
@@ -405,15 +406,13 @@ function OTPGenerated(retVal)
 	var msgNode = xmlDoc.getElementsByTagName("message")[0];
 	var msg = msgNode.childNodes[0].nodeValue;
 	
-	if(msg.indexOf("Error") == -1)
+	if("1" == msg)
 	{
+		
 		document.getElementById("otpInputDiv").style.display = "block";
 		document.getElementById("Detail1.1.otp").focus();
 		isOtpGenerated = true;
 		startTimer(10);
-	}
-	if("1" == msg)
-	{
 		alert("OTP has been sent successfully to mobile number registerd with GSTN.");
 	}
 	else
@@ -636,6 +635,7 @@ function setSummaryTotal()
 }
 function validateDetailForm()
 {
+	displayWaitImg();
 	var pendingDataTable = document.getElementById("pendingDataTable");
 	
 	if(pendingDataTable != undefined)

webitm-gst/module-resource/web/xsl/wizard/gstsalesdata_getinv1_wiz_en_US_A.xsl

@@ -180,7 +180,7 @@
 					<div class="eachLineFields">
 						<div class="eachField" style="margin-left:12px;display:none;" id="otpInputDiv">
 							<div class="labelDiv" style="width:50px;float:none;">OTP<span style="color:red;">*</span> : </div>
-							<div class="inputDiv" style="float:none;"><input type="text" class="input_editable"  name="Detail1.{normalize-space($dbID)}.otp" id="Detail1.{normalize-space($dbID)}.otp" tabIndex="60" style="width:80px;text-align:right;padding-right:4px;" onblur="checkValidInput(this);" onkeypress="return isNumberKey(event);"/></div>
+							<div class="inputDiv" style="float:none;"><input type="text" class="input_editable"  name="Detail1.{normalize-space($dbID)}.otp" id="Detail1.{normalize-space($dbID)}.otp" tabIndex="60" style="width:80px;" onblur="checkValidInput(this);" onkeypress="return isNumberKey(event);"/></div>
 							<div id="timerDiv" style="display: none;margin-left: 20px;font-size:13px;float:none;"> OTP Expires in <span id="timerVal">10:00</span></div>
 						</div>
 					</div>
@@ -197,7 +197,7 @@
 			<input type="hidden" value="1" name="FORM_NO" ID="FORM_NO" />
 			<input type="hidden" value="gstsalesdata_getinv" name="OBJ_NAME" />
 			<input type="hidden" value="" name="action" id="action" />
-			<input type="submit" style="cursor:hand;margin-left:20px;" value="Finish" onclick="setActionVal('finish');return validateHeaderForm();displayWaitImg();" class="button" title='Finish' id="finish"/>
+			<input type="submit" style="cursor:hand;margin-left:20px;" value="Next" onclick="setActionVal('next');return validateHeaderForm();displayWaitImg();" class="button" title='Next' id="next"/>
 		</div>
 	</div>
 	<div id="buttonreplacement">