changes for statues link

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

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

@@ -215,7 +215,7 @@ public class SorderStatusEJB extends ValidatorEJB implements SorderStatusEJBRemo
 	    	   	/*valueXmlString.append("<item_ser><![CDATA["+rs.getString("ITEM_SER")+"]]>></item_ser>\n");*/
 	    	   	/*valueXmlString.append("<cust_code__bil><![CDATA["+rs.getString("CUST_CODE__BIL")+"]]>></cust_code__bil>\n");*/
 	    	   	/*valueXmlString.append("<net_tot_amt><![CDATA["+rs.getString("NET_TOT_AMT")+"]]>></net_tot_amt>\n");*/
-	    	   	/*valueXmlString.append("<confirmed><![CDATA["+rs.getString("CONFIRMED")+"]]>></confirmed>\n");*/
+	    		valueXmlString.append("<confirmed><![CDATA["+checkNull(rs1.getString("CONFIRMED"))+"]]></confirmed>\n");// uncommented by nandkumar gadkari on 17/01/19
 	    	   	/*valueXmlString.append("<desp_id><![CDATA["+rs.getString("DESP_ID")+"]]>></desp_id>\n");*/
 	    	   	valueXmlString.append("<min_due_date><![CDATA["+minDate1+"]]></min_due_date>\n");
 	    	   	valueXmlString.append("<max_due_date><![CDATA["+maxDate1+"]]></max_due_date>\n");

webitm-dis/module-resource/xsl/sorder_status11_en_US_V.xsl

@@ -15,6 +15,7 @@
 		<xsl:variable name="orderStatus"><xsl:value-of select="//Detail1/header_data/status"/></xsl:variable>
 		<xsl:variable name="custPo"><xsl:value-of select="//Detail1/header_data/cust_pord"/></xsl:variable>
 		<xsl:variable name="custPoDate"><xsl:value-of select="//Detail1/header_data/pord_date"/></xsl:variable>
+		<xsl:variable name="confirmedYN"><xsl:value-of select="//Detail1/header_data/confirmed"/></xsl:variable>
 		<div class="statusHeader">
 			<div class="statusLine">
 				<div class="leftAlignDiv">
@@ -23,18 +24,24 @@
 				<div class="rightAlignDiv">
 					<div class="orderStatsDiv">
 						<input type="hidden" value="{$orderStatus}" id="orderStatus"/>
-						<xsl:if test="$orderStatus='H'">
-					<!-- Changed by Pooja S on[11-12-2018] for the Unconfirmed Status -->
-						<span>Order is on hold</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderHold.png" />
-						</xsl:if>
-						<xsl:if test="$orderStatus='P'">
-						<span>Order is not confirmed</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderPending.png" />
-						</xsl:if>
-						<xsl:if test="$orderStatus='C'">
-						<span>Order is closed</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderClosed.png" />
+						<input type="hidden" value="{$confirmedYN}" id="confirmedYN"/>
+						<xsl:if test="$confirmedYN='Y'">
+							<xsl:if test="$orderStatus='H'">
+						<!-- Changed by Pooja S on[11-12-2018] for the Unconfirmed Status -->
+							<span>Order is on hold</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderHold.png" />
+							</xsl:if>
+							<xsl:if test="$orderStatus='P'">
+							<span>Order is pending</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderPending.png" />
+							</xsl:if>
+							<xsl:if test="$orderStatus='C'">
+							<span>Order is closed</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderClosed.png" />
+							</xsl:if>
+							<xsl:if test="$orderStatus='X'">
+							<span>Order is cancelled</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderCancel.png" />
+							</xsl:if>
 						</xsl:if>
-						<xsl:if test="$orderStatus='X'">
-						<span>Order is cancelled</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderCancel.png" />
+                        <xsl:if test="$confirmedYN='N'">
+                        	<span>Order is not confirmed</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderPending.png" />
 						</xsl:if>
 					</div>
 				</div>