svn commit: r1649482 [23/26] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1649482 [23/26] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy Mon Jan 5 08:50:30 2015 @@ -39,7 +39,7 @@ cart = ShoppingCartEvents.getCartObject( context.remove("totalPrice"); if (optProductId) { - miniProduct = delegator.findOne("Product", [productId : optProductId], false); + miniProduct = from("Product").where("productId", optProductId).queryOne(); } if (miniProduct && productStoreId && prodCatalogId ) { @@ -51,12 +51,12 @@ if (miniProduct && productStoreId && pro autoUserLogin : autoUserLogin, productStoreId : productStoreId]; if (userLogin) priceParams.partyId = userLogin.partyId; - priceResult = dispatcher.runSync("calculateProductPrice", priceParams); + priceResult = runService('calculateProductPrice', priceParams); // returns: isSale, price, orderItemPriceInfos context.priceResult = priceResult; // Check if Price has to be displayed with tax if (productStore.get("showPricesWithVatTax").equals("Y")) { - Map priceMap = dispatcher.runSync("calcTaxForDisplay", UtilMisc.toMap("basePrice", priceResult.get("price"), "locale", locale, "productId", optProductId, "productStoreId", productStoreId)); + Map priceMap = runServic('calcTaxForDisplay', ["basePrice": priceResult.get("price"), "locale": locale, "productId": optProductId, "productStoreId": productStoreId]); context.price = priceMap.get("priceWithTax"); } else { context.price = priceResult.get("price"); @@ -70,7 +70,7 @@ if (miniProduct && productStoreId && pro // Check if Config Price has to be displayed with tax if (productStore.get("showPricesWithVatTax").equals("Y")) { BigDecimal totalPriceNoTax = configWrapper.getTotalPrice(); - Map totalPriceMap = dispatcher.runSync("calcTaxForDisplay", UtilMisc.toMap("basePrice", totalPriceNoTax, "locale", locale, "productId", optProductId, "productStoreId", productStoreId)); + Map totalPriceMap = runService('calcTaxForDisplay', ["basePrice": totalPriceNoTax, "locale": locale, "productId": optProductId, "productStoreId": productStoreId]); context.totalPrice = totalPriceMap.get("priceWithTax"); } else { context.totalPrice = configWrapper.getTotalPrice(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy Mon Jan 5 08:50:30 2015 @@ -36,16 +36,16 @@ int limitTagCloud = Integer.parseInt(Ent tagCloudList = [] as LinkedList; tagList = [] as LinkedList; -keywordConditions = EntityCondition.makeCondition([keywordTypeId : "KWT_TAG", statusId : "KW_APPROVED"], EntityOperator.AND); -keywordOrder = ["keyword"]; -keywordFields = ["keyword", "keywordTypeId", "statusId"] as Set; -keywordFindOptions = new EntityFindOptions(); -keywordFindOptions.setDistinct(true); -productKeywords = delegator.findList("ProductKeyword", keywordConditions, keywordFields, keywordOrder, keywordFindOptions, false); +productKeywords = select("keyword", "keywordTypeId", "statusId") + .from("ProductKeyword") + .where(keywordTypeId : "KWT_TAG", statusId : "KW_APPROVED") + .orderBy("keyword") + .distinct(true) + .queryList(); if (UtilValidate.isNotEmpty(productKeywords)) { productKeywords.each { productKeyword -> - productTags = delegator.findByAnd("ProductKeyword", ["keyword": productKeyword.keyword, "keywordTypeId" : "KWT_TAG", "statusId" : "KW_APPROVED"], null, false); + productTags = from("ProductKeyword").where("keyword", productKeyword.keyword, "keywordTypeId", "KWT_TAG", "statusId", "KW_APPROVED").queryList(); searchResult = [:]; searchResult.tag = productKeyword.keyword; searchResult.countTag = productTags.size(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy Mon Jan 5 08:50:30 2015 @@ -36,7 +36,7 @@ List fillTree(rootCat ,CatLvl, parentCat rootCat.sort{ it.productCategoryId } def listTree = FastList.newInstance(); for(root in rootCat) { - preCatChilds = delegator.findByAnd("ProductCategoryRollup", ["parentProductCategoryId": root.productCategoryId], null, false); + preCatChilds = from("ProductCategoryRollup").where("parentProductCategoryId", root.productCategoryId).queryList(); catChilds = EntityUtil.getRelated("CurrentProductCategory",null,preCatChilds,false); def childList = FastList.newInstance(); @@ -51,12 +51,12 @@ List fillTree(rootCat ,CatLvl, parentCat childList = fillTree(catChilds,CatLvl+1, parentCategoryId+'/'+root.productCategoryId); } - productsInCat = delegator.findByAnd("ProductCategoryAndMember", ["productCategoryId": root.productCategoryId], null, false); + productsInCat = from("ProductCategoryAndMember").where("productCategoryId", root.productCategoryId).queryList(); // Display the category if this category containing products or contain the category that's containing products if(productsInCat || childList) { def rootMap = FastMap.newInstance(); - category = delegator.findOne("ProductCategory", ["productCategoryId": root.productCategoryId], false); + category = from("ProductCategory").where("productCategoryId", root.productCategoryId).queryOne(); categoryContentWrapper = new CategoryContentWrapper(category, request); context.title = categoryContentWrapper.CATEGORY_NAME; categoryDescription = categoryContentWrapper.DESCRIPTION; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy Mon Jan 5 08:50:30 2015 @@ -29,7 +29,7 @@ if(!UtilValidate.isEmpty(parentCategoryS pathTemp = ''; for(path in pathList) { cateMap = FastMap.newInstance(); - category = delegator.findOne("ProductCategory", ["productCategoryId": path], false); + category = from("ProductCategory").where("productCategoryId", path).queryOne(); categoryContentWrapper = new CategoryContentWrapper(category, request); pathTemp = pathTemp + path; @@ -44,7 +44,7 @@ if(!UtilValidate.isEmpty(parentCategoryS context.productCategoryTrail = cateList; } -currentCategory = delegator.findOne("ProductCategory", ["productCategoryId": productCategoryId], false); +currentCategory = from("ProductCategory").where("productCategoryId", productCategoryId).queryOne(); currentCategoryContentWrapper = new CategoryContentWrapper(currentCategory, request); context.currentCategoryName = currentCategoryContentWrapper.CATEGORY_NAME; context.currentCategoryDescription = currentCategoryContentWrapper.DESCRIPTION; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Mrv.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Mrv.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Mrv.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Mrv.groovy Mon Jan 5 08:50:30 2015 @@ -59,7 +59,7 @@ mrvList = []; lifoSet.each { pk0 -> pk = pk0.getPrimaryKey(); - gv = delegator.findOne(pk.getEntityName(), pk, true); + gv = from(pk.getEntityName()).where(pk).cache(true).queryOne(); if (gv) { arr = [gv.contentId, gv.contentName] as String[]; mrvList.add(arr); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy Mon Jan 5 08:50:30 2015 @@ -105,7 +105,7 @@ if (searcher) { for (int start = 0; start < collector.getTotalHits(); start++) { Document doc = searcher.doc(hits[start].doc) contentId = doc.get("contentId"); - content = delegator.findOne("Content", [contentId : contentId], true); + content = from("Content").where("contentId", contentId).cache(true).queryOne(); if (!hitSet.contains(contentId)) { contentList.add(content); hitSet.add(contentId); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy Mon Jan 5 08:50:30 2015 @@ -39,8 +39,7 @@ exprListThruDate.add(EntityCondition.mak exprListThruDate.add(EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, UtilDateTime.nowTimestamp())); orCond = EntityCondition.makeCondition(exprListThruDate, EntityOperator.OR); exprList.add(orCond); -topCond = EntityCondition.makeCondition(exprList, EntityOperator.AND); -webSiteContactList = delegator.findList("WebSiteContactList", topCond, null, null, null, false); +webSiteContactList = from("WebSiteContactList").where(exprList).queryList(); publicEmailContactLists = []; webSiteContactList.each { webSiteContactList -> @@ -54,8 +53,7 @@ webSiteContactList.each { webSiteContact context.publicEmailContactLists = publicEmailContactLists; if (userLogin) { - partyAndContactMechList = delegator.findByAnd("PartyAndContactMech", [partyId : partyId, contactMechTypeId : "EMAIL_ADDRESS"], ["-fromDate"], false); - partyAndContactMechList = EntityUtil.filterByDate(partyAndContactMechList); + partyAndContactMechList = from("PartyAndContactMech").where("partyId", partyId, "contactMechTypeId", "EMAIL_ADDRESS").orderBy("-fromDate").filterByDate().queryList(); context.partyAndContactMechList = partyAndContactMechList; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerReviews.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerReviews.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerReviews.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerReviews.groovy Mon Jan 5 08:50:30 2015 @@ -22,8 +22,7 @@ import org.ofbiz.entity.condition.Entity // get the product review(s) for the given user if (userLogin) { - condition = EntityCondition.makeCondition("userLoginId", EntityOperator.EQUALS, userLogin.userLoginId); - reviews = delegator.findList("ProductReview", condition, null, null, null, true); + reviews = from("ProductReview").where("userLoginId", userLogin.userLoginId).cache(true).queryList(); context.reviews = reviews; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy Mon Jan 5 08:50:30 2015 @@ -27,7 +27,7 @@ paramMap = UtilHttp.getParameterMap(requ productStoreSurveyId = parameters.productStoreSurveyId; -surveyAppl = delegator.findOne("ProductStoreSurveyAppl", [productStoreSurveyId : productStoreSurveyId], false); +surveyAppl = from("ProductStoreSurveyAppl").where("productStoreSurveyId", productStoreSurveyId).queryOne(); if (surveyAppl) { survey = surveyAppl.getRelatedOne("Survey", false); context.survey = survey; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy Mon Jan 5 08:50:30 2015 @@ -36,17 +36,17 @@ if (userLogin) { context.billToPostalCode = postalAddress.postalCode; context.billToStateProvinceGeoId = postalAddress.stateProvinceGeoId; context.billToCountryGeoId = postalAddress.countryGeoId; - billToStateProvinceGeo = delegator.findOne("Geo", [geoId : postalAddress.stateProvinceGeoId], false); + billToStateProvinceGeo = from("Geo").where("geoId", postalAddress.stateProvinceGeoId).queryOne(); if (billToStateProvinceGeo) { context.billToStateProvinceGeo = billToStateProvinceGeo.geoName; } - billToCountryProvinceGeo = delegator.findOne("Geo", [geoId : postalAddress.countryGeoId], false); + billToCountryProvinceGeo = from("Geo").where("geoId", postalAddress.countryGeoId).queryOne(); if (billToCountryProvinceGeo) { context.billToCountryProvinceGeo = billToCountryProvinceGeo.geoName; } creditCards = []; - paymentMethod = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findList("PaymentMethod", EntityCondition.makeCondition([partyId : party.partyId, paymentMethodTypeId : "CREDIT_CARD"]), null, ["fromDate"], null, false))); + paymentMethod = from("PaymentMethod").where("partyId", party.partyId, "paymentMethodTypeId", "CREDIT_CARD").orderBy("fromDate").filterByDate().queryFirst(); if (paymentMethod) { creditCard = paymentMethod.getRelatedOne("CreditCard", false); context.paymentMethodTypeId = "CREDIT_CARD"; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditContactMech.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditContactMech.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditContactMech.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditContactMech.groovy Mon Jan 5 08:50:30 2015 @@ -46,7 +46,7 @@ if (paymentMethodId) context.paymentMeth cmNewPurposeTypeId = parameters.contactMechPurposeTypeId; if (cmNewPurposeTypeId) { - contactMechPurposeType = delegator.findOne("ContactMechPurposeType", [contactMechPurposeTypeId : cmNewPurposeTypeId], false); + contactMechPurposeType = from("ContactMechPurposeType").where("contactMechPurposeTypeId", cmNewPurposeTypeId).queryOne(); if (contactMechPurposeType) { context.contactMechPurposeType = contactMechPurposeType; } else { @@ -79,24 +79,24 @@ if (telecomNumberData) context.telecomNu // load the geo names for selected countries and states/regions if (parameters.countryGeoId) { - geoValue = delegator.findOne("Geo", [geoId : parameters.countryGeoId], true); + geoValue = from("Geo").where("geoId", parameters.countryGeoId).cache(true).queryOne(); if (geoValue) { context.selectedCountryName = geoValue.geoName; } } else if (postalAddressData?.countryGeoId) { - geoValue = delegator.findOne("Geo", [geoId : postalAddressData.countryGeoId], true); + geoValue = from("Geo").where("geoId", postalAddressData.countryGeoId).cache(true).queryOne(); if (geoValue) { context.selectedCountryName = geoValue.geoName; } } if (parameters.stateProvinceGeoId) { - geoValue = delegator.findOne("Geo", [geoId : parameters.stateProvinceGeoId], true); + geoValue = from("Geo").where("geoId", parameters.stateProvinceGeoId).cache(true).queryOne(); if (geoValue) { context.selectedStateName = geoValue.geoId; } } else if (postalAddressData?.stateProvinceGeoId) { - geoValue = delegator.findOne("Geo", [geoId : postalAddressData.stateProvinceGeoId], true); + geoValue = from("Geo").where("geoId", postalAddressData.stateProvinceGeoId).cache(true).queryOne(); if (geoValue) { context.selectedStateName = geoValue.geoId; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy Mon Jan 5 08:50:30 2015 @@ -31,7 +31,7 @@ if (userLogin) { contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "PRIMARY_PHONE", "TELECOM_NUMBER", false)); if (contactMech) { - partyContactMech = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactMech", [partyId : party.partyId, contactMechId : contactMech.contactMechId], null, false))); + partyContactMech = from("PartyContactMech").where("partyId", party.partyId, "contactMechId", contactMech.contactMechId).filterByDate().queryFirst(); if (partyContactMech) { telecomNumber = partyContactMech.getRelatedOne("TelecomNumber", false); context.phoneContactMechId = telecomNumber.contactMechId; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy Mon Jan 5 08:50:30 2015 @@ -24,11 +24,11 @@ if (userLogin) { party = userLogin.getRelatedOne("Party", false); context.partyId = party.partyId if ("PERSON".equals(party.partyTypeId)) { - person = delegator.findOne("Person", [partyId : party.partyId], false); + person = from("Person").where("partyId", party.partyId).queryOne(); context.firstName = person.firstName; context.lastName = person.lastName; } else { - group = delegator.findOne("PartyGroup", [partyId : party.partyId], false); + group = from("PartyGroup").where("partyId", party.partyId).queryOne(); context.firstName = group.groupName; context.lastName = ""; } @@ -46,11 +46,11 @@ if (userLogin) { context.shipToPostalCode = postalAddress.postalCode; context.shipToStateProvinceGeoId = postalAddress.stateProvinceGeoId; context.shipToCountryGeoId = postalAddress.countryGeoId; - shipToStateProvinceGeo = delegator.findOne("Geo", [geoId : postalAddress.stateProvinceGeoId], false); + shipToStateProvinceGeo = from("Geo").where("geoId", postalAddress.stateProvinceGeoId).queryOne(); if (shipToStateProvinceGeo) { context.shipToStateProvinceGeo = shipToStateProvinceGeo.geoName; } - shipToCountryProvinceGeo = delegator.findOne("Geo", [geoId : postalAddress.countryGeoId], false); + shipToCountryProvinceGeo = from("Geo").where("geoId", postalAddress.countryGeoId).queryOne(); if (shipToCountryProvinceGeo) { context.shipToCountryProvinceGeo = shipToCountryProvinceGeo.geoName; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy Mon Jan 5 08:50:30 2015 @@ -31,7 +31,7 @@ productStoreId = ProductStoreWorker.getP context.productStoreId = productStoreId; if (userLogin) { - profiledefs = delegator.findOne("PartyProfileDefault", [partyId : partyId, productStoreId : productStoreId], false); + profiledefs = from("PartyProfileDefault").where("partyId", partyId, "productStoreId", productStoreId).queryOne(); showOld = "true".equals(parameters.SHOW_OLD); @@ -45,7 +45,7 @@ if (userLogin) { // shipping methods - for default selection if (profiledefs?.defaultShipAddr) { - shipAddress = delegator.findOne("PostalAddress", [contactMechId : profiledefs.defaultShipAddr], false); + shipAddress = from("PostalAddress").where("contactMechId", profiledefs.defaultShipAddr).queryOne(); if (shipAddress) { carrierShipMeths = ProductStoreWorker.getAvailableStoreShippingMethods(delegator, productStoreId, shipAddress, [1], null, 0, 1); context.carrierShipMethods = carrierShipMeths; @@ -55,42 +55,35 @@ if (userLogin) { profileSurveys = ProductStoreWorker.getProductSurveys(delegator, productStoreId, null, "CUSTOMER_PROFILE"); context.surveys = profileSurveys; - orderBy = ["-entryDate"]; - findOpts = new EntityFindOptions(); - findOpts.setMaxRows(5); exprs = [EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId)]; exprs.add(EntityCondition.makeCondition("roleStatusId", EntityOperator.NOT_EQUAL, "COM_ROLE_READ")); - condition = EntityCondition.makeCondition(exprs, EntityOperator.AND); - messages = delegator.findList("CommunicationEventAndRole", condition, null, orderBy, findOpts, false); + messages = from("CommunicationEventAndRole").where(exprs).orderBy("-entryDate").maxRows(5).queryList(); context.messages = messages; context.profileMessages = true; - partyContent = delegator.findByAnd("ContentRole", [partyId : partyId, roleTypeId : "OWNER"], null, false); - partyContent = EntityUtil.filterByDate(partyContent); + partyContent = from("ContentRole").where("partyId", partyId, "roleTypeId", "OWNER").filterByDate().queryList(); context.partyContent = partyContent; - mimeTypes = delegator.findList("MimeType", null, null, ["description", "mimeTypeId"], null, false); + mimeTypes = from("MimeType").orderBy("description", "mimeTypeId").queryList(); context.mimeTypes = mimeTypes; - partyContentTypes = delegator.findList("PartyContentType", null, null, ["description"], null, false); + partyContentTypes = from("PartyContentType").orderBy("description").queryList(); context.partyContentTypes = partyContentTypes; // call the getOrderedSummaryInformation service to get the sub-total of valid orders in last X months monthsToInclude = 12; - serviceIn = [partyId : partyId, roleTypeId : "PLACING_CUSTOMER", orderTypeId : "SALES_ORDER", statusId : "ORDER_COMPLETED", monthsToInclude : monthsToInclude, userLogin : userLogin]; - result = dispatcher.runSync("getOrderedSummaryInformation", serviceIn); + result = runService('getOrderedSummaryInformation', [partyId : partyId, roleTypeId : "PLACING_CUSTOMER", orderTypeId : "SALES_ORDER", statusId : "ORDER_COMPLETED", monthsToInclude : monthsToInclude, userLogin : userLogin]); context.monthsToInclude = monthsToInclude; context.totalSubRemainingAmount = result.totalSubRemainingAmount; context.totalOrders = result.totalOrders; - contactListPartyList = delegator.findByAnd("ContactListParty", [partyId : partyId], ["-fromDate"], false); + contactListPartyList = from("ContactListParty").where("partyId", partyId).orderBy("-fromDate").queryList(); // show all, including history, ie don't filter: contactListPartyList = EntityUtil.filterByDate(contactListPartyList, true); context.contactListPartyList = contactListPartyList; - publicContactLists = delegator.findByAnd("ContactList", [isPublic : "Y"], ["contactListName"], false); + publicContactLists = from("ContactList").where("isPublic", "Y").orderBy("contactListName").queryList(); context.publicContactLists = publicContactLists; - partyAndContactMechList = delegator.findByAnd("PartyAndContactMech", [partyId : partyId], ["-fromDate"], false); - partyAndContactMechList = EntityUtil.filterByDate(partyAndContactMechList); + partyAndContactMechList = from("PartyAndContactMech").where("partyId", partyId).orderBy("-fromDate").filterByDate().queryList(); context.partyAndContactMechList = partyAndContactMechList; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentAddPrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentAddPrep.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentAddPrep.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentAddPrep.groovy Mon Jan 5 08:50:30 2015 @@ -54,7 +54,7 @@ contentIdTo = ContentManagementWorker.ge context.contentIdTo = contentIdTo; //Debug.logInfo("in contentaddprep, contentIdTo:" + contentIdTo,""); //Debug.logInfo("in contentaddprep, paramMap:" + paramMap,""); -attrList = delegator.findByAnd("ContentAttribute", [contentId : contentIdTo, attrName : "publishOperation"], null, true); +attrList = from("ContentAttribute").where("contentId", contentIdTo, "attrName", "publishOperation").cache(true).queryList(); publishOperation = null; if (attrList) { contentAttribute = attrList.get(0); @@ -76,7 +76,7 @@ contentPurpose = page.contentPurpose ?: singleWrapper.putInContext("contentPurpose", contentPurpose); singleWrapper.putInContext("forumId", contentIdTo); -forumContent = delegator.findOne("Content", [contentId : contentIdTo], true); +forumContent = from("Content").where("contentId", contentIdTo).cache(true).queryOne(); statusId = "CTNT_PUBLISHED"; if (forumContent) { statusId = forumContent.statusId; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy Mon Jan 5 08:50:30 2015 @@ -61,7 +61,7 @@ if (!contentId && currentValue) { contentId = currentValue.contentId; } if (contentId && !currentValue) { - currentValue = delegator.findOne("Content", [contentId : contentId], true); + currentValue = from("Content").where("contentId", contentId).cache(true).queryOne(); } //Debug.logInfo("in contentprep, currentValue(1):" + currentValue, ""); //Debug.logInfo("in contentprep, contentId(4):" + contentId, ""); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/CurrentValPrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/CurrentValPrep.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/CurrentValPrep.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/CurrentValPrep.groovy Mon Jan 5 08:50:30 2015 @@ -120,7 +120,7 @@ if (!pksEqual) { currentEntityMap[currentEntityName] = currentPK; request.setAttribute("currentPK", currentPK); context.currentPK = currentPK; -currentValue = delegator.findOne(currentPK.getPrimaryKey().getEntityName(), currentPK.getPrimaryKey(), false); +currentValue = from(currentPK.getPrimaryKey().getEntityName()).where(currentPK.getPrimaryKey()).queryOne(); context.currentValue = currentValue; request.setAttribute("currentValue", currentValue); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/EditAddPrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/EditAddPrep.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/EditAddPrep.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/EditAddPrep.groovy Mon Jan 5 08:50:30 2015 @@ -68,7 +68,7 @@ currentValue = ContentWorker.getSubConte //Debug.logInfo("in editaddprep, currentValue:" + currentValue,""); if (!currentValue) { - parentValue = delegator.findOne("Content", [contentId : contentIdTo], true); + parentValue = from("Content").where("contentId", contentIdTo).cache(true).queryOne(); currentValue = delegator.makeValue("Content"); subject = parentValue.contentName; if ("SUMMARY".equals(mapKey)) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PermPrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PermPrep.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PermPrep.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PermPrep.groovy Mon Jan 5 08:50:30 2015 @@ -102,7 +102,7 @@ if (permissionType.equals("complex")) { if (!currentValue || !"Content".equals(entityName)) { if (thisContentId) { - currentValue = delegator.findOne("Content", [contentId : thisContentId], false); + currentValue = from("Content").where("contentId", thisContentId).queryOne(); } } if ("add".equals(mode)) { @@ -128,7 +128,7 @@ if (permissionType.equals("complex")) { } //org.ofbiz.base.util.Debug.logInfo("in permprep, mapIn:" + mapIn, null); - result = dispatcher.runSync("checkContentPermission", mapIn); + result = runService('checkContentPermission', mapIn); permissionStatus = result.permissionStatus; //org.ofbiz.base.util.Debug.logInfo("in permprep, permissionStatus:" + permissionStatus, null); if ("granted".equals(permissionStatus)) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy Mon Jan 5 08:50:30 2015 @@ -55,7 +55,7 @@ if (!pubPt) { } */ -contentToValue = delegator.findOne("Content", [contentId : contentIdTo], false); +contentToValue = from("Content").where("contentId", contentIdTo).queryOne(); contentToPurposeList = contentToValue.getRelated("ContentPurpose", null, null, true); currentValue = delegator.makeValue("Content", [contentTypeId : "DOCUMENT", statusId : "CTNT_PUBLISHED", privilegeEnumId : "_00_"]); @@ -79,7 +79,7 @@ mapIn.entityOperation = "_CREATE"; mapIn.contentPurposeList = ["RESPONSE"]; //org.ofbiz.base.util.Debug.logInfo("in permprep, mapIn:" + mapIn, null); -result = dispatcher.runSync("checkContentPermission", mapIn); +result = runService('checkContentPermission', mapIn); permissionStatus = result.permissionStatus; //org.ofbiz.base.util.Debug.logInfo("permissionStatus:" + permissionStatus, null); if (!"granted".equals(permissionStatus)) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ResponsePrep.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ResponsePrep.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ResponsePrep.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ResponsePrep.groovy Mon Jan 5 08:50:30 2015 @@ -63,7 +63,7 @@ if (trail) { // start at 1 to skip webSiteId idList.each { id -> - webSitePublishPoint = delegator.findOne("WebSitePublishPoint", [contentId : id], true); + webSitePublishPoint = from("WebSitePublishPoint").where("contentId", id).cache(true).queryOne(); siteAncestorList.add(webSitePublishPoint); } context.siteAncestorList = siteAncestorList; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy Mon Jan 5 08:50:30 2015 @@ -40,7 +40,7 @@ context.partyId = partyId; request.removeAttribute("_EVENT_MESSAGE_"); if (partyId && !partyId.equals("_NA_")) { - party = delegator.findOne("Party", [partyId : partyId], false); + party = from("Party").where("partyId", partyId).queryOne(); person = party.getRelatedOne("Person", false); context.party = party; context.person = person; @@ -57,14 +57,12 @@ if (partyId && !partyId.equals("_NA_")) if (parameters.useShipAddr && cart.getShippingContactMechId()) { shippingContactMech = cart.getShippingContactMechId(); - postalAddress = delegator.findOne("PostalAddress", [contactMechId : shippingContactMech], false); + postalAddress = from("PostalAddress").where("contactMechId", shippingContactMech).queryOne(); context.useEntityFields = "Y"; context.postalFields = postalAddress; if (postalAddress && partyId) { - partyContactMechs = delegator.findByAnd("PartyContactMech", [partyId : partyId, contactMechId : postalAddress.contactMechId], ["-fromDate"], false); - partyContactMechs = EntityUtil.filterByDate(partyContactMechs); - partyContactMech = EntityUtil.getFirst(partyContactMechs); + partyContactMech = from("PartyContactMech").where("partyId", partyId, "contactMechId", postalAddress.contactMechId).orderBy("-fromDate").filterByDate().queryFirst(); context.partyContactMech = partyContactMech; } } else { @@ -75,7 +73,7 @@ if (cart && !parameters.singleUsePayment if (cart.getPaymentMethodIds() ) { checkOutPaymentId = cart.getPaymentMethodIds()[0]; context.checkOutPaymentId = checkOutPaymentId; - paymentMethod = delegator.findOne("PaymentMethod", [paymentMethodId : checkOutPaymentId], false); + paymentMethod = from("PaymentMethod").where("paymentMethodId", checkOutPaymentId).queryOne(); account = null; if ("CREDIT_CARD".equals(paymentMethod.paymentMethodTypeId)) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy Mon Jan 5 08:50:30 2015 @@ -64,7 +64,7 @@ paymentMethodType = null; paymentMethodTypeId = null; if (paymentMethodTypeIds) { paymentMethodTypeId = paymentMethodTypeIds[0]; - paymentMethodType = delegator.findOne("PaymentMethodType", [paymentMethodTypeId : paymentMethodTypeId], false); + paymentMethodType = from("PaymentMethodType").where("paymentMethodTypeId", paymentMethodTypeId).queryOne(); context.paymentMethodType = paymentMethodType; } @@ -97,7 +97,7 @@ context.giftMessage = cart.getGiftMessag context.isGift = cart.getIsGift(); context.currencyUomId = cart.getCurrency(); -shipmentMethodType = delegator.findOne("ShipmentMethodType", [shipmentMethodTypeId : cart.getShipmentMethodTypeId()], false); +shipmentMethodType = from("ShipmentMethodType").where("shipmentMethodTypeId", cart.getShipmentMethodTypeId()).queryOne(); if (shipmentMethodType) context.shipMethDescription = shipmentMethodType.description; orh = new OrderReadHelper(orderAdjustments, orderItems); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CustSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CustSettings.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CustSettings.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CustSettings.groovy Mon Jan 5 08:50:30 2015 @@ -35,7 +35,7 @@ if (partyId) { // NOTE: if there was an error, then don't look up and fill in all of this data, just use the values from the previous request (which will be in the parameters Map automagically) if (!request.getAttribute("_ERROR_MESSAGE_") && !request.getAttribute("_ERROR_MESSAGE_LIST_")) { - person = delegator.findOne("Person", [partyId : partyId], false); + person = from("Person").where("partyId", partyId).queryOne(); if (person) { context.callSubmitForm = true; // should never be null for the anonymous checkout, but just in case @@ -68,8 +68,7 @@ if (partyId) { } // get the Email Address - emailPartyContactDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose", - [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_EMAIL"], null, false))); + emailPartyContactDetail = from("PartyContactDetailByPurpose").where("partyId", partyId, "contactMechPurposeTypeId", "PRIMARY_EMAIL").filterByDate().queryFirst(); if (emailPartyContactDetail) { parameters.emailContactMechId = emailPartyContactDetail.contactMechId; parameters.emailAddress = emailPartyContactDetail.infoString; @@ -77,8 +76,7 @@ if (partyId) { } // get the Phone Numbers - homePhonePartyContactDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose", - [partyId : partyId, contactMechPurposeTypeId : "PHONE_HOME"], null, false))); + homePhonePartyContactDetail = from("PartyContactDetailByPurpose").where("partyId", partyId, "contactMechPurposeTypeId", "PHONE_HOME").filterByDate().queryFirst(); if (homePhonePartyContactDetail) { parameters.homePhoneContactMechId = homePhonePartyContactDetail.contactMechId; parameters.homeCountryCode = homePhonePartyContactDetail.countryCode; @@ -88,8 +86,7 @@ if (partyId) { parameters.homeSol = homePhonePartyContactDetail.allowSolicitation; } - workPhonePartyContactDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose", - [partyId : partyId, contactMechPurposeTypeId : "PHONE_WORK"], null, false))); + workPhonePartyContactDetail = from("PartyContactDetailByPurpose").where("partyId", partyId, "contactMechPurposeTypeId", "PHONE_WORK").filterByDate().queryFirst(); if (workPhonePartyContactDetail) { parameters.workPhoneContactMechId = workPhonePartyContactDetail.contactMechId; parameters.workCountryCode = workPhonePartyContactDetail.countryCode; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OptionSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OptionSettings.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OptionSettings.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OptionSettings.groovy Mon Jan 5 08:50:30 2015 @@ -40,7 +40,7 @@ request.removeAttribute("_EVENT_MESSAGE_ party = null; partyId = session.getAttribute("orderPartyId"); if (partyId) { - party = delegator.findOne("Party", [partyId : partyId], false); + party = from("Party").where("partyId", partyId).queryOne(); context.party = party; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderHistory.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderHistory.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderHistory.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderHistory.groovy Mon Jan 5 08:50:30 2015 @@ -22,11 +22,11 @@ import org.ofbiz.entity.*; import org.ofbiz.entity.util.*; import org.ofbiz.entity.condition.*; -partyRole = delegator.findOne("PartyRole", [partyId : userLogin.partyId, roleTypeId : "SUPPLIER"], false); +partyRole = from("PartyRole").where("partyId", userLogin.partyId, "roleTypeId", "SUPPLIER").queryOne(); if (partyRole) { if ("SUPPLIER".equals(partyRole.roleTypeId)) { /** drop shipper or supplier **/ - porderRoleCollection = delegator.findByAnd("OrderRole", [partyId : userLogin.partyId, roleTypeId : "SUPPLIER_AGENT"], null, false); + porderRoleCollection = from("OrderRole").where("partyId", userLogin.partyId, "roleTypeId", "SUPPLIER_AGENT").queryList(); porderHeaderList = EntityUtil.orderBy(EntityUtil.filterByAnd(EntityUtil.getRelated("OrderHeader", null, porderRoleCollection, false), [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED"), EntityCondition.makeCondition("orderTypeId", EntityOperator.EQUALS, "PURCHASE_ORDER")]), @@ -34,11 +34,10 @@ if (partyRole) { context.porderHeaderList = porderHeaderList; } } -orderRoleCollection = delegator.findByAnd("OrderRole", [partyId : userLogin.partyId, roleTypeId : "PLACING_CUSTOMER"], null, false); +orderRoleCollection = from("OrderRole").where("partyId", userLogin.partyId, "roleTypeId", "PLACING_CUSTOMER").queryList(); orderHeaderList = EntityUtil.orderBy(EntityUtil.filterByAnd(EntityUtil.getRelated("OrderHeader", null, orderRoleCollection, false), [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED")]), ["orderDate DESC"]); context.orderHeaderList = orderHeaderList; -downloadOrderRoleAndProductContentInfoList = delegator.findByAnd("OrderRoleAndProductContentInfo", - [partyId : userLogin.partyId, roleTypeId : "PLACING_CUSTOMER", productContentTypeId : "DIGITAL_DOWNLOAD", statusId : "ITEM_COMPLETED"], null, false); +downloadOrderRoleAndProductContentInfoList = from("OrderRoleAndProductContentInfo").where("partyId", userLogin.partyId, "roleTypeId", "PLACING_CUSTOMER", "productContentTypeId", "DIGITAL_DOWNLOAD", "statusId", "ITEM_COMPLETED").queryList(); context.downloadOrderRoleAndProductContentInfoList = downloadOrderRoleAndProductContentInfoList; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy Mon Jan 5 08:50:30 2015 @@ -38,7 +38,7 @@ if (!userLogin) { // then userLogin is not found when Order Complete Mail is send to user. if (!userLogin) { if (orderId) { - orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); + orderHeader = from("OrderHeader").where("orderId", orderId).queryOne(); orderStatuses = orderHeader.getRelated("OrderStatus", null, null, false); filteredOrderStatusList = []; extOfflineModeExists = false; @@ -57,12 +57,12 @@ if (!userLogin) { if (UtilValidate.isNotEmpty(filteredOrderStatusList)) { if (filteredOrderStatusList.size() < 2) { statusUserLogin = EntityUtil.getFirst(filteredOrderStatusList).statusUserLogin; - userLogin = delegator.findOne("UserLogin", [userLoginId : statusUserLogin], false); + userLogin = from("UserLogin").where("userLoginId", statusUserLogin).queryOne(); } else { filteredOrderStatusList.each { orderStatus -> if ("ORDER_COMPLETED".equals(orderStatus.statusId)) { statusUserLogin = orderStatus.statusUserLogin; - userLogin = delegator.findOne("UserLogin", [userLoginId :statusUserLogin], false); + userLogin = from("UserLogin").where("userLoginId", statusUserLogin).queryOne(); } } } @@ -88,7 +88,7 @@ allowAnonymousView = context.allowAnonym isDemoStore = true; if (orderId) { - orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); + orderHeader = from("OrderHeader").where("orderId", orderId).queryOne(); if ("PURCHASE_ORDER".equals(orderHeader?.orderTypeId)) { //drop shipper or supplier roleTypeId = "SUPPLIER_AGENT"; @@ -100,7 +100,7 @@ if (orderId) { // check OrderRole to make sure the user can view this order. This check must be done for any order which is not anonymously placed and // any anonymous order when the allowAnonymousView security flag (see above) is not set to Y, to prevent peeking if (orderHeader && (!"anonymous".equals(orderHeader.createdBy) || ("anonymous".equals(orderHeader.createdBy) && !"Y".equals(allowAnonymousView)))) { - orderRole = EntityUtil.getFirst(delegator.findByAnd("OrderRole", [orderId : orderId, partyId : partyId, roleTypeId : roleTypeId], null, false)); + orderRole = from("OrderRole").where("orderId", orderId, "partyId", partyId, "roleTypeId", roleTypeId).queryFirst(); if (!userLogin || !orderRole) { context.remove("orderHeader"); @@ -128,9 +128,8 @@ if (orderHeader) { orderTaxTotal = OrderReadHelper.getAllOrderItemsAdjustmentsTotal(orderItems, orderAdjustments, false, true, false); orderTaxTotal = orderTaxTotal.add(OrderReadHelper.calcOrderAdjustments(orderHeaderAdjustments, orderSubTotal, false, true, false)); - placingCustomerOrderRoles = delegator.findByAnd("OrderRole", [orderId : orderId, roleTypeId : roleTypeId], null, false); - placingCustomerOrderRole = EntityUtil.getFirst(placingCustomerOrderRoles); - placingCustomerPerson = placingCustomerOrderRole == null ? null : delegator.findOne("Person", [partyId : placingCustomerOrderRole.partyId], false); + placingCustomerOrderRole = from("OrderRole").where("orderId", orderId, "roleTypeId", roleTypeId).queryFirst(); + placingCustomerPerson = placingCustomerOrderRole == null ? null : from("Person").where("partyId", placingCustomerOrderRole.partyId).queryOne(); billingAccount = orderHeader.getRelatedOne("BillingAccount", false); @@ -154,15 +153,12 @@ if (orderHeader) { if (paymentAddress) context.paymentAddress = paymentAddress; // get Shipment tracking info - osisCond = EntityCondition.makeCondition([orderId : orderId], EntityOperator.AND); - osisOrder = ["shipmentId", "shipmentRouteSegmentId", "shipmentPackageSeqId"]; - osisFields = ["shipmentId", "shipmentRouteSegmentId", "carrierPartyId", "shipmentMethodTypeId"] as Set; - osisFields.add("shipmentPackageSeqId"); - osisFields.add("trackingCode"); - osisFields.add("boxNumber"); - osisFindOptions = new EntityFindOptions(); - osisFindOptions.setDistinct(true); - orderShipmentInfoSummaryList = delegator.findList("OrderShipmentInfoSummary", osisCond, osisFields, osisOrder, osisFindOptions, false); + orderShipmentInfoSummaryList = select("shipmentId", "shipmentRouteSegmentId", "carrierPartyId", "shipmentMethodTypeId","shipmentPackageSeqId","trackingCode","boxNumber") + .from("OrderShipmentInfoSummary") + .where("orderId", orderId) + .orderBy("shipmentId", "shipmentRouteSegmentId", "shipmentPackageSeqId") + .distinct(true) + .queryList(); customerPoNumberSet = new TreeSet(); orderItems.each { orderItemPo -> @@ -215,6 +211,6 @@ if (orderHeader) { context.orderShipmentInfoSummaryList = orderShipmentInfoSummaryList; context.customerPoNumberSet = customerPoNumberSet; - orderItemChangeReasons = delegator.findByAnd("Enumeration", [enumTypeId : "ODR_ITM_CH_REASON"], ["sequenceId"], false); + orderItemChangeReasons = from("Enumeration").where("enumTypeId", "ODR_ITM_CH_REASON").queryList(); context.orderItemChangeReasons = orderItemChangeReasons; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy Mon Jan 5 08:50:30 2015 @@ -36,7 +36,7 @@ if (!partyId) { context.partyId = partyId; if (partyId && !partyId.equals("_NA_")) { - party = delegator.findOne("Party", [partyId : partyId], false); + party = from("Party").where("partyId", partyId).queryOne(); person = party.getRelatedOne("Person", false); context.party = party; context.person = person; @@ -47,14 +47,12 @@ request.removeAttribute("_EVENT_MESSAGE_ if (parameters.useShipAddr && cart.getShippingContactMechId()) { shippingContactMech = cart.getShippingContactMechId(); - postalAddress = delegator.findOne("PostalAddress", [contactMechId : shippingContactMech], false); + postalAddress = from("PostalAddress").where("contactMechId", shippingContactMech).queryOne(); context.useEntityFields = "Y"; context.postalAddress = postalAddress; if (postalAddress && partyId) { - partyContactMechs = delegator.findByAnd("PartyContactMech", [partyId : partyId, contactMechId : postalAddress.contactMechId], ["-fromDate"], false); - partyContactMechs = EntityUtil.filterByDate(partyContactMechs); - partyContactMech = EntityUtil.getFirst(partyContactMechs); + partyContactMech = from("PartyContactMech").where("partyId", partyId, "contactMechId", postalAddress.contactMechId).orderBy("-fromDate").filterByDate().queryFirst(); context.partyContactMech = partyContactMech; } } else { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy Mon Jan 5 08:50:30 2015 @@ -42,7 +42,7 @@ if (partyId) { // NOTE: if there was an error, then don't look up and fill in all of this data, just use the values from the previous request (which will be in the parameters Map automagically) if (!request.getAttribute("_ERROR_MESSAGE_") && !request.getAttribute("_ERROR_MESSAGE_LIST_")) { - person = delegator.findOne("Person", [partyId : partyId], false); + person = from("Person").where("partyId", partyId).queryOne(); if (person) { context.callSubmitForm = true; // should never be null for the anonymous checkout, but just in case @@ -52,8 +52,7 @@ if (partyId) { } // get the Email Address - emailPartyContactDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose", - [partyId : partyId, contactMechPurposeTypeId : "PRIMARY_EMAIL"], null, false))); + emailPartyContactDetail = from("PartyContactDetailByPurpose").where("partyId", partyId, "contactMechPurposeTypeId", "PRIMARY_EMAIL").filterByDate().queryFirst(); if (emailPartyContactDetail) { parameters.emailContactMechId = emailPartyContactDetail.contactMechId; parameters.emailAddress = emailPartyContactDetail.infoString; @@ -61,8 +60,7 @@ if (partyId) { } // get the Phone Numbers - homePhonePartyContactDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose", - [partyId : partyId, contactMechPurposeTypeId : "PHONE_HOME"], null, false))); + homePhonePartyContactDetail = from("PartyContactDetailByPurpose").where("partyId", partyId, "contactMechPurposeTypeId", "PHONE_HOME").filterByDate().queryFirst(); if (homePhonePartyContactDetail) { parameters.homePhoneContactMechId = homePhonePartyContactDetail.contactMechId; parameters.homeCountryCode = homePhonePartyContactDetail.countryCode; @@ -72,8 +70,7 @@ if (partyId) { parameters.homeSol = homePhonePartyContactDetail.allowSolicitation; } - workPhonePartyContactDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose", - [partyId : partyId, contactMechPurposeTypeId : "PHONE_WORK"], null, false))); + workPhonePartyContactDetail = from("PartyContactDetailByPurpose").where(partyId : partyId, contactMechPurposeTypeId : "PHONE_WORK").filterByDate().queryFirst(); if (workPhonePartyContactDetail) { parameters.workPhoneContactMechId = workPhonePartyContactDetail.contactMechId; parameters.workCountryCode = workPhonePartyContactDetail.countryCode; @@ -93,7 +90,7 @@ context.cart = cart; request.removeAttribute("_EVENT_MESSAGE_"); if (cartPartyId && !cartPartyId.equals("_NA_")) { - cartParty = delegator.findOne("Party", [partyId : cartPartyId], false); + cartParty = from("Party").where("partyId", cartPartyId).queryOne(); if (cartParty) { cartPerson = cartParty.getRelatedOne("Person", false); context.party = cartParty; @@ -103,8 +100,7 @@ if (cartPartyId && !cartPartyId.equals(" if (cart && cart.getShippingContactMechId()) { shippingContactMechId = cart.getShippingContactMechId(); - shippingPartyContactDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose", - [partyId : cartPartyId, contactMechId : shippingContactMechId], null, false))); + shippingPartyContactDetail = from("PartyContactDetailByPurpose").where("partyId", cartPartyId, "contactMechId", shippingContactMechId).filterByDate().queryFirst(); parameters.shippingContactMechId = shippingPartyContactDetail.contactMechId; context.callSubmitForm = true; parameters.shipToName = shippingPartyContactDetail.toName; @@ -121,7 +117,7 @@ if (cart && cart.getShippingContactMechI billingContactMechId = session.getAttribute("billingContactMechId"); if (billingContactMechId) { - billPostalAddress = delegator.findOne("PostalAddress", [contactMechId : billingContactMechId], false); + billPostalAddress = from("PostalAddress").where("contactMechId", billingContactMechId).queryOne(); parameters.billingContactMechId = billPostalAddress.contactMechId; parameters.billToName = billPostalAddress.toName; parameters.billToAttnName = billPostalAddress.attnName; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonOptionSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonOptionSettings.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonOptionSettings.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonOptionSettings.groovy Mon Jan 5 08:50:30 2015 @@ -40,7 +40,7 @@ request.removeAttribute("_EVENT_MESSAGE_ party = null; partyId = session.getAttribute("orderPartyId"); if (partyId) { - party = delegator.findOne("Party", [partyId : partyId], false); + party = from("Party").where("partyId", partyId).queryOne(); context.party = party; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy Mon Jan 5 08:50:30 2015 @@ -27,27 +27,27 @@ context.orderId = orderId; party = userLogin.getRelatedOne("Party", false); context.party = party; -returnTypes = delegator.findList("ReturnType", null, null, ["sequenceId"], null, false); +returnTypes = from("ReturnType").orderBy("sequenceId").queryList(); context.returnTypes = returnTypes; -returnReasons = delegator.findList("ReturnReason", null, null, ["sequenceId"], null, false); +returnReasons = from("ReturnReason").orderBy("sequenceId").queryList(); context.returnReasons = returnReasons; if (orderId) { - returnRes = dispatcher.runSync("getReturnableItems", [orderId : orderId]); + returnRes = runService('getReturnableItems', [orderId : orderId]); context.returnableItems = returnRes.returnableItems; - orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false); + orderHeader = from("OrderHeader").where("orderId", orderId).queryOne(); context.orderHeader = orderHeader; } -returnItemTypeMap = delegator.findByAnd("ReturnItemTypeMap", [returnHeaderTypeId : "CUSTOMER_RETURN"], null, false); +returnItemTypeMap = from("ReturnItemTypeMap").where("returnHeaderTypeId", "CUSTOMER_RETURN").queryList(); typeMap = new HashMap(); returnItemTypeMap.each { value -> typeMap[value.returnItemMapKey] = value.returnItemTypeId } context.returnItemTypeMap = typeMap; //put in the return to party information from the order header if (orderId) { - order = delegator.findOne("OrderHeader", [orderId : orderId], false); + order = from("OrderHeader").where("orderId", orderId).queryOne(); productStore = order.getRelatedOne("ProductStore", false); context.toPartyId = productStore.payToPartyId; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy Mon Jan 5 08:50:30 2015 @@ -32,7 +32,7 @@ context.cart = cart; request.removeAttribute("_EVENT_MESSAGE_"); if (partyId && !partyId.equals("_NA_")) { - party = delegator.findOne("Party", [partyId : partyId], false); + party = from("Party").where("partyId", partyId).queryOne(); person = party.getRelatedOne("Person", false); context.party = party; context.person = person; @@ -40,8 +40,7 @@ if (partyId && !partyId.equals("_NA_")) if (cart?.getShippingContactMechId()) { shippingContactMechId = cart.getShippingContactMechId(); - shippingPartyContactDetail = EntityUtil.getFirst(EntityUtil.filterByDate(delegator.findByAnd("PartyContactDetailByPurpose", - [partyId : partyId, contactMechId : shippingContactMechId], null, false))); + shippingPartyContactDetail = from("PartyContactDetailByPurpose").where("partyId", partyId, "contactMechId", shippingContactMechId).filterByDate().queryFirst(); parameters.shippingContactMechId = shippingPartyContactDetail.contactMechId; context.callSubmitForm = true; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy Mon Jan 5 08:50:30 2015 @@ -25,16 +25,16 @@ import org.ofbiz.entity.util.*; shipmentId = parameters.shipmentId; if (shipmentId) { - shipment = delegator.findOne("Shipment", [shipmentId : shipmentId], false); - shipmentItems = delegator.findByAnd("ShipmentItem", [shipmentId : shipmentId], null, false); + shipment = from("Shipment").where("shipmentId", shipmentId).queryOne(); + shipmentItems = from("ShipmentItem").where("shipmentId", shipmentId).queryList(); // get Shipment tracking info - osisCond = EntityCondition.makeCondition([shipmentId : shipmentId], EntityOperator.AND); - osisOrder = ["shipmentId", "shipmentRouteSegmentId", "shipmentPackageSeqId"]; - osisFields = ["shipmentId", "shipmentRouteSegmentId", "shipmentPackageSeqId", "carrierPartyId", "trackingCode"] as Set; - osisFindOptions = new EntityFindOptions(); - osisFindOptions.setDistinct(true); - orderShipmentInfoSummaryList = delegator.findList("OrderShipmentInfoSummary", osisCond, osisFields, osisOrder, osisFindOptions, false); + orderShipmentInfoSummaryList = select("shipmentId", "shipmentRouteSegmentId", "shipmentPackageSeqId", "carrierPartyId", "trackingCode") + .from("OrderShipmentInfoSummary") + .where("shipmentId", shipmentId) + .orderBy("shipmentId", "shipmentRouteSegmentId", "shipmentPackageSeqId") + .distinct() + .queryList(); context.shipment = shipment; context.shipmentItems = shipmentItems; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy Mon Jan 5 08:50:30 2015 @@ -53,13 +53,13 @@ context.currencyUomId = currencyUomId; exprList = [EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, userLogin.partyId), EntityCondition.makeCondition("listName", EntityOperator.NOT_EQUAL, "auto-save")]; condition = EntityCondition.makeCondition(exprList, EntityOperator.AND); -allShoppingLists = delegator.findList("ShoppingList", condition, null, ["listName"], null, false); +allShoppingLists = from("ShoppingList").where(exprList).orderBy("listName").queryList(); shoppingLists = EntityUtil.filterByAnd(allShoppingLists, [parentShoppingListId : null]); context.allShoppingLists = allShoppingLists; context.shoppingLists = shoppingLists; // get all shoppingListTypes -shoppingListTypes = delegator.findList("ShoppingListType", null, null, ["description"], null, true); +shoppingListTypes = from("ShoppingListType").orderBy("description").cache(true).queryList(); context.shoppingListTypes = shoppingListTypes; // get the shoppingListId for this reqest @@ -78,7 +78,7 @@ session.setAttribute("currentShoppingLis // if we passed a shoppingListId get the shopping list info if (shoppingListId) { - shoppingList = delegator.findOne("ShoppingList", [shoppingListId : shoppingListId], false); + shoppingList = from("ShoppingList").where("shoppingListId", shoppingListId).queryOne(); context.shoppingList = shoppingList; if (shoppingList) { @@ -93,11 +93,8 @@ if (shoppingListId) { product = shoppingListItem.getRelatedOne("Product", true); - calcPriceInMap = [product : product, quantity : shoppingListItem.quantity, currencyUomId : currencyUomId, userLogin : userLogin]; - calcPriceInMap.webSiteId = webSiteId; - calcPriceInMap.prodCatalogId = prodCatalogId; - calcPriceInMap.productStoreId = productStoreId; - calcPriceOutMap = dispatcher.runSync("calculateProductPrice", calcPriceInMap); + calcPriceOutMap = runService('calculateProductPrice', [product : product, quantity : shoppingListItem.quantity, currencyUomId : currencyUomId, userLogin : userLogin, + webSiteId: webSiteId, prodCatalogId: prodCatalogId, productStoreId: productStoreId]); price = calcPriceOutMap.price; totalPrice = price * shoppingListItem.quantity; // similar code at ShoppingCartItem.java getRentalAdjustment @@ -164,15 +161,14 @@ if (shoppingListId) { context.shoppingListType = shoppingListType; // get the child shopping lists of the current list for the logged in user - childShoppingLists = delegator.findByAnd("ShoppingList", [partyId : userLogin.partyId, parentShoppingListId : shoppingListId], ["listName"], true); + childShoppingLists = from("ShoppingList").where("partyId", userLogin.partyId, "parentShoppingListId", shoppingListId).orderBy("listName").cache(true).queryList(); // now get prices for each child shopping list... if (childShoppingLists) { childShoppingListDatas = new ArrayList(childShoppingLists.size()); childShoppingLists.each { childShoppingList -> childShoppingListData = [:]; - calcListPriceInMap = [shoppingListId : childShoppingList.shoppingListId, prodCatalogId : prodCatalogId, webSiteId : webSiteId, userLogin : userLogin, currencyUomId : currencyUomId]; - childShoppingListPriceMap = dispatcher.runSync("calculateShoppingListDeepTotalPrice", calcListPriceInMap); + childShoppingListPriceMap = runService('calculateShoppingListDeepTotalPrice', [shoppingListId : childShoppingList.shoppingListId, prodCatalogId : prodCatalogId, webSiteId : webSiteId, userLogin : userLogin, currencyUomId : currencyUomId]); totalPrice = childShoppingListPriceMap.totalPrice; shoppingListChildTotal += totalPrice; @@ -205,7 +201,7 @@ if (shoppingListId) { context.shippingContactMechList = ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false); context.paymentMethodList = EntityUtil.filterByDate(party.getRelated("PaymentMethod", null, ["paymentMethodTypeId"], false)); - shipAddress = delegator.findOne("PostalAddress", ["contactMechId" : shoppingList.contactMechId], false); + shipAddress = from("PostalAddress").where("contactMechId", shoppingList.contactMechId).queryOne(); Debug.log("SL - address : " + shipAddress); if (shipAddress) { listCart = ShoppingListServices.makeShoppingListCart(dispatcher, shoppingListId, locale); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl Mon Jan 5 08:50:30 2015 @@ -19,7 +19,11 @@ under the License. <#if currentSearchCategory??> <div id="layeredNav" class="screenlet"> - <h3>Layered Navigation</h3> + <div class="screenlet-title-bar"> + <ul> + <li class="h3">${uiLabelMap.EcommerceLayeredNavigation}</li> + </ul> + </div> <#escape x as x?xml> <#if productCategory.productCategoryId != currentSearchCategory.productCategoryId> <#assign currentSearchCategoryName = categoryContentWrapper.get("CATEGORY_NAME")?string /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl Mon Jan 5 08:50:30 2015 @@ -199,7 +199,11 @@ var rawdata = [ <div id="quickadd" class="screenlet"> - <h3>${uiLabelMap.ProductCategories}</h3> + <div class="screenlet-title-bar"> + <ul> + <li class="h3">${uiLabelMap.ProductCategories}</li> + </ul> + </div> <div class="screenlet-body" id="tree"> </div> </div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/minireorderprods.ftl Mon Jan 5 08:50:30 2015 @@ -18,7 +18,11 @@ under the License. --> <#if reorderProducts?has_content> <div id ="minireorderprods" class="screenlet"> - <h3>${uiLabelMap.ProductQuickReorder}...</h3> + <div class="screenlet-title-bar"> + <ul> + <li class="h3">${uiLabelMap.ProductQuickReorder}...</li> + </ul> + </div> <div class="screenlet-body"> <#list reorderProducts as miniProduct> <div> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CatalogScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CatalogScreens.xml Mon Jan 5 08:50:30 2015 @@ -475,6 +475,9 @@ under the License. </screen> <screen name="LayeredNavBar"> <section> + <actions> + <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> + </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl"/></html></platform-specific> </widgets> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ContentForms.xml?rev=1649482&r1=1649481&r2=1649482&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ContentForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/ContentForms.xml Mon Jan 5 08:50:30 2015 @@ -37,7 +37,7 @@ under the License. </hyperlink> </field> <field name="contentId"><display/></field> - <field name="dataResourceId"><display/></field> + <field name="dataResourceId" title="${uiLabelMap.ContentDataResourceId}"><display/></field> <field name="contentName"><display/></field> </form> </forms> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |