svn commit: r557392 [2/2] - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/data/ applications/order/config/ applications/order/data/ applications/order/servicedef/ applications/order/src/org/ofbiz/order/order/ applications/ord...

[jacopoc]

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?view=diff&rev=557392&r1=557391&r2=557392
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Wed Jul 18 13:41:01 2007
@@ -2407,6 +2407,18 @@
         <response name="error" type="view" value="ProductsExportToGoogle"/>
     </request-map>
     
+     <request-map uri="ProductsExportToEbay">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ProductsExportToEbay"/>
+    </request-map>
+    
+    <request-map uri="PostProductsToEbay">
+        <security https="true" auth="true"/>
+        <event type="service" path="" invoke="exportToEbay"/>
+        <response name="success" type="view" value="ProductsExportToEbay"/>
+        <response name="error" type="view" value="ProductsExportToEbay"/>
+    </request-map>
+    
     <!-- end of request mappings -->
 
     <!-- View Mappings -->
@@ -2541,6 +2553,7 @@
     <view-map name="ListCarrierShipmentMethods" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListCarrierShipmentMethods"/>
 
     <view-map name="ProductsExportToGoogle" type="screen" page="component://product/widget/catalog/FindScreens.xml#ProductsExportToGoogle"/>
+    <view-map name="ProductsExportToEbay" type="screen" page="component://product/widget/catalog/FindScreens.xml#ProductsExportToEbay"/>
   
     <!-- Lookup request mappings -->
     <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/>

Modified: ofbiz/trunk/applications/product/webapp/catalog/find/ExportForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/ExportForms.xml?view=diff&rev=557392&r1=557391&r2=557392
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/ExportForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/ExportForms.xml Wed Jul 18 13:41:01 2007
@@ -52,4 +52,18 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.ProductExportToGoogle}"><submit button-type="button"/></field>
     </form>
+    <form name="ProductsExportToEbay" type="single" target="PostProductsToEbay">
+        <field name="selectResult"><hidden/></field>
+        <field name="webSiteUrl"><text size="50" maxlength="250"/></field>
+        <field name="imageUrl"><text size="50" maxlength="250"/></field>
+        <field name="trackingCodeId" widget-style="selectBox">
+            <drop-down no-current-selected-key="_NA_">
+                <option key="_NA_" description="${uiLabelMap.ProductExportNoTrackingRequested}"/>
+                <entity-options entity-name="TrackingCode" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.ProductExportToeBay}"><submit button-type="button"/></field>
+    </form>
 </forms>

Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl?view=diff&rev=557392&r1=557391&r2=557392
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl Wed Jul 18 13:41:01 2007
@@ -67,6 +67,11 @@
         document.products.action="<@ofbizUrl>ProductsExportToGoogle</@ofbizUrl>";
         document.products.submit();
     }
+    
+    function exportToeBay() {
+        document.products.action="<@ofbizUrl>ProductsExportToEbay</@ofbizUrl>";
+        document.products.submit();
+    }
 </script>
 
 <#if productIds?has_content>
@@ -222,6 +227,7 @@
   <b>${uiLabelMap.ProductSearchExportProductList}:</b> <a href="<@ofbizUrl>searchExportProductList?clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchExport}</a>
   <#if productIds?has_content>
     <a href="javascript:exportToGoogle();" class="buttontext">${uiLabelMap.ProductExportToGoogle}</a>
+    <a href="javascript:exportToeBay();" class="buttontext">${uiLabelMap.ProductExportToeBay}</a>
   </#if>
 </div>
 </#if>

Modified: ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml?view=diff&rev=557392&r1=557391&r2=557392
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml Wed Jul 18 13:41:01 2007
@@ -150,5 +150,22 @@
             </widgets>
         </section>  
     </screen>
-            
+
+    <screen name="ProductsExportToEbay">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleProductsExportToEbay"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container>
+                            <label style="head1">${uiLabelMap.PageTitleProductsExportToEbay}</label>
+                        </container>
+                        <include-form name="ProductsExportToEbay" location="component://product/webapp/catalog/find/ExportForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>  
+    </screen>
 </screens>

Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties?view=diff&rev=557392&r1=557391&r2=557392
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonEntityLabels.properties (original)
+++ ofbiz/trunk/framework/common/config/CommonEntityLabels.properties Wed Jul 18 13:41:01 2007
@@ -50,6 +50,7 @@
 Enumeration.description.EMAIL_SALES_CHANNEL=E-Mail Channel
 Enumeration.description.SNAIL_SALES_CHANNEL=Snail Mail Channel
 Enumeration.description.AFFIL_SALES_CHANNEL=Affiliate Channel
+Enumeration.description.EBAY_SALES_CHANNEL=eBay Channel
 Enumeration.description.UNKNWN_SALES_CHANNEL=Unknown Channel
 
 # order and order item status

Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties?view=diff&rev=557392&r1=557391&r2=557392
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties (original)
+++ ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties Wed Jul 18 13:41:01 2007
@@ -50,6 +50,7 @@
 Enumeration.description.EMAIL_SALES_CHANNEL=Canale E-Mail
 Enumeration.description.SNAIL_SALES_CHANNEL=Canale Snail Mail
 Enumeration.description.AFFIL_SALES_CHANNEL=Canale Affiliato
+Enumeration.description.EBAY_SALES_CHANNEL=Canale eBay
 Enumeration.description.UNKNWN_SALES_CHANNEL=Canale Sconosciuto
 
 # order and order item status