svn commit: r1128865 [25/27] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1128865 [25/27] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/buttons/Numbers.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/buttons/Numbers.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/buttons/Numbers.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/buttons/Numbers.ftl Sun May 29 11:02:09 2011 @@ -1,64 +0,0 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<div class="screenlet-body"> - <table class="tableButtons" cellspacing="5"> - <tr> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">1</a> - </td> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">2</a> - </td> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">3</a> - </td> - </tr> - <tr> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">4</a> - </td> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">5</a> - </td> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">6</a> - </td> - </tr> - <tr> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">7</a> - </td> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">8</a> - </td> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">9</a> - </td> - </tr> - <tr> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">0</a> - </td> - <td colspan="2"> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonReturn}</a> - </td> - </tr> - </table> -</div> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/buttons/Payment.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/buttons/Payment.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/buttons/Payment.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/buttons/Payment.ftl Sun May 29 11:02:09 2011 @@ -1,81 +0,0 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<table class="tableButtons" cellspacing="5"> - <tr> - <td> - <a href="<@ofbizUrl>AddPayCash</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayCash}</a> - </td> - <td> - <a href="<@ofbizUrl>AddPayCheck</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayCheck}</a> - </td> - <td> - <a href="<@ofbizUrl>AddPayGiftCard</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayGiftCard}</a> - </td> - </tr> - <tr> - <td> - <a href="<@ofbizUrl>AddPayCreditCard</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayCreditCard}</a> - </td> - <td> - <#if (totalDue = 0.00)> - <a href="<@ofbizUrl>PayFinish</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayFinish}</a> - <#else> - <span class="disabled">${uiLabelMap.WebPosButtonPayFinish}</span> - </#if> - </td> - <td> - <#if (totalPayments > 0.00)> - <a href="<@ofbizUrl>AddPaySetRef</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPaySetRef}</a> - <#else> - <span class="disabled">${uiLabelMap.WebPosButtonPaySetRef}</span> - </#if> - </td> - </tr> - <tr> - <td> - <#if (totalPayments > 0.00)> - <a href="<@ofbizUrl>AddClearPayment</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayClear}</a> - <#else> - <span class="disabled">${uiLabelMap.WebPosButtonPayClear}</span> - </#if> - </td> - <td> - <#if (totalPayments > 0.00)> - <a href="<@ofbizUrl>PayClearAll</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPayClearAll}</a> - <#else> - <span class="disabled">${uiLabelMap.WebPosButtonPayClearAll}</span> - </#if> - </td> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonMain}</a> - </td> - </tr> -</table> -<#if cart?has_content> - <#if (totalDue > 0.00)> - <div class="errorPosMessage"> - <p>${uiLabelMap.WebPosTransactionTotalDue} <@ofbizCurrency amount=totalDue isoCode=cart.getCurrency()/></p> - </div> - <#else> - <div class="errorPosMessage"> - <p>${uiLabelMap.WebPosCompleteSale}</p> - </div> - </#if> -</#if> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/buttons/Promo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/buttons/Promo.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/buttons/Promo.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/buttons/Promo.ftl Sun May 29 11:02:09 2011 @@ -1,36 +0,0 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<table class="tableButtons" cellspacing="5"> - <tr> - <td> - <#if isOpen?default(false) == true> - <a href="<@ofbizUrl>AddPromoCode</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonPromoCode}</a> - <#else> - <span class="disabled">${uiLabelMap.WebPosButtonPromoCode}</span> - </#if> - </td> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton">${uiLabelMap.WebPosButtonMain}</a> - </td> - <td> - <a href="<@ofbizUrl>main</@ofbizUrl>" class="posButton"> </a> - </td> - </tr> -</table> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/cart/MicroCart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/cart/MicroCart.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/cart/MicroCart.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/cart/MicroCart.ftl Sun May 29 11:02:09 2011 @@ -1,57 +0,0 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<div id="microCart"> - <#if (shoppingCartSize > 0)> - <table class="basic-table" cellspacing="1" cellpadding="2"> - <tr> - <td><b>${uiLabelMap.WebPosTransactionId}</b></td> - <td><b>${transactionId?default("NA")}</b></td> - <td><b>${(paymentCash.get("description", locale))?if_exists}</b></td> - <td align="right"><b><@ofbizCurrency amount=cashAmount isoCode=shoppingCart.getCurrency()/></b></td> - <td><b>${uiLabelMap.OrderSalesTax}</b></td> - <td align="right"><b><@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency()/></b></td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosDrawer}</b></td> - <td><b>${drawerNumber?default(0)}</b></td> - <td><b>${(paymentCheck.get("description", locale))?if_exists}</b></td> - <td align="right"><b><@ofbizCurrency amount=checkAmount isoCode=shoppingCart.getCurrency()/></b></td> - <td><b>${uiLabelMap.WebPosCartTotal}</b></td> - <td align="right"><b><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/></b></td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosEmployee}</b></td> - <td><b>${userLoginId?default("NA")}</b></td> - <td><b>${(paymentGift.get("description", locale))?if_exists}</b></td> - <td align="right"><b><@ofbizCurrency amount=giftAmount isoCode=shoppingCart.getCurrency()/></b></td> - <td colspan="2"> </td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosTransactionDate}</b></td> - <td><b>${transactionDate?default("NA")}</b></td> - <td><b>${(paymentCredit.get("description", locale))?if_exists}</b></td> - <td align="right"><b><@ofbizCurrency amount=creditAmount isoCode=shoppingCart.getCurrency()/></b></td> - <td><b>${uiLabelMap.WebPosTransactionTotalDue}</b></td> - <td align="right"><b><@ofbizCurrency amount=totalDue isoCode=shoppingCart.getCurrency()/></b></td> - </tr> - </table> - <#else> - - </#if> -</div> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl Sun May 29 11:02:09 2011 @@ -16,111 +16,135 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<script language="JavaScript" type="text/javascript"> - function toggle(e) { - e.checked = !e.checked; - } - - function checkToggle(e) { - var cform = document.cartform; - if (e.checked) { - var len = cform.elements.length; - var allchecked = true; - for (var i = 0; i < len; i++) { - var element = cform.elements[i]; - if (element.name == "selectedItem" && !element.checked) { - allchecked = false; - } - cform.selectAll.checked = allchecked; - } - } else { - cform.selectAll.checked = false; - } - } - - function toggleAll(e) { - var cform = document.cartform; - var len = cform.elements.length; - for (var i = 0; i < len; i++) { - var element = cform.elements[i]; - if (element.name == "selectedItem" && element.checked != e.checked) { - toggle(element); - } - } - } +<input type="hidden" id="selectedItem" name="selectedItem" value="${selectedItem?default(0)}"/> +<input type="hidden" id="cartSize" name="cartSize" value="${shoppingCartSize?default(0)}"/> - function removeSelected() { - var cform = document.cartform; - cform.removeSelected.value = true; - cform.submit(); - } -</script> -<div class="pos-cart-scroll"> - <table class="basic-table" cellspacing="0"> - <tr class="header-row"> - <td nowrap="nowrap"> </td> - <td nowrap="nowrap"><b>${uiLabelMap.OrderProduct}</b></td> - <td nowrap="nowrap"> </td> - <td nowrap="nowrap" align="center"><b>${uiLabelMap.CommonQuantity}</b></td> - <td nowrap="nowrap" align="right"><b>${uiLabelMap.WebPosUnitPrice}</b></td> - <td nowrap="nowrap" align="right"><b>${uiLabelMap.WebPosAdjustments}</b></td> - <td nowrap="nowrap" align="right"><b>${uiLabelMap.WebPosItemTotal}</b></td> - <td nowrap="nowrap" align="center"><input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);" /></td> +<#if (shoppingCartSize > 0)> +<div id="CartHeader"> + <table class="basic-table" cellspacing="1" cellpadding="1"> + <input type="hidden" id="totalDue" value="${totalDue}"/> + <input type="hidden" id="totalCash" value="${cashAmount}"/> + <input type="hidden" id="totalCheck" value="${checkAmount}"/> + <input type="hidden" id="totalGift" value="${giftAmount}"/> + <input type="hidden" id="totalCredit" value="${creditAmount}"/> + <input type="hidden" id="totalDueFormatted" value="<@ofbizCurrency amount=totalDue isoCode=shoppingCart.getCurrency()/>"/> + <input type="hidden" id="totalCashFormatted" value="<@ofbizCurrency amount=cashAmount isoCode=shoppingCart.getCurrency()/>"/> + <input type="hidden" id="totalCheckFormatted" value="<@ofbizCurrency amount=checkAmount isoCode=shoppingCart.getCurrency()/>"/> + <input type="hidden" id="totalGiftFormatted" value="<@ofbizCurrency amount=giftAmount isoCode=shoppingCart.getCurrency()/>"/> + <input type="hidden" id="totalCreditFormatted" value="<@ofbizCurrency amount=creditAmount isoCode=shoppingCart.getCurrency()/>"/> + <tr> + <td>${uiLabelMap.WebPosTransactionId}</td> + <td><b>${transactionId?default("NA")}</b></td> + <td>${(paymentCash.get("description", locale))?if_exists}</td> + <td align="right"><b><@ofbizCurrency amount=cashAmount isoCode=shoppingCart.getCurrency()/></b></td> + <td>${uiLabelMap.WebPosTotalItemSubTotal}</td> + <td align="right"><b><@ofbizCurrency amount=shoppingCart.getDisplaySubTotal() isoCode=shoppingCart.getCurrency()/></b></td> + </tr> + <tr> + <td>${uiLabelMap.WebPosDrawer}</td> + <td><b>${drawerNumber?default(0)}</b></td> + <td>${(paymentCheck.get("description", locale))?if_exists}</td> + <td align="right"><b><@ofbizCurrency amount=checkAmount isoCode=shoppingCart.getCurrency()/></b></td> + <td>${uiLabelMap.WebPosTotalPromotions}</td> + <td align="right"><b><@ofbizCurrency amount=shoppingCart.getOrderOtherAdjustmentTotal() isoCode=shoppingCart.getCurrency()/></b></td> + </tr> + <tr> + <td>${uiLabelMap.WebPosTerminal}</td> + <td><b><#if isOpen>${uiLabelMap.WebPosTerminalOpen}<#else>${uiLabelMap.WebPosTerminalClose}</#if></b></td> + <td>${(paymentGift.get("description", locale))?if_exists}</td> + <td align="right"><b><@ofbizCurrency amount=giftAmount isoCode=shoppingCart.getCurrency()/></b></td> + <td>${uiLabelMap.WebPosTotalSalesTax}</td> + <td align="right"><b><@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency()/></b></td> + </tr> + <tr> + <td></td> + <td></td> + <td>${(paymentCredit.get("description", locale))?if_exists}</td> + <td align="right"><b><@ofbizCurrency amount=creditAmount isoCode=shoppingCart.getCurrency()/></b></td> + <td>${uiLabelMap.WebPosTotalShipping}</td> + <td align="right"><b><@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency()/></b></td> + </tr> + <tr> + <td>${uiLabelMap.WebPosTransactionTotalDue}</td> + <td align="right"><b><@ofbizCurrency amount=totalDue isoCode=shoppingCart.getCurrency()/></b></td> + <td>${uiLabelMap.WebPosTransactionTotalPay}</td> + <td align="right"><b><@ofbizCurrency amount=totalPay isoCode=shoppingCart.getCurrency()/></b></td> + <td>${uiLabelMap.WebPosTotal}</td> + <td align="right"><b><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/></b></td> + </tr> + </table> +</div> +</#if> +<div id="Cart"> + <table class="basic-table" cellspacing="0"> + <thead class="CartHead"> + <tr class="header-row"> + <td nowrap><b>${uiLabelMap.OrderProduct}</b></td> + <td nowrap align="center"><b>${uiLabelMap.CommonQuantity}</b></td> + <td nowrap align="right"><b>${uiLabelMap.WebPosUnitPrice}</b></td> + <td nowrap align="right"><b>${uiLabelMap.WebPosAdjustments}</b></td> + <td nowrap align="right"><b>${uiLabelMap.WebPosItemTotal}</b></td> + <td nowrap align="center"><b>${uiLabelMap.CommonRemove}</b></td> + </tr> + </thead> + <#if (shoppingCartSize > 0)> + <tbody class="CartBody"> + <#-- set initial row color --> + <#assign alt_row = false> + <#list shoppingCart.items() as cartLine> + <#assign cartLineIndex = shoppingCart.getItemIndex(cartLine)> + <tr id="cartLine${cartLineIndex}" <#if alt_row>class="pos-cart-even"<#else>class="pos-cart-odd"</#if>> + <td> + <div> + <#if cartLine.getProductId()?exists> + <#-- product item --> + <#-- start code to display a small image of the product --> + <#if cartLine.getParentProductId()?exists> + <#assign parentProductId = cartLine.getParentProductId()/> + <#else> + <#assign parentProductId = cartLine.getProductId()/> + </#if> + <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists> + <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if> + <#if smallImageUrl?string?has_content> + <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" align="left" width="50" class="imageborder" border="0"/> + </#if> + <#-- end code to display a small image of the product --> + ${cartLine.getProductId()} - ${cartLine.getName()?if_exists} : ${cartLine.getDescription()?if_exists} + <#else> + <#-- this is a non-product item --> + <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists} + </#if> + </div> + </td> + <td nowrap align="center"> + ${cartLine.getQuantity()?string.number} + </td> + <td nowrap align="right"><div><@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency()/></div></td> + <td nowrap align="right"><div><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/></div></td> + <td nowrap align="right"><div><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/></div></td> + <td nowrap align="center"><a href="javascript:deleteCartItem('${cartLineIndex}');"><img src="/images/mini-trash.png" /></a></td> </tr> - <#if (shoppingCartSize > 0)> - <form method="post" action="<@ofbizUrl>ModifyCart</@ofbizUrl>" name="cartform"> - <input type="hidden" name="removeSelected" value="false" /> - <#assign itemsFromList = false> - <#-- set initial row color --> - <#assign alt_row = false> - <#list shoppingCart.items() as cartLine> - <#assign cartLineIndex = shoppingCart.getItemIndex(cartLine)> - <#-- show adjustment info --> - <#list cartLine.getAdjustments() as cartLineAdjustment> - <!-- cart line ${cartLineIndex} adjustment: ${cartLineAdjustment} --> - </#list> - <tr <#if alt_row>class="alternate-row pos-cart-hover-bar"<#else>class="pos-cart-hover-bar"</#if>> - <td> </td> - <td> - <div> - <#if cartLine.getProductId()?exists> - <#-- product item --> - <#-- start code to display a small image of the product --> - <#if cartLine.getParentProductId()?exists> - <#assign parentProductId = cartLine.getParentProductId()/> - <#else> - <#assign parentProductId = cartLine.getProductId()/> - </#if> - <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists> - <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if> - <#if smallImageUrl?string?has_content> - <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" align="left" width="50" class="imageborder" border="0" alt="" /> - </#if> - <#-- end code to display a small image of the product --> - ${cartLine.getProductId()} - ${cartLine.getName()?if_exists} : ${cartLine.getDescription()?if_exists} - <#else> - <#-- this is a non-product item --> - <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists} - </#if> - </div> - </td> - <td nowrap="nowrap" align="right"> - - </td> - <td nowrap="nowrap" align="center"> - <div> - <input size="6" type="text" name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}" /> - </div> - </td> - <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency()/></div></td> - <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/></div></td> - <td nowrap="nowrap" align="right"><div><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/></div></td> - <td nowrap="nowrap" align="center"><div><#if !cartLine.getIsPromo()><input type="checkbox" name="selectedItem" value="${cartLineIndex}" onclick="javascript:checkToggle(this);" /><#else> </#if></div></td> - </tr> - <#-- toggle the row color --> - <#assign alt_row = !alt_row> - </#list> - </form> - </#if> - </table> -</div> \ No newline at end of file + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + <tbody> + <tfoot class="CartFoot"> + <tr> + <td colspan="6"><b><hr/></b></td> + </tr> + <tr id="CartTotal"> + <td align="left"><b>${shoppingCartSize?default(0)}</b></td> + <td align="center"><b>${totalQuantity?default(0)}</b></td> + <td align="right"> </td> + <td align="right"> </td> + <td align="right"><b><@ofbizCurrency amount=shoppingCart.getDisplaySubTotal() isoCode=shoppingCart.getCurrency()/></b></td> + <td align="right"> </td> + </tr> + <tfoot> + </#if> + </table> +</div> +<script language="JavaScript" type="text/javascript"> + selectCartItem(); +</script> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/error/error.jsp URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/error/error.jsp?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/error/error.jsp (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/error/error.jsp Sun May 29 11:02:09 2011 @@ -16,37 +16,4 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --%> -<%@ page import="org.ofbiz.base.util.*" %> -<html> -<head> -<title>Open For Business Message</title> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -</head> - -<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %> - -<body bgcolor="#FFFFFF"> -<div align="center"> - <br/> - <table width="100%" border="1" height="200"> - <tr> - <td> - <table width="100%" border="0" height="200"> - <tr bgcolor="#CC6666"> - <td height="45"> - <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div> - </td> - </tr> - <tr> - <td> - <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div> - </td> - </tr> - </table> - </td> - </tr> - </table> -</div> -<div align="center"></div> -</body> -</html> +<%response.sendRedirect("control/error");%> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js Sun May 29 11:02:09 2011 @@ -16,78 +16,60 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. */ - -jQuery(document).ready( function() { - - // Autocompleter for good identification field - var productsIdent = []; - var productsIdIdent = []; - - jQuery( "#productGoodIdentification" ).autocomplete({ - minLength: 2, - source: function( request, response ) { - var term = request.term; - term = 'productGoodIdentification=' + term; - jQuery.ajax({ - url: "FindProductsByIdentification", - type: 'POST', - async: false, - data: term, - success: function(data) { - productsIdent = data.productsList; - productsIdIdent = data.productsId; - response( productsIdent ); - } - - }); - }, - select: function( event, ui ) { - var identValues = ui.item.value; +jQuery(document).ready(function() { + productToSearchFocus(); - jQuery.each(productsIdent, function(product) { - if (identValues == this) { - document.getElementById('add_product_id').value = productsIdIdent[product]; - return false; - } - }); + jQuery('#productToSearch').bind('keypress', function(event) { + code = event.keyCode ? event.keyCode : event.which; + if (code.toString() == 13) { + productSearch(); + return false; } }); - - // Autocompleter for search by field - jQuery('#searchBy').change( function(s) { - document.getElementById('add_product_id').value = ''; - document.getElementById('productToSearch').value = ''; - jQuery('#productToSearch').focus(); - }); - jQuery( "#productToSearch" ).autocomplete({ - minLength: 2, - source: function( request, response ) { - var term = request.term; - term = 'searchBy=' + document.getElementById('searchBy').value + '&productToSearch=' + term; - jQuery.ajax({ - url: "FindProducts", - async: false, - type: 'POST', - data: term, - success: function(data) { - products = data.productsList; - productsId = data.productsId; - response( products ); - } + jQuery('#searchBy').bind('change', function(event) { + productToSearchFocus(); + return false; + }); - }); + jQuery('#productSearchConfirm').bind('click', function(event) { + productSearch(); + return false; + }); +}); + +function productToSearchFocus() { + hideOverlayDiv(); + jQuery('#productToSearch').focus(); + return false; +} + +function productSearch() { + pleaseWait('Y'); + var param = 'goodIdentificationTypeId=' + jQuery('#goodIdentificationTypeId').val(); + if (jQuery('#searchBy').val() == "productName") { + param = param + '&searchByProductName=' + jQuery('#productToSearch').val(); + } else if (jQuery('#searchBy').val() == "productDescription") { + param = param + '&searchByProductDescription=' + jQuery('#productToSearch').val(); + } else if (jQuery('#searchBy').val() == "idValue") { + param = param + '&searchByProductIdValue=' + jQuery('#productToSearch').val(); + } + jQuery.ajax({url: 'FindProducts', + data: param, + type: 'post', + async: false, + success: function(data) { + var products = data.productsList; + // automatically add item to cart if returned only one product + if (products.length == 1) { + addItem(products[0].productId, '1', 'Y'); + } else { + buildProductsResults(products, 'Y'); + } }, - select: function( event, ui ) { - var productToSearchValues = ui.item.value; - - jQuery.each(products, function(product){ - if (productToSearchValues == this) { - document.getElementById('add_product_id').value = productsId[product]; - return false; - } - }); + error: function(data) { + alert("Error during product searching"); } }); - -}); \ No newline at end of file + pleaseWait('N'); +} \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/images/webpos.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/images/webpos.css?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/images/webpos.css (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/images/webpos.css Sun May 29 11:02:09 2011 @@ -40,61 +40,42 @@ under the License. } .tableButtons { - background-color: #FFFFF; - color: #FFFF00; width: 100%; height: 100%; } .tableButtons td { - background-color: #000099; - background-image: url(/images/gradient_sub_uns.gif); + border: 1px solid #0099CC; + background-color: #fece2f; background-repeat: repeat-x; - height: 1em; text-align: center; border-width: 2px; padding-left: 0.5em; height: 5em; width: 5em; -} - -.posButton, A.posButton, A.posButton:visited { - color: #ffff00; - font-size: 0.9em; - font-weight: bold; - padding-left: 0.2em; - padding-right: 0.5em; -} -A.posButton:hover { - color: #ffff00; } - -div#panel { - border: solid 2px #EBEFF7; - background-color: #CCFFFF; - padding: 10px; - top: 250px; - left: 200px; - position: absolute; - color: #333; +.pos-cart-odd { + background-color: white; overflow: auto; } - -div.pos-cart-scroll { - height: 370px; - width: 100%; +.pos-cart-odd:hover { + background-color: #FFFCCF; + cursor: pointer; +} +.pos-cart-even { + background-color: #eeeeee; overflow: auto; } - -.pos-cart-hover-bar:hover { +.pos-cart-even:hover { background-color: #FFFCCF; cursor: pointer; } - +.pos-cart-choose { + background: #fece2f 50% 50% repeat-x; +} .errorPosMessage { background-color: #FF0000; - border: solid #000000 0.1em; font-size: 1.1em; font-weight: bold; text-align: center; @@ -103,45 +84,356 @@ div.pos-cart-scroll { color: #FFFCCF; overflow: auto; } - -/* ===== Header Styles ===== */ -#webpos-header { - position: relative; - background: #ffffff; +#posButton { + list-style-type: none; + margin: 0; + padding: 0; +} +#posButton li { + margin: 2px; + padding: 1px; + float: left; + width: 60px; + height: 60px; + line-height: 10px; + font-size: 0.90em; + text-align: center; + overflow: hidden; +} +.notSelectedButton { + border: 1px solid #d19405; + background: #fece2f 50% 50% repeat-x; + font-weight: bold; + color: black; + outline: none; +} +.notSelectedButton a, .notSelectedButton a:link, .notSelectedButton a:visited, .notSelectedButton a:hover { + color: black; + text-decoration: none; + outline: none; +} +.selectedButton { + border: 1px solid #d19405; + background: #f39814 50% 50% repeat-x; + font-weight: bold; + color: white; + outline: none; +} +.selectedButton a, .selectedButton a:link, .selectedButton a:visited, .selectedButton a:hover { + color: white; + text-decoration: none; + outline: none; + cursor: hand; +} +.linkButton { + width: 60px; + height: 40px; + line-height: 10px; + font-size: 0.90em; + text-align: center; + overflow: hidden; +} +#posShortcut { + list-style-type: none; + margin: 0; + padding: 0; +} +#posShortcut li { + margin: 2px; + padding: 1px; + float: left; + width: 60px; + height: 60px; + line-height: 20px; + font-size: 0.90em; + text-align: center; +} +.notSelectedShortcut { + border: 1px solid #d19405; + background: #fece2f 50% 50% repeat-x; + font-weight: bold; + color: black; + outline: none; +} +.notSelectedShortcut a, .notSelectedShortcut a:link, .notSelectedShortcut a:visited, .notSelectedShortcut a:hover { + color: black; + text-decoration: none; + outline: none; +} +.selectedShortcut { + border: 1px solid #d19405; + background: #f39814 50% 50% repeat-x; + font-weight: bold; + color: white; + outline: none; +} +.selectedShortcut a, .selectedShortcut a:link, .selectedShortcut a:visited, .selectedShortcut a:hover { + color: white; + text-decoration: none; + outline: none; + cursor: hand; +} +input[type="text"]:focus, input[type="password"]:focus { + border: 1px solid #0099CC; + background: #FFFCCF; +} +#TopBar { + height: 130px; + width: 100%; +} +#TopBar .leftTopBar { + float: left; + width: 58%; +} +#TopBar .rightTopBar { + float: right; + width: 40%; +} +#centerTopBarLeft { + float: left; + margin-left: 5px; + margin-right: 5px; + width: auto; +} +#centerTopBarRight { + float: right; + margin-left: 5px; + margin-right:5px; + width: auto; +} +#SearchProducts { height: 100px; - voice-family: "\"}\""; - voice-family: inherit; } -#webpos-header #left { +#searchProductsResults { + border: solid 4px #0099CC; + background-color: #CCFFFF; position: absolute; top: 0px; - left: 0px; - width: 280px; -} -#webpos-header #middle { - margin-left: 290px; - margin-right: 210px; - padding-top: 10px; - width: auto; - text-align: center; + left: 25%; + width: 50%; + height: 280px; + overflow-x: hidden; + overflow-y: auto; +} +.searchProductsResultsHead { + height: 30px; +} +.searchProductsResultsCartBody { + height: 186px; + max-height: 186px; + overflow-x: hidden; + overflow-y: auto; } -#webpos-header #right { +#searchPartiesResults { + border: solid 4px #0099CC; + background-color: #CCFFFF; position: absolute; top: 0px; - right: 0px; - width: 200px; - padding: 0px; - margin-top: 20px; - text-align: right; -} -#webpos-header #middle { - margin-left: 290px; - margin-right: 210px; - padding-top: 10px; + right: 0%; + width: 65%; + height: 280px; + overflow-x: hidden; + overflow-y: auto; +} +.searchPartiesResultsHead { + height: 30px; +} +.searchPartiesResultsCartBody { + height: 168px; + max-height: 168px; + overflow-x: hidden; + overflow-y: auto; +} +#SearchSalesRepsList { + border: 1px solid #0099CC; + overflow: auto; + height: 120px; +} +#SearchSalesReps { + height: 110px; +} +#CustomerAddressList { + height: 120px; +} +#customerAddress { + border: 1px solid #0099CC; + overflow: auto; + height: 110px; +} +#billingAddressSelected { + color: white; +} +#shippingAddressSelected { + color: white; +} +.selectedAddress { + border: 1px solid #0099CC; + background-color: #fece2f; +} +#CenterBar { + margin-top: 33px; + height: auto; +} +.leftCenterBar { + float: left; + width: 24em; + margin-right: 1em; +} +.rightCenterBar { + float: right; + margin-left: 1em; + width: 24em; +} +.centerCenterBar { + margin-left: 24em; + margin-right: 24em; width: auto; - text-align: center; } -#webpos-header #middle-right { - margin-left: 290px; - width: auto; +#CartHeader { + height: 100px; + width: 100%; +} +#Cart { + height: 460px; + width: 100%; +} +.basic-table .CartHead { + height: 30px; +} +.basic-table .CartBody { + height: 400px; + overflow-x: hidden; + overflow-y: auto; +} +.basic-table .CartFoot { + height: 30px; +} +#CartItemSelected { + height: 130px; + overflow: auto; +} +#CartItemSelectedLeft { + float: left; +} +#CartItemSelectedRight { + float: right; +} +#chooseVariant { + border: solid 4px #0099CC; + background-color: #CCFFFF; + position: absolute; + top: 300px; + left: 40%; + width: 20%; + height: 280px; +} +#payCash { + border: solid 4px #0099CC; + background-color: #CCFFFF; + position: absolute; + top: 300px; + left: 40%; + width: 20%; + height: 180px; +} +#payCheck { + border: solid 4px #0099CC; + background-color: #CCFFFF; + position: absolute; + top: 300px; + left: 39%; + width: 22%; + height: 210px; +} +#payGiftCard { + border: solid 4px #0099CC; + background-color: #CCFFFF; + position: absolute; + top: 300px; + left: 38%; + width: 24%; + height: 210px; +} +#payCreditCard { + border: solid 4px #0099CC; + background-color: #CCFFFF; + position: absolute; + top: 300px; + left: 23%; + width: 54%; + height: 310px; +} +#payFinish { + border: solid 4px #0099CC; + background-color: #CCFFFF; + position: absolute; + top: 300px; + left: 40%; + width: 20%; + height: 110px; +} +#openTerminal { + border: solid 4px #0099CC; + background-color: #CCFFFF; + position: absolute; + top: 300px; + left: 38%; + width: 24%; + height: 130px; +} +#closeTerminal { + border: solid 4px #0099CC; + background-color: #CCFFFF; + position: absolute; + top: 300px; + left: 30%; + width: 40%; + height: 250px; +} +#paidOutAndIn { + border: solid 4px #0099CC; + background-color: #CCFFFF; + position: absolute; + top: 300px; + left: 30%; + width: 40%; + height: 200px; +} +#promo { + border: solid 4px #0099CC; + background-color: #CCFFFF; + position: absolute; + top: 300px; + left: 36%; + width: 28%; + height: 150px; +} +#voidOrder { + border: solid 4px #0099CC; + background-color: #CCFFFF; + position: absolute; + top: 300px; + left: 30%; + width: 40%; + height: 130px; +} +#editAddress { + border: solid 4px #0099CC; + background-color: #CCFFFF; + position: absolute; + top: 300px; + left: 20%; + width: 60%; + height: 200px; +} +#pleaseWait { + border: 1px solid #d19405; + background: #fece2f url(/images/ajax-loader.gif) no-repeat center left; + position: absolute; + top: 50px; + left: 85%; + width: 13%; + height: 20px; + text-align: center; + vertical-align: middle; } \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Footer.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Footer.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Footer.ftl Sun May 29 11:02:09 2011 @@ -1,34 +0,0 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()> - -<br /> -<div align="center"> - <a href="http://jigsaw.w3.org/css-validator/"><img style="border:0;width:88px;height:31px" src="<@ofbizContentUrl>/images/vcss.gif</@ofbizContentUrl>" alt="Valid CSS!"/></a> - <a href="http://validator.w3.org/check?uri=referer"><img style="border:0;width:88px;height:31px" src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a> -</div> -<br /> -<div align="center"> - <div>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" class="tabletext" target="_blank">www.apache.org</a></div> - <div>Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></div> -</div> -<br /> -</body> -</html> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Header.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Header.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Header.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Header.ftl Sun May 29 11:02:09 2011 @@ -20,53 +20,37 @@ under the License. <html xmlns="http://www.w3.org/1999/xhtml"> <#-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> --> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>: ${(productStore.storeName)?if_exists}</title> - <#if layoutSettings.shortcutIcon?has_content> - <link rel="shortcut icon" href="<@ofbizContentUrl>${layoutSettings.shortcutIcon}</@ofbizContentUrl>" /> - </#if> - <#if layoutSettings.javaScripts?has_content> - <#--layoutSettings.javaScripts is a list of java scripts. --> - <#list layoutSettings.javaScripts as javaScript> - <script language="javascript" src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script> - </#list> - </#if> - <#if layoutSettings.styleSheets?has_content> - <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.--> - <#list layoutSettings.styleSheets as styleSheet> - <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/> - </#list> - </#if> - - <#-- Append CSS for catalog --> - <#if catalogStyleSheet?exists> - <link rel="stylesheet" href="${catalogStyleSheet}" type="text/css"/> - </#if> - <#-- Append CSS for tracking codes --> - <#if sessionAttributes.overrideCss?exists> - <link rel="stylesheet" href="${sessionAttributes.overrideCss}" type="text/css"/> - </#if> - <#-- Meta tags if defined by the page action --> - <#if metaDescription?exists> - <meta name="description" content="${metaDescription}"/> - </#if> - <#if metaKeywords?exists> - <meta name="keywords" content="${metaKeywords}"/> - </#if> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>: ${(productStore.storeName)?if_exists}</title> + <#if layoutSettings.shortcutIcon?has_content> + <link rel="shortcut icon" href="<@ofbizContentUrl>${layoutSettings.shortcutIcon}</@ofbizContentUrl>" /> + </#if> + <#if layoutSettings.javaScripts?has_content> + <#--layoutSettings.javaScripts is a list of java scripts. --> + <#list layoutSettings.javaScripts as javaScript> + <script language="javascript" src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script> + </#list> + </#if> + <#if layoutSettings.styleSheets?has_content> + <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.--> + <#list layoutSettings.styleSheets as styleSheet> + <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/> + </#list> + </#if> + <#-- Append CSS for catalog --> + <#if catalogStyleSheet?exists> + <link rel="stylesheet" href="${catalogStyleSheet}" type="text/css"/> + </#if> + <#-- Append CSS for tracking codes --> + <#if sessionAttributes.overrideCss?exists> + <link rel="stylesheet" href="${sessionAttributes.overrideCss}" type="text/css"/> + </#if> + <#-- Meta tags if defined by the page action --> + <#if metaDescription?exists> + <meta name="description" content="${metaDescription}"/> + </#if> + <#if metaKeywords?exists> + <meta name="keywords" content="${metaKeywords}"/> + </#if> </head> - -<body> -<div id="webpos-header"> - <div id="left"> - <#if sessionAttributes.overrideLogo?exists> - <img src="<@ofbizContentUrl>${sessionAttributes.overrideLogo}</@ofbizContentUrl>" alt="Logo"/> - <#elseif catalogHeaderLogo?exists> - <img src="<@ofbizContentUrl>${catalogHeaderLogo}</@ofbizContentUrl>" alt="Logo"/> - <#elseif (productStore.headerLogo)?has_content> - <img src="<@ofbizContentUrl>${productStore.headerLogo}</@ofbizContentUrl>" alt="Logo"/> - </#if> - </div> - <div id="middle-right"> - ${screens.render("component://webpos/widget/WebPosScreens.xml#MicroCart")} - </div> -</div> \ No newline at end of file +<body> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Language.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Language.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Language.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Language.ftl Sun May 29 11:02:09 2011 @@ -1,39 +0,0 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<div id="choose-language" class="screenlet"> - <div class="screenlet-title-bar"> - <h3>${uiLabelMap.CommonLanguageTitle}</h3> - </div> - <div class="screenlet-body" style="text-align: center;"> - <form method="post" name="chooseLanguage" action="<@ofbizUrl>SetSessionLocale</@ofbizUrl>" style="margin: 0;"> - <select name="newLocale" style="width:95%" onchange="submit()"> - <#assign availableLocales = Static["org.ofbiz.base.util.UtilMisc"].availableLocales()/> - <#list availableLocales as availableLocale> - <#assign langAttr = availableLocale.toString()?replace("_", "-")> - <#assign langDir = "ltr"> - <#if "ar.iw"?contains(langAttr?substring(0, 2))> - <#assign langDir = "rtl"> - </#if> - <option lang="${langAttr}" dir="${langDir}" value="${availableLocale.toString()}"<#if locale.toString() = availableLocale.toString()> selected="selected"</#if>>${availableLocale.getDisplayName(availableLocale)}</option> - </#list> - </select> - </form> - </div> -</div> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl Sun May 29 11:02:09 2011 @@ -62,3 +62,5 @@ under the License. </#if> </div> </#if> + +<div id="errors" style="display:none" class="errorPosMessage"/> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/CloseTerminal.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/CloseTerminal.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/CloseTerminal.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/CloseTerminal.ftl Sun May 29 11:02:09 2011 @@ -16,45 +16,42 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - -<div id="panel"> - <form method="post" action="<@ofbizUrl>CloseTerminal</@ofbizUrl>" name="CloseTerminalForm"> - <table border="0"> - <tr> - <td colspan="2""> </td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosManagerCloseTerminalCashAmount}</b></td> - <td><input type="text" name="endingDrawerCashAmount" id="endingDrawerCashAmount" value="${parameters.endingDrawerCashAmount?default("")}"/></td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosManagerCloseTerminalCheckAmount}</b></td> - <td><input type="text" name="endingDrawerCheckAmount" id="endingDrawerCheckAmount" value="${parameters.endingDrawerCheckAmount?default("")}"/></td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosManagerCloseTerminalCcAmount}</b></td> - <td><input type="text" name="endingDrawerCcAmount" id="endingDrawerCcAmount" value="${parameters.endingDrawerCcAmount?default("")}"/></td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosManagerCloseTerminalGcAmount}</b></td> - <td><input type="text" name="endingDrawerGcAmount" id="endingDrawerGcAmount" value="${parameters.endingDrawerGcAmount?default("")}"/></td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosManagerCloseTerminalOtherAmount}</b></td> - <td><input type="text" name="endingDrawerOtherAmount" id="endingDrawerOtherAmount" value="${parameters.endingDrawerOtherAmount?default("")}"/></td> - </tr> - <tr> - <td colspan="2""> </td> - </tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" value="${uiLabelMap.CommonConfirm}" name="confirm"/> - <input type="submit" value="${uiLabelMap.CommonCancel}"/> - </td> - </tr> - </table> - </form> -</div> -<script language="javascript" type="text/javascript"> - document.CloseTerminalForm.endingDrawerCashAmount.focus(); -</script> \ No newline at end of file +<div id="closeTerminal" style="display:none"> + <table border="0" width="100%"> + <tr> + <td colspan="2""> </td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosManagerCloseTerminalCashAmount}</td> + <td width="50%" align="left"><input type="text" id="endingDrawerCashAmount" name="endingDrawerCashAmount" size="10" value=""/></td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosManagerCloseTerminalCheckAmount}</td> + <td width="50%" align="left"><input type="text" id="endingDrawerCheckAmount" name="endingDrawerCheckAmount" size="10" value=""/></td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosManagerCloseTerminalCcAmount}</td> + <td width="50%" align="left"><input type="text" id="endingDrawerCcAmount" name="endingDrawerCcAmount" size="10" value=""/></td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosManagerCloseTerminalGcAmount}</td> + <td width="50%" align="left"><input type="text" id="endingDrawerGcAmount" name="endingDrawerGcAmount" size="10" value=""/></td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosManagerCloseTerminalOtherAmount}</td> + <td width="50%" align="left"><input type="text" id="endingDrawerOtherAmount" name="endingDrawerOtherAmount" size="10" value=""/></td> + </tr> + <tr> + <td colspan="2""> </td> + </tr> + <tr> + <td colspan="2" align="center"> + <input type="submit" value="${uiLabelMap.CommonConfirm}" id="closeTerminalConfirm"/> + <input type="submit" value="${uiLabelMap.CommonCancel}" id="closeTerminalCancel"/> + </td> + </tr> + <tr> + <td colspan="2"><div class="errorPosMessage"><span id="closeTerminalFormServerError"/></div></td> + </tr> + </table> +</div> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/ModifyPrice.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/ModifyPrice.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/ModifyPrice.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/ModifyPrice.ftl Sun May 29 11:02:09 2011 @@ -1,49 +0,0 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<div id="panel"> - <form method="post" action="<@ofbizUrl>ModifyPrice</@ofbizUrl>" name="ModifyPriceForm"> - <table border="0"> - <tr> - <td colspan="2""> </td> - </tr> - - <tr> - <td><b>${uiLabelMap.WebPosManagerModifyPriceSku}</b></td> - <td><input type="text" name="sku" id="sku"/></td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosManagerModifyPriceNewPrice}</b></td> - <td><input type="text" name="price" id="price" value="${parameters.price?default("")}"/></td> - </tr> - <tr> - <td colspan="2""> </td> - </tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" value="${uiLabelMap.CommonConfirm}" name="confirm"/> - <input type="submit" value="${uiLabelMap.CommonCancel}"/> - </td> - </tr> - </table> - </form> -</div> -<script language="javascript" type="text/javascript"> - document.ModifyPriceForm.sku.focus(); -</script> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/OpenTerminal.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/OpenTerminal.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/OpenTerminal.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/OpenTerminal.ftl Sun May 29 11:02:09 2011 @@ -16,29 +16,26 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - -<div id="panel"> - <form method="post" action="<@ofbizUrl>OpenTerminal</@ofbizUrl>" name="OpenTerminalForm"> - <table border="0"> - <tr> - <td colspan="2""> </td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosManagerOpenTerminalDrawingAmount}</b></td> - <td><input type="text" name="startingDrawerAmount" id="startingDrawerAmount" value="${parameters.startingDrawerAmount?default("")}"/></td> - </tr> - <tr> - <td colspan="2""> </td> - </tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" value="${uiLabelMap.CommonConfirm}" name="confirm"/> - <input type="submit" value="${uiLabelMap.CommonCancel}"/> - </td> - </tr> - </table> - </form> -</div> -<script language="javascript" type="text/javascript"> - document.OpenTerminalForm.startingDrawerAmount.focus(); -</script> \ No newline at end of file +<div id="openTerminal" style="display:none"> + <table border="0" width="100%"> + <tr> + <td colspan="2""> </td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosManagerOpenTerminalDrawingAmount}</td> + <td width="50%" align="left"><input type="text" id="startingDrawerAmount" name="startingDrawerAmount" size="10" value=""/></td> + </tr> + <tr> + <td colspan="2""> </td> + </tr> + <tr> + <td colspan="2" align="center"> + <input type="submit" value="${uiLabelMap.CommonConfirm}" id="openTerminalConfirm"/> + <input type="submit" value="${uiLabelMap.CommonCancel}" id="openTerminalCancel"/> + </td> + </tr> + <tr> + <td colspan="2"><div class="errorPosMessage"><span id="openTerminalFormServerError"/></div></td> + </tr> + </table> +</div> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl Sun May 29 11:02:09 2011 @@ -16,49 +16,53 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - -<div id="panel"> - <form method="post" action="<@ofbizUrl>PaidOutAndIn</@ofbizUrl>" name="PaidOutAndInForm"> - <table border="0"> - <tr> - <td colspan="2""> <input type="hidden" name="type" value="${parameters.type?default('IN')}"/></td> - </tr> - <tr> - <td><b><#if 'IN' == parameters.type?default('IN')>${uiLabelMap.WebPosManagerPaidInAmount}<#else>${uiLabelMap.WebPosManagerPaidOutAmount}</#if></b></td> - <td><input type="text" name="amountInOut" id="amountInOut" value="${parameters.amountInOut?default("")}"/></td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosManagerPaidOutAndIndReason}</b></td> - <td> - <select name="reasonInOut" id="reasonInOut"> - <#if 'IN' == parameters.type?default('IN')> - <#list paidReasonIn as reason> - <option value="${reason.enumId}">${reason.get("description", locale)?default(reason.enumId)}</option> - </#list> - <#else> - <#list paidReasonOut as reason> - <option value="${reason.enumId}">${reason.get("description", locale)?default(reason.enumId)}</option> - </#list> - </#if> - </select> - </td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosManagerPaidOutAndIndReasonComment}</b></td> - <td><input type="text" name="reasonCommentInOut" id="reasonCommentInOut" value="${parameters.reasonCommentInOut?default("")}"/></td> - </tr> - <tr> - <td colspan="2""> </td> - </tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" value="${uiLabelMap.CommonConfirm}" name="confirm"/> - <input type="submit" value="${uiLabelMap.CommonCancel}"/> - </td> - </tr> - </table> - </form> -</div> -<script language="javascript" type="text/javascript"> - document.PaidOutAndInForm.amountInOut.focus(); -</script> \ No newline at end of file +<div id="paidOutAndIn" style="display:none"> + <input type="hidden" id="paidType" name="type"/> + <table border="0" width="100%"> + <tr> + <td colspan="2""> </td> + </tr> + <tr> + <td width="50%" align="right"> + <span id="amountPaidIn" style="display:none">${uiLabelMap.WebPosManagerPaidInAmount}</span> + <span id="amountPaidOut" style="display:none">${uiLabelMap.WebPosManagerPaidOutAmount}</span> + </td> + <td width="50%" align="left"><input type="text" id="amountInOut" name="amountInOut" value=""/></td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosManagerPaidOutAndIndReason}</td> + <td width="50%" align="left"> + <div id="reasonIn" style="display:none"> + <select id="reasIn" name="reasonIn"> + <#list paidReasonIn as reason> + <option value="${reason.enumId}">${reason.get("description", locale)?default(reason.enumId)}</option> + </#list> + </select> + </div> + <div id="reasonOut" style="display:none"> + <select id="reasOut" name="reasonOut"> + <#list paidReasonOut as reason> + <option value="${reason.enumId}">${reason.get("description", locale)?default(reason.enumId)}</option> + </#list> + </select> + </div> + </td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosManagerPaidOutAndIndReasonComment}</td> + <td width="50%" align="left"><input type="text" id="reasonCommentInOut" name="reasonCommentInOut" value=""/></td> + </tr> + <tr> + <td colspan="2""> </td> + </tr> + <tr> + <td colspan="2" align="center"> + <input type="submit" value="${uiLabelMap.CommonConfirm}" id="paidOutAndInConfirm"/> + <input type="submit" value="${uiLabelMap.CommonCancel}" id="paidOutAndInCancel"/> + </td> + </tr> + <tr> + <td colspan="2"><div class="errorPosMessage"><span id="paidOutAndInFormServerError"/></div></td> + </tr> + </table> +</div> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/VoidOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/VoidOrder.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/VoidOrder.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/manager/VoidOrder.ftl Sun May 29 11:02:09 2011 @@ -16,29 +16,26 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - -<div id="panel"> - <form method="post" action="<@ofbizUrl>VoidOrder</@ofbizUrl>" name="VoidOrderForm"> - <table border="0"> - <tr> - <td colspan="2""> </td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosManagerVoidOrder}</b></td> - <td><input type="text" name="orderId" id="orderId"/></td> - </tr> - <tr> - <td colspan="2""> </td> - </tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" value="${uiLabelMap.CommonConfirm}" name="confirm"/> - <input type="submit" value="${uiLabelMap.CommonCancel}"/> - </td> - </tr> - </table> - </form> -</div> -<script language="javascript" type="text/javascript"> - document.VoidOrderForm.orderId.focus(); -</script> \ No newline at end of file +<div id="voidOrder" style="display:none"> + <table border="0" width="100%"> + <tr> + <td colspan="2""> </td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosManagerVoidOrderNumber}</td> + <td width="50%" align="left"><input type="text" id="orderId" name="orderId" size="10" value=""/></td> + </tr> + <tr> + <td colspan="2""> </td> + </tr> + <tr> + <td colspan="2" align="center"> + <input type="submit" value="${uiLabelMap.CommonConfirm}" id="voidOrderConfirm"/> + <input type="submit" value="${uiLabelMap.CommonCancel}" id="voidOrderCancel"/> + </td> + </tr> + <tr> + <td colspan="2"><div class="errorPosMessage"><span id="voidOrderFormServerError"/></div></td> + </tr> + </table> +</div> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl Sun May 29 11:02:09 2011 @@ -1,66 +0,0 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<div id="panel"> - <form method="post" action="<@ofbizUrl>ClearPayment</@ofbizUrl>" name="ClearPaymentForm"> - <table border="0"> - <tr> - <td> </td> - <td> </td> - <td><b><u>${uiLabelMap.WebPosPageTitlePayClear}</u></b></td> - </tr> - <#if (cashAmount?default(0) > 0.00)> - <tr> - <td><b>${(paymentCash.get("description", locale))?if_exists}</b></td> - <td align="right"><@ofbizCurrency amount=cashAmount isoCode=shoppingCart.getCurrency()/></td> - <td align="center"><input type="checkbox" name="clearCash" value="Y" checked="checked" /></td> - </tr> - </#if> - <#if (checkAmount?default(0) > 0.00)> - <tr> - <td><b>${(paymentCheck.get("description", locale))?if_exists}</b></td> - <td align="right"><@ofbizCurrency amount=checkAmount isoCode=shoppingCart.getCurrency()/></td> - <td align="center"><input type="checkbox" name="clearCheck" value="Y" checked="checked" /></td> - </tr> - </#if> - <#if (giftAmount?default(0) > 0.00)> - <tr> - <td><b>${(paymentGift.get("description", locale))?if_exists}</b></td> - <td align="right"><@ofbizCurrency amount=giftAmount isoCode=shoppingCart.getCurrency()/></td> - <td align="center"><input type="checkbox" name="clearGift" value="Y" checked="checked" /></td> - </tr> - </#if> - <#if (creditAmount?default(0) > 0.00)> - <tr> - <td><b>${(paymentCredit.get("description", locale))?if_exists}</b></td> - <td align="right"><@ofbizCurrency amount=creditAmount isoCode=shoppingCart.getCurrency()/></td> - <td align="center"><input type="checkbox" name="clearCredit" value="Y" checked="checked" /></td> - </tr> - </#if> - <tr> - <td colspan="3"> </td> - </tr> - <tr> - <td colspan="3" align="center"> - <input type="submit" value="${uiLabelMap.CommonConfirm}" name="confirm"/> - <input type="submit" value="${uiLabelMap.CommonCancel}"/> - </td> - </tr> - </table> - </form> -</div> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayCash.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayCash.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayCash.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayCash.ftl Sun May 29 11:02:09 2011 @@ -16,29 +16,39 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - -<div id="panel"> - <form method="post" action="<@ofbizUrl>PayCash</@ofbizUrl>" name="PayCashForm"> - <table border="0"> - <tr> - <td colspan="2"> </td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosPayCash}</b></td> - <td><input type="text" name="amount" id="amount" value="${requestParameters.amount?if_exists}"/></td> - </tr> - <tr> - <td colspan="2"> </td> - </tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" value="${uiLabelMap.CommonConfirm}" name="confirm"/> - <input type="submit" value="${uiLabelMap.CommonCancel}"/> - </td> - </tr> - </table> - </form> -</div> -<script language="javascript" type="text/javascript"> - document.PayCashForm.amount.focus(); -</script> \ No newline at end of file +<div id="payCash" style="display:none"> + <table border="0" width="100%"> + <tr> + <td colspan="2"> </td> + </tr> + <tr> + <td width="100%" align="center" colspan="2"> + <b>${uiLabelMap.WebPosTransactionTotalDue} <span id="cashTotalDue"/></b> + </td> + </tr> + <tr> + <td width="100%" align="center" colspan="2"> + <b>${uiLabelMap.WebPosPayCashTotal} <span id="cashTotalPaid"/></b> + <a id="removeCashTotalPaid" href="javascript:void(0);"><img src="/images/collapse.gif"></a> + </td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosPayCash}</td> + <td width="50%" align="left"> + <input type="text" id="amountCash" name="amountCash" size="10" value=""/> + </td> + </tr> + <tr> + <td colspan="2"> </td> + </tr> + <tr> + <td colspan="2" align="center"> + <input type="submit" value="${uiLabelMap.CommonConfirm}" id="payCashConfirm"/> + <input type="submit" value="${uiLabelMap.CommonCancel}" id="payCashCancel"/> + </td> + </tr> + <tr> + <td colspan="2"><div class="errorPosMessage"><span id="payCashFormServerError"/></div></td> + </tr> + </table> +</div> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayCheck.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayCheck.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayCheck.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayCheck.ftl Sun May 29 11:02:09 2011 @@ -16,33 +16,41 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - -<div id="panel"> - <form method="post" action="<@ofbizUrl>PayCheck</@ofbizUrl>" name="PayCheckForm"> - <table border="0"> - <tr> - <td colspan="2"> </td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosPayCheck}</b></td> - <td><input type="text" name="amount" id="amount" value="${requestParameters.amount?if_exists}"/></td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosPayCheckRefNum}</b></td> - <td><input type="text" name="refNum" id="refNum" value="${requestParameters.refNum?if_exists}"/></td> - </tr> - <tr> - <td colspan="2"> </td> - </tr> - <tr> - <td colspan="2" align="center"> - <input type="submit" value="${uiLabelMap.CommonConfirm}" name="confirm"/> - <input type="submit" value="${uiLabelMap.CommonCancel}"/> - </td> - </tr> - </table> - </form> +<div id="payCheck" style="display:none"> + <table border="0" width="100%"> + <tr rowspan="2"> + <td colspan="2"> </td> + </tr> + <tr> + <td width="100%" align="center" colspan="2"> + <b>${uiLabelMap.WebPosTransactionTotalDue} <span id="checkTotalDue"/></b> + </td> + </tr> + <tr> + <td width="100%" align="center" colspan="2"> + <b>${uiLabelMap.WebPosPayCheckTotal} <span id="checkTotalPaid"/></b> + <a id="removeCheckTotalPaid" href="javascript:void(0);"><img src="/images/collapse.gif"></a> + </td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosPayCheck}</td> + <td width="50%" align="left"><input type="text" id="amountCheck" name="amountCheck" size="10" value=""/></td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosPayCheckRefNum}</td> + <td width="50%" align="left"><input type="text" id="refNumCheck" name="refNum" size="10" value=""/></td> + </tr> + <tr> + <td colspan="2"> </td> + </tr> + <tr> + <td colspan="2" align="center"> + <input type="submit" value="${uiLabelMap.CommonConfirm}" id="payCheckConfirm"/> + <input type="submit" value="${uiLabelMap.CommonCancel}" id="payCheckCancel"/> + </td> + </tr> + <tr> + <td colspan="2"><div class="errorPosMessage"><span id="payCheckFormServerError"/></div></td> + </tr> + </table> </div> -<script language="javascript" type="text/javascript"> - document.PayCheckForm.amount.focus(); -</script> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |