Author: doogie
Date: Mon May 14 21:02:33 2012
New Revision: 1338414
URL: http://svn.apache.org/viewvc?rev=1338414&view=rev
Log:
DEPRECATION: specialpurpose/ebaystore: findByAnd variants replaced with
findByAnd that takes a boolean useCache parameter.
Modified:
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetEbayJobsandbox.groovy
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/email/GetProductStoreEmailTemplate.groovy
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/CheckOrderStatus.groovy
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/StoreAccount.groovy
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
Modified:
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java
Mon May 14 21:02:33 2012
@@ -174,7 +174,7 @@ public class EbayBestOfferAutoPref {
dispatcher.runSync("updateEbayProductStorePref",ebayPref);
String parentPrefCondId =
productStorePref.getString("parentPrefCondId");
- List<GenericValue> productPref =
delegator.findByAnd("EbayProductStorePrefCond",
UtilMisc.toMap("parentPrefCondId",parentPrefCondId));
+ List<GenericValue> productPref =
delegator.findByAnd("EbayProductStorePrefCond",
UtilMisc.toMap("parentPrefCondId",parentPrefCondId), null, false);
if (productPref.size() != 0) {
String[] condition = {condition1, condition2, condition3,
condition4, condition5, condition6, condition7, condition8, condition9,
condition10, condition11};
Map<String, Object> ebayPrefCond = UtilMisc.<String,
Object>toMap("userLogin", userLogin);
Modified:
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java
Mon May 14 21:02:33 2012
@@ -864,7 +864,7 @@ public class EbayEvents {
attributeMapList.put("Currency", "USD");
if
(UtilValidate.isNotEmpty(requestParams.get("requireEbayInventory")) &&
"Y".equals(requestParams.get("requireEbayInventory").toString())) {
- GenericValue ebayProductStore =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("EbayProductStoreInventory",
UtilMisc.toMap("productStoreId", productStoreId, "productId", productId))));
+ GenericValue ebayProductStore =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("EbayProductStoreInventory",
UtilMisc.toMap("productStoreId", productStoreId, "productId", productId),
null, false)));
if (UtilValidate.isNotEmpty(ebayProductStore)) {
String facilityId =
ebayProductStore.getString("facilityId");
BigDecimal atp =
ebayProductStore.getBigDecimal("availableToPromiseListing");
@@ -900,9 +900,9 @@ public class EbayEvents {
itemObj.put("isAutoRelist", "Y");
}
try {
- GenericValue storeRole =
EntityUtil.getFirst(delegator.findByAnd("ProductStoreRole",
UtilMisc.toMap("productStoreId", productStoreId, "roleTypeId",
"EBAY_ACCOUNT")));
+ GenericValue storeRole =
EntityUtil.getFirst(delegator.findByAnd("ProductStoreRole",
UtilMisc.toMap("productStoreId", productStoreId, "roleTypeId", "EBAY_ACCOUNT"),
null, false));
if (UtilValidate.isNotEmpty(storeRole)) {
- List<GenericValue> ebayUserLoginList =
delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId",
storeRole.get("partyId")));
+ List<GenericValue> ebayUserLoginList =
delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId",
storeRole.get("partyId")), null, false);
if (ebayUserLoginList.size() > 0) {
GenericValue eBayUserLogin =
EntityUtil.getFirst(ebayUserLoginList);
if
(UtilValidate.isNotEmpty(eBayUserLogin)) {
Modified:
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java
Mon May 14 21:02:33 2012
@@ -97,7 +97,7 @@ public class EbayFeedback {
partyId = userLoginEx.getString("partyId");
}
//PartyRole For eBay User
- List<GenericValue> partyRoles =
delegator.findByAnd("PartyRole", UtilMisc.toMap("partyId", partyId,
"roleTypeId", "OWNER"));
+ List<GenericValue> partyRoles =
delegator.findByAnd("PartyRole", UtilMisc.toMap("partyId", partyId,
"roleTypeId", "OWNER"), null, false);
if (partyRoles.size() == 0) {
GenericValue partyRole = delegator.makeValue("PartyRole");
partyRole.put("partyId", partyId);
@@ -116,7 +116,7 @@ public class EbayFeedback {
String textData = feedback[i].getCommentText();
String commentingUserId= feedback[i].getCommentingUser();
String commentingPartyId = null;
- List<GenericValue> CommentingUserLogins =
delegator.findByAnd("UserLogin", UtilMisc.toMap("userLoginId",
commentingUserId));
+ List<GenericValue> CommentingUserLogins =
delegator.findByAnd("UserLogin", UtilMisc.toMap("userLoginId",
commentingUserId), null, false);
if (CommentingUserLogins.size() == 0) {
//Party
GenericValue party = delegator.makeValue("Party");
@@ -158,7 +158,7 @@ public class EbayFeedback {
contentPurpose.put("contentPurposeTypeId", "FEEDBACK");
contentPurpose.create();
//PartyRole For eBay Commentator
- List<GenericValue> commentingPartyRoles =
delegator.findByAnd("PartyRole", UtilMisc.toMap("partyId", commentingPartyId,
"roleTypeId", "COMMENTATOR"));
+ List<GenericValue> commentingPartyRoles =
delegator.findByAnd("PartyRole", UtilMisc.toMap("partyId", commentingPartyId,
"roleTypeId", "COMMENTATOR"), null, false);
if (commentingPartyRoles.size() == 0) {
GenericValue partyRole =
delegator.makeValue("PartyRole");
partyRole.put("partyId", commentingPartyId);
@@ -166,7 +166,7 @@ public class EbayFeedback {
partyRole.create();
}
//ContentRole for eBay User
- List<GenericValue> contentRoles =
delegator.findByAnd("ContentRole", UtilMisc.toMap("partyId", partyId,
"roleTypeId", "OWNER", "contentId", contentId));
+ List<GenericValue> contentRoles =
delegator.findByAnd("ContentRole", UtilMisc.toMap("partyId", partyId,
"roleTypeId", "OWNER", "contentId", contentId), null, false);
if (contentRoles.size() == 0) {
GenericValue contentRole =
delegator.makeValue("ContentRole");
contentRole.put("contentId", contentId);
@@ -176,7 +176,7 @@ public class EbayFeedback {
contentRole.create();
}
//ContentRole for Commentator
- List<GenericValue> commentingContentRoles =
delegator.findByAnd("ContentRole", UtilMisc.toMap("partyId", commentingPartyId,
"roleTypeId", "COMMENTATOR", "contentId", contentId));
+ List<GenericValue> commentingContentRoles =
delegator.findByAnd("ContentRole", UtilMisc.toMap("partyId", commentingPartyId,
"roleTypeId", "COMMENTATOR", "contentId", contentId), null, false);
if (commentingContentRoles.size() == 0) {
GenericValue contentRole =
delegator.makeValue("ContentRole");
contentRole.put("contentId", contentId);
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=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
Mon May 14 21:02:33 2012
@@ -236,7 +236,7 @@ public class EbayStore {
try {
SetStoreCategoriesCall call = new
SetStoreCategoriesCall(EbayStoreHelper.getApiContext((String)context.get("productStoreId"),
locale, delegator));
- catalogCategories = delegator.findByAnd("ProdCatalogCategory",
UtilMisc.toMap("prodCatalogId",
context.get("prodCatalogId").toString(),"prodCatalogCategoryTypeId","PCCT_EBAY_ROOT"),
UtilMisc.toList("sequenceNum ASC"));
+ catalogCategories = delegator.findByAnd("ProdCatalogCategory",
UtilMisc.toMap("prodCatalogId",
context.get("prodCatalogId").toString(),"prodCatalogCategoryTypeId","PCCT_EBAY_ROOT"),
UtilMisc.toList("sequenceNum ASC"), false);
if (catalogCategories != null && catalogCategories.size() > 0) {
List<StoreCustomCategoryType> listAdd = FastList.newInstance();
List<StoreCustomCategoryType> listEdit =
FastList.newInstance();
@@ -279,7 +279,7 @@ public class EbayStore {
if (productCategory != null) {
String ebayParentCategoryId =
EbayStoreHelper.retriveEbayCategoryIdByPartyId(delegator,
productCategory.getString("productCategoryId"),
context.get("partyId").toString());
if (ebayParentCategoryId != null) {
- List<GenericValue> productCategoryRollupList =
delegator.findByAnd("ProductCategoryRollup",
UtilMisc.toMap("parentProductCategoryId",
productCategory.getString("productCategoryId")), UtilMisc.toList("sequenceNum
ASC"));
+ List<GenericValue> productCategoryRollupList =
delegator.findByAnd("ProductCategoryRollup",
UtilMisc.toMap("parentProductCategoryId",
productCategory.getString("productCategoryId")), UtilMisc.toList("sequenceNum
ASC"), false);
for (GenericValue productCategoryRollup :
productCategoryRollupList) {
productCategory =
delegator.findOne("ProductCategory", UtilMisc.toMap("productCategoryId",
productCategoryRollup.getString("productCategoryId")), false);
StoreCustomCategoryType childCategoryType =
new StoreCustomCategoryType();
@@ -318,11 +318,11 @@ public class EbayStore {
for (GenericValue catalogCategory : catalogCategories) {
GenericValue productCategory =
catalogCategory.getRelatedOne("ProductCategory");
if (productCategory != null) {
- List<GenericValue> productParentCategoryRollupList =
delegator.findByAnd("ProductCategoryRollup",
UtilMisc.toMap("parentProductCategoryId",productCategory.getString("productCategoryId")),UtilMisc.toList("sequenceNum
ASC"));
+ List<GenericValue> productParentCategoryRollupList =
delegator.findByAnd("ProductCategoryRollup",
UtilMisc.toMap("parentProductCategoryId",productCategory.getString("productCategoryId")),UtilMisc.toList("sequenceNum
ASC"), false);
for (GenericValue productParentCategoryRollup :
productParentCategoryRollupList) {
String ebayParentCategoryId =
EbayStoreHelper.retriveEbayCategoryIdByPartyId(delegator,productParentCategoryRollup.getString("productCategoryId"),context.get("partyId").toString());
if (ebayParentCategoryId != null) {
- List<GenericValue>
productChildCategoryRollupList = delegator.findByAnd("ProductCategoryRollup",
UtilMisc.toMap("parentProductCategoryId",productParentCategoryRollup.getString("productCategoryId")),UtilMisc.toList("sequenceNum
ASC"));
+ List<GenericValue>
productChildCategoryRollupList = delegator.findByAnd("ProductCategoryRollup",
UtilMisc.toMap("parentProductCategoryId",productParentCategoryRollup.getString("productCategoryId")),UtilMisc.toList("sequenceNum
ASC"), false);
for (GenericValue productChildCategoryRollup :
productChildCategoryRollupList) {
productCategory =
delegator.findOne("ProductCategory", UtilMisc.toMap("productCategoryId",
productChildCategoryRollup.getString("productCategoryId")), false);
StoreCustomCategoryType childCategoryType
= new StoreCustomCategoryType();
@@ -396,7 +396,7 @@ public class EbayStore {
if
(actionCode.equals(StoreCategoryUpdateActionCodeType.ADD) &&
returnedCustomCategory != null) {
StoreCustomCategoryType[] returnCategoryTypeList =
returnedCustomCategory.getCustomCategory();
for (StoreCustomCategoryType returnCategoryType :
returnCategoryTypeList) {
- List<GenericValue> productCategoryList =
delegator.findByAnd("ProductCategory",
UtilMisc.toMap("categoryName",returnCategoryType.getName(),"productCategoryTypeId","EBAY_CATEGORY"));
+ List<GenericValue> productCategoryList =
delegator.findByAnd("ProductCategory",
UtilMisc.toMap("categoryName",returnCategoryType.getName(),"productCategoryTypeId","EBAY_CATEGORY"),
null, false);
for (GenericValue productCategory :
productCategoryList) {
if
(EbayStoreHelper.veriflyCategoryInCatalog(delegator,catalogCategories,productCategory.getString("productCategoryId")))
{
if
(EbayStoreHelper.createEbayCategoryIdByPartyId(delegator,
productCategory.getString("productCategoryId"), partyId,
String.valueOf(returnCategoryType.getCategoryID()))) {
@@ -598,10 +598,10 @@ public class EbayStore {
Delegator delegator = dctx.getDelegator();
String productStoreId = (String) context.get("productStoreId");
try {
- List<GenericValue> productStores =
delegator.findByAnd("ProductStoreRole", UtilMisc.toMap("productStoreId",
productStoreId, "roleTypeId", "EBAY_ACCOUNT"));
+ List<GenericValue> productStores =
delegator.findByAnd("ProductStoreRole", UtilMisc.toMap("productStoreId",
productStoreId, "roleTypeId", "EBAY_ACCOUNT"), null, false);
if (productStores.size() != 0) {
String partyId = (productStores.get(0)).getString("partyId");
- List<GenericValue> userLoginStore =
delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId", partyId));
+ List<GenericValue> userLoginStore =
delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId", partyId), null,
false);
if (userLoginStore.size() != 0) {
String userLoginId =
(userLoginStore.get(0)).getString("userLoginId");
result.put("userLoginId", userLoginId);
@@ -628,10 +628,10 @@ public class EbayStore {
if (context.get("productStoreId") != null) {
String partyId = null;
try {
- List<GenericValue> productStoreRoles =
delegator.findByAnd("ProductStoreRole", UtilMisc.toMap("productStoreId",
context.get("productStoreId").toString(),"roleTypeId","EBAY_ACCOUNT"));
+ List<GenericValue> productStoreRoles =
delegator.findByAnd("ProductStoreRole", UtilMisc.toMap("productStoreId",
context.get("productStoreId").toString(),"roleTypeId","EBAY_ACCOUNT"), null,
false);
if (productStoreRoles.size() != 0) {
partyId= (String)productStoreRoles.get(0).get("partyId");
- List<GenericValue> userLogins =
delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId", partyId));
+ List<GenericValue> userLogins =
delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId", partyId), null,
false);
if (userLogins.size() != 0) {
userLoginId =
(String)userLogins.get(0).get("userLoginId");
}
@@ -1552,7 +1552,7 @@ public class EbayStore {
int intAtp = 1;
String facilityId = "";
if (UtilValidate.isNotEmpty(context.get("requireEbayInventory"))
&& "on".equals(context.get("requireEbayInventory").toString())) {
- GenericValue ebayProductStore =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("EbayProductStoreInventory",
UtilMisc.toMap("productStoreId", context.get("productStoreId").toString(),
"productId", context.get("productId")))));
+ GenericValue ebayProductStore =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("EbayProductStoreInventory",
UtilMisc.toMap("productStoreId", context.get("productStoreId").toString(),
"productId", context.get("productId")), null, false)));
if (UtilValidate.isNotEmpty(ebayProductStore)) {
facilityId = ebayProductStore.getString("facilityId");
BigDecimal atp =
ebayProductStore.getBigDecimal("availableToPromiseListing");
@@ -1565,9 +1565,9 @@ public class EbayStore {
}
GenericValue userLogin = (GenericValue) context.get("userLogin");
if (UtilValidate.isNotEmpty(context.get("productCategoryId"))) {
- GenericValue prodCategoryMember =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryMember",
UtilMisc.toMap("productCategoryId",
context.get("productCategoryId"),"productId", context.get("productId")))));
+ GenericValue prodCategoryMember =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryMember",
UtilMisc.toMap("productCategoryId",
context.get("productCategoryId"),"productId", context.get("productId")), null,
false)));
if (UtilValidate.isNotEmpty(prodCategoryMember)) {
- GenericValue prodCategoryRole =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryRole",
UtilMisc.toMap("productCategoryId",
prodCategoryMember.get("productCategoryId").toString(), "partyId",
userLogin.get("partyId"),"roleTypeId", "EBAY_ACCOUNT"))));
+ GenericValue prodCategoryRole =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryRole",
UtilMisc.toMap("productCategoryId",
prodCategoryMember.get("productCategoryId").toString(), "partyId",
userLogin.get("partyId"),"roleTypeId", "EBAY_ACCOUNT"), null, false)));
if (UtilValidate.isNotEmpty(prodCategoryRole)) {
context.put("ebayCategory",
prodCategoryRole.get("comments"));
} else {
@@ -1576,13 +1576,13 @@ public class EbayStore {
}
}
} else {
- List<GenericValue> prodCategoryMember =
EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryMember",
UtilMisc.toMap("productId", context.get("productId"))));
+ List<GenericValue> prodCategoryMember =
EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryMember",
UtilMisc.toMap("productId", context.get("productId")), null, false));
Iterator<GenericValue> prodCategoryMemberIter =
prodCategoryMember.iterator();
while (prodCategoryMemberIter.hasNext()) {
GenericValue prodCategory = prodCategoryMemberIter.next();
- GenericValue prodCatalogCategory =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProdCatalogCategory",
UtilMisc.toMap("prodCatalogId", context.get("prodCatalogId"),
"productCategoryId", prodCategory.get("productCategoryId").toString()))));
+ GenericValue prodCatalogCategory =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProdCatalogCategory",
UtilMisc.toMap("prodCatalogId", context.get("prodCatalogId"),
"productCategoryId", prodCategory.get("productCategoryId").toString()), null,
false)));
if (UtilValidate.isNotEmpty(prodCatalogCategory)) {
- GenericValue prodCategoryRole =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryRole",
UtilMisc.toMap("productCategoryId",
prodCatalogCategory.get("productCategoryId").toString(), "partyId",
userLogin.get("partyId"),"roleTypeId", "EBAY_ACCOUNT"))));
+ GenericValue prodCategoryRole =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryRole",
UtilMisc.toMap("productCategoryId",
prodCatalogCategory.get("productCategoryId").toString(), "partyId",
userLogin.get("partyId"),"roleTypeId", "EBAY_ACCOUNT"), null, false)));
if (UtilValidate.isNotEmpty(prodCategoryRole)) {
context.put("ebayCategory",
prodCategoryRole.get("comments"));
} else {
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=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
Mon May 14 21:02:33 2012
@@ -396,7 +396,7 @@ public class EbayStoreAutoPreferences {
Map<String, Object> serviceMap = FastMap.newInstance();
serviceMap.put("userLogin", userLogin);
//ProductStore
- List<GenericValue> productStores =
delegator.findByAnd("EbayProductStorePref", UtilMisc.toMap("autoPrefJobId",
jobId));
+ List<GenericValue> productStores =
delegator.findByAnd("EbayProductStorePref", UtilMisc.toMap("autoPrefJobId",
jobId), null, false);
if (productStores.size() != 0) {
// get auto preference setting
String productStoreId =
productStores.get(0).getString("productStoreId");
@@ -428,7 +428,7 @@ public class EbayStoreAutoPreferences {
inMap.put("userLogin", userLogin);
dispatcher.runSync("createProduct", inMap);
// ProductRole (VENDOR)
- List<GenericValue> productRole =
delegator.findByAnd("ProductRole", UtilMisc.toMap("partyId", partyId,
"productId", soldItemMap.get("itemId"), "roleTypeId", "VENDOR"));
+ List<GenericValue> productRole =
delegator.findByAnd("ProductRole", UtilMisc.toMap("partyId", partyId,
"productId", soldItemMap.get("itemId"), "roleTypeId", "VENDOR"), null, false);
if (productRole.size() == 0) {
Map<String, Object> addRole =
FastMap.newInstance();
addRole.put("productId",
soldItemMap.get("itemId"));
@@ -458,7 +458,7 @@ public class EbayStoreAutoPreferences {
}
}
//check product role
- List<GenericValue> productRoles =
delegator.findByAnd("ProductRole", UtilMisc.toMap("partyId", partyId,
"roleTypeId", "VENDOR"));
+ List<GenericValue> productRoles =
delegator.findByAnd("ProductRole", UtilMisc.toMap("partyId", partyId,
"roleTypeId", "VENDOR"), null, false);
List<String> productRoleIds = FastList.newInstance();
if (productRoles.size() != 0) {
for (int itemCount = 0; itemCount <
productRoles.size(); itemCount++) {
@@ -508,7 +508,7 @@ public class EbayStoreAutoPreferences {
String jobId = (String) context.get("jobId");
try {
GenericValue userLogin = delegator.findOne("UserLogin", false,
"userLoginId", "system");
- List<GenericValue> productStores =
delegator.findByAnd("EbayProductStorePref", UtilMisc.toMap("autoPrefJobId",
jobId));
+ List<GenericValue> productStores =
delegator.findByAnd("EbayProductStorePref", UtilMisc.toMap("autoPrefJobId",
jobId), null, false);
if (productStores.size() != 0) {
// get automatic setting
String productStoreId =
productStores.get(0).getString("productStoreId");
@@ -579,7 +579,7 @@ public class EbayStoreAutoPreferences {
String jobId = (String) context.get("jobId");
try {
GenericValue userLogin = delegator.findOne("UserLogin", false,
"userLoginId", "system");
- List<GenericValue> productStores =
delegator.findByAnd("EbayProductStorePref", UtilMisc.toMap("autoPrefJobId",
jobId));
+ List<GenericValue> productStores =
delegator.findByAnd("EbayProductStorePref", UtilMisc.toMap("autoPrefJobId",
jobId), null, false);
if (productStores.size() != 0) {
// get automatic setting
String productStoreId =
productStores.get(0).getString("productStoreId");
@@ -1149,7 +1149,7 @@ public class EbayStoreAutoPreferences {
String productStoreId = (String) context.get("productStoreId");
GenericValue ebayProductStorePref =
delegator.findOne("EbayProductStorePref", UtilMisc.toMap("productStoreId",
productStoreId, "autoPrefEnumId", "EBAY_AUTO_BEST_OFFER"), false);
String parentPrefCondId =
ebayProductStorePref.getString("parentPrefCondId");
- List<GenericValue> ebayProductStorePrefCond =
delegator.findByAnd("EbayProductStorePrefCond",
UtilMisc.toMap("parentPrefCondId", parentPrefCondId));
+ List<GenericValue> ebayProductStorePrefCond =
delegator.findByAnd("EbayProductStorePrefCond",
UtilMisc.toMap("parentPrefCondId", parentPrefCondId), null, false);
//Parameters
String priceType =
ebayProductStorePrefCond.get(0).getString("acceptanceCondition");
String acceptBestOfferValue =
ebayProductStorePrefCond.get(1).getString("acceptanceCondition");
@@ -1239,7 +1239,7 @@ public class EbayStoreAutoPreferences {
} else if (priceType.equals("RETAIL_PRICE")) {
//ignore
} else if (priceType.equals("SELLER_COST")) {
- List<GenericValue> supplierProduct =
delegator.findByAnd("SupplierProduct", UtilMisc.toMap("productId", SKUItem),
UtilMisc.toList("availableFromDate DESC"));
+ List<GenericValue> supplierProduct =
delegator.findByAnd("SupplierProduct", UtilMisc.toMap("productId", SKUItem),
UtilMisc.toList("availableFromDate DESC"), false);
String lastPrice =
supplierProduct.get(0).getString("lastPrice");
doBasePrice = Double.parseDouble(lastPrice);
} else if (priceType.equals("SECOND_CHANCE_PRICE")) {
Modified:
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java
Mon May 14 21:02:33 2012
@@ -193,7 +193,7 @@ public class EbayStoreHelper {
Debug.logError("Require field partyId.",module);
return ebayCategoryId;
}
- productCategoryRoles = delegator.findByAnd("ProductCategoryRole",
UtilMisc.toMap("productCategoryId", productCategoryId, "partyId", partyId,
"roleTypeId", "EBAY_ACCOUNT"));
+ productCategoryRoles = delegator.findByAnd("ProductCategoryRole",
UtilMisc.toMap("productCategoryId", productCategoryId, "partyId", partyId,
"roleTypeId", "EBAY_ACCOUNT"), null, false);
if (productCategoryRoles != null && productCategoryRoles.size()>0)
{
for (GenericValue productCategoryRole : productCategoryRoles) {
ebayCategoryId = productCategoryRole.getString("comments");
@@ -238,14 +238,14 @@ public class EbayStoreHelper {
break;
} else {
// check from child category level 1
- List<GenericValue> productCategoryRollupList =
delegator.findByAnd("ProductCategoryRollup",
UtilMisc.toMap("parentProductCategoryId",catalogCategory.getString("productCategoryId")));
+ List<GenericValue> productCategoryRollupList =
delegator.findByAnd("ProductCategoryRollup",
UtilMisc.toMap("parentProductCategoryId",catalogCategory.getString("productCategoryId")),
null, false);
for (GenericValue productCategoryRollup :
productCategoryRollupList) {
if
(productCategoryRollup.containsValue(productCategoryId)) {
flag = true;
break;
} else {
// check from level 2
- List<GenericValue> prodCategoryRollupList =
delegator.findByAnd("ProductCategoryRollup",
UtilMisc.toMap("parentProductCategoryId",productCategoryRollup.getString("productCategoryId")));
+ List<GenericValue> prodCategoryRollupList =
delegator.findByAnd("ProductCategoryRollup",
UtilMisc.toMap("parentProductCategoryId",productCategoryRollup.getString("productCategoryId")),
null, false);
for (GenericValue prodCategoryRollup :
prodCategoryRollupList) {
if
(prodCategoryRollup.containsValue(productCategoryId)) {
flag = true;
@@ -276,7 +276,7 @@ public class EbayStoreHelper {
GenericValue ebayProductPref =
delegator.findOne("EbayProductStorePref", UtilMisc.toMap("productStoreId",
productStoreId, "autoPrefEnumId", autoPrefEnumId), false);
String jobId = ebayProductPref.getString("autoPrefJobId");
if (UtilValidate.isNotEmpty(jobId)) {
- List<GenericValue> jobs = delegator.findByAnd("JobSandbox",
UtilMisc.toMap("parentJobId", jobId, "statusId", "SERVICE_PENDING"));
+ List<GenericValue> jobs = delegator.findByAnd("JobSandbox",
UtilMisc.toMap("parentJobId", jobId, "statusId", "SERVICE_PENDING"), null,
false);
if (jobs.size() == 0) {
Map<String, Object>inMap = FastMap.newInstance();
inMap.put("jobId", jobId);
@@ -355,7 +355,7 @@ public class EbayStoreHelper {
try {
GenericValue ebayProductPref =
delegator.findOne("EbayProductStorePref", UtilMisc.toMap("productStoreId",
productStoreId, "autoPrefEnumId", autoPrefEnumId), false);
String jobId = ebayProductPref.getString("autoPrefJobId");
- List<GenericValue> jobs = delegator.findByAnd("JobSandbox",
UtilMisc.toMap("parentJobId", jobId ,"statusId", "SERVICE_PENDING"));
+ List<GenericValue> jobs = delegator.findByAnd("JobSandbox",
UtilMisc.toMap("parentJobId", jobId ,"statusId", "SERVICE_PENDING"), null,
false);
Map<String, Object>inMap = FastMap.newInstance();
inMap.put("userLogin", userLogin);
@@ -468,7 +468,7 @@ public class EbayStoreHelper {
HashMap<String, Object> attributeMapList =
UtilGenerics.cast(context.get("attributeMapList"));
String productListingId = (String) context.get("productListingId");
try {
- List<GenericValue> attributeToClears =
delegator.findByAnd("EbayProductListingAttribute",
UtilMisc.toMap("productListingId", productListingId));
+ List<GenericValue> attributeToClears =
delegator.findByAnd("EbayProductListingAttribute",
UtilMisc.toMap("productListingId", productListingId), null, false);
for (int clearCount = 0; clearCount < attributeToClears.size();
clearCount++) {
GenericValue valueToClear = attributeToClears.get(clearCount);
if (valueToClear != null) {
@@ -493,7 +493,7 @@ public class EbayStoreHelper {
public static ItemType prepareAddItem(Delegator delegator, GenericValue
attribute) {
ItemType item = new ItemType();
try {
- List<GenericValue> attrs =
delegator.findByAnd("EbayProductListingAttribute",
UtilMisc.toMap("productListingId", attribute.getString("productListingId")));
+ List<GenericValue> attrs =
delegator.findByAnd("EbayProductListingAttribute",
UtilMisc.toMap("productListingId", attribute.getString("productListingId")),
null, false);
AmountType amount = new AmountType();
AmountType shippingServiceCost = new AmountType();
PictureDetailsType picture = new PictureDetailsType();
@@ -715,7 +715,7 @@ public class EbayStoreHelper {
public static boolean isReserveInventory(GenericDelegator delegator,
String productId, String productStoreId) {
boolean isReserve = false;
try {
- GenericValue ebayProductStore =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("EbayProductStoreInventory",
UtilMisc.toMap("productStoreId", productStoreId, "productId", productId))));
+ GenericValue ebayProductStore =
EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("EbayProductStoreInventory",
UtilMisc.toMap("productStoreId", productStoreId, "productId", productId),
null, false)));
if (UtilValidate.isNotEmpty(ebayProductStore)) {
BigDecimal atp =
ebayProductStore.getBigDecimal("availableToPromiseListing");
int intAtp = atp.intValue();
Modified:
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java
Mon May 14 21:02:33 2012
@@ -385,7 +385,7 @@ public class EbayStoreInventoryServices
try {
if (context.get("productStoreId") != null &&
context.get("facilityId") != null) {
- ebayProductStoreInventoryList =
delegator.findByAnd("EbayProductStoreInventory",
UtilMisc.toMap("facilityId",(String)context.get("facilityId"),"productStoreId",(String)context.get("productStoreId")));
+ ebayProductStoreInventoryList =
delegator.findByAnd("EbayProductStoreInventory",
UtilMisc.toMap("facilityId",(String)context.get("facilityId"),"productStoreId",(String)context.get("productStoreId")),
null, false);
for (GenericValue ebayProductStoreInventory :
ebayProductStoreInventoryList) {
if (ebayProductStoreInventory.get("ebayProductId") !=
null) {
dispatcher.runSync("updateEbayInventoryStatusByProductId",
UtilMisc.toMap("productStoreId", (String)context.get("productStoreId"),
"facilityId", (String)context.get("facilityId"), "folderId",
ebayProductStoreInventory.get("folderId"), "productId",
ebayProductStoreInventory.get("productId"), "ebayProductId",
ebayProductStoreInventory.get("ebayProductId"), "userLogin",
context.get("userLogin")));
Modified:
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java
Mon May 14 21:02:33 2012
@@ -212,7 +212,7 @@ public class EbayStoreOrder {
String contactMechId = "";
GenericValue partyAttribute = null;
if
(UtilValidate.isNotEmpty(context.get("eiasTokenBuyer").toString())) {
- partyAttribute =
EntityUtil.getFirst(delegator.findByAnd("PartyAttribute",
UtilMisc.toMap("attrValue", context.get("eiasTokenBuyer").toString())));
+ partyAttribute =
EntityUtil.getFirst(delegator.findByAnd("PartyAttribute",
UtilMisc.toMap("attrValue", context.get("eiasTokenBuyer").toString()), null,
false));
}
// if we get a party, check its contact information.
@@ -443,7 +443,7 @@ public class EbayStoreOrder {
// If matching party not found then try to find partyId from
PartyAttribute entity.
GenericValue partyAttribute = null;
if (UtilValidate.isNotEmpty(context.get("eiasTokenBuyer"))) {
- partyAttribute =
EntityUtil.getFirst(delegator.findByAnd("PartyAttribute",
UtilMisc.toMap("attrValue", (String) context.get("eiasTokenBuyer"))));
+ partyAttribute =
EntityUtil.getFirst(delegator.findByAnd("PartyAttribute",
UtilMisc.toMap("attrValue", (String) context.get("eiasTokenBuyer")), null,
false));
if (UtilValidate.isNotEmpty(partyAttribute)) {
partyId = (String) partyAttribute.get("partyId");
}
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetEbayJobsandbox.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetEbayJobsandbox.groovy?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetEbayJobsandbox.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetEbayJobsandbox.groovy
Mon May 14 21:02:33 2012
@@ -19,7 +19,7 @@
import org.ofbiz.base.util.*;
-jobSandboxs = delegator.findByAnd("JobSandbox",
UtilMisc.toMap("authUserLoginId", userLoginId));
+jobSandboxs = delegator.findByAnd("JobSandbox",
UtilMisc.toMap("authUserLoginId", userLoginId), null, false);
job = null
jobId = null;
if(jobSandboxs) {
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/email/GetProductStoreEmailTemplate.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/email/GetProductStoreEmailTemplate.groovy?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/email/GetProductStoreEmailTemplate.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/email/GetProductStoreEmailTemplate.groovy
Mon May 14 21:02:33 2012
@@ -20,10 +20,10 @@
import org.ofbiz.base.util.*;
contentId = null;
-contentRoles = delegator.findByAnd("ContentRole", UtilMisc.toMap("partyId",
partyId, "roleTypeId", "OWNER"));
+contentRoles = delegator.findByAnd("ContentRole", UtilMisc.toMap("partyId",
partyId, "roleTypeId", "OWNER"), null, false);
if (contentRoles.size() != 0) {
contentRoles.each { contentRole->
- contents = delegator.findByAnd("Content", UtilMisc.toMap("contentId",
contentRole.getString("contentId"), "ownerContentId", emailType));
+ contents = delegator.findByAnd("Content", UtilMisc.toMap("contentId",
contentRole.getString("contentId"), "ownerContentId", emailType), null, false);
if (contents.size() != 0) {
if (emailType.equals(contents.get(0).getString("ownerContentId")))
{
contentId = contents.get(0).getString("contentId");
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy
Mon May 14 21:02:33 2012
@@ -55,7 +55,7 @@ if (fromDate && thruDate) {
} else if (!fromDate && thruDate) {
expr.add(EntityCondition.makeCondition("createdDate",EntityOperator.LESS_THAN,
UtilDateTime.getDayEnd(Timestamp.valueOf(thruDate + " 23:59:59.999"))));
}
-contentRoles = delegator.findByAnd("ContentRole",
UtilMisc.toMap("roleTypeId","OWNER", "partyId", partyId));
+contentRoles = delegator.findByAnd("ContentRole",
UtilMisc.toMap("roleTypeId","OWNER", "partyId", partyId), null, false);
contentIds = [];
contentRoles.each{ content ->
contentIds.add(content.getString("contentId"));
@@ -68,10 +68,10 @@ recentFeedbackList = [];
ownerUser = null;
commentator = null;
contents.each{ content ->
- commentatorContents = delegator.findByAnd("ContentRole",
UtilMisc.toMap("contentId",content.contentId, "roleTypeId","COMMENTATOR"));
+ commentatorContents = delegator.findByAnd("ContentRole",
UtilMisc.toMap("contentId",content.contentId, "roleTypeId","COMMENTATOR"),
null, false);
if(commentatorContents){
commentatorPartyId = commentatorContents.get(0).get("partyId");
- commentatorUsers = delegator.findByAnd("UserLogin",
UtilMisc.toMap("partyId", commentatorPartyId));
+ commentatorUsers = delegator.findByAnd("UserLogin",
UtilMisc.toMap("partyId", commentatorPartyId), null, false);
if(commentatorUsers){
commentator = commentatorUsers.get(0).get("userLoginId");
}
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/CheckOrderStatus.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/CheckOrderStatus.groovy?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/CheckOrderStatus.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/CheckOrderStatus.groovy
Mon May 14 21:02:33 2012
@@ -19,7 +19,7 @@
import org.ofbiz.entity.util.EntityUtil;
context.importStatus = "NOT_IMPORT";
-orderHeaders = delegator.findByAnd("OrderHeader", [externalId : externalId]);
+orderHeaders = delegator.findByAnd("OrderHeader", [externalId : externalId],
null, false);
if (orderHeaders.size() > 0) {
orderHeader = EntityUtil.getFirst(orderHeaders);
context.orderId = orderHeader.get("orderId");
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy
Mon May 14 21:02:33 2012
@@ -28,7 +28,7 @@ if (orderList) {
for (orderCount = 0; orderCount < orderList.size(); orderCount++) {
orderItem = orderList[orderCount];
orderId = null;
- orderHeaders = delegator.findByAnd("OrderHeader", [externalId :
orderItem.("externalId")]);
+ orderHeaders = delegator.findByAnd("OrderHeader", [externalId :
orderItem.("externalId")], null, false);
if (orderHeaders.size() > 0) {
orderHeader = EntityUtil.getFirst(orderHeaders);
orderId = orderHeader.get("orderId").toString();
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy
Mon May 14 21:02:33 2012
@@ -94,7 +94,7 @@
}
context.isProductId = productId;
// get product default price form product price
- productPrices =
delegator.findByAnd("ProductPrice",["productId":productId,"productPricePurposeId":"EBAY"]);
+ productPrices =
delegator.findByAnd("ProductPrice",["productId":productId,"productPricePurposeId":"EBAY"],
null, false);
if (productPrices) {
context.productPrices = productPrices;
}
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/StoreAccount.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/StoreAccount.groovy?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/StoreAccount.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/StoreAccount.groovy
Mon May 14 21:02:33 2012
@@ -22,8 +22,8 @@ import javolution.util.FastList;
import javolution.util.FastMap;
results = FastList.newInstance();
-ebayAccountList =
delegator.findByAnd("PartyRoleAndPartyDetail",["roleTypeId":"EBAY_ACCOUNT"]);
-productStoreRoles =
delegator.findByAnd("ProductStoreRole",["roleTypeId":"EBAY_ACCOUNT"]);
+ebayAccountList =
delegator.findByAnd("PartyRoleAndPartyDetail",["roleTypeId":"EBAY_ACCOUNT"],
null, false);
+productStoreRoles =
delegator.findByAnd("ProductStoreRole",["roleTypeId":"EBAY_ACCOUNT"], null,
false);
if (productStoreRoles != null && ebayAccountList != null) {
ebayAccountList.each{ebayAccount->
Modified:
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl?rev=1338414&r1=1338413&r2=1338414&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
Mon May 14 21:02:33 2012
@@ -408,7 +408,7 @@ under the License.
<tr>
<td
class="label">${uiLabelMap.CommonCountry}</td>
<#if
item.getCountry().value()?exists>
- <#assign country =
Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("Geo",
{"geoCode": item.getCountry().value()}))/>
+ <#assign country =
Static["org.ofbiz.entity.util.EntityUtil"].getFirst(delegator.findByAnd("Geo",
{"geoCode": item.getCountry().value()}, null, false))/>
<#if country?has_content>
<#assign countryname =
country.geoName/>
</#if>
