Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java?rev=1629587&r1=1629586&r2=1629587&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java Mon Oct 6 08:07:22 2014 @@ -42,6 +42,7 @@ import org.ofbiz.entity.condition.Entity import org.ofbiz.entity.condition.EntityConditionList; import org.ofbiz.entity.condition.EntityExpr; import org.ofbiz.entity.condition.EntityOperator; +import org.ofbiz.entity.util.EntityQuery; import org.ofbiz.entity.util.EntityUtil; /** @@ -82,7 +83,7 @@ public class InvoiceWorker { GenericValue invoice = null; try { - invoice = delegator.findOne("Invoice", UtilMisc.toMap("invoiceId", invoiceId), false); + invoice = EntityQuery.use(delegator).from("Invoice").where("invoiceId", invoiceId).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Problem getting Invoice", module); } @@ -114,7 +115,8 @@ public class InvoiceWorker { /** Method to get the taxable invoice item types as a List of invoiceItemTypeIds. These are identified in Enumeration with enumTypeId TAXABLE_INV_ITM_TY. */ public static List<String> getTaxableInvoiceItemTypeIds(Delegator delegator) throws GenericEntityException { List<String> typeIds = FastList.newInstance(); - List<GenericValue> invoiceItemTaxTypes = delegator.findByAnd("Enumeration", UtilMisc.toMap("enumTypeId", "TAXABLE_INV_ITM_TY"), null, true); + List<GenericValue> invoiceItemTaxTypes = EntityQuery.use(delegator).from("Enumeration").where("enumTypeId", "TAXABLE_INV_ITM_TY") + .cache().queryList(); for (GenericValue invoiceItemTaxType : invoiceItemTaxTypes) { typeIds.add(invoiceItemTaxType.getString("enumId")); } @@ -299,8 +301,8 @@ public class InvoiceWorker { if (invoice.getString("invoiceTypeId").equals("PURCHASE_INVOICE")) destinationPartyId = invoice.getString("partyId"); try { - locations = delegator.findByAnd("PartyContactWithPurpose", - UtilMisc.toMap("partyId", destinationPartyId, "contactMechPurposeTypeId", contactMechPurposeTypeId), null, false); + locations = EntityQuery.use(delegator).from("PartyContactWithPurpose") + .where("partyId", destinationPartyId, "contactMechPurposeTypeId", contactMechPurposeTypeId).queryList(); locations = EntityUtil.filterByDate(locations, null, "contactFromDate", "contactThruDate", true); locations = EntityUtil.filterByDate(locations, null, "purposeFromDate", "purposeThruDate", true); } catch (GenericEntityException e) { @@ -309,8 +311,8 @@ public class InvoiceWorker { //if still not found get it from the general location if (UtilValidate.isEmpty(locations)) { try { - locations = delegator.findByAnd("PartyContactWithPurpose", - UtilMisc.toMap("partyId", destinationPartyId, "contactMechPurposeTypeId", "GENERAL_LOCATION"), null, false); + locations = EntityQuery.use(delegator).from("PartyContactWithPurpose") + .where("partyId", destinationPartyId, "contactMechPurposeTypeId", "GENERAL_LOCATION").queryList(); locations = EntityUtil.filterByDate(locations, null, "contactFromDate", "contactThruDate", true); locations = EntityUtil.filterByDate(locations, null, "purposeFromDate", "purposeThruDate", true); } catch (GenericEntityException e) { @@ -408,7 +410,8 @@ public class InvoiceWorker { EntityOperator.AND); try { - paymentApplications = delegator.findList("PaymentAndApplication", conditions, null, UtilMisc.toList("effectiveDate"), null, false); + paymentApplications = EntityQuery.use(delegator).from("PaymentAndApplication") + .where(conditions).orderBy("effectiveDate").queryList(); } catch (GenericEntityException e) { Debug.logError(e, "Trouble getting paymentApplicationlist", module); } @@ -457,7 +460,7 @@ public class InvoiceWorker { GenericValue invoiceItem = null; try { - invoiceItem = delegator.findOne("Invoice", UtilMisc.toMap("invoiceId", invoiceId,"invoiceItemSeqId", invoiceItemSeqId), false); + invoiceItem = EntityQuery.use(delegator).from("Invoice").where("invoiceId", invoiceId,"invoiceItemSeqId", invoiceItemSeqId).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Problem getting InvoiceItem", module); } @@ -495,9 +498,9 @@ public class InvoiceWorker { String otherCurrencyUomId = null; // find the organization party currencyUomId which different from the invoice currency try { - GenericValue party = delegator.findOne("PartyAcctgPreference", UtilMisc.toMap("partyId", invoice.getString("partyIdFrom")), false); + GenericValue party = EntityQuery.use(delegator).from("PartyAcctgPreference").where("partyId", invoice.get("partyIdFrom")).queryOne(); if (UtilValidate.isEmpty(party) || party.getString("baseCurrencyUomId").equals(invoice.getString("currencyUomId"))) { - party = delegator.findOne("PartyAcctgPreference", UtilMisc.toMap("partyId", invoice.getString("partyId")), false); + party = EntityQuery.use(delegator).from("PartyAcctgPreference").where("partyId", invoice.get("partyId")).queryOne(); } if (UtilValidate.isNotEmpty(party) && party.getString("baseCurrencyUomId") != null) { otherCurrencyUomId = party.getString("baseCurrencyUomId"); @@ -540,9 +543,9 @@ public class InvoiceWorker { } // use the dated conversion entity if (UtilValidate.isEmpty(conversionRate)) { - List<GenericValue> rates = EntityUtil.filterByDate(delegator.findByAnd("UomConversionDated", UtilMisc.toMap("uomIdTo", invoice.getString("currencyUomId"), "uomId", otherCurrencyUomId), null, false), invoice.getTimestamp("invoiceDate")); - if (UtilValidate.isNotEmpty(rates)) { - conversionRate = (BigDecimal.ONE).divide((rates.get(0)).getBigDecimal("conversionFactor"), new MathContext(100)).setScale(decimals,rounding); + GenericValue rate = EntityQuery.use(delegator).from("UomConversionDated").where("uomIdTo", invoice.get("currencyUomId"), "uomId", otherCurrencyUomId).filterByDate(invoice.getTimestamp("invoiceDate")).queryFirst(); + if (rate != null) { + conversionRate = BigDecimal.ONE.divide(rate.getBigDecimal("conversionFactor"), new MathContext(100)).setScale(decimals,rounding); } else { Debug.logError("Could not find conversionrate for invoice: " + invoice.getString("invoiceId"), module); return new BigDecimal("1"); @@ -562,7 +565,7 @@ public class InvoiceWorker { GenericValue invoice = null; try { - invoice = delegator.findOne("Invoice", UtilMisc.toMap("invoiceId", invoiceId), false); + invoice = EntityQuery.use(delegator).from("Invoice").where("invoiceId", invoiceId).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Problem getting Invoice", module); } @@ -650,11 +653,11 @@ public class InvoiceWorker { List<GenericValue> invoiceTaxItems = null; try { Delegator delegator = invoice.getDelegator(); - EntityConditionList<EntityExpr> condition = EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition("invoiceId", invoice.getString("invoiceId")), - EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.IN, getTaxableInvoiceItemTypeIds(delegator))), - EntityOperator.AND); - invoiceTaxItems = delegator.findList("InvoiceItem", condition, null, null, null, false); + invoiceTaxItems = EntityQuery.use(delegator).from("InvoiceItem") + .where(UtilMisc.<EntityCondition>toList( + EntityCondition.makeCondition("invoiceId", invoice.getString("invoiceId")), + EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.IN, getTaxableInvoiceItemTypeIds(delegator))) + ).queryList(); } catch (GenericEntityException e) { Debug.logError(e, "Trouble getting InvoiceItem list", module); return null; @@ -688,13 +691,13 @@ public class InvoiceWorker { List<GenericValue> invoiceTaxItems = null; try { Delegator delegator = invoice.getDelegator(); - EntityConditionList<EntityExpr> condition = EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition("invoiceId", invoice.getString("invoiceId")), - EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.IN, getTaxableInvoiceItemTypeIds(delegator)), - EntityCondition.makeCondition("taxAuthPartyId", taxAuthPartyId), - EntityCondition.makeCondition("taxAuthGeoId", taxAuthGeoId)), - EntityOperator.AND); - invoiceTaxItems = delegator.findList("InvoiceItem", condition, null, null, null, false); + invoiceTaxItems = EntityQuery.use(delegator).from("InvoiceItem") + .where(UtilMisc.toList( + EntityCondition.makeCondition("invoiceId", invoice.getString("invoiceId")), + EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.IN, getTaxableInvoiceItemTypeIds(delegator)), + EntityCondition.makeCondition("taxAuthPartyId", taxAuthPartyId), + EntityCondition.makeCondition("taxAuthGeoId", taxAuthGeoId)) + ).queryList(); } catch (GenericEntityException e) { Debug.logError(e, "Trouble getting InvoiceItem list", module); return null; @@ -710,12 +713,12 @@ public class InvoiceWorker { List<GenericValue> invoiceTaxItems = null; try { Delegator delegator = invoice.getDelegator(); - EntityConditionList<EntityExpr> condition = EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition("invoiceId", invoice.getString("invoiceId")), - EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.IN, getTaxableInvoiceItemTypeIds(delegator)), - EntityCondition.makeCondition("taxAuthPartyId", null)), - EntityOperator.AND); - invoiceTaxItems = delegator.findList("InvoiceItem", condition, null, null, null, false); + invoiceTaxItems = EntityQuery.use(delegator).from("InvoiceItem") + .where(UtilMisc.toList( + EntityCondition.makeCondition("invoiceId", invoice.get("invoiceId")), + EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.IN, getTaxableInvoiceItemTypeIds(delegator)), + EntityCondition.makeCondition("taxAuthPartyId", null))) + .queryList(); } catch (GenericEntityException e) { Debug.logError(e, "Trouble getting InvoiceItem list", module); return null;
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java?rev=1629587&r1=1629586&r2=1629587&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java Mon Oct 6 08:07:22 2014 @@ -43,6 +43,7 @@ import org.ofbiz.entity.condition.Entity import org.ofbiz.entity.condition.EntityConditionList; import org.ofbiz.entity.condition.EntityExpr; import org.ofbiz.entity.condition.EntityOperator; +import org.ofbiz.entity.util.EntityQuery; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.order.order.OrderReadHelper; import org.ofbiz.service.DispatchContext; @@ -77,11 +78,11 @@ public class BillingAccountWorker { } List<String> relatedPartyIdList = UtilGenerics.checkList(agentResult.get("relatedPartyIdList")); - EntityCondition barFindCond = EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition("partyId", EntityOperator.IN, relatedPartyIdList), - EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, "BILL_TO_CUSTOMER")), EntityOperator.AND); - List<GenericValue> billingAccountRoleList = delegator.findList("BillingAccountRole", barFindCond, null, null, null, false); - billingAccountRoleList = EntityUtil.filterByDate(billingAccountRoleList); + List<GenericValue> billingAccountRoleList = EntityQuery.use(delegator).from("BillingAccountRole") + .where(UtilMisc.toList( + EntityCondition.makeCondition("partyId", EntityOperator.IN, relatedPartyIdList), + EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, "BILL_TO_CUSTOMER"))) + .filterByDate().queryList(); if (billingAccountRoleList.size() > 0) { BigDecimal totalAvailable = BigDecimal.ZERO; @@ -113,13 +114,13 @@ public class BillingAccountWorker { * Returns list of orders which are currently open against a billing account */ public static List<GenericValue> getBillingAccountOpenOrders(Delegator delegator, String billingAccountId) throws GenericEntityException { - EntityConditionList<EntityExpr> ecl = EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition("billingAccountId", EntityOperator.EQUALS, billingAccountId), - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED"), - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_CANCELLED"), - EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_COMPLETED")), - EntityOperator.AND); - return delegator.findList("OrderHeader", ecl, null, null, null, false); + return EntityQuery.use(delegator).from("OrderHeader") + .where(UtilMisc.toList( + EntityCondition.makeCondition("billingAccountId", EntityOperator.EQUALS, billingAccountId), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED"), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_CANCELLED"), + EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ORDER_COMPLETED"))) + .queryList(); } /** @@ -141,7 +142,7 @@ public class BillingAccountWorker { } public static BigDecimal getBillingAccountAvailableBalance(Delegator delegator, String billingAccountId) throws GenericEntityException { - GenericValue billingAccount = delegator.findOne("BillingAccount", UtilMisc.toMap("billingAccountId", billingAccountId), false); + GenericValue billingAccount = EntityQuery.use(delegator).from("BillingAccount").where("billingAccountId", billingAccountId).queryOne(); return getBillingAccountAvailableBalance(billingAccount); } @@ -157,7 +158,7 @@ public class BillingAccountWorker { BigDecimal balance = ZERO; // search through all PaymentApplications and add the amount that was applied to invoice and subtract the amount applied from payments - List<GenericValue> paymentAppls = delegator.findByAnd("PaymentApplication", UtilMisc.toMap("billingAccountId", billingAccountId), null, false); + List<GenericValue> paymentAppls = EntityQuery.use(delegator).from("PaymentApplication").where("billingAccountId", billingAccountId).queryList(); for (Iterator<GenericValue> pAi = paymentAppls.iterator(); pAi.hasNext();) { GenericValue paymentAppl = pAi.next(); BigDecimal amountApplied = paymentAppl.getBigDecimal("amountApplied"); @@ -196,7 +197,7 @@ public class BillingAccountWorker { Map<String, Object> result = ServiceUtil.returnSuccess(); try { - GenericValue billingAccount = delegator.findOne("BillingAccount", UtilMisc.toMap("billingAccountId", billingAccountId), false); + GenericValue billingAccount = EntityQuery.use(delegator).from("BillingAccount").where("billingAccountId", billingAccountId).queryOne(); if (billingAccount == null) { return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "AccountingBillingAccountNotFound", Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1629587&r1=1629586&r2=1629587&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java Mon Oct 6 08:07:22 2014 @@ -37,6 +37,7 @@ import org.ofbiz.base.util.collections.R import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; +import org.ofbiz.entity.util.EntityQuery; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.order.finaccount.FinAccountHelper; @@ -85,7 +86,9 @@ public class GiftCertificateServices { final String accountName = "Gift Certificate Account"; final String deposit = "DEPOSIT"; - GenericValue giftCertSettings = delegator.findOne("ProductStoreFinActSetting", UtilMisc.toMap("productStoreId", productStoreId, "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId), true); + GenericValue giftCertSettings = EntityQuery.use(delegator).from("ProductStoreFinActSetting") + .where("productStoreId", productStoreId, "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId) + .cache().queryOne(); Map<String, Object> acctResult = null; if ("Y".equals(giftCertSettings.getString("requirePinCode"))) { @@ -129,7 +132,7 @@ public class GiftCertificateServices { // create the initial (deposit) transaction // do something tricky here: run as the "system" user // that can actually create a financial account transaction - GenericValue permUserLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", "system"), true); + GenericValue permUserLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").cache().queryOne(); refNum = createTransaction(delegator, dispatcher, permUserLogin, initialAmount, productStoreId, partyId, currencyUom, deposit, finAccountId, locale); @@ -182,7 +185,9 @@ public class GiftCertificateServices { GenericValue finAccount = null; // validate the pin if the store requires it and figure out the finAccountId from card number try { - GenericValue giftCertSettings = delegator.findOne("ProductStoreFinActSetting", UtilMisc.toMap("productStoreId", productStoreId, "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId), true); + GenericValue giftCertSettings = EntityQuery.use(delegator).from("ProductStoreFinActSetting") + .where("productStoreId", productStoreId, "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId) + .cache().queryOne(); if ("Y".equals(giftCertSettings.getString("requirePinCode"))) { if (!validatePin(delegator, cardNumber, pinNumber)) { return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, @@ -209,7 +214,7 @@ public class GiftCertificateServices { if (finAccount == null) { try { - finAccount = delegator.findOne("FinAccount", UtilMisc.toMap("finAccountId", finAccountId), false); + finAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", finAccountId).queryOne(); } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "AccountingFinAccountNotFound", UtilMisc.toMap("finAccountId", finAccountId), locale)); @@ -274,7 +279,9 @@ public class GiftCertificateServices { // validate the pin if the store requires it try { - GenericValue giftCertSettings = delegator.findOne("ProductStoreFinActSetting", UtilMisc.toMap("productStoreId", productStoreId, "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId), true); + GenericValue giftCertSettings = EntityQuery.use(delegator).from("ProductStoreFinActSetting") + .where("productStoreId", productStoreId, "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId) + .cache().queryOne(); if ("Y".equals(giftCertSettings.getString("requirePinCode")) && !validatePin(delegator, cardNumber, pinNumber)) { return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "AccountingGiftCerticateNumberPinNotValid", locale)); @@ -289,7 +296,7 @@ public class GiftCertificateServices { GenericValue finAccount = null; try { - finAccount = delegator.findOne("FinAccount", UtilMisc.toMap("finAccountId", cardNumber), false); + finAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", cardNumber).queryOne(); } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "AccountingFinAccountNotFound", UtilMisc.toMap("finAccountId", cardNumber), locale)); @@ -343,7 +350,7 @@ public class GiftCertificateServices { GenericValue finAccount = null; try { - finAccount = delegator.findOne("FinAccount", UtilMisc.toMap("finAccountId", cardNumber), false); + finAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", cardNumber).queryOne(); } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "AccountingFinAccountNotFound", UtilMisc.toMap("finAccountId", cardNumber), locale)); @@ -387,7 +394,7 @@ public class GiftCertificateServices { // get the gift certificate and its authorization from the authorization String finAccountAuthId = authTransaction.getString("referenceNum"); try { - GenericValue finAccountAuth = delegator.findOne("FinAccountAuth", UtilMisc.toMap("finAccountAuthId", finAccountAuthId), false); + GenericValue finAccountAuth = EntityQuery.use(delegator).from("FinAccountAuth").where("finAccountAuthId", finAccountAuthId).queryOne(); GenericValue giftCard = finAccountAuth.getRelatedOne("FinAccount", false); // make sure authorization has not expired Timestamp authExpiration = finAccountAuth.getTimestamp("thruDate"); @@ -478,14 +485,16 @@ public class GiftCertificateServices { try { // if the store requires pin codes, then validate pin code against card number, and the gift certificate's finAccountId is the gift card's card number // otherwise, the gift card's card number is an ecrypted string, which must be decoded to find the FinAccount - GenericValue giftCertSettings = delegator.findOne("ProductStoreFinActSetting", UtilMisc.toMap("productStoreId", productStoreId, "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId), true); + GenericValue giftCertSettings = EntityQuery.use(delegator).from("ProductStoreFinActSetting") + .where("productStoreId", productStoreId, "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId) + .cache().queryOne(); GenericValue finAccount = null; String finAccountId = null; if (UtilValidate.isNotEmpty(giftCertSettings)) { if ("Y".equals(giftCertSettings.getString("requirePinCode"))) { if (validatePin(delegator, giftCard.getString("cardNumber"), giftCard.getString("pinNumber"))) { finAccountId = giftCard.getString("cardNumber"); - finAccount = delegator.findOne("FinAccount", UtilMisc.toMap("finAccountId", finAccountId), false); + finAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", finAccountId).queryOne(); } } else { finAccount = FinAccountHelper.getFinAccountFromCode(giftCard.getString("cardNumber"), delegator); @@ -754,7 +763,9 @@ public class GiftCertificateServices { // Gift certificate settings are per store in this entity GenericValue giftCertSettings = null; try { - giftCertSettings = delegator.findOne("ProductStoreFinActSetting", UtilMisc.toMap("productStoreId", productStoreId, "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId), true); + giftCertSettings = EntityQuery.use(delegator).from("ProductStoreFinActSetting") + .where("productStoreId", productStoreId, "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId) + .cache().queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Unable to get Product Store FinAccount settings for " + FinAccountHelper.giftCertFinAccountTypeId, module); return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, @@ -769,12 +780,10 @@ public class GiftCertificateServices { // get the survey response GenericValue surveyResponse = null; try { - Map<String, Object> fields = UtilMisc.<String, Object>toMap("orderId", orderId, - "orderItemSeqId", orderItem.get("orderItemSeqId"), "surveyId", surveyId); - List<String> order = UtilMisc.toList("-responseDate"); - List<GenericValue> responses = delegator.findByAnd("SurveyResponse", fields, order, false); // there should be only one - surveyResponse = EntityUtil.getFirst(responses); + surveyResponse = EntityQuery.use(delegator).from("SurveyResponse") + .where("orderId", orderId, "orderItemSeqId", orderItem.get("orderItemSeqId"), "surveyId", surveyId) + .orderBy("-responseDate").queryFirst(); } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, @@ -883,8 +892,7 @@ public class GiftCertificateServices { GenericValue productStoreEmail = null; String emailType = "PRDS_GC_PURCHASE"; try { - productStoreEmail = delegator.findOne("ProductStoreEmailSetting", - UtilMisc.toMap("productStoreId", productStoreId, "emailType", emailType), false); + productStoreEmail = EntityQuery.use(delegator).from("ProductStoreEmailSetting").where("productStoreId", productStoreId, "emailType", emailType).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Unable to get product store email setting for gift card purchase", module); } @@ -1004,12 +1012,10 @@ public class GiftCertificateServices { // get the survey response GenericValue surveyResponse = null; try { - Map<String, Object> fields = UtilMisc.toMap("orderId", orderId, - "orderItemSeqId", orderItem.get("orderItemSeqId"), "surveyId", surveyId); - List<String> order = UtilMisc.toList("-responseDate"); - List<GenericValue> responses = delegator.findByAnd("SurveyResponse", fields, order, false); // there should be only one - surveyResponse = EntityUtil.getFirst(responses); + surveyResponse = EntityQuery.use(delegator).from("SurveyResponse") + .where("orderId", orderId, "orderItemSeqId", orderItem.get("orderItemSeqId"), "surveyId", surveyId) + .orderBy("-responseDate").queryFirst(); } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, @@ -1124,7 +1130,7 @@ public class GiftCertificateServices { GenericValue productStoreEmail = null; String emailType = "PRDS_GC_RELOAD"; try { - productStoreEmail = delegator.findOne("ProductStoreEmailSetting", UtilMisc.toMap("productStoreId", productStoreId, "emailType", emailType), false); + productStoreEmail = EntityQuery.use(delegator).from("ProductStoreEmailSetting").where("productStoreId", productStoreId, "emailType", emailType).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Unable to get product store email setting for gift card purchase", module); } @@ -1296,10 +1302,10 @@ public class GiftCertificateServices { Debug.logVerbose("Created return item : " + returnId + " / " + returnItemSeqId, module); } - // need the admin userLogin to "fake" out the update service + // need the system userLogin to "fake" out the update service GenericValue admin = null; try { - admin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", "admin"), false); + admin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").queryOne(); } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, @@ -1336,7 +1342,7 @@ public class GiftCertificateServices { private static boolean validatePin(Delegator delegator, String cardNumber, String pinNumber) { GenericValue finAccount = null; try { - finAccount = delegator.findOne("FinAccount", UtilMisc.toMap("finAccountId", cardNumber), false); + finAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", cardNumber).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, module); } @@ -1466,7 +1472,7 @@ public class GiftCertificateServices { } private static boolean checkNumberInDatabase(Delegator delegator, String number) throws GenericEntityException { - GenericValue finAccount = delegator.findOne("FinAccount", UtilMisc.toMap("finAccountId", number), false); + GenericValue finAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", number).queryOne(); if (finAccount == null) { return true; } @@ -1482,7 +1488,7 @@ public class GiftCertificateServices { String payToPartyId = "Company"; // default value GenericValue productStore = null; try { - productStore = delegator.findOne("ProductStore", UtilMisc.toMap("productStoreId", productStoreId), false); + productStore = EntityQuery.use(delegator).from("ProductStore").where("productStoreId", productStoreId).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Unable to locate ProductStore (" + productStoreId + ")", module); return null; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1629587&r1=1629586&r2=1629587&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Mon Oct 6 08:07:22 2014 @@ -43,7 +43,6 @@ import org.ofbiz.base.util.UtilNumber; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; -import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -52,6 +51,7 @@ import org.ofbiz.entity.condition.Entity import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.entity.util.EntityListIterator; +import org.ofbiz.entity.util.EntityQuery; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.order.order.OrderChangeHelper; @@ -128,8 +128,7 @@ public class PaymentGatewayServices { GenericValue orderHeader = null; GenericValue orderPaymentPreference = null; try { - orderPaymentPreference = delegator.findOne("OrderPaymentPreference", - UtilMisc.toMap("orderPaymentPreferenceId", orderPaymentPreferenceId), false); + orderPaymentPreference = EntityQuery.use(delegator).from("OrderPaymentPreference").where("orderPaymentPreferenceId", orderPaymentPreferenceId).queryOne(); orderHeader = orderPaymentPreference.getRelatedOne("OrderHeader", false); } catch (GenericEntityException e) { Debug.logError(e, module); @@ -231,9 +230,8 @@ public class PaymentGatewayServices { } if (UtilValidate.isNotEmpty(billToPartyId)) { - otherPaymentMethodAndCreditCardList = delegator.findByAnd("PaymentMethodAndCreditCard", - UtilMisc.toMap("partyId", billToPartyId, "paymentMethodTypeId", "CREDIT_CARD"), null, false); - otherPaymentMethodAndCreditCardList = EntityUtil.filterByDate(otherPaymentMethodAndCreditCardList, true); + otherPaymentMethodAndCreditCardList = EntityQuery.use(delegator).from("PaymentMethodAndCreditCard") + .where("partyId", billToPartyId, "paymentMethodTypeId", "CREDIT_CARD").filterByDate().queryList(); } if (UtilValidate.isNotEmpty(otherPaymentMethodAndCreditCardList)) { @@ -333,16 +331,16 @@ public class PaymentGatewayServices { try { // get the OrderHeader - orderHeader = delegator.findOne("OrderHeader", UtilMisc.toMap("orderId", orderId), false); + orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne(); // get the payments to auth Map<String, String> lookupMap = UtilMisc.toMap("orderId", orderId, "statusId", "PAYMENT_NOT_AUTH"); List<String> orderList = UtilMisc.toList("maxAmount"); - paymentPrefs = delegator.findByAnd("OrderPaymentPreference", lookupMap, orderList, false); + paymentPrefs = EntityQuery.use(delegator).from("OrderPaymentPreference").where(lookupMap).orderBy(orderList).queryList(); if (reAuth) { lookupMap.put("orderId", orderId); lookupMap.put("statusId", "PAYMENT_AUTHORIZED"); - paymentPrefs.addAll(delegator.findByAnd("OrderPaymentPreference", lookupMap, orderList, false)); + paymentPrefs.addAll(EntityQuery.use(delegator).from("OrderPaymentPreference").where(lookupMap).orderBy(orderList).queryList()); } } catch (GenericEntityException gee) { Debug.logError(gee, "Problems getting the order information", module); @@ -716,8 +714,7 @@ public class PaymentGatewayServices { GenericValue paymentPref = null; try { if (orderPaymentPreferenceId != null) { - paymentPref = delegator.findOne("OrderPaymentPreference", - UtilMisc.toMap("orderPaymentPreferenceId", orderPaymentPreferenceId), false); + paymentPref = EntityQuery.use(delegator).from("OrderPaymentPreference").where("orderPaymentPreferenceId", orderPaymentPreferenceId).queryOne(); orderId = paymentPref.getString("orderId"); } else { @@ -743,7 +740,7 @@ public class PaymentGatewayServices { EntityCondition con3 = EntityCondition.makeCondition(UtilMisc.toList(con2, authExpr), EntityOperator.OR); EntityExpr orderExpr = EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId); EntityCondition con4 = EntityCondition.makeCondition(UtilMisc.toList(con3, orderExpr), EntityOperator.AND); - paymentPrefs = delegator.findList("OrderPaymentPreference", con4, null, null, null, false); + paymentPrefs = EntityQuery.use(delegator).from("OrderPaymentPreference").where(con4).queryList(); } catch (GenericEntityException gee) { Debug.logError(gee, "Problems getting entity record(s), see stack trace", module); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_ERROR); @@ -885,7 +882,7 @@ public class PaymentGatewayServices { // Get the OrderPaymentPreference GenericValue paymentPref = null; try { - paymentPref = delegator.findOne("OrderPaymentPreference", UtilMisc.toMap("orderPaymentPreferenceId", orderPaymentPreferenceId), false); + paymentPref = EntityQuery.use(delegator).from("OrderPaymentPreference").where("orderPaymentPreferenceId", orderPaymentPreferenceId).queryOne(); } catch (GenericEntityException e) { Debug.logWarning(e, "Problem getting OrderPaymentPreference for orderPaymentPreferenceId " + orderPaymentPreferenceId, module); @@ -905,7 +902,7 @@ public class PaymentGatewayServices { GenericValue orderHeader = null; String orderId = paymentPref.getString("orderId"); try { - orderHeader = delegator.findOne("OrderHeader", UtilMisc.toMap("orderId", orderId), false); + orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne(); } catch (GenericEntityException e) { Debug.logWarning(e, "Problem getting OrderHeader for orderId " + orderId, module); return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, @@ -1089,7 +1086,7 @@ public class PaymentGatewayServices { // lookup the invoice GenericValue invoice = null; try { - invoice = delegator.findOne("Invoice", UtilMisc.toMap("invoiceId", invoiceId), false); + invoice = EntityQuery.use(delegator).from("Invoice").where("invoiceId", invoiceId).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Trouble looking up Invoice #" + invoiceId, module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -1181,16 +1178,16 @@ public class PaymentGatewayServices { List<GenericValue> paymentPrefsBa = null; try { - orderHeader = delegator.findOne("OrderHeader", UtilMisc.toMap("orderId", orderId), false); + orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne(); // get the payment prefs - Map<String, String> lookupMap = UtilMisc.toMap("orderId", orderId, "statusId", "PAYMENT_AUTHORIZED"); - List<String> orderList = UtilMisc.toList("-maxAmount"); - paymentPrefs = delegator.findByAnd("OrderPaymentPreference", lookupMap, orderList, false); + paymentPrefs = EntityQuery.use(delegator).from("OrderPaymentPreference") + .where("orderId", orderId, "statusId", "PAYMENT_AUTHORIZED").orderBy("-maxAmount").queryList(); if (UtilValidate.isNotEmpty(billingAccountId)) { - lookupMap = UtilMisc.toMap("orderId", orderId, "paymentMethodTypeId", "EXT_BILLACT", "statusId", "PAYMENT_NOT_RECEIVED"); - paymentPrefsBa = delegator.findByAnd("OrderPaymentPreference", lookupMap, orderList, false); + paymentPrefsBa = EntityQuery.use(delegator).from("OrderPaymentPreference") + .where("orderId", orderId, "paymentMethodTypeId", "EXT_BILLACT", "statusId", "PAYMENT_NOT_RECEIVED") + .orderBy("-maxAmount").queryList(); } } catch (GenericEntityException gee) { Debug.logError(gee, "Problems getting entity record(s), see stack trace", module); @@ -1507,7 +1504,7 @@ public class PaymentGatewayServices { try { // Note that the partyIdFrom of the Payment should be the partyIdTo of the invoice, since you're receiving a payment from the party you billed - GenericValue invoice = delegator.findOne("Invoice", UtilMisc.toMap("invoiceId", invoiceId), false); + GenericValue invoice = EntityQuery.use(delegator).from("Invoice").where("invoiceId", invoiceId).queryOne(); Map<String, Object> paymentParams = UtilMisc.<String, Object>toMap("paymentTypeId", "CUSTOMER_PAYMENT", "paymentMethodTypeId", "EXT_BILLACT", "partyIdFrom", invoice.getString("partyId"), "partyIdTo", invoice.getString("partyIdFrom"), "statusId", "PMNT_RECEIVED", "effectiveDate", UtilDateTime.nowTimestamp()); @@ -1534,7 +1531,7 @@ public class PaymentGatewayServices { if (orderId != null && captureAmount.compareTo(BigDecimal.ZERO) > 0) { // Create a paymentGatewayResponse, if necessary - GenericValue order = delegator.findOne("OrderHeader", UtilMisc.toMap("orderId", orderId), false); + GenericValue order = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne(); if (order == null) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingNoPaymentGatewayResponseCreatedForInvoice", @@ -1542,9 +1539,8 @@ public class PaymentGatewayServices { "orderId", orderId), locale)); } // See if there's an orderPaymentPreference - there should be only one OPP for EXT_BILLACT per order - List<GenericValue> orderPaymentPreferences = delegator.findByAnd("OrderPaymentPreference", UtilMisc.toMap("orderId", orderId, "paymentMethodTypeId", "EXT_BILLACT"), null, false); - if (orderPaymentPreferences.size() > 0) { - GenericValue orderPaymentPreference = EntityUtil.getFirst(orderPaymentPreferences); + GenericValue orderPaymentPreference = EntityQuery.use(delegator).from("OrderPaymentPreference").where("orderId", orderId, "paymentMethodTypeId", "EXT_BILLACT").queryFirst(); + if (orderPaymentPreference != null) { // Check the productStore setting to see if we need to do this explicitly GenericValue productStore = order.getRelatedOne("ProductStore", false); @@ -1593,11 +1589,9 @@ public class PaymentGatewayServices { try { // Select all the unapplied payment applications associated to the billing account - List<EntityExpr> conditionList = UtilMisc.toList(EntityCondition.makeCondition("billingAccountId", EntityOperator.EQUALS, billingAccountId), - EntityCondition.makeCondition("invoiceId", EntityOperator.EQUALS, GenericEntity.NULL_FIELD)); - EntityCondition conditions = EntityCondition.makeCondition(conditionList, EntityOperator.AND); - - List<GenericValue> paymentApplications = delegator.findList("PaymentApplication", conditions, null, UtilMisc.toList("-amountApplied"), null, false); + List<GenericValue> paymentApplications = EntityQuery.use(delegator).from("PaymentApplication") + .where("billingAccountId", billingAccountId, "invoiceId", null) + .orderBy("-amountApplied").queryList(); if (UtilValidate.isNotEmpty(paymentApplications)) { Iterator<GenericValue> paymentApplicationsIt = paymentApplications.iterator(); while (paymentApplicationsIt.hasNext()) { @@ -1909,7 +1903,7 @@ public class PaymentGatewayServices { try { String paymentMethodId = orderPaymentPreference.getString("paymentMethodId"); - GenericValue paymentMethod = delegator.findOne("PaymentMethod", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); + GenericValue paymentMethod = EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne(); GenericValue creditCard = null; if (paymentMethod != null && "CREDIT_CARD".equals(paymentMethod.getString("paymentMethodTypeId"))) { creditCard = paymentMethod.getRelatedOne("CreditCard", false); @@ -2046,13 +2040,11 @@ public class PaymentGatewayServices { // and that have resultNsf = Y, ie only consider other NSF responses Long autoOrderCcTryLaterMax = productStore.getLong("autoOrderCcTryLaterMax"); if (autoOrderCcTryLaterMax != null) { - long failedTries = delegator.findCountByCondition("PaymentGatewayResponse", - EntityCondition.makeCondition(UtilMisc.toMap( - "orderPaymentPreferenceId", orderPaymentPreference.get("orderPaymentPreferenceId"), - "paymentMethodId", orderPaymentPreference.get("paymentMethodId"), - "resultNsf", "Y"), - EntityOperator.AND), - null, null); + long failedTries = EntityQuery.use(delegator).from("PaymentGatewayResponse") + .where("orderPaymentPreferenceId", orderPaymentPreference.get("orderPaymentPreferenceId"), + "paymentMethodId", orderPaymentPreference.get("paymentMethodId"), + "resultNsf", "Y") + .queryCount(); if (failedTries < autoOrderCcTryLaterMax.longValue()) { needsNsfRetry = true; } @@ -2282,7 +2274,7 @@ public class PaymentGatewayServices { GenericValue invoice = null; if (invoiceId != null) { try { - invoice = delegator.findOne("Invoice", UtilMisc.toMap("invoiceId", invoiceId), false); + invoice = EntityQuery.use(delegator).from("Invoice").where("invoiceId", invoiceId).queryOne(); } catch (GenericEntityException e) { String message = "Failed to process capture result: Could not find invoice ["+invoiceId+"] due to entity error: " + e.getMessage(); Debug.logError(e, message, module); @@ -2298,14 +2290,13 @@ public class PaymentGatewayServices { } else { // otherwise get the party from the order's OrderRole String orderId = paymentPreference.getString("orderId"); - List<GenericValue> orl = null; + GenericValue orderRole = null; try { - orl = delegator.findByAnd("OrderRole", UtilMisc.toMap("orderId", orderId, "roleTypeId", "BILL_TO_CUSTOMER"), null, false); + orderRole = EntityQuery.use(delegator).from("OrderRole").where("orderId", orderId, "roleTypeId", "BILL_TO_CUSTOMER").queryFirst(); } catch (GenericEntityException e) { Debug.logError(e, module); } - if (UtilValidate.isNotEmpty(orl)) { - GenericValue orderRole = EntityUtil.getFirst(orl); + if (orderRole != null) { partyIdFrom = orderRole.getString("partyId"); } } @@ -2384,7 +2375,7 @@ public class PaymentGatewayServices { Locale locale = (Locale) context.get("locale"); GenericValue orderPaymentPreference = null; try { - orderPaymentPreference = delegator.findOne("OrderPaymentPreference", UtilMisc.toMap("orderPaymentPreferenceId", orderPaymentPreferenceId), false); + orderPaymentPreference = EntityQuery.use(delegator).from("OrderPaymentPreference").where("orderPaymentPreferenceId", orderPaymentPreferenceId).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -2639,7 +2630,7 @@ public class PaymentGatewayServices { // get the order header GenericValue orderHeader = null; try { - orderHeader = delegator.findOne("OrderHeader", UtilMisc.toMap("orderId", orderId), false); + orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.toString()); @@ -2706,8 +2697,11 @@ public class PaymentGatewayServices { EntityListIterator eli = null; try { - eli = delegator.find("OrderPaymentPreference", - EntityCondition.makeCondition(exprs, EntityOperator.AND), null, null, UtilMisc.toList("orderId"), null); + eli = EntityQuery.use(delegator).from("OrderPaymentPreference") + .where(UtilMisc.toList( + EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "PAYMENT_NOT_AUTH"), + EntityCondition.makeCondition("processAttempt", EntityOperator.GREATER_THAN, Long.valueOf(0)))) + .orderBy("orderId").queryIterator(); List<String> processList = FastList.newInstance(); if (eli != null) { Debug.logInfo("Processing failed order re-auth(s)", module); @@ -2753,9 +2747,11 @@ public class PaymentGatewayServices { EntityListIterator eli = null; try { - eli = delegator.find("OrderPaymentPreference", - EntityCondition.makeCondition(EntityCondition.makeCondition("needsNsfRetry", EntityOperator.EQUALS, "Y"), EntityOperator.AND, EntityCondition.makeCondition(ModelEntity.STAMP_FIELD, EntityOperator.LESS_THAN_EQUAL_TO, oneWeekAgo)), - null, null, UtilMisc.toList("orderId"), null); + eli = EntityQuery.use(delegator).from("OrderPaymentPreference") + .where(UtilMisc.toList( + EntityCondition.makeCondition("needsNsfRetry", EntityOperator.EQUALS, "Y"), + EntityCondition.makeCondition(ModelEntity.STAMP_FIELD, EntityOperator.LESS_THAN_EQUAL_TO, oneWeekAgo))) + .orderBy("orderId").queryIterator(); List<String> processList = FastList.newInstance(); if (eli != null) { @@ -3009,7 +3005,7 @@ public class PaymentGatewayServices { // check the payment method; verify type GenericValue paymentMethod; try { - paymentMethod = delegator.findOne("PaymentMethod", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); + paymentMethod = EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); @@ -3031,7 +3027,7 @@ public class PaymentGatewayServices { // get the credit card object GenericValue creditCard; try { - creditCard = delegator.findOne("CreditCard", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); + creditCard = EntityQuery.use(delegator).from("CreditCard").where("paymentMethodId", paymentMethodId).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); @@ -3146,7 +3142,7 @@ public class PaymentGatewayServices { // Get the OrderPaymentPreference GenericValue paymentPref = null; try { - paymentPref = delegator.findOne("OrderPaymentPreference", UtilMisc.toMap("orderPaymentPreferenceId", orderPaymentPreferenceId), false); + paymentPref = EntityQuery.use(delegator).from("OrderPaymentPreference").where("orderPaymentPreferenceId", orderPaymentPreferenceId).queryOne(); } catch (GenericEntityException e) { Debug.logWarning(e, "Problem getting OrderPaymentPreference for orderPaymentPreferenceId " + orderPaymentPreferenceId, module); @@ -3166,7 +3162,7 @@ public class PaymentGatewayServices { GenericValue orderHeader = null; String orderId = paymentPref.getString("orderId"); try { - orderHeader = delegator.findOne("OrderHeader", UtilMisc.toMap("orderId", orderId), false); + orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne(); } catch (GenericEntityException e) { Debug.logWarning(e, "Problem getting OrderHeader for orderId " + orderId, module); return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, @@ -3733,7 +3729,7 @@ public class PaymentGatewayServices { String serviceName = null; GenericValue customMethod = null; try { - customMethod = delegator.findOne("CustomMethod", UtilMisc.toMap("customMethodId", customMethodId), false); + customMethod = EntityQuery.use(delegator).from("CustomMethod").where("customMethodId", customMethodId).queryOne(); if (UtilValidate.isNotEmpty(customMethod)) { serviceName = customMethod.getString("customMethodName"); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=1629587&r1=1629586&r2=1629587&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Mon Oct 6 08:07:22 2014 @@ -35,6 +35,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; +import org.ofbiz.entity.util.EntityQuery; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.security.Security; import org.ofbiz.service.DispatchContext; @@ -73,7 +74,7 @@ public class PaymentMethodServices { GenericValue paymentMethod = null; try { - paymentMethod = delegator.findOne("PaymentMethod", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); + paymentMethod = EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne(); } catch (GenericEntityException e) { Debug.logWarning(e.toString(), module); return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, @@ -213,8 +214,8 @@ public class PaymentMethodServices { GenericValue tempVal = null; try { - List<GenericValue> allPCWPs = delegator.findByAnd("PartyContactWithPurpose", - UtilMisc.toMap("partyId", partyId, "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId), null, false); + List<GenericValue> allPCWPs = EntityQuery.use(delegator).from("PartyContactWithPurpose") + .where("partyId", partyId, "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId).queryList(); allPCWPs = EntityUtil.filterByDate(allPCWPs, null, "contactFromDate", "contactThruDate", true); allPCWPs = EntityUtil.filterByDate(allPCWPs, null, "purposeFromDate", "purposeThruDate", true); tempVal = EntityUtil.getFirst(allPCWPs); @@ -275,8 +276,8 @@ public class PaymentMethodServices { String paymentMethodId = (String) context.get("paymentMethodId"); try { - creditCard = delegator.findOne("CreditCard", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); - paymentMethod = delegator.findOne("PaymentMethod", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); + creditCard = EntityQuery.use(delegator).from("CreditCard").where("paymentMethodId", paymentMethodId).queryOne(); + paymentMethod = EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne(); } catch (GenericEntityException e) { Debug.logWarning(e.getMessage(), module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -388,8 +389,8 @@ public class PaymentMethodServices { GenericValue tempVal = null; try { - List<GenericValue> allPCWPs = delegator.findByAnd("PartyContactWithPurpose", - UtilMisc.toMap("partyId", partyId, "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId), null, false); + List<GenericValue> allPCWPs = EntityQuery.use(delegator).from("PartyContactWithPurpose") + .where("partyId", partyId, "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId).queryList(); allPCWPs = EntityUtil.filterByDate(allPCWPs, null, "contactFromDate", "contactThruDate", true); allPCWPs = EntityUtil.filterByDate(allPCWPs, null, "purposeFromDate", "purposeThruDate", true); @@ -448,7 +449,7 @@ public class PaymentMethodServices { Delegator delegator = dctx.getDelegator(); GenericValue creditCard; try { - creditCard = delegator.findOne("CreditCard", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); + creditCard = EntityQuery.use(delegator).from("CreditCard").where("paymentMethodId", paymentMethodId).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); @@ -563,8 +564,8 @@ public class PaymentMethodServices { String paymentMethodId = (String) context.get("paymentMethodId"); try { - giftCard = delegator.findOne("GiftCard", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); - paymentMethod = delegator.findOne("PaymentMethod", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); + giftCard = EntityQuery.use(delegator).from("GiftCard").where("paymentMethodId", paymentMethodId).queryOne(); + paymentMethod = EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne(); } catch (GenericEntityException e) { Debug.logWarning(e.getMessage(), module); return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, @@ -729,8 +730,8 @@ public class PaymentMethodServices { GenericValue tempVal = null; try { - List<GenericValue> allPCWPs = delegator.findByAnd("PartyContactWithPurpose", - UtilMisc.toMap("partyId", partyId, "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId), null, false); + List<GenericValue> allPCWPs = EntityQuery.use(delegator).from("PartyContactWithPurpose") + .where("partyId", partyId, "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId).queryList(); allPCWPs = EntityUtil.filterByDate(allPCWPs, null, "contactFromDate", "contactThruDate", true); allPCWPs = EntityUtil.filterByDate(allPCWPs, null, "purposeFromDate", "purposeThruDate", true); @@ -795,9 +796,9 @@ public class PaymentMethodServices { String paymentMethodId = (String) context.get("paymentMethodId"); try { - eftAccount = delegator.findOne("EftAccount", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); + eftAccount = EntityQuery.use(delegator).from("EftAccount").where("paymentMethodId", paymentMethodId).queryOne(); paymentMethod = - delegator.findOne("PaymentMethod", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); + EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne(); } catch (GenericEntityException e) { Debug.logWarning(e.getMessage(), module); return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, @@ -858,8 +859,8 @@ public class PaymentMethodServices { GenericValue tempVal = null; try { - List<GenericValue> allPCWPs = delegator.findByAnd("PartyContactWithPurpose", - UtilMisc.toMap("partyId", partyId, "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId), null, false); + List<GenericValue> allPCWPs = EntityQuery.use(delegator).from("PartyContactWithPurpose") + .where("partyId", partyId, "contactMechId", contactMechId, "contactMechPurposeTypeId", contactMechPurposeTypeId).queryList(); allPCWPs = EntityUtil.filterByDate(allPCWPs, null, "contactFromDate", "contactThruDate", true); allPCWPs = EntityUtil.filterByDate(allPCWPs, null, "purposeFromDate", "purposeThruDate", true); tempVal = EntityUtil.getFirst(allPCWPs); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java?rev=1629587&r1=1629586&r2=1629587&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java Mon Oct 6 08:07:22 2014 @@ -39,6 +39,7 @@ import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityExpr; import org.ofbiz.entity.condition.EntityOperator; +import org.ofbiz.entity.util.EntityQuery; import org.ofbiz.entity.util.EntityUtil; @@ -59,7 +60,7 @@ public class PaymentWorker { public static List<Map<String, GenericValue>> getPartyPaymentMethodValueMaps(Delegator delegator, String partyId, Boolean showOld) { List<Map<String, GenericValue>> paymentMethodValueMaps = FastList.newInstance(); try { - List<GenericValue> paymentMethods = delegator.findByAnd("PaymentMethod", UtilMisc.toMap("partyId", partyId), null, false); + List<GenericValue> paymentMethods = EntityQuery.use(delegator).from("PaymentMethod").where("partyId", partyId).queryList(); if (!showOld) paymentMethods = EntityUtil.filterByDate(paymentMethods, true); @@ -113,10 +114,10 @@ public class PaymentWorker { if (UtilValidate.isNotEmpty(paymentMethodId)) { try { - paymentMethod = delegator.findOne("PaymentMethod", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); - creditCard = delegator.findOne("CreditCard", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); - giftCard = delegator.findOne("GiftCard", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); - eftAccount = delegator.findOne("EftAccount", UtilMisc.toMap("paymentMethodId", paymentMethodId), false); + paymentMethod = EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne(); + creditCard = EntityQuery.use(delegator).from("CreditCard").where("paymentMethodId", paymentMethodId).queryOne(); + giftCard = EntityQuery.use(delegator).from("GiftCard").where("paymentMethodId", paymentMethodId).queryOne(); + eftAccount = EntityQuery.use(delegator).from("EftAccount").where("paymentMethodId", paymentMethodId).queryOne(); } catch (GenericEntityException e) { Debug.logWarning(e, module); } @@ -156,23 +157,21 @@ public class PaymentWorker { } public static GenericValue getPaymentAddress(Delegator delegator, String partyId) { - List<GenericValue> paymentAddresses = null; + GenericValue purpose = null; try { - paymentAddresses = delegator.findByAnd("PartyContactWithPurpose", - UtilMisc.toMap("partyId", partyId, "contactMechPurposeTypeId", "PAYMENT_LOCATION"), - UtilMisc.toList("-purposeFromDate"), false); - paymentAddresses = EntityUtil.filterByDate(paymentAddresses, null, "contactFromDate", "contactThruDate", true); - paymentAddresses = EntityUtil.filterByDate(paymentAddresses, null, "purposeFromDate", "purposeThruDate", true); + purpose = EntityQuery.use(delegator).from("PartyContactWithPurpose") + .where("partyId", partyId, "contactMechPurposeTypeId", "PAYMENT_LOCATION") + .orderBy("-purposeFromDate").filterByDate("contactFromDate", "contactThruDate", "purposeFromDate", "purposeThruDate") + .queryFirst(); } catch (GenericEntityException e) { Debug.logError(e, "Trouble getting PartyContactWithPurpose view entity list", module); } // get the address for the primary contact mech - GenericValue purpose = EntityUtil.getFirst(paymentAddresses); GenericValue postalAddress = null; if (purpose != null) { try { - postalAddress = delegator.findOne("PostalAddress", UtilMisc.toMap("contactMechId", purpose.getString("contactMechId")), false); + postalAddress = EntityQuery.use(delegator).from("PostalAddress").where("contactMechId", purpose.getString("contactMechId")).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Trouble getting PostalAddress record for contactMechId: " + purpose.getString("contactMechId"), module); } @@ -217,7 +216,7 @@ public class PaymentWorker { GenericValue payment = null; try { - payment = delegator.findOne("Payment", UtilMisc.toMap("paymentId", paymentId), false); + payment = EntityQuery.use(delegator).from("Payment").where("paymentId", paymentId).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Problem getting Payment", module); } @@ -237,7 +236,7 @@ public class PaymentWorker { GenericValue paymentApplication = null; BigDecimal appliedAmount = BigDecimal.ZERO; try { - paymentApplication = delegator.findOne("PaymentApplication", UtilMisc.toMap("paymentApplicationId", paymentApplicationId), false); + paymentApplication = EntityQuery.use(delegator).from("PaymentApplication").where("paymentApplicationId", paymentApplicationId).queryOne(); appliedAmount = paymentApplication.getBigDecimal("amountApplied"); if (paymentApplication.get("paymentId") != null) { GenericValue payment = paymentApplication.getRelatedOne("Payment", false); @@ -323,7 +322,7 @@ public class PaymentWorker { GenericValue payment = null; try { - payment = delegator.findOne("Payment", UtilMisc.toMap("paymentId", paymentId), false); + payment = EntityQuery.use(delegator).from("Payment").where("paymentId", paymentId).queryOne(); } catch (GenericEntityException e) { Debug.logError(e, "Problem getting Payment", module); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceForms.xml?rev=1629587&r1=1629586&r2=1629587&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceForms.xml Mon Oct 6 08:07:22 2014 @@ -73,7 +73,6 @@ under the License. .multiply(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceCurrencyConversionRate(delegator,invoiceId))}"/> <set field="total" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId) .multiply(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceCurrencyConversionRate(delegator,invoiceId))}"/> - <set field="currencyUomId" from-field="defaultOrganizationPartyCurrencyUomId"/> </row-actions> <field name="invoiceId" widget-style="buttontext" sort-field="true"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1629587&r1=1629586&r2=1629587&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Mon Oct 6 08:07:22 2014 @@ -1017,7 +1017,7 @@ public class DataResourceWorker impleme } byte[] bytes = text.getBytes(); - return UtilMisc.toMap("stream", new ByteArrayInputStream(bytes), "length", Integer.valueOf(bytes.length)); + return UtilMisc.toMap("stream", new ByteArrayInputStream(bytes), "length", Long.valueOf(bytes.length)); // object (binary) data } else if (dataResourceTypeId.endsWith("_OBJECT")) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=1629587&r1=1629586&r2=1629587&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Mon Oct 6 08:07:22 2014 @@ -20,92 +20,6 @@ under the License. <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd";> - <simple-method method-name="createProdCatalog" short-description="Create an ProdCatalog"> - <make-value value-field="newEntity" entity-name="ProdCatalog"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - - <if-empty field="parameters.prodCatalogId"> - <sequenced-id sequence-name="ProdCatalog" field="newEntity.prodCatalogId"/> - <else> - <set field="newEntity.prodCatalogId" from-field="parameters.prodCatalogId"/> - <check-id field="newEntity.prodCatalogId"/> - <check-errors/> - </else> - </if-empty> - <field-to-result field="newEntity.prodCatalogId" result-name="prodCatalogId"/> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateProdCatalog" short-description="Update an ProdCatalog"> - <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> - <set-nonpk-fields map="parameters" value-field="prodCatalog"/> - <store-value value-field="prodCatalog"/> - </simple-method> - <simple-method method-name="deleteProdCatalog" short-description="Delete an ProdCatalog"> - <entity-one entity-name="ProdCatalog" value-field="prodCatalog"/> - <remove-value value-field="prodCatalog"/> - </simple-method> - - <simple-method method-name="addProductCategoryToProdCatalog" short-description="Add Category To ProdCatalog"> - <!-- Check that the ProductCategory exists --> - <entity-one entity-name="ProductCategory" value-field="productCategory"/> - <if-empty field="productCategory"> - <add-error><fail-property resource="ProductUiLabels" property="ProductCategoryNotFoundForCategoryID"/></add-error> - </if-empty> - <check-errors/> - - <make-value value-field="newEntity" entity-name="ProdCatalogCategory"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - - <if-empty field="newEntity.fromDate"> - <now-timestamp field="nowTimestamp"/> - <set from-field="nowTimestamp" field="newEntity.fromDate"/> - </if-empty> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateProductCategoryToProdCatalog" short-description="Remove ContactMech From ProdCatalog"> - - <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="ProdCatalogCategory" map="lookupPKMap" value-field="prodCatalogCategory"/> - <set-nonpk-fields map="parameters" value-field="prodCatalogCategory"/> - <store-value value-field="prodCatalogCategory"/> - </simple-method> - <simple-method method-name="removeProductCategoryFromProdCatalog" short-description="Remove ContactMech From ProdCatalog"> - - <make-value value-field="lookupPKMap" entity-name="ProdCatalogCategory"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="ProdCatalogCategory" map="lookupPKMap" value-field="prodCatalogCategory"/> - <remove-value value-field="prodCatalogCategory"/> - </simple-method> - - <!-- Party and Catalog services --> - <simple-method method-name="addProdCatalogToParty" short-description="Add ProdCatalog To Party"> - <make-value value-field="newEntity" entity-name="ProdCatalogRole"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - - <if-empty field="newEntity.fromDate"> - <now-timestamp field="newEntity.fromDate"/> - </if-empty> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateProdCatalogToParty" short-description="Update ProdCatalog To Party"> - <make-value value-field="lookupPKMap" entity-name="ProdCatalogRole"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="ProdCatalogRole" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="removeProdCatalogFromParty" short-description="Remove ProdCatalog From Party"> - <make-value value-field="lookupPKMap" entity-name="ProdCatalogRole"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="ProdCatalogRole" map="lookupPKMap" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="getAllCategories" short-description="get All categories" login-required="false"> <if-not-empty field="parameters.topCategory"> @@ -127,6 +41,7 @@ under the License. <log level="info" message="=========${category.productCategoryId}"/> </iterate --> </simple-method> + <simple-method method-name="getRelatedCategories" short-description="get All Related categories" login-required="false"> <set value="sequenceNum" field="orderByString"/> <field-to-list list="orderByStringList" field="orderByString"/> @@ -182,6 +97,7 @@ under the License. </iterate --> <field-to-result result-name="categories" field="categories"/> </simple-method> + <simple-method method-name="checkImageUrlForAllCategories" short-description="Check for image url exists or not for All categories" login-required="false"> <!-- Get all the categories from top category --> <set-service-fields to-map="categoryFindContext" service-name="getAllCategories" map="parameters"/> @@ -401,6 +317,7 @@ under the License. <field-to-result field="filesImageMap" result-name="filesImageMap"/> </if-not-empty> </simple-method> + <simple-method method-name="checkImageUrlForProduct" short-description="Check for image url exists or not for product" login-required="false"> <if-not-empty field="parameters.productId"> <set field="productFindContext.productId" from-field="parameters.productId"/> @@ -466,8 +383,8 @@ under the License. <!-- set-service-fields service-name="updateProduct" map-name="product" to-map-name="updateProductContext"/> <call-service service-name="updateProduct" in-map-name="updateProductContext" / --> </if-not-empty> - </simple-method> + <!-- get file image url and return Y or N --> <simple-method method-name="checkImageUrl" short-description="Check for image url exists or not" login-required="false"> <set field="imageUrl" from-field="parameters.imageUrl"/> @@ -530,7 +447,7 @@ under the License. <entity-and list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="false"> <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> </entity-and> - + <!-- Get all categories --> <call-class-method method-name="newInstance" class-name="javolution.util.FastList" ret-field="parameters.productCategories"/> <iterate entry="prodCatalogCategory" list="prodCatalogCategoryList"> @@ -541,9 +458,8 @@ under the License. <set field="parameters.parentProductCategoryId" from-field="rootProductCategoryId"/> <call-simple-method method-name="createMissingCategoryAltUrlInline"/> </iterate> - + <iterate entry="productCategoryList" list="parameters.productCategories"> - <!-- Create Product Category Alternative URLs --> <if-empty field="category"> <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true"> @@ -598,7 +514,7 @@ under the License. </else> </if-empty> </if-empty> - + <!-- Create Product Alternative URLs --> <if-empty field="product"> <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true"> @@ -659,6 +575,7 @@ under the License. <field-to-result field="categoriesUpdated" result-name="categoriesUpdated"/> <field-to-result field="productsUpdated" result-name="productsUpdated"/> </simple-method> + <simple-method method-name="createMissingCategoryAltUrlInline" short-description="create missing category alternative inline"> <entity-and list="productCategoryRollups" entity-name="ProductCategoryRollup" filter-by-date="true"> <field-map field-name="parentProductCategoryId" from-field="parameters.parentProductCategoryId"/> @@ -669,7 +586,6 @@ under the License. <field-map field-name="productCategoryId" from-field="productCategoryRollup.productCategoryId"/> </entity-one> <field-to-list list="parameters.productCategories" field="productCategory"/> - <!-- find rollup product categories --> <set field="parameters.parentProductCategoryId" from-field="productCategoryRollup.productCategoryId"/> <call-simple-method method-name="createMissingCategoryAltUrlInline"/>
