Author: hansbak
Date: Fri Mar 5 11:01:57 2010
New Revision: 919374
URL: http://svn.apache.org/viewvc?rev=919374&view=rev
Log:
ebaystore: Change 'check out of stock item' function to automatic function in
automation preferences
Modified:
ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreTypeData.xml
ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml
ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml
ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml
Modified: ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreTypeData.xml?rev=919374&r1=919373&r2=919374&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/data/EbayStoreTypeData.xml Fri Mar 5
11:01:57 2010
@@ -35,7 +35,9 @@
<Enumeration enumId="EBAY_AUTO_FB_RMD" description="Automatic send
reminder email if feedback has not been received after day? shipping"
enumTypeId="EBAY_AUTO_PREF"/>
<Enumeration enumId="EBAY_AUTO_COMB_ORD" description="Automatic combine
order" enumTypeId="EBAY_AUTO_PREF"/>
<Enumeration enumId="EBAY_AUTO_PR_EMAIL" description="Automatic send
payment received email when has not been received" enumTypeId="EBAY_AUTO_PREF"/>
-
+ <Enumeration enumId="EBAY_AUTO_ITEM_DISP" description="Automatic send item
dispatched email" enumTypeId="EBAY_AUTO_PREF"/>
+ <Enumeration enumId="EBAY_AUTO_BLK_ITEM" description="Automatic block item
that out of stock" enumTypeId="EBAY_AUTO_PREF"/>
+
<!-- Automation email -->
<Enumeration enumId="EBAY_WIN_BUYER_NOTI" description="Automatically
send a Winning Buyer Notification email to your winning buyer(s) after item has
sold." enumTypeId="PRDS_EMAIL"/>
<Enumeration enumId="EBAY_PAY_RECIEVED" description="Automatically send
Payment Received email when payment has been received."
enumTypeId="PRDS_EMAIL"/>
Modified:
ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml?rev=919374&r1=919373&r2=919374&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml
Fri Mar 5 11:01:57 2010
@@ -286,4 +286,45 @@
<result-to-field result-name="contentId"/>
</call-service>
</simple-method>
+
+ <simple-method method-name="settingAutoBlockItemOutOfStock"
login-required="false" short-description="Set automatic block item that out of
stock">
+ <entity-one entity-name="ProductStore" value-field="productStore" >
+ <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
+ </entity-one>
+ <if-empty field="productStore">
+ <add-error><fail-message message="No ProductStore found with id
${parameters.productStoreId}."/></add-error>
+ <check-errors/>
+ </if-empty>
+
+ <entity-one entity-name="EbayProductStorePref"
value-field="ebayProdStorePref">
+ <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
+ <field-map field-name="autoPrefEnumId" value="EBAY_AUTO_BLK_ITEM"/>
+ </entity-one>
+
+ <if-not-empty field="ebayProdStorePref">
+ <set field="parameters.productStoreId" type="String"
default-value="parameters.productStoreId"
from-field="ebayProdStorePref.productStoreId"/>
+ <else>
+ <set field="parameters.productStoreId" type="String"
from-field="parameters.productStoreId"/>
+ </else>
+ </if-not-empty>
+ <set field="parameters.autoPrefEnumId" type="String"
value="EBAY_AUTO_BLK_ITEM"/>
+ <if-not-empty field="ebayProdStorePref">
+ <if-not-empty field="ebayProdStorePref.autoPrefJobId">
+ <set field="parameters.autoPrefJobId" type="String"
from-field="ebayProdStorePref.autoPrefJobId"/>
+ </if-not-empty>
+ </if-not-empty>
+ <set field="parameters.enabled" default-value="N" type="String"
from-field="parameters.isRunBlockItem"/>
+ <set field="parameters.serviceName"
default-value="autoBlockItemsOutOfStock" type="String"/>
+ <session-to-field field="context.userLogin" session-name="userLogin"/>
+
+ <if-empty field="ebayProdStorePref">
+ <set-service-fields service-name="createEbayProductStorePref"
map="parameters" to-map="ebayProductStorePref"/>
+ <call-service service-name="createEbayProductStorePref"
in-map-name="ebayProductStorePref" ></call-service>
+ <else>
+ <set-service-fields service-name="updateEbayProductStorePref"
map="parameters" to-map="ebayProductStorePref"/>
+ <call-service service-name="updateEbayProductStorePref"
in-map-name="ebayProductStorePref"></call-service>
+ </else>
+ </if-empty>
+ <field-to-request field="parameters.productStoreId"
request-name="productStoreId"/>
+ </simple-method>
</simple-methods>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml?rev=919374&r1=919373&r2=919374&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/servicedef/services.xml Fri Mar 5
11:01:57 2010
@@ -170,12 +170,6 @@
<attribute name="period" mode="IN" type="String" optional="true"/>
<attribute name="soldItems" mode="OUT" type="List" optional="true"/>
</service>
- <!-- block out of stock items -->
- <service name="getSellingInventory" engine="java"
transaction-timeout="7200"
- location="org.ofbiz.ebaystore.EbayStore" invoke="getSellingInventory"
auth="true">
- <attribute name="productStoreId" mode="IN" type="String"
optional="false"/>
- <attribute name="itemBlocked" type="Map" mode="OUT" optional="true"/>
- </service>
<!-- ebay inventory -->
<service name="reserveEbayProductInventory" engine="simple"
location="component://ebaystore/script/org/ofbiz/ebaystore/EbayServices.xml"
invoke="reserveEbayProductInventory">
@@ -384,4 +378,10 @@
<attribute name="jobId" mode="IN" type="String" optional="false"/>
<attribute name="productStoreId" mode="IN" type="String"
optional="false"/>
</service>
+ <service name="autoBlockItemsOutOfStock" engine="java"
transaction-timeout="7200"
+ location="org.ofbiz.ebaystore.EbayStoreAutoPreferences"
invoke="autoBlockItemsOutOfStock" auth="false">
+ <description>Automatic service to send item dispatched notification
email when user mark sold listing as dispatched</description>
+ <attribute name="jobId" mode="IN" type="String" optional="false"/>
+ <attribute name="productStoreId" mode="IN" type="String"
optional="false"/>
+ </service>
</services>
\ 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=919374&r1=919373&r2=919374&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
Fri Mar 5 11:01:57 2010
@@ -1512,74 +1512,6 @@
return result;
}
- /* ebay store block out of stock items */
- public static Map<String,Object> getSellingInventory(DispatchContext dctx,
Map<String,Object> context) {
- Locale locale = (Locale) context.get("locale");
- Delegator delegator = dctx.getDelegator();
- Map<String,Object> result = FastMap.newInstance();
- GetSellingManagerInventoryRequestType req = new
GetSellingManagerInventoryRequestType();
- GetSellingManagerInventoryResponseType resp = null;
-
- if (context.get("productStoreId") != null) {
- GetSellingManagerInventoryCall call = new
GetSellingManagerInventoryCall(EbayStoreHelper.getApiContext((String)context.get("productStoreId"),
locale, delegator));
-
- try {
- Map<String,Object> ebayResp = FastMap.newInstance();
- SellingManagerProductType[] returnedSellingManagerProductType
= null;
- resp =
(GetSellingManagerInventoryResponseType)call.execute(req);
- if (resp != null &&
"SUCCESS".equals(resp.getAck().toString())) {
- returnedSellingManagerProductType =
resp.getSellingManagerProduct();
- //result = ServiceUtil.returnSuccess("load store data
success..");
- for (int i = 0; i <
returnedSellingManagerProductType.length; i++) {
- SellingManagerProductInventoryStatusType
sellingProductInventory =
returnedSellingManagerProductType[i].getSellingManagerProductInventoryStatus();
- SellingManagerProductDetailsType prodDetailType =
returnedSellingManagerProductType[i].getSellingManagerProductDetails();
- Long productID = (Long) prodDetailType.getProductID();
- int qty = prodDetailType.getQuantityAvailable();
-
- if (qty == 0) {
- SellingManagerTemplateDetailsArrayType
sellingTempArr =
returnedSellingManagerProductType[i].getSellingManagerTemplateDetailsArray();
- SellingManagerTemplateDetailsType[]
selllingTempType = null;
- if (UtilValidate.isNotEmpty(sellingTempArr)) {
- selllingTempType =
sellingTempArr.getSellingManagerTemplateDetails();
- }
-
- if (selllingTempType.length > 0) {
- for (int j = 0; j < selllingTempType.length;
j++) {
- Long longTemplete =
Long.parseLong(selllingTempType[j].getSaleTemplateID());
- DeleteSellingManagerTemplateCall tcall =
new
DeleteSellingManagerTemplateCall(EbayStoreHelper.getApiContext((String)context.get("productStoreId"),
locale, delegator));
- DeleteSellingManagerTemplateRequestType
treq = new DeleteSellingManagerTemplateRequestType();
- DeleteSellingManagerTemplateResponseType
tresp = null;
- treq.setSaleTemplateID(longTemplete);
-
- tresp =
(DeleteSellingManagerTemplateResponseType) tcall.execute(treq);
- if (tresp != null &&
"SUCCESS".equals(tresp.getAck().toString())) {
- ebayResp.put("TemplateID",
tresp.getDeletedSaleTemplateID());
- ebayResp.put("TemplateName",
tresp.getDeletedSaleTemplateName());
- result.put("itemBlocked", ebayResp);
- }
- }
- }
- }
- }
- result.put(ModelService.RESPONSE_MESSAGE,
ModelService.RESPOND_SUCCESS);
- if (UtilValidate.isNotEmpty(ebayResp.get("TemplateID"))) {
- result.put(ModelService.SUCCESS_MESSAGE, "block
"+ebayResp.get("TemplateID")+" out of stock success..");
- } else {
- result.put(ModelService.SUCCESS_MESSAGE, "no item out
of stock");
- }
-
- }
- } catch (ApiException e) {
- e.printStackTrace();
- } catch (SdkSoapException e) {
- e.printStackTrace();
- } catch (SdkException e) {
- e.printStackTrace();
- }
- }
- return result;
- }
-
public static Map<String, Object>
exportProductsFromEbayStore(DispatchContext dctx, Map context) {
Map<String,Object> result = FastMap.newInstance();
Locale locale = (Locale) context.get("locale");
Modified:
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java?rev=919374&r1=919373&r2=919374&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
Fri Mar 5 11:01:57 2010
@@ -52,13 +52,17 @@
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ModelService;
import org.ofbiz.service.ServiceUtil;
import com.ebay.sdk.ApiContext;
import com.ebay.sdk.ApiException;
import com.ebay.sdk.SdkException;
+import com.ebay.sdk.SdkSoapException;
import com.ebay.sdk.call.AddOrderCall;
import com.ebay.sdk.call.AddDisputeCall;
+import com.ebay.sdk.call.DeleteSellingManagerTemplateCall;
+import com.ebay.sdk.call.GetSellingManagerInventoryCall;
import com.ebay.sdk.call.GetSellingManagerSoldListingsCall;
import com.ebay.sdk.call.GetUserCall;
import com.ebay.sdk.call.LeaveFeedbackCall;
@@ -70,19 +74,28 @@
import com.ebay.soap.eBLBaseComponents.BuyerPaymentMethodCodeType;
import com.ebay.soap.eBLBaseComponents.CommentTypeCodeType;
import com.ebay.soap.eBLBaseComponents.CurrencyCodeType;
+import com.ebay.soap.eBLBaseComponents.DeleteSellingManagerTemplateRequestType;
+import
com.ebay.soap.eBLBaseComponents.DeleteSellingManagerTemplateResponseType;
import com.ebay.soap.eBLBaseComponents.DetailLevelCodeType;
import com.ebay.soap.eBLBaseComponents.DisputeExplanationCodeType;
import com.ebay.soap.eBLBaseComponents.DisputeReasonCodeType;
import com.ebay.soap.eBLBaseComponents.FeedbackDetailType;
+import com.ebay.soap.eBLBaseComponents.GetSellingManagerInventoryRequestType;
+import com.ebay.soap.eBLBaseComponents.GetSellingManagerInventoryResponseType;
import com.ebay.soap.eBLBaseComponents.ItemType;
import com.ebay.soap.eBLBaseComponents.OrderType;
import com.ebay.soap.eBLBaseComponents.ItemType;
import com.ebay.soap.eBLBaseComponents.SellingManagerOrderStatusType;
import com.ebay.soap.eBLBaseComponents.SellingManagerPaidStatusCodeType;
+import com.ebay.soap.eBLBaseComponents.SellingManagerProductDetailsType;
+import
com.ebay.soap.eBLBaseComponents.SellingManagerProductInventoryStatusType;
+import com.ebay.soap.eBLBaseComponents.SellingManagerProductType;
import com.ebay.soap.eBLBaseComponents.SellingManagerShippedStatusCodeType;
import
com.ebay.soap.eBLBaseComponents.SellingManagerSoldListingsSortTypeCodeType;
import com.ebay.soap.eBLBaseComponents.SellingManagerSoldOrderType;
import com.ebay.soap.eBLBaseComponents.SellingManagerSoldTransactionType;
+import com.ebay.soap.eBLBaseComponents.SellingManagerTemplateDetailsArrayType;
+import com.ebay.soap.eBLBaseComponents.SellingManagerTemplateDetailsType;
import com.ebay.soap.eBLBaseComponents.TradingRoleCodeType;
import com.ebay.soap.eBLBaseComponents.TransactionArrayType;
import com.ebay.soap.eBLBaseComponents.TransactionType;
@@ -1026,4 +1039,62 @@
}
return result;
}
+
+ public static Map<String,Object> autoBlockItemsOutOfStock(DispatchContext
dctx, Map<String,Object> context) {
+ Locale locale = (Locale) context.get("locale");
+ Delegator delegator = dctx.getDelegator();
+ Map<String,Object> result = FastMap.newInstance();
+ GetSellingManagerInventoryRequestType req = new
GetSellingManagerInventoryRequestType();
+ GetSellingManagerInventoryResponseType resp = null;
+
+ if (context.get("productStoreId") != null) {
+ GetSellingManagerInventoryCall call = new
GetSellingManagerInventoryCall(EbayStoreHelper.getApiContext((String)context.get("productStoreId"),
locale, delegator));
+
+ try {
+ SellingManagerProductType[] returnedSellingManagerProductType
= null;
+ resp =
(GetSellingManagerInventoryResponseType)call.execute(req);
+ if (resp != null &&
"SUCCESS".equals(resp.getAck().toString())) {
+ returnedSellingManagerProductType =
resp.getSellingManagerProduct();
+ //result = ServiceUtil.returnSuccess("load store data
success..");
+ for (int i = 0; i <
returnedSellingManagerProductType.length; i++) {
+ SellingManagerProductDetailsType prodDetailType =
returnedSellingManagerProductType[i].getSellingManagerProductDetails();
+ int qty = prodDetailType.getQuantityAvailable();
+
+ if (qty == 0) {
+ SellingManagerTemplateDetailsArrayType
sellingTempArr =
returnedSellingManagerProductType[i].getSellingManagerTemplateDetailsArray();
+ SellingManagerTemplateDetailsType[]
selllingTempType = null;
+ if (UtilValidate.isNotEmpty(sellingTempArr)) {
+ selllingTempType =
sellingTempArr.getSellingManagerTemplateDetails();
+ }
+
+ if (selllingTempType.length > 0) {
+ for (int j = 0; j < selllingTempType.length;
j++) {
+ Long longTemplete =
Long.parseLong(selllingTempType[j].getSaleTemplateID());
+ DeleteSellingManagerTemplateCall tcall =
new
DeleteSellingManagerTemplateCall(EbayStoreHelper.getApiContext((String)context.get("productStoreId"),
locale, delegator));
+ DeleteSellingManagerTemplateRequestType
treq = new DeleteSellingManagerTemplateRequestType();
+ DeleteSellingManagerTemplateResponseType
tresp = null;
+ treq.setSaleTemplateID(longTemplete);
+
+ tresp =
(DeleteSellingManagerTemplateResponseType) tcall.execute(treq);
+ if (tresp != null &&
"SUCCESS".equals(tresp.getAck().toString())) {
+ result = ServiceUtil.returnSuccess();
+ }
+ }
+ }
+ }
+ }
+ result.put(ModelService.RESPONSE_MESSAGE,
ModelService.RESPOND_SUCCESS);
+ }
+ result = ServiceUtil.returnSuccess();
+ } catch (ApiException e) {
+ e.printStackTrace();
+ } catch (SdkSoapException e) {
+ e.printStackTrace();
+ } catch (SdkException e) {
+ e.printStackTrace();
+ }
+ }
+ return result;
+ }
+
}
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=919374&r1=919373&r2=919374&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/controller.xml
Fri Mar 5 11:01:57 2010
@@ -193,17 +193,11 @@
<response name="success" type="request-redirect"
value="automationPreferences"/>
<response name="error" type="view" value="AutomationPreferences"/>
</request-map>
- <!-- Block item out of stock -->
- <request-map uri="blockItemOutOfStock">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="blockItemOutOfStock"/>
- <response name="error" type="view" value="blockItemOutOfStock"/>
- </request-map>
<request-map uri="runBlockItemOutOfStock">
<security https="true" auth="true"/>
- <event type="service" invoke="getSellingInventory"/>
- <response name="success" type="view" value="blockItemOutOfStock"/>
- <response name="error" type="view" value="blockItemOutOfStock"/>
+ <event type="simple"
path="component://ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml"
invoke="settingAutoBlockItemOutOfStock"/>
+ <response name="success" type="request-redirect"
value="automationPreferences"/>
+ <response name="error" type="view" value="AutomationPreferences"/>
</request-map>
<!-- Store inventory -->
<request-map uri="ebayStoreInventory">
@@ -326,8 +320,6 @@
<view-map name="LeaveFeedback" type="screen"
page="component://ebaystore/widget/EbayAccountScreens.xml#LeaveFeedback"/>
<!-- AutomationPreferences -->
<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"/>
<!-- Selling Manager -->
<view-map name="editEmailTemplate" type="screen"
page="component://ebaystore/widget/EbaySellingManagerScreens.xml#EditEmailTemplate"/>
<!-- store Inventory -->
Modified:
ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=919374&r1=919373&r2=919374&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Fri
Mar 5 11:01:57 2010
@@ -455,4 +455,16 @@
<field name="includeCrossPromotions"
title="${uiLabelMap.CommonEmptyHeader}"
tooltip="${uiLabelMap.EbayIncludeMyDefaultCrossPromotionInThisEmail}"
tooltip-style="h3"><check/></field-->
<field name="submitButton"><submit/></field>
</form>
+ <form name="blockItemsOutOfStock" type="single"
target="runBlockItemOutOfStock" header-row-style="header-row"
default-table-style="basic-table">
+ <actions>
+ <entity-one entity-name="EbayProductStorePref"
value-field="ebayPrefCombine">
+ <field-map field-name="productStoreId"
from-field="parameters.productStoreId"/>
+ <field-map field-name="autoPrefEnumId"
value="EBAY_AUTO_BLK_ITEM"/>
+ </entity-one>
+ <set field="isRunBlockItem" type="String"
from-field="ebayPrefCombine.enabled"/>
+ </actions>
+ <field name="productStoreId"><hidden
value="${parameters.productStoreId}"/></field>
+ <field name="isRunBlockItem" position="1" title="Enable to automatic
block item that out of stock"><check></check></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit
button-type="button"/></field>
+ </form>
</forms>
\ No newline at end of file
Modified:
ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml?rev=919374&r1=919373&r2=919374&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerScreens.xml
Fri Mar 5 11:01:57 2010
@@ -266,6 +266,9 @@
<screenlet
title="${uiLabelMap.EbayAutoSendItemDispatchEmail}"
id="itemDispatchedNotification" collapsible="true" initially-collapsed="true">
<include-form name="itemDispatchedNotification"
location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
</screenlet>
+ <screenlet
title="${uiLabelMap.EbayBlockItemOutOfStock}" id="blockItemsOutOfStock"
collapsible="true" initially-collapsed="true">
+ <include-form name="blockItemsOutOfStock"
location="component://ebaystore/widget/EbaySellingManagerForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml?rev=919374&r1=919373&r2=919374&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreForms.xml Fri Mar 5
11:01:57 2010
@@ -120,10 +120,4 @@
<field name="currentPasswordVerify"><password/></field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit
button-type="button"/></field>
</form>
- <!-- block out of stock items -->
- <form name="blockItemsOutOfStock" type="single"
target="runBlockItemOutOfStock">
- <field name="productStoreId"><hidden
value="${parameters.productStoreId}"/></field>
- <field name="productStore" entry-name="parameters.productStoreId"
><display-entity entity-name="ProductStore" description="${storeName}
[${productStoreId}]" key-field-name="productStoreId" ></display-entity></field>
- <field name="submitButton"
title="${uiLabelMap.BlockItemsOutOfStock}"><submit
button-type="button"/></field>
- </form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml?rev=919374&r1=919373&r2=919374&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbayStoreScreens.xml Fri Mar 5
11:01:57 2010
@@ -160,26 +160,6 @@
</widgets>
</section>
</screen>
- <!-- block out of stock -->
- <screen name="blockItemOutOfStock">
- <section>
- <actions>
- <set field="titleProperty" value="Block items out of stock on
eBay"/>
- <set field="headerItem" value="ebayStore"/>
- <set field="tabButtonItem" value="blockItemOutOfStock"/>
- <set field="productStoreId"
value="${parameters.productStoreId}"/>
- </actions>
- <widgets>
- <decorator-screen name="permission-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <screenlet title="${uiLabelMap.BlockItemsOutOfStock}">
- <include-form name="blockItemsOutOfStock"
location="component://ebaystore/widget/EbayStoreForms.xml"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<!-- Export product listing -->
<screen name="exportProductListing">
<section>
