midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1664006 Web Store Login Button not working 

https://sourceforge.net/tracker/index.php?func=detail&aid=1664006&group_id=176962&atid=879332
This commit is contained in:
phib 2009-09-25 03:59:55 +00:00
parent 0f9ce1a9ca
commit de08ea18d9
6 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serverApps/src/main/servlet/org/compiere/wstore/CheckOutLinkTag.java
View File

@ -117,7 +117,7 @@ public class CheckOutLinkTag extends TagSupport
img.setBorder(0); img.setBorder(0);
String url = CheckOutServlet.NAME; String url = CheckOutServlet.NAME;
if (!request.isSecure()) if (!request.isSecure())
url = "https://" + request.getServerName() + request.getContextPath() + "/" + CheckOutServlet.NAME; url = "./" + CheckOutServlet.NAME;
a = new a(url); a = new a(url);
a.setClass("menuMain"); a.setClass("menuMain");
a.addElement("Create Order"); a.addElement("Create Order");

6
serverApps/src/main/servlet/org/compiere/wstore/LoginLinkTag.java
View File

@ -153,7 +153,7 @@ public class LoginLinkTag extends TagSupport
HtmlCode retValue = new HtmlCode(); HtmlCode retValue = new HtmlCode();
// Login button // Login button
input button = new input(input.TYPE_BUTTON, "Login", "Login"); input button = new input(input.TYPE_BUTTON, "Login", "Login");
button.setOnClick("window.top.location.replace('https://" + serverContext + "/loginServlet');"); button.setOnClick("window.top.location.replace('./loginServlet');");
retValue.addElement(button); retValue.addElement(button);
/** Link /** Link
@ -177,7 +177,7 @@ public class LoginLinkTag extends TagSupport
{ {
HtmlCode retValue = new HtmlCode(); HtmlCode retValue = new HtmlCode();
// //
a a = new a("https://" + serverContext + "/login.jsp"); a a = new a("./login.jsp");
a.setClass("menuMain"); a.setClass("menuMain");
String msg = "Welcome " + wu.getName(); String msg = "Welcome " + wu.getName();
a.addElement(msg); a.addElement(msg);
@ -216,7 +216,7 @@ public class LoginLinkTag extends TagSupport
else else
{ {
input button = new input (input.TYPE_BUTTON, "Login", "Login"); input button = new input (input.TYPE_BUTTON, "Login", "Login");
button.setOnClick ("window.top.location.replace('https://" + serverContext + "/login.jsp');"); button.setOnClick ("window.top.location.replace('./login.jsp');");
retValue.addElement (button); retValue.addElement (button);
} }
retValue.addElement (" "); retValue.addElement (" ");

17
webStore/src/web/WEB-INF/web.xml
View File

@ -24,6 +24,23 @@
<filter-name>WebStoreFilter</filter-name> <filter-name>WebStoreFilter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</filter-mapping> </filter-mapping>
<!-- Force SSL for login and checkout -->
<security-constraint>
<web-resource-collection>
<web-resource-name>SSL pages</web-resource-name>
<url-pattern>/login.jsp</url-pattern>
<url-pattern>/loginServlet</url-pattern>
<url-pattern>/checkOutServlet</url-pattern>
<url-pattern>/orderServlet</url-pattern>
</web-resource-collection>
<user-data-constraint>
<transport-guarantee>CONFIDENTIAL</transport-guarantee>
</user-data-constraint>
</security-constraint>
<servlet> <servlet>
<display-name>Web Store Advertisement</display-name> <display-name>Web Store Advertisement</display-name>
<servlet-name>AdvertisementServlet</servlet-name> <servlet-name>AdvertisementServlet</servlet-name>

2
webStore/src/web/basket.jsp
View File

@ -55,7 +55,7 @@
<th> <th>
<div class="amount"><c:out value='${priceList.currency}'/> <fmt:formatNumber value='${webBasket.total}' type="currency" currencySymbol=""/></div></th> <div class="amount"><c:out value='${priceList.currency}'/> <fmt:formatNumber value='${webBasket.total}' type="currency" currencySymbol=""/></div></th>
<th><input type="button" name="Checkout" id="Checkout" value="Create Secure Order" <th><input type="button" name="Checkout" id="Checkout" value="Create Secure Order"
onClick="window.top.location.replace('<c:out value='https://${ctx.context}/'/>checkOutServlet');"> onClick="window.top.location.replace('./checkOutServlet');">
<!-- removed by request of BBB <!-- removed by request of BBB
&nbsp; <input name="CheckoutUnsecure" id="CheckoutUnsecure" value="Create Order" &nbsp; <input name="CheckoutUnsecure" id="CheckoutUnsecure" value="Create Order"
onClick="window.top.location.replace('checkOutServlet');" type="button"> --> onClick="window.top.location.replace('checkOutServlet');" type="button"> -->

4
webStore/src/web/orderDetails.jsp
View File

@ -52,9 +52,9 @@
<td class="oddRow"> <td class="oddRow">
<c:if test='${order.docStatus=="IP"}'> <c:if test='${order.docStatus=="IP"}'>
<input name="Void" id="Void" value="Void" <input name="Void" id="Void" value="Void"
onClick="window.top.location.replace('<c:out value='https://${ctx.context}/'/>orderServlet?C_Order_ID=<c:out value='${order.c_Order_ID}'/>&DocAction=VO');" type="button"> onClick="window.top.location.replace('./orderServlet?C_Order_ID=<c:out value='${order.c_Order_ID}'/>&DocAction=VO');" type="button">
<input name="Complere" id="Complete" value="Complete" <input name="Complere" id="Complete" value="Complete"
onClick="window.top.location.replace('<c:out value='https://${ctx.context}/'/>orderServlet?C_Order_ID=<c:out value='${order.c_Order_ID}'/>&DocAction=CO');" type="button"> onClick="window.top.location.replace('./orderServlet?C_Order_ID=<c:out value='${order.c_Order_ID}'/>&DocAction=CO');" type="button">
</c:if> </c:if>
<c:if test='${order.docStatus=="WP"}'> <c:if test='${order.docStatus=="WP"}'>
<input type="submit" name="OrderPay" value="Pay <c:out value='${order.grandTotal}'/>" <input type="submit" name="OrderPay" value="Pay <c:out value='${order.grandTotal}'/>"

4
webStore/src/web/orders.jsp
View File

@ -54,9 +54,9 @@
<td class="<c:out value='${rowClass}' />"> <td class="<c:out value='${rowClass}' />">
<c:if test='${order.docStatus=="IP"}'> <c:if test='${order.docStatus=="IP"}'>
<input name="Void" id="Void" value="Void" <input name="Void" id="Void" value="Void"
onClick="window.top.location.replace('<c:out value='https://${ctx.context}/'/>orderServlet?C_Order_ID=<c:out value='${order.c_Order_ID}'/>&DocAction=VO');" type="button"> onClick="window.top.location.replace('./orderServlet?C_Order_ID=<c:out value='${order.c_Order_ID}'/>&DocAction=VO');" type="button">
<input name="Complere" id="Complete" value="Complete" <input name="Complere" id="Complete" value="Complete"
onClick="window.top.location.replace('<c:out value='https://${ctx.context}/'/>orderServlet?C_Order_ID=<c:out value='${order.c_Order_ID}'/>&DocAction=CO');" type="button"> onClick="window.top.location.replace('./orderServlet?C_Order_ID=<c:out value='${order.c_Order_ID}'/>&DocAction=CO');" type="button">
</c:if> </c:if>
<c:if test='${order.docStatus=="WP"}'> <c:if test='${order.docStatus=="WP"}'>
<input type="submit" name="OrderPay" value="Pay <c:out value='${order.grandTotal}'/>" <input type="submit" name="OrderPay" value="Pay <c:out value='${order.grandTotal}'/>"