svn commit: r1747769 [1/2] - in /ofbiz/trunk: applications/marketing/widget/ applications/order/groovyScrip
Locked
svn commit: r1747769 [1/2] - in /ofbiz/trunk: applications/marketing/widget/ applications/order/groovyScrip
 
|
Author: deepak
Date: Fri Jun 10 18:36:39 2016 New Revision: 1747769 URL: http://svn.apache.org/viewvc?rev=1747769&view=rev Log: (OFBIZ-7227) Relocate .groovy files in the order component Added: ofbiz/trunk/applications/order/groovyScripts/ - copied from r1747740, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/ Removed: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/ Modified: ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml ofbiz/trunk/specialpurpose/ecommerce/widget/OrderScreens.xml ofbiz/trunk/specialpurpose/webpos/widget/CatalogScreens.xml Modified: ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml Fri Jun 10 18:36:39 2016 @@ -48,7 +48,7 @@ under the License. <section> <actions> <set field="titleProperty" value="MarketingReports"/> - <!-- <script location="component://order/webapp/ordermgr/WEB-INF/actions/reports/ReportList.groovy"/>--> + <!-- <script location="component://order/groovyScripts/reports/ReportList.groovy"/>--> </actions> <widgets> <decorator-screen name="CommonMarketReportDecorator"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Fri Jun 10 18:36:39 2016 @@ -283,7 +283,7 @@ under the License. <entity-one entity-name="CustRequestItem" value-field="custRequestItem"/> <set field="statusId" from-field="custRequestItem.statusId"/> <entity-one entity-name="StatusItem" value-field="currentStatus"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/request/GetNextSequenceNum.groovy"/> + <script location="component://order/groovyScripts/request/GetNextSequenceNum.groovy"/> </actions> <widgets> <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> @@ -315,7 +315,7 @@ under the License. <set field="custRequestItemSeqId" from-field="parameters.custRequestItemSeqId"/> <entity-one entity-name="CustRequest" value-field="custRequest"/> <entity-one entity-name="CustRequestItem" value-field="custRequestItem"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/request/RequestItemNotes.groovy"/> + <script location="component://order/groovyScripts/request/RequestItemNotes.groovy"/> </actions> <widgets> <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> @@ -378,7 +378,7 @@ under the License. <field-map from-field="custRequestItem.custRequestId" field-name="custRequestId"/> <field-map from-field="custRequestItem.custRequestItemSeqId" field-name="custRequestItemSeqId"/> </entity-and> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/request/SetRequestQuote.groovy"/> + <script location="component://order/groovyScripts/request/SetRequestQuote.groovy"/> </actions> <widgets> <decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml Fri Jun 10 18:36:39 2016 @@ -51,7 +51,7 @@ under the License. <screen name="orderShortcuts"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShoppingList.groovy"/> + <script location="component://order/groovyScripts/entry/ShoppingList.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/OrderShortcuts.ftl"/></html></platform-specific> @@ -67,8 +67,8 @@ under the License. <set field="productsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/> <property-to-field resource="order" property="orderPreference.giftEnable" field="giftEnable" default="Y"/> <set field="promoUseDetailsInlineScreen" value="component://order/widget/ordermgr/OrderEntryCartScreens.xml#promoUseDetailsInline"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShowPromoText.groovy"/> + <script location="component://order/groovyScripts/entry/ShowCart.groovy"/> + <script location="component://order/groovyScripts/entry/ShowPromoText.groovy"/> <entity-condition entity-name="ProductStorePromoAndAppl" list="allProductPromos" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="manualOnly" value="Y"/> @@ -100,8 +100,8 @@ under the License. <set field="titleProperty" value="PageTitleOrderShowCart"/> <set field="productsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/> <set field="promoUseDetailsInlineScreen" value="component://order/widget/ordermgr/OrderEntryCartScreens.xml#promoUseDetailsInline"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShowPromoText.groovy"/> + <script location="component://order/groovyScripts/entry/ShowCart.groovy"/> + <script location="component://order/groovyScripts/entry/ShowPromoText.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderEntryDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> @@ -117,8 +117,8 @@ under the License. <actions> <set field="titleProperty" value="PageTitleShowAllPromotions"/> <set field="promoUseDetailsInlineScreen" value="component://order/widget/ordermgr/OrderEntryCartScreens.xml#promoUseDetailsInline"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShowPromoText.groovy"/> + <script location="component://order/groovyScripts/entry/ShowCart.groovy"/> + <script location="component://order/groovyScripts/entry/ShowPromoText.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderEntryDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> @@ -134,7 +134,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleShowPromotionDetails"/> <set field="productsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy"/> + <script location="component://order/groovyScripts/entry/cart/ShowPromotionDetails.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderEntryDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> @@ -167,7 +167,7 @@ under the License. <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.groovy"/> + <script location="component://order/groovyScripts/entry/cart/LookupBulkAddProducts.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> @@ -182,7 +182,7 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleLookupBulkAddSupplierProduct"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy"/> + <script location="component://order/groovyScripts/entry/cart/LookupBulkAddSupplierProducts.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> @@ -197,7 +197,7 @@ under the License. <section> <actions> <set field="titleProperty" value="OrderAddGiftCertificate"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/AddGiftCertificates.groovy"/> + <script location="component://order/groovyScripts/entry/AddGiftCertificates.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> @@ -214,7 +214,7 @@ under the License. <section> <actions> <set field="titleProperty" value="OrderAssociatedProducts"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy"/> + <script location="component://order/groovyScripts/lookup/LookupAssociatedProducts.groovy"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml Fri Jun 10 18:36:39 2016 @@ -25,7 +25,7 @@ under the License. <screen name="choosecatalog"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ChooseCatalog.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/ChooseCatalog.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/ChooseCatalog.ftl"/></html></platform-specific> @@ -35,7 +35,7 @@ under the License. <screen name="keywordsearchbox"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearchOptions.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/KeywordSearchOptions.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/KeywordSearchBox.ftl"/></html></platform-specific> @@ -45,7 +45,7 @@ under the License. <screen name="sidedeepcategory"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/SideDeepCategory.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/SideDeepCategory.ftl"/></html></platform-specific> @@ -58,7 +58,7 @@ under the License. <actions> <set field="showPriceDetails" value="Y"/> <set field="backendPath" value="Y"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/ProductSummary.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/ProductSummary.ftl"/></html></platform-specific> @@ -69,7 +69,7 @@ under the License. <screen name="breadcrumbs"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/SideDeepCategory.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/BreadCrumbs.ftl"/></html></platform-specific> @@ -105,7 +105,7 @@ under the License. <screen name="category-include"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/Category.groovy"/> </actions> <widgets> <section> @@ -126,7 +126,7 @@ under the License. <section> <actions> <set field="productsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/CategoryDetail.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/CategoryDetail.ftl"/></html></platform-specific> @@ -138,7 +138,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleProductPage"/> <set field="configproductdetailScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#configproductdetail"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/Product.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> @@ -165,7 +165,7 @@ under the License. <set field="productsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/> <set field="showPriceDetails" value="Y"/> <!-- Warning: this groovy file in the order component is slightly different from that of the ecommerce one (the currency is taken from the cart) --> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/ProductDetail.groovy"/> </actions> <widgets> <include-screen name="breadcrumbs"/> @@ -181,9 +181,9 @@ under the License. <actions> <set field="productsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/> <set field="inlineProductDetailScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#inlineProductDetail"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/ProductDetail.groovy"/> <!--<script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/prepareconfigform.bsh"/>--> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/PrepareConfigForm.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/PrepareConfigForm.groovy"/> </actions> <widgets> <include-screen name="breadcrumbs"/> @@ -196,7 +196,7 @@ under the License. <screen name="inlineProductDetail"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/InlineProductDetail.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/InlineProductDetail.ftl"/></html></platform-specific> @@ -208,7 +208,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleSearchResults"/> <set field="productsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/KeywordSearch.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> @@ -224,7 +224,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleAdvancedSearch"/> <set field="headerItem" value="Advanced Search"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/AdvancedSearchOptions.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/AdvancedSearchOptions.groovy"/> <entity-condition entity-name="PartyRoleAndPartyDetail" list="supplerPartyRoleAndPartyDetails"> <condition-expr field-name="roleTypeId" value="SUPPLIER"/> @@ -247,7 +247,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleQuickAdd"/> <set field="quickaddsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#quickaddsummary"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/QuickAdd.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/QuickAdd.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> @@ -261,7 +261,7 @@ under the License. <screen name="quickaddsummary"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/ProductSummary.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/QuickAddSummary.ftl"/></html></platform-specific> @@ -274,7 +274,7 @@ under the License. <set field="titleProperty" value="ProductCompareProducts"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" from-field="uiLabelMap.ProductCompareProducts"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CompareProducts.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/CompareProducts.groovy"/> </actions> <widgets> <decorator-screen name="CommonPopUpDecorator" location="${parameters.mainDecoratorLocation}"> @@ -293,7 +293,7 @@ under the License. <screen name="ProductUomDropDownOnly"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/ProductUomDropDownOnly.groovy"/> </actions> <widgets> <section> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml Fri Jun 10 18:36:39 2016 @@ -22,7 +22,7 @@ under the License. <section> <actions> <set field="headerItem" value="orderentry"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetShoppingCart.groovy"/> + <script location="component://order/groovyScripts/entry/SetShoppingCart.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -47,7 +47,7 @@ under the License. <section> <actions> <set field="headerItem" value="orderentry"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetShoppingCart.groovy"/> + <script location="component://order/groovyScripts/entry/SetShoppingCart.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Fri Jun 10 18:36:39 2016 @@ -25,8 +25,8 @@ under the License. <section> <actions> <set field="headerItem" value="orderentry"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetShoppingCart.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetCheckOutTabBar.groovy"/> + <script location="component://order/groovyScripts/entry/SetShoppingCart.groovy"/> + <script location="component://order/groovyScripts/entry/SetCheckOutTabBar.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -50,9 +50,9 @@ under the License. <actions> <set field="headerItem" value="orderentry"/> <set field="titleProperty" value="PageTitleCheckoutOptions"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/StorePaymentOptions.groovy"/> + <script location="component://order/groovyScripts/entry/CheckoutPayment.groovy"/> + <script location="component://order/groovyScripts/entry/CheckoutOptions.groovy"/> + <script location="component://order/groovyScripts/entry/StorePaymentOptions.groovy"/> <property-to-field resource="order" property="orderPreference.giftEnable" field="giftEnable" default="Y"/> </actions> <widgets> @@ -72,7 +72,7 @@ under the License. <section> <actions> <set field="stepLabelId" value="PartyParties"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy"/> + <script location="component://order/groovyScripts/entry/ShipSettings.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCheckoutDecorator"> @@ -90,7 +90,7 @@ under the License. <actions> <set field="stepTitleId" value="OrderOrderEntryShipToSettings"/> <set field="stepLabelId" value="FacilityShipping"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy"/> + <script location="component://order/groovyScripts/entry/ShipSettings.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCheckoutDecorator"> @@ -108,7 +108,7 @@ under the License. <actions> <set field="stepTitleId" value="OrderOrderEntryShipToSettings"/> <set field="stepLabelId" value="FacilityShipping"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy"/> + <script location="component://order/groovyScripts/entry/ShipSettings.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCheckoutDecorator"> @@ -126,7 +126,7 @@ under the License. <actions> <set field="stepTitleId" value="SetItemShipGroups"/> <set field="stepLabelId" value="OrderShipGroups"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetShoppingCart.groovy"/> + <script location="component://order/groovyScripts/entry/SetShoppingCart.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCheckoutDecorator"> @@ -144,7 +144,7 @@ under the License. <actions> <set field="stepTitleId" value="OrderOrderOptionSettings"/> <set field="stepLabelId" value="CommonOptions"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/OptionSettings.groovy"/> + <script location="component://order/groovyScripts/entry/OptionSettings.groovy"/> <property-to-field resource="order" property="orderPreference.giftEnable" field="giftEnable" default="Y"/> </actions> <widgets> @@ -163,7 +163,7 @@ under the License. <actions> <set field="stepTitleId" value="OrderOrderEntryPaymentSettings"/> <set field="stepLabelId" value="AccountingPayment"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/BillSettings.groovy"/> + <script location="component://order/groovyScripts/entry/BillSettings.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCheckoutDecorator"> @@ -181,8 +181,8 @@ under the License. <actions> <set field="stepTitleId" value="PartyAdditionalPartyEntry"/> <set field="stepLabelId" value="PartyParties"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/AdditionalPartyListing.groovy"/> + <script location="component://order/groovyScripts/entry/SetAdditionalParty.groovy"/> + <script location="component://order/groovyScripts/entry/AdditionalPartyListing.groovy"/> <!-- asmslect parameters, must be prefixed by asm_ for SetMultipleSelectJs.ftl --> <!--set field="asm_multipleSelectForm" value="addAdditionalPartyForm"/> @@ -213,7 +213,7 @@ under the License. <actions> <set field="stepTitleId" value="OrderOrderEntryOrderTerms"/> <set field="stepLabelId" value="OrderOrderTerms"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/OrderTerms.groovy"/> + <script location="component://order/groovyScripts/entry/OrderTerms.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCheckoutDecorator"> @@ -232,7 +232,7 @@ under the License. <set field="stepTitleId" value="OrderOrderConfirmation"/> <set field="stepLabelId" value="OrderReviewOrder"/> <property-to-field resource="order" property="orderPreference.giftEnable" field="giftEnable" default="Y"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy"/> + <script location="component://order/groovyScripts/entry/CheckoutReview.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCheckoutDecorator"> @@ -261,7 +261,7 @@ under the License. <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleCheckoutOptions"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy"/> + <script location="component://order/groovyScripts/entry/CheckoutShippingAddress.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -279,8 +279,8 @@ under the License. <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleCheckoutOptions"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/StorePaymentOptions.groovy"/> + <script location="component://order/groovyScripts/entry/CheckoutPayment.groovy"/> + <script location="component://order/groovyScripts/entry/StorePaymentOptions.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -315,7 +315,7 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleLookupBulkAddSupplierProduct"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy"/> + <script location="component://order/groovyScripts/entry/cart/LookupBulkAddSupplierProducts.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -341,7 +341,7 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleSplitItemsForShipping"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy"/> + <script location="component://order/groovyScripts/entry/SplitShip.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml Fri Jun 10 18:36:39 2016 @@ -23,7 +23,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleOrderInits"/> <set field="headerItem" value="orderentry"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy"/> + <script location="component://order/groovyScripts/entry/CheckInits.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -39,7 +39,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleOrderAgreements"/> <set field="headerItem" value="orderentry"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/OrderAgreements.groovy"/> + <script location="component://order/groovyScripts/entry/OrderAgreements.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -59,7 +59,7 @@ under the License. <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetShoppingCart.groovy"/> + <script location="component://order/groovyScripts/entry/SetShoppingCart.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"> @@ -98,7 +98,7 @@ under the License. <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="requestParameters.statusId" to-scope="screen" default-value="QUO_APPROVED"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetShoppingCart.groovy"/> + <script location="component://order/groovyScripts/entry/SetShoppingCart.groovy"/> <set field="requestParameters.currencyUomId" to-scope="screen" from-field="currencyUomId"/> </actions> <widgets> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml Fri Jun 10 18:36:39 2016 @@ -32,7 +32,7 @@ under the License. <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy"/> + <script location="component://order/groovyScripts/order/OrderView.groovy"/> </actions> <widgets> <decorator-screen name="FoReportDecorator" location="component://common/widget/CommonScreens.xml"> @@ -79,7 +79,7 @@ under the License. <screen name="CompanyLogo"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy"/> + <script location="component://order/groovyScripts/order/CompanyHeader.groovy"/> </actions> <widgets> <platform-specific><xsl-fo><html-template location="component://order/template/order/CompanyHeader.fo.ftl"/></xsl-fo></platform-specific> @@ -93,8 +93,8 @@ under the License. <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy"/> + <script location="component://order/groovyScripts/return/ReturnHeader.groovy"/> + <script location="component://order/groovyScripts/return/ReturnItems.groovy"/> </actions> <widgets> <decorator-screen name="FoReportDecorator" location="component://common/widget/CommonScreens.xml"> @@ -144,7 +144,7 @@ under the License. <set field="titleProperty" value="OrderShipGroups"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy"/> + <script location="component://order/groovyScripts/order/ShipGroups.groovy"/> </actions> <widgets> <decorator-screen name="FoReportDecorator" location="component://common/widget/CommonScreens.xml"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReportScreens.xml Fri Jun 10 18:36:39 2016 @@ -38,7 +38,7 @@ under the License. <actions> <set field="titleProperty" value="OrderReports"/> <set field="headerItem" value="reports"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/reports/ReportList.groovy"/> + <script location="component://order/groovyScripts/reports/ReportList.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderReportDecorator"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml Fri Jun 10 18:36:39 2016 @@ -67,7 +67,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleFindQuickReturn"/> <set field="headerItem" value="return"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy"/> + <script location="component://order/groovyScripts/return/QuickReturn.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderReturnDecorator" location="${parameters.orderReturnDecoratorLocation}"> @@ -90,7 +90,7 @@ under the License. <set field="tabButtonItem" value="OrderReturnHeader"/> <set field="layoutSettings.javaScripts[+0]" value="/ordermgr-js/return.js" global="true"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy"/> + <script location="component://order/groovyScripts/return/ReturnHeader.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderReturnDecorator" location="${parameters.orderReturnDecoratorLocation}"> @@ -131,7 +131,7 @@ under the License. <set field="titleProperty" value="PageTitleReturnItems"/> <set field="headerItem" value="return"/> <set field="tabButtonItem" value="OrderReturnItems"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy"/> + <script location="component://order/groovyScripts/return/ReturnItems.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderReturnDecorator" location="${parameters.orderReturnDecoratorLocation}"> @@ -158,7 +158,7 @@ under the License. <set field="headerItem" value="return"/> <set field="tabButtonItem" value="OrderReturnHistory"/> <set field="returnId" from-field="parameters.returnId"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy"/> + <script location="component://order/groovyScripts/return/ReturnItems.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderReturnDecorator" location="${parameters.orderReturnDecoratorLocation}"> @@ -208,7 +208,7 @@ under the License. <section> <actions> <set field="entityField" value="returnTypeId"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnHistory.groovy"/> + <script location="component://order/groovyScripts/return/ReturnHistory.groovy"/> </actions> <widgets> <section> @@ -236,7 +236,7 @@ under the License. <section> <actions> <set field="entityField" value="returnReasonId"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnHistory.groovy"/> + <script location="component://order/groovyScripts/return/ReturnHistory.groovy"/> </actions> <widgets> <section> @@ -264,7 +264,7 @@ under the License. <section> <actions> <set field="entityField" value="returnQuantity"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnHistory.groovy"/> + <script location="component://order/groovyScripts/return/ReturnHistory.groovy"/> </actions> <widgets> <section> @@ -292,7 +292,7 @@ under the License. <section> <actions> <set field="entityField" value="receivedQuantity"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnHistory.groovy"/> + <script location="component://order/groovyScripts/return/ReturnHistory.groovy"/> </actions> <widgets> <section> @@ -320,7 +320,7 @@ under the License. <section> <actions> <set field="entityField" value="returnPrice"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnHistory.groovy"/> + <script location="component://order/groovyScripts/return/ReturnHistory.groovy"/> </actions> <widgets> <section> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml Fri Jun 10 18:36:39 2016 @@ -38,7 +38,7 @@ under the License. <actions> <set field="titleProperty" value="OrderOrderEntryPaymentSettings"/> <set field="headerItem" value="setup"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy"/> + <script location="component://order/groovyScripts/setup/PaymentSetup.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderTaskDecorator"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml Fri Jun 10 18:36:39 2016 @@ -86,7 +86,7 @@ Also add this back to AppHeader.ftl: <actions> <set field="titleProperty" value="OrderOrderTasks"/> <set field="headerItem" value="tasklist"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy"/> + <script location="component://order/groovyScripts/task/OrderTaskList.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderTaskDecorator"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Fri Jun 10 18:36:39 2016 @@ -55,8 +55,8 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/ordermgr-js/order.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/ordermgr-js/OrderShippingInfo.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/ordermgr-js/geoAutoCompleter.js" global="true"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderViewWebSecure.groovy"/> + <script location="component://order/groovyScripts/order/OrderView.groovy"/> + <script location="component://order/groovyScripts/order/OrderViewWebSecure.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderViewDecorator"> @@ -202,8 +202,8 @@ under the License. <set field="titleProperty" value="OrderLookupOrder"/> <set field="headerItem" value="orderlist"/> <set field="filterDate" type="Timestamp" from-field="parameters.filterDate"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/FilterOrderList.groovy"/> + <script location="component://order/groovyScripts/order/OrderList.groovy"/> + <script location="component://order/groovyScripts/order/FilterOrderList.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderViewDecorator"> @@ -221,8 +221,8 @@ under the License. <actions> <set field="titleProperty" value="OrderEditItems"/> <set field="headerItem" value="orderlist"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderViewWebSecure.groovy"/> + <script location="component://order/groovyScripts/order/OrderView.groovy"/> + <script location="component://order/groovyScripts/order/OrderViewWebSecure.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderViewDecorator"> @@ -245,7 +245,7 @@ under the License. <actions> <set field="titleProperty" value="OrderFindOrder"/> <set field="headerItem" value="findorders"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy"/> + <script location="component://order/groovyScripts/order/FindOrders.groovy"/> <script location="component://content/groovyScripts/print/FindPrinters.groovy"/> <!-- asmslect parameters, must be prefixed by asm_ for SetMultipleSelectJs.ftl --> @@ -277,7 +277,7 @@ under the License. <actions> <set field="titleProperty" value="OrderAddNote"/> <set field="headerItem" value="findorders"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/NewNote.groovy"/> + <script location="component://order/groovyScripts/order/NewNote.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderViewDecorator"> @@ -305,7 +305,7 @@ under the License. <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy"/> + <script location="component://order/groovyScripts/order/OrderDeliveryScheduleInfo.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderViewDecorator"> @@ -323,7 +323,7 @@ under the License. <actions> <set field="titleProperty" value="OrderOrderStatisticsPage"/> <set field="headerItem" value="stats"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderStats.groovy"/> + <script location="component://order/groovyScripts/order/OrderStats.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderViewDecorator"> @@ -341,7 +341,7 @@ under the License. <actions> <set field="titleProperty" value="OrderReceiveOfflinePayments"/> <set field="headerItem" value="findorders"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/ReceivePayment.groovy"/> + <script location="component://order/groovyScripts/order/ReceivePayment.groovy"/> <entity-and entity-name="OrderRole" list="orderRoles"> <field-map field-name="orderId" value="${parameters.orderId}"/> <field-map field-name="roleTypeId" value="BILL_FROM_VENDOR"/> @@ -365,7 +365,7 @@ under the License. <section> <actions> <set field="titleProperty" value="OrderViewImage"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/ViewImage.groovy"/> + <script location="component://order/groovyScripts/order/ViewImage.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/order/ViewImage.ftl"/></html></platform-specific> @@ -378,7 +378,7 @@ under the License. <set field="titleProperty" value="OrderSendConfirmationEmail"/> <set field="headerItem" value="findorders"/> <set field="emailType" value="PRDS_ODR_CONFIRM"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy"/> + <script location="component://order/groovyScripts/order/SendConfirmationEmail.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderViewDecorator"> @@ -397,7 +397,7 @@ under the License. <set field="titleProperty" value="OrderSendConfirmationEmail"/> <set field="headerItem" value="findorders"/> <set field="emailType" value="PRDS_ODR_COMPLETE"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy"/> + <script location="component://order/groovyScripts/order/SendConfirmationEmail.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderViewDecorator"> @@ -436,7 +436,7 @@ under the License. <section> <actions> <set field="headerItem" value="findorders"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderHistory.groovy"/> + <script location="component://order/groovyScripts/order/OrderHistory.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderViewDecorator"> @@ -539,7 +539,7 @@ under the License. <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="filterDate" type="Timestamp" value="${nowTimestamp}"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy"/> + <script location="component://order/groovyScripts/order/OrderList.groovy"/> </actions> <widgets> <section> Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Fri Jun 10 18:36:39 2016 @@ -173,7 +173,7 @@ under the License. <get-related value-field="quote" relation-name="QuoteItem" list="quoteItems" order-by-list="listOrderBy"/> <get-related value-field="quote" relation-name="QuoteAdjustment" list="quoteAdjustments"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyAddress.groovy"/> + <script location="component://order/groovyScripts/quote/GetPartyAddress.groovy"/> <!-- <get-related value-name="quote" relation-name="QuoteRole" list-name="quoteRoles"/> <get-related value-name="quote" relation-name="QuoteAttribute" list-name="quoteAttributes"/> @@ -500,7 +500,7 @@ under the License. </entity-and> <set from-field="quote.quoteId" field="quoteId"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/quote/ManageQuotePrices.groovy"/> + <script location="component://order/groovyScripts/quote/ManageQuotePrices.groovy"/> </actions> <widgets> <decorator-screen name="CommonQuoteDecorator" location="${parameters.quoteDecoratorLocation}"> @@ -604,7 +604,7 @@ under the License. </entity-and> <set from-field="quote.quoteId" field="quoteId"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/quote/ViewQuoteProfit.groovy"/> + <script location="component://order/groovyScripts/quote/ViewQuoteProfit.groovy"/> </actions> <widgets> <decorator-screen name="CommonQuoteDecorator" location="${parameters.quoteDecoratorLocation}"> @@ -629,7 +629,7 @@ under the License. <set field="quoteId" from-field="parameters.quoteId"/> <entity-one entity-name="Quote" value-field="quote"/> <get-related-one value-field="quote" relation-name="Party" to-value-field="party"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyEmailAddress.groovy"/> + <script location="component://order/groovyScripts/quote/GetPartyEmailAddress.groovy"/> </actions> <widgets> <decorator-screen name="CommonQuoteDecorator" location="${parameters.quoteDecoratorLocation}"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Fri Jun 10 18:36:39 2016 @@ -239,7 +239,7 @@ under the License. <set field="viewIndex" value="${parameters.VIEW_INDEX}" default-value="0" type="Integer"/> <set field="fromOrderDate" from-field="parameters.fromOrderDate" type="Timestamp"/> <set field="thruOrderDate" from-field="parameters.thruOrderDate" type="Timestamp"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy"/> + <script location="component://order/groovyScripts/reports/OpenOrderItemsReport.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Fri Jun 10 18:36:39 2016 @@ -114,7 +114,7 @@ under the License. <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/requirement/SelectCreatedProposed.groovy"/> + <script location="component://order/groovyScripts/requirement/SelectCreatedProposed.groovy"/> </actions> <widgets> <decorator-screen name="CommonRequirementsDecorator" location="${parameters.commonRequirementsDecoratorLocation}"> @@ -142,7 +142,7 @@ under the License. <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="_rowSubmit" value="Y"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/requirement/ApprovedProductRequirements.groovy"/> + <script location="component://order/groovyScripts/requirement/ApprovedProductRequirements.groovy"/> </actions> <widgets> <decorator-screen name="CommonRequirementsDecorator" location="${parameters.commonRequirementsDecoratorLocation}"> @@ -215,7 +215,7 @@ under the License. <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/requirement/ApprovedProductRequirementsByVendor.groovy"/> + <script location="component://order/groovyScripts/requirement/ApprovedProductRequirementsByVendor.groovy"/> </actions> <widgets> <decorator-screen name="CommonRequirementsDecorator" location="${parameters.commonRequirementsDecoratorLocation}"> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Fri Jun 10 18:36:39 2016 @@ -1283,7 +1283,7 @@ under the License. <set field="titleProperty" value="PageTitleViewProductOrders"/> <set field="tabButtonItem" value="viewProductOrder"/> <set field="labelTitleProperty" value="OrderOrders"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy"/> + <script location="component://order/groovyScripts/order/FindOrders.groovy"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Jun 10 18:36:39 2016 @@ -1221,7 +1221,7 @@ under the License. <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="facilityId" from-field="parameters.facilityId"/> <set field="pickMoveInfoList" from-field="parameters.pickMoveInfoList"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy"/> + <script location="component://order/groovyScripts/order/CompanyHeader.groovy"/> </actions> <widgets> <section> Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign (original) +++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign Fri Jun 10 18:36:39 2016 @@ -838,7 +838,7 @@ context.put("locale", reportContext.getL context.put("parameters", parameters); context.put("delegator", delegator); context.put("dispatcher", dispatcher); -GroovyUtil.runScriptAtLocation("component://order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy", context); +GroovyUtil.runScriptAtLocation("component://order/groovyScripts/order/CompanyHeader.groovy", context); var postalAddress = context.get("postalAddress"); var country = postalAddress.getRelatedOne("CountryGeo", false); var phone = context.get("phone"); Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign (original) +++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign Fri Jun 10 18:36:39 2016 @@ -59,7 +59,7 @@ companyLogoCtx.put("nowTimestamp", UtilD companyLogoCtx.put("locale", reportContext.getLocale()); companyLogoCtx.put("parameters", parameters); companyLogoCtx.put("delegator", delegator); -GroovyUtil.runScriptAtLocation("component://order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy", companyLogoCtx); +GroovyUtil.runScriptAtLocation("component://order/groovyScripts/order/CompanyHeader.groovy", companyLogoCtx); logoImageUrl = companyLogoCtx.get("logoImageUrl"); if (!logoImageUrl) { logoImageUrl = FileUtil.getFile("component://images/webapp/images/ofbiz_logo.gif").getPath(); Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml Fri Jun 10 18:36:39 2016 @@ -538,7 +538,7 @@ <actions> <set field="headerItem" value="ebayStore"/> <set field="sellingManagerItem" value="ordersImported"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy"/> + <script location="component://order/groovyScripts/order/FindOrders.groovy"/> <set field="orderList" value="${orderList}" type="List"/> <set field="productStoreId" from-field="parameters.productStoreId"/> </actions> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CartScreens.xml Fri Jun 10 18:36:39 2016 @@ -115,7 +115,7 @@ under the License. <set field="MainColumnStyle" value="center"/> <set field="productsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/> <set field="titleProperty" value="PageTitleShowPromotionDetails"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy"/> + <script location="component://order/groovyScripts/entry/cart/ShowPromotionDetails.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CatalogScreens.xml Fri Jun 10 18:36:39 2016 @@ -37,7 +37,7 @@ under the License. <screen name="keywordsearchbox"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearchOptions.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/KeywordSearchOptions.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/KeywordSearchBox.ftl"/></html></platform-specific> @@ -49,7 +49,7 @@ under the License. <section> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/SideDeepCategory.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/template/catalog/SideDeepCategory.ftl"/></html></platform-specific> @@ -81,7 +81,7 @@ under the License. <section> <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/SideDeepCategory.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/template/catalog/MiniLastViewedCategories.ftl"/></html></platform-specific> @@ -132,7 +132,7 @@ under the License. <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/ProductSummary.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/ProductSummary.ftl"/></html></platform-specific> @@ -144,7 +144,7 @@ under the License. <section> <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/SideDeepCategory.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/BreadCrumbs.ftl"/></html></platform-specific> @@ -163,7 +163,7 @@ under the License. <set field="MainColumnStyle" value="center"/> <set field="titleProperty" value="PageTitleCategoryPage"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/Category.groovy"/> <!-- Open this commented section for the demo of Layered Navigation, navigate through Gizmo and Widgets categories to see it in action. <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/LayeredNavigation.groovy"/> <set field="detailScreen" value="LayeredCategoryDetail"/> @@ -205,7 +205,7 @@ under the License. <set field="productsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/> <set field="productCategoryLinkScreen" value="component://ecommerce/widget/CatalogScreens.xml#ProductCategoryLink"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/CategoryDetail.groovy"/> <entity-and entity-name="ProductCategoryLink" list="productCategoryLinks" use-cache="true" filter-by-date="true"> <field-map field-name="productCategoryId" from-field="productCategoryId"/> @@ -252,7 +252,7 @@ under the License. <set field="titleProperty" value="PageTitleProductPage"/> <set field="layoutSettings.javaScripts[]" value="/ecommerce/images/productAdditionalView.js" global="true"/> <set field="configproductdetailScreen" value="component://ecommerce/widget/CatalogScreens.xml#configproductdetail"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/Product.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -279,7 +279,7 @@ under the License. <actions> <set field="productsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/ProductDetail.groovy"/> </actions> <widgets> <include-screen name="breadcrumbs"/> @@ -291,7 +291,7 @@ under the License. <screen name="inlineProductDetail"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/InlineProductDetail.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/InlineProductDetail.ftl"/></html></platform-specific> @@ -304,8 +304,8 @@ under the License. <actions> <set field="productsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#productsummary"/> <set field="inlineProductDetailScreen" value="component://ecommerce/widget/CatalogScreens.xml#inlineProductDetail"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/PrepareConfigForm.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/ProductDetail.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/PrepareConfigForm.groovy"/> </actions> <widgets> <include-screen name="breadcrumbs"/> @@ -384,7 +384,7 @@ under the License. <set field="quickaddsummaryScreen" value="component://ecommerce/widget/CatalogScreens.xml#quickaddsummary"/> <set field="titleProperty" value="PageTitleQuickAdd"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/QuickAdd.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/QuickAdd.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -399,7 +399,7 @@ under the License. <screen name="quickaddsummary"> <section> <actions> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/ProductSummary.groovy"/> </actions> <widgets> <platform-specific><html><html-template location="component://order/template/entry/catalog/QuickAddSummary.ftl"/></html></platform-specific> @@ -418,7 +418,7 @@ under the License. <set field="titleProperty" value="PageTitleSearchResults"/> <set field="parameters.VIEW_SIZE" from-field="parameters.VIEW_SIZE" default-value="10"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/KeywordSearch.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -441,7 +441,7 @@ under the License. <set field="titleProperty" value="PageTitleTagResults"/> <set field="parameters.VIEW_SIZE" from-field="parameters.VIEW_SIZE" default-value="10"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/KeywordSearch.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -462,7 +462,7 @@ under the License. <set field="titleProperty" value="PageTitleAdvancedSearch"/> <set field="headerItem" value="Advanced Search"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/AdvancedSearchOptions.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/AdvancedSearchOptions.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -536,7 +536,7 @@ under the License. <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/Category.groovy"/> <set field="fromSetSessionLocale" value="${groovy: return request.getAttribute('fromSetSessionLocale');}"/> <set field="visualThemeId" from-field="productStore.visualThemeId" default-value="EC_DEFAULT"/> <service service-name="getVisualThemeResources"> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Fri Jun 10 18:36:39 2016 @@ -313,7 +313,7 @@ under the License. <set field="randomSurveyGroup" value="testSurveyGroup"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/Main.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy"/> + <script location="component://order/groovyScripts/entry/catalog/Category.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml?rev=1747769&r1=1747768&r2=1747769&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml Fri Jun 10 18:36:39 2016 @@ -32,7 +32,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleOrderConfirmationNotice}"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce"/> <set field="title" value="Order"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy"/> + <script location="component://order/groovyScripts/order/OrderView.groovy"/> </actions> <widgets> <decorator-screen name="FoReportDecorator" location="component://common/widget/CommonScreens.xml"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |