svn commit: r1781219 [8/14] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/groovy
Locked
svn commit: r1781219 [8/14] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/groovy
 
|
Propchange: ofbiz/trunk/plugins/ebaystore/widget/EbaySellingManagerScreens.xml
------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/plugins/ebaystore/widget/EbayStoreForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/plugins/ebaystore/widget/EbayStoreMenus.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/trunk/plugins/ebaystore/widget/EbayStoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/ebaystore/widget/EbayStoreScreens.xml?rev=1781219&r1=1781218&r2=1781219&view=diff ============================================================================== --- ofbiz/trunk/plugins/ebaystore/widget/EbayStoreScreens.xml (original) +++ ofbiz/trunk/plugins/ebaystore/widget/EbayStoreScreens.xml Wed Feb 1 10:58:46 2017 @@ -1,299 +1,299 @@ -<?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" - xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd"> - <screen name="ebayStores"> - <section> - <actions> - <set field="titleProperty" value="${uiLabelMap.EbayStore}"/> - <set field="headerItem" value="ebayStore"/> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-menu name="EbaySubTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/> - <screenlet title="Ebay Accounts"> - <include-form name="EbayAccountList" location="component://ebaystore/widget/EbayStoreForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="ebayStoreDetail"> - <section> - <actions> - <set field="titleProperty" value="${uiLabelMap.EbayStoreSetting}"/> - <set field="headerItem" value="ebayStore"/> - <set field="tabButtonItem" value="ebayStoreSetting"/> - <script location="component://ebaystore/groovyScripts/store/RetrieveStoreOptions.groovy"/> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.EbayStoreSetting}"> - <platform-specific> - <html><html-template location="component://ebaystore/template/store/StoreSetting.ftl"/></html> - </platform-specific> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="exportCategoryEbayStore"> - <section> - <actions> - <set field="titleProperty" value="EbayExportAllCategoryToEbayStore"/> - <set field="headerItem" value="ebayStore"/> - <set field="tabButtonItem" value="ebayExportAllCategoryToEbayStore"/> - <set field="productStoreId" value="${parameters.productStoreId}"/> - <entity-and entity-name="ProdCatalogCategory" list="categoriesList"> - <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> - <order-by field-name="productCategoryId"/> - </entity-and> - <entity-one entity-name="ProdCatalog" value-field="prodCatalog"> - <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> - <select-field field-name="catalogName"/> - </entity-one> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <section> - <condition> - <not> - <if-empty field="parameters.productCategoryId"/> - </not> - </condition> - <actions> - <entity-and entity-name="ProductCategoryRollup" list="categoriesRollupList"> - <field-map field-name="parentProductCategoryId" from-field="parameters.productCategoryId"/> - <order-by field-name="productCategoryId"/> - </entity-and> - </actions> - <widgets> - <section> - <condition> - <not> - <if-empty field="categoriesRollupList"/> - </not> - </condition> - <actions> - <set field="categoriesList" from-field="nullField"/> - <set field="categoriesList" from-field="categoriesRollupList"/> - </actions> - <widgets> - <screenlet> - <screenlet title="${uiLabelMap.EbayExportAllCategoryToEbayStore}"> - <include-form name="ListCurrentStores" location="component://ebaystore/widget/EbayStoreForms.xml"/> - </screenlet> - <screenlet navigation-form-name="ListCategories" title="List category in ${prodCatalog.catalogName}"> - <include-form name="ListCategories" location="component://ebaystore/widget/EbayStoreForms.xml"/> - </screenlet> - </screenlet> - </widgets> - <fail-widgets> - <screenlet title="${uiLabelMap.EbayExportAllCategoryToEbayStore}"> - <include-form name="ListCurrentStores" location="component://ebaystore/widget/EbayStoreForms.xml"/> - </screenlet> - <screenlet navigation-form-name="ListCategories" title="List category in ${prodCatalog.catalogName}"> - <label text="Not found child category"/> - </screenlet> - </fail-widgets> - </section> - </widgets> - <fail-widgets> - <screenlet> - <screenlet title="${uiLabelMap.EbayExportAllCategoryToEbayStore}"> - <include-form name="ListCurrentStores" location="component://ebaystore/widget/EbayStoreForms.xml"/> - </screenlet> - <screenlet navigation-form-name="ListCategories" title="List category in ${prodCatalog.catalogName}"> - <include-form name="ListCategories" location="component://ebaystore/widget/EbayStoreForms.xml"/> - </screenlet> - <link name="exportCategoriesSelectedToEbayStore" target="exportCategoriesSelectedToEbayStore" style="buttontext" text="${uiLabelMap.EbayExportToEbayStore}"> - <parameter param-name="productStoreId" from-field="productStoreId"/> - <parameter param-name="prodCatalogId" from-field="parameters.prodCatalogId"/> - <parameter param-name="partyId" from-field="parameters.partyId"/> - </link> - </screenlet> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <!-- ebay account --> - <screen name="NewEbayAccount"> - <section> - <actions> - <set field="headerItem" value="ebayStore"/> - <set field="tabButtonItem" value="NewEbayAccount"/> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="New Ebay Account"> - <include-form name="NewEbayAccount" location="component://ebaystore/widget/EbayStoreForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="AssociateCatalog"> - <section> - <actions> - <set field="headerItem" value="ebayStore"/> - <set field="tabButtonItem" value="associateCatalogToStore"/> - <entity-and entity-name="ProductStoreCatalog" list="prodStoreCatalogList" filter-by-date="true"> - <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> - </entity-and> - <set field="prodCatalogIds" value="${groovy:org.apache.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(prodStoreCatalogList, 'prodCatalogId', true);}" type="List"/> - <entity-condition entity-name="ProdCatalog" list="prodCatalogList"> - <condition-expr field-name="prodCatalogId" operator="not-in" from-field="prodCatalogIds" ignore-if-empty="true"/> - </entity-condition> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="Add Catalog To Store"> - <include-form name="AddCatalog" location="component://ebaystore/widget/EbayStoreForms.xml"/> - </screenlet> - <section> - <condition> - <not> - <if-empty field="prodStoreCatalogList"/> - </not> - </condition> - <widgets> - <screenlet title="Associated Catalog List"> - <include-grid name="CatalogList" location="component://ebaystore/widget/EbayStoreForms.xml"/> - </screenlet> - </widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <!-- Export product listing --> - <screen name="exportProductListing"> - <section> - <actions> - <set field="titleProperty" value="PageTitleAdvancedSearch"/> - <set field="headerItem" value="ebayStore"/> - <set field="tabButtonItem" value="exportProductListing"/> - <entity-condition entity-name="ProductCategory" list="productCategories"> - <condition-expr field-name="showInSelect" operator="not-equals" value="N"/> - <order-by field-name="description"/> - </entity-condition> - <script location="component://product/groovyScripts/catalog/find/AdvancedSearchOptions.groovy"/> - <script location="component://ebay/groovyScripts/EbayAdvancedSearch.groovy"/> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://ebaystore/template/store/EbayApiKeywordSearch.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="productSearchResults"> - <section> - <actions> - <set field="titleProperty" value="PageTitleSearchResults"/> - <set field="headerItem" value="ebayStore"/> - <set field="tabButtonItem" value="exportProductListing"/> - <set field="toEbayStore" default-value="Y"/> - <set field="productStoreId" from-field="parameters.productStoreId"/> - <script location="component://product/groovyScripts/catalog/find/KeywordSearch.groovy"/> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://ebay/template/find/EbayKeywordSearch.ftl"/></html> - </platform-specific> - <platform-specific> - <html><html-template location="component://ebay/template/find/ebayExportLink.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="prepareProductListing"> - <section> - <actions> - <set field="titleProperty" value="PageTitleSearchResults"/> - <set field="headerItem" value="ebayStore"/> - <set field="tabButtonItem" value="exportProductListing"/> - <!--set field="layoutSettings.javaScripts[+0]" value="/ebaystore/js/itemSpecifics.js" global="true"/--> - <!--entity-condition entity-name="Geo" list="countries"> - <condition-expr field-name="geoTypeId" value="COUNTRY"/> - <order-by field-name="geoName"/> - </entity-condition--> - <set field="productStoreId" from-field="parameters.productStoreId"/> - <set field="search_CategoryId" type="String" from-field="parameters.SEARCH_CATEGORY_ID"/> - <entity-one entity-name="EbayConfig" value-field="ebayConfig"> - <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> - </entity-one> - <script location="component://ebaystore/groovyScripts/store/PrepareProductListing.groovy"/> - <set field="language" from-field="userLogin.lastLocale" default-value="en"/> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <platform-specific> - <html><html-template location="component://ebaystore/template/store/ProductSearchExport.ftl"/></html> - </platform-specific> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="errorMessageList"> - <section> - <actions> - <set field="headerItem" value="ebayStore"/> - <set field="tabButtonItem" value="errorMessageList"/> - <entity-and entity-name="EBayLogMessagesInfo" list="errorMsgList"> - <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> - <order-by field-name="createDatetime DESC"/> - </entity-and> - </actions> - <widgets> - <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <screenlet title="${uiLabelMap.EbayErrorMessageList}"> - <include-grid name="errorMessageList" location="component://ebaystore/widget/EbayStoreForms.xml"/> - </screenlet> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> -</screens> +<?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" + xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd"> + <screen name="ebayStores"> + <section> + <actions> + <set field="titleProperty" value="${uiLabelMap.EbayStore}"/> + <set field="headerItem" value="ebayStore"/> + </actions> + <widgets> + <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <include-menu name="EbaySubTabBar" location="component://ebaystore/widget/EbayStoreMenus.xml"/> + <screenlet title="Ebay Accounts"> + <include-form name="EbayAccountList" location="component://ebaystore/widget/EbayStoreForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="ebayStoreDetail"> + <section> + <actions> + <set field="titleProperty" value="${uiLabelMap.EbayStoreSetting}"/> + <set field="headerItem" value="ebayStore"/> + <set field="tabButtonItem" value="ebayStoreSetting"/> + <script location="component://ebaystore/groovyScripts/store/RetrieveStoreOptions.groovy"/> + </actions> + <widgets> + <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.EbayStoreSetting}"> + <platform-specific> + <html><html-template location="component://ebaystore/template/store/StoreSetting.ftl"/></html> + </platform-specific> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="exportCategoryEbayStore"> + <section> + <actions> + <set field="titleProperty" value="EbayExportAllCategoryToEbayStore"/> + <set field="headerItem" value="ebayStore"/> + <set field="tabButtonItem" value="ebayExportAllCategoryToEbayStore"/> + <set field="productStoreId" value="${parameters.productStoreId}"/> + <entity-and entity-name="ProdCatalogCategory" list="categoriesList"> + <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> + <order-by field-name="productCategoryId"/> + </entity-and> + <entity-one entity-name="ProdCatalog" value-field="prodCatalog"> + <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> + <select-field field-name="catalogName"/> + </entity-one> + </actions> + <widgets> + <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <condition> + <not> + <if-empty field="parameters.productCategoryId"/> + </not> + </condition> + <actions> + <entity-and entity-name="ProductCategoryRollup" list="categoriesRollupList"> + <field-map field-name="parentProductCategoryId" from-field="parameters.productCategoryId"/> + <order-by field-name="productCategoryId"/> + </entity-and> + </actions> + <widgets> + <section> + <condition> + <not> + <if-empty field="categoriesRollupList"/> + </not> + </condition> + <actions> + <set field="categoriesList" from-field="nullField"/> + <set field="categoriesList" from-field="categoriesRollupList"/> + </actions> + <widgets> + <screenlet> + <screenlet title="${uiLabelMap.EbayExportAllCategoryToEbayStore}"> + <include-form name="ListCurrentStores" location="component://ebaystore/widget/EbayStoreForms.xml"/> + </screenlet> + <screenlet navigation-form-name="ListCategories" title="List category in ${prodCatalog.catalogName}"> + <include-form name="ListCategories" location="component://ebaystore/widget/EbayStoreForms.xml"/> + </screenlet> + </screenlet> + </widgets> + <fail-widgets> + <screenlet title="${uiLabelMap.EbayExportAllCategoryToEbayStore}"> + <include-form name="ListCurrentStores" location="component://ebaystore/widget/EbayStoreForms.xml"/> + </screenlet> + <screenlet navigation-form-name="ListCategories" title="List category in ${prodCatalog.catalogName}"> + <label text="Not found child category"/> + </screenlet> + </fail-widgets> + </section> + </widgets> + <fail-widgets> + <screenlet> + <screenlet title="${uiLabelMap.EbayExportAllCategoryToEbayStore}"> + <include-form name="ListCurrentStores" location="component://ebaystore/widget/EbayStoreForms.xml"/> + </screenlet> + <screenlet navigation-form-name="ListCategories" title="List category in ${prodCatalog.catalogName}"> + <include-form name="ListCategories" location="component://ebaystore/widget/EbayStoreForms.xml"/> + </screenlet> + <link name="exportCategoriesSelectedToEbayStore" target="exportCategoriesSelectedToEbayStore" style="buttontext" text="${uiLabelMap.EbayExportToEbayStore}"> + <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="prodCatalogId" from-field="parameters.prodCatalogId"/> + <parameter param-name="partyId" from-field="parameters.partyId"/> + </link> + </screenlet> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <!-- ebay account --> + <screen name="NewEbayAccount"> + <section> + <actions> + <set field="headerItem" value="ebayStore"/> + <set field="tabButtonItem" value="NewEbayAccount"/> + </actions> + <widgets> + <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="New Ebay Account"> + <include-form name="NewEbayAccount" location="component://ebaystore/widget/EbayStoreForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="AssociateCatalog"> + <section> + <actions> + <set field="headerItem" value="ebayStore"/> + <set field="tabButtonItem" value="associateCatalogToStore"/> + <entity-and entity-name="ProductStoreCatalog" list="prodStoreCatalogList" filter-by-date="true"> + <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> + </entity-and> + <set field="prodCatalogIds" value="${groovy:org.apache.ofbiz.entity.util.EntityUtil.getFieldListFromEntityList(prodStoreCatalogList, 'prodCatalogId', true);}" type="List"/> + <entity-condition entity-name="ProdCatalog" list="prodCatalogList"> + <condition-expr field-name="prodCatalogId" operator="not-in" from-field="prodCatalogIds" ignore-if-empty="true"/> + </entity-condition> + </actions> + <widgets> + <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="Add Catalog To Store"> + <include-form name="AddCatalog" location="component://ebaystore/widget/EbayStoreForms.xml"/> + </screenlet> + <section> + <condition> + <not> + <if-empty field="prodStoreCatalogList"/> + </not> + </condition> + <widgets> + <screenlet title="Associated Catalog List"> + <include-grid name="CatalogList" location="component://ebaystore/widget/EbayStoreForms.xml"/> + </screenlet> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <!-- Export product listing --> + <screen name="exportProductListing"> + <section> + <actions> + <set field="titleProperty" value="PageTitleAdvancedSearch"/> + <set field="headerItem" value="ebayStore"/> + <set field="tabButtonItem" value="exportProductListing"/> + <entity-condition entity-name="ProductCategory" list="productCategories"> + <condition-expr field-name="showInSelect" operator="not-equals" value="N"/> + <order-by field-name="description"/> + </entity-condition> + <script location="component://product/groovyScripts/catalog/find/AdvancedSearchOptions.groovy"/> + <script location="component://ebay/groovyScripts/EbayAdvancedSearch.groovy"/> + </actions> + <widgets> + <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <platform-specific> + <html><html-template location="component://ebaystore/template/store/EbayApiKeywordSearch.ftl"/></html> + </platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="productSearchResults"> + <section> + <actions> + <set field="titleProperty" value="PageTitleSearchResults"/> + <set field="headerItem" value="ebayStore"/> + <set field="tabButtonItem" value="exportProductListing"/> + <set field="toEbayStore" default-value="Y"/> + <set field="productStoreId" from-field="parameters.productStoreId"/> + <script location="component://product/groovyScripts/catalog/find/KeywordSearch.groovy"/> + </actions> + <widgets> + <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <platform-specific> + <html><html-template location="component://ebay/template/find/EbayKeywordSearch.ftl"/></html> + </platform-specific> + <platform-specific> + <html><html-template location="component://ebay/template/find/ebayExportLink.ftl"/></html> + </platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="prepareProductListing"> + <section> + <actions> + <set field="titleProperty" value="PageTitleSearchResults"/> + <set field="headerItem" value="ebayStore"/> + <set field="tabButtonItem" value="exportProductListing"/> + <!--set field="layoutSettings.javaScripts[+0]" value="/ebaystore/js/itemSpecifics.js" global="true"/--> + <!--entity-condition entity-name="Geo" list="countries"> + <condition-expr field-name="geoTypeId" value="COUNTRY"/> + <order-by field-name="geoName"/> + </entity-condition--> + <set field="productStoreId" from-field="parameters.productStoreId"/> + <set field="search_CategoryId" type="String" from-field="parameters.SEARCH_CATEGORY_ID"/> + <entity-one entity-name="EbayConfig" value-field="ebayConfig"> + <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> + </entity-one> + <script location="component://ebaystore/groovyScripts/store/PrepareProductListing.groovy"/> + <set field="language" from-field="userLogin.lastLocale" default-value="en"/> + </actions> + <widgets> + <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <platform-specific> + <html><html-template location="component://ebaystore/template/store/ProductSearchExport.ftl"/></html> + </platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="errorMessageList"> + <section> + <actions> + <set field="headerItem" value="ebayStore"/> + <set field="tabButtonItem" value="errorMessageList"/> + <entity-and entity-name="EBayLogMessagesInfo" list="errorMsgList"> + <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> + <order-by field-name="createDatetime DESC"/> + </entity-and> + </actions> + <widgets> + <decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.EbayErrorMessageList}"> + <include-grid name="errorMessageList" location="component://ebaystore/widget/EbayStoreForms.xml"/> + </screenlet> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> +</screens> Propchange: ofbiz/trunk/plugins/ebaystore/widget/EbayStoreScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/plugins/ecommerce/data/DemoPopularCategoriesData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/plugins/ecommerce/data/DemoProductI18nData.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/plugins/ecommerce/groovyScripts/catalog/BestSellingCategory.groovy ------------------------------------------------------------------------------ svn:eol-style = native Modified: ofbiz/trunk/plugins/ecommerce/groovyScripts/customer/ContactList.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/ecommerce/groovyScripts/customer/ContactList.groovy?rev=1781219&r1=1781218&r2=1781219&view=diff ============================================================================== --- ofbiz/trunk/plugins/ecommerce/groovyScripts/customer/ContactList.groovy (original) +++ ofbiz/trunk/plugins/ecommerce/groovyScripts/customer/ContactList.groovy Wed Feb 1 10:58:46 2017 @@ -1,60 +1,60 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.lang.* -import java.util.* -import org.apache.ofbiz.base.util.* -import org.apache.ofbiz.entity.* -import org.apache.ofbiz.entity.util.* -import org.apache.ofbiz.entity.condition.* -import org.apache.ofbiz.party.contact.ContactMechWorker -import org.apache.ofbiz.product.store.ProductStoreWorker -import org.apache.ofbiz.webapp.website.WebSiteWorker -import org.apache.ofbiz.accounting.payment.PaymentWorker - -/*publicEmailContactLists = delegator.findByAnd("ContactList", [isPublic : "Y", contactMechTypeId : "EMAIL_ADDRESS"], ["contactListName"], false) -context.publicEmailContactLists = publicEmailContactLists;*/ - -webSiteId = WebSiteWorker.getWebSiteId(request) -exprList = [] -exprListThruDate = [] -exprList.add(EntityCondition.makeCondition("webSiteId", EntityOperator.EQUALS, webSiteId)) -exprListThruDate.add(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null)) -exprListThruDate.add(EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, UtilDateTime.nowTimestamp())) -orCond = EntityCondition.makeCondition(exprListThruDate, EntityOperator.OR) -exprList.add(orCond) -webSiteContactList = from("WebSiteContactList").where(exprList).queryList() - -publicEmailContactLists = [] -webSiteContactList.each { webSiteContactList -> - contactList = webSiteContactList.getRelatedOne("ContactList", false) - contactListType = contactList.getRelatedOne("ContactListType", false) - temp = [:] - temp.contactList = contactList - temp.contactListType = contactListType - publicEmailContactLists.add(temp) -} -context.publicEmailContactLists = publicEmailContactLists - -if (userLogin) { - partyAndContactMechList = from("PartyAndContactMech").where("partyId", partyId, "contactMechTypeId", "EMAIL_ADDRESS").orderBy("-fromDate").filterByDate().queryList() - context.partyAndContactMechList = partyAndContactMechList -} - - +/* + * 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 java.lang.* +import java.util.* +import org.apache.ofbiz.base.util.* +import org.apache.ofbiz.entity.* +import org.apache.ofbiz.entity.util.* +import org.apache.ofbiz.entity.condition.* +import org.apache.ofbiz.party.contact.ContactMechWorker +import org.apache.ofbiz.product.store.ProductStoreWorker +import org.apache.ofbiz.webapp.website.WebSiteWorker +import org.apache.ofbiz.accounting.payment.PaymentWorker + +/*publicEmailContactLists = delegator.findByAnd("ContactList", [isPublic : "Y", contactMechTypeId : "EMAIL_ADDRESS"], ["contactListName"], false) +context.publicEmailContactLists = publicEmailContactLists;*/ + +webSiteId = WebSiteWorker.getWebSiteId(request) +exprList = [] +exprListThruDate = [] +exprList.add(EntityCondition.makeCondition("webSiteId", EntityOperator.EQUALS, webSiteId)) +exprListThruDate.add(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null)) +exprListThruDate.add(EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, UtilDateTime.nowTimestamp())) +orCond = EntityCondition.makeCondition(exprListThruDate, EntityOperator.OR) +exprList.add(orCond) +webSiteContactList = from("WebSiteContactList").where(exprList).queryList() + +publicEmailContactLists = [] +webSiteContactList.each { webSiteContactList -> + contactList = webSiteContactList.getRelatedOne("ContactList", false) + contactListType = contactList.getRelatedOne("ContactListType", false) + temp = [:] + temp.contactList = contactList + temp.contactListType = contactListType + publicEmailContactLists.add(temp) +} +context.publicEmailContactLists = publicEmailContactLists + +if (userLogin) { + partyAndContactMechList = from("PartyAndContactMech").where("partyId", partyId, "contactMechTypeId", "EMAIL_ADDRESS").orderBy("-fromDate").filterByDate().queryList() + context.partyAndContactMechList = partyAndContactMechList +} + + Propchange: ofbiz/trunk/plugins/ecommerce/groovyScripts/customer/ContactList.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/plugins/ecommerce/widget/ForumForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/plugins/ecommerce/widget/ForumTrees.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/plugins/ecommerce/widget/blog/BlogForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/plugins/ecommerce/widget/blog/BlogMenus.xml ------------------------------------------------------------------------------ svn:eol-style = native |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |