svn commit: r926913 - in /ofbiz/trunk/specialpurpose/ebaystore: config/EbayStoreUiLabels.xml src/org/ofbiz/ebaystore/EbayStore.java widget/EbaySellingManagerForms.xml widget/EbaySellingManagerScreens.xml widget/EbayStoreMenus.xml

[hansbak-2]

Author: hansbak
Date: Wed Mar 24 03:16:56 2010
New Revision: 926913

URL: http://svn.apache.org/viewvc?rev=926913&view=rev
Log:
Ebaystore:  Changed the label names and added new fields in find/list Active listing screen.(Added fields SKU, reservePrice, hitCount and add link so the user can click and see their Item detail on eBay site)

Modified:
    ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml
    ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
    ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
    ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
    ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml

Modified: ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml?rev=926913&r1=926912&r2=926913&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml Wed Mar 24 03:16:56 2010
@@ -311,4 +311,7 @@
     <property key="EbayNoOrderImported">
         <value xml:lang="en">No orders imported found</value>
     </property>
+    <property key="EbayOpenListings">
+        <value xml:lang="en">Open Listings</value>
+    </property>
 </resource>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java?rev=926913&r1=926912&r2=926913&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java Wed Mar 24 03:16:56 2010
@@ -1983,13 +1983,16 @@ public class EbayStore {
         cols.put("title", item.getTitle() != null ? item.getTitle() : "");
         
         SellingStatusType sst = item.getSellingStatus();
-        String currentPrice = null;
-        String bidCount = null;
+        double currentPrice = 0;
+        int bidCount = 0;
+        double reservPrice = 0;
+        int hitCount = 0;
         if (UtilValidate.isNotEmpty(sst)) {
             AmountType amt = sst.getCurrentPrice();
-            currentPrice = amt != null ? (new Double(amt.getValue()).toString()) : "";
-            bidCount = sst.getBidCount() != null ? sst.getBidCount().toString() : "";
+            currentPrice = amt != null ? (new Double(amt.getValue())) : 0;
+            bidCount = sst.getBidCount() != null ? sst.getBidCount() : 0;
         }
+        cols.put("buyItNowPrice", item.getBuyItNowPrice().getValue());
         cols.put("currentPrice", currentPrice);
         cols.put("bidCount", bidCount);
 
@@ -1998,11 +2001,14 @@ public class EbayStore {
 
         Integer quantity = item.getQuantity();
         String quantityStr = null;
-        if (UtilValidate.isNotEmpty(quantity)) {
-            quantityStr = quantity.toString();
-        }
+        if (UtilValidate.isNotEmpty(quantity)) quantityStr = quantity.toString();
         cols.put("quantity", quantityStr);
         cols.put("listingType", item.getListingType().value());
+        cols.put("viewItemURL", item.getListingDetails().getViewItemURL());
+        cols.put("SKU", item.getSKU());
+        if (UtilValidate.isNotEmpty(item.getReservePrice())) reservPrice = item.getReservePrice().getValue();
+        cols.put("reservePrice", reservPrice);
+        cols.put("hitCount", item.getHitCount() != null ? item.getHitCount() : 0);
         return cols;
     }
 

Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=926913&r1=926912&r2=926913&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Wed Mar 24 03:16:56 2010
@@ -469,9 +469,14 @@ value="${bsh:billingAccount != null ? or
     <form name="ActiveItemList" type="list"  target="doAction" list-name="activeItemList"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" use-row-submit="true" separate-columns="true">
         <field name="itemId"><display/></field>
-        <field name="title"><display/></field>
-        <field name="price"><display/></field>
+        <field name="SKU"><display/></field>
+        <field name="title">
+            <hyperlink target="${viewItemURL}" description="${title}" target-type="plain" target-window="_BLANK"/>
+        </field>
+        <field name="buyItNowPrice"><display/></field>
+        <field name="reservePrice"><display/></field>
         <field name="bidCount"><display/></field>
+        <field name="hitCount"><display/></field>
         <field name="startTime"><display/></field>
         <field name="quantity"><display/></field>
         <field name="listingType"><display/></field>

Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml?rev=926913&r1=926912&r2=926913&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml Wed Mar 24 03:16:56 2010
@@ -460,7 +460,7 @@
             <widgets>
                 <decorator-screen name="EbayActiveListing">
                     <decorator-section name="body">
-                        <screenlet title="Active Listing">
+                        <screenlet title="${uiLabelMap.EbayOpenListings}">
                             <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="ItemOption"/>
                             <include-form location="component://ebaystore/widget/EbaySellingManagerForms.xml" name="ActiveItemList"/>
                         </screenlet>

Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml?rev=926913&r1=926912&r2=926913&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml Wed Mar 24 03:16:56 2010
@@ -61,7 +61,7 @@
                 <parameter param-name="productStoreId" value="${parameters.productStoreId}"/>
             </link>
         </menu-item>
-        <menu-item name="activeListing" title="${uiLabelMap.EbayActive}">
+        <menu-item name="activeListing" title="${uiLabelMap.EbayOpenListings}">
             <link target="activeListing">
                 <parameter param-name="productStoreId" value="${parameters.productStoreId}"/>
             </link>