Author: hansbak
Date: Fri Feb 19 07:55:52 2010
New Revision: 911734
URL: http://svn.apache.org/viewvc?rev=911734&view=rev
Log:
Ebaystore update:
In this patch we grouped these following functions together
- Account tab moved feedback function into new tab call 'selling manager' and
moved solditems , inventory, automatic preference functions into this one
Modified:
ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.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/ebaystore/config/EbayStoreUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml?rev=911734&r1=911733&r2=911734&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml Fri Feb
19 07:55:52 2010
@@ -40,6 +40,9 @@
<value xml:lang="en">Export To eBay Store</value>
<value
xml:lang="th">à¸à¸²à¸£à¸ªà¹à¸à¸à¸à¸à¹à¸à¸¢à¸±à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹</value>
</property>
+ <property key="EbaySellingManager">
+ <value xml:lang="en">Selling Manager</value>
+ </property>
<property key="EbayStore">
<value xml:lang="en">Ebay Store</value>
<value
xml:lang="th">à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¸à¸¢à¹</value>
@@ -166,7 +169,7 @@
<property key="EbayLeaveFeedback">
<value xml:lang="en">Leave Feedback</value>
</property>
- <property key="EbaySoldLeaveFeedback">
+ <property key="EbaySold">
<value xml:lang="en">Sold</value>
</property>
<property key="EbayBlockItemOutOfStock">
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=911734&r1=911733&r2=911734&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
Fri Feb 19 07:55:52 2010
@@ -637,10 +637,10 @@
String partyId = null;
try {
List<GenericValue> productStoreRoles =
delegator.findByAnd("ProductStoreRole", UtilMisc.toMap("productStoreId",
context.get("productStoreId").toString(),"roleTypeId","EBAY_ACCOUNT"));
- if (productStoreRoles!=null) {
+ if (productStoreRoles.size() != 0) {
partyId=
(String)productStoreRoles.get(0).get("partyId");
List<GenericValue> userLogin =
delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId", partyId));
- if (userLogin!=null) {
+ if (userLogin.size() != 0) {
userLoginId =
(String)userLogin.get(0).get("userLoginId");
password =
(String)userLogin.get(0).get("currentPassword");
}
@@ -1439,10 +1439,34 @@
SellingManagerSoldTransactionType sellingManagerSoldTransaction =
sellingManagerSoldTransactions[j];
entry.put("itemId",sellingManagerSoldTransaction.getItemID());
entry.put("title",sellingManagerSoldTransaction.getItemTitle());
-
entry.put("transactionId",sellingManagerSoldTransaction.getTransactionID());
+
entry.put("transactionId",
sellingManagerSoldTransaction.getTransactionID().toString());
entry.put("quantity",sellingManagerSoldTransaction.getQuantitySold());
entry.put("listingType",sellingManagerSoldTransaction.getListingType().value());
-
+
+ String buyer = null;
+ if
(sellingManagerSoldOrder.getBuyerID() != null) {
+ buyer =
sellingManagerSoldOrder.getBuyerID();
+ }
+ entry.put("buyer",
buyer);
+ GetItemCall api = new
GetItemCall(apiContext);
+
api.setItemID(sellingManagerSoldTransaction.getItemID());
+ DetailLevelCodeType[]
detailLevels = new DetailLevelCodeType[] {
+
DetailLevelCodeType.RETURN_ALL,
+
DetailLevelCodeType.ITEM_RETURN_ATTRIBUTES,
+
DetailLevelCodeType.ITEM_RETURN_DESCRIPTION
+ };
+
api.setDetailLevel(detailLevels);
+ ItemType itemType =
api.getItem();
+ String itemUrl = null;
+ if
(itemType.getListingDetails() != null) {
+ itemUrl =
itemType.getListingDetails().getViewItemURL();
+ }
+ entry.put("itemUrl",
itemUrl);
+ String itemUrlNatural =
null;
+ if
(itemType.getListingDetails() != null) {
+ itemUrlNatural
= itemType.getListingDetails().getViewItemURLForNaturalSearch();
+ }
+
entry.put("itemUrlNatural", itemUrlNatural);
String unpaidItemStatus
= null;
if
(sellingManagerSoldOrder.getUnpaidItemStatus() != null) {
unpaidItemStatus = sellingManagerSoldOrder.getUnpaidItemStatus().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=911734&r1=911733&r2=911734&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml
Fri Feb 19 07:55:52 2010
@@ -63,6 +63,11 @@
<response name="error" type="view" value="EbayAccount"/>
<response name="success" type="view" value="EbayAccount"/>
</request-map>
+ <request-map uri="personalInformation">
+ <security https="true" auth="true"/>
+ <response name="error" type="view" value="EbayAccount"/>
+ <response name="success" type="view" value="EbayAccount"/>
+ </request-map>
<!-- Store output -->
<request-map uri="ebayStores">
@@ -186,6 +191,12 @@
<response name="success" type="view" value="exportProductListing"/>
<response name="error" type="view" value="exportProductListing"/>
</request-map>
+ <!-- Selling Manager -->
+ <request-map uri="sellingManager">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ebayStoreInventory"/>
+ <response name="error" type="view" value="ebayStoreInventory"/>
+ </request-map>
<!-- Active -->
<request-map uri="activeListing">
<security auth="true" https="true"/>
@@ -238,29 +249,29 @@
<view-map name="ebayStoreDetail" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#ebayStoreDetail"/>
<!-- ebay account -->
<view-map name="NewEbayAccount" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#NewEbayAccount"/>
- <view-map name="EbayAccount" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#EbayAccount"/>
+ <view-map name="EbayAccount" type="screen"
page="component://ebaystore/widget/EbayAccountScreens.xml#EbayPersonalInformation"/>
<!-- feedback -->
- <view-map name="FeedbackStore" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#FeedbackStore"/>
- <view-map name="Feedback" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#Feedback"/>
- <view-map name="LeaveFeedback" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#LeaveFeedback"/>
+ <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"/>
<!-- AutomationPreferences -->
- <view-map name="AutomationPreferences" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#EbayAutomationPreferences"/>
+ <view-map name="AutomationPreferences" type="screen"
page="component://ebaystore/widget/EbaySellingManagerScreens.xml#EbayAutomationPreferences"/>
<!-- block out of stock -->
<view-map name="blockItemOutOfStock" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#blockItemOutOfStock"/>
<!-- store Inventory -->
- <view-map name="ebayStoreInventory" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#ebayStoreInventory"/>
- <view-map name="ebayLoadStoreInventory" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#ebayLoadStoreInventory"/>
- <view-map name="reserveEbayProductInventory" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#reserveEbayProductInventory"/>
- <view-map name="updateQuantityReserved" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#updateQuantityReserved"/>
+ <view-map name="ebayStoreInventory" type="screen"
page="component://ebaystore/widget/EbaySellingManagerScreens.xml#ebayStoreInventory"/>
+ <view-map name="ebayLoadStoreInventory" type="screen"
page="component://ebaystore/widget/EbaySellingManagerScreens.xml#ebayLoadStoreInventory"/>
+ <view-map name="reserveEbayProductInventory" type="screen"
page="component://ebaystore/widget/EbaySellingManagerScreens.xml.xml#reserveEbayProductInventory"/>
+ <view-map name="updateQuantityReserved" type="screen"
page="component://ebaystore/widget/EbaySellingManagerScreens.xml#updateQuantityReserved"/>
<view-map name="exportProductListing" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#exportProductListing"/>
<view-map name="productsearch" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#productsearchexport"/>
<!-- Active -->
- <view-map name="ActiveListing" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#EbayActiveListing"/>
- <view-map name="AssignAutomaticRule" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#AssignAutomaticRule"/>
+ <view-map name="ActiveListing" type="screen"
page="component://ebaystore/widget/EbaySellingManagerScreens.xml#EbayActiveListing"/>
+ <view-map name="AssignAutomaticRule" type="screen"
page="component://ebaystore/widget/EbaySellingManagerScreens.xml#AssignAutomaticRule"/>
<!-- Sold -->
- <view-map name="SoldListing" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#SoldListing"/>
- <view-map name="OpenUnpaid" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#OpenUnpaid"/>
- <view-map name="MakeSecondChanceOffer" type="screen"
page="component://ebaystore/widget/EbayStoreScreens.xml#MakeSecondChanceOffer"/>
+ <view-map name="SoldListing" type="screen"
page="component://ebaystore/widget/EbaySellingManagerScreens.xml#SoldListing"/>
+ <view-map name="OpenUnpaid" type="screen"
page="component://ebaystore/widget/EbaySellingManagerScreens.xml#OpenUnpaid"/>
+ <view-map name="MakeSecondChanceOffer" type="screen"
page="component://ebaystore/widget/EbaySellingManagerScreens.xml#MakeSecondChanceOffer"/>
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml?rev=911734&r1=911733&r2=911734&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/CommonScreens.xml Fri Feb 19
07:55:52 2010
@@ -120,4 +120,44 @@
</section>
</screen>
+ <screen name="SellingManagerDecorator">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="sellingManager"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <include-menu
location="component://ebaystore/widget/EbayStoreMenus.xml"
name="EbaySellingManagerTabBar"/>
+ <decorator-section-include name="body"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="AccountDecorator">
+ <section>
+ <actions>
+ <set field="tabButtonItem" value="ebayAccount"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <include-menu
location="component://ebaystore/widget/EbayStoreMenus.xml"
name="EbayAccountTabBar"/>
+ <decorator-section-include name="body"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml?rev=911734&r1=911733&r2=911734&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayAccountScreens.xml Fri Feb
19 07:55:52 2010
@@ -19,18 +19,111 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd";>
- <screen name="EbayPersonalInformation">
+ <screen name="EbayPersonalInformation">
<section>
- <actions>
- <service service-name="getEbayUser"
result-map="results">
- <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
- </service>
- </actions>
+ <actions>
+ <set field="accountItem"
value="personalInformation"/>
+ <service service-name="getEbayUser"
result-map="results">
+ <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
+ </service>
+ </actions>
<widgets>
+ <decorator-screen name="AccountDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
<screenlet name=""
title="${uiLabelMap.EbayPersonalInformation}">
<include-form
location="component://ebaystore/widget/EbayAccountForms.xml"
name="EbayPersonalInformationForm"/>
</screenlet>
+ </decorator-section>
+ </decorator-screen>
</widgets>
</section>
</screen>
+ <!-- ebay feedback -->
+ <screen name="EbayFeedback">
+ <section>
+ <actions>
+ <set field="titleProperty" value="eBay Feedback"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="accountItem" value="feedback"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="AccountDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <if-has-permission permission="EBAY"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <screenlet title="${uiLabelMap.EbayFeedback}">
+ <include-menu
location="component://ebaystore/widget/EbayStoreMenus.xml"
name="EbayFeedbackTabBar"/>
+ <decorator-section-include name="body"/>
+ </screenlet>
+ </widgets>
+ <fail-widgets>
+ <label
style="h3">${uiLabelMap.EbayViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="Feedback">
+ <section>
+ <actions>
+ <set field="titleProperty" value="eBay Feedback"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="feedbackItem" value="Feedback"/>
+ <service service-name="loadFeedback">
+ <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
+ </service>
+ <service service-name="getItemsAwaitingFeedback"
result-map="results">
+ <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
+ </service>
+ <set field="itemsAwaitingFeedbackList"
from-field="results.itemsAwaitingFeedback"/>
+ <script
location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="EbayFeedback" >
+ <decorator-section name="body">
+ <screenlet>
+ <screenlet
navigation-form-name="ItemsAwaitingFeedback" title="Items Awaiting Feedback">
+ <include-form name="ItemsAwaitingFeedback"
location="component://ebaystore/widget/EbayStoreForms.xml"/>
+ </screenlet>
+ </screenlet>
+ <screenlet>
+ <screenlet navigation-form-name="RecentFeedback"
title="Recent Feedback">
+ <include-form name="RecentFeedback"
location="component://ebaystore/widget/EbayStoreForms.xml"/>
+ </screenlet>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="LeaveFeedback">
+ <section>
+ <actions>
+ <set field="titleProperty" value="eBay Feedback"/>
+ <set field="headerItem" value="ebayStore"/>
+ <set field="feedbackItem" value="LeaveFeedback"/>
+ <set field="role" from-field="parameters.role"
default-value="all"/>
+ <service service-name="getItemsAwaitingFeedback"
result-map="results"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="EbayFeedback" >
+ <decorator-section name="body">
+ <screenlet>
+ <screenlet title="${uiLabelMap.EbayLeaveFeedback}">
+ <include-menu
location="component://ebaystore/widget/EbayStoreMenus.xml"
name="EbayFeedbackSubTabBar"/>
+ <platform-specific>
+ <html><html-template
location="component://ebaystore/webapp/ebaystore/feedback/LeaveFeedback.ftl"/></html>
+ </platform-specific>
+ </screenlet>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml?rev=911734&r1=911733&r2=911734&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml Fri Feb 19
07:55:52 2010
@@ -162,6 +162,7 @@
</row-actions>
<field name="productStoreId"><hidden
value="${parameters.productStoreId}"/></field>
<field name="itemId"><display description="${itemId} -
${title}"/></field>
+ <field name="buyer"><display description="${buyer}"/></field>
<field name="listingType"><display
description="${listingType}"/></field>
<field name="quantity"><display description="${quantity}"/></field>
<field name="transactionId"><display
description="${transactionId}"/></field>
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml?rev=911734&r1=911733&r2=911734&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreMenus.xml Fri Feb 19
07:55:52 2010
@@ -43,23 +43,31 @@
<parameter param-name="productStoreId"
value="${parameters.productStoreId}"/>
</link>
</menu-item>
- <menu-item name="inventory" title="${uiLabelMap.ProductProduct}
${uiLabelMap.ProductInventory}">
- <link target="ebayStoreInventory">
+ <menu-item name="blockItemOutOfStock"
title="${uiLabelMap.EbayBlockItemOutOfStock}">
+ <link target="blockItemOutOfStock">
<parameter param-name="productStoreId"
value="${parameters.productStoreId}"/>
</link>
</menu-item>
- <menu-item name="blockItemOutOfStock"
title="${uiLabelMap.EbayBlockItemOutOfStock}">
- <link target="blockItemOutOfStock">
+ <menu-item name="exportProductListing" title="Export Product Listing">
+ <link target="exportProductListing">
<parameter param-name="productStoreId"
value="${parameters.productStoreId}"/>
</link>
</menu-item>
- <menu-item name="soldListing"
title="${uiLabelMap.EbayStoreOpenUnpaidItemDispute}">
- <link target="soldListing">
+ <menu-item name="sellingManager"
title="${uiLabelMap.EbaySellingManager}">
+ <link target="sellingManager">
<parameter param-name="productStoreId"
value="${parameters.productStoreId}"/>
</link>
</menu-item>
- <menu-item name="feedback" title="${uiLabelMap.EbayFeedback}">
- <link target="Feedback">
+ </menu>
+ <menu name="EbaySellingManagerTabBar"
selected-menuitem-context-field-name="sellingManagerItem" type="simple"
+ default-selected-style="selected" menu-container-style="button-bar
button-style-2">
+ <menu-item name="inventory" title="${uiLabelMap.ProductProduct}
${uiLabelMap.ProductInventory}">
+ <link target="ebayStoreInventory">
+ <parameter param-name="productStoreId"
value="${parameters.productStoreId}"/>
+ </link>
+ </menu-item>
+ <menu-item name="soldListing" title="${uiLabelMap.EbaySold}">
+ <link target="soldListing">
<parameter param-name="productStoreId"
value="${parameters.productStoreId}"/>
</link>
</menu-item>
@@ -68,13 +76,21 @@
<parameter param-name="productStoreId"
value="${parameters.productStoreId}"/>
</link>
</menu-item>
- <menu-item name="exportProductListing" title="Export Product Listing">
- <link target="exportProductListing">
+ </menu>
+ <menu name="EbayAccountTabBar"
selected-menuitem-context-field-name="accountItem" type="simple"
+ default-selected-style="selected" menu-container-style="button-bar
button-style-2">
+ <menu-item name="personalInformation"
title="${uiLabelMap.EbayPersonalInformation}">
+ <link target="personalInformation">
+ <parameter param-name="productStoreId"
value="${parameters.productStoreId}"/>
+ </link>
+ </menu-item>
+ <menu-item name="feedback" title="${uiLabelMap.EbayFeedback}">
+ <link target="Feedback">
<parameter param-name="productStoreId"
value="${parameters.productStoreId}"/>
</link>
</menu-item>
</menu>
- <menu name="EbayFeedbackTabBar"
selected-menuitem-context-field-name="eBayTabButtonItem" type="simple"
+ <menu name="EbayFeedbackTabBar"
selected-menuitem-context-field-name="feedbackItem" type="simple"
default-selected-style="selected" menu-container-style="button-bar
button-style-2">
<menu-item name="Feedback">
<condition>
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml?rev=911734&r1=911733&r2=911734&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml Fri Feb 19
07:55:52 2010
@@ -162,153 +162,6 @@
</widgets>
</section>
</screen>
- <screen name="EbayAccount">
- <section>
- <actions>
- <entity-one value-field="portalPage" entity-name="PortalPage">
- <field-map field-name="portalPageId" value="EbayAccount"/>
- </entity-one>
- <entity-and entity-name="PortalPageColumn"
list="portalPageColumns">
- <field-map field-name="portalPageId" value="EbayAccount"/>
- <order-by field-name="columnSeqId"/>
- </entity-and>
- <entity-and entity-name="PortalPagePortletView"
list="portalPagePortlets">
- <field-map field-name="portalPageId" value="EbayAccount"/>
- <order-by field-name="columnSeqId"/>
- <order-by field-name="sequenceNum"/>
- </entity-and>
- <set field="headerItem" value="ebayStore"/>
- <set field="tabButtonItem" value="ebayAccount"/>
- </actions>
- <widgets>
- <decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <platform-specific><html><html-template
location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <!-- ebay feedback -->
- <screen name="EbayFeedback">
- <section>
- <actions>
- <set field="titleProperty" value="eBay Feedback"/>
- <set field="headerItem" value="ebayStore"/>
- <set field="tabButtonItem" value="feedback"/>
- </actions>
- <widgets>
- <decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="EBAY"
action="_VIEW"/>
- </condition>
- <widgets>
- <include-menu
location="component://ebaystore/widget/EbayStoreMenus.xml"
name="EbayFeedbackTabBar"/>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label
style="h3">${uiLabelMap.EbayViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="Feedback">
- <section>
- <actions>
- <set field="titleProperty" value="eBay Feedback"/>
- <set field="headerItem" value="ebayStore"/>
- <set field="eBayTabButtonItem" value="Feedback"/>
- <service service-name="loadFeedback">
- <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
- </service>
- <service service-name="getItemsAwaitingFeedback"
result-map="results">
- <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
- </service>
- <set field="itemsAwaitingFeedbackList"
from-field="results.itemsAwaitingFeedback"/>
- <script
location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="EbayFeedback" >
- <decorator-section name="body">
- <screenlet>
- <screenlet
navigation-form-name="ItemsAwaitingFeedback" title="Items Awaiting Feedback">
- <include-form name="ItemsAwaitingFeedback"
location="component://ebaystore/widget/EbayStoreForms.xml"/>
- </screenlet>
- </screenlet>
- <screenlet>
- <screenlet navigation-form-name="RecentFeedback"
title="Recent Feedback">
- <include-form name="RecentFeedback"
location="component://ebaystore/widget/EbayStoreForms.xml"/>
- </screenlet>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="LeaveFeedback">
- <section>
- <actions>
- <set field="titleProperty" value="eBay Feedback"/>
- <set field="headerItem" value="ebayStore"/>
- <set field="eBayTabButtonItem" value="LeaveFeedback"/>
- <set field="role" from-field="parameters.role"
default-value="all"/>
- <service service-name="getItemsAwaitingFeedback"
result-map="results"/>
- </actions>
- <widgets>
- <decorator-screen name="EbayFeedback" >
- <decorator-section name="body">
- <screenlet>
- <screenlet title="${uiLabelMap.EbayLeaveFeedback}">
- <include-menu
location="component://ebaystore/widget/EbayStoreMenus.xml"
name="EbayFeedbackSubTabBar"/>
- <platform-specific>
- <html><html-template
location="component://ebaystore/webapp/ebaystore/feedback/LeaveFeedback.ftl"/></html>
- </platform-specific>
- </screenlet>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="EbayAutomationPreferences">
- <section>
- <actions>
- <set field="headerItem" value="ebayStore"/>
- <set field="tabButtonItem" value="automationPreferences"/>
- <service service-name="getEbayStoreUser" result-map="result">
- <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
- </service>
- <set field="userLoginId" from-field="result.userLoginId"/>
- <script
location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetEbayJobsandbox.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <decorator-section-include name="body"/>
- <include-screen name="AutomationRelistSoldItems"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="AutomationRelistSoldItems">
- <section>
- <actions>
- <set field="headerItem" value="ebayStore"/>
- <set field="tabButtonItem" value="automationPreferences"/>
- </actions>
- <widgets>
- <screenlet title="${uiLabelMap.EbayAutomationRelistItems}">
- <include-form name="EditAutomationRelistSoldItems"
location="component://ebaystore/widget/EbayStoreForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- </screen>
<!-- block out of stock -->
<screen name="blockItemOutOfStock">
<section>
@@ -329,219 +182,6 @@
</widgets>
</section>
</screen>
- <!-- Store reserve inventory -->
- <screen name="ebayStoreInventory">
- <section>
- <actions>
- <set field="headerItem" value="ebayStore"/>
- <set field="tabButtonItem" value="inventory"/>
- <entity-and entity-name="ProductStoreFacility"
list="productStoreFacilityList">
- <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
- </entity-and>
- <set field="check" value="${groovy:
- check= "false";
- if(productStoreFacilityList!=null &&
productStoreFacilityList.size()== 1) check = "true";
- return check;
- }" type="String"/>
- <set field="facilityId" value="${groovy:
- if(check.equals("true")) facility =
productStoreFacilityList.get(0);
- if(facility!=null) facilityId = facility.facilityId;
- return facilityId;}" type="String"/>
- </actions>
- <widgets>
- <section>
- <condition>
- <if-compare field="check" operator="equals"
value="true"/>
- </condition>
- <widgets>
- <section>
- <actions>
- <set field="parameters.facilityId"
value="${facilityId}"/>
- <set field="parameters.productStoreId"
from-field="parameters.productStoreId"/>
- <service
service-name="getFolderInEbayStoreInventory" result-map="result">
- <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
- </service>
- <set field="ebayfolderId"
value="${result.folderId}"/>
- </actions>
- <widgets>
- <section>
- <condition>
- <not><if-empty
field="ebayfolderId"/></not>
- </condition>
- <widgets><include-screen
name="ViewInventoryItemDetail"/></widgets>
- <fail-widgets><include-screen
name="ebayStoreInventoryFail"/></fail-widgets>
- </section>
- </widgets>
- </section>
- </widgets>
- <fail-widgets>
- <section>
- <actions>
- <set field="parameters.facilityId"
value="${facilityId}"/>
- <set field="parameters.productStoreId"
from-field="parameters.productStoreId"/>
- </actions>
- <widgets>
- <decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet>
- <include-form
name="EbayStoreFacilityList"
location="component://ebaystore/widget/EbayInventoryForms.xml"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </fail-widgets>
- </section>
- </widgets>
- </section>
- </screen>
- <screen name="ebayLoadStoreInventory">
- <section>
- <actions>
- <set field="headerItem" value="ebayStore"/>
- <set field="tabButtonItem" value="inventory"/>
- <entity-and entity-name="ProductStoreFacility"
list="productStoreFacilityList">
- <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
- </entity-and>
- </actions>
- <widgets>
- <section>
- <widgets>
- <section>
- <actions>
- <set field="facilityId"
from-field="parameters.facilityId"/>
- <set field="productStoreId"
from-field="parameters.productStoreId"/>
- <set field="ebayfolderId"
from-field="parameters.folderId"/>
- </actions>
- <widgets><include-screen
name="ViewInventoryItemDetail"/></widgets>
- </section>
- </widgets>
- </section>
- </widgets>
- </section>
- </screen>
- <screen name="ViewInventoryItemDetail">
- <section>
- <actions>
- <property-map resource="WorkEffortUiLabels"
map-name="uiLabelMap" global="true"/>
- <set field="titleProperty" value="PageTitleEditInventoryItem"/>
- <set field="headerItem" value="ebayStore"/>
- <set field="tabButtonItem" value="inventory"/>
-
- <set field="facilityId" from-field="parameters.facilityId"/>
- <set field="productStoreId"
from-field="parameters.productStoreId"/>
- <entity-one entity-name="ProductStore"
value-field="productStore">
- <field-map field-name="productStoreId"
from-field="productStoreId"/>
- <select-field field-name="storeName"/>
- </entity-one>
- <entity-one entity-name="Facility" value-field="facility">
- <field-map field-name="facilityId"
from-field="facilityId"/>
- <select-field field-name="facilityName"/>
- </entity-one>
- <entity-and entity-name="EbayProductStoreInventory"
list="ebayProductStoreInventoryList">
- <field-map field-name="productStoreId"
from-field="productStoreId"/>
- <field-map field-name="facilityId"
from-field="facilityId"/>
- </entity-and>
- <property-map resource="ProductUiLabels"
map-name="uiLabelMap"/>
- </actions>
- <widgets>
- <decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet
title="${uiLabelMap.ProductInventoryDetails} ${uiLabelMap.ProductStoreNameId} :
${productStore.storeName}[${productStore.productStoreId}]
${uiLabelMap.FacilityFacility} : ${facility.facilityName}">
- <section>
- <widgets>
- <link name="updateEbayInventoryStatus"
secure="true" target="updateEbayInventoryStatus" style="buttontext"
text="${uiLabelMap.EbayUpdateInventoryStatus}">
- <parameter param-name="productStoreId"
from-field="productStoreId"/>
- <parameter param-name="facilityId"
from-field="facilityId"/>
- </link>
- <link name="reserveEbayProductInventory"
target="reserveEbayProductInventory" style="buttontext"
text="${uiLabelMap.EbayReserveProductInventory}">
- <parameter param-name="productStoreId"
from-field="productStoreId"/>
- <parameter param-name="facilityId"
from-field="facilityId"/>
- </link>
- </widgets>
- </section>
- <include-form
name="ListEbayProductInventoryDetail"
location="component://ebaystore/widget/EbayInventoryForms.xml"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="reserveEbayProductInventory">
- <section>
- <actions>
- <set field="headerItem" value="ebayStore"/>
- <set field="tabButtonItem" value="inventory"/>
- <set field="productStoreId"
from-field="parameters.productStoreId"/>
- <entity-one entity-name="Facility" value-field="facility">
- <field-map field-name="facilityId"
value="${parameters.facilityId}"/>
- <select-field field-name="facilityName"/>
- </entity-one>
- </actions>
- <widgets>
- <decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet title="${uiLabelMap.EbayReserveProductFrom}
: ${facility.facilityName}">
- <include-form name="reserveEbayProductInventory"
location="component://ebaystore/widget/EbayInventoryForms.xml"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="ebayStoreInventoryFail">
- <section>
- <actions>
- <set field="headerItem" value="ebayStore"/>
- <set field="tabButtonItem" value="inventory"/>
- <set field="productStoreId"
from-field="parameters.productStoreId"/>
- </actions>
- <widgets>
- <decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet title="notes">
- <label style="label" text="Please subscribed to
Selling Manager Pro before you use this function because ebay product inventory
will open when you start selling manager pro on ebay site."></label>
- <label style="label" text="if you subscribed
already then still can not use, please check you internet connection."></label>
- <label text="- To subscribe for production
site"></label>
- <link
target="http://pages.ebay.com/selling_manager_pro";
text="http://pages.ebay.com/selling_manager_pro"; target-window="_BLANK"
url-mode="plain"></link>
- <label text="- To upgrade store level sandbox
site"></label>
- <link
target="http://k2b-bulk.sandbox.ebay.com/ws/eBayISAPI.dll?MyeBaySellingPendingListings";
target-window="_BLANK" url-mode="plain"
text="http://k2b-bulk.sandbox.ebay.com/ws/eBayISAPI.dll?MyeBaySellingPendingListings";></link>
- </screenlet>
- <screenlet title="How to upgrade sandbox store level?">
- <label text="- Click on the link "To upgrade
store level for sandbox site""></label>
- <label text="- Go to "Selling Related
links" section"></label>
- <label text="- Click on "Edit my eBay
store""></label>
- <label text="- Page Manage my eBay store will show
up"></label>
- <label text="- Go to "Store Usage
Information" section"></label>
- <label text="- Click upgrade at "Subscription
level" then select "Premium Store" and "Selling Manager
Pro" then submit."></label>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="updateQuantityReserved">
- <section>
- <actions>
- <set field="headerItem" value="ebayStore"/>
- <set field="tabButtonItem" value="inventory"/>
- <entity-one entity-name="EbayProductStoreInventory"
value-field="ebayProductStoreInventory">
- <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
- <field-map field-name="facilityId"
from-field="parameters.facilityId"/>
- <field-map field-name="productId"
from-field="parameters.productId"/>
- </entity-one>
- </actions>
- <widgets>
- <decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet title="Inventory Quantities">
- <include-form name="updateQuantityReserved"
location="component://ebaystore/widget/EbayInventoryForms.xml"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<!-- Export product listing -->
<screen name="exportProductListing">
<section>
@@ -595,52 +235,4 @@
</widgets>
</section>
</screen>
- <screen name="EbaySoldListing">
- <section>
- <actions>
- <set field="tabButtonItem" value="soldListing"/>
- </actions>
- <widgets>
- <decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <decorator-section-include name="body"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="SoldListing">
- <section>
- <actions>
- <service service-name="getEbaySoldItems"
result-map="result">
- <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
- <field-map field-name="status"
from-field="parameters.status"/>
- <field-map field-name="period"
from-field="parameters.period"/>
- </service>
- <set field="soldItemList" from-field="result.soldItems"/>
- </actions>
- <widgets>
- <decorator-screen name="EbaySoldListing">
- <decorator-section name="body">
- <screenlet title="Sold Listing">
- <include-form
location="component://ebaystore/widget/EbayStoreForms.xml" name="SoldItemList"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="OpenUnpaid">
- <section>
- <widgets>
- <decorator-screen name="EbaySoldListing">
- <decorator-section name="body">
- <screenlet title="Open Unpaid">
- <include-form
location="component://ebaystore/widget/EbayStoreForms.xml" name="OpenUnpaid"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
</screens>
\ No newline at end of file
