Skip to content

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

Changes made for Group scheme in Sales Order html wizard screen 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@180244 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6e5832be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 802 additions and 118 deletions
webitm-wms/module-resource/web/js/sorderWizard.js
View file @ cebf74ca
......@@ -2905,6 +2905,8 @@ var lineNoForTax = 0;
//Added by kaustubh on 29 dec start
tr = tr + "<input type = 'hidden' id='Detail2."+fld+".tax_xml' value = '"+str+"' name='Detail2."+fld+".tax_xml' ></input>";
tr = tr + "<input type = 'hidden' id='Detail2."+fld+".scheme_code' value = '"+itemQtys[8]+"' name='Detail2."+fld+".scheme_code' ></input>";
tr = tr + "<input type = 'hidden' id='Detail2."+fld+".scheme_descr' value = '"+itemQtys[9]+"' name='Detail2."+fld+".scheme_descr' ></input>";
//Added by kaustubh on 29 dec end
......@@ -6418,6 +6420,34 @@ function setCheckedScheme(rowID, schemeCode)
eachEleme.setAttribute("id",newID);
eachEleme.setAttribute("name",newName);
if( prvName.indexOf("dsp_date") != -1 )
{
eachEleme.setAttribute("id","dsp_date"+rowCount);
}
if( prvName.indexOf("is_scheme_row") != -1 )
{
eachEleme.value="Y";
}
if( prvName.indexOf("tax_amt") != -1)
{
eachEleme.value = 0;
eachEleme.removeAttribute("onclick");
eachEleme.setAttribute("onclick","getxmlData(1,"+rowCount+");");
}
if(prvName.indexOf("quantity") != -1)
{
eachEleme.removeAttribute("onchange");
eachEleme.setAttribute("onchange","changeAmount("+rowCount+");sendInfo('"+"Detail3."+rowCount+".quantity"+"');");
}
if(prvName.indexOf("discount") != -1)
{
eachEleme.removeAttribute("onchange");
eachEleme.setAttribute("onchange","chgAmtOnDiscount("+rowCount+");sendInfo('"+"Detail3."+rowCount+".quantity"+"');");
}
}
}
}
......@@ -6477,9 +6507,13 @@ function setCheckedScheme(rowID, schemeCode)
console.log("existTabVal"+existTabVal);
//document.getElementById("EXISITING_COL_VALUES").value = existTabVal;
//document.getElementById("EXISITING_COL_VALUES").value = existTabVal;
//document.getElementById("Detail3."+rowCount+".is_scheme_row").value = "Y";
}
foarmatSchemeRows();
/* document.getElementById("PRE_SCHEME_VAL").value = xmlString;
......@@ -6601,6 +6635,43 @@ function setCheckedScheme(rowID, schemeCode)
}
// Added by Kaustubh on 11 Jan 2018 end
function foarmatSchemeRows()
{
var rows = $('#Details tbody tr');
for(var i=0; i<rows.length; i++)
{
var eachRow = rows[i];
var isSchemeRow = document.getElementById("Detail3."+(i+1)+".is_scheme_row").value;
if(isSchemeRow == "Y")
{
eachRow.classList.add("schemeRow");
var inputElemes = eachRow.getElementsByTagName("input");
for(var j=0; j< inputElemes.length; j++)
{
var eachInputEleme = inputElemes[j];
if(eachInputEleme.name.indexOf("tax_amt") == -1)
{
eachInputEleme.setAttribute("readonly","1");
eachInputEleme.removeAttribute("onkeypress");
}
}
changeAmount(i+1);
}
}
var schemeRowImgs = $('#Details tr.schemeRow img ');
for(var i=0; i<schemeRowImgs.length; i++)
{
var eachImg = schemeRowImgs[i];
eachImg.removeAttribute("onclick");
}
}
/*
......
webitm-wms/module-resource/web/jsp/E12WizardTax.jsp
View file @ cebf74ca
......@@ -138,7 +138,7 @@ catch(Exception e)
<td style="vertical-align: top;" align="left">
<div style="position: relative; overflow: hidden;" class="e12CustomInputPanel">
<input coltype="String" style="position:relative;;TYPE:String;text-align:LEFT" class="headerInputField" required="" srvcallonchange="true" ischanged="false" protectexpr=" " protect=" " onkeyup="getAutoCompleteList(this); " minlengthauto="1" helpoption="2" popupparameters="NULL" popupexists="true" maxlength="5" taborder="991" tabindex="991" fontcase="upper" id="Detail2.<%=domID%>.tax_classNew" name="tax.tax_class" type="text" value="<%=taxClass%>" title="Please enter value." autocomplete="off">
<input coltype="String" style="position:relative;;TYPE:String;text-align:LEFT" class="headerInputField" required="" srvcallonchange="true" ischanged="false" protectexpr=" " protect=" " minlengthauto="1" helpoption="2" popupparameters="NULL" popupexists="true" maxlength="5" taborder="991" tabindex="991" fontcase="upper" id="Detail2.<%=domID%>.tax_classNew" name="tax.tax_class" type="text" value="<%=taxClass%>" title="Please enter value." autocomplete="off">
<span label="Tax Class" style=" width: 130; position:relative; text-align:RIGHT; " class="headerLabelField" id="tax.tax_class_t" name="tax.tax_class_t">Tax Class </span>
<input type="hidden" id="tax.old_tax_class" value="">
......@@ -148,7 +148,7 @@ catch(Exception e)
<td style="vertical-align: top;" align="left">
<div style="position: relative; overflow: hidden;" class="e12CustomInputPanel">
<input coltype="String" style="position:relative;;TYPE:String;text-align:LEFT" class="headerInputField" required="" srvcallonchange="true" ischanged="false" protectexpr="" protect="" onkeyup="getAutoCompleteList(this);" minlengthauto="1" helpoption="2" popupparameters="NULL" popupexists="true" maxlength="10" taborder="992" tabindex="992" fontcase="upper" id="Detail2.<%=domID%>.tax_chapNew" name="tax.tax_chap" type="text" value="<%=taxChapter%>" title="Please enter value." autocomplete="off">
<input coltype="String" style="position:relative;;TYPE:String;text-align:LEFT" class="headerInputField" required="" srvcallonchange="true" ischanged="false" protectexpr="" protect="" minlengthauto="1" helpoption="2" popupparameters="NULL" popupexists="true" maxlength="10" taborder="992" tabindex="992" fontcase="upper" id="Detail2.<%=domID%>.tax_chapNew" name="tax.tax_chap" type="text" value="<%=taxChapter%>" title="Please enter value." autocomplete="off">
<span label="Tax Class" style=" width: 130; position:relative; text-align:RIGHT; " class="headerLabelField" id="tax.tax_chapter_t" name="tax.tax_chapter_t">Tax Chapter </span>
<input type="hidden" id="tax.old_tax_chapter" value="">
</div>
......@@ -156,7 +156,7 @@ catch(Exception e)
<td style="vertical-align: top;" align="left">
<div style="position: relative; overflow: hidden;" class="e12CustomInputPanel">
<input coltype="String" style="position:relative;;TYPE:String;text-align:LEFT" class="headerInputField" required="" srvcallonchange="true" ischanged="false" protectexpr="" protect="" onkeyup="getAutoCompleteList(this);" minlengthauto="1" helpoption="2" popupparameters="NULL" popupexists="true" maxlength="10" taborder="993" tabindex="993" fontcase="upper" id="Detail2.<%=domID%>.tax_envNew" name="tax.tax_env" type="text" value="<%=taxEnv%>" title="Please enter value." autocomplete="off">
<input coltype="String" style="position:relative;;TYPE:String;text-align:LEFT" class="headerInputField" required="" srvcallonchange="true" ischanged="false" protectexpr="" protect="" minlengthauto="1" helpoption="2" popupparameters="NULL" popupexists="true" maxlength="10" taborder="993" tabindex="993" fontcase="upper" id="Detail2.<%=domID%>.tax_envNew" name="tax.tax_env" type="text" value="<%=taxEnv%>" title="Please enter value." autocomplete="off">
<span label="Tax Class" style=" width: 140; position:relative; text-align:RIGHT; " class="headerLabelField" id="tax.tax_env_t" name="tax.tax_env_t">Tax Environment </span>
<input type="hidden" id="tax.old_tax_env" value="">
</div>
......
webitm-wms/module-resource/web/jsp/E12WizardTaxUpadation.jsp
View file @ cebf74ca
......@@ -138,7 +138,7 @@ catch(Exception e)
<td style="vertical-align: top;" align="left">
<div style="position: relative; overflow: hidden;" class="e12CustomInputPanel">
<input coltype="String" style="position:relative;;TYPE:String;text-align:LEFT" class="headerInputField" required="" srvcallonchange="true" ischanged="false" protectexpr=" " protect=" " onkeyup="getAutoCompleteList(this); " minlengthauto="1" helpoption="2" popupparameters="NULL" popupexists="true" maxlength="5" taborder="991" tabindex="991" fontcase="upper" id="Detail2.<%=domID%>.tax_classNew" name="tax.tax_class" type="text" value="<%=taxClass%>" title="Please enter value." autocomplete="off">
<input coltype="String" style="position:relative;;TYPE:String;text-align:LEFT" class="headerInputField" required="" srvcallonchange="true" ischanged="false" protectexpr=" " protect=" " minlengthauto="1" helpoption="2" popupparameters="NULL" popupexists="true" maxlength="5" taborder="991" tabindex="991" fontcase="upper" id="Detail2.<%=domID%>.tax_classNew" name="tax.tax_class" type="text" value="<%=taxClass%>" title="Please enter value." autocomplete="off">
<span label="Tax Class" style=" width: 130; position:relative; text-align:RIGHT; " class="headerLabelField" id="tax.tax_class_t" name="tax.tax_class_t">Tax Class </span>
<input type="hidden" id="tax.old_tax_class" value="">
......@@ -148,7 +148,7 @@ catch(Exception e)
<td style="vertical-align: top;" align="left">
<div style="position: relative; overflow: hidden;" class="e12CustomInputPanel">
<input coltype="String" style="position:relative;;TYPE:String;text-align:LEFT" class="headerInputField" required="" srvcallonchange="true" ischanged="false" protectexpr="" protect="" onkeyup="getAutoCompleteList(this);" minlengthauto="1" helpoption="2" popupparameters="NULL" popupexists="true" maxlength="10" taborder="992" tabindex="992" fontcase="upper" id="Detail2.<%=domID%>.tax_chapNew" name="tax.tax_chap" type="text" value="<%=taxChapter%>" title="Please enter value." autocomplete="off">
<input coltype="String" style="position:relative;;TYPE:String;text-align:LEFT" class="headerInputField" required="" srvcallonchange="true" ischanged="false" protectexpr="" protect="" minlengthauto="1" helpoption="2" popupparameters="NULL" popupexists="true" maxlength="10" taborder="992" tabindex="992" fontcase="upper" id="Detail2.<%=domID%>.tax_chapNew" name="tax.tax_chap" type="text" value="<%=taxChapter%>" title="Please enter value." autocomplete="off">
<span label="Tax Class" style=" width: 130; position:relative; text-align:RIGHT; " class="headerLabelField" id="tax.tax_chapter_t" name="tax.tax_chapter_t">Tax Chapter </span>
<input type="hidden" id="tax.old_tax_chapter" value="">
</div>
......@@ -156,7 +156,7 @@ catch(Exception e)
<td style="vertical-align: top;" align="left">
<div style="position: relative; overflow: hidden;" class="e12CustomInputPanel">
<input coltype="String" style="position:relative;;TYPE:String;text-align:LEFT" class="headerInputField" required="" srvcallonchange="true" ischanged="false" protectexpr="" protect="" onkeyup="getAutoCompleteList(this);" minlengthauto="1" helpoption="2" popupparameters="NULL" popupexists="true" maxlength="10" taborder="993" tabindex="993" fontcase="upper" id="Detail2.<%=domID%>.tax_envNew" name="tax.tax_env" type="text" value="<%=taxEnv%>" title="Please enter value." autocomplete="off">
<input coltype="String" style="position:relative;;TYPE:String;text-align:LEFT" class="headerInputField" required="" srvcallonchange="true" ischanged="false" protectexpr="" protect="" minlengthauto="1" helpoption="2" popupparameters="NULL" popupexists="true" maxlength="10" taborder="993" tabindex="993" fontcase="upper" id="Detail2.<%=domID%>.tax_envNew" name="tax.tax_env" type="text" value="<%=taxEnv%>" title="Please enter value." autocomplete="off">
<span label="Tax Class" style=" width: 140; position:relative; text-align:RIGHT; " class="headerLabelField" id="tax.tax_env_t" name="tax.tax_env_t">Tax Environment </span>
<input type="hidden" id="tax.old_tax_env" value="">
</div>
......
webitm-wms/module-resource/web/xsl/WIZARD/sorderWiz2_wiz_en_US_A.xsl
View file @ cebf74ca
......@@ -205,8 +205,8 @@
<!-- Added by kaustubh on 4 dec 2017 end -->
<!-- Added by kaustubh on 21 dec 2017 start -->
<xsl:variable name="schemeCode"><xsl:value-of select="schemeCode"/></xsl:variable>
<xsl:variable name="schemeDescr"><xsl:value-of select="schemeDescr"/></xsl:variable>
<xsl:variable name="scheme_code"><xsl:value-of select="scheme_code"/></xsl:variable>
<xsl:variable name="scheme_descr"><xsl:value-of select="scheme_descr"/></xsl:variable>
<!-- Added by kaustubh on 21 dec 2017 end -->
<xsl:if test="$dbIDs = '0'">
......@@ -262,10 +262,8 @@
<!-- Added by kaustubh on 4 dec 2017 end -->
<!-- Added by kaustubh on 21 dec 2017 start -->
<input type="hidden" value="{$schemeCode}" name="Detail2.{normalize-space($dbIDs)}.schemeCode" id="schemeCode" />
<input type="hidden" value="{$schemeDescr}" name="Detail2.{normalize-space($dbIDs)}.schemeDescr" id="schemeDescr" />
<!-- <input type="hidden" value="{$schemeCode}" name="Detail2.{normalize-space($dbIDs)}.schemeCode" id="schemeCode" />
<input type="hidden" value="{$schemeDescr}" name="Detail2.{normalize-space($dbIDs)}.schemeDescr" id="schemeDescr" /> -->
</xsl:if>
</xsl:for-each>
</table>
......
webitm-wms/module-resource/web/xsl/WIZARD/sorderWiz3_wiz_en_US_A.xsl
View file @ cebf74ca
......@@ -81,7 +81,7 @@ tr.schemeRow>td>input {
</style>
<body>
<body onload="foarmatSchemeRows();">
<form name="sorderWizFormIII" id="sorderWizFormIII" onkeypress="return event.keyCode != 13;" METHOD="post" ACTION="/ibase/ITMWizardHandlerServlet">
<xsl:for-each select="//Detail3">
......@@ -355,8 +355,9 @@ tr.schemeRow>td>input {
<!-- added By kaustubh on 21 dec start -->
<xsl:variable name="schemeCode"><xsl:value-of select="schemeCode"/></xsl:variable>
<xsl:variable name="schemeDescr"><xsl:value-of select="schemeDescr"/></xsl:variable>
<xsl:variable name="scheme_code"><xsl:value-of select="scheme_code"/></xsl:variable>
<xsl:variable name="scheme_descr"><xsl:value-of select="scheme_descr"/></xsl:variable>
<xsl:variable name="is_scheme_row"><xsl:value-of select="is_scheme_row"/></xsl:variable>
<!-- added By kaustubh on 5 jan 2018 end -->
<!-- <xsl:variable name="tax_xml"><xsl:value-of select="tax_xml"/></xsl:variable> -->
......@@ -390,7 +391,7 @@ tr.schemeRow>td>input {
</td>
<xsl:choose>
<xsl:when test="$schemeCode =''">
<xsl:when test="$scheme_code =''">
<td style="width:100px" nowrap="true">
<!-- <xsl:value-of select="item_code"/> -->
<input id="Detail3.{normalize-space($dbIDs)}.item_code" name="Detail3.{normalize-space($dbIDs)}.item_code" value="{$item_code}" type="text" style="border: none;outline: none;color: #555;font-size: 12px;" readonly=""/>
......@@ -544,6 +545,9 @@ tr.schemeRow>td>input {
<input type="hidden" value="{$rate__clg}" name="Detail3.{normalize-space($dbIDs)}.rate__clg" id="Detail3.{normalize-space($dbIDs)}.rate__clg" />
<input type="hidden" value="{$tax_amt}" name="Detail3.{normalize-space($dbIDs)}.tax_amt" id="Detail3.{normalize-space($dbIDs)}.tax_amt" />
<input type="hidden" value="{$item_code}" name="Detail3.{normalize-space($dbIDs)}.item_code" id="Detail3.{normalize-space($dbIDs)}.item_code" />
<input type="hidden" value="{$scheme_code}" name="Detail3.{normalize-space($dbIDs)}.scheme_code" id="Detail3.{normalize-space($dbIDs)}.scheme_code" />
<input type="hidden" value="{$scheme_descr}" name="Detail3.{normalize-space($dbIDs)}.scheme_descr" id="Detail3.{normalize-space($dbIDs)}.scheme_descr" />
<input type="hidden" value="{$is_scheme_row}" name="Detail3.{normalize-space($dbIDs)}.is_scheme_row" id="Detail3.{normalize-space($dbIDs)}.is_scheme_row" />
<input type="hidden" value="" name="Detail3.{normalize-space($dbIDs)}.natue" id="Detail3.{normalize-space($dbIDs)}.nature" />
......@@ -551,7 +555,7 @@ tr.schemeRow>td>input {
<input type="hidden" value="{$discount}" name="Detail3.{normalize-space($dbIDs)}.discount" id="Detail3.{normalize-space($dbIDs)}.discount" />
<input type="hidden" value="" id="Detail3.{normalize-space($dbIDs)}.tax_xml" name="Detail3.{normalize-space($dbIDs)}.tax_xmlData"/>
<input type="hidden" value="" id="Detail3.{normalize-space($dbIDs)}.tax_xml" name="Detail3.{normalize-space($dbIDs)}.tax_xmlData" disabled="disabled" />
<!-- <input type="hidden" class="editInputClass editInputCur" value="{$discount}" name="Detail3.{normalize-space($dbIDs)}.discount" id="Detail3.{normalize-space($dbIDs)}.discount"
......
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