Skip to content

B
business-java
Commit 79fbdcaf authored by steurwadkar's avatar steurwadkar
Browse files
Options

F17ABAS001 GST API calling web part commit 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106420 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 978b333b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3563 additions and 749 deletions
webitm-gst/module-resource/web/js/GSTDataSubmitWiz.js
View file @ 79fbdcaf
......@@ -423,34 +423,8 @@ function OTPGenerated(retVal)
}
function validateHeaderForm()
{
/*if(document.getElementById("Detail1.1.period_code").value == undefined || document.getElementById("Detail1.1.period_code").value == null || document.getElementById("Detail1.1.period_code").value.trim() == "" )
{
alert("Please enter period code.");
document.getElementById("Detail1.1.period_code").value = document.getElementById("Detail1.1.period_code").value.trim();
document.getElementById("Detail1.1.period_code").focus();
return false;
}
else*/ if(document.getElementById("Detail1.1.site_code").value == undefined || document.getElementById("Detail1.1.site_code").value == null || document.getElementById("Detail1.1.site_code").value.trim() == "" )
{
alert("Please enter site code.");
document.getElementById("Detail1.1.site_code").value = document.getElementById("Detail1.1.site_code").value.trim();
document.getElementById("Detail1.1.site_code").focus();
return false;
}
else if(document.getElementById("Detail1.1.gross_turnover").value == undefined || document.getElementById("Detail1.1.gross_turnover").value == null || document.getElementById("Detail1.1.gross_turnover").value.trim() == "" )
{
alert("Please enter gross turnover.");
document.getElementById("Detail1.1.gross_turnover").value = document.getElementById("Detail1.1.gross_turnover").value.trim();
document.getElementById("Detail1.1.gross_turnover").focus();
return false;
}
else if(document.getElementById("Detail1.1.returns_type").value == undefined || document.getElementById("Detail1.1.returns_type").value == null || document.getElementById("Detail1.1.returns_type").value.trim() == "" )
{
alert("Please select returns type");
document.getElementById("Detail1.1.returns_type").focus();
return false;
}
else if(document.getElementById("Detail1.1.otp").value == undefined || document.getElementById("Detail1.1.otp").value == null || document.getElementById("Detail1.1.otp").value.trim() == "" )
if(document.getElementById("Detail1.1.otp").value == undefined || document.getElementById("Detail1.1.otp").value == null || document.getElementById("Detail1.1.otp").value.trim() == "" )
{
if(!isOtpGenerated)
{
......@@ -462,13 +436,6 @@ function validateHeaderForm()
document.getElementById("Detail1.1.otp").focus();
return false;
}
else if(document.getElementById("Detail1.1.action").value == undefined || document.getElementById("Detail1.1.action").value == null || document.getElementById("Detail1.1.action").value.trim() == "" )
{
alert("Please select action.");
document.getElementById("Detail1.1.action").value = document.getElementById("Detail1.1.action").value.trim();
document.getElementById("Detail1.1.action").focus();
return false;
}
displayWaitImg();
return true;
......@@ -596,7 +563,7 @@ function setTitlenImg(retVal)
function setSummaryTotal()
{
var months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
var totalsByCol = [0, 0, 0, 0, 0, 0, 0];
var totalsByCol = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
var retPeriod = document.getElementById("summaryRetPeriod").value;
var monthCode = parseInt(retPeriod.substring(0,2))-1;
......@@ -645,6 +612,7 @@ function validateDetailForm()
if(tableRows.length > 0)
{
alert("Please save all data to GSTN server before submitting.");
hideWaitImg();
return false;
}
}
......@@ -701,7 +669,7 @@ function getSignedData(docType)
function signedDataReceived(signedData)
{
if( signedData != "FAILED")
if(signedData != undefined || signedData != null || signedData != "FAILED")
{
document.getElementById("Detail2.1.signed_data").value = signedData ;
var htmlBody = document.getElementsByTagName("html")[0];
......@@ -711,6 +679,10 @@ function signedDataReceived(signedData)
document.getElementById("gstdataSubmitForm2").action = "/ibase/ITMWizardHandlerServlet";
document.getElementById("gstdataSubmitForm2").submit();
}
else if(signedData == undefined || signedData == null || signedData == "FAILED")
{
alert("Error occurred during signing data.");
}
}
function formatDetailWithErr()
{
......@@ -741,9 +713,9 @@ function returnPeriodDropdown()
selectedMonthCode = monthCode[prevMonth.getMonth()]+prevMonth.getFullYear();
var prevdate = curDate.addMonths(-3);
var prevdate = curDate.addMonths(-4);
for(var i=0; i<5; i++)
for(var i=0; i<6; i++)
{
var nextDate = prevdate.addMonths(1);
$('#yearMonthInput').append($('<option />').val(monthCode[nextDate.getMonth()] + nextDate.getFullYear()).html(months[nextDate.getMonth()] + " " + nextDate.getFullYear()));
......@@ -768,6 +740,11 @@ function showDocTextbox(selectBox)
document.getElementById("aadhaarTextbox").style.display = "block";
document.getElementById("panTextbox").style.display = "none";
}
else if(selectValue == "")
{
document.getElementById("panTextbox").style.display = "none";
document.getElementById("aadhaarTextbox").style.display = "none";
}
}
function dataSavedInSess(retVal)
{
......
webitm-gst/module-resource/web/xsl/wizard/gstpurchasedata_file1_wiz_en_US_A.xsl
View file @ 79fbdcaf
......@@ -7,7 +7,7 @@
<html>
<body onload="getTitlenImg('gstpurchasedata_file')">
<body onload="getTitlenImg('gstpurchasedata_file');returnPeriodDropdown();">
<script type="text/javascript" src="/ibase/webitm/js/GSTDataSubmitWiz.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.10.4.custom.min.js"></script>
......@@ -119,7 +119,7 @@
<div class="eachLineFields">
<div class="eachField">
<div class="labelDiv">GSTIN : </div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$gstin}" name="Detail1.{normalize-space($dbID)}.gstin" id="Detail1.{normalize-space($dbID)}.gstin" tabIndex="-1"/></div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$gstin}" name="Detail1.{normalize-space($dbID)}.gstin" id="Detail1.{normalize-space($dbID)}.gstin" tabIndex="-1" readOnly="true"/></div>
</div>
<div class="eachField">
<div class="labelDiv">User name : </div>
......@@ -134,16 +134,20 @@
<div class="eachField">
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$state_descr}" name="Detail1.{normalize-space($dbID)}.state_descr" id="Detail1.{normalize-space($dbID)}.state_descr" tabIndex="-1" readOnly="true" style="width:150px;"/></div>
</div>
<div class="eachField" style="float:right;">
<div class="eachField" style="float:right;display:none;">
<div class="labelDiv">Gross turnover<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="input_editable" value="{$gross_turnover}" name="Detail1.{normalize-space($dbID)}.gross_turnover" id="Detail1.{normalize-space($dbID)}.gross_turnover" tabIndex="30" style="text-align:right;padding-right:4px;width:120px;" onblur="checkValidInput(this);" onkeypress="return isNumberKey(event);"/></div>
</div>
</div>
<div class="eachLineFields">
<div class="eachField">
<!--<div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="input_editable" value="{$period_code}" name="Detail1.{normalize-space($dbID)}.period_code" id="Detail1.{normalize-space($dbID)}.period_code" tabIndex="10" style="width:60px;" popupFldName="PERIOD_CODE" onkeyup="getAutoPopupData(this);" onfocus="displayPopUpIcon('popUpIcon1');"/></div>
<div class="popHelpIconDiv"><a href="javascript:getListOfValues('PERIOD_CODE','Detail1.{normalize-space($dbID)}.period_code','{$site_code}');" id="popUpIcon1" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png"/></a></div>
</div>-->
<div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><select class="input_editable" id="yearMonthInput" name="Detail1.{normalize-space($dbID)}.period_code"></select></div>
</div>
<div class="eachField" style="display:none;">
<div class="labelDiv">Site code<span style="color:red;">*</span> : </div>
......@@ -168,15 +172,15 @@
</div>
</div>
</div>
<div class="eachLineFields" style="text-align:center;margin-top:10px;">
<div class="eachLineFields" style="margin-top:10px;margin-left:60px;">
<div class="eachField">
<div class="inputDiv"><input type="button" class="button" value="Generate OTP" title="Generate OTP" onClick="generateOTP();" tabIndex="-1" style="margin-right:0px;"/></div>
</div>
</div>
<div class="eachLineFields" style="text-align:center;">
<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;" /></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>
......@@ -193,7 +197,7 @@
<input type="hidden" value="1" name="FORM_NO" ID="FORM_NO" />
<input type="hidden" value="gstpurchasedata_file" 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();" class="button" title='Next' id="next"/>
</div>
</div>
<div id="buttonreplacement">
......
webitm-gst/module-resource/web/xsl/wizard/gstpurchasedata_getinv1_wiz_en_US_A.xsl
View file @ 79fbdcaf
......@@ -7,7 +7,7 @@
<html>
<body onload="getTitlenImg('gstpurchasedata_getinv')">
<body onload="getTitlenImg('gstpurchasedata_getinv');returnPeriodDropdown();">
<script type="text/javascript" src="/ibase/webitm/js/GSTDataSubmitWiz.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.10.4.custom.min.js"></script>
......@@ -119,7 +119,7 @@
<div class="eachLineFields">
<div class="eachField">
<div class="labelDiv">GSTIN : </div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$gstin}" name="Detail1.{normalize-space($dbID)}.gstin" id="Detail1.{normalize-space($dbID)}.gstin" tabIndex="-1"/></div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$gstin}" name="Detail1.{normalize-space($dbID)}.gstin" id="Detail1.{normalize-space($dbID)}.gstin" tabIndex="-1" readOnly="true"/></div>
</div>
<div class="eachField">
<div class="labelDiv">User name : </div>
......@@ -140,10 +140,14 @@
</div>
</div>
<div class="eachLineFields">
<div class="eachField">
<!-- <div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="input_editable" value="{$period_code}" name="Detail1.{normalize-space($dbID)}.period_code" id="Detail1.{normalize-space($dbID)}.period_code" tabIndex="10" style="width:60px;" popupFldName="PERIOD_CODE" onkeyup="getAutoPopupData(this);" onfocus="displayPopUpIcon('popUpIcon1');"/></div>
<div class="popHelpIconDiv"><a href="javascript:getListOfValues('PERIOD_CODE','Detail1.{normalize-space($dbID)}.period_code','{$site_code}');" id="popUpIcon1" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png"/></a></div>
</div> -->
<div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><select class="input_editable" id="yearMonthInput" name="Detail1.{normalize-space($dbID)}.period_code"></select></div>
</div>
<div class="eachField" style="display:none;">
<div class="labelDiv">Site code<span style="color:red;">*</span> : </div>
......@@ -168,15 +172,15 @@
</div>
</div>
</div>
<div class="eachLineFields" style="text-align:center;margin-top:10px;">
<div class="eachLineFields" style=";margin-top:10px;margin-left:60px;">
<div class="eachField">
<div class="inputDiv"><input type="button" class="button" value="Generate OTP" title="Generate OTP" onClick="generateOTP();" tabIndex="-1" style="margin-right:0px;"/></div>
</div>
</div>
<div class="eachLineFields" style="text-align:center;">
<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>
......@@ -193,7 +197,7 @@
<input type="hidden" value="1" name="FORM_NO" ID="FORM_NO" />
<input type="hidden" value="gstpurchasedata_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">
......
webitm-gst/module-resource/web/xsl/wizard/gstpurchasedata_save1_wiz_en_US_A.xsl
View file @ 79fbdcaf
......@@ -7,7 +7,7 @@
<html>
<body onload="getTitlenImg('gstpurchasedata_save')">
<body onload="getTitlenImg('gstpurchasedata_save');returnPeriodDropdown();">
<script type="text/javascript" src="/ibase/webitm/js/GSTDataSubmitWiz.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.10.4.custom.min.js"></script>
......@@ -113,13 +113,14 @@
<xsl:variable name="app_key"><xsl:value-of select="app_key"/></xsl:variable>
<xsl:variable name="returns_type"><xsl:value-of select="returns_type"/></xsl:variable>
<xsl:variable name="gross_turnover"><xsl:value-of select="gross_turnover"/></xsl:variable>
<xsl:variable name="cur_gross_turnover"><xsl:value-of select="cur_gross_turnover"/></xsl:variable>
<xsl:variable name="action"><xsl:value-of select="action"/></xsl:variable>
<div class="inputFormDiv">
<div class="eachLineFields">
<div class="eachField">
<div class="labelDiv">GSTIN : </div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$gstin}" name="Detail1.{normalize-space($dbID)}.gstin" id="Detail1.{normalize-space($dbID)}.gstin" tabIndex="-1"/></div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$gstin}" name="Detail1.{normalize-space($dbID)}.gstin" id="Detail1.{normalize-space($dbID)}.gstin" tabIndex="-1" readOnly="true" /></div>
</div>
<div class="eachField">
<div class="labelDiv">User name : </div>
......@@ -134,16 +135,21 @@
<div class="eachField">
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$state_descr}" name="Detail1.{normalize-space($dbID)}.state_descr" id="Detail1.{normalize-space($dbID)}.state_descr" tabIndex="-1" readOnly="true" style="width:150px;"/></div>
</div>
<div class="eachField" style="float:right;">
</div>
<div class="eachLineFields" style="width:675px;display:none;">
<div class="eachField">
<div class="labelDiv">Gross turnover<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="input_editable" value="{$gross_turnover}" name="Detail1.{normalize-space($dbID)}.gross_turnover" id="Detail1.{normalize-space($dbID)}.gross_turnover" tabIndex="30" style="text-align:right;padding-right:4px;width:120px;" onblur="checkValidInput(this);" onkeypress="return isNumberKey(event);"/></div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$gross_turnover}" name="Detail1.{normalize-space($dbID)}.gross_turnover" id="Detail1.{normalize-space($dbID)}.gross_turnover" tabIndex="-1" readOnly="true" style="text-align:right;padding-right:4px;width:120px;" onblur="checkValidInput(this);" onkeypress="return isNumberKey(event);"/></div>
</div>
<div class="eachField" style="float:right;">
<div class="labelDiv" style="width:250px;">Current year Gross turnover<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$cur_gross_turnover}" name="Detail1.{normalize-space($dbID)}.cur_gross_turnover" id="Detail1.{normalize-space($dbID)}.cur_gross_turnover" tabIndex="-1" readOnly="true" style="text-align:right;padding-right:4px;width:120px;" onblur="checkValidInput(this);" onkeypress="return isNumberKey(event);"/></div>
</div>
</div>
<div class="eachLineFields">
<div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="input_editable" value="{$period_code}" name="Detail1.{normalize-space($dbID)}.period_code" id="Detail1.{normalize-space($dbID)}.period_code" tabIndex="10" style="width:60px;" popupFldName="PERIOD_CODE" onkeyup="getAutoPopupData(this);" onfocus="displayPopUpIcon('popUpIcon1');"/></div>
<div class="popHelpIconDiv"><a href="javascript:getListOfValues('PERIOD_CODE','Detail1.{normalize-space($dbID)}.period_code','{$site_code}');" id="popUpIcon1" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png"/></a></div>
<div class="inputDiv"><select class="input_editable" id="yearMonthInput" name="Detail1.{normalize-space($dbID)}.period_code"></select></div>
</div>
<div class="eachField" style="display:none;">
<div class="labelDiv">Site code<span style="color:red;">*</span> : </div>
......@@ -168,15 +174,15 @@
</div>
</div>
</div>
<div class="eachLineFields" style="text-align:center;margin-top:10px;">
<div class="eachLineFields" style="margin-top:10px;margin-left:60px;">
<div class="eachField">
<div class="inputDiv"><input type="button" class="button" value="Generate OTP" title="Generate OTP" onClick="generateOTP();" tabIndex="-1" style="margin-right:0px;"/></div>
</div>
</div>
<div class="eachLineFields" style="text-align:center;">
<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;"/></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>
......@@ -193,7 +199,7 @@
<input type="hidden" value="1" name="FORM_NO" ID="FORM_NO" />
<input type="hidden" value="gstpurchasedata_save" 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="Finish" onclick="setActionVal('finish');displayWaitImg();return validateHeaderForm();" class="button" title='Finish' id="finish"/>
</div>
</div>
<div id="buttonreplacement">
......
webitm-gst/module-resource/web/xsl/wizard/gstpurchasedata_submit1_wiz_en_US_A.xsl
View file @ 79fbdcaf
......@@ -7,7 +7,7 @@
<html>
<body onload="getTitlenImg('gstpurchasedata_submit')">
<body onload="getTitlenImg('gstpurchasedata_submit');returnPeriodDropdown();">
<script type="text/javascript" src="/ibase/webitm/js/GSTDataSubmitWiz.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.10.4.custom.min.js"></script>
......@@ -111,15 +111,13 @@
<xsl:variable name="state_descr"><xsl:value-of select="state_descr"/></xsl:variable>
<xsl:variable name="otp"><xsl:value-of select="otp"/></xsl:variable>
<xsl:variable name="app_key"><xsl:value-of select="app_key"/></xsl:variable>
<xsl:variable name="returns_type"><xsl:value-of select="returns_type"/></xsl:variable>
<xsl:variable name="gross_turnover"><xsl:value-of select="gross_turnover"/></xsl:variable>
<xsl:variable name="action"><xsl:value-of select="action"/></xsl:variable>
<div class="inputFormDiv">
<div class="eachLineFields">
<div class="eachField">
<div class="labelDiv">GSTIN : </div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$gstin}" name="Detail1.{normalize-space($dbID)}.gstin" id="Detail1.{normalize-space($dbID)}.gstin" tabIndex="-1"/></div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$gstin}" name="Detail1.{normalize-space($dbID)}.gstin" id="Detail1.{normalize-space($dbID)}.gstin" tabIndex="-1" readOnly="true"/></div>
</div>
<div class="eachField">
<div class="labelDiv">User name : </div>
......@@ -134,16 +132,20 @@
<div class="eachField">
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$state_descr}" name="Detail1.{normalize-space($dbID)}.state_descr" id="Detail1.{normalize-space($dbID)}.state_descr" tabIndex="-1" readOnly="true" style="width:150px;"/></div>
</div>
<div class="eachField" style="float:right;">
<div class="eachField" style="float:right;display:none;">
<div class="labelDiv">Gross turnover<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="input_editable" value="{$gross_turnover}" name="Detail1.{normalize-space($dbID)}.gross_turnover" id="Detail1.{normalize-space($dbID)}.gross_turnover" tabIndex="30" style="text-align:right;padding-right:4px;width:120px;" onblur="checkValidInput(this);" onkeypress="return isNumberKey(event);"/></div>
</div>
</div>
<div class="eachLineFields">
<div class="eachField">
<!--<div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="input_editable" value="{$period_code}" name="Detail1.{normalize-space($dbID)}.period_code" id="Detail1.{normalize-space($dbID)}.period_code" tabIndex="10" style="width:60px;" popupFldName="PERIOD_CODE" onkeyup="getAutoPopupData(this);" onfocus="displayPopUpIcon('popUpIcon1');"/></div>
<div class="popHelpIconDiv"><a href="javascript:getListOfValues('PERIOD_CODE','Detail1.{normalize-space($dbID)}.period_code','{$site_code}');" id="popUpIcon1" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png"/></a></div>
</div>-->
<div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><select class="input_editable" id="yearMonthInput" name="Detail1.{normalize-space($dbID)}.period_code"></select></div>
</div>
<div class="eachField" style="display:none;">
<div class="labelDiv">Site code<span style="color:red;">*</span> : </div>
......@@ -168,15 +170,15 @@
</div>
</div>
</div>
<div class="eachLineFields" style="text-align:center;margin-top:10px;">
<div class="eachLineFields" style="margin-top:10px;margin-left:60px">
<div class="eachField">
<div class="inputDiv"><input type="button" class="button" value="Generate OTP" title="Generate OTP" onClick="generateOTP();" tabIndex="-1" style="margin-right:0px;"/></div>
</div>
</div>
<div class="eachLineFields" style="text-align:center;">
<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;"/></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>
......@@ -193,7 +195,7 @@
<input type="hidden" value="1" name="FORM_NO" ID="FORM_NO" />
<input type="hidden" value="gstpurchasedata_submit" 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();" class="button" title='Next' id="next"/>
</div>
</div>
<div id="buttonreplacement">
......
webitm-gst/module-resource/web/xsl/wizard/gstsalesdata_file1_wiz_en_US_A.xsl
View file @ 79fbdcaf
......@@ -140,11 +140,6 @@
</div>
</div>
<div class="eachLineFields">
<!--<div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="input_editable" value="{$period_code}" name="Detail1.{normalize-space($dbID)}.period_code" id="Detail1.{normalize-space($dbID)}.period_code" tabIndex="10" style="width:60px;" popupFldName="PERIOD_CODE" onkeyup="getAutoPopupData(this);" onfocus="displayPopUpIcon('popUpIcon1');"/></div>
<div class="popHelpIconDiv"><a href="javascript:getListOfValues('PERIOD_CODE','Detail1.{normalize-space($dbID)}.period_code','{$site_code}');" id="popUpIcon1" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png"/></a></div>
</div>-->
<div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><select class="input_editable" id="yearMonthInput" name="Detail1.{normalize-space($dbID)}.period_code"></select></div>
......
webitm-gst/module-resource/web/xsl/wizard/gstsalesdata_getinv1_wiz_en_US_A.xsl
View file @ 79fbdcaf
......@@ -140,11 +140,6 @@
</div>
</div>
<div class="eachLineFields">
<!-- <div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="input_editable" value="{$period_code}" name="Detail1.{normalize-space($dbID)}.period_code" id="Detail1.{normalize-space($dbID)}.period_code" tabIndex="10" style="width:60px;" popupFldName="PERIOD_CODE" onkeyup="getAutoPopupData(this);" onfocus="displayPopUpIcon('popUpIcon1');"/></div>
<div class="popHelpIconDiv"><a href="javascript:getListOfValues('PERIOD_CODE','Detail1.{normalize-space($dbID)}.period_code','{$site_code}');" id="popUpIcon1" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png"/></a></div>
</div> -->
<div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><select class="input_editable" id="yearMonthInput" name="Detail1.{normalize-space($dbID)}.period_code"></select></div>
......
webitm-gst/module-resource/web/xsl/wizard/gstsalesdata_getinv2_wiz_en_US_A.xsl
View file @ 79fbdcaf
......@@ -193,197 +193,6 @@
</div>
</xsl:if>
<xsl:if test ="$dbID != '1'">
<xsl:for-each select="pending_data">
<button class="accordion1" type="button">
<div class="iconDiv">P</div>
Pending data to save on GSTN server till date
</button>
<div class="panel1" id="pendingDataPanel">
<table class="tableClass" id="pendingDataTable">
<thead class="table-head">
<tr>
<th nowrap="true" style="border-left:0px solid black !important;" align="left">Document number</th>
<th nowrap="true" align="right">Date</th>
<th nowrap="true" style="border-right:0px solid black !important;" align="right">Amount</th>
</tr>
</thead>
<tbody class="table-body">
<xsl:for-each select="data">
<tr>
<td style="border-left:0px solid black !important;"><xsl:value-of select="doc_no"/></td>
<td align="right"><xsl:value-of select="doc_date"/></td>
<td style="border-right:0px solid black !important;" align="right"><xsl:value-of select="amount"/></td>
</tr>
</xsl:for-each>
</tbody>
</table>
</div>
</xsl:for-each>
<!--<xsl:for-each select="summary_data">
<button class="accordion1" type="button" expanded="false">
<div class="iconDiv">S</div>
<div style="margin-left:40px;">
<xsl:variable name="summaryRetPeriod"><xsl:value-of select="ret_period"/></xsl:variable>
<input type="hidden" id="summaryRetPeriod" value="{$summaryRetPeriod}"/>
<div class="invTypDiv">Summary of documents till date saved on GSTN server for <span id="returnMonthLbl"></span></div>
</div>
</button>
<div class="panel1" style="overflow-x:auto;">
<table class="tableClass" id="dataSummaryTable">
<thead class="table-head">
<tr class="titleRow">
<th nowrap="true" style="border-left:0px solid black !important;" align="left">Section</th>
<th nowrap="true" align="right">No. of Invoices</th>
<th nowrap="true" align="right">Amount</th>
<th nowrap="true" align="right">Taxable amount</th>
<th nowrap="true" align="right">IGST</th>
<th nowrap="true" align="right">CGST</th>
<th nowrap="true" align="right">SGST</th>
<th nowrap="true" style="border-right:0px solid black !important;" align="right">Cess</th>
</tr>
</thead>
<tbody class="table-body">
<xsl:for-each select="sec_sum">
<xsl:variable name="sectionName"><xsl:value-of select="sec_nm"/></xsl:variable>
<xsl:if test="not($sectionName='HSN') and not($sectionName='DOC_ISSUE') and not($sectionName='NIL')">
<tr>
<td style="border-left:0px solid black !important;" class="titleColumn">
<xsl:if test="$sectionName='B2B'">
Invoices for outward supply (B2B)
</xsl:if>
<xsl:if test="$sectionName='B2BA'">
Revised invoices (B2B)
</xsl:if>
<xsl:if test="$sectionName='B2CL'">
Invoices for outward supply (B2CL)
</xsl:if>
<xsl:if test="$sectionName='B2CLA'">
Revised invoices (B2CL)
</xsl:if>
<xsl:if test="$sectionName='B2CS'">
Invoices for outward supply (B2CS)
</xsl:if>
<xsl:if test="$sectionName='B2CSA'">
Revised invoices (B2CS)
</xsl:if>
<xsl:if test="$sectionName='CDNR'">
Credit/Debit note
</xsl:if>
<xsl:if test="$sectionName='CDNRA'">
Revised Credit/Debit note
</xsl:if>
<xsl:if test="$sectionName='CDNUR'">
Credit/Debit note unregistered
</xsl:if>
<xsl:if test="$sectionName='CDNURA'">
Revised Credit/Debit note
</xsl:if>
<xsl:if test="$sectionName='AT'">
Advance received
</xsl:if>
<xsl:if test="$sectionName='ATA'">
Advance received amendment
</xsl:if>
<xsl:if test="$sectionName='TXPD'">
Tax paid on advance received
</xsl:if>
<xsl:if test="$sectionName='NIL'">
Nil supplies
</xsl:if>
<xsl:if test="$sectionName='EXP'">
Export supplies
</xsl:if>
<xsl:if test="$sectionName='EXPA'">
Revised Export supplies
</xsl:if>
</td>
<td align="right">
<xsl:choose>
<xsl:when test="ttl_rec">
<xsl:value-of select="ttl_rec"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
<td align="right">
<xsl:choose>
<xsl:when test="ttl_val">
<xsl:value-of select="ttl_val"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
<td align="right">
<xsl:choose>
<xsl:when test="ttl_tax">
<xsl:value-of select="ttl_tax"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
<td align="right">
<xsl:choose>
<xsl:when test="ttl_igst">
<xsl:value-of select="ttl_igst"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
<td align="right">
<xsl:choose>
<xsl:when test="ttl_cgst">
<xsl:value-of select="ttl_cgst"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
<td align="right">
<xsl:choose>
<xsl:when test="ttl_sgst">
<xsl:value-of select="ttl_sgst"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
<td style="border-right:0px solid black !important;" align="right">
<xsl:choose>
<xsl:when test="ttl_cess">
<xsl:value-of select="ttl_cess"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
</tr>
</xsl:if>
</xsl:for-each>
<tr class="totalRow">
<td style="border-left:0px solid black !important;"><b>Total</b></td>
<td align="right" class="totalCol"></td>
<td align="right" class="totalCol"></td>
<td align="right" class="totalCol"></td>
<td align="right" class="totalCol"></td>
<td align="right" class="totalCol"></td>
<td align="right" class="totalCol"></td>
<td style="border-right:0px solid black !important;" align="right" class="totalCol"></td>
</tr>
</tbody>
</table>
</div>
</xsl:for-each>-->
<xsl:for-each select="b2b_invoices">
<button class="accordion1" type="button" expanded="false">
<div class="iconDiv">I</div>
......@@ -612,7 +421,16 @@
<xsl:value-of select="samt"/>
</xsl:if>
</td>
<td class="td_rightAlign" style="border-right:0px solid black !important;"><xsl:value-of select="csamt"/></td>
<td class="td_rightAlign" style="border-right:0px solid black !important;">
<xsl:choose>
<xsl:when test="csamt">
<xsl:value-of select="csamt"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
</tr>
</xsl:for-each>
</tbody>
......@@ -838,7 +656,16 @@
<xsl:value-of select="itms/samt"/>
</xsl:if>
</td>
<td class="td_rightAlign" style="border-right:0px solid black !important;"><xsl:value-of select="itms/csamt"/></td>
<td class="td_rightAlign" style="border-right:0px solid black !important;">
<xsl:choose>
<xsl:when test="itms/csamt">
<xsl:value-of select="itms/csamt"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
</tr>
</xsl:for-each>
</tbody>
......@@ -901,7 +728,16 @@
<xsl:value-of select="itms/samt"/>
</xsl:if>
</td>
<td class="td_rightAlign" style="border-right:0px solid black !important;"><xsl:value-of select="itms/csamt"/></td>
<td class="td_rightAlign" style="border-right:0px solid black !important;">
<xsl:choose>
<xsl:when test="itms/csamt">
<xsl:value-of select="itms/csamt"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
</tr>
</xsl:for-each>
</tbody>
......@@ -1107,12 +943,6 @@
</xsl:if>
</xsl:for-each>
</div>
<!--<div id="btnDiv">
<input type="hidden" value="2" 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');" class="button" title='Finish' id="finish"/>
</div>-->
</div>
<div id="buttonreplacement">
<img src="/ibase/images/preload.gif" alt="Please wait" ></img>
......
webitm-gst/module-resource/web/xsl/wizard/gstsalesdata_save1_wiz_en_US_A.xsl
View file @ 79fbdcaf
......@@ -115,6 +115,8 @@
<xsl:variable name="gross_turnover"><xsl:value-of select="gross_turnover"/></xsl:variable>
<xsl:variable name="cur_gross_turnover"><xsl:value-of select="cur_gross_turnover"/></xsl:variable>
<xsl:variable name="action"><xsl:value-of select="action"/></xsl:variable>
<xsl:variable name="auth_token"><xsl:value-of select="auth_token"/></xsl:variable>
<xsl:variable name="sek"><xsl:value-of select="sek"/></xsl:variable>
<div class="inputFormDiv">
<div class="eachLineFields">
......@@ -147,11 +149,6 @@
</div>
</div>
<div class="eachLineFields">
<!-- <div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="input_editable" value="{$period_code}" name="Detail1.{normalize-space($dbID)}.period_code" id="Detail1.{normalize-space($dbID)}.period_code" tabIndex="10" style="width:60px;" popupFldName="PERIOD_CODE" onkeyup="getAutoPopupData(this);" onfocus="displayPopUpIcon('popUpIcon1');"/></div>
<div class="popHelpIconDiv"><a href="javascript:getListOfValues('PERIOD_CODE','Detail1.{normalize-space($dbID)}.period_code','{$site_code}');" id="popUpIcon1" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png"/></a></div>
</div> -->
<div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><select class="input_editable" id="yearMonthInput" name="Detail1.{normalize-space($dbID)}.period_code"></select></div>
......@@ -197,6 +194,16 @@
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$app_key}" name="Detail1.{normalize-space($dbID)}.app_key" id="Detail1.{normalize-space($dbID)}.app_key" tabIndex="-1" style="width:400px;"/></div>
</div>
</div>
<div class="eachLineFields" style="display:none;">
<div class="eachField">
<div class="labelDiv">Auth token : </div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$auth_token}" name="Detail1.{normalize-space($dbID)}.auth_token" id="Detail1.{normalize-space($dbID)}.auth_token" tabIndex="-1"/></div>
</div>
<div class="eachField">
<div class="labelDiv">Session key : </div>
<div class="inputDiv"><input type="text" class="editDisplayClass" value="{$sek}" name="Detail1.{normalize-space($dbID)}.sek" id="Detail1.{normalize-space($dbID)}.sek" tabIndex="-1"/></div>
</div>
</div>
</div>
</xsl:for-each>
</div>
......@@ -204,7 +211,7 @@
<input type="hidden" value="1" name="FORM_NO" ID="FORM_NO" />
<input type="hidden" value="gstsalesdata_save" 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');displayWaitImg();return validateHeaderForm();" class="button" title='Finish' id="finish"/>
<input type="submit" style="cursor:hand;margin-left:20px;" value="Finish" onclick="setActionVal('finish');return validateHeaderForm();" class="button" title='Finish' id="finish"/>
</div>
</div>
<div id="buttonreplacement">
......
webitm-gst/module-resource/web/xsl/wizard/gstsalesdata_submit1_wiz_en_US_A.xsl
View file @ 79fbdcaf
......@@ -138,11 +138,6 @@
</div>
</div>
<div class="eachLineFields">
<!--<div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><input type="text" class="input_editable" value="{$period_code}" name="Detail1.{normalize-space($dbID)}.period_code" id="Detail1.{normalize-space($dbID)}.period_code" tabIndex="10" style="width:60px;" popupFldName="PERIOD_CODE" onkeyup="getAutoPopupData(this);" onfocus="displayPopUpIcon('popUpIcon1');"/></div>
<div class="popHelpIconDiv"><a href="javascript:getListOfValues('PERIOD_CODE','Detail1.{normalize-space($dbID)}.period_code','{$site_code}');" id="popUpIcon1" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png"/></a></div>
</div>-->
<div class="eachField">
<div class="labelDiv">Month<span style="color:red;">*</span> : </div>
<div class="inputDiv"><select class="input_editable" id="yearMonthInput" name="Detail1.{normalize-space($dbID)}.period_code"></select></div>
......
webitm-gst/module-resource/web/xsl/wizard/gstsalesdata_submit2_wiz_en_US_A.xsl
View file @ 79fbdcaf
......@@ -612,7 +612,16 @@
<xsl:value-of select="samt"/>
</xsl:if>
</td>
<td class="td_rightAlign" style="border-right:0px solid black !important;"><xsl:value-of select="csamt"/></td>
<td class="td_rightAlign" style="border-right:0px solid black !important;">
<xsl:choose>
<xsl:when test="csamt">
<xsl:value-of select="csamt"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
</tr>
</xsl:for-each>
</tbody>
......@@ -838,7 +847,16 @@
<xsl:value-of select="itms/samt"/>
</xsl:if>
</td>
<td class="td_rightAlign" style="border-right:0px solid black !important;"><xsl:value-of select="itms/csamt"/></td>
<td class="td_rightAlign" style="border-right:0px solid black !important;">
<xsl:choose>
<xsl:when test="itms/csamt">
<xsl:value-of select="itms/csamt"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
</tr>
</xsl:for-each>
</tbody>
......@@ -901,7 +919,16 @@
<xsl:value-of select="itms/samt"/>
</xsl:if>
</td>
<td class="td_rightAlign" style="border-right:0px solid black !important;"><xsl:value-of select="itms/csamt"/></td>
<td class="td_rightAlign" style="border-right:0px solid black !important;">
<xsl:choose>
<xsl:when test="itms/csamt">
<xsl:value-of select="itms/csamt"/>
</xsl:when>
<xsl:otherwise>
0
</xsl:otherwise>
</xsl:choose>
</td>
</tr>
</xsl:for-each>
</tbody>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment