svn commit: r1742196 [5/6] - in /ofbiz/trunk: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/ applications/accounting/webapp/accounting/WEB-INF/ applications/content/config/ applications/product/con...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1742196 [5/6] - in /ofbiz/trunk: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/ applications/accounting/webapp/accounting/WEB-INF/ applications/content/config/ applications/product/con...

jleroux@apache.org
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml Tue May  3 20:50:10 2016
@@ -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"
-        xsi:noNamespaceSchemaLocation="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/webapp/ebaystore/WEB-INF/actions/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.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-form 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/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy"/>
-                <script location="component://ebay/webapp/ebay/WEB-INF/actions/find/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/webapp/catalog/WEB-INF/actions/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/webapp/ebaystore/WEB-INF/actions/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-form 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"
+        xsi:noNamespaceSchemaLocation="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/webapp/ebaystore/WEB-INF/actions/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.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/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.groovy"/>
+                <script location="component://ebay/webapp/ebay/WEB-INF/actions/find/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/webapp/catalog/WEB-INF/actions/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/webapp/ebaystore/WEB-INF/actions/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>

Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoSurvey.xml Tue May  3 20:50:10 2016
@@ -53,7 +53,7 @@ under the License.
     <SurveyQuestion surveyQuestionId="1034" surveyQuestionCategoryId="1001" surveyQuestionTypeId="OPTION" question="How would you rate this store for on-line functionality?"/>
     <SurveyQuestion surveyQuestionId="1035" surveyQuestionCategoryId="1001" surveyQuestionTypeId="URL" question="What is your favorite on-line store? (Enter Valid URL)"/>
     <SurveyQuestion surveyQuestionId="1036" surveyQuestionCategoryId="1001" surveyQuestionTypeId="TEXTAREA" question="Comments:"/>
-    <SurveyQuestion surveyQuestionId="1037" surveyQuestionCategoryId="1001" surveyQuestionTypeId="SEPERATOR_TEXT" question="&lt;img src=&quot;http://localhost:8080/images/ofbiz_logo.gif&quot;&gt;"/>
+    <SurveyQuestion surveyQuestionId="1037" surveyQuestionCategoryId="1001" surveyQuestionTypeId="SEPERATOR_TEXT" question="&lt;img src=&quot;https://localhost:8443/images/ofbiz_logo.gif&quot;&gt;"/>
     <SurveyQuestion surveyQuestionId="1038" surveyQuestionCategoryId="1001" surveyQuestionTypeId="SEPERATOR_LINE"/>
     <SurveyQuestion surveyQuestionId="1042" surveyQuestionCategoryId="1001" surveyQuestionTypeId="CONTENT" question="Do you have a picture you would like to attach?"/>
 

Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoTestSurveyData.xml Tue May  3 20:50:10 2016
@@ -100,9 +100,9 @@ under the License.
     <SurveyQuestion surveyQuestionId="1603" surveyQuestionCategoryId="1601" surveyQuestionTypeId="BOOLEAN" description="" question="Does the EDIT link redirects to the page https://localhost:8443/ecommerce/control/editProfile"/>
     <SurveyQuestion surveyQuestionId="1604" surveyQuestionCategoryId="1601" surveyQuestionTypeId="BOOLEAN" description="" question="Does the Billing and shipping address of user displayed correctly?"/>
     <SurveyQuestion surveyQuestionId="1605" surveyQuestionCategoryId="1601" surveyQuestionTypeId="BOOLEAN" description="" question="Does the Manage Address link redirects user to manage addresses page https://localhost:8443/ecommerce/control/manageAddress?"/>
-    <SurveyQuestion surveyQuestionId="1606" surveyQuestionCategoryId="1601" surveyQuestionTypeId="BOOLEAN" description="" question="Does Quick add takes to the page http://localhost:8080/ecommerce/control/quickadd"/>
+    <SurveyQuestion surveyQuestionId="1606" surveyQuestionCategoryId="1601" surveyQuestionTypeId="BOOLEAN" description="" question="Does Quick add takes to the page https://localhost:8443/ecommerce/control/quickadd"/>
     <SurveyQuestion surveyQuestionId="1607" surveyQuestionCategoryId="1601" surveyQuestionTypeId="BOOLEAN" description="" question="Does the 'Order History' redirects to order detail page. https://localhost:8443/ecommerce/control/orderhistory"/>
-    <SurveyQuestion surveyQuestionId="1608" surveyQuestionCategoryId="1601" surveyQuestionTypeId="BOOLEAN" description="" question="Does Shopping List link redirects to page http://localhost:8080/ecommerce/control/editShoppingList"/>
+    <SurveyQuestion surveyQuestionId="1608" surveyQuestionCategoryId="1601" surveyQuestionTypeId="BOOLEAN" description="" question="Does Shopping List link redirects to page https://localhost:8443/ecommerce/control/editShoppingList"/>
     <SurveyQuestion surveyQuestionId="1609" surveyQuestionCategoryId="1601" surveyQuestionTypeId="BOOLEAN" description="" question="Does List quotes link redirects to page https://localhost:8443/ecommerce/control/ListQuotes"/>
     <SurveyQuestion surveyQuestionId="1610" surveyQuestionCategoryId="1601" surveyQuestionTypeId="BOOLEAN" description="" question="Does List Requests link redirects to page https://localhost:8443/ecommerce/control/ListRequests"/>
     <SurveyQuestion surveyQuestionId="1611" surveyQuestionCategoryId="1601" surveyQuestionTypeId="BOOLEAN" description="" question="Does on changing the email address the username changed ?"/>
@@ -128,7 +128,7 @@ under the License.
     <SurveyQuestion surveyQuestionId="1801" surveyQuestionCategoryId="1801" surveyQuestionTypeId="BOOLEAN" description="" question="Are breadcrumbs visible on the page and on clicking them, Are they working proper and takes you to clicked page ?"/>
     <SurveyQuestion surveyQuestionId="1802" surveyQuestionCategoryId="1801" surveyQuestionTypeId="BOOLEAN" description="" question="Is the mincart visible and does it displays all the details it contains?"/>
     <SurveyQuestion surveyQuestionId="1803" surveyQuestionCategoryId="1801" surveyQuestionTypeId="BOOLEAN" description="" question="Does the page contains the quantity and Add to cart option that on Clicking adds the Product to the Shopping cart?"/>
-    <SurveyQuestion surveyQuestionId="1804" surveyQuestionCategoryId="1801" surveyQuestionTypeId="BOOLEAN" description="" question="Does it contains the Search in Category options that takes to the Advance Search page http://localhost:8080/ecommerce/control/advancedsearch"/>
+    <SurveyQuestion surveyQuestionId="1804" surveyQuestionCategoryId="1801" surveyQuestionTypeId="BOOLEAN" description="" question="Does it contains the Search in Category options that takes to the Advance Search page https://localhost:8443/ecommerce/control/advancedsearch"/>
     <SurveyQuestion surveyQuestionId="1805" surveyQuestionCategoryId="1801" surveyQuestionTypeId="BOOLEAN" description="" question="Does the page display the different product list with their names and images if available ?"/>
     <SurveyQuestion surveyQuestionId="1806" surveyQuestionCategoryId="1801" surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking onto the product image this redirects you to that specified product detail page ?"/>
     
@@ -142,7 +142,7 @@ under the License.
     <SurveyQuestion surveyQuestionId="1907" surveyQuestionCategoryId="1901" surveyQuestionTypeId="BOOLEAN" description="" question="Are you able to add the product into the cart without selecting any feature ?"/>
     <SurveyQuestion surveyQuestionId="1908" surveyQuestionCategoryId="1901" surveyQuestionTypeId="BOOLEAN" description="" question="Does it displays the links Tell a friend that takes to the respective target page?"/>
     <SurveyQuestion surveyQuestionId="1909" surveyQuestionCategoryId="1901" surveyQuestionTypeId="BOOLEAN" description="" question="Does it displays the message with link Login You Must Login  To Add Selected Items To Shopping List if the user is not logged in."/>
-    <SurveyQuestion surveyQuestionId="1910" surveyQuestionCategoryId="1901" surveyQuestionTypeId="BOOLEAN" description="" question="Does Review the Product First link working and takes to the page http://localhost:8080/ecommerce/control/reviewProduct?"/>
+    <SurveyQuestion surveyQuestionId="1910" surveyQuestionCategoryId="1901" surveyQuestionTypeId="BOOLEAN" description="" question="Does Review the Product First link working and takes to the page https://localhost:8443/ecommerce/control/reviewProduct?"/>
     
     <!--MINI CART PAGE-->
     <SurveyQuestion surveyQuestionId="2001" surveyQuestionCategoryId="2001" surveyQuestionTypeId="BOOLEAN" description="" question="Is the minicart displayed on the all the pages except profile and checkout page ?"/>
@@ -153,12 +153,12 @@ under the License.
     <SurveyQuestion surveyQuestionId="2006" surveyQuestionCategoryId="2001" surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking to the checkout link in case the user is registered,takes to https://localhost:8443/ecommerce/control/checkoutoptions"/>
     <SurveyQuestion surveyQuestionId="2007" surveyQuestionCategoryId="2001" surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking to the quickCheckout link in case the user is registered,takes to https://localhost:8443/ecommerce/control/quickcheckout"/>
     <SurveyQuestion surveyQuestionId="2008" surveyQuestionCategoryId="2001" surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking to the quickCheckout link in case the user is registered,takes to https://localhost:8443/ecommerce/control/onePageCheckout"/>
-    <SurveyQuestion surveyQuestionId="2009" surveyQuestionCategoryId="2001" surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking ViewCart link will redirect to the show cart page at this url http://localhost:8080/ecommerce/control/view/showcart"/>
+    <SurveyQuestion surveyQuestionId="2009" surveyQuestionCategoryId="2001" surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking ViewCart link will redirect to the show cart page at this url https://localhost:8443/ecommerce/control/view/showcart"/>
     <SurveyQuestion surveyQuestionId="2010" surveyQuestionCategoryId="2001" surveyQuestionTypeId="BOOLEAN" description="" question="Does the mini cart displays the Quantity,Product and its price and total details correctly ?"/>
     <SurveyQuestion surveyQuestionId="2011" surveyQuestionCategoryId="2001" surveyQuestionTypeId="BOOLEAN" description="" question="Does the Format of amount on mini cart have currency format like $00.00 ?"/>
     
     <!--SHOW CART PAGE-->
-    <SurveyQuestion surveyQuestionId="2101" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does the Cart link on click takes to the http://localhost:8080/ecommerce/control/view/showcart?"/>
+    <SurveyQuestion surveyQuestionId="2101" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does the Cart link on click takes to the https://localhost:8443/ecommerce/control/view/showcart?"/>
     <SurveyQuestion surveyQuestionId="2102" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does it diplays the panels Quick add,shopping cart,promotion coupon code,Special offers,you might interested in,Promotion information on the ViewCart Page"/>
     <SurveyQuestion surveyQuestionId="2103" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does the Cart displays the all the cart details ?"/>
     <SurveyQuestion surveyQuestionId="2104" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does the cart displays the images of the products it has or not and does those product images on clicking takes to the target page ?"/>
@@ -169,10 +169,10 @@ under the License.
     <SurveyQuestion surveyQuestionId="2109" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does it shows the message To save cart you must Login in case if not logged in?"/>
     <SurveyQuestion surveyQuestionId="2110" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does it displays the Update,Continue shopping and checkout link ?"/>
     <SurveyQuestion surveyQuestionId="2111" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does it on clicking the Continue shopping takes to last product detail page ?"/>
-    <SurveyQuestion surveyQuestionId="2112" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does it on clicking the Details link on Special offers panel takes to http://localhost:8080/ecommerce/control/showPromotionDetails"/>
+    <SurveyQuestion surveyQuestionId="2112" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does it on clicking the Details link on Special offers panel takes to https://localhost:8443/ecommerce/control/showPromotionDetails"/>
     <SurveyQuestion surveyQuestionId="2113" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does the shopping cart display the links create request for Quote and create new Quote from cart?"/>
     <SurveyQuestion surveyQuestionId="2114" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does You might interested in link contain Add to cart link that adds the product to the shopping cart"/>
-    <SurveyQuestion surveyQuestionId="2115" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does You might interested in link contain Product link that http://localhost:8080/ecommerce/control/product"/>
+    <SurveyQuestion surveyQuestionId="2115" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does You might interested in link contain Product link that https://localhost:8443/ecommerce/control/product"/>
     <SurveyQuestion surveyQuestionId="2116" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does Shopping cart contains the Recalculate Cart,Empty Cart,Remove Selected and Checkout link on the title Bar that takes to their respaective target page?"/>
     <SurveyQuestion surveyQuestionId="2117" surveyQuestionCategoryId="2101" surveyQuestionTypeId="BOOLEAN" description="" question="Does Quick Add panel containing the Add to cart linnk adds the product to the shopping cart successfully on entering the ProductId"/>
     

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Tue May  3 20:50:10 2016
@@ -81,7 +81,7 @@ under the License.
         <description>Verify a user is logged in.</description>
         <security https="true" auth="false"/>
         <event type="java" path="org.ofbiz.securityext.login.LoginEvents" invoke="storeCheckLogin"/>
-        <response name="success" type="view-last"/>
+        <response name="success" type="view-last" value="main"/>
         <response name="error" type="view" value="login"/>
     </request-map>
     <request-map uri="login">
@@ -733,7 +733,7 @@ under the License.
         <event type="java" path="org.ofbiz.order.shoppingcart.CheckOutEvents" invoke="createOrder"/>
         <response name="sales_order" type="request" value="checkBlacklist"/>
         <response name="work_order" type="request" value="checkBlacklist"/>
-        <response name="error" type="view" value="checkoutreview"/>
+        <response name="error" type="view" value="quickAnonOrderReview"/>
     </request-map>
     <request-map uri="processpayment">
         <security https="true" direct-request="false"/>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml?rev=1742196&r1=1742195&r2=1742196&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ContentForms.xml Tue May  3 20:50:10 2016
@@ -26,7 +26,7 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
 
     </form>
-    <grid name="searchList" target="" list-name="queryResults"
+    <form name="searchList" type="list" target="" list-name="queryResults"
         default-title-style="tableheadtext" default-widget-style="inputBox"
         paginate-target="/AdminSearch">
         <field name="editContent" title=" ">