svn commit: r1125951 [9/9] - in /ofbiz/trunk: applications/order/config/ applications/order/src/org/ofb
Locked
svn commit: r1125951 [9/9] - in /ofbiz/trunk: applications/order/config/ applications/order/src/org/ofb
 
|
Modified: ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml Sun May 22 13:11:17 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.13.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.6.1.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 Added: ofbiz/trunk/specialpurpose/webpos/widget/CustomerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/CustomerScreens.xml?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/CustomerScreens.xml (added) +++ ofbiz/trunk/specialpurpose/webpos/widget/CustomerScreens.xml Sun May 22 13:11:17 2011 @@ -0,0 +1,53 @@ +<?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="EditAddressList"> + <section> + <widgets> + <container id="EditAddressList"> + <include-screen name="EditAddress"/> + </container> + </widgets> + </section> + </screen> + + <screen name="EditAddress"> + <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/customer/EditAddress.groovy"/> + </actions> + <widgets> + <container> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/customer/EditAddress.ftl"/></html></platform-specific> + </container> + </widgets> + </section> + </screen> +</screens> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/webpos/widget/CustomerScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/widget/CustomerScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/widget/CustomerScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/specialpurpose/webpos/widget/ManagerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/ManagerScreens.xml?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/ManagerScreens.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/widget/ManagerScreens.xml Sun May 22 13:11:17 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/trunk/specialpurpose/webpos/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/PaymentScreens.xml?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/PaymentScreens.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/widget/PaymentScreens.xml Sun May 22 13:11:17 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/trunk/specialpurpose/webpos/widget/PromoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/PromoScreens.xml?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/PromoScreens.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/widget/PromoScreens.xml Sun May 22 13:11:17 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> Added: ofbiz/trunk/specialpurpose/webpos/widget/SearchScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/SearchScreens.xml?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/SearchScreens.xml (added) +++ ofbiz/trunk/specialpurpose/webpos/widget/SearchScreens.xml Sun May 22 13:11:17 2011 @@ -0,0 +1,121 @@ +<?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="Products"> + <section> + <widgets> + <screenlet title="${uiLabelMap.ProductProductSearch}"> + <container id="SearchProducts"> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/search/SearchProducts.ftl"/></html></platform-specific> + </container> + </screenlet> + </widgets> + </section> + </screen> + + <screen name="SearchProductsResults"> + <section> + <widgets> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/search/SearchProductsResults.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> + + <screen name="CustomerAddressList"> + <section> + <widgets> + <container id="CustomerAddressList"> + <include-screen name="CustomerAddress"/> + </container> + </widgets> + </section> + </screen> + + <screen name="CustomerAddress"> + <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/search/CustomerAddress.groovy"/> + </actions> + <widgets> + <container> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/search/CustomerAddress.ftl"/></html></platform-specific> + </container> + </widgets> + </section> + </screen> + + <screen name="Parties"> + <section> + <widgets> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/search/SearchParties.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> + + <screen name="SearchPartiesResults"> + <section> + <widgets> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/search/SearchPartiesResults.ftl"/></html></platform-specific> + </widgets> + </section> + </screen> + + <screen name="SearchSalesReps"> + <section> + <widgets> + <screenlet title="${uiLabelMap.WebPosSearchSalesReps}"> + <container id="SearchSalesReps"> + <include-screen name="SearchSalesRepsList"/> + </container> + </screenlet> + </widgets> + </section> + </screen> + + <screen name="SearchSalesRepsList"> + <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/search/SearchSalesReps.groovy"/> + </actions> + <widgets> + <container> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/search/SearchSalesReps.ftl"/></html></platform-specific> + </container> + </widgets> + </section> + </screen> +</screens> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/webpos/widget/SearchScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/widget/SearchScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/widget/SearchScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/webpos/widget/ShortcutsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/ShortcutsScreens.xml?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/ShortcutsScreens.xml (added) +++ ofbiz/trunk/specialpurpose/webpos/widget/ShortcutsScreens.xml Sun May 22 13:11:17 2011 @@ -0,0 +1,54 @@ +<?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="ShortcutsList"> + <section> + <widgets> + <screenlet title="${uiLabelMap.WebPosShortcuts}"> + <container id="ShortcutsList"> + <include-screen name="Shortcuts"/> + </container> + </screenlet> + </widgets> + </section> + </screen> + + <screen name="Shortcuts"> + <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"/> + </actions> + <widgets> + <container> + <platform-specific><html><html-template location="component://webpos/webapp/webpos/shortcuts/Shortcuts.ftl"/></html></platform-specific> + </container> + </widgets> + </section> + </screen> +</screens> Propchange: ofbiz/trunk/specialpurpose/webpos/widget/ShortcutsScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/widget/ShortcutsScreens.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/widget/ShortcutsScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.groovy?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.groovy (added) +++ ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.groovy Sun May 22 13:11:17 2011 @@ -0,0 +1,38 @@ +/* + * 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. + */ + +import org.ofbiz.webpos.WebPosEvents; +import org.ofbiz.webpos.session.WebPosSession; +import org.ofbiz.webpos.transaction.WebPosTransaction; + +webPosSession = WebPosEvents.getWebPosSession(request, null); +if (webPosSession) { + context.shoppingCartSize = webPosSession.getCart().size(); + context.isManagerLoggedIn = webPosSession.isManagerLoggedIn(); + webPosTransaction = webPosSession.getCurrentTransaction(); + + if (webPosTransaction) { + context.isOpen = webPosTransaction.isOpen(); + } + context.cart = webPosSession.getCart(); + context.totalDue = webPosSession.getCurrentTransaction().getTotalDue(); + context.totalPayments = webPosSession.getCurrentTransaction().getPaymentTotal(); +} else { + context.shoppingCartSize = 0; +} \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.groovy ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.groovy ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.xml?rev=1125951&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.xml (added) +++ ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.xml Sun May 22 13:11:17 2011 @@ -0,0 +1,62 @@ +<?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. +--> +<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> + <menu name="WebPosAppBar" title="${uiLabelMap.WebPosMenuMain}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <actions> + <script location="component://webpos/widget/WebPosMenus.groovy"/> + </actions> + <menu-item name="Manager" title="${uiLabelMap.WebPosMenuManager}"> + <condition> + <and> + <not><if-empty field="isManagerLoggedIn"/></not> + <if-compare field="isManagerLoggedIn" operator="equals" value="true"/> + </and> + </condition> + <link target="Manager"/> + </menu-item> + </menu> + + <menu name="ManagerTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> + <actions> + <script location="component://webpos/widget/WebPosMenus.groovy"/> + </actions> + <menu-item name="ManagerOpenTerminal" title="${uiLabelMap.WebPosManagerOpenTerminal}"> + <link target="javascript:openTerminal();" url-mode="plain"/> + </menu-item> + <menu-item name="ManagerCloseTerminal" title="${uiLabelMap.WebPosManagerCloseTerminal}"> + <link target="javascript:closeTerminal();" url-mode="plain"/> + </menu-item> + <menu-item name="ManagerPaidIn" title="${uiLabelMap.WebPosManagerPaidIn}"> + <link target="javascript:paidOutAndIn('Y', 'IN');" url-mode="plain"/> + </menu-item> + <menu-item name="ManagerPaidOut" title="${uiLabelMap.WebPosManagerPaidOut}"> + <link target="javascript:paidOutAndIn('Y', 'OUT');" url-mode="plain"/> + </menu-item> + <menu-item name="ManagerPromoCode" title="${uiLabelMap.WebPosManagerPromoCode}"> + <link target="javascript:promoCode();" url-mode="plain"/> + </menu-item> + <menu-item name="ManagerVoidOrder" title="${uiLabelMap.WebPosManagerVoidOrder}"> + <link target="javascript:voidOrder();" url-mode="plain"/> + </menu-item> + <menu-item name="Shutdown" title="${uiLabelMap.WebPosManagerShutdown}"> + <link target="Shutdown"/> + </menu-item> + </menu> +</menus> \ No newline at end of file Propchange: ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/specialpurpose/webpos/widget/WebPosMenus.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml Sun May 22 13:11:17 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/trunk/specialpurpose/webpos/widget/WebPosSetup.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/WebPosSetup.groovy?rev=1125951&r1=1125950&r2=1125951&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/widget/WebPosSetup.groovy (original) +++ ofbiz/trunk/specialpurpose/webpos/widget/WebPosSetup.groovy Sun May 22 13:11:17 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; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |