svn commit: r1125951 [8/9] - in /ofbiz/trunk: applications/order/config/ applications/order/src/org/ofb
Locked
svn commit: r1125951 [8/9] - in /ofbiz/trunk: applications/order/config/ applications/order/src/org/ofb
 
|
Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl Sun May 22 13:11:17 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/trunk/specialpurpose/webpos/webapp/webpos/manager/VoidOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/manager/VoidOrder.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/manager/VoidOrder.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/manager/VoidOrder.ftl Sun May 22 13:11:17 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/trunk/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl Sun May 22 13:11:17 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/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCash.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCash.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCash.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCash.ftl Sun May 22 13:11:17 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/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCheck.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCheck.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCheck.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCheck.ftl Sun May 22 13:11:17 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 Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl Sun May 22 13:11:17 2011 @@ -16,67 +16,136 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - -<div id="panel"> - <form method="post" action="<@ofbizUrl>PayCreditCard</@ofbizUrl>" name="PayCreditCardForm"> - <table border="0"> - <tr> - <td colspan="2"> </td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosPayCreditCardFirstName}</b><input type="text" name="firstName" id="firstName" size="20" maxlength="60" value="${requestParameters.firstName?if_exists}"/></td> - <td><b>${uiLabelMap.WebPosPayCreditCardLastName}</b><input type="text" name="lastName" id="lastName" size="20" maxlength="60" value="${requestParameters.lastName?if_exists}"/></td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosPayCreditCardNum}</b><input type="text" name="cardNum" id="cardNum" size="20" maxlength="30" value="${requestParameters.cardNum?if_exists}"/></td> - <td> - <b>${uiLabelMap.WebPosPayCreditCardExp}</b> - <#assign expMonth = ""> - <#assign expYear = ""> - <select name="expMonth"> - <#assign ccExprMonth = requestParameters.expMonth?if_exists> - <#if ccExprMonth?has_content> - <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option> - </#if> - ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")} - </select> - <select name="expYear"> - <#assign ccExprYear = requestParameters.expYear?if_exists> - <#if ccExprYear?has_content> - <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option> - </#if> - ${screens.render("component://common/widget/CommonScreens.xml#ccyears")} - </select> - </td> - </tr> - <tr> - <td> - <b>${uiLabelMap.WebPosPayCreditCardSecurityCode}</b> - <input type="text" name="securityCode" id="securityCode" size="5" maxlength="10" value="${requestParameters.securityCode?if_exists}"/> - <input type="hidden" name="postalCode" id="postalCode"/> - <input type="hidden" name="track2" id="track2"/> - </td> - <td> - <b>${uiLabelMap.WebPosPayCreditCardRefNum}</b> - <input type="text" name="refNum" id="refNum" value="${requestParameters.refNum?if_exists}"/> - </td> - </tr> - <tr> - <td> - <b>${uiLabelMap.WebPosPayCreditCard}</b> - <input type="text" name="amount" id="amount" value="${requestParameters.amount?if_exists}"/> - </td> - <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.PayCreditCardForm.firstName.focus(); -</script> \ No newline at end of file +<div id="payCreditCard" style="display:none"> + <table border="0" width="100%"> + <tr> + <td colspan="4"> </td> + </tr> + <tr> + <td width="100%" align="center" colspan="4"> + <b>${uiLabelMap.WebPosTransactionTotalDue} <span id="creditCardTotalDue"/></b> + </td> + </tr> + <tr> + <td width="100%" align="center" colspan="4"> + <b>${uiLabelMap.WebPosPayCreditCardTotal} <span id="creditCardTotalPaid"/></b> + <a id="removeCreditCardTotalPaid" href="javascript:void(0);"><img src="/images/collapse.gif"></a> + </td> + </tr> + <tr> + <td width="100%" align="center" colspan="4"> + ${uiLabelMap.WebPosPayCreditCardSwipe} <input type="checkbox" id="swipeCard" name="swipeCard" value="Y" checked="checked"> + </td> + </tr> + <tr id="showSwipeData"> + <td width="25%" align="right"> + ${uiLabelMap.WebPosPayCreditCardSwipeData} + </td> + <td width="75%" align="left" colspan="3"> + <input type="password" id="swipeData" name="swipeData" size="50" value=""/> + </td> + </tr> + <tr id="showCreditCardData1" style="display:none"> + <td width="25%" align="right"> + ${uiLabelMap.WebPosPayCreditCardFirstName} + </td> + <td width="25%" align="left"> + <input type="text" id="firstName" name="firstName" size="20" maxlength="60" value=""/> + </td> + <td width="25%" align="right"> + ${uiLabelMap.WebPosPayCreditCardLastName} + </td> + <td width="25%" align="left"> + <input type="text" id="lastName" name="lastName" size="20" maxlength="60" value=""/></td> + </td> + </tr> + <tr id="showCreditCardData2" style="display:none"> + <td width="25%" align="right"> + ${uiLabelMap.WebPosPayCreditCardNum} + </td> + <td width="25%" align="left"> + <input type="text" id="cardNum" name="cardNum" size="20" maxlength="30" value=""/> + </td> + <td width="25%" align="right"> + ${uiLabelMap.WebPosPayCreditCardExp} + </td> + <td width="25%" align="left"> + <#assign expMonth = ""> + <#assign expYear = ""> + <select id="expMonth" name="expMonth"> + <option value="01" <#if expMonth?default('') == '01'> selected="selected"</#if>>${uiLabelMap.CommonJanuary}</option> + <option value="02" <#if expMonth?default('') == '02'> selected="selected"</#if>>${uiLabelMap.CommonFebruary}</option> + <option value="03" <#if expMonth?default('') == '03'> selected="selected"</#if>>${uiLabelMap.CommonMarch}</option> + <option value="04" <#if expMonth?default('') == '04'> selected="selected"</#if>>${uiLabelMap.CommonApril}</option> + <option value="05" <#if expMonth?default('') == '05'> selected="selected"</#if>>${uiLabelMap.CommonMay}</option> + <option value="06" <#if expMonth?default('') == '06'> selected="selected"</#if>>${uiLabelMap.CommonJune}</option> + <option value="07" <#if expMonth?default('') == '07'> selected="selected"</#if>>${uiLabelMap.CommonJuly}</option> + <option value="08" <#if expMonth?default('') == '08'> selected="selected"</#if>>${uiLabelMap.CommonAugust}</option> + <option value="09" <#if expMonth?default('') == '09'> selected="selected"</#if>>${uiLabelMap.CommonSeptember}</option> + <option value="10" <#if expMonth?default('') == '10'> selected="selected"</#if>>${uiLabelMap.CommonOctober}</option> + <option value="11" <#if expMonth?default('') == '11'> selected="selected"</#if>>${uiLabelMap.CommonNovember}</option> + <option value="12" <#if expMonth?default('') == '12'> selected="selected"</#if>>${uiLabelMap.CommonDecember}</option> + </select> + <select id="expYear" name="expYear"> + <#assign ccExprYear = requestParameters.expYear?if_exists> + <#if ccExprYear?has_content> + <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option> + </#if> + ${screens.render("component://common/widget/CommonScreens.xml#ccyears")} + </select> + </td> + </tr> + <tr> + <td width="25%" align="right"> + ${uiLabelMap.WebPosPayCreditCardType} + </td> + <td width="25%" align="left"> + <select id="cardType" name="cardType"> + ${screens.render("component://common/widget/CommonScreens.xml#cctypes")} + </select> + </td> + <td width="25%" align="right"> + ${uiLabelMap.WebPosPayCreditCardSecurityCode} + </td> + <td width="25%" align="left"> + <input type="text" id="securityCode" name="securityCode" size="5" maxlength="10" value=""/> + <input type="hidden" name="track2" id="track2"/> + </td> + </tr> + <tr> + <td width="25%" align="right"> + ${uiLabelMap.WebPosPayCreditCard} + </td> + <td width="25%" align="left"> + <input type="text" id="amountCreditCard" name="amountCreditCard" size="10" value=""/> + </td> + <td width="25%" align="right"> + ${uiLabelMap.WebPosPayCreditCardPostalCode} + </td> + <td width="25%" align="left"> + <input type="text" id="postalCode" name="postalCode" value=""/> + </td> + </tr> + <tr> + <td width="25%" align="right"> + ${uiLabelMap.WebPosPayCreditCardRefNum} + </td> + <td width="25%" align="left"> + <input type="text" id="refNumCreditCard" name="refNum" size="10" value=""/> + </td> + <td width="50%" colspan="2"> </td> + </tr> + <tr> + <td width="100%" colspan="4"> </td> + </tr> + <tr> + <td colspan="4" align="center"> + <input type="submit" value="${uiLabelMap.CommonConfirm}" id="payCreditCardConfirm"/> + <input type="submit" value="${uiLabelMap.CommonCancel}" id="payCreditCardCancel"/> + </td> + </tr> + <tr> + <td colspan="4"><div class="errorPosMessage"><span id="payCreditCardFormServerError"/></div></td> + </tr> + </table> +</div> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayGiftCard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayGiftCard.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayGiftCard.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PayGiftCard.ftl Sun May 22 13:11:17 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>PayGiftCard</@ofbizUrl>" name="PayGiftCardForm"> - <table border="0"> - <tr> - <td colspan="2""> </td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosPayGiftCard}</b></td> - <td><input type="text" name="amount" id="amount"/></td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosPayGiftCardRefNum}</b></td> - <td><input type="text" name="refNum" id="refNum"/></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.PayGiftCardForm.amount.focus(); -</script> \ No newline at end of file +<div id="payGiftCard" 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="giftCardTotalDue"/></b> + </td> + </tr> + <tr> + <td width="100%" align="center" colspan="2"> + <b>${uiLabelMap.WebPosPayGiftCardTotal} <span id="giftCardTotalPaid"/></b> + <a id="removeGiftCardTotalPaid" href="javascript:void(0);"><img src="/images/collapse.gif"></a> + </td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosPayGiftCard}</td> + <td width="50%" align="left"><input type="text" id="amountGiftCard" name="amountGiftCard" size="10" value=""/></td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosPayGiftCardRefNum}</td> + <td width="50%" align="left"><input type="text" id="refNumGiftCard" 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="payGiftCardConfirm"/> + <input type="submit" value="${uiLabelMap.CommonCancel}" id="payGiftCardCancel"/> + </td> + </tr> + <tr> + <td colspan="2"><div class="errorPosMessage"><span id="payGiftCardFormServerError"/></div></td> + </tr> + </table> +</div> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PaySetRef.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PaySetRef.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PaySetRef.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/payment/PaySetRef.ftl Sun May 22 13:11:17 2011 @@ -1,63 +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>PaySetRef</@ofbizUrl>" name="PaySetRefForm"> - <table border="0"> - <tr> - <td> </td> - <td> </td> - <td><b><u>${uiLabelMap.WebPosPaymentSetRef}</u></b></td> - </tr> - <#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="text" name="refNumCheck" id="refNumCheck" value="${requestParameters.refNumCheck?if_exists}"/></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="text" name="refNumGift" id="refNumGift" value="${requestParameters.refNumGift?if_exists}"/></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="text" name="refNumCredit" id="refNumCredit" value="${requestParameters.refNumCredit?if_exists}"/></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> -<script language="javascript" type="text/javascript"> - document.PaySetRefForm.refNumCheck.focus(); -</script> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/promo/PromoCode.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/promo/PromoCode.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/promo/PromoCode.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/promo/PromoCode.ftl Sun May 22 13:11:17 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>PromoCode</@ofbizUrl>" name="PromoCodeForm"> - <table border="0"> - <tr> - <td colspan="2""> </td> - </tr> - <tr> - <td><b>${uiLabelMap.WebPosPromoCode}</b></td> - <td><input type="text" name="promoCode" id="promoCode"/></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.PromoCodeForm.promoCode.focus(); -</script> \ No newline at end of file +<div id="promo" style="display:none"> + <table border="0" width="100%"> + <tr> + <td colspan="2"> </td> + </tr> + <tr> + <td width="50%" align="right">${uiLabelMap.WebPosPromoCode}</td> + <td width="50%" align="left"><input type="text" id="promoCode" name="promoCode" size="10" value=""/></td> + </tr> + <tr> + <td colspan="2""> </td> + </tr> + <tr> + <td colspan="2" align="center"> + <input type="submit" value="${uiLabelMap.CommonConfirm}" id="promoCodeConfirm"/> + <input type="submit" value="${uiLabelMap.CommonCancel}" id="promoCodeCancel"/> + </td> + </tr> + <tr> + <td colspan="2"><div class="errorPosMessage"><span id="promoCodeFormServerError"/></div></td> + </tr> + </table> +</div> \ No newline at end of file Added: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl (added) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl Sun May 22 13:11:17 2011 @@ -0,0 +1,121 @@ +<#-- +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"> + <div class="screenlet-title-bar"> + <ul> + <li class="h3"> + <a id="billingAddressSelected" href="javascript:void();">${uiLabelMap.WebPosBillingAddress}</a> + + <a id="shippingAddressSelected" href="javascript:void();">${uiLabelMap.WebPosShippingAddress}</a> + </li> + </ul> + <br class="clear" /> + </div> + <div class="screenlet-body"> + <div id="customerAddress"> + <div id="centerTopBarLeft"> + <input type="hidden" id="billingLocation" name="billingLocation" value="Y"/> + <input type="hidden" id="shippingLocation" name="shippingLocation" value="N"/> + <div id="billingAddress"> + <table class="basic-table" cellspacing="0"> + <#if billingPostalAddress?exists> + <#if personBillTo?exists> + <tr> + <td><b><#if personBillTo.lastName?has_content>${personBillTo.lastName}</#if> <#if personBillTo.firstName?has_content>${personBillTo.firstName}</#if></b></td> + </tr> + </#if> + <#assign state = billingPostalAddress.getRelatedOne("StateProvinceGeo")?if_exists/> + <#assign country = billingPostalAddress.getRelatedOne("CountryGeo")?if_exists/> + <tr> + <td><#if billingPostalAddress.address1?has_content>${billingPostalAddress.address1}</#if></td> + </tr> + <tr> + <td><#if billingPostalAddress.city?has_content>${billingPostalAddress.city},</#if> <#if state?exists && state?has_content && state.geoCode?has_content>${state.geoCode}</#if> <#if billingPostalAddress.postalCode?has_content>${billingPostalAddress.postalCode}</#if> + </td> + </tr> + <tr> + <td><#if country?exists && country?has_content &&country.get("geoName", locale)?has_content>${country.get("geoName", locale)}</#if> + </td> + </tr> + <#else> + <tr> + <td> </td> + </tr> + <tr> + <td align="center"><b>${uiLabelMap.WebPosNoPartyInformation}</b></td> + </tr> + </#if> + </table> + </div> + <div id="shippingAddress" style="display:none"> + <table class="basic-table" cellspacing="0"> + <#if shippingPostalAddress?exists> + <#if personShipTo?exists> + <tr> + <td><b><#if personShipTo.lastName?has_content>${personShipTo.lastName}</#if> <#if personShipTo.firstName?has_content>${personShipTo.firstName}</#if></b></td> + </tr> + </#if> + <#assign state = shippingPostalAddress.getRelatedOne("StateProvinceGeo")?if_exists/> + <#assign country = shippingPostalAddress.getRelatedOne("CountryGeo")?if_exists/> + <tr> + <td><#if shippingPostalAddress.address1?has_content>${shippingPostalAddress.address1}</#if></td> + </tr> + <tr> + <td><#if shippingPostalAddress.city?has_content>${shippingPostalAddress.city},</#if> <#if state?exists && state?has_content && state.geoCode?has_content>${state.geoCode}</#if> <#if shippingPostalAddress.postalCode?has_content>${shippingPostalAddress.postalCode}</#if> + </td> + </tr> + <tr> + <td> + <input type="hidden" id="shipToSelected" value="Y"/> + <#if country?exists && country?has_content && country.get("geoName", locale)?has_content>${country.get("geoName", locale)}</#if> + </td> + </tr> + <#else> + <tr> + <td> </td> + </tr> + <tr> + <td align="center"><b>${uiLabelMap.WebPosNoPartyInformation}</b></td> + </tr> + </#if> + </table> + </div> + </div> + <div id="centerTopBarRight" > + ${screens.render("component://webpos/widget/SearchScreens.xml#Parties")} + <div id="billingPanel"> + <div> <br /></div> + <div> + <br /> + </div> + </div> + <div id="shipMethodPanel" style="display:none"> + <div id="shipMethodFormServerError"></div> + <div> + <label for="shipMethod"><b>${uiLabelMap.WebPosShippingMethod}</b></label> + <div id="shipMethodSelection"></div> + </div> + </div> + </div> + </div> + </div> +</div> +<script language="JavaScript" type="text/javascript"> + customerAddressSelected(); +</script> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchParties.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchParties.ftl?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchParties.ftl (added) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchParties.ftl Sun May 22 13:11:17 2011 @@ -0,0 +1,34 @@ +<#-- +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> + <input type="hidden" id="partyIdentificationTypeId" name="partyIdentificationTypeId" value=""> + <label for="searchPartyBy"><b> ${uiLabelMap.WebPosSearchBy}</b></label> + <select id="searchPartyBy" name="searchPartyBy"> + <option value="lastName" selected>${uiLabelMap.PartyLastName}</option> + <option value="firstName">${uiLabelMap.PartyFirstName}</option> + <option value="idValue">${uiLabelMap.PartyPartyIdentification}</option> + </select> + <br/> + <input type="text" id="partyToSearch" name="partyToSearch" size="30" maxlength="100"> + <input type="submit" value="${uiLabelMap.CommonSearch}" id="partySearchConfirm"/> + <br/> +</div> +<script language="JavaScript" type="text/javascript"> + partyKeyEvents(); +</script> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchParties.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchParties.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchParties.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl (added) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl Sun May 22 13:11:17 2011 @@ -0,0 +1,86 @@ +<#-- +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="searchPartiesResults" style="display:none"> + <form method="post" action="javascript:void(0);" id="SearchPartiesResultsForm" name="SearchPartiesResultsForm"> + <table> + <tr> + <td width="12.5%"> + <label for="searchByPartyLastName"><b> ${uiLabelMap.PartyLastName}</b></label> + </td> + <td width="12.5%"> + <input type="text" id="searchByPartyLastName" name="searchByPartyLastName"/> + </td> + <td width="12.5%"> + <label for="searchByPartyFirstName"><b> ${uiLabelMap.PartyFirstName}</b></label> + </td> + <td width="12.5%"> + <input type="text" id="searchByPartyFirstName" name="searchByPartyFirstName"/> + </td> + <td width="20%"> + <label for="billingLocation"><b> ${uiLabelMap.WebPosBillingAddress}</b></label> + </td> + <td width="5%"> + <input type="checkbox" id="billingLoc" name="billingLoc"/> + </td> + <td width="20%"> + <label for="shippingLocation"><b> ${uiLabelMap.WebPosShippingAddress}</b></label> + </td> + <td width="5%"> + <input type="checkbox" id="shippingLoc" name="shippingLoc"/> + </td> + </tr> + <tr> + <td width="12.5%"> + <label for="searchByPartyIdValue"><b> ${uiLabelMap.PartyPartyIdentification}</b></label> + </td> + <td width="12.5%"> + <input type="text" id="searchByPartyIdValue" name="searchByPartyIdValue"/> + </td> + <td width="50%" colspan="4" style="text-align:center"> + <input type="submit" value="${uiLabelMap.CommonSearch}" id="searchPartiesResultsSearch"/> + + <input type="submit" value="${uiLabelMap.CommonCancel}" id="searchPartiesResultsCancel"/> + </td> + <td width="25%" colspan="2"></td> + </tr> + </table> + <table cellspacing="0" cellpadding="2" class="basic-table"> + <thead class="searchPartiesResultsHead"> + <tr class="header-row"> + <td> </td> + <td><b>${uiLabelMap.PartyPartyId}</b></td> + <td><b>${uiLabelMap.PartyLastName}</b></td> + <td><b>${uiLabelMap.PartyFirstName}</b></td> + <td><b>${uiLabelMap.PartyAddressLine1}</b></td> + <td><b>${uiLabelMap.PartyCity}</b></td> + <td><b>${uiLabelMap.PartyPostalCode}</b></td> + <td><b>${uiLabelMap.PartyState}</b></td> + <td><b>${uiLabelMap.PartyCountry}</b></td> + <td><b>B/S</b></td> + </tr> + </thead> + <tbody id="searchPartiesResultsList" class="searchPartiesResultsCartBody"> + <tr> + <td colspan="9"> + </td> + </tr> + <tbody> + </table> + </form> +</div> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl Sun May 22 13:11:17 2011 @@ -16,26 +16,24 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - <form name="SearchProducts" method="post" action="<@ofbizUrl>AddItem</@ofbizUrl>"> - <div> - <input type="hidden" id="quantity" name="quantity" value="1" /> - <input type="hidden" id="add_product_id" name="add_product_id" value="${parameters.add_product_id?if_exists}" /> - <label for="productGoodIdentification"><b> ${uiLabelMap.ProductGoodIdentification}</b></label> - <input type="text" id="productGoodIdentification" name="productGoodIdentification" size="40" maxlength="100" /> - <div id="productsIdent" class="autocomplete" style="display:none"></div> - <input type="submit" id="submitButton" name="submitButton" value="${uiLabelMap.OrderAddToCart}" onclick="ajaxSubmitFormUpdateAreas('SearchProducts', 'CartScreen, webpos/control/ShowCart,')" /> - <br /> - <label for="searchBy"><b> ${uiLabelMap.WebPosSearchBy}</b></label> - <select id="searchBy" name="searchBy"> - <option value="productName" selected="selected">${uiLabelMap.ProductProductName}</option> - <option value="productDescription">${uiLabelMap.ProductProductDescription}</option> - </select> - <input type="text" id="productToSearch" name="productToSearch" size="40" maxlength="100"/> - <div id="products" class="autocomplete" style="display:none"></div> - </div> + <div> + <input type="hidden" id="quantity" name="quantity" value="1" /> + <input type="hidden" id="add_product_id" name="add_product_id" value="${parameters.add_product_id?if_exists}" /> + <input type="hidden" id="goodIdentificationTypeId" name="goodIdentificationTypeId" value="" /> + <label for="searchBy"><b> ${uiLabelMap.WebPosSearchBy}</b></label> + <select id="searchBy" name="searchBy"> + <option value="productName" selected="selected">${uiLabelMap.ProductProductName}</option> + <option value="productDescription">${uiLabelMap.ProductProductDescription}</option> + <option value="idValue">${uiLabelMap.ProductGoodIdentification}</option> + </select> + <input type="text" id="productToSearch" name="productToSearch" size="28" maxlength="100"/> + <div id="products" class="autocomplete" style="display:none"></div> + <br /> + <input type="submit" value="${uiLabelMap.CommonSearch}" id="productSearchConfirm"/> + </div> </form> <br /> <script language="javascript" type="text/javascript"> - document.SearchProducts.productGoodIdentification.focus(); + document.SearchProducts.productToSearch.focus(); </script> \ No newline at end of file Added: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProductsResults.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProductsResults.ftl?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProductsResults.ftl (added) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProductsResults.ftl Sun May 22 13:11:17 2011 @@ -0,0 +1,68 @@ +<#-- +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="searchProductsResults" style="display:none"> + <form method="post" action="javascript:void(0);" id="SearchProductsResultsForm" name="SearchProductsResultsForm"> + <table> + <tr> + <td width="25%"> + <label for="searchByProductIdValue"><b> ${uiLabelMap.ProductGoodIdentification}</b></label> + </td> + <td width="25%"> + <input type="hidden" id="goodIdentificationTypeId" name="goodIdentificationTypeId" value="" /> + <input type="text" id="searchByProductIdValue" name="searchByProductIdValue"/> + </td> + <td width="25%"> + <label for="searchByProductName"><b> ${uiLabelMap.ProductProductName}</b></label> + </td> + <td width="25%"> + <input type="text" id="searchByProductName" name="searchByProductName"/> + </td> + </tr> + <tr> + <td width="25%"> + <label for="searchByProductDescription"><b> ${uiLabelMap.ProductProductDescription}</b></label> + </td> + <td width="25%"> + <input type="text" id="searchByProductDescription" name="searchByProductDescription"/> + </td> + <td width="50%" colspan="2" style="text-align:center"> + <input type="submit" value="${uiLabelMap.CommonSearch}" id="searchProductsResultsSearch"/> + + <input type="submit" value="${uiLabelMap.CommonCancel}" id="searchProductsResultsCancel"/> + </td> + </tr> + </table> + <table cellspacing="0" cellpadding="2" class="basic-table"> + <thead class="searchProductsResultsHead"> + <tr class="header-row"> + <td nowrap> </td> + <td nowrap><b>${uiLabelMap.ProductProductId}</b></td> + <td nowrap><b>${uiLabelMap.ProductProductName}</b></td> + <td nowrap><b>${uiLabelMap.ProductProductDescription}</b></td> + </tr> + </thead> + <tbody id="searchProductsResultsList" class="searchProductsResultsCartBody"> + <tr> + <td colspan="3"> + </td> + </tr> + <tbody> + </table> + </form> +</div> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProductsResults.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProductsResults.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchProductsResults.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl (added) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl Sun May 22 13:11:17 2011 @@ -0,0 +1,60 @@ +<#-- +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> + <div id="SearchSalesRepsList"> + <#if salesReps?exists && salesReps?has_content> + <table id="salesRepsResults" name="salesRepsResults" cellspacing="0" cellpadding="2" class="basic-table"> + <#assign alt_row = false> + <#list salesReps as salesRep> + <#assign salesRepInCart = false> + <#if cartSalesReps?exists && cartSalesReps?has_content> + <#list cartSalesReps as cartSalesRep> + <#if cartSalesRep == salesRep.partyId> + <#assign salesRepInCart = true> + </#if> + </#list> + </#if> + <#assign person = ""/> + <#if salesRep.lastName?has_content> + <#assign person = person + (salesRep.lastName).trim() + " "/> + </#if> + <#if salesRep.firstName?has_content> + <#assign person = person + (salesRep.firstName).trim()/> + </#if> + <#assign person = person + " (" + salesRep.partyId + ")"/> + <tr <#if salesRepInCart>class="pos-cart-choose"<#else><#if alt_row>class="pos-cart-even"<#else>class="pos-cart-odd"</#if></#if>> + <td> + <#if salesRepInCart> + <a href="javascript:removeSalesRep('${salesRep.partyId}');"> + ${person} + </a> + <#else> + <a href="javascript:addSalesRep('${salesRep.partyId}');"> + ${person} + </a> + </#if> + </td> + </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + </table> + </#if> + </div> +</div> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl (added) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl Sun May 22 13:11:17 2011 @@ -0,0 +1,46 @@ +<#-- +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> + <tr> + <td> + <ol id="posShortcut"></ol> + </td> + <td> + <div id="pleaseWait" style="display:none;"> <b>${uiLabelMap.WebPosPleaseWait}</b></div> + </td> + </tr> +</table> +<script type="text/javascript"> + function activateHotKeys() { + WebPosHotkeys.bind("keydown", "f1", productToSearchFocus, "productToSearchFocus()", "${uiLabelMap.WebPosShortcutF1}"); + WebPosHotkeys.bind("keydown", "f2", partyToSearchFocus, "partyToSearchFocus()", "${uiLabelMap.WebPosShortcutF2}"); + WebPosHotkeys.bind("keydown", "f3", payCash, "payCash()", "${uiLabelMap.WebPosShortcutF3}"); + WebPosHotkeys.bind("keydown", "f4", payCheck, "payCheck()", "${uiLabelMap.WebPosShortcutF4}"); + WebPosHotkeys.bind("keydown", "f5", payGiftCard, "payGiftCard()", "${uiLabelMap.WebPosShortcutF5}"); + WebPosHotkeys.bind("keydown", "f6", payCreditCard, "payCreditCard()", "${uiLabelMap.WebPosShortcutF6}"); + WebPosHotkeys.bind("keydown", "f7", payFinish, "payFinish()", "${uiLabelMap.WebPosShortcutF7}"); + WebPosHotkeys.bind("keydown", "f8", itemQuantityFocus, "itemQuantityFocus()", "${uiLabelMap.WebPosShortcutF8}"); + WebPosHotkeys.bind("keydown", "f9", incrementItemQuantity, "incrementItemQuantity()", "${uiLabelMap.WebPosShortcutF9}"); + WebPosHotkeys.bind("keydown", "f10", decrementItemQuantity, "decrementItemQuantity()", "${uiLabelMap.WebPosShortcutF10}"); + WebPosHotkeys.bind("keydown", "f11", emptyCart, "emptyCart()", "${uiLabelMap.WebPosShortcutF11}"); + WebPosHotkeys.bind("keydown", "up", keyUp, "keyUp()", "${uiLabelMap.WebPosShortcutKeyUp}"); + WebPosHotkeys.bind("keydown", "down", keyDown, "keyDown()", "${uiLabelMap.WebPosShortcutKeyDown}"); + updateHotKeys(); + } +</script> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/specialpurpose/webpos/widget/ButtonsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/ButtonsScreens.xml?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/ButtonsScreens.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/widget/ButtonsScreens.xml Sun May 22 13:11:17 2011 @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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. ---> - -<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> - - <screen name="Main"> - <section> - <actions> - <script location="component://webpos/webapp/webpos/WEB-INF/actions/buttons/Main.groovy"/> - </actions> - <widgets> - <container> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/buttons/Main.ftl"/></html></platform-specific> - </container> - </widgets> - </section> - </screen> - - <screen name="Manager"> - <section> - <actions> - <script location="component://webpos/webapp/webpos/WEB-INF/actions/buttons/Main.groovy"/> - </actions> - <widgets> - <container> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/buttons/Manager.ftl"/></html></platform-specific> - </container> - </widgets> - </section> - </screen> - - <screen name="Payment"> - <section> - <actions> - <script location="component://webpos/webapp/webpos/WEB-INF/actions/buttons/Payment.groovy"/> - </actions> - <widgets> - <container> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/buttons/Payment.ftl"/></html></platform-specific> - </container> - </widgets> - </section> - </screen> - - <screen name="Promo"> - <section> - <actions> - <script location="component://webpos/webapp/webpos/WEB-INF/actions/buttons/Main.groovy"/> - </actions> - <widgets> - <container> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/buttons/Promo.ftl"/></html></platform-specific> - </container> - </widgets> - </section> - </screen> -</screens> Added: ofbiz/trunk/specialpurpose/webpos/widget/CartScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/CartScreens.xml?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/CartScreens.xml (added) +++ ofbiz/trunk/specialpurpose/webpos/widget/CartScreens.xml Sun May 22 13:11:17 2011 @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + <screen name="CartList"> + <section> + <widgets> + <screenlet title="${uiLabelMap.WebPosCart}"> + <container id="CartList"> + <include-screen name="ShowCart"/> + </container> + </screenlet> + </widgets> + </section> + </screen> + + <screen name="ShowCart"> + <section> + <actions> + <property-map resource="WebPosUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + <script location="component://webpos/webapp/webpos/WEB-INF/actions/cart/ShowCart.groovy"/> + </actions> + <widgets> + <container> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/cart/ShowCart.ftl"/></html></platform-specific> + </container> + </widgets> + </section> + </screen> + + <screen name="CartItemSelected"> + <section> + <widgets> + <screenlet title="${uiLabelMap.WebPosCartItemSelected}"> + <container id="CartItemSelected"> + <include-screen name="ShowCartItemSelected"/> + </container> + </screenlet> + </widgets> + </section> + </screen> + + <screen name="ShowCartItemSelected"> + <section> + <actions> + <property-map resource="WebPosUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + <script location="component://webpos/webapp/webpos/WEB-INF/actions/cart/ShowCart.groovy"/> + </actions> + <widgets> + <container> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/cart/ShowCartItemSelected.ftl"/></html></platform-specific> + </container> + </widgets> + </section> + </screen> + + <screen name="ChooseVariant"> + <section> + <actions> + <set field="titleProperty" value="WebPosPageTitleChooseVariant"/> + </actions> + <widgets> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/cart/ChooseVariant.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> +</screens> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/webpos/widget/CartScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/widget/CartScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/widget/CartScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/webpos/widget/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/CatalogScreens.xml?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/CatalogScreens.xml (added) +++ ofbiz/trunk/specialpurpose/webpos/widget/CatalogScreens.xml Sun May 22 13:11:17 2011 @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + <screen name="SideDeepCategoryList"> + <section> + <widgets> + <screenlet title="${uiLabelMap.ProductBrowseCategories}"> + <container id="SideDeepCategoryList"> + <include-screen name="SideDeepCategory"/> + </container> + </screenlet> + </widgets> + </section> + </screen> + + <screen name="SideDeepCategory"> + <section> + <actions> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> + <script location="component://webpos/webapp/webpos/WEB-INF/actions/catalog/SideDeepCategory.groovy"/> + </actions> + <widgets> + <container> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/catalog/SideDeepCategory.ftl"/></html></platform-specific> + </container> + </widgets> + </section> + </screen> + + <screen name="CategoryDetailList"> + <section> + <widgets> + <screenlet title="${uiLabelMap.ProductCategoryProducts}"> + <container id="CategoryDetailList"> + <include-screen name="CategoryDetail"/> + </container> + </screenlet> + </widgets> + </section> + </screen> + + <screen name="CategoryDetail"> + <section> + <actions> + <set field="titleProperty" value="PageTitleCategoryPage"/> + <script location="component://webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy"/> + <script location="component://webpos/webapp/webpos/WEB-INF/actions/catalog/CategoryDetail.groovy"/> + </actions> + <widgets> + <container> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/catalog/CategoryDetail.ftl"/></html></platform-specific> + </container> + </widgets> + </section> + </screen> +</screens> Propchange: ofbiz/trunk/specialpurpose/webpos/widget/CatalogScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/widget/CatalogScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/widget/CatalogScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |