BF [2979271] - Improve Posterita
https://sourceforge.net/tracker/?func=detail&aid=2979271&group_id=176962&atid=883808 Reverted rev. 11851 and 11859. Have to reconsider the solution.
This commit is contained in:
parent
e15c70f816
commit
ba938efa6b
|
@ -267,7 +267,7 @@ td.yellow
|
|||
|
||||
#messagebox div, .errormsg
|
||||
{
|
||||
background-image: url("<%= path %> + "images/newUI/icon-err.gif");
|
||||
background-image: url("<%= path + "images/newUI/icon-err.gif" %>");
|
||||
background-repeat: no-repeat;
|
||||
background-position: left center;
|
||||
font-family: arial,sans-serif;
|
||||
|
@ -280,7 +280,7 @@ td.yellow
|
|||
|
||||
.successmsg
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/success.gif");
|
||||
background-image: url("<%= path + "images/pos/success.gif" %>");
|
||||
background-repeat: no-repeat;
|
||||
background-position: left top;
|
||||
font-family: arial,sans-serif;
|
||||
|
@ -373,7 +373,7 @@ font
|
|||
|
||||
li.submenu
|
||||
{
|
||||
list-style-image: url("<%= path %> + "images/pos/buttons/bullet_red.gif");
|
||||
list-style-image: url("<%= path + "images/pos/buttons/bullet_red.gif" %>");
|
||||
font-family: arial,sans-serif;
|
||||
font-size: 10pt;
|
||||
/*font-weight: bold;*/
|
||||
|
@ -868,142 +868,142 @@ caption
|
|||
/* buttons styles */
|
||||
.advanced
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_advanced.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_advanced.gif" %>");
|
||||
}
|
||||
|
||||
.continue
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_continue.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_continue.gif" %>");
|
||||
}
|
||||
|
||||
.create
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_create.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_create.gif" %>");
|
||||
}
|
||||
|
||||
.complete
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_complete.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_complete.gif" %>");
|
||||
}
|
||||
|
||||
.addtocart
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_addtocart.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_addtocart.gif" %>");
|
||||
}
|
||||
|
||||
.newcustomer
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_newcustomer.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_newcustomer.gif" %>");
|
||||
}
|
||||
|
||||
.checkout
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_checkout.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_checkout.gif" %>");
|
||||
}
|
||||
|
||||
.delete
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_delete.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_delete.gif" %>");
|
||||
}
|
||||
|
||||
.neworder
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_neworder.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_neworder.gif" %>");
|
||||
}
|
||||
.newnote
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_newnote.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_newnote.gif" %>");
|
||||
}
|
||||
|
||||
.cash
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_cash.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_cash.gif" %>");
|
||||
}
|
||||
|
||||
.card
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_card.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_card.gif" %>");
|
||||
}
|
||||
|
||||
.cheque
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_cheque.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_cheque.gif" %>");
|
||||
}
|
||||
|
||||
.mixed
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_mixed.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_mixed.gif" %>");
|
||||
}
|
||||
|
||||
.save
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_save.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_save.gif" %>");
|
||||
}
|
||||
|
||||
.search
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_search.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_search.gif" %>");
|
||||
}
|
||||
|
||||
.edit
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_edit.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_edit.gif" %>");
|
||||
}
|
||||
|
||||
.tangoSearch
|
||||
{
|
||||
background-image: url("<%= path %> + "images/tango/system-search.png");
|
||||
background-image: url("<%= path + "images/tango/system-search.png" %>");
|
||||
margin-top: -3px;
|
||||
}
|
||||
|
||||
.selectall
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_selectall.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_selectall.gif" %>");
|
||||
}
|
||||
|
||||
.submit
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_submit.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_submit.gif" %>");
|
||||
}
|
||||
|
||||
.refresh
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_refresh.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_refresh.gif" %>");
|
||||
}
|
||||
|
||||
.piechart
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_piechart.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_piechart.gif" %>");
|
||||
}
|
||||
|
||||
.barchart
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_barchart.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_barchart.gif" %>");
|
||||
}
|
||||
|
||||
.timeseries
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_timeseries.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_timeseries.gif" %>");
|
||||
}
|
||||
|
||||
.tabular
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_tabular.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_tabular.gif" %>");
|
||||
}
|
||||
|
||||
.saveascsv
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_saveascsv.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_saveascsv.gif" %>");
|
||||
}
|
||||
|
||||
.saveaspdf
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_saveaspdf.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_saveaspdf.gif" %>");
|
||||
}
|
||||
|
||||
.blank
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_blank.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_blank.gif" %>");
|
||||
}
|
||||
|
||||
.bigbutton
|
||||
|
@ -1276,7 +1276,7 @@ div#PINPanel
|
|||
|
||||
div#divBack
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/maskBG.png");
|
||||
background-image: url("<%= path + "images/pos/maskBG.png" %>");
|
||||
filter: alpha(opacity=40);
|
||||
}
|
||||
|
||||
|
@ -1440,7 +1440,7 @@ fieldset.submenu{
|
|||
color: #666666;
|
||||
height: 42px;
|
||||
/*min-width:87px;*/
|
||||
background-image: url("<%= path %> + "images/pos/buttons/button_middle.gif");
|
||||
background-image: url("<%= path + "images/pos/buttons/button_middle.gif" %>");
|
||||
border-left: solid 1px #9b9b9b;
|
||||
border-right: solid 1px #9b9b9b;
|
||||
border-top-width: 0px;
|
||||
|
@ -1455,7 +1455,7 @@ fieldset#createcustomer{
|
|||
|
||||
/*
|
||||
.searchBox{
|
||||
background-image:url("<%= path %> + "images/pos/magnifying-glass.gif");
|
||||
background-image:url("<%= path + "images/pos/magnifying-glass.gif" %>");
|
||||
background-repeat:no-repeat;
|
||||
padding-left:20px;
|
||||
}
|
||||
|
@ -1541,7 +1541,7 @@ div#customerInfoPanel{
|
|||
|
||||
div.disableMask
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/maskBG.png");
|
||||
background-image: url("<%= path + "images/pos/maskBG.png" %>");
|
||||
filter: alpha(opacity=40);
|
||||
}
|
||||
|
||||
|
@ -1551,7 +1551,7 @@ div.ajaxindicator
|
|||
padding:10px;
|
||||
border:solid 1px #000000;
|
||||
background-color:#FFFFFF;
|
||||
/*background-image: url("<%= path %> + "images/ajax-indicators/indicator.gif");*/
|
||||
/*background-image: url("<%= path + "images/ajax-indicators/indicator.gif" %>");*/
|
||||
background-repeat:no-repeat;
|
||||
background-position:left center;
|
||||
padding-left:20px;
|
||||
|
@ -1567,14 +1567,14 @@ td.loginHeader
|
|||
{
|
||||
height: 210px;
|
||||
width: 800px;
|
||||
background-image: url("<%= path %> + "images/pos/logo.jpg");
|
||||
background-image: url("<%= path + "images/pos/logo.jpg" %>");
|
||||
background-position:center center;
|
||||
background-repeat:no-repeat;
|
||||
}
|
||||
|
||||
td.headerLogo
|
||||
{
|
||||
background-image: url("<%= path %> + "images/pos/logo.gif");
|
||||
background-image: url("<%= path + "images/pos/logo.gif" %>");
|
||||
background-position:top left;
|
||||
background-repeat:no-repeat;
|
||||
height: 40px;
|
||||
|
@ -1596,7 +1596,7 @@ input.calendar-icon
|
|||
{
|
||||
width: 28px;
|
||||
height: 22px;
|
||||
background-image: url("<%= path %> + "images/pos/calendar.gif");
|
||||
background-image: url("<%= path + "images/pos/calendar.gif" %>");
|
||||
}
|
||||
|
||||
.floatleft
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
</html:form>
|
||||
</td>
|
||||
|
||||
<td align = "right"><html:link href="UpdateOrCreateOrg.do">
|
||||
<td align = "right"><html:link href="<%="UpdateOrCreateOrg.do"%>">
|
||||
<img src="images/tango/document-new.png" title="Create Organisation" alt="Create Organisation" border="0">
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -72,11 +72,11 @@
|
|||
<bean:write name="org" property="isActive"/>
|
||||
</td>
|
||||
<td align="center" class = "label">
|
||||
<html:link href="OrganisationAction.do?action=viewOrg&orgId=<%= org.getOrgId()%>">
|
||||
<html:link href="<%="OrganisationAction.do?action=viewOrg&orgId=" + org.getOrgId()%>">
|
||||
<img src="images/tango/accessories-text-editor.png" border="0"
|
||||
title = "update organisation" alt = "update organisation">
|
||||
</html:link>
|
||||
<html:link href="OrganisationAction.do?action=activateOrg&orgId=<%= org.getOrgId()%>">
|
||||
<html:link href="<%="OrganisationAction.do?action=activateOrg&orgId=" + org.getOrgId()%>">
|
||||
<img src="images/tango/edit-redo.png" border="0"
|
||||
title = "activate/deactivate organisation" alt = "activate/deactivate organisation">
|
||||
</html:link>
|
||||
|
|
|
@ -72,10 +72,10 @@
|
|||
|
||||
|
||||
<td><%--
|
||||
<html:link href="RoleAction.do?action=viewRole&roleId=<%= roleID %>">Edit</html:link>
|
||||
<html:link href="<%= "RoleAction.do?action=viewRole&roleId=" + roleID %>">Edit</html:link>
|
||||
--%>
|
||||
<html:link href="RoleAction.do?action=viewRole&roleId=<%= roleID %>">View</html:link>
|
||||
<%--<html:link href="RoleAction.do?action=deleteRole&roleId=<%= roleID %>">Delete</html:link>--%>
|
||||
<html:link href="<%= "RoleAction.do?action=viewRole&roleId=" + roleID %>">View</html:link>
|
||||
<%--<html:link href="<%= "RoleAction.do?action=deleteRole&roleId=" + roleID %>">Delete</html:link>--%>
|
||||
</td>
|
||||
</tr>
|
||||
</logic:iterate>
|
||||
|
|
|
@ -88,7 +88,7 @@
|
|||
</td>
|
||||
|
||||
<td class="<%=styleClass%>">
|
||||
<html:link href="ViewUserDetailsAction.do?action=viewUserDetails&userID=<%= element.getUserId() %>">
|
||||
<html:link href="<%="ViewUserDetailsAction.do?action=viewUserDetails&userID=" + element.getUserId() %>">
|
||||
<bean:message key="admin.viewUsers.editDelete"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -152,23 +152,23 @@
|
|||
</td>
|
||||
|
||||
<td class="<%=styleClass%>">
|
||||
<html:link href="EditBPartnerAction.do?action=viewBpartnerDetails&bpartnerId=<%= element.getBpartnerId()%>">
|
||||
<html:link href="<%="EditBPartnerAction.do?action=viewBpartnerDetails&bpartnerId=" + element.getBpartnerId()%>">
|
||||
<img src="images/tango/edit-find.png" title="View Business Partner" alt="View Business Partner" border="0">
|
||||
</html:link>
|
||||
|
||||
<html:link href="InitEditBPartnerAction.do?action=initEditBpartnerDetails&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="InitEditBPartnerAction.do?action=initEditBpartnerDetails&bpartnerId=" + element.getBpartnerId()%>">
|
||||
<img src="images/tango/accessories-text-editor.png" title="Edit Business Partner" alt="Edit Business Partner" border="0">
|
||||
</html:link>
|
||||
|
||||
|
||||
<logic:equal name="element" property="isActive" value="true">
|
||||
<html:link href="ActivateBPartnerAction.do?action=activateBPartner&isActive=true&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="ActivateBPartnerAction.do?action=activateBPartner&bpartnerId=" + element.getBpartnerId()+"&isActive=true" %>">
|
||||
<img src="images/tango/edit-redo.png" title="Deactivate" alt="Deactivate" border="0">
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
||||
<logic:notEqual name="element" property="isActive" value="true">
|
||||
<html:link href="ActivateBPartnerAction.do?action=activateBPartner&isActive=false&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="ActivateBPartnerAction.do?action=activateBPartner&bpartnerId=" + element.getBpartnerId()+ "&isActive=false" %>">
|
||||
<img src="images/tango/edit-undo.png" title="Activate" alt="Activate" border="0">
|
||||
</html:link>
|
||||
</logic:notEqual>
|
||||
|
|
|
@ -83,7 +83,7 @@
|
|||
<logic:notPresent name="<%= Constants.PARTIAL_POS_OREDR %>">
|
||||
<logic:present name="<%= Constants.CURRENT_POS_ORDER_ID %>">
|
||||
<bean:define id="posOrderId" name="<%= Constants.CURRENT_POS_ORDER_ID %>"/>
|
||||
<html:link href="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId=<%= posOrderId %>&orderType=<%= orderType%>">
|
||||
<html:link href="<%="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId="+posOrderId + "&orderType=" + orderType%>">
|
||||
<html:button property="btn" styleClass="edit smallbutton" accesskey="c"> </html:button>
|
||||
</html:link>
|
||||
</logic:present>
|
||||
|
|
|
@ -172,7 +172,7 @@ if (isTerminalLocked)
|
|||
<html:link href="PostingAction.do?action=resubmitPosting">
|
||||
<image src="images/newUI/butn-system.gif" border="0" class="center"/>
|
||||
</html:link>
|
||||
<html:link href="POSLogoutAction.do?action=logout">
|
||||
<html:link href="<%="POSLogoutAction.do?action=logout"%>">
|
||||
<image src="images/newUI/butn-exit.gif" border="0" class="center"/>
|
||||
</html:link>
|
||||
</div>
|
||||
|
|
|
@ -172,7 +172,7 @@ if (isTerminalLocked)
|
|||
<html:link href="PostingAction.do?action=resubmitPosting">
|
||||
<image src="images/newUI/butn-system.gif" border="0" class="center"/>
|
||||
</html:link>
|
||||
<html:link href="POSLogoutAction.do?action=logout">
|
||||
<html:link href="<%="POSLogoutAction.do?action=logout"%>">
|
||||
<image src="images/newUI/butn-exit.gif" border="0" class="center"/>
|
||||
</html:link>
|
||||
</div>
|
||||
|
|
|
@ -149,7 +149,7 @@ if (isTerminalLocked)
|
|||
<html:link href="PostingAction.do?action=resubmitPosting">
|
||||
<image src="images/newUI/butn-system.gif" border="0"/>
|
||||
</html:link>
|
||||
<html:link href="POSLogoutAction.do?action=logout">
|
||||
<html:link href="<%="POSLogoutAction.do?action=logout"%>">
|
||||
<image src="images/newUI/butn-exit.gif" border="0"/>
|
||||
</html:link>
|
||||
</div>
|
||||
|
|
|
@ -264,7 +264,7 @@
|
|||
<tr><td> </td></tr>
|
||||
<tr>
|
||||
<td align="right">
|
||||
<html:link href="CreatePOSOrder.do">
|
||||
<html:link href="<%="CreatePOSOrder.do"%>">
|
||||
<img src="images/pos/buttons/button_edit.gif" styleClass="continue smallbutton"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -264,7 +264,7 @@
|
|||
<tr><td> </td></tr>
|
||||
<tr>
|
||||
<td align="right">
|
||||
<html:link href="CreatePOSOrder2.do">
|
||||
<html:link href="<%="CreatePOSOrder2.do"%>">
|
||||
<img src="images/pos/buttons/button_edit.gif" styleClass="continue smallbutton"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -30,26 +30,26 @@
|
|||
<script>
|
||||
try
|
||||
{
|
||||
document.applets[0].setPrinterName('<%= cookie.getValue() %>');
|
||||
document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
|
||||
}
|
||||
catch (e)
|
||||
{}
|
||||
|
||||
function print()
|
||||
{
|
||||
var url = '<%= basePath %>ReprintOrderAction.do?action=getPrintOrderData&orderId=';
|
||||
var url = '<%=basePath + "ReprintOrderAction.do?action=getPrintOrderData&orderId="%>';
|
||||
document.applets[0].printURL(url + '<c:out value='${morder._ID}'/>');
|
||||
}
|
||||
|
||||
function print(orderId)
|
||||
{
|
||||
var url = '<%= basePath %>ReprintOrderAction.do?action=getPrintOrderData&orderId=';
|
||||
var url = '<%=basePath + "ReprintOrderAction.do?action=getPrintOrderData&orderId="%>';
|
||||
document.applets[0].printURL(url + orderId);
|
||||
}
|
||||
|
||||
function printOrder(orderId)
|
||||
{
|
||||
var url = '<%= basePath %>ReprintOrderAction.do?action=getPrintOrderData&openDrawer=false&orderId=';
|
||||
var url = '<%=basePath + "ReprintOrderAction.do?action=getPrintOrderData&openDrawer=false&orderId="%>';
|
||||
document.applets[0].printURL(url + orderId);
|
||||
}
|
||||
</script>
|
||||
|
|
|
@ -67,7 +67,7 @@
|
|||
<!--<ul>-->
|
||||
<logic:iterate id="user" collection="<%=element.getOrgUsers()%>" type="org.compiere.model.MUser">
|
||||
<!--<li>-->
|
||||
<html:link href="LoginUserAction.do?action=loginUser&userId=<%= user.get_ID() %>" styleClass="submenu">
|
||||
<html:link href="<%="LoginUserAction.do?action=loginUser&userId=" + user.get_ID()%>" styleClass="submenu">
|
||||
<bean:write name="user" property="name"/>
|
||||
</html:link>
|
||||
<br/>
|
||||
|
|
|
@ -94,7 +94,7 @@
|
|||
<table border="0">
|
||||
<tr>
|
||||
<td align="center">
|
||||
<html:link action="/ViewReportAction.do?action=viewReport&<%= requestParams %>" target="_blank">
|
||||
<html:link action="<%= "/ViewReportAction.do?action=viewReport&" + requestParams %>" target="_blank">
|
||||
<img src="<%= imgSrc %>" name="image" width="210" height="140">
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
<bean:write name="stock" property="moveConfirmId" />
|
||||
</td>
|
||||
<td class = "label">
|
||||
<html:link action="StockMovementAction.do?action=viewMoveConfirmLines&movementId=<%= stock.getMovementId().toString() %>&moveConfirmId=<%= stock.getMoveConfirmId().toString() %>"><bean:write name="stock" property="documentNo"/></html:link>
|
||||
<html:link action="<%="StockMovementAction.do?action=viewMoveConfirmLines&movementId=" + stock.getMovementId().toString() + "&moveConfirmId=" + stock.getMoveConfirmId().toString() %>"><bean:write name="stock" property="documentNo"/></html:link>
|
||||
</td>
|
||||
<td class = "label">
|
||||
<bean:write name="stock" property="orgFromName"/>
|
||||
|
@ -77,7 +77,7 @@
|
|||
<% if (!stock.getDocStatus().equals("CO"))
|
||||
{
|
||||
%>
|
||||
<html:link action="StockMovementAction.do?action=completeMoveConfirm&moveConfirmId=<%= stock.getMoveConfirmId().toString() %>">Complete</html:link>
|
||||
<html:link action="<%= "StockMovementAction.do?action=completeMoveConfirm&moveConfirmId=" + stock.getMoveConfirmId().toString()%>">Complete</html:link>
|
||||
<%
|
||||
}
|
||||
%>
|
||||
|
|
|
@ -127,7 +127,7 @@
|
|||
<html:text name="stock" property="qtyToMove" indexed="true" value="<%=stock.getQtyToMove().toString()%>"></html:text>
|
||||
</td>
|
||||
<td align="right" class="<%=styleClass%>">
|
||||
<html:link action="StockMovementAction.do?action=remove&index=<%= index.intValue() %>">Remove</html:link>
|
||||
<html:link action="<%= "StockMovementAction.do?action=remove&index=" + index.intValue() %>">Remove</html:link>
|
||||
</td>
|
||||
</tr>
|
||||
</logic:iterate>
|
||||
|
|
|
@ -81,7 +81,7 @@
|
|||
%>
|
||||
|
||||
<td class="<%=styleClass%>">
|
||||
<html:link href="ViewPaymentAction.do?documentId=<%= element.getPaymentId() %>">
|
||||
<html:link href="<%="ViewPaymentAction.do?documentId="+element.getPaymentId()%>">
|
||||
<bean:write name="element" property="paymentId"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
</html:link>
|
||||
</td>
|
||||
<td>
|
||||
<html:link href="ImportPOSCustomers.do">
|
||||
<html:link href="<%="ImportPOSCustomers.do"%>">
|
||||
<img src="images/tango/applications-system.png" title="Import POS Customers" alt="Import POS Customers" border="0">
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -190,25 +190,25 @@
|
|||
<bean:define id="bpartnerId" name="element" property="bpartnerId"/>
|
||||
|
||||
<logic:equal name="element" property="isEditable" value="true">
|
||||
<html:link href="POSCustomerAction.do?action=initEditPOSCustomer&bpartnerId=<%= bpartnerId %>">
|
||||
<html:link href="<%="POSCustomerAction.do?action=initEditPOSCustomer&bpartnerId=" + bpartnerId%>">
|
||||
<img src="images/tango/accessories-text-editor.png" title='<pos:message textOnly="true" key="edit.customer"/>' alt='<pos:message textOnly="true" key="edit.customer"/>' border="0">
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
||||
|
||||
<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= bpartnerId %>">
|
||||
<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=" + bpartnerId%>">
|
||||
<img src="images/tango/edit-find.png" title='<pos:message textOnly="true" key="view"/>' alt='<pos:message textOnly="true" key="view"/>' border="0">
|
||||
</html:link>
|
||||
|
||||
<logic:equal name="element" property="isEditable" value="true">
|
||||
|
||||
<logic:equal name="element" property="isActive" value="true">
|
||||
<html:link href="POSCustomerAction.do?action=deactivatePOSCustomer&bpartnerId=<%= bpartnerId %>">
|
||||
<html:link href="<%="POSCustomerAction.do?action=deactivatePOSCustomer&bpartnerId=" + bpartnerId%>">
|
||||
<img src="images/tango/edit-redo.png" title='<pos:message textOnly="true" key="deactivate"/>' alt='<pos:message textOnly="true" key="deactivate"/>' border="0">
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
<logic:notEqual name="element" property="isActive" value="true">
|
||||
<html:link href="POSCustomerAction.do?action=activatePOSCustomer&bpartnerId=<%= bpartnerId %>">
|
||||
<html:link href="<%="POSCustomerAction.do?action=activatePOSCustomer&bpartnerId=" + bpartnerId%>">
|
||||
<img src="images/tango/edit-undo.png" title='<pos:message textOnly="true" key="activate"/>' alt='<pos:message textOnly="true" key="activate"/>' border="0">
|
||||
</html:link>
|
||||
</logic:notEqual>
|
||||
|
|
|
@ -138,22 +138,22 @@
|
|||
</td>
|
||||
|
||||
<td nowrap="nowrap" class="<%=styleClass%>">
|
||||
<html:link href="POSVendorAction.do?action=initEditVendor&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="POSVendorAction.do?action=initEditVendor&bpartnerId=" + element.getBpartnerId()%>">
|
||||
<img src="images/tango/accessories-text-editor.png" title='<%= editmsg %>' alt='<%=editmsg%>' border="0">
|
||||
</html:link>
|
||||
|
||||
<html:link href="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=" + element.getBpartnerId()%>">
|
||||
<img src="images/tango/edit-find.png" title='<%=viewmsg%>' alt='<%=viewmsg%>' border="0">
|
||||
</html:link>
|
||||
|
||||
<logic:equal name="element" property="isActive" value="true">
|
||||
<html:link href="POSVendorAction.do?action=deactivateVendor&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="POSVendorAction.do?action=deactivateVendor&bpartnerId=" + element.getBpartnerId()%>">
|
||||
<img src="images/tango/edit-redo.png" title='<%=deactivatemsg%>' alt='<%=deactivatemsg%>' border="0">
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
||||
<logic:notEqual name="element" property="isActive" value="true">
|
||||
<html:link href="POSVendorAction.do?action=activateVendor&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="POSVendorAction.do?action=activateVendor&bpartnerId=" + element.getBpartnerId()%>">
|
||||
<img src="images/tango/edit-undo.png" title='<%=activatemsg%>' alt='<%=activatemsg%>' border="0">
|
||||
</html:link>
|
||||
</logic:notEqual>
|
||||
|
|
|
@ -228,12 +228,12 @@
|
|||
<tr height="100%">
|
||||
<html:form action="/InventoryCartAction" styleId="inventoryForm" onsubmit="return false;">
|
||||
<html:hidden property="action" value="completeInventoryAdjustment"/>
|
||||
<html:hidden property="priceListId" value="<%= m_pricelist_id %>" styleId="priceListId"/>
|
||||
<html:hidden property="description" value="<%= description %>" styleId="invdescription"/>
|
||||
<html:hidden property="inventoryId" value="<%= inventoryId %>" styleId="inventoryId"/>
|
||||
<html:hidden property = "roundOffFactor" value = "<%= roundOffFactor %>" styleId = "roundOffFactor" />
|
||||
<input type="hidden" name="searchProductBy" value="<%= searchProductBy %>" id="searchProductBy"/>
|
||||
<input type="hidden" name="isCustomerCompulsory" value="<%= isCustomerCompulsory %>" id="isCustomerCompulsory"/>
|
||||
<html:hidden property="priceListId" value="<%=m_pricelist_id + ""%>" styleId="priceListId"/>
|
||||
<html:hidden property="description" value="<%=description + ""%>" styleId="invdescription"/>
|
||||
<html:hidden property="inventoryId" value="<%=inventoryId + ""%>" styleId="inventoryId"/>
|
||||
<html:hidden property = "roundOffFactor" value = "<%= roundOffFactor + ""%>" styleId = "roundOffFactor" />
|
||||
<input type="hidden" name="searchProductBy" value="<%=searchProductBy%>" id="searchProductBy"/>
|
||||
<input type="hidden" name="isCustomerCompulsory" value="<%=isCustomerCompulsory + ""%>" id="isCustomerCompulsory"/>
|
||||
<td width="75%" valign="top" height="100%">
|
||||
<div id="contentContainer">
|
||||
<div id="content">
|
||||
|
@ -431,8 +431,8 @@
|
|||
{
|
||||
try
|
||||
{
|
||||
document.applets[0].setPrinterName('<%= cookie.getValue() %>');
|
||||
var url = '<%=basePath %>InventoryCartAction.do?action=printInventory';
|
||||
document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
|
||||
var url = '<%=basePath + "InventoryCartAction.do?action=printInventory"%>';
|
||||
document.applets[0].printURL(url);
|
||||
}
|
||||
catch(e)
|
||||
|
@ -452,8 +452,8 @@
|
|||
{
|
||||
try
|
||||
{
|
||||
document.applets[0].setPrinterName('<%= cookie.getValue() %>');
|
||||
var url = '<%=basePath %>InventoryCartAction.do?action=printInventory';
|
||||
document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
|
||||
var url = '<%=basePath + "InventoryCartAction.do?action=printInventory"%>';
|
||||
document.applets[0].printURL(url);
|
||||
}
|
||||
catch(e)
|
||||
|
|
|
@ -187,7 +187,7 @@
|
|||
trStyleClass = "oddRow";
|
||||
}
|
||||
%>
|
||||
<tr class="<%=trStyleClass%> productId="<%=element.getProductId()%>" qty="<%=element.getQty()%>" id="row<%= (count.intValue()+1)%>">
|
||||
<tr class="<%=trStyleClass%> productId="<%=element.getProductId()%>" qty="<%=element.getQty()%>" id="<%= "row" + (count.intValue()+1)%>">
|
||||
<td>
|
||||
<bean:write name="element" property="description"/>
|
||||
</td>
|
||||
|
@ -232,7 +232,7 @@
|
|||
</logic:present>
|
||||
</tbody>
|
||||
<bean:size id="size" name="<%= Constants.SHOPPING_ORDER_CART_ITEMS %>"/>
|
||||
<tr class="itemsTotal" id="row<%= (size.intValue() + 1) %>">
|
||||
<tr class="itemsTotal" id="<%= "row" + (size.intValue() + 1) %>">
|
||||
<td> </td>
|
||||
<td><fmt:formatNumber value='${qtyTotal}'/></td>
|
||||
<td colspan="4"> </td>
|
||||
|
|
|
@ -99,9 +99,9 @@
|
|||
|
||||
<td class="<%=styleClass%>">
|
||||
<bean:define id="blackListedId" name="element" property="blackListedId"/>
|
||||
<html:link href="BlackListChequeAction.do?action=initEditCheque&blackListedId=<%= blackListedId %>">Edit</html:link>
|
||||
<html:link href="<%="BlackListChequeAction.do?action=initEditCheque&blackListedId="+ blackListedId%>">Edit</html:link>
|
||||
|
||||
<html:link href="BlackListChequeAction.do?action=deactivateCheque&blackListedId=<%= blackListedId %>">Delete</html:link>
|
||||
<html:link href="<%="BlackListChequeAction.do?action=deactivateCheque&blackListedId=" + blackListedId%>">Delete</html:link>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
%>
|
||||
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="CashLineReportAction.do?action=getCashLineDetails&cashId=<%= element.getCashId() %>">
|
||||
<html:link href="<%="CashLineReportAction.do?action=getCashLineDetails&cashId=" + element.getCashId() %>">
|
||||
<bean:write name="element" property="name"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -90,13 +90,13 @@
|
|||
<td class="<%=styleClass%>">
|
||||
<bean:define id="beginingBalance" name="element" property="beginingBalance"/>
|
||||
<fmt:formatNumber value='${beginingBalance}'type="currency" currencySymbol='${currSymbole}'/>
|
||||
<html:hidden property="beginingBalanceAsString" value="<%= beginingBalance.toString() %>"/>
|
||||
<html:hidden property="beginingBalanceAsString" value="<%=""+beginingBalance%>"/>
|
||||
</td>
|
||||
|
||||
<td class="<%=styleClass%>">
|
||||
<bean:define id="endingBalance" name="element" property="endingBalance"/>
|
||||
<fmt:formatNumber value='${endingBalance}' type="currency" currencySymbol='${currSymbole}'/>
|
||||
<html:hidden property="endingBalanceAsString" value="<%= endingBalance.toString() %>"/>
|
||||
<html:hidden property="endingBalanceAsString" value="<%=""+endingBalance%>"/>
|
||||
</td>
|
||||
|
||||
<td class="<%=styleClass%>">
|
||||
|
|
|
@ -172,8 +172,8 @@
|
|||
<script>
|
||||
function printTillData()
|
||||
{
|
||||
document.applets[0].setPrinterName('<%= cookie.getValue() %>');
|
||||
var url = '<%=basePath %>ClosePOSTillAction.do?action=getClosedTillData';
|
||||
document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
|
||||
var url = '<%=basePath + "ClosePOSTillAction.do?action=getClosedTillData"%>';
|
||||
document.applets[0].printURL(url);
|
||||
}
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
<bean:define id="title"><pos:message textOnly="true" key="smenu.credit.sales"/></bean:define>
|
||||
<table width="100%">
|
||||
<td align="right">
|
||||
<html:link href="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=<%= UDIOrderTypes.CREDIT_ORDER.getOrderType() %>">
|
||||
<html:link href="<%="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=" + UDIOrderTypes.CREDIT_ORDER.getOrderType() %>">
|
||||
Create New
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -41,13 +41,13 @@
|
|||
<table align="left" cellpadding="5" width="100%">
|
||||
<tr>
|
||||
<td colspan="3" align="right">
|
||||
<html:link href='PriceListAction.do?action=viewPriceList&isNext=false&priceListId=<%= priceListId %>'>
|
||||
<html:link href='<%="PriceListAction.do?action=viewPriceList&isNext=false&priceListId=" + priceListId%>'>
|
||||
<img src="images/tango/go-previous.png" title="Previous" alt="Previous" border="0">
|
||||
</html:link>
|
||||
<html:link href="PriceListAction.do?action=viewPriceList&isNext=true&priceListId=<%= priceListId %>">
|
||||
<html:link href="<%="PriceListAction.do?action=viewPriceList&isNext=true&priceListId=" + priceListId%>">
|
||||
<img src="images/tango/go-next.png" title="Next" alt="Next" border="0">
|
||||
</html:link>
|
||||
<html:link href="PriceListAction.do?action=viewPriceList&priceListId=0">
|
||||
<html:link href="<%="PriceListAction.do?action=viewPriceList&priceListId=0"%>">
|
||||
<img src="images/tango/document-new.png" title="Create PriceList" alt="Create PriceList" border="0">
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -56,11 +56,11 @@
|
|||
<bean:define id="productId" name="POSProductForm" property="productId" ></bean:define>
|
||||
<script>
|
||||
$('previousItem').onclick = function(e){
|
||||
get('POSProductAction.do?action=viewProduct&isNext=false&productId=<%= productId %>');
|
||||
get('<%="POSProductAction.do?action=viewProduct&isNext=false&productId=" + productId%>');
|
||||
};
|
||||
|
||||
$('nextItem').onclick = function(e){
|
||||
get('POSProductAction.do?action=viewProduct&isNext=true&productId=<%= productId %>');
|
||||
get('<%="POSProductAction.do?action=viewProduct&isNext=true&productId=" + productId%>');
|
||||
}
|
||||
|
||||
</script>
|
||||
|
@ -337,7 +337,7 @@
|
|||
|
||||
%>
|
||||
|
||||
<tr id="row<%= (index.intValue()+1) %>" class="<%=styleClass%>" onMouseOver="this.className='highlight'" onMouseOut="this.className='oddRow'"">
|
||||
<tr id="<%= "row" + (index.intValue()+1)%>" class="<%=styleClass%>" onMouseOver="this.className='highlight'" onMouseOut="this.className='oddRow'"">
|
||||
<td class="bold11" width="100">
|
||||
<bean:write name="productBean" property="priceListName"/>
|
||||
<logic:equal name="productBean" property="isMandatory" value="true">
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
<table>
|
||||
<tr>
|
||||
<td colspan="3" align="right">
|
||||
<html:link href="POSProductAction3.do?action=getCreateProductForm&productId=0">
|
||||
<html:link href="<%="POSProductAction3.do?action=getCreateProductForm&productId=0"%>">
|
||||
<img src="images/tango/document-new.png" title="Create Product" alt="Create Product" border="0">
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -191,7 +191,7 @@
|
|||
<html:hidden name="productBean" property="productId" value="<%=productBean.getProductId().toString()%>" indexed="true"/>
|
||||
<html:hidden name="productBean" property="priceListVersionId" value="<%=productBean.getPriceListVersionId().toString()%>" indexed="true"/>
|
||||
|
||||
<tr id="row<%= (index.intValue()+1) %>">
|
||||
<tr id="<%= "row" + (index.intValue()+1)%>">
|
||||
<td><bean:write name="productBean" property="priceListName"/>
|
||||
<logic:equal name="productBean" property="isMandatory" value="true">
|
||||
<mandatory>*</mandatory>
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
<!--
|
||||
<table width="100%">
|
||||
<td align="right">
|
||||
<html:link href="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=<%= UDIOrderTypes.POS_ORDER.getOrderType() %>">
|
||||
<html:link href="<%="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=" + UDIOrderTypes.POS_ORDER.getOrderType() %>">
|
||||
Create New
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -68,7 +68,7 @@
|
|||
<table>
|
||||
<tr>
|
||||
<td colspan="4" align="right">
|
||||
<html:link href="POSProductAction3.do?action=getCreateProductForm&productId=0">
|
||||
<html:link href="<%="POSProductAction3.do?action=getCreateProductForm&productId=0"%>">
|
||||
<img src="images/tango/document-new.png" title="Create Product" alt="Create Product" border="0">
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -206,7 +206,7 @@
|
|||
<html:hidden name="productBean" property="productId" value="<%=productBean.getProductId().toString()%>" indexed="true"/>
|
||||
<html:hidden name="productBean" property="priceListVersionId" value="<%=productBean.getPriceListVersionId().toString()%>" indexed="true"/>
|
||||
|
||||
<tr id="row<%= (index.intValue()+1)%>">
|
||||
<tr id="<%= "row" + (index.intValue()+1)%>">
|
||||
<td><bean:write name="productBean" property="priceListName"/>
|
||||
<logic:equal name="productBean" property="isMandatory" value="true">
|
||||
<mandatory>*</mandatory>
|
||||
|
|
|
@ -66,15 +66,15 @@ if(partner.getName2() != null)
|
|||
<td><bean:write name="element" property="date" format="dd/MM/yyyy"/></td>
|
||||
<td>
|
||||
<logic:equal value="Order" name="element" property="docType">
|
||||
<html:link action="/ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
|
||||
<html:link action="<%="/ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
|
||||
</logic:equal>
|
||||
|
||||
<logic:equal value="Payment" name="element" property="docType">
|
||||
<html:link action="/ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
|
||||
<html:link action="<%="/ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
|
||||
</logic:equal>
|
||||
|
||||
<logic:equal value="CashLine" name="element" property="docType">
|
||||
<html:link action="/ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=<%= element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
|
||||
<html:link action="<%="/ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=" + element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
|
||||
</logic:equal>
|
||||
</td>
|
||||
<td><bean:write name="element" property="details"/></td>
|
||||
|
|
|
@ -85,16 +85,17 @@
|
|||
<bean:define id="grandTotal" name="element" property="grandTotal"/>
|
||||
</td>
|
||||
<td class="<%=styleClass%>" align="right">
|
||||
<img src="images/pos/buttons/button_plus.gif" class="cartBtn" onclick="incrementCart(<%= element.getProductId() %>)">
|
||||
<img src="images/pos/buttons/button_plus.gif" class="cartBtn" onclick="<%="incrementCart("+element.getProductId()+")"%>">
|
||||
</td>
|
||||
|
||||
<td class="<%=styleClass%>" align="right">
|
||||
<img src="images/pos/buttons/button_minus.gif" class="cartBtn" onclick="decrementCart(<%= element.getProductId() %>)">
|
||||
<img src="images/pos/buttons/button_minus.gif" class="cartBtn" onclick="<%="decrementCart("+element.getProductId()+")"%>">
|
||||
</td>
|
||||
|
||||
|
||||
<td class="<%=styleClass%>" align="center">
|
||||
<html:link href="DeleteFromShoppingCartAction.do?action=deleteFromCustRetCart&productId=<%= element.getProductId()%>">X</html:link>
|
||||
<html:link href="<%="DeleteFromShoppingCartAction.do?action=deleteFromCustRetCart&productId="
|
||||
+ element.getProductId()%>">X</html:link>
|
||||
</td>
|
||||
</tr>
|
||||
</logic:iterate>
|
||||
|
|
|
@ -42,14 +42,14 @@
|
|||
<%@ include file="/jsp/include/errors.jsp" %>
|
||||
<div class="spacingSubmenu"/>
|
||||
<pos:message key="select"/>:<br>
|
||||
<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.TODAY %>" styleClass="submenu"><pos:message key="today"/></html:link><br>
|
||||
<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.CURRENT_WEEK %>" styleClass="submenu"><pos:message key="current.week"/></html:link><br>
|
||||
<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.LAST_2WEEKS %>" styleClass="submenu"><pos:message key="last.2.weeks"/></html:link><br>
|
||||
<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.LAST_3WEEKS %>" styleClass="submenu"><pos:message key="last.3.weeks"/></html:link><br>
|
||||
<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.CURRENT_MONTH %>" styleClass="submenu"><pos:message key="current.month"/></html:link><br>
|
||||
<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.LAST_3MONTHS %>" styleClass="submenu"><pos:message key="last.3.months"/></html:link><br>
|
||||
<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.LAST_6MONTHS %>" styleClass="submenu"><pos:message key="last.6.month"/></html:link><br>
|
||||
<html:link action="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod=<%= ReportDateManager.CURRENT_YEAR %>" styleClass="submenu"><pos:message key="current.year"/></html:link><br>
|
||||
<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.TODAY%>" styleClass="submenu"><pos:message key="today"/></html:link><br>
|
||||
<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.CURRENT_WEEK%>" styleClass="submenu"><pos:message key="current.week"/></html:link><br>
|
||||
<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.LAST_2WEEKS%>" styleClass="submenu"><pos:message key="last.2.weeks"/></html:link><br>
|
||||
<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.LAST_3WEEKS%>" styleClass="submenu"><pos:message key="last.3.weeks"/></html:link><br>
|
||||
<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.CURRENT_MONTH%>" styleClass="submenu"><pos:message key="current.month"/></html:link><br>
|
||||
<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.LAST_3MONTHS%>" styleClass="submenu"><pos:message key="last.3.months"/></html:link><br>
|
||||
<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.LAST_6MONTHS%>" styleClass="submenu"><pos:message key="last.6.month"/></html:link><br>
|
||||
<html:link action="<%="/CustomSalesReportAction.do?action=initCustomSalesReport&timePeriod="+ReportDateManager.CURRENT_YEAR%>" styleClass="submenu"><pos:message key="current.year"/></html:link><br>
|
||||
<html:link action="/CustomSalesReport.do" styleClass="submenu"><pos:message key="custom"/></html:link><br>
|
||||
|
||||
<%@ include file="/jsp/include/posFooter.jsp" %>
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
</logic:notPresent>
|
||||
<table width="100%">
|
||||
<td align="right">
|
||||
<html:link href="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=<%= UDIOrderTypes.CUSTOMER_RETURN_ORDER.getOrderType() %>">
|
||||
<html:link href="<%="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=" + UDIOrderTypes.CUSTOMER_RETURN_ORDER.getOrderType() %>">
|
||||
Create New
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -66,15 +66,15 @@ if(partner.getName2() != null)
|
|||
<td><bean:write name="element" property="date" format="dd/MM/yyyy"/></td>
|
||||
<td>
|
||||
<logic:equal value="Order" name="element" property="docType">
|
||||
<html:link action="/ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getDocId() %>"><bean:write name="element" property="reference"/></html:link>
|
||||
<html:link action="<%="/ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
|
||||
</logic:equal>
|
||||
|
||||
<logic:equal value="Payment" name="element" property="docType">
|
||||
<html:link action="/ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getDocId() %>"><bean:write name="element" property="reference"/></html:link>
|
||||
<html:link action="<%="/ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
|
||||
</logic:equal>
|
||||
|
||||
<logic:equal value="CashLine" name="element" property="docType">
|
||||
<html:link action="/ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=<%= element.getDocId() %>"><bean:write name="element" property="reference"/></html:link>
|
||||
<html:link action="<%="/ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=" + element.getDocId()%>"><bean:write name="element" property="reference"/></html:link>
|
||||
</logic:equal>
|
||||
</td>
|
||||
<td><bean:write name="element" property="details"/></td>
|
||||
|
|
|
@ -108,7 +108,7 @@
|
|||
<html:hidden property="orderType" value="<%=UDIOrderTypes.CREDIT_MEMO.getOrderType() %>"/>
|
||||
</logic:equal>
|
||||
<td class=<%=styleClass%> >
|
||||
<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>&isFullDetails=<%= isFullDetails %>">
|
||||
<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() + "&isFullDetails=" + isFullDetails %>">
|
||||
<bean:write name="element" property="documentNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -155,14 +155,14 @@
|
|||
%>
|
||||
|
||||
<logic:equal name="element" property="isCustomer" value="Yes">
|
||||
<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= partnerId %>">
|
||||
<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=" + partnerId %>">
|
||||
<bean:write name="element" property="partnerName"/>
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
||||
|
||||
<logic:equal name="element" property="isCustomer" value="No">
|
||||
<html:link href="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=<%= partnerId %>">
|
||||
<html:link href="<%="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=" + partnerId %>">
|
||||
<bean:write name="element" property="partnerName"/>
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
@ -209,14 +209,14 @@
|
|||
</a>
|
||||
</logic:equal>
|
||||
<logic:notEqual cookie="preference.printing" property="value" value="true">
|
||||
<html:link href="ReprintOrderAction.do?action=reprintOrder&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ReprintOrderAction.do?action=reprintOrder&orderId=" + element.getOrderId() %>">
|
||||
<pos:message key="reprint"/>
|
||||
</html:link>
|
||||
</logic:notEqual>
|
||||
</logic:present>
|
||||
|
||||
<logic:notPresent cookie="preference.printing">
|
||||
<html:link href="ReprintOrderAction.do?action=reprintOrder&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ReprintOrderAction.do?action=reprintOrder&orderId=" + element.getOrderId() %>">
|
||||
<pos:message key="reprint"/>
|
||||
</html:link>
|
||||
</logic:notPresent>
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
<bean:write name="<%= Constants.CURRENT_POS_ORDER_ID %>"/>
|
||||
</bean:define>
|
||||
$FElement('edit').onclick = function(){
|
||||
window.location ='GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId=<%= posOrderId %>';
|
||||
window.location ='<%="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId="+posOrderId%>';
|
||||
};
|
||||
</logic:present>
|
||||
|
||||
|
|
|
@ -89,7 +89,7 @@ $FElement('edit').onclick = function(e)
|
|||
<bean:define id="posOrderId">
|
||||
<bean:write name="<%= Constants.CUSTOMER_RETURN_ORDER_ID %>"/>
|
||||
</bean:define>
|
||||
window.location = 'GetShoppingCartForOrder.do?action=getCustomerReturnOrderShoppingCart2&orderId=<%= posOrderId %>';
|
||||
window.location = '<%="GetShoppingCartForOrder.do?action=getCustomerReturnOrderShoppingCart2&orderId="+posOrderId%>';
|
||||
</logic:present>
|
||||
};
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ $FElement('edit').onclick = function(e)
|
|||
<bean:define id="posOrderId">
|
||||
<bean:write name="<%= Constants.CUSTOMER_RETURN_ORDER_ID %>"/>
|
||||
</bean:define>
|
||||
window.location = 'GetShoppingCartForOrder.do?action=getCustomerReturnOrderShoppingCart&orderId=<%= posOrderId %>';
|
||||
window.location = '<%="GetShoppingCartForOrder.do?action=getCustomerReturnOrderShoppingCart&orderId="+posOrderId%>';
|
||||
</logic:present>
|
||||
};
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ $FElement('edit').onclick = function(e)
|
|||
<bean:define id="posOrderId">
|
||||
<bean:write name="<%= Constants.CUSTOMER_RETURN_ORDER_ID %>"/>
|
||||
</bean:define>
|
||||
window.location = 'GetShoppingCartForOrder.do?action=getCreditMemoShoppingCart&orderId=<%= posOrderId %>';
|
||||
window.location = '<%="GetShoppingCartForOrder.do?action=getCreditMemoShoppingCart&orderId="+posOrderId%>';
|
||||
</logic:present>
|
||||
};
|
||||
|
||||
|
|
|
@ -96,7 +96,7 @@
|
|||
|
||||
$FElement('edit').onclick = function(e)
|
||||
{
|
||||
window.location = "GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId=<%= posOrderId %>";
|
||||
window.location = "<%="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId="+posOrderId%>";
|
||||
};
|
||||
</logic:present>
|
||||
|
||||
|
|
|
@ -115,7 +115,7 @@ window.onload = function(e)
|
|||
</bean:define>
|
||||
$FElement('edit').onclick = function(e)
|
||||
{
|
||||
window.location = "GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId=<%= posOrderId %>";
|
||||
window.location = "<%="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId="+posOrderId%>";
|
||||
};
|
||||
</logic:present>
|
||||
|
||||
|
|
|
@ -108,7 +108,7 @@
|
|||
<logic:present name="orderType">
|
||||
<logic:present name="<%= Constants.CURRENT_POS_ORDER_ID %>">
|
||||
<bean:define id="posOrderId" name="<%= Constants.CURRENT_POS_ORDER_ID %>"/>
|
||||
<html:link href="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId=<%= posOrderId %>&orderType=<%= orderType %>">
|
||||
<html:link href="<%="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId="+posOrderId + "&orderType=" + orderType%>">
|
||||
<html:button property="btn" styleClass="edit smallbutton" accesskey="c"> </html:button>
|
||||
</html:link>
|
||||
</logic:present>
|
||||
|
@ -117,7 +117,7 @@
|
|||
<logic:notPresent name="orderType">
|
||||
<logic:present name="<%= Constants.CURRENT_POS_ORDER_ID %>">
|
||||
<bean:define id="posOrderId" name="<%= Constants.CURRENT_POS_ORDER_ID %>"/>
|
||||
<html:link href="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId=<%= posOrderId %>">
|
||||
<html:link href="<%="GetShoppingCartForOrder.do?action=getOrderShoppingCart&orderId="+posOrderId%>">
|
||||
<html:button property="btn" styleClass="edit smallbutton" accesskey="c"> </html:button>
|
||||
</html:link>
|
||||
</logic:present>
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
<bean:define id="title"><pos:message textOnly="true" key="goods.returned.note"/></bean:define>
|
||||
<table width="100%">
|
||||
<td align="right">
|
||||
<html:link href="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=<%= UDIOrderTypes.POS_GOODS_RETURN_NOTE.getOrderType() %>">
|
||||
<html:link href="<%="CreateNewOrderAction.do?action=removeSessionForNewOrder&orderType=" + UDIOrderTypes.POS_GOODS_RETURN_NOTE.getOrderType() %>">
|
||||
Create New
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -82,13 +82,13 @@
|
|||
</html:link>
|
||||
|
||||
<logic:equal name="row" property="isActive" value="true">
|
||||
<html:link href='SearchCashBookAction.do?action=deactivateCashBook&cashBookId=<%= ((CashBookBean)row).getCashBookId().intValue() %>' paramName="CashBookForm" paramId="searchText" paramProperty="searchText">
|
||||
<html:link href='<%="SearchCashBookAction.do?action=deactivateCashBook&cashBookId=" + ((CashBookBean)row).getCashBookId().intValue()%>' paramName="CashBookForm" paramId="searchText" paramProperty="searchText">
|
||||
<img src="images/tango/edit-redo.png" title="Deactivate CashBook" alt="Deactivate" border="0">
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
||||
<logic:notEqual name="row" property="isActive" value="true">
|
||||
<html:link href='SearchCashBookAction.do?action=activateCashBook&cashBookId=<%= ((CashBookBean)row).getCashBookId().intValue() %>' paramName="CashBookForm" paramId="searchText" paramProperty="searchText">
|
||||
<html:link href='<%="SearchCashBookAction.do?action=activateCashBook&cashBookId=" + ((CashBookBean)row).getCashBookId().intValue()%>' paramName="CashBookForm" paramId="searchText" paramProperty="searchText">
|
||||
<img src="images/tango/edit-undo.png" title="Activate CashBook" alt="Activate" border="0">
|
||||
</html:link>
|
||||
</logic:notEqual>
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
<bean:write name="currencyList" property="isActive"/>
|
||||
</td>
|
||||
<td align="center" class = "label">
|
||||
<html:link href="CurrencyAction.do?action=viewCurrency¤cyId=<%= currencyList.getCurrencyId() %>">
|
||||
<html:link href="<%="CurrencyAction.do?action=viewCurrency¤cyId=" + currencyList.getCurrencyId()%>">
|
||||
<img src="images/tango/accessories-text-editor.png" border="0">
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -108,23 +108,23 @@
|
|||
</td>
|
||||
|
||||
<td class="<%=styleClass%>" width="110px">
|
||||
<html:link href="POSUserAction.do?action=initEditUser&userId=<%= element.getUserId() %>">
|
||||
<html:link href="<%="POSUserAction.do?action=initEditUser&userId=" + element.getUserId()%>">
|
||||
<img src="images/tango/accessories-text-editor.png" title="Edit Customer" alt="Edit Customer" border="0">
|
||||
</html:link>
|
||||
|
||||
|
||||
<html:link href="POSUserAction.do?action=viewUser&userId=<%= element.getUserId() %>">
|
||||
<html:link href="<%="POSUserAction.do?action=viewUser&userId=" + element.getUserId()%>">
|
||||
<img src="images/tango/edit-find.png" title="View Customer" alt="View Customer" border="0">
|
||||
</html:link>
|
||||
|
||||
<logic:equal name="element" property="isActive" value="true">
|
||||
<html:link href="POSUserAction.do?action=deleteUser&userId=<%= element.getUserId() %>">
|
||||
<html:link href="<%="POSUserAction.do?action=deleteUser&userId=" + element.getUserId()%>">
|
||||
<img src="images/tango/edit-redo.png" title="Deactivate User" alt="User Customer" border="0">
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
||||
<logic:notEqual name="element" property="isActive" value="true">
|
||||
<html:link href="POSUserAction.do?action=activateUser&userId=<%= element.getUserId()%>">
|
||||
<html:link href="<%="POSUserAction.do?action=activateUser&userId=" + element.getUserId()%>">
|
||||
<img src="images/tango/edit-undo.png" title="Activate User" alt="Activate User" border="0">
|
||||
</html:link>
|
||||
</logic:notEqual>
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
</html:form>
|
||||
</td>
|
||||
<logic:notPresent name = "<%= Constants.IS_FROM_DELETE_PRODUCT_PRICE %>" >
|
||||
<td align = "right"><html:link href="PriceListAction.do?action=viewPriceList&priceListId=0">
|
||||
<td align = "right"><html:link href="<%="PriceListAction.do?action=viewPriceList&priceListId=0"%>">
|
||||
<img src="images/tango/document-new.png" border="0">
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -100,13 +100,13 @@
|
|||
</td>
|
||||
<td align="center" class = "label">
|
||||
<logic:present name = "<%= Constants.IS_FROM_DELETE_PRODUCT_PRICE %>">
|
||||
<html:link href="POSProductAction2.do?action=viewAllPOSProducts&isFromDeletePriceOnPriceList=true&priceListId=<%= priceList.getPriceListId() %>">
|
||||
<html:link href="<%="POSProductAction2.do?action=viewAllPOSProducts&isFromDeletePriceOnPriceList=true&priceListId=" + priceList.getPriceListId()%>">
|
||||
<img src="images/tango/edit-delete.png" border="0">
|
||||
</html:link>
|
||||
</logic:present>
|
||||
|
||||
<logic:notPresent name = "<%= Constants.IS_FROM_DELETE_PRODUCT_PRICE %>">
|
||||
<html:link href="PriceListAction.do?action=viewPriceList&priceListId=<%= priceList.getPriceListId().toString() %>">
|
||||
<html:link href="<%="PriceListAction.do?action=viewPriceList&priceListId=" + priceList.getPriceListId().toString()%>">
|
||||
<img src="images/tango/accessories-text-editor.png" border="0">
|
||||
</html:link>
|
||||
|
||||
|
@ -115,7 +115,7 @@
|
|||
</logic:equal>
|
||||
|
||||
<logic:equal name="priceList" property="isDefault" value="false">
|
||||
<html:link href="PriceListAction.do?action=setDefaultPriceList&priceListId=<%= priceList.getPriceListId().toString() %>">
|
||||
<html:link href="<%="PriceListAction.do?action=setDefaultPriceList&priceListId=" + priceList.getPriceListId().toString()%>">
|
||||
<img src="images/tango/edit-redo.png" border="0" title="Set Default Price List">
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
|
|
@ -97,19 +97,19 @@
|
|||
<bean:define id="name" name="element" property="name"/>
|
||||
</td>
|
||||
<td class="<%=styleClass%>" width="120px">
|
||||
<html:link href="POSRoleAction.do?action=initEditRole&roleId=<%= roleID %>">
|
||||
<html:link href="<%= "POSRoleAction.do?action=initEditRole&roleId=" + roleID %>">
|
||||
<img src="images/tango/accessories-text-editor.png" title="Edit Role" alt="Edit Role" border="0">
|
||||
</html:link>
|
||||
|
||||
<html:link href="POSRoleAction.do?action=viewRole&roleId=<%= roleID %>">
|
||||
<html:link href="<%= "POSRoleAction.do?action=viewRole&roleId=" + roleID %>">
|
||||
<img src="images/tango/edit-find.png" title="View Role" alt="View Role" border="0">
|
||||
</html:link>
|
||||
|
||||
<html:link href="RoleOrgAccessAction.do?action=initEditRoleOrgAccess&roleId=<%= roleID %>&name=<%= name %>">
|
||||
<html:link href="<%= "RoleOrgAccessAction.do?action=initEditRoleOrgAccess&roleId=" + roleID + "&name=" + name %>">
|
||||
<img src="images/tango/edit-find.png" title="Edit Organisation Access" alt="Edit Organisation Access" border="0">
|
||||
</html:link>
|
||||
|
||||
<%--<html:link href="POSRoleAction.do?action=deleteRole&roleId=<%= roleID %>">Delete</html:link>--%>
|
||||
<%--<html:link href="<%= "POSRoleAction.do?action=deleteRole&roleId=" + roleID %>">Delete</html:link>--%>
|
||||
</td>
|
||||
</tr>
|
||||
</logic:iterate>
|
||||
|
|
|
@ -99,18 +99,18 @@
|
|||
%>
|
||||
|
||||
<logic:equal name="row" property="isActive" value="true">
|
||||
<html:link href='SearchTerminalAction.do?action=deactivateTerminal&terminalId=<%= ((TerminalBean)row).getTerminalId().intValue() %>' paramName="TerminalForm" paramId="searchText" paramProperty="searchText">
|
||||
<html:link href='<%="SearchTerminalAction.do?action=deactivateTerminal&terminalId=" + ((TerminalBean)row).getTerminalId().intValue()%>' paramName="TerminalForm" paramId="searchText" paramProperty="searchText">
|
||||
<img src="images/tango/edit-redo.png" title="Deactivate Terminal" alt="Deactivate" border="0">
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
||||
<logic:notEqual name="row" property="isActive" value="true">
|
||||
<html:link href='SearchTerminalAction.do?action=activateTerminal&terminalId=<%= ((TerminalBean)row).getTerminalId().intValue() %>' paramName="TerminalForm" paramId="searchText" paramProperty="searchText">
|
||||
<html:link href='<%="SearchTerminalAction.do?action=activateTerminal&terminalId=" + ((TerminalBean)row).getTerminalId().intValue()%>' paramName="TerminalForm" paramId="searchText" paramProperty="searchText">
|
||||
<img src="images/tango/edit-undo.png" title="Activate Terminal" alt="Activate" border="0">
|
||||
</html:link>
|
||||
</logic:notEqual>
|
||||
<logic:notEqual name="row" property="isCurrentTerminal" value="true">
|
||||
<html:link href='SearchTerminalAction.do?action=updateCurrentTerminal&terminalId=<%= ((TerminalBean)row).getTerminalId().intValue() %>' paramName="TerminalForm" paramId="searchText" paramProperty="searchText">
|
||||
<html:link href='<%="SearchTerminalAction.do?action=updateCurrentTerminal&terminalId=" + ((TerminalBean)row).getTerminalId().intValue()%>' paramName="TerminalForm" paramId="searchText" paramProperty="searchText">
|
||||
<img src="images/tango/go-jump.png" title='<pos:message textOnly="true" key="UpdateCurrentPOSTerminal"/>' alt='<pos:message textOnly="true" key="UpdateCurrentPOSTerminal"/>' border="0">
|
||||
</html:link>
|
||||
</logic:notEqual>
|
||||
|
|
|
@ -222,7 +222,7 @@
|
|||
<html:hidden property="cardNo" value=""/>
|
||||
<html:hidden property="chequeNo" value=""/>
|
||||
<html:hidden property="discountOnTotal" styleId="discountOnTotal" value=""/>
|
||||
<html:hidden property="roundOffFactor" value = "<%= roundOffFactor.toString() %>" styleId="roundOffFactor"/>
|
||||
<html:hidden property="roundOffFactor" value = "<%=roundOffFactor + ""%>" styleId="roundOffFactor"/>
|
||||
<html:hidden property="isDiscountApplied" value="" styleId="isDiscountApplied"/>
|
||||
<logic:equal name="<%= Constants.DISCOUNT_ON_ORDER_TOTAL_PERCENT%>" value="true">
|
||||
<html:hidden property="discountOnTotalPercent" styleId="discountOnTotalPercent" value="true"/>
|
||||
|
@ -237,7 +237,7 @@
|
|||
<html:hidden property="discountOnTotal" styleId="discountOnTotal" value="false"/>
|
||||
</logic:equal>
|
||||
<input type="hidden" name="searchProductBy" value="<%=searchProductBy%>" id="searchProductBy"/>
|
||||
<input type="hidden" name="isCustomerCompulsory" value="<%= isCustomerCompulsory %>" id="isCustomerCompulsory"/>
|
||||
<input type="hidden" name="isCustomerCompulsory" value="<%=isCustomerCompulsory + ""%>" id="isCustomerCompulsory"/>
|
||||
<input type="hidden" id="bpartnerId" name="bpartnerId" value="<%=bPartnerId%>"/>
|
||||
<td width="75%" valign="top" height="100%">
|
||||
<div id="contentContainer">
|
||||
|
@ -704,7 +704,7 @@
|
|||
<script>
|
||||
function printOrder(orderId)
|
||||
{
|
||||
var url = "<%=basePath %>ReprintOrderAction.do?action=getPrintOrderData&openDrawer=false&orderId=";
|
||||
var url = '<%=basePath + "ReprintOrderAction.do?action=getPrintOrderData&openDrawer=false&orderId="%>';
|
||||
document.applets[0].printURL(url + orderId);
|
||||
}
|
||||
|
||||
|
|
|
@ -329,7 +329,7 @@
|
|||
try
|
||||
{
|
||||
|
||||
document.applets[0].setPrinterName(<%= cookie.getValue() %>');
|
||||
document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
|
||||
var url = '<%=basePath + "BarcodeAction.do?action=printProductBarcode"%>' + '&isPrintPrices=' + isPrintPrices + '&isPrintProductName=' + isPrintProductName + '&isPrintProductDescription=' + isPrintProductDescription;
|
||||
document.applets[0].printURL(url);
|
||||
}
|
||||
|
@ -361,8 +361,8 @@
|
|||
try
|
||||
{
|
||||
|
||||
document.applets[0].setPrinterName('<%= cookie.getValue() %>');
|
||||
var url = '<%=basePath %>BarcodeAction.do?action=printProductBarcode' + '&isPrintPrices=' + isPrintPrices + '&isPrintProductName=' + isPrintProductName + '&isPrintProductDescription=' + isPrintProductDescription;
|
||||
document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
|
||||
var url = '<%=basePath + "BarcodeAction.do?action=printProductBarcode"%>' + '&isPrintPrices=' + isPrintPrices + '&isPrintProductName=' + isPrintProductName + '&isPrintProductDescription=' + isPrintProductDescription;
|
||||
document.applets[0].printURL(url);
|
||||
}
|
||||
catch(e)
|
||||
|
|
|
@ -107,7 +107,7 @@
|
|||
<html:hidden property="action" value="addToShoppingCart"/>
|
||||
<html:hidden property="ifAdd" value="true"/>
|
||||
<html:hidden property="isSales" value="false"/>
|
||||
<html:hidden property="productId" value="<%= element.getProductId().toString() %>"/>
|
||||
<html:hidden property="productId" value="<%=element.getProductId()+""%>"/>
|
||||
<html:hidden property="bpartnerId" value=""/>
|
||||
<html:image property="btn" src="images/pos/buttons/button_plus.gif" onclick="this.form.submit();" style="width:28px;height:28px;border:0px"/>
|
||||
</html:form>
|
||||
|
@ -118,14 +118,15 @@
|
|||
<html:hidden property="action" value="addToShoppingCart"/>
|
||||
<html:hidden property="ifAdd" value="false"/>
|
||||
<html:hidden property="isSales" value="false"/>
|
||||
<html:hidden property="productId" value="<%= element.getProductId().toString() %>"/>
|
||||
<html:hidden property="productId" value="<%=element.getProductId()+""%>"/>
|
||||
<html:hidden property="bpartnerId" value=""/>
|
||||
<html:image property="btn" src="images/pos/buttons/button_minus.gif" onclick="this.form.submit();" style="width:28px;height:28px;border:0px"/>
|
||||
</html:form>
|
||||
</td>
|
||||
|
||||
<td class="<%=styleClass%>" align="center">
|
||||
<html:link href="DeleteFromShoppingCartAction.do?action=deleteFromPOSRetCart&productId=<%= element.getProductId() %>">X</html:link>
|
||||
<html:link href="<%="DeleteFromShoppingCartAction.do?action=deleteFromPOSRetCart&productId="
|
||||
+ element.getProductId()%>">X</html:link>
|
||||
</td>
|
||||
</tr>
|
||||
</logic:iterate>
|
||||
|
|
|
@ -142,26 +142,26 @@
|
|||
</tr>
|
||||
<logic:iterate indexId="count" id="element" name="<%=Constants.OPEN_ITEMS%>" type="org.posterita.beans.OpenItemBean">
|
||||
<tr>
|
||||
<%
|
||||
<%
|
||||
String styleClass = "";
|
||||
%>
|
||||
<logic:equal name="element" property="allocationStatus" value="<%=Constants.PAID%>">
|
||||
<%
|
||||
styleClass = "green";
|
||||
styleClass = "green";
|
||||
%>
|
||||
</logic:equal>
|
||||
|
||||
<logic:equal name="element" property="allocationStatus" value="<%=Constants.UNPAID%>">
|
||||
<%
|
||||
styleClass = "red";
|
||||
styleClass = "red";
|
||||
%>
|
||||
</logic:equal>
|
||||
|
||||
<logic:equal name="element" property="allocationStatus" value="<%=Constants.PARTIALLY_PAID%>">
|
||||
|
||||
<%
|
||||
styleClass = "yellow";
|
||||
%>
|
||||
styleClass = "yellow";
|
||||
%>
|
||||
|
||||
</logic:equal>
|
||||
|
||||
|
@ -170,35 +170,38 @@
|
|||
<logic:equal name="element" property="allocationStatus" value="<%=Constants.OVER_PAID%>">
|
||||
|
||||
<%
|
||||
styleClass = "blue";
|
||||
%>
|
||||
styleClass = "blue";
|
||||
%>
|
||||
|
||||
</logic:equal>
|
||||
<logic:lessThan name="element" property="openAmt" value="0">
|
||||
<%
|
||||
styleClass = "blue";
|
||||
styleClass = "blue";
|
||||
%>
|
||||
</logic:lessThan>
|
||||
<td class=<%=styleClass%> >
|
||||
<logic:notEqual name="element" property="allocationStatus" value="<%=Constants.PAID%>">
|
||||
|
||||
<logic:greaterThan name="element" property="openAmt" value="0">
|
||||
<html:link href="InitCreatePaymentAction.do?action=initCreatePayment&invoiceId=<%= element.getInvoiceId() %>&invoiceNo=<%= element.getInvoiceNo() %>&invoiceGrandTotal=<%= element.getInvoiceGrandTotal() %>&paidAmt=<%=element.getPaidAmt() %>&openAmt=<%= element.getOpenAmt() %>&discountAmt=<%= element.getDiscountAmt()%>">
|
||||
<html:link href="<%="InitCreatePaymentAction.do?action=initCreatePayment&invoiceId=" + element.getInvoiceId()+
|
||||
"&invoiceNo="+element.getInvoiceNo()+"&invoiceGrandTotal="+element.getInvoiceGrandTotal()+
|
||||
"&paidAmt="+element.getPaidAmt()+"&openAmt="+element.getOpenAmt()+
|
||||
"&discountAmt="+element.getDiscountAmt()%>">
|
||||
Pay
|
||||
|
||||
</html:link>
|
||||
</logic:greaterThan>
|
||||
</html:link>
|
||||
</logic:greaterThan>
|
||||
</logic:notEqual>
|
||||
</td>
|
||||
|
||||
<td class=<%=styleClass%> >
|
||||
<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getInvoiceId() %>">
|
||||
<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getInvoiceId() %>">
|
||||
<bean:write name="element" property="invoiceNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
||||
<td class=<%=styleClass%> >
|
||||
<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
|
||||
<bean:write name="element" property="documentNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -230,7 +233,7 @@
|
|||
</td>
|
||||
<td class=<%=styleClass%> >
|
||||
|
||||
<html:link href="ViewPaymentAllocationAction.do?action=getAllocationDetailsForPartner&invoiceNo=<%= element.getInvoiceNo() %>">
|
||||
<html:link href="<%="ViewPaymentAllocationAction.do?action=getAllocationDetailsForPartner&invoiceNo=" + element.getInvoiceNo()%>">
|
||||
<bean:write name="element" property="paidAmt"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -310,7 +313,7 @@
|
|||
<logic:iterate indexId="count" id="element" name="<%=Constants.UNALLOCATED_PAYMENTS%>" type="org.posterita.beans.OpenItemBean">
|
||||
<tr>
|
||||
<td>
|
||||
<html:link href="ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getPaymentId() %>">
|
||||
<html:link href="<%="ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getPaymentId() %>">
|
||||
<bean:write name="element" property="paymentId"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -207,7 +207,10 @@
|
|||
<logic:notEqual name="element" property="allocationStatus" value="<%=Constants.PAID%>">
|
||||
|
||||
<logic:greaterThan name="element" property="openAmt" value="0">
|
||||
<html:link href="InitCreatePaymentAction.do?action=initCreatePayment&invoiceId=<%= element.getInvoiceId() %>&invoiceNo=<%= element.getInvoiceNo() %>&invoiceGrandTotal=<%= element.getInvoiceGrandTotal() %>&paidAmt=<%= element.getPaidAmt() %>&openAmt=<%= element.getOpenAmt() %>&discountAmt=<%= element.getDiscountAmt()%>">
|
||||
<html:link href="<%="InitCreatePaymentAction.do?action=initCreatePayment&invoiceId=" + element.getInvoiceId()+
|
||||
"&invoiceNo="+element.getInvoiceNo()+"&invoiceGrandTotal="+element.getInvoiceGrandTotal()+
|
||||
"&paidAmt="+element.getPaidAmt()+"&openAmt="+element.getOpenAmt()+
|
||||
"&discountAmt="+element.getDiscountAmt()%>">
|
||||
Pay
|
||||
|
||||
</html:link>
|
||||
|
@ -216,13 +219,13 @@
|
|||
</td>
|
||||
|
||||
<td class=<%=styleClass%> >
|
||||
<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getInvoiceId() %>">
|
||||
<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getInvoiceId() %>">
|
||||
<bean:write name="element" property="invoiceNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
||||
<td class=<%=styleClass%> >
|
||||
<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
|
||||
<bean:write name="element" property="documentNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -254,7 +257,7 @@
|
|||
</td>
|
||||
<td class=<%=styleClass%> >
|
||||
|
||||
<html:link href="ViewPaymentAllocationAction.do?action=getAllocationDetailsForPartner&invoiceNo=<%= element.getInvoiceNo()%>">
|
||||
<html:link href="<%="ViewPaymentAllocationAction.do?action=getAllocationDetailsForPartner&invoiceNo=" + element.getInvoiceNo()%>">
|
||||
<bean:write name="element" property="paidAmt"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -334,7 +337,7 @@
|
|||
<logic:iterate indexId="count" id="element" name="<%=Constants.UNALLOCATED_PAYMENTS%>" type="org.posterita.beans.OpenItemBean">
|
||||
<tr>
|
||||
<td>
|
||||
<html:link href="ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getPaymentId() %>">
|
||||
<html:link href="<%="ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getPaymentId() %>">
|
||||
<bean:write name="element" property="paymentId"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -106,15 +106,15 @@
|
|||
</td>
|
||||
|
||||
<td class="<%=styleClass%>" align="right">
|
||||
<img src="images/pos/buttons/button_plus.gif" class="button" onclick="incrementCart(<%= element.getProductId() %>)">
|
||||
<img src="images/pos/buttons/button_plus.gif" class="button" onclick="<%="incrementCart("+element.getProductId()+")"%>">
|
||||
</td>
|
||||
|
||||
<td class="<%=styleClass%>" align="right">
|
||||
<img src="images/pos/buttons/button_minus.gif" class="button" onclick="decrementCart(<%= element.getProductId() %>)">
|
||||
<img src="images/pos/buttons/button_minus.gif" class="button" onclick="<%="decrementCart("+element.getProductId()+")"%>">
|
||||
</td>
|
||||
|
||||
<td class="<%=styleClass%>" align="right">
|
||||
<img src="images/pos/cross.gif" class="button" onclick="deleteItemFromCart(<%= element.getProductId() %>)">
|
||||
<img src="images/pos/cross.gif" class="button" onclick="<%="deleteItemFromCart("+element.getProductId()+")"%>">
|
||||
</td>
|
||||
|
||||
|
||||
|
|
|
@ -45,10 +45,10 @@
|
|||
<table align="left" cellpadding="5" width="100%">
|
||||
<tr>
|
||||
<td colspan="3" align="right">
|
||||
<html:link href='CurrencyAction.do?action=viewCurrency&isNext=false¤cyId=<%= currencyId %>'>
|
||||
<html:link href='<%="CurrencyAction.do?action=viewCurrency&isNext=false¤cyId=" + currencyId%>'>
|
||||
<img src="images/tango/go-previous.png" title="Previous" alt="Previous" border="0">
|
||||
</html:link>
|
||||
<html:link href="CurrencyAction.do?action=viewCurrency&isNext=true¤cyId=<%= currencyId %>">
|
||||
<html:link href="<%="CurrencyAction.do?action=viewCurrency&isNext=true¤cyId=" + currencyId%>">
|
||||
<img src="images/tango/go-next.png" title="Next" alt="Next" border="0">
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -90,37 +90,37 @@
|
|||
|
||||
<td class=<%=styleClass%>>
|
||||
|
||||
<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId="+ element.getBpartnerId() %>">
|
||||
<bean:write name="element" property="partnerName"/>
|
||||
</html:link>
|
||||
|
||||
</td>
|
||||
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
|
||||
<bean:write name="element" property="documentNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getInvoiceId() %>">
|
||||
<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getInvoiceId() %>">
|
||||
<bean:write name="element" property="invoiceNo"/>
|
||||
</html:link>
|
||||
|
||||
</td>
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getPaymentId() %>">
|
||||
<html:link href="<%="ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getPaymentId() %>">
|
||||
<bean:write name="element" property="paymentId"/>
|
||||
</html:link>
|
||||
|
||||
</td>
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=<%= element.getCashLineId() %>">
|
||||
<html:link href="<%="ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=" + element.getCashLineId() %>">
|
||||
<bean:write name="element" property="cashLineId"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getCreditMemoId() %>">
|
||||
<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getCreditMemoId() %>">
|
||||
<bean:write name="element" property="creditMemoNumber"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -210,7 +210,7 @@
|
|||
|
||||
<tr id="row<%=count%>" class="<%=styleClass%>" itemId="<%=element.getProductId()%>">
|
||||
<td style="color: #669ACF;">
|
||||
<html:link action="POSProductSalesAnalysisAction.do?action=viewProductSalesDetails&productId=<%= element.getProductId() %>">
|
||||
<html:link action="<%= "POSProductSalesAnalysisAction.do?action=viewProductSalesDetails&productId=" + element.getProductId() %>">
|
||||
<bean:write name="element" property="productName" filter="false"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -95,19 +95,19 @@
|
|||
</td>
|
||||
|
||||
<td class="<%=styleClass%>" align="center">
|
||||
<html:link href="InitEditPaymentTermAction.do?action=initEditPaymentTerm&paymentTermId=<%= element.getPaymentTermId() %>">
|
||||
<html:link href="<%="InitEditPaymentTermAction.do?action=initEditPaymentTerm&paymentTermId=" + element.getPaymentTermId()%>">
|
||||
<img src="images/tango/accessories-text-editor.png" title="Edit" alt="Edit" border="0">
|
||||
</html:link>
|
||||
|
||||
|
||||
<logic:equal name="element" property="isActive" value="true">
|
||||
<html:link href="ActivateDeactivatePaymentTermAction.do?action=deActivatePaymentTerm&paymentTermId=<%= element.getPaymentTermId() %>">
|
||||
<html:link href="<%="ActivateDeactivatePaymentTermAction.do?action=deActivatePaymentTerm&paymentTermId=" + element.getPaymentTermId()%>">
|
||||
<img src="images/tango/edit-redo.png" title="Deactivate" alt="Deactivate" border="0">
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
||||
<logic:notEqual name="element" property="isActive" value="true">
|
||||
<html:link href="ActivateDeactivatePaymentTermAction.do?action=activatePaymentTerm&paymentTermId=<%= element.getPaymentTermId() %>">
|
||||
<html:link href="<%="ActivateDeactivatePaymentTermAction.do?action=activatePaymentTerm&paymentTermId=" + element.getPaymentTermId()%>">
|
||||
<img src="images/tango/edit-undo.png" title="Activate" alt="Activate" border="0">
|
||||
</html:link>
|
||||
</logic:notEqual>
|
||||
|
|
|
@ -81,19 +81,19 @@
|
|||
</td>
|
||||
|
||||
<td class="<%=styleClass%>" width="10%" align="center">
|
||||
<html:link href="EditTaxAction.do?action=initEditTax&taxId=<%= element.getTaxId() %>">
|
||||
<html:link href="<%="EditTaxAction.do?action=initEditTax&taxId=" + element.getTaxId()%>">
|
||||
<img src="images/tango/accessories-text-editor.png" title="Edit" alt="Edit" border="0">
|
||||
</html:link>
|
||||
|
||||
|
||||
<logic:equal name="element" property="isActive" value="true">
|
||||
<html:link href="ActivateDeactivateTaxAction.do?action=deActivateTax&taxId=<%= element.getTaxId() %>">
|
||||
<html:link href="<%="ActivateDeactivateTaxAction.do?action=deActivateTax&taxId=" + element.getTaxId()%>">
|
||||
<img src="images/tango/edit-redo.png" title="Deactivate" alt="Deactivate" border="0">
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
||||
<logic:notEqual name="element" property="isActive" value="true">
|
||||
<html:link href="ActivateDeactivateTaxAction.do?action=activateTax&taxId=<%= element.getTaxId() %>">
|
||||
<html:link href="<%="ActivateDeactivateTaxAction.do?action=activateTax&taxId=" + element.getTaxId()%>">
|
||||
<img src="images/tango/edit-undo.png" title="Activate" alt="Activate" border="0">
|
||||
</html:link>
|
||||
</logic:notEqual>
|
||||
|
|
|
@ -48,13 +48,13 @@
|
|||
|
||||
<div>
|
||||
<logic:present name="<%=Constants.BUSINESSPARTNER%>">
|
||||
<html:link href="ViewPOSBPartnerInfo.do">
|
||||
<html:link href="<%="ViewPOSBPartnerInfo.do"%>">
|
||||
<pos:message key="back"/>
|
||||
</html:link>
|
||||
</logic:present>
|
||||
|
||||
<logic:present name="<%=Constants.DEBTORS%>">
|
||||
<html:link href="InitPrintDunningAction.do?action=initPrintDunning">
|
||||
<html:link href="<%="InitPrintDunningAction.do?action=initPrintDunning"%>">
|
||||
<pos:message key="back"/>
|
||||
</html:link>
|
||||
</logic:present>
|
||||
|
@ -157,7 +157,7 @@
|
|||
styleClass1 = "contentname";
|
||||
%>
|
||||
<td class=<%=styleClass1%>>
|
||||
<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
|
||||
<bean:write name="element" property="documentNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -86,7 +86,7 @@
|
|||
<bean:write name="element" property="periodAndCurrencyDesc"/>
|
||||
</td>
|
||||
<td class="<%=styleClass%>">
|
||||
<html:link href="ViewCommissionAction.do?action=viewCommissionDetails&commissionAmtId=<%= element.getCommissionAmtId() %>">
|
||||
<html:link href="<%="ViewCommissionAction.do?action=viewCommissionDetails&commissionAmtId="+element.getCommissionAmtId() %>">
|
||||
<bean:define id="convertedAmt" name="element" property="convertedAmt"/>
|
||||
<fmt:formatNumber value='${convertedAmt}' maxFractionDigits="2" type="currency" currencySymbol='${symbol}'/>
|
||||
</html:link>
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
<table class="main">
|
||||
<tr>
|
||||
<td>
|
||||
<html:link href="ViewCommissionAction.do?action=viewCommission">
|
||||
<html:link href="<%="ViewCommissionAction.do?action=viewCommission" %>">
|
||||
<pos:message key="back"/>
|
||||
</html:link>
|
||||
|
||||
|
@ -79,7 +79,7 @@
|
|||
|
||||
<logic:notEqual name="element" property="orderLineId" value="0">
|
||||
<td class=<%=styleClass%> >
|
||||
<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
|
||||
<bean:write name="element" property="reference"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -87,7 +87,7 @@
|
|||
|
||||
<logic:notEqual name="element" property="invoiceLineId" value="0">
|
||||
<td class=<%=styleClass%> >
|
||||
<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getInvoiceId() %>">
|
||||
<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getInvoiceId() %>">
|
||||
<bean:write name="element" property="reference"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -76,7 +76,7 @@
|
|||
styleClass = "contentname";
|
||||
%>
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="CreditorDebtorAction.do?action=getCreditorHistory&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="CreditorDebtorAction.do?action=getCreditorHistory&bpartnerId=" + element.getBpartnerId() %>">
|
||||
<bean:write name="element" property="partnerName"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -77,7 +77,7 @@
|
|||
%>
|
||||
<td class=<%=styleClass%>>
|
||||
|
||||
<html:link href="CreditorDebtorAction.do?action=getDebtorHistory&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="CreditorDebtorAction.do?action=getDebtorHistory&bpartnerId=" + element.getBpartnerId() %>">
|
||||
<bean:write name="element" property="partnerName"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -90,14 +90,14 @@
|
|||
%>
|
||||
|
||||
<logic:equal name="element" property="isCustomer" value="true">
|
||||
<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= partnerId %>">
|
||||
<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=" + partnerId %>">
|
||||
<bean:write name="element" property="partnerName"/>
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
||||
|
||||
<logic:equal name="element" property="isCustomer" value="false">
|
||||
<html:link href="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=<%= partnerId %>">
|
||||
<html:link href="<%="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=" + partnerId %>">
|
||||
<bean:write name="element" property="partnerName"/>
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
@ -112,19 +112,19 @@
|
|||
|
||||
<td class="<%=styleClass%>">
|
||||
|
||||
<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
|
||||
<bean:write name="element" property="documentNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
||||
<td align="left" class="<%=styleClass%>">
|
||||
<html:link href="ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getPaymentId() %>">
|
||||
<html:link href="<%="ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getPaymentId() %>">
|
||||
<bean:write name="element" property="paymentId"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
||||
<td align="left" class="<%=styleClass%>">
|
||||
<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getInvoiceId() %>">
|
||||
<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getInvoiceId() %>">
|
||||
<bean:write name="element" property="invoiceNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -132,7 +132,7 @@
|
|||
<logic:notPresent name="element" property="shipmentNo">
|
||||
<logic:present name="element" property="invoiceNo">
|
||||
<td align="left" class="<%=styleClass%>">
|
||||
<html:link href="CreateShipmentForCreditOrderAction.do?action=createShipmentForCreditOrder&invoiceId=<%= element.getInvoiceId() %>">
|
||||
<html:link href="<%="CreateShipmentForCreditOrderAction.do?action=createShipmentForCreditOrder&invoiceId=" + element.getInvoiceId() %>">
|
||||
Create Shipment
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -140,7 +140,7 @@
|
|||
</logic:notPresent>
|
||||
|
||||
<td align="left" class="<%=styleClass%>">
|
||||
<html:link href="ViewMinOutAction.do?action=viewOrder&documentId=<%= element.getMinOutId() %>">
|
||||
<html:link href="<%="ViewMinOutAction.do?action=viewOrder&documentId=" + element.getMinOutId() %>">
|
||||
<bean:write name="element" property="shipmentNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
|
||||
<td class=<%=styleClass%>>
|
||||
|
||||
<html:link href="ViewBPartnerTrxDetailsAction.do?action=getBpartnerTrxDetails&isCustomer=<%= element.getIsCustomer() %>&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="ViewBPartnerTrxDetailsAction.do?action=getBpartnerTrxDetails&isCustomer="+element.getIsCustomer()+"&bpartnerId=" + element.getBpartnerId() %>">
|
||||
<bean:write name="element" property="partnerName"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -101,7 +101,7 @@
|
|||
|
||||
<td class=<%=styleClass%>>
|
||||
|
||||
<html:link href="ViewBPartnerTrxDetailsAction.do?action=getBpartnerTrxDetails&isCustomer=<%= element.getIsCustomer() %>&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="ViewBPartnerTrxDetailsAction.do?action=getBpartnerTrxDetails&isCustomer="+element.getIsCustomer()+"&bpartnerId=" + element.getBpartnerId() %>">
|
||||
<bean:write name="element" property="partnerName"/>
|
||||
|
||||
</html:link>
|
||||
|
|
|
@ -196,7 +196,7 @@
|
|||
<bean:define id="bpartnerId" name="<%=Constants.CUSTOMER_DETAILS%>" property="bpartnerId"/>
|
||||
<bean:define id="partnerName" name="<%=Constants.CUSTOMER_DETAILS%>" property="partnerName"/>
|
||||
|
||||
<html:link href="GetBpartnerPaymentStatus.do?action=getBpartnerPaymentStatus&forward=/ViewPOSCustomer.do&bpartnerId=<%= bpartnerId %>&partnerName=<%= partnerName%>">
|
||||
<html:link href="<%="GetBpartnerPaymentStatus.do?action=getBpartnerPaymentStatus&forward=/ViewPOSCustomer.do&bpartnerId=" + bpartnerId+"&partnerName="+partnerName%>">
|
||||
<pos:message key="settle.payment"/>
|
||||
</html:link>
|
||||
|
||||
|
@ -204,7 +204,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<html:link href="ViewBPartnerTrxDetailsAction.do?action=getBpartnerTrxDetails&forward=/ViewPOSCustomer.do&isCustomer=true&bpartnerId=<%= bpartnerId %>">
|
||||
<html:link href="<%="ViewBPartnerTrxDetailsAction.do?action=getBpartnerTrxDetails&forward=/ViewPOSCustomer.do&isCustomer=true"+"&bpartnerId=" + bpartnerId %>">
|
||||
<pos:message key="view.info"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -218,7 +218,7 @@
|
|||
</table>
|
||||
<div align="right">
|
||||
|
||||
<html:button property="button" styleClass="blank smallbutton" onclick="get('POSCustomerAction.do?action=initEditPOSCustomer&bpartnerId=<%= bpartnerId %>">Edit</html:button>
|
||||
<html:button property="button" styleClass="blank smallbutton" onclick="<%= "get('POSCustomerAction.do?action=initEditPOSCustomer&bpartnerId=" + bpartnerId + "')" %>">Edit</html:button>
|
||||
<html:button property="button" styleClass="blank smallbutton" onclick="get('InitCreatePOSCustomer.do?action=initCreatePOSCustomer')">Add New</html:button>
|
||||
<html:button property="button" styleClass="blank smallbutton" onclick="get('ViewAllCustomers.do')">Back</html:button>
|
||||
</div>
|
||||
|
|
|
@ -119,7 +119,7 @@
|
|||
</logic:equal>
|
||||
</td>
|
||||
<td class="<%=styleClass%>">
|
||||
<a href="POSCustomerAction.do?action=remove&bpartnerId=<%= element.getBpartnerId() %>"><pos:message key="cart.remove"/></a>
|
||||
<a href="<%= "POSCustomerAction.do?action=remove&bpartnerId=" + element.getBpartnerId()%>"><pos:message key="cart.remove"/></a>
|
||||
</td>
|
||||
</tr>
|
||||
</logic:iterate>
|
||||
|
@ -132,7 +132,7 @@
|
|||
</logic:notEmpty>
|
||||
</logic:present>
|
||||
<div>
|
||||
<applet archive="<%= basePath %>applets/printOrderApplet.jar" code="org.posterita.core.PrintOrderApplet.class" width="0" height="0"></applet>
|
||||
<applet archive="<%= basePath + "applets/printOrderApplet.jar"%>" code="org.posterita.core.PrintOrderApplet.class" width="0" height="0"></applet>
|
||||
</div>
|
||||
|
||||
<logic:present cookie="preference.printing">
|
||||
|
@ -146,8 +146,8 @@
|
|||
try
|
||||
{
|
||||
|
||||
document.applets[0].setPrinterName('<%= cookie.getValue()%>');
|
||||
var url = '<%=basePath %>POSCustomerAction.do?action=generateCustomerBarcode';
|
||||
document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
|
||||
var url = '<%=basePath + "POSCustomerAction.do?action=generateCustomerBarcode"%>';
|
||||
document.applets[0].printURL(url);
|
||||
}
|
||||
catch(e)
|
||||
|
@ -168,8 +168,8 @@
|
|||
try
|
||||
{
|
||||
|
||||
document.applets[0].setPrinterName('<%= cookie.getValue() %>');
|
||||
var url = '<%=basePath %>POSCustomerAction.do?action=generateCustomerBarcode';
|
||||
document.applets[0].setPrinterName(<%="'" + cookie.getValue() + "'"%>);
|
||||
var url = '<%=basePath + "POSCustomerAction.do?action=generateCustomerBarcode"%>';
|
||||
document.applets[0].printURL(url);
|
||||
}
|
||||
catch(e)
|
||||
|
|
|
@ -90,7 +90,7 @@
|
|||
%>
|
||||
|
||||
<td class=<%=styleClass%> >
|
||||
<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
|
||||
<bean:write name="element" property="documentNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
@ -137,14 +137,14 @@
|
|||
%>
|
||||
|
||||
<logic:equal name="element" property="isCustomer" value="Yes">
|
||||
<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= partnerId %>">
|
||||
<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=" + partnerId %>">
|
||||
<bean:write name="element" property="partnerName"/>
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
||||
|
||||
<logic:equal name="element" property="isCustomer" value="No">
|
||||
<html:link href="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=<%= partnerId %>">
|
||||
<html:link href="<%="POSVendorAction.do?action=viewVendorDetails1&bpartnerId=" + partnerId %>">
|
||||
<bean:write name="element" property="partnerName"/>
|
||||
</html:link>
|
||||
</logic:equal>
|
||||
|
@ -185,14 +185,14 @@
|
|||
</a>
|
||||
</logic:equal>
|
||||
<logic:notEqual cookie="preference.printing" property="value" value="true">
|
||||
<html:link href="ReprintOrderAction.do?action=reprintOrder&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ReprintOrderAction.do?action=reprintOrder&orderId=" + element.getOrderId() %>">
|
||||
<pos:message key="reprint"/>
|
||||
</html:link>
|
||||
</logic:notEqual>
|
||||
</logic:present>
|
||||
|
||||
<logic:notPresent cookie="preference.printing">
|
||||
<html:link href="ReprintOrderAction.do?action=reprintOrder&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ReprintOrderAction.do?action=reprintOrder&orderId=" + element.getOrderId() %>">
|
||||
<pos:message key="reprint"/>
|
||||
</html:link>
|
||||
</logic:notPresent>
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
|
||||
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
|
||||
<bean:write name="element" property="documentNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -90,37 +90,37 @@
|
|||
|
||||
<td class=<%=styleClass%>>
|
||||
|
||||
<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= element.getBpartnerId() %>">
|
||||
<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId="+ element.getBpartnerId() %>">
|
||||
<bean:write name="element" property="partnerName"/>
|
||||
</html:link>
|
||||
|
||||
</td>
|
||||
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
|
||||
<bean:write name="element" property="documentNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getInvoiceId() %>">
|
||||
<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getInvoiceId() %>">
|
||||
<bean:write name="element" property="invoiceNo"/>
|
||||
</html:link>
|
||||
|
||||
</td>
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getPaymentId() %>">
|
||||
<html:link href="<%="ViewWebstorePaymentAction.do?action=viewOrder&documentId=" + element.getPaymentId() %>">
|
||||
<bean:write name="element" property="paymentId"/>
|
||||
</html:link>
|
||||
|
||||
</td>
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=<%= element.getCashLineId() %>">
|
||||
<html:link href="<%="ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=" + element.getCashLineId() %>">
|
||||
<bean:write name="element" property="cashLineId"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link href="ViewInvoiceAction.do?action=viewOrder&documentId=<%= element.getCreditMemoId() %>">
|
||||
<html:link href="<%="ViewInvoiceAction.do?action=viewOrder&documentId=" + element.getCreditMemoId() %>">
|
||||
<bean:write name="element" property="creditMemoNumber"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
</td>
|
||||
|
||||
<td>
|
||||
<html:link href="ViewWebstorePaymentAction.do?action=viewOrder&documentId=<%= element.getPaymentId() %>">
|
||||
<html:link href="<%="ViewWebstorePaymentAction.do?action=viewOrder&documentId="+ element.getPaymentId() %>">
|
||||
<bean:write name="element" property="paymentId"/>
|
||||
</html:link>
|
||||
|
||||
|
@ -137,7 +137,7 @@
|
|||
</td>
|
||||
|
||||
<td>
|
||||
<html:link href="ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=<%= element.getCashLineId() %>">
|
||||
<html:link href="<%="ViewWebstoreCashPaymentAction.do?action=viewOrder&documentId=" + element.getCashLineId() %>">
|
||||
<bean:write name="element" property="cashLineId"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -114,7 +114,7 @@
|
|||
</td>
|
||||
</td>
|
||||
<td align="right" class=<%=styleClass%>>
|
||||
<html:link action="ViewPOSProductCartAction.do?action=remove&productId=<%= element.getProductId() %>">Remove</html:link>
|
||||
<html:link action="<%= "ViewPOSProductCartAction.do?action=remove&productId=" + element.getProductId() %>">Remove</html:link>
|
||||
</td>
|
||||
</tr>
|
||||
</logic:iterate>
|
||||
|
|
|
@ -111,7 +111,7 @@
|
|||
<fmt:formatNumber value='${salesPriceStandard}' type="currency" currencySymbol=" "/>
|
||||
</td>
|
||||
<td class=<%=styleClass%> align="center">
|
||||
<html:link action="/ViewAllPOSProductsForUpdateAction.do?action=remove&productId=<%= element.getProductId() %>">
|
||||
<html:link action="<%="/ViewAllPOSProductsForUpdateAction.do?action=remove&productId=" + element.getProductId() %>">
|
||||
<pos:message key="Remove"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
<%@ include file="/jsp/include/errors.jsp" %>
|
||||
|
||||
<div>
|
||||
<html:link href="ViewAllPOSProduct.do">
|
||||
<html:link href="<%="ViewAllPOSProduct.do"%>">
|
||||
<pos:message key="back" textOnly="true"/>
|
||||
</html:link>
|
||||
</div>
|
||||
|
@ -126,7 +126,7 @@
|
|||
styleClass1 = "contentname";
|
||||
%>
|
||||
<td class=<%=styleClass1%>>
|
||||
<html:link href="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=<%= element.getOrderId() %>">
|
||||
<html:link href="<%="ViewPOSOrderAction.do?action=viewPOSOrders&orderId=" + element.getOrderId() %>">
|
||||
<bean:write name="element" property="documentNo"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -93,7 +93,7 @@
|
|||
|
||||
<tr>
|
||||
<td class=<%=styleClass%> width="400px">
|
||||
<html:link action="POSProductSalesAnalysisAction.do?action=viewProductSalesDetails&productId=<%= element.getProductId() %>">
|
||||
<html:link action="<%= "POSProductSalesAnalysisAction.do?action=viewProductSalesDetails&productId=" + element.getProductId() %>">
|
||||
<bean:write name="element" property="productName"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
%>
|
||||
<tr>
|
||||
<td class=<%=styleClass%>>
|
||||
<html:link action="POSProductSalesAnalysisAction.do?action=viewProductSalesDetails&productId=<%= element.getProductId() %>">
|
||||
<html:link action="<%= "POSProductSalesAnalysisAction.do?action=viewProductSalesDetails&productId=" + element.getProductId() %>">
|
||||
<bean:write name="element" property="productName"/>
|
||||
</html:link>
|
||||
</td>
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
<bean:write name="<%=Constants.WEB_DOCUMENT_HEADER_BEAN%>" property="from"/>
|
||||
</td>
|
||||
<td width="200px">
|
||||
<html:link href="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId=<%= partnerId %>">
|
||||
<html:link href="<%="POSCustomerAction.do?action=viewPOSCustomer&bpartnerId="+ partnerId %>">
|
||||
<c:out value='${you.name}'/>
|
||||
<c:out value='${you.name2}'/>
|
||||
</html:link>
|
||||
|
|
|
@ -79,15 +79,15 @@
|
|||
</td>
|
||||
|
||||
<td class="<%=styleClass%>">
|
||||
<html:link href="UserAction.do?action=initEditUser&userId=<%= element.getUserId()%>">Edit</html:link>
|
||||
<html:link href="<%="UserAction.do?action=initEditUser&userId=" + element.getUserId()%>">Edit</html:link>
|
||||
|
||||
<html:link href="UserAction.do?action=viewUser&userId=<%= element.getUserId()%>">View</html:link>
|
||||
<html:link href="<%="UserAction.do?action=viewUser&userId=" + element.getUserId()%>">View</html:link>
|
||||
|
||||
<logic:equal name="element" property="isActive" value="true">
|
||||
<html:link href="UserAction.do?action=deleteUser&userId=<%= element.getUserId()%>">Deactivate</html:link>
|
||||
<html:link href="<%="UserAction.do?action=deleteUser&userId=" + element.getUserId()%>">Deactivate</html:link>
|
||||
</logic:equal>
|
||||
<logic:notEqual name="element" property="isActive" value="true">
|
||||
<html:link href="UserAction.do?action=activateUser&userId=<%= element.getUserId()%>">Activate</html:link>
|
||||
<html:link href="<%="UserAction.do?action=activateUser&userId=" + element.getUserId()%>">Activate</html:link>
|
||||
</logic:notEqual>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
Loading…
Reference in New Issue