OFBiz › OFBiz - Commits

svn commit: r1094868 - in /ofbiz/trunk/specialpurpose: ebay/config/EbayUiLabels.xml ebaystore/webapp/ebaystore/WEB-INF/controller.xml ebaystore/widget/EbayStoreForms.xml ebaystore/widget/EbayStoreMenus.xml ebaystore/widget/EbayStoreScreens.xml

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1094868 - in /ofbiz/trunk/specialpurpose: ebay/config/EbayUiLabels.xml ebaystore/webapp/ebaystore/WEB-INF/controller.xml ebaystore/widget/EbayStoreForms.xml ebaystore/widget/EbayStoreMenus.xml ebaystore/widget/EbayStoreScreens.xml

jleroux@apache.org
Author: jleroux
Date: Tue Apr 19 06:17:44 2011
New Revision: 1094868

URL: http://svn.apache.org/viewvc?rev=1094868&view=rev
Log:
A patch from Ankit Jain  "Some misc issues in ebay and ebayStore component."(https://issues.apache.org/jira/browse/OFBIZ-4118

Improvement in ebay store.

In the ebay account adds a screen to add catalog to store , so one can add the catalogs to ebay store.

After selecting an account, it redirect to ebay account page, and here is the screen https://localhost:8443/ebaystore/control/AssociateCatalog?productStoreId=90101
so one can add the catalog to ebay store.

Modified:
    ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
    ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml
    ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml
    ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml

Modified: ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml?rev=1094868&r1=1094867&r2=1094868&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml Tue Apr 19 06:17:44 2011
@@ -19,6 +19,9 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <property key="EbayAddCatalogToStore">
+        <value xml:lang="en">Add Catalog To Store</value>
+    </property>
     <property key="EbayAddEbayConfiguration">
         <value xml:lang="en">Add Ebay Configuration</value>
         <value xml:lang="it">Aggiungi configurazione eBay</value>

Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml?rev=1094868&r1=1094867&r2=1094868&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml Tue Apr 19 06:17:44 2011
@@ -110,6 +110,23 @@
         <response name="success" type="view" value="LeaveFeedback"/>
         <response name="error" type="view" value="LeaveFeedback"/>
     </request-map>
+    <!-- Associate catalog to Ebay Store -->
+    <request-map uri="AssociateCatalog">
+        <security auth="true" https="true"/>
+        <response name="success" type="view" value="AssociateCatalog"/>
+    </request-map>
+    <request-map uri="associateCatalogToStore">
+        <security auth="true" https="true"/>
+        <event type="service" invoke="createProductStoreCatalog"/>
+        <response name="success" type="view-last"/>
+        <response name="error" type="view-last"/>
+    </request-map>
+        <request-map uri="removeCatalogFromStore">
+        <security auth="true" https="true"/>
+        <event type="service" invoke="deleteProductStoreCatalog"/>
+        <response name="success" type="view-last"/>
+        <response name="error" type="view-last"/>
+    </request-map>
     <!-- Automation Preferences -->
     <request-map uri="automationPreferences">
         <security auth="true" https="true"/>
@@ -552,6 +569,8 @@
     <view-map name="FeedbackStore" type="screen" page="component://ebaystore/widget/EbayAccountScreens.xml#FeedbackStore"/>
     <view-map name="Feedback" type="screen" page="component://ebaystore/widget/EbayAccountScreens.xml#Feedback"/>
     <view-map name="LeaveFeedback" type="screen" page="component://ebaystore/widget/EbayAccountScreens.xml#LeaveFeedback"/>
+    <!-- Associate Catalog to Ebay Store-->
+    <view-map name="AssociateCatalog" type="screen" page="component://ebaystore/widget/EbayStoreScreens.xml#AssociateCatalog"/>
     <!-- AutomationPreferences -->
     <view-map name="AutomationPreferences" type="screen" page="component://ebaystore/widget/EbaySellingManagerScreens.xml#EbayAutomationPreferences"/>
     <!-- Selling Manager -->

Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml?rev=1094868&r1=1094867&r2=1094868&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml Tue Apr 19 06:17:44 2011
@@ -120,6 +120,28 @@ value="${bsh:billingAccount != null ? or
         <field name="currentPasswordVerify"><password/></field>
         <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
     </form>
+    <form name="AddCatalog" type="single" target="associateCatalogToStore">
+        <field name="productStoreId"><hidden /></field>
+        <field name="catalogName" parameter-name="prodCatalogId">
+            <drop-down>
+                <list-options list-name="prodCatalogList" key-name="prodCatalogId" description="${catalogName}"/>
+            </drop-down>
+        </field>
+        <field name="submit" title="${uiLabelMap.CommonAdd}"><submit/></field>
+    </form>
+    <form name="CatalogList" type="list" list-name="prodStoreCatalogList" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="productStoreId"><display/></field>
+        <field name="prodCatalogId">
+            <display-entity entity-name="ProdCatalog" description="${catalogName}" key-field-name="prodCatalogId"/>
+        </field>
+        <field name="delete" widget-style="buttontext">
+            <hyperlink target="removeCatalogFromStore" description="${uiLabelMap.CommonDelete}">
+                <parameter param-name="productStoreId"/>
+                <parameter param-name="prodCatalogId"/>
+                <parameter param-name="fromDate"/>
+            </hyperlink>
+        </field>
+    </form>
     <form name="errorMessageList" type="list" target="" list-name="errorMsgList" view-size="30"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="createDatetime"><display/></field>

Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml?rev=1094868&r1=1094867&r2=1094868&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml Tue Apr 19 06:17:44 2011
@@ -38,6 +38,11 @@
                 <parameter param-name="productStoreId" value="${parameters.productStoreId}"/>
             </link>
         </menu-item>
+        <menu-item name="associateCatalogToStore" title="${uiLabelMap.EbayAddCatalogToStore}">
+            <link target="AssociateCatalog">
+                <parameter param-name="productStoreId" value="${parameters.productStoreId}"/>
+            </link>
+        </menu-item>
         <menu-item name="ebayExportAllCategoryToEbayStore" title="${uiLabelMap.EbayExportAllCategoryToEbayStore}">
             <link target="exportCategoryEbayStore">
                 <parameter param-name="productStoreId" value="${parameters.productStoreId}"/>

Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml?rev=1094868&r1=1094867&r2=1094868&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml Tue Apr 19 06:17:44 2011
@@ -160,6 +160,42 @@ under the License.
             </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>


Free forum by Nabble Edit this page