svn commit: r1128865 [26/27] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1128865 [26/27] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayCreditCard.ftl Sun May 29 11:02:09 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/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayGiftCard.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayGiftCard.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayGiftCard.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PayGiftCard.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>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/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PaySetRef.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PaySetRef.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PaySetRef.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/payment/PaySetRef.ftl Sun May 29 11:02:09 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/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/promo/PromoCode.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/promo/PromoCode.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/promo/PromoCode.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/promo/PromoCode.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>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 Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl Sun May 29 11:02:09 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 Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/ButtonsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/ButtonsScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/ButtonsScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/ButtonsScreens.xml Sun May 29 11:02:09 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> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/CommonScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/CommonScreens.xml Sun May 29 11:02:09 2011 @@ -20,11 +20,10 @@ 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-decorator"> <section> <actions> - <!-- base/top/specific map first, then more common map added for shared labels --> <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"/> @@ -32,143 +31,206 @@ under the License. <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"/> - - <set field="MainColumnStyle" value="center" global="true"/> - - <!-- The default (global) shortcut icon --> - <set field="layoutSettings.shortcutIcon" value="/images/favicon.ico" global="true"/> - - <!-- The default (main) java scripts --> - <!-- NOTE: this should be included on each screen that uses it to avoid including it in all screens: --> - <set field="layoutSettings.javaScripts[+0]" value="/images/fieldlookup.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/selectall.js" global="true"/> - - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.11.custom.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/> - <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-${initialLocale}.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/> - <script location="component://webpos/widget/WebPosSetup.groovy"/> - - <!-- The default (main) stylesheets --> + <set field="layoutSettings.styleSheets[+0]" value="/webpos/images/webpos.css" global="true"/> - <set field="layoutSettings.styleSheets[+0]" value="${productStore.styleSheet}" default-value="/images/ecommain.css" global="true"/> - <set field="layoutSettings.styleSheets[+0]" value="/images/maincss.css" global="true"/> - <set field="layoutSettings.styleSheets[]" value="/content/images/contentForum.css" global="true"/> - + <set field="layoutSettings.companyName" from-field="uiLabelMap.WebPosCompanyName" global="true"/> + <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.WebPosCompanySubtitle" global="true"/> <set field="activeApp" value="webpos" global="true"/> + <set field="applicationMenuName" value="WebPosAppBar" global="true"/> + <set field="applicationMenuLocation" value="component://webpos/widget/WebPosMenus.xml" global="true"/> + <set field="applicationTitle" value="${uiLabelMap.WebPosMenuMain}" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/jquery.hotkeys-0.7.9.min.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/WebPosHotkeys.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/Shortcuts.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/SearchProducts.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/SearchProductsResults.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/SearchParties.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/SearchPartiesResults.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/SearchSalesReps.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/ShowCart.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/ShowCartItemSelected.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/SideDeepCategory.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/CategoryDetail.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/PayCash.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/PayCheck.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/PayGiftCard.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/PayCreditCard.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/PayFinish.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/OpenTerminal.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/CloseTerminal.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/PaidOutAndIn.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/PromoCode.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/VoidOrder.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/ChooseVariant.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/EditAddress.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/Common.js" global="true"/> </actions> <widgets> - <!-- render Header --> - <include-screen name="Header" location="component://webpos/widget/CommonScreens.xml"/> - <container id="ecom-mainarea"> - <container> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/includes/Messages.ftl"/></html></platform-specific> - </container> - <!-- by default will render left-bar only if left/rightbarScreenName value not empty --> - <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/> - <include-screen name="${rightbarScreenName}" location="${rightbarScreenLocation}"/> - <container style="${MainColumnStyle}"> - <decorator-section-include name="body"/> - </container> - </container> - <!-- render Footer --> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/includes/Footer.ftl"/></html></platform-specific> + <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> </widgets> </section> </screen> - - <screen name="rightbar"> + + <screen name="CommonWebPosMainDecorator"> <section> <widgets> - <container style="right"> - <include-screen name="Language"/> - <include-screen name="Main" location="component://webpos/widget/ButtonsScreens.xml"/> - </container> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="pre-body"> + <section> + <widgets/> + </section> + </decorator-section> + <decorator-section name="body"> + <section> + <widgets> + <container style="no-clear"> + <container id="SchortcutsBar"> + <include-screen name="SchortcutsBar"/> + </container> + </container> + <container style="no-clear"> + <container id="TopBar"> + <include-screen name="TopBar"/> + </container> + </container> + <container style="no-clear"> + <container id="LeftBar" style="leftCenterBar"> + <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/> + </container> + <container id="RightBar" style="rightCenterBar"> + <include-screen name="${rightbarScreenName}" location="${rightbarScreenLocation}"/> + </container> + <container id="CenterBar" style="centerCenterBar"> + <decorator-section-include name="body"/> + </container> + </container> + </widgets> + </section> + </decorator-section> + </decorator-screen> </widgets> </section> </screen> - - <screen name="rightbar_manager"> + + <screen name="CommonWebPosManagerDecorator"> <section> <widgets> - <container style="right"> - <include-screen name="Language"/> - <include-screen name="Manager" location="component://webpos/widget/ButtonsScreens.xml"/> - </container> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="pre-body"> + <section> + <widgets> + <include-menu name="ManagerTabBar" location="component://webpos/widget/WebPosMenus.xml"/> + </widgets> + </section> + </decorator-section> + <decorator-section name="body"> + <section> + <widgets> + <container style="no-clear"> + <container id="SchortcutsBar"> + <include-screen name="SchortcutsBar"/> + </container> + </container> + <container style="no-clear"> + <container id="TopBar"> + <include-screen name="TopBar"/> + </container> + </container> + <container style="no-clear"> + <container id="LeftBar" style="leftCenterBar"> + <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/> + </container> + <container id="RightBar" style="rightCenterBar"> + <include-screen name="${rightbarScreenName}" location="${rightbarScreenLocation}"/> + </container> + <container id="CenterBar" style="centerCenterBar"> + <decorator-section-include name="body"/> + </container> + </container> + </widgets> + </section> + </decorator-section> + </decorator-screen> </widgets> </section> </screen> - - <screen name="rightbar_payment"> + + <screen name="TopBar"> <section> <widgets> - <container style="right"> - <include-screen name="Language"/> - <include-screen name="Payment" location="component://webpos/widget/ButtonsScreens.xml"/> + <container style="no-clear"> + <container style="leftTopBar"> + <include-screen name="CustomerAddressList" location="component://webpos/widget/SearchScreens.xml"/> + <include-screen name="SearchPartiesResults" location="component://webpos/widget/SearchScreens.xml"/> + </container> + <container style="rightTopBar"> + <include-screen name="SearchSalesReps" location="component://webpos/widget/SearchScreens.xml"/> + </container> </container> </widgets> </section> </screen> - - <screen name="rightbar_promo"> + + <screen name="LeftBar"> <section> <widgets> - <container style="right"> - <include-screen name="Language"/> - <include-screen name="Promo" location="component://webpos/widget/ButtonsScreens.xml"/> - </container> + <include-screen name="Products" location="component://webpos/widget/SearchScreens.xml"/> + <include-screen name="SearchProductsResults" location="component://webpos/widget/SearchScreens.xml"/> + <include-screen name="CartItemSelected" location="component://webpos/widget/CartScreens.xml"/> </widgets> </section> </screen> - - <screen name="leftbar"> + + <screen name="CenterBar"> <section> <widgets> - <container style="left"> + <container id="CenterBar"> + <include-screen name="Messages" location="component://webpos/widget/WebPosScreens.xml"/> + <include-screen name="CartList" location="component://webpos/widget/CartScreens.xml"/> + <include-screen name="ChooseVariant" location="component://webpos/widget/CartScreens.xml"/> + <include-screen name="PayCash" location="component://webpos/widget/PaymentScreens.xml"/> + <include-screen name="PayCheck" location="component://webpos/widget/PaymentScreens.xml"/> + <include-screen name="PayGiftCard" location="component://webpos/widget/PaymentScreens.xml"/> + <include-screen name="PayCreditCard" location="component://webpos/widget/PaymentScreens.xml"/> + <include-screen name="OpenTerminal" location="component://webpos/widget/ManagerScreens.xml"/> + <include-screen name="CloseTerminal" location="component://webpos/widget/ManagerScreens.xml"/> + <include-screen name="PaidOutAndIn" location="component://webpos/widget/ManagerScreens.xml"/> + <include-screen name="PromoCode" location="component://webpos/widget/PromoScreens.xml"/> + <include-screen name="VoidOrder" location="component://webpos/widget/ManagerScreens.xml"/> + <include-screen name="EditAddressList" location="component://webpos/widget/CustomerScreens.xml"/> </container> </widgets> </section> </screen> - - <screen name="Header"> + + <screen name="RightBar"> <section> <widgets> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/includes/Header.ftl"/></html></platform-specific> + <include-screen name="SideDeepCategoryList" location="component://webpos/widget/CatalogScreens.xml"/> + <include-screen name="CategoryDetailList" location="component://webpos/widget/CatalogScreens.xml"/> </widgets> </section> </screen> - - <!-- Column Included Screens --> - <screen name="Language"> + + <screen name="SchortcutsBar"> <section> <widgets> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/includes/Language.ftl"/></html></platform-specific> + <include-screen name="ShortcutsList" location="component://webpos/widget/ShortcutsScreens.xml"/> </widgets> </section> </screen> - - <!-- Top Level Screens --> - <screen name="Main"> + + <screen name="Header"> <section> - <actions> - <set field="MainColumnStyle" value="center"/> - <set field="titleProperty" value="PageTitleMain"/> - <set field="headerItem" value="Main"/> - </actions> <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - </decorator-section> - </decorator-screen> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/includes/Header.ftl"/></html></platform-specific> </widgets> </section> </screen> - + <screen name="Login"> <section> <actions> @@ -188,10 +250,11 @@ under the License. </widgets> </section> </screen> - + <screen name="RequirePasswordChange"> <section> <actions> + <set field="MainColumnStyle" value="leftonly"/> <set field="titleProperty" value="PageTitleLogin"/> <script location="component://webpos/webapp/webpos/WEB-INF/actions/Login.groovy"/> </actions> @@ -206,4 +269,4 @@ under the License. </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/ManagerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/ManagerScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/ManagerScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/ManagerScreens.xml Sun May 29 11:02:09 2011 @@ -20,78 +20,59 @@ 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="OpenTerminal"> <section> <actions> - <set field="rightbarScreenName" value="rightbar_manager"/> <set field="titleProperty" value="WebPosPageTitleOpenTerminal"/> + <set field="headerItem" value="Manager"/> </actions> <widgets> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - <container id="OpenTerminal"> + <container> <platform-specific><html><html-template location="component://webpos/webapp/webpos/manager/OpenTerminal.ftl"/></html></platform-specific> </container> </widgets> </section> </screen> - + <screen name="CloseTerminal"> <section> <actions> - <set field="rightbarScreenName" value="rightbar_manager"/> <set field="titleProperty" value="WebPosPageTitleCloseTerminal"/> + <set field="headerItem" value="Manager"/> </actions> <widgets> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - <container id="CloseTerminal"> + <container> <platform-specific><html><html-template location="component://webpos/webapp/webpos/manager/CloseTerminal.ftl"/></html></platform-specific> </container> </widgets> </section> </screen> - - <screen name="VoidOrder"> - <section> - <actions> - <set field="rightbarScreenName" value="rightbar_manager"/> - <set field="titleProperty" value="WebPosPageTitleVoidOrder"/> - </actions> - <widgets> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - <container id="VoidOrder"> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/manager/VoidOrder.ftl"/></html></platform-specific> - </container> - </widgets> - </section> - </screen> - + <screen name="PaidOutAndIn"> <section> <actions> - <set field="rightbarScreenName" value="rightbar_manager"/> <set field="titleProperty" value="WebPosPageTitlePaidOutAndIn"/> + <set field="headerItem" value="PaidOutAndIn"/> <script location="component://webpos/webapp/webpos/WEB-INF/actions/manager/PaidOutAndIn.groovy"/> </actions> <widgets> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - <container id="PaidOutAndIn"> + <container> <platform-specific><html><html-template location="component://webpos/webapp/webpos/manager/PaidOutAndIn.ftl"/></html></platform-specific> </container> </widgets> </section> </screen> - - <screen name="ModifyPrice"> + + <screen name="VoidOrder"> <section> <actions> - <set field="rightbarScreenName" value="rightbar_manager"/> - <set field="titleProperty" value="WebPosPageTitleModifyPrice"/> + <set field="titleProperty" value="WebPosPageTitleVoidOrder"/> + <set field="headerItem" value="VoidOrder"/> </actions> <widgets> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - <container id="ModifyPrice"> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/manager/ModifyPrice.ftl"/></html></platform-specific> + <container> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/manager/VoidOrder.ftl"/></html></platform-specific> </container> </widgets> </section> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/PaymentScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/PaymentScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/PaymentScreens.xml Sun May 29 11:02:09 2011 @@ -20,96 +20,56 @@ 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="PayCash"> <section> <actions> - <set field="rightbarScreenName" value="rightbar_payment"/> <set field="titleProperty" value="WebPosPageTitlePayCash"/> </actions> <widgets> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - <container id="PayCash"> + <container> <platform-specific><html><html-template location="component://webpos/webapp/webpos/payment/PayCash.ftl"/></html></platform-specific> </container> </widgets> </section> </screen> - + <screen name="PayCheck"> <section> <actions> - <set field="rightbarScreenName" value="rightbar_payment"/> <set field="titleProperty" value="WebPosPageTitlePayCheck"/> </actions> <widgets> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - <container id="PayCheck"> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/payment/PayCheck.ftl"/></html></platform-specific> - </container> + <container> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/payment/PayCheck.ftl"/></html></platform-specific> + </container> </widgets> </section> </screen> - + <screen name="PayGiftCard"> <section> <actions> - <set field="rightbarScreenName" value="rightbar_payment"/> <set field="titleProperty" value="WebPosPageTitlePayGiftCard"/> </actions> <widgets> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - <container id="PayGiftCard"> + <container> <platform-specific><html><html-template location="component://webpos/webapp/webpos/payment/PayGiftCard.ftl"/></html></platform-specific> </container> </widgets> </section> </screen> - + <screen name="PayCreditCard"> <section> <actions> - <set field="rightbarScreenName" value="rightbar_payment"/> <set field="titleProperty" value="WebPosPageTitlePayCreditCard"/> </actions> <widgets> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - <container id="PayCreditCard"> + <container> <platform-specific><html><html-template location="component://webpos/webapp/webpos/payment/PayCreditCard.ftl"/></html></platform-specific> </container> </widgets> </section> </screen> - - <screen name="ClearPayment"> - <section> - <actions> - <set field="rightbarScreenName" value="rightbar_payment"/> - <set field="titleProperty" value="WebPosPageTitlePayClear"/> - <script location="component://webpos/webapp/webpos/WEB-INF/actions/cart/MicroCart.groovy"/> - </actions> - <widgets> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - <container id="ClearPayment"> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/payment/ClearPayment.ftl"/></html></platform-specific> - </container> - </widgets> - </section> - </screen> - - <screen name="PaySetRef"> - <section> - <actions> - <set field="rightbarScreenName" value="rightbar_payment"/> - <set field="titleProperty" value="WebPosPageTitlePaySetRef"/> - <script location="component://webpos/webapp/webpos/WEB-INF/actions/cart/MicroCart.groovy"/> - </actions> - <widgets> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - <container id="PaySetRef"> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/payment/PaySetRef.ftl"/></html></platform-specific> - </container> - </widgets> - </section> - </screen> </screens> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/PromoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/PromoScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/PromoScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/PromoScreens.xml Sun May 29 11:02:09 2011 @@ -20,16 +20,15 @@ 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="PromoCode"> <section> <actions> - <set field="rightbarScreenName" value="rightbar_promo"/> <set field="titleProperty" value="WebPosPageTitlePromoCode"/> + <set field="headerItem" value="Promo"/> </actions> <widgets> - <include-screen name="SearchProducts" location="component://webpos/widget/WebPosScreens.xml"/> - <container id="PromoCode"> + <container> <platform-specific><html><html-template location="component://webpos/webapp/webpos/promo/PromoCode.ftl"/></html></platform-specific> </container> </widgets> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/WebPosScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/WebPosScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/WebPosScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/WebPosScreens.xml Sun May 29 11:02:09 2011 @@ -20,139 +20,57 @@ 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="webPosMainDecorator"> - <section> - <actions> - <set field="MainColumnStyle" value="rightonly"/> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <widgets> - <decorator-section-include name="body"/> - </widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - + <screen name="Main"> <section> <actions> - <set field="titleProperty" value="PageTitleMain"/> - <set field="rightbarScreenName" value="rightbar"/> - </actions> - <widgets> - <include-screen name="SearchProducts"/> - </widgets> - </section> - </screen> - - <screen name="Manager"> - <section> - <actions> - <set field="titleProperty" value="PageTitleMain"/> - <set field="rightbarScreenName" value="rightbar_manager"/> - </actions> - <widgets> - <include-screen name="SearchProducts"/> - </widgets> - </section> - </screen> - - <screen name="Payment"> - <section> - <actions> - <set field="titleProperty" value="PageTitleMain"/> - <set field="rightbarScreenName" value="rightbar_payment"/> + <set field="titleProperty" value="WebPosMenuMain"/> + <set field="leftbarScreenName" value="LeftBar"/> + <set field="leftbarScreenLocation" value="component://webpos/widget/CommonScreens.xml"/> + <set field="rightbarScreenName" value="RightBar"/> + <set field="rightbarScreenLocation" value="component://webpos/widget/CommonScreens.xml"/> + <set field="MainColumnStyle" value="center"/> </actions> <widgets> - <include-screen name="SearchProducts"/> - </widgets> - </section> - </screen> - - <screen name="Promo"> - <section> - <actions> - <set field="titleProperty" value="PageTitleMain"/> - <set field="rightbarScreenName" value="rightbar_promo"/> - </actions> - <widgets> - <include-screen name="SearchProducts"/> - </widgets> - </section> - </screen> - - <screen name="SearchProducts"> - <section> - <actions> - <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/SearchProducts.js" global="true"/> - </actions> - <widgets> - <decorator-screen name="webPosMainDecorator"> + <decorator-screen name="CommonWebPosMainDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.WebPosCart}"> - <container id="SearchProducts"> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/search/SearchProducts.ftl"/></html></platform-specific> - </container> - <container id="CartScreen"> - <include-screen name="ShowCart"/> - </container> - </screenlet> + <include-screen name="CenterBar" location="component://webpos/widget/CommonScreens.xml"/> </decorator-section> </decorator-screen> </widgets> </section> </screen> - - <screen name="ShowCart"> + + <screen name="Manager"> <section> <actions> - <!-- base/top/specific map first, then more common map added for shared labels --> - <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"/> - <property-to-field resource="order" property="orderPreference.giftEnable" field="giftEnable" default="Y"/> - <set field="titleProperty" value="PageTitleShoppingCart"/> - <set field="headerItem" value="Shopping Cart"/> - <script location="component://webpos/webapp/webpos/WEB-INF/actions/cart/ShowCart.groovy"/> + <set field="titleProperty" value="WebPosPageTitleManager"/> + <set field="headerItem" value="Manager"/> + <set field="leftbarScreenName" value="LeftBar"/> + <set field="leftbarScreenLocation" value="component://webpos/widget/CommonScreens.xml"/> + <set field="rightbarScreenName" value="RightBar"/> + <set field="rightbarScreenLocation" value="component://webpos/widget/CommonScreens.xml"/> + <set field="MainColumnStyle" value="center"/> </actions> <widgets> - <section> - <condition> - <not><if-empty field="shoppingCart"/></not> - </condition> - <widgets> - <container> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/cart/ShowCart.ftl"/></html></platform-specific> - </container> - </widgets> - </section> + <container id="ManagerScreens"> + <decorator-screen name="CommonWebPosManagerDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-screen name="CenterBar" location="component://webpos/widget/CommonScreens.xml"/> + </decorator-section> + </decorator-screen> + </container> </widgets> </section> </screen> - - <screen name="MicroCart"> + + <screen name="Messages"> <section> - <actions> - <script location="component://webpos/webapp/webpos/WEB-INF/actions/cart/MicroCart.groovy"/> - </actions> <widgets> - <screenlet title="${uiLabelMap.PageTitleMain}"> - <container id="MicroCart"> - <platform-specific><html><html-template location="component://webpos/webapp/webpos/cart/MicroCart.ftl"/></html></platform-specific> - </container> - </screenlet> + <container id="Messages"> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/includes/Messages.ftl"/></html></platform-specific> + </container> </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/WebPosSetup.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/WebPosSetup.groovy?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/WebPosSetup.groovy (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/webpos/widget/WebPosSetup.groovy Sun May 29 11:02:09 2011 @@ -31,9 +31,13 @@ productStore = ProductStoreWorker.getPro prodCatalog = CatalogWorker.getProdCatalog(request); if (prodCatalog) { catalogStyleSheet = prodCatalog.styleSheet; - if (catalogStyleSheet) globalContext.catalogStyleSheet = catalogStyleSheet; + if (catalogStyleSheet) { + globalContext.catalogStyleSheet = catalogStyleSheet; + } catalogHeaderLogo = prodCatalog.headerLogo; - if (catalogHeaderLogo) globalContext.catalogHeaderLogo = catalogHeaderLogo; + if (catalogHeaderLogo) { + globalContext.catalogHeaderLogo = catalogHeaderLogo; + } } globalContext.productStore = productStore; Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfActivity.java Sun May 29 11:02:09 2011 @@ -74,7 +74,7 @@ public interface WfActivity extends WfEx /** * Assign Result for this activity. - * @param newResult New result. + * @param result New result. * @throws WfException General workflow exception. * @throws InvalidData Data is invalid */ Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignment.java Sun May 29 11:02:09 2011 @@ -62,7 +62,7 @@ public interface WfAssignment { /** * Set the results of this assignment. - * @param Map The results of the assignement. + * @param results Map The results of the assignement. * @throws WfException */ public void setResult(Map<String, Object> results) throws WfException; Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignmentEventAudit.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignmentEventAudit.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignmentEventAudit.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfAssignmentEventAudit.java Sun May 29 11:02:09 2011 @@ -25,25 +25,25 @@ public interface WfAssignmentEventAudit /** * @throws WfException - * @return + * @return return old resource key */ public String oldResourceKey() throws WfException; /** * @throws WfException - * @return + * @return return old resource name */ public String oldResourceName() throws WfException; /** * @throws WfException - * @return + * @return return new resource key */ public String newResourceKey() throws WfException; /** * @throws WfException - * @return + * @return return new resource name */ public String newResourceName() throws WfException; Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfCreateProcessEventAudit.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfCreateProcessEventAudit.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfCreateProcessEventAudit.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfCreateProcessEventAudit.java Sun May 29 11:02:09 2011 @@ -25,31 +25,31 @@ public interface WfCreateProcessEventAud /** * @throws WfException - * @return + * @return return the activity key */ public String pActivityKey() throws WfException; /** * @throws WfException - * @return + * @return return the process key */ public String pProcessKey() throws WfException; /** * @throws WfException - * @return + * @return return the process name */ public String pProcessName() throws WfException; /** * @throws WfException - * @return + * @return return the process mgr name */ public String pProcessMgrName() throws WfException; /** * @throws WfException - * @return + * @return return the process mgr version */ public String pProcessMgrVersion() throws WfException; Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfDataEventAudit.java Sun May 29 11:02:09 2011 @@ -27,13 +27,13 @@ public interface WfDataEventAudit { /** * @throws WfException - * @return + * @return return the old data */ public Map<String, Object> oldData() throws WfException; /** * @throws WfException - * @return + * @return return the new data */ public Map<String, Object> newData() throws WfException; Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfEventAudit.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfEventAudit.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfEventAudit.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfEventAudit.java Sun May 29 11:02:09 2011 @@ -28,55 +28,55 @@ public interface WfEventAudit { /** * @throws WfException * @throws SourceNotAvailable - * @return + * @return return the source */ public WfExecutionObject source() throws WfException, SourceNotAvailable; /** * @throws WfException - * @return + * @return return the timestamp */ public Timestamp timeStamp() throws WfException; /** * @throws WfException - * @return + * @return return the event type */ public String eventType() throws WfException; /** * @throws WfException - * @return + * @return return the activity key */ public String activityKey() throws WfException; /** * @throws WfException - * @return + * @return return the activity name */ public String activityName() throws WfException; /** * @throws WfException - * @return + * @return return the process key */ public String processKey() throws WfException; /** * @throws WfException - * @return + * @return return the process name */ public String processName() throws WfException; /** * @throws WfException - * @return + * @return return the process mgr name */ public String processMgrName() throws WfException; /** * @throws WfException - * @return + * @return return the process mgr version */ public String processMgrVersion() throws WfException; Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfExecutionObject.java Sun May 29 11:02:09 2011 @@ -39,7 +39,7 @@ public interface WfExecutionObject { /** * @throws WfException General workflow exception. - * @return + * @return return a list */ public List<String> whileOpenType() throws WfException; @@ -243,14 +243,14 @@ public interface WfExecutionObject { /** * Gets the GenericValue object of the definition. - * @returns GenericValue object of the definition. + * @return returns GenericValue object of the definition. * @throws WfException */ public GenericValue getDefinitionObject() throws WfException; /** * Gets the GenericValue object of the runtime workeffort. - * @returns GenericValue object of the runtime workeffort. + * @return returns GenericValue object of the runtime workeffort. * @throws WfException */ public GenericValue getRuntimeObject() throws WfException; Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcess.java Sun May 29 11:02:09 2011 @@ -44,13 +44,13 @@ public interface WfProcess extends WfExe /** * @throws WfException - * @return + * @return returns how many steps */ public int howManyStep() throws WfException; /** * @throws WfException - * @return + * @return returns an iterator of WfActivity */ public Iterator<WfActivity> getIteratorStep() throws WfException; @@ -64,14 +64,14 @@ public interface WfProcess extends WfExe /** * @param member * @throws WfException - * @return + * @return returns if is a member of step */ public boolean isMemberOfStep(WfActivity member) throws WfException; /** * Gets the manager associated with this process * @throws WfException - * @return + * @return returns the manager */ public WfProcessMgr manager() throws WfException; @@ -119,7 +119,8 @@ public interface WfProcess extends WfExe * @param state * @throws WfException * @throws InvalidState - * @return + * @return returns an iterator of WfActivity + */ public Iterator<WfActivity> getActivitiesInState(String state) throws WfException, InvalidState; Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfProcessMgr.java Sun May 29 11:02:09 2011 @@ -29,13 +29,13 @@ public interface WfProcessMgr { /** * @throws WfException - * @return + * @return returns how many process */ public int howManyProcess() throws WfException; /** * @throws WfException - * @return + * @return returns an iterator of WfProcess */ public Iterator<WfProcess> getIteratorProcess() throws WfException; @@ -49,13 +49,13 @@ public interface WfProcessMgr { /** * @param member * @throws WfException - * @return + * @return returns if is a member of process */ public boolean isMemberOfProcess(WfProcess member) throws WfException; /** * @throws WfException - * @return + * @return returns the process manager state type */ public List<String> processMgrStateType() throws WfException; @@ -68,37 +68,37 @@ public interface WfProcessMgr { /** * @throws WfException - * @return + * @return returns the name */ public String name() throws WfException; /** * @throws WfException - * @return + * @return returns the description */ public String description() throws WfException; /** * @throws WfException - * @return + * @return returns the category */ public String category() throws WfException; /** * @throws WfException - * @return + * @return returns the version */ public String version() throws WfException; /** * @throws WfException - * @return + * @return returns the context signature */ public Map<String, Object> contextSignature() throws WfException; /** * @throws WfException - * @return + * @return returns the result signature */ public Map<String, Object> resultSignature() throws WfException; Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfResource.java Sun May 29 11:02:09 2011 @@ -86,8 +86,8 @@ public interface WfResource { /** * Release the resouce from the assignement - * @param fromAssigment - * @param releaseInfo + * @param fromAssignment the from assignement + * @param releaseInfo the release information * @throws WfException * @throws NotAssigned */ Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfStateEventAudit.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfStateEventAudit.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfStateEventAudit.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/WfStateEventAudit.java Sun May 29 11:02:09 2011 @@ -25,13 +25,13 @@ public interface WfStateEventAudit exten /** * @throws WfException - * @return + * @return returns the old state */ public String oldState() throws WfException; /** * @throws WfException - * @return + * @return returns the new state */ public String newState() throws WfException; Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowClient.java Sun May 29 11:02:09 2011 @@ -67,7 +67,7 @@ public class WorkflowClient { /** * Get a new instance of the Workflow Client - * @param dctx A DispatchContext object. + * @param context A DispatchContext object. * *** Note the delegator from this object must match the delegator used by the workflow engine. */ public WorkflowClient(DispatchContext context) { @@ -116,7 +116,6 @@ public class WorkflowClient { * @param partyId The assigned / to be assigned users party ID. * @param roleTypeId The assigned / to be assigned role type ID. * @param fromDate The assignment's from date. - * @return GenericResultWaiter of the start job. * @throws WfException */ public void acceptAndStart(String workEffortId, String partyId, String roleTypeId, Timestamp fromDate) throws WfException { @@ -187,12 +186,14 @@ public class WorkflowClient { /** * Delegate and accept an activity assignment. - * @param workEffortId The WorkEffort entity ID for the activitiy. - * @param partyId The assigned / to be assigned users party ID. - * @param roleTypeId The assigned / to be assigned role type ID. - * @param fromDate The assignment's from date. + * @param workEffortId the WorkEffort entity ID for the activitiy. + * @param fromPartyId the from users party ID. + * @param fromRoleTypeId the from role type ID. + * @param fromFromDate the from date. + * @param toPartyId the assigned users party ID. + * @param toRoleTypeId the assigned role type ID. + * @param toFromDate the assignment's to date. * @param start True to attempt to start the activity. - * @return GenericResultWaiter of the start job. * @throws WfException */ public void delegateAndAccept(String workEffortId, String fromPartyId, String fromRoleTypeId, Timestamp fromFromDate, String toPartyId, String toRoleTypeId, Timestamp toFromDate, boolean start) throws WfException { @@ -215,7 +216,6 @@ public class WorkflowClient { /** * Start the activity. * @param workEffortId The WorkEffort entity ID for the activitiy. - * @return GenericResultWaiter of the start job. * @throws WfException */ public void start(String workEffortId) throws WfException { @@ -246,7 +246,7 @@ public class WorkflowClient { * @param partyId The assigned / to be assigned users party ID. * @param roleTypeId The assigned / to be assigned role type ID. * @param fromDate The assignment's from date. - * @return GenericResultWaiter for the complete job. + * @param result The assignment result. * @throws WfException */ public void complete(String workEffortId, String partyId, String roleTypeId, Timestamp fromDate, Map<String, Object> result) throws WfException { @@ -344,7 +344,6 @@ public class WorkflowClient { * Set the state of the execution object defined by the work effort key. * @param workEffortId The WorkEffort entity key for the execution object. * @param state The new state of the execution object. - * @return Current state of the execution object as a string. * @throws WfException If state change is not allowed. */ public void setState(String workEffortId, String state) throws WfException { Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java Sun May 29 11:02:09 2011 @@ -551,7 +551,6 @@ public abstract class WfExecutionObjectI /** * Updates the runtime data entity - * @param field The field name of the entity (resultDataId,contextDataId) * @param value The value to serialize and set * @throws WfException */ Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfResourceImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfResourceImpl.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfResourceImpl.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfResourceImpl.java Sun May 29 11:02:09 2011 @@ -49,11 +49,11 @@ public class WfResourceImpl implements W /** * Creates a new WfResource + * @param delegator the delegator * @param resourceKey Uniquely identifies the resource * @param resourceName The name of the resource * @param partyId The partyID of this resource * @param roleTypeId The roleTypeId of this resource - * @param fromDate The fromDate of this resource */ public WfResourceImpl(Delegator delegator, String resourceKey, String resourceName, String partyId, String roleTypeId) { this.delegator = delegator; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |