[ofbiz-framework] branch trunk updated: Improved: Corrected remaining ', is not followed by whitespace' checkstyle errors in framework component. (OFBIZ-11805)
Locked
 
|
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 749d4d6 Improved: Corrected remaining ', is not followed by whitespace' checkstyle errors in framework component. (OFBIZ-11805) 749d4d6 is described below commit 749d4d6d94a4dcff9d80a7089e35d9cbbca9e7bd Author: Suraj Khurana <[hidden email]> AuthorDate: Tue Jul 7 15:25:15 2020 +0530 Improved: Corrected remaining ', is not followed by whitespace' checkstyle errors in framework component. (OFBIZ-11805) --- .../ofbiz/accounting/invoice/InvoiceServices.java | 20 ++-- .../ofbiz/accounting/invoice/InvoiceWorker.java | 6 +- .../ofbiz/accounting/payment/PaymentWorker.java | 8 +- .../authorizedotnet/AIMPaymentServices.java | 6 +- .../content/content/ContentSearchSession.java | 2 +- .../ofbiz/content/content/ContentWorker.java | 12 +-- .../ofbiz/content/survey/PdfSurveyServices.java | 4 +- .../webapp/ftl/TraverseSubContentTransform.java | 6 +- .../jobshopmgt/ProductionRunHelper.java | 6 +- .../jobshopmgt/ProductionRunServices.java | 8 +- .../manufacturing/techdata/TechDataServices.java | 10 +- .../ofbiz/order/order/OrderChangeHelper.java | 4 +- .../apache/ofbiz/order/order/OrderReadHelper.java | 2 +- .../ofbiz/order/order/OrderReturnServices.java | 6 +- .../apache/ofbiz/order/order/OrderServices.java | 104 ++++++++++----------- .../apache/ofbiz/order/quote/QuoteServices.java | 2 +- .../ofbiz/order/shoppingcart/CheckOutEvents.java | 2 +- .../ofbiz/order/shoppingcart/ShoppingCart.java | 16 ++-- .../order/shoppingcart/ShoppingCartEvents.java | 2 +- .../order/shoppingcart/ShoppingCartHelper.java | 18 ++-- .../ofbiz/order/shoppingcart/ShoppingCartItem.java | 18 ++-- .../order/shoppingcart/ShoppingCartServices.java | 22 ++--- .../shoppingcart/product/ProductPromoWorker.java | 8 +- .../shoppingcart/shipping/ShippingEvents.java | 2 +- .../order/shoppinglist/ShoppingListServices.java | 12 +-- .../thirdparty/zipsales/ZipSalesServices.java | 16 ++-- .../ofbiz/product/config/ProductConfigWrapper.java | 4 +- .../ofbiz/product/imagemanagement/RotateImage.java | 2 +- .../ofbiz/product/inventory/InventoryServices.java | 2 +- .../ofbiz/product/product/ProductWorker.java | 2 +- .../ofbiz/product/store/ProductStoreWorker.java | 2 +- .../product/supplier/SupplierProductServices.java | 2 +- .../ofbiz/shipment/shipment/ShipmentServices.java | 2 +- .../ofbiz/shipment/thirdparty/ups/UpsServices.java | 4 +- .../workeffort/workeffort/WorkEffortSearch.java | 6 +- .../workeffort/WorkEffortSearchSession.java | 4 +- 36 files changed, 176 insertions(+), 176 deletions(-) diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java index 7a889c3..605878b 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java @@ -1100,7 +1100,7 @@ public class InvoiceServices { resMap = dispatcher.runSync("createInvoiceItem", UtilMisc.toMap("invoiceId", invoiceId, "productId", commissionMap.get("productId"), "invoiceItemTypeId", "COMM_INV_ITEM", - "quantity",quantity, + "quantity", quantity, "amount", elemAmount, "userLogin", userLogin)); if (ServiceUtil.isError(resMap)) { @@ -1133,7 +1133,7 @@ public class InvoiceServices { "AccountingInvoiceCommissionEntityDataProblem", UtilMisc.toMap("reason", e.toString()), locale)); } - invoicesCreated.add(UtilMisc.<String, String>toMap("commissionInvoiceId",invoiceId, "salesRepresentative ",partyIdBillFrom)); + invoicesCreated.add(UtilMisc.<String, String>toMap("commissionInvoiceId", invoiceId, "salesRepresentative ", partyIdBillFrom)); } String invCreated = Integer.toString(invoicesCreated.size()); Map<String, Object> result = ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, @@ -2007,7 +2007,7 @@ public class InvoiceServices { String returnId= (String) context.get("returnId"); List<GenericValue> billItems = UtilGenerics.cast(context.get("billItems")); - String errorMsg = UtilProperties.getMessage(RESOURCE, "AccountingErrorCreatingInvoiceForReturn",UtilMisc.toMap("returnId",returnId),locale); + String errorMsg = UtilProperties.getMessage(RESOURCE, "AccountingErrorCreatingInvoiceForReturn",UtilMisc.toMap("returnId", returnId), locale); // List invoicesCreated = new ArrayList(); try { String invoiceTypeId; @@ -2856,7 +2856,7 @@ public class InvoiceServices { if (currencyUomId != null && invoice.get("currencyUomId") != null && !currencyUomId.equals(invoice.getString("currencyUomId"))) { Debug.logInfo(UtilProperties.getMessage(RESOURCE, "AccountingInvoicePaymentCurrencyProblem", - UtilMisc.toMap("invoiceCurrency", invoice.getString("currencyUomId"), "paymentCurrency", payment.getString("currencyUomId")),locale), MODULE); + UtilMisc.toMap("invoiceCurrency", invoice.getString("currencyUomId"), "paymentCurrency", payment.getString("currencyUomId")), locale), MODULE); Debug.logInfo("will try to apply payment on the actualCurrency amount on payment", MODULE); if (payment.get("actualCurrencyAmount") == null || payment.get("actualCurrencyUomId") == null) { @@ -3226,7 +3226,7 @@ public class InvoiceServices { paymentApplication.set("amountApplied", amountApplied); paymentApplication.set("billingAccountId", billingAccountId); paymentApplication.set("taxAuthGeoId", taxAuthGeoId); - return storePaymentApplication(delegator, paymentApplication,locale); + return storePaymentApplication(delegator, paymentApplication, locale); } // if no invoice sequence number is provided it assumed the requested paymentAmount will be @@ -3239,7 +3239,7 @@ public class InvoiceServices { Debug.logInfo("Try to allocate the payment to the invoice as a whole", MODULE); } paymentApplication.set("paymentId", paymentId); - paymentApplication.set("toPaymentId",null); + paymentApplication.set("toPaymentId", null); paymentApplication.set("invoiceId", invoiceId); paymentApplication.set("invoiceItemSeqId", null); paymentApplication.set("toPaymentId", null); @@ -3249,7 +3249,7 @@ public class InvoiceServices { if (debug) { Debug.logInfo("creating new paymentapplication", MODULE); } - return storePaymentApplication(delegator, paymentApplication,locale); + return storePaymentApplication(delegator, paymentApplication, locale); } if (debug) { Debug.logInfo("Try to allocate the payment to the itemnumbers of the invoice", MODULE); @@ -3336,7 +3336,7 @@ public class InvoiceServices { paymentApplication.set("amountApplied", tobeApplied); paymentApplication.set("billingAccountId", billingAccountId); paymentApplication.set("taxAuthGeoId", taxAuthGeoId); - storePaymentApplication(delegator, paymentApplication,locale); + storePaymentApplication(delegator, paymentApplication, locale); } } @@ -3360,7 +3360,7 @@ public class InvoiceServices { paymentApplication.set("amountApplied", amountApplied); paymentApplication.set("billingAccountId", billingAccountId); paymentApplication.set("taxAuthGeoId", taxAuthGeoId); - return storePaymentApplication(delegator, paymentApplication,locale); + return storePaymentApplication(delegator, paymentApplication, locale); } @@ -3476,7 +3476,7 @@ public class InvoiceServices { } } else { if (debug) { - Debug.logInfo("No records found with paymentId,invoiceid..etc probaly changed one of them...", MODULE); + Debug.logInfo("No records found with paymentId, invoiceid..etc probaly changed one of them...", MODULE); } // create record if ID null; if (paymentApplication.get("paymentApplicationId") == null) { diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java index 8c78fb3..c17d237 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java @@ -157,7 +157,7 @@ public final class InvoiceWorker { } } if (UtilValidate.isEmpty(description)) { - description = (String) invoiceItem.getRelatedOne("InvoiceItemType", true).get("description",locale); + description = (String) invoiceItem.getRelatedOne("InvoiceItemType", true).get("description", locale); } return description; } @@ -614,10 +614,10 @@ public final class InvoiceWorker { GenericValue payment = paymentAppl.getRelatedOne("Payment", false); if (UtilValidate.isNotEmpty(payment.getBigDecimal("actualCurrencyAmount"))) { if (UtilValidate.isEmpty(conversionRate)) { - conversionRate = payment.getBigDecimal("amount").divide(payment.getBigDecimal("actualCurrencyAmount"),new MathContext(100)).setScale(DECIMALS, ROUNDING); + conversionRate = payment.getBigDecimal("amount").divide(payment.getBigDecimal("actualCurrencyAmount"), new MathContext(100)).setScale(DECIMALS, ROUNDING); } else { conversionRate = conversionRate.add(payment.getBigDecimal("amount").divide(payment.getBigDecimal("actualCurrencyAmount"), - new MathContext(100))).divide(new BigDecimal("2"),new MathContext(100)).setScale(DECIMALS, ROUNDING); + new MathContext(100))).divide(new BigDecimal("2"), new MathContext(100)).setScale(DECIMALS, ROUNDING); } } } diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java index 513fedb..3022646 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java @@ -278,7 +278,7 @@ public final class PaymentWorker { if (paymentApplication.get("invoiceId") != null && payment.get("actualCurrencyAmount") != null && payment.get("actualCurrencyUomId") != null) { GenericValue invoice = paymentApplication.getRelatedOne("Invoice", false); if (payment.getString("actualCurrencyUomId").equals(invoice.getString("currencyUomId"))) { - appliedAmount = appliedAmount.multiply(payment.getBigDecimal("amount")).divide(payment.getBigDecimal("actualCurrencyAmount"),new MathContext(100)); + appliedAmount = appliedAmount.multiply(payment.getBigDecimal("amount")).divide(payment.getBigDecimal("actualCurrencyAmount"), new MathContext(100)); } } } @@ -320,7 +320,7 @@ public final class PaymentWorker { if (actual.equals(Boolean.FALSE) && paymentApplication.get("invoiceId") != null && payment.get("actualCurrencyAmount") != null && payment.get("actualCurrencyUomId") != null) { GenericValue invoice = paymentApplication.getRelatedOne("Invoice", false); if (payment.getString("actualCurrencyUomId").equals(invoice.getString("currencyUomId"))) { - amountApplied = amountApplied.multiply(payment.getBigDecimal("amount")).divide(payment.getBigDecimal("actualCurrencyAmount"),new MathContext(100)); + amountApplied = amountApplied.multiply(payment.getBigDecimal("amount")).divide(payment.getBigDecimal("actualCurrencyAmount"), new MathContext(100)); } } paymentApplied = paymentApplied.add(amountApplied).setScale(DECIMALS, ROUNDING_MODE); @@ -347,7 +347,7 @@ public final class PaymentWorker { } public static BigDecimal getPaymentNotApplied(Delegator delegator, String paymentId) { - return getPaymentNotApplied(delegator,paymentId, false); + return getPaymentNotApplied(delegator, paymentId, false); } public static BigDecimal getPaymentNotApplied(Delegator delegator, String paymentId, Boolean actual) { @@ -365,6 +365,6 @@ public final class PaymentWorker { if (payment == null) { throw new IllegalArgumentException("The paymentId passed does not match an existing payment"); } - return payment.getBigDecimal("amount").subtract(getPaymentApplied(delegator,paymentId, actual)).setScale(DECIMALS, ROUNDING_MODE); + return payment.getBigDecimal("amount").subtract(getPaymentApplied(delegator, paymentId, actual)).setScale(DECIMALS, ROUNDING_MODE); } } diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java index 5f69c3d..e896cc3 100644 --- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java +++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java @@ -108,7 +108,7 @@ public class AIMPaymentServices { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue creditCard = null; try { - creditCard = delegator.getRelatedOne("CreditCard",orderPaymentPreference, false); + creditCard = delegator.getRelatedOne("CreditCard", orderPaymentPreference, false); } catch (GenericEntityException e) { Debug.logError(e, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, @@ -133,7 +133,7 @@ public class AIMPaymentServices { // CAPTURE_ONLY is a "force" transaction to be used if there is no prior authorization props.put("transType", "PRIOR_AUTH_CAPTURE"); props.put("cardtype", creditCard.get("cardType")); - buildCaptureTransaction(context,props,request); + buildCaptureTransaction(context, props, request); Map<String, Object> validateResults = validateRequest(context, props, request); String respMsg = (String)validateResults.get(ModelService.RESPONSE_MESSAGE); if (ModelService.RESPOND_ERROR.equals(respMsg)) { @@ -448,7 +448,7 @@ public class AIMPaymentServices { AIMRequest.put("x_Tran_Key", props.getProperty("trankey")); } else { // only send password if no tran key - AIMRequest.put("x_Password",props.getProperty("password")); + AIMRequest.put("x_Password", props.getProperty("password")); } // api version (non Card Present) diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java index a807937..0935adf 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentSearchSession.java @@ -189,7 +189,7 @@ public class ContentSearchSession { String contentId=(String) parameters.get("SEARCH_CONTENT_ID"); String contentAssocTypeId=(String) parameters.get("contentAssocTypeId"); boolean includeAllSubContents =!"N".equalsIgnoreCase((String) parameters.get("SEARCH_SUB_CONTENTS")); - searchAddConstraint(new ContentSearch.ContentAssocConstraint(contentId, contentAssocTypeId,includeAllSubContents), session); + searchAddConstraint(new ContentSearch.ContentAssocConstraint(contentId, contentAssocTypeId, includeAllSubContents), session); constraintsChanged = true; } diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java index b56e28f..5e9dc56 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java @@ -559,7 +559,7 @@ public class ContentWorker implements org.apache.ofbiz.widget.content.ContentWor public static boolean traverseSubContent(Map<String, Object> ctx) { boolean inProgress = false; List<Map <String, Object>> nodeTrail = UtilGenerics.cast(ctx.get("nodeTrail")); - ContentWorker.traceNodeTrail("11",nodeTrail); + ContentWorker.traceNodeTrail("11", nodeTrail); int sz = nodeTrail.size(); if (sz == 0) { return false; @@ -576,14 +576,14 @@ public class ContentWorker implements org.apache.ofbiz.widget.content.ContentWor int idx = 0; while (idx < kids.size()) { currentNode = kids.get(idx); - ContentWorker.traceNodeTrail("12",nodeTrail); + ContentWorker.traceNodeTrail("12", nodeTrail); Boolean isPick = (Boolean)currentNode.get("isPick"); if (isPick != null && isPick) { nodeTrail.add(currentNode); inProgress = true; selectKids(currentNode, ctx); - ContentWorker.traceNodeTrail("14",nodeTrail); + ContentWorker.traceNodeTrail("14", nodeTrail); break; } else { Boolean isFollow = (Boolean)currentNode.get("isFollow"); @@ -604,7 +604,7 @@ public class ContentWorker implements org.apache.ofbiz.widget.content.ContentWor // look for next sibling while (sz > 1) { currentNode = nodeTrail.remove(--sz); - ContentWorker.traceNodeTrail("15",nodeTrail); + ContentWorker.traceNodeTrail("15", nodeTrail); Map<String, Object> parentNode = nodeTrail.get(sz - 1); kids = UtilGenerics.cast(parentNode.get("kids")); if (kids == null) { @@ -620,12 +620,12 @@ public class ContentWorker implements org.apache.ofbiz.widget.content.ContentWor continue; } nodeTrail.add(currentNode); - ContentWorker.traceNodeTrail("16",nodeTrail); + ContentWorker.traceNodeTrail("16", nodeTrail); Boolean isPick = (Boolean)currentNode.get("isPick"); if (isPick == null || !isPick) { // If not a "pick" node, look at kids inProgress = traverseSubContent(ctx); - ContentWorker.traceNodeTrail("17",nodeTrail); + ContentWorker.traceNodeTrail("17", nodeTrail); if (inProgress) { break; } diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java index a729d29..d31116f 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java @@ -244,7 +244,7 @@ public class PdfSurveyServices { ByteArrayOutputStream os = new ByteArrayOutputStream(); ByteBuffer byteBuffer = getInputByteBuffer(context, delegator); PdfReader r = new PdfReader(byteBuffer.array()); - PdfStamper s = new PdfStamper(r,os); + PdfStamper s = new PdfStamper(r, os); AcroFields fs = s.getAcroFields(); Map<String, Object> hm = UtilGenerics.cast(fs.getFields()); s.setFormFlattening(true); @@ -289,7 +289,7 @@ public class PdfSurveyServices { Delegator delegator = dctx.getDelegator(); ByteBuffer byteBuffer = getInputByteBuffer(context, delegator); PdfReader r = new PdfReader(byteBuffer.array()); - PdfStamper s = new PdfStamper(r,os); + PdfStamper s = new PdfStamper(r, os); AcroFields fs = s.getAcroFields(); Map<String, Object> map = UtilGenerics.cast(fs.getFields()); s.setFormFlattening(true); diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java index 388b3c6..0975631 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java @@ -181,12 +181,12 @@ public class TraverseSubContentTransform implements TemplateTransformModel { @Override public int afterBody() throws TemplateModelException, IOException { List<Map<String, Object>> nodeTrail = UtilGenerics.cast(traverseContext.get("nodeTrail")); - ContentWorker.traceNodeTrail("6",nodeTrail); + ContentWorker.traceNodeTrail("6", nodeTrail); boolean inProgress = ContentWorker.traverseSubContent(traverseContext); - ContentWorker.traceNodeTrail("7",nodeTrail); + ContentWorker.traceNodeTrail("7", nodeTrail); if (inProgress) { populateContext(traverseContext, templateCtx); - ContentWorker.traceNodeTrail("8",nodeTrail); + ContentWorker.traceNodeTrail("8", nodeTrail); return TransformControl.REPEAT_EVALUATION; } else return TransformControl.END_EVALUATION; diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java index 2177934..acc8e31 100644 --- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java +++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java @@ -58,11 +58,11 @@ public final class ProductionRunHelper { if (productionRunId != null) { GenericValue productionRun = EntityQuery.use(delegator).from("WorkEffort").where("workEffortId", productionRunId).queryOne(); if (productionRun != null) { - List<GenericValue> productionRunProducts = productionRun.getRelated("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUN_PROD_DELIV"),null, false); + List<GenericValue> productionRunProducts = productionRun.getRelated("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUN_PROD_DELIV"), null, false); GenericValue productionRunProduct = EntityUtil.getFirst(productionRunProducts); GenericValue productProduced = productionRunProduct.getRelatedOne("Product", true); - List<GenericValue> productionRunComponents = productionRun.getRelated("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUNT_PROD_NEEDED"),null, false); - List<GenericValue> productionRunRoutingTasks = productionRun.getRelated("FromWorkEffortAssoc",UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"),null, false); + List<GenericValue> productionRunComponents = productionRun.getRelated("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUNT_PROD_NEEDED"), null, false); + List<GenericValue> productionRunRoutingTasks = productionRun.getRelated("FromWorkEffortAssoc",UtilMisc.toMap("workEffortTypeId","PROD_ORDER_TASK"), null, false); result.put("productionRunProduct", productionRunProduct); result.put("productProduced", productProduced); result.put("productionRunComponents", productionRunComponents); diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java index acd4a06..c9af897 100644 --- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java +++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java @@ -327,9 +327,9 @@ public class ProductionRunServices { serviceContext.clear(); serviceContext.put("priority", routingTaskAssoc.get("sequenceNum")); serviceContext.put("workEffortPurposeTypeId", "WEPT_PRODUCTION_RUN"); - serviceContext.put("workEffortName",routingTask.get("workEffortName")); - serviceContext.put("description",routingTask.get("description")); - serviceContext.put("fixedAssetId",routingTask.get("fixedAssetId")); + serviceContext.put("workEffortName", routingTask.get("workEffortName")); + serviceContext.put("description", routingTask.get("description")); + serviceContext.put("fixedAssetId", routingTask.get("fixedAssetId")); serviceContext.put("workEffortTypeId", "PROD_ORDER_TASK"); serviceContext.put("currentStatusId","PRUN_CREATED"); serviceContext.put("workEffortParentId", productionRunId); @@ -416,7 +416,7 @@ public class ProductionRunServices { // update the estimatedCompletionDate field for the productionRun serviceContext.clear(); - serviceContext.put("workEffortId",productionRunId); + serviceContext.put("workEffortId", productionRunId); serviceContext.put("estimatedCompletionDate",startDate); serviceContext.put("userLogin", userLogin); serviceResult = null; diff --git a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java index 09a8495..ccc1a23 100644 --- a/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java +++ b/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java @@ -315,7 +315,7 @@ public class TechDataServices { Map<String, Object> position = dayStartCapacityAvailable(techDataCalendarWeek, cDateTrav.get(Calendar.DAY_OF_WEEK)); Time startTime = (Time) position.get("startTime"); int moveDay = (Integer) position.get("moveDay"); - dateTo = (moveDay == 0) ? dateFrom : UtilDateTime.getDayStart(dateFrom,moveDay); + dateTo = (moveDay == 0) ? dateFrom : UtilDateTime.getDayStart(dateFrom, moveDay); Timestamp startAvailablePeriod = new Timestamp(UtilDateTime.getDayStart(dateTo).getTime() + startTime.getTime() + cDateTrav.get(Calendar.ZONE_OFFSET) + cDateTrav.get(Calendar.DST_OFFSET)); if (dateTo.before(startAvailablePeriod)) { dateTo = startAvailablePeriod; @@ -326,11 +326,11 @@ public class TechDataServices { position = dayStartCapacityAvailable(techDataCalendarWeek, cDateTrav.get(Calendar.DAY_OF_WEEK)); startTime = (Time) position.get("startTime"); moveDay = (Integer) position.get("moveDay"); - if (moveDay != 0) dateTo = UtilDateTime.getDayStart(dateTo,moveDay); + if (moveDay != 0) dateTo = UtilDateTime.getDayStart(dateTo, moveDay); dateTo.setTime(dateTo.getTime() + startTime.getTime() + cDateTrav.get(Calendar.ZONE_OFFSET) + cDateTrav.get(Calendar.DST_OFFSET)); } result.put("dateTo", dateTo); - result.put("nextCapacity",position.get("capacity")); + result.put("nextCapacity", position.get("capacity")); return result; } /** Used to move forward in a TechDataCalenda, start from the dateFrom and move forward only on available period. @@ -482,11 +482,11 @@ public class TechDataServices { startTime = (Time) position.get("startTime"); moveDay = (Integer) position.get("moveDay"); capacity = (Double) position.get("capacity"); - if (moveDay != 0) dateTo = UtilDateTime.getDayStart(dateTo,moveDay); + if (moveDay != 0) dateTo = UtilDateTime.getDayStart(dateTo, moveDay); dateTo.setTime(dateTo.getTime() + startTime.getTime() + capacity.longValue() + cDateTrav.get(Calendar.ZONE_OFFSET) + cDateTrav.get(Calendar.DST_OFFSET)); } result.put("dateTo", dateTo); - result.put("previousCapacity",position.get("capacity")); + result.put("previousCapacity", position.get("capacity")); return result; } /** Used to move backward in a TechDataCalendar, start from the dateFrom and move backward only on available period. diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java index f38a12c..7e08849 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderChangeHelper.java @@ -93,7 +93,7 @@ public final class OrderChangeHelper { try { OrderChangeHelper.orderStatusChanges(dispatcher, userLogin, orderId, HEADER_STATUS, null, ITEM_STATUS, null); OrderChangeHelper.cancelInventoryReservations(dispatcher, userLogin, orderId); - OrderChangeHelper.releasePaymentAuthorizations(dispatcher, userLogin,orderId); + OrderChangeHelper.releasePaymentAuthorizations(dispatcher, userLogin, orderId); } catch (GenericServiceException e) { Debug.logError(e, "Service invocation error, status changes were not updated for order #" + orderId, MODULE); return false; @@ -127,7 +127,7 @@ public final class OrderChangeHelper { try { OrderChangeHelper.orderStatusChanges(dispatcher, userLogin, orderId, HEADER_STATUS, null, ITEM_STATUS, null); OrderChangeHelper.cancelInventoryReservations(dispatcher, userLogin, orderId); - OrderChangeHelper.releasePaymentAuthorizations(dispatcher, userLogin,orderId); + OrderChangeHelper.releasePaymentAuthorizations(dispatcher, userLogin, orderId); } catch (GenericServiceException e) { Debug.logError(e, "Service invocation error, status changes were not updated for order #" + orderId, MODULE); return false; diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java index 4f13416..d318fb2 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java @@ -2798,7 +2798,7 @@ public class OrderReadHelper { adjustments = EntityQuery.use(delegator).from("ReturnAdjustment").where(condition).queryList(); if (adjustments != null) { for (GenericValue returnAdjustment : adjustments) { - total = total.add(setScaleByType("RET_SALES_TAX_ADJ".equals(returnAdjustment.get("returnAdjustmentTypeId")),returnAdjustment.getBigDecimal("amount"))); + total = total.add(setScaleByType("RET_SALES_TAX_ADJ".equals(returnAdjustment.get("returnAdjustmentTypeId")), returnAdjustment.getBigDecimal("amount"))); } } } catch (GenericEntityException e) { diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java index 57d3f4b..03310e4 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java @@ -199,7 +199,7 @@ public class OrderReturnServices { } catch (GenericEntityException e) { Debug.logError(e, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorUnableToGetReturnHeaderForID", UtilMisc.toMap("returnId",returnId), locale)); + "OrderErrorUnableToGetReturnHeaderForID", UtilMisc.toMap("returnId", returnId), locale)); } // get the return items @@ -2392,7 +2392,7 @@ public class OrderReturnServices { } if ((returnItemSeqId != null) && !("_NA_".equals(returnItemSeqId))) { returnItem = EntityQuery.use(delegator).from("ReturnItem").where("returnId", returnId, "returnItemSeqId", returnItemSeqId).queryOne(); - Debug.logInfo("returnId:" + returnId + ",returnItemSeqId:" + returnItemSeqId, MODULE); + Debug.logInfo("returnId:" + returnId + ", returnItemSeqId:" + returnItemSeqId, MODULE); orderItem = returnItem.getRelatedOne("OrderItem", false); } else { // we don't have the returnItemSeqId but before we consider this @@ -2427,7 +2427,7 @@ public class OrderReturnServices { // calculate the returnAdjustment amount if (returnItem != null) { // returnAdjustment for returnItem if (needRecalculate(returnAdjustmentTypeId)) { - Debug.logInfo("returnPrice:" + returnItem.getBigDecimal("returnPrice") + ",returnQuantity:" + returnItem.getBigDecimal("returnQuantity") + ",sourcePercentage:" + orderAdjustment.getBigDecimal("sourcePercentage"), MODULE); + Debug.logInfo("returnPrice:" + returnItem.getBigDecimal("returnPrice") + ", returnQuantity:" + returnItem.getBigDecimal("returnQuantity") + ",sourcePercentage:" + orderAdjustment.getBigDecimal("sourcePercentage"), MODULE); BigDecimal returnTotal = returnItem.getBigDecimal("returnPrice").multiply(returnItem.getBigDecimal("returnQuantity")); BigDecimal orderTotal = orderItem.getBigDecimal("quantity").multiply(orderItem.getBigDecimal("unitPrice")); amount = getAdjustmentAmount("RET_SALES_TAX_ADJ".equals(returnAdjustmentTypeId), returnTotal, orderTotal, orderAdjustment.getBigDecimal("amount")); diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java index a9e03d4..5358a3b 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java @@ -212,7 +212,7 @@ public class OrderServices { productStore = EntityQuery.use(delegator).from("ProductStore").where("productStoreId", productStoreId).cache().queryOne(); } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCouldNotFindProductStoreWithID",UtilMisc.toMap("productStoreId",productStoreId),locale) + e.toString()); + "OrderErrorCouldNotFindProductStoreWithID",UtilMisc.toMap("productStoreId", productStoreId), locale) + e.toString()); } } @@ -230,13 +230,13 @@ public class OrderServices { orderType = EntityQuery.use(delegator).from("OrderType").where("orderTypeId", orderTypeId).cache().queryOne(); } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorOrderTypeLookupFailed",locale) + e.toString()); + "OrderErrorOrderTypeLookupFailed", locale) + e.toString()); } // make sure we have a valid order type if (orderType == null) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorInvalidOrderTypeWithID", UtilMisc.toMap("orderTypeId",orderTypeId), locale)); + "OrderErrorInvalidOrderTypeWithID", UtilMisc.toMap("orderTypeId", orderTypeId), locale)); } // check to make sure we have something to order @@ -286,14 +286,14 @@ public class OrderServices { } catch (GenericServiceException e1) { Debug.logError(e1, "Error calling countProductQuantityOrdered service", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCallingCountProductQuantityOrderedService",locale) + e1.toString()); + "OrderErrorCallingCountProductQuantityOrderedService", locale) + e1.toString()); } } } if (!"PURCHASE_ORDER".equals(orderTypeId) && productStoreId == null) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorTheProductStoreIdCanOnlyBeNullForPurchaseOrders",locale)); + "OrderErrorTheProductStoreIdCanOnlyBeNullForPurchaseOrders", locale)); } Timestamp orderDate = (Timestamp) context.get("orderDate"); @@ -382,7 +382,7 @@ public class OrderServices { Debug.logError(errMsg, MODULE); errorMessages.add(errMsg); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderRentalOrderItems",locale)); + "OrderRentalOrderItems", locale)); } for (GenericValue workEffort : workEfforts) { // find the related workEffortItem (workEffortId = orderSeqId) @@ -390,13 +390,13 @@ public class OrderServices { if (workEffort.getString("workEffortId").equals(orderItem.getString("orderItemSeqId"))) { List<GenericValue> selFixedAssetProduct = null; try { - selFixedAssetProduct = EntityQuery.use(delegator).from("FixedAssetProduct").where("productId",orderItem.getString("productId"),"fixedAssetProductTypeId", "FAPT_USE").filterByDate(nowTimestamp, "fromDate", "thruDate").queryList(); + selFixedAssetProduct = EntityQuery.use(delegator).from("FixedAssetProduct").where("productId", orderItem.getString("productId"),"fixedAssetProductTypeId", "FAPT_USE").filterByDate(nowTimestamp, "fromDate", "thruDate").queryList(); } catch (GenericEntityException e) { String excMsg = "Could not find related Fixed Asset for the product: " + orderItem.getString("productId"); Debug.logError(excMsg, MODULE); errorMessages.add(excMsg); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderCouldNotFindRelatedFixedAssetForTheProduct",UtilMisc.toMap("productId",orderItem.getString("productId")), locale)); + "OrderCouldNotFindRelatedFixedAssetForTheProduct",UtilMisc.toMap("productId", orderItem.getString("productId")), locale)); } if (UtilValidate.isNotEmpty(selFixedAssetProduct)) { @@ -404,8 +404,8 @@ public class OrderServices { if (firstOne.hasNext()) { GenericValue fixedAssetProduct = delegator.makeValue("FixedAssetProduct"); fixedAssetProduct = firstOne.next(); - workEffort.set("fixedAssetId",fixedAssetProduct.get("fixedAssetId")); - workEffort.set("quantityToProduce",orderItem.get("quantity")); // have quantity easy available later... + workEffort.set("fixedAssetId", fixedAssetProduct.get("fixedAssetId")); + workEffort.set("quantityToProduce", orderItem.get("quantity")); // have quantity easy available later... workEffort.set("createdByUserLogin", userLogin.get("userLoginId")); } } @@ -566,7 +566,7 @@ public class OrderServices { } catch (GenericEntityException e) { Debug.logError(e, "Cannot create OrderHeader entity; problems with insert", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderOrderCreationFailedPleaseNotifyCustomerService",locale)); + "OrderOrderCreationFailedPleaseNotifyCustomerService", locale)); } // create the order status record @@ -796,7 +796,7 @@ public class OrderServices { orderAdjustment.set("orderAdjustmentId", delegator.getNextSeqId("OrderAdjustment")); } catch (IllegalArgumentException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCouldNotGetNextSequenceIdForOrderAdjustmentCannotCreateOrder",locale)); + "OrderErrorCouldNotGetNextSequenceIdForOrderAdjustmentCannotCreateOrder", locale)); } orderAdjustment.set("orderId", orderId); @@ -888,7 +888,7 @@ public class OrderServices { oipi.set("orderItemPriceInfoId", delegator.getNextSeqId("OrderItemPriceInfo")); } catch (IllegalArgumentException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCouldNotGetNextSequenceIdForOrderItemPriceInfoCannotCreateOrder",locale)); + "OrderErrorCouldNotGetNextSequenceIdForOrderItemPriceInfoCannotCreateOrder", locale)); } oipi.set("orderId", orderId); @@ -1117,7 +1117,7 @@ public class OrderServices { } catch (GenericEntityException e) { Debug.logError(e, "Problem with order storage or reservations", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCouldNotCreateOrderWriteError",locale) + e.getMessage() + ")."); + "OrderErrorCouldNotCreateOrderWriteError", locale) + e.getMessage() + ")."); } return successResult; @@ -1150,7 +1150,7 @@ public class OrderServices { } catch (GenericEntityException e) { Debug.logError(e, "Error calling countProductQuantityOrdered service", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCallingCountProductQuantityOrderedService",locale) + e.toString()); + "OrderErrorCallingCountProductQuantityOrderedService", locale) + e.toString()); } @@ -1161,7 +1161,7 @@ public class OrderServices { } catch (GenericEntityException e) { Debug.logError(e, "Error calling countProductQuantityOrdered service", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCallingCountProductQuantityOrderedService",locale) + e.toString()); + "OrderErrorCallingCountProductQuantityOrderedService", locale) + e.toString()); } if (UtilValidate.isNotEmpty(virtualProductId)) { @@ -1534,7 +1534,7 @@ public class OrderServices { if (resetResult != null && ServiceUtil.isError(resetResult)) { Debug.logWarning(UtilProperties.getMessage(RES_ERROR, "OrderErrorCannotResetOrderTotals", - UtilMisc.toMap("orderId",orderId,"resetResult",ServiceUtil.getErrorMessage(resetResult)), locale), MODULE); + UtilMisc.toMap("orderId", orderId,"resetResult",ServiceUtil.getErrorMessage(resetResult)), locale), MODULE); } else { Debug.logInfo("No orders found for reset processing", MODULE); } @@ -1560,7 +1560,7 @@ public class OrderServices { boolean hasPermission = OrderServices.hasPermission(orderId, userLogin, "UPDATE", security, delegator); if (!hasPermission) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderYouDoNotHavePermissionToChangeThisOrdersStatus",locale)); + "OrderYouDoNotHavePermissionToChangeThisOrdersStatus", locale)); } // get the order header @@ -1569,12 +1569,12 @@ public class OrderServices { orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne(); } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCannotGetOrderHeaderEntity",locale) + e.getMessage()); + "OrderErrorCannotGetOrderHeaderEntity", locale) + e.getMessage()); } if (orderHeader == null) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorNoValidOrderHeaderFoundForOrderId", UtilMisc.toMap("orderId",orderId), locale)); + "OrderErrorNoValidOrderHeaderFoundForOrderId", UtilMisc.toMap("orderId", orderId), locale)); } // Retrieve the order tax adjustments @@ -1584,7 +1584,7 @@ public class OrderServices { } catch (GenericEntityException e) { Debug.logError(e, "Unable to retrieve SALES_TAX adjustments for order : " + orderId, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderUnableToRetrieveSalesTaxAdjustments",locale)); + "OrderUnableToRetrieveSalesTaxAdjustments", locale)); } // Accumulate the total existing tax adjustment @@ -1644,7 +1644,7 @@ public class OrderServices { } catch (GenericEntityException e) { Debug.logError(e, "Cannot read order item entity : " + orderItem, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderCannotReadTheOrderItemEntity",locale)); + "OrderCannotReadTheOrderItemEntity", locale)); } } @@ -1699,7 +1699,7 @@ public class OrderServices { } catch (GenericServiceException e) { Debug.logError(e, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderProblemOccurredInTaxService",locale)); + "OrderProblemOccurredInTaxService", locale)); } if (ServiceUtil.isError(serviceResult)) { @@ -1787,7 +1787,7 @@ public class OrderServices { boolean hasPermission = OrderServices.hasPermission(orderId, userLogin, "UPDATE", security, delegator); if (!hasPermission) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderYouDoNotHavePermissionToChangeThisOrdersStatus",locale)); + "OrderYouDoNotHavePermissionToChangeThisOrdersStatus", locale)); } // get the order header @@ -1796,12 +1796,12 @@ public class OrderServices { orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne(); } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCannotGetOrderHeaderEntity",locale) + e.getMessage()); + "OrderErrorCannotGetOrderHeaderEntity", locale) + e.getMessage()); } if (orderHeader == null) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorNoValidOrderHeaderFoundForOrderId", UtilMisc.toMap("orderId",orderId), locale)); + "OrderErrorNoValidOrderHeaderFoundForOrderId", UtilMisc.toMap("orderId", orderId), locale)); } OrderReadHelper orh = new OrderReadHelper(orderHeader); @@ -1859,7 +1859,7 @@ public class OrderServices { } catch (GenericEntityException e) { Debug.logError(e, "Problem creating shipping re-calc adjustment : " + orderAdjustment, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCannotCreateAdjustment",locale)); + "OrderErrorCannotCreateAdjustment", locale)); } } @@ -1885,7 +1885,7 @@ public class OrderServices { boolean hasPermission = OrderServices.hasPermission(orderId, userLogin, "UPDATE", security, delegator); if (!hasPermission) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderYouDoNotHavePermissionToChangeThisOrdersStatus",locale)); + "OrderYouDoNotHavePermissionToChangeThisOrdersStatus", locale)); } // get the order header @@ -1898,7 +1898,7 @@ public class OrderServices { if (orderHeader == null) { Debug.logError("OrderHeader came back as null", MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderCannotUpdateNullOrderHeader",UtilMisc.toMap("orderId",orderId),locale)); + "OrderCannotUpdateNullOrderHeader",UtilMisc.toMap("orderId", orderId), locale)); } // get the order items @@ -2002,7 +2002,7 @@ public class OrderServices { } } else { Debug.logWarning(UtilProperties.getMessage(RES_ERROR, - "OrderReceivedNullForOrderItemRecordsOrderId", UtilMisc.toMap("orderId",orderId),locale), MODULE); + "OrderReceivedNullForOrderItemRecordsOrderId", UtilMisc.toMap("orderId", orderId), locale), MODULE); } return ServiceUtil.returnSuccess(); @@ -2038,7 +2038,7 @@ public class OrderServices { boolean hasPermission = OrderServices.hasPermission(orderId, userLogin, "UPDATE", security, delegator); if (!hasPermission) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderYouDoNotHavePermissionToChangeThisOrdersStatus",locale)); + "OrderYouDoNotHavePermissionToChangeThisOrdersStatus", locale)); } Map<String, String> fields = UtilMisc.<String, String>toMap("orderId", orderId); @@ -2056,7 +2056,7 @@ public class OrderServices { } catch (GenericEntityException e) { Debug.logError(e, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCannotGetOrderItemAssocEntity", UtilMisc.toMap("itemMsgInfo",itemMsgInfo), locale)); + "OrderErrorCannotGetOrderItemAssocEntity", UtilMisc.toMap("itemMsgInfo", itemMsgInfo), locale)); } if (orderItemShipGroupAssocs != null) { @@ -2071,7 +2071,7 @@ public class OrderServices { if (orderItem == null) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCannotCancelItemItemNotFound", UtilMisc.toMap("itemMsgInfo",itemMsgInfo), locale)); + "OrderErrorCannotCancelItemItemNotFound", UtilMisc.toMap("itemMsgInfo", itemMsgInfo), locale)); } BigDecimal aisgaCancelQuantity = orderItemShipGroupAssoc.getBigDecimal("cancelQuantity"); @@ -2126,7 +2126,7 @@ public class OrderServices { } catch (GenericEntityException e) { Debug.logError(e, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderUnableToSetCancelQuantity", UtilMisc.toMap("itemMsgInfo",itemMsgInfo), locale)); + "OrderUnableToSetCancelQuantity", UtilMisc.toMap("itemMsgInfo", itemMsgInfo), locale)); } Map<String, Object> localCtx = UtilMisc.toMap("userLogin", userLogin, @@ -2198,7 +2198,7 @@ public class OrderServices { dispatcher.runSyncIgnore("cancelOrderItemInvResQty", cancelOrderItemInvResCtx); } catch (GenericServiceException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToUpdateInventoryReservations", UtilMisc.toMap("itemMsgInfo",itemMsgInfo), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToUpdateInventoryReservations", UtilMisc.toMap("itemMsgInfo", itemMsgInfo), locale)); } } // all items are cancelled -- mark the item as cancelled @@ -2208,7 +2208,7 @@ public class OrderServices { } catch (GenericServiceException e) { Debug.logError(e, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderUnableToCancelOrderLine", UtilMisc.toMap("itemMsgInfo",itemMsgInfo), locale)); + "OrderUnableToCancelOrderLine", UtilMisc.toMap("itemMsgInfo", itemMsgInfo), locale)); } } else { // reverse the inventory reservation @@ -2219,7 +2219,7 @@ public class OrderServices { } catch (GenericServiceException e) { Debug.logError(e, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderUnableToUpdateInventoryReservations", UtilMisc.toMap("itemMsgInfo",itemMsgInfo), locale)); + "OrderUnableToUpdateInventoryReservations", UtilMisc.toMap("itemMsgInfo", itemMsgInfo), locale)); } } } else { @@ -2229,7 +2229,7 @@ public class OrderServices { } } else { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCannotCancelItemItemNotFound", UtilMisc.toMap("itemMsgInfo",itemMsgInfo), locale)); + "OrderErrorCannotCancelItemItemNotFound", UtilMisc.toMap("itemMsgInfo", itemMsgInfo), locale)); } return ServiceUtil.returnSuccess(); @@ -2252,7 +2252,7 @@ public class OrderServices { boolean hasPermission = OrderServices.hasPermission(orderId, userLogin, "UPDATE", security, delegator); if (!hasPermission) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderYouDoNotHavePermissionToChangeThisOrdersStatus",locale)); + "OrderYouDoNotHavePermissionToChangeThisOrdersStatus", locale)); } List<EntityExpr> exprs = new ArrayList<>(); @@ -2270,7 +2270,7 @@ public class OrderServices { orderItems = EntityQuery.use(delegator).from("OrderItem").where(exprs).queryList(); } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCannotGetOrderItemEntity",locale) + e.getMessage()); + "OrderErrorCannotGetOrderItemEntity", locale) + e.getMessage()); } if (UtilValidate.isNotEmpty(orderItems)) { @@ -2299,12 +2299,12 @@ public class OrderServices { if (statusChange == null) { Debug.logWarning(UtilProperties.getMessage(RES_ERROR, - "OrderItemStatusNotChangedIsNotAValidChange", UtilMisc.toMap("orderStatusId",orderItem.getString("statusId"),"statusId",statusId), locale), MODULE); + "OrderItemStatusNotChangedIsNotAValidChange", UtilMisc.toMap("orderStatusId", orderItem.getString("statusId"),"statusId",statusId), locale), MODULE); continue; } } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCouldNotChangeItemStatus",locale) + e.getMessage()); + "OrderErrorCouldNotChangeItemStatus", locale) + e.getMessage()); } orderItem.set("statusId", statusId); @@ -2355,7 +2355,7 @@ public class OrderServices { boolean hasPermission = OrderServices.hasPermission(orderId, userLogin, "UPDATE", security, delegator); if (!hasPermission) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderYouDoNotHavePermissionToChangeThisOrdersStatus",locale)); + "OrderYouDoNotHavePermissionToChangeThisOrdersStatus", locale)); } try { @@ -2378,7 +2378,7 @@ public class OrderServices { if (orderHeader.getString("statusId").equals(statusId)) { Debug.logWarning(UtilProperties.getMessage(RES_ERROR, - "OrderTriedToSetOrderStatusWithTheSameStatusIdforOrderWithId", UtilMisc.toMap("statusId",statusId,"orderId",orderId),locale),MODULE); + "OrderTriedToSetOrderStatusWithTheSameStatusIdforOrderWithId", UtilMisc.toMap("statusId",statusId,"orderId", orderId), locale),MODULE); return successResult; } try { @@ -2389,7 +2389,7 @@ public class OrderServices { } } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCouldNotChangeOrderStatus",locale) + e.getMessage() + ")."); + "OrderErrorCouldNotChangeOrderStatus", locale) + e.getMessage() + ")."); } // update the current status @@ -2411,7 +2411,7 @@ public class OrderServices { successResult.put("grandTotal", orderHeader.get("grandTotal")); } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCouldNotChangeOrderStatus",locale) + e.getMessage() + ")."); + "OrderErrorCouldNotChangeOrderStatus", locale) + e.getMessage() + ")."); } if ("Y".equals(context.get("setItemStatus"))) { @@ -2723,7 +2723,7 @@ public class OrderServices { } catch (GenericServiceException e) { Debug.logError(e, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderServiceExceptionSeeLogs",locale)); + "OrderServiceExceptionSeeLogs", locale)); } // check for errors @@ -3154,7 +3154,7 @@ public class OrderServices { } catch (GenericEntityException e) { Debug.logError(e, "ERROR: Unable to get OrderHeader for orderId : " + orderId, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorUnableToGetOrderHeaderForOrderId", UtilMisc.toMap("orderId",orderId), locale)); + "OrderErrorUnableToGetOrderHeaderForOrderId", UtilMisc.toMap("orderId", orderId), locale)); } // get all the items for the order @@ -3165,7 +3165,7 @@ public class OrderServices { } catch (GenericEntityException e) { Debug.logError(e, "ERROR: Unable to get OrderItem list for orderId : " + orderId, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorUnableToGetOrderItemListForOrderId", UtilMisc.toMap("orderId",orderId), locale)); + "OrderErrorUnableToGetOrderItemListForOrderId", UtilMisc.toMap("orderId", orderId), locale)); } } @@ -3442,7 +3442,7 @@ public class OrderServices { } catch (IllegalArgumentException e) { Debug.logError(e, "ERROR: Unable to get OrderHeader for orderId : " + orderId, MODULE); return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorUnableToGetOrderHeaderForOrderId", UtilMisc.toMap("orderId",orderId), locale)); + "OrderErrorUnableToGetOrderHeaderForOrderId", UtilMisc.toMap("orderId", orderId), locale)); } // get all the approved items for the order @@ -6726,7 +6726,7 @@ public class OrderServices { } } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCouldNotChangeAllocationPlanStatus",locale) + e.getMessage() + ")."); + "OrderErrorCouldNotChangeAllocationPlanStatus", locale) + e.getMessage() + ")."); } String userLoginId = null; if (userLogin != null) { @@ -6777,7 +6777,7 @@ public class OrderServices { } } catch (GenericEntityException e) { return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, - "OrderErrorCouldNotChangeAllocationPlanItemStatus",locale) + e.getMessage() + ")."); + "OrderErrorCouldNotChangeAllocationPlanItemStatus", locale) + e.getMessage() + ")."); } String userLoginId = null; if (userLogin != null) { diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java index 44c0e86..c82f577 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/quote/QuoteServices.java @@ -131,7 +131,7 @@ public class QuoteServices { } } catch (GenericServiceException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "OrderServiceExceptionSeeLogs",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "OrderServiceExceptionSeeLogs", locale)); } // check for errors diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java index 664561a..4564a5b 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java @@ -465,7 +465,7 @@ public class CheckOutEvents { GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); CheckOutHelper checkOutHelper = new CheckOutHelper(dispatcher, delegator, cart); Map<String, Object> callResult; - String result = checkoutValidation(request,response); + String result = checkoutValidation(request, response); if ("error".equals(result)) { return "error"; } diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java index e795f0f..8a3f05e 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java @@ -511,8 +511,8 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable { Timestamp shipBeforeDate, Timestamp shipAfterDate, Map<String, GenericValue> features, Map<String, Object> attributes, String prodCatalogId, ProductConfigWrapper configWrapper, String itemType, String itemGroupNumber, String parentProductId, LocalDispatcher dispatcher) throws CartItemModifyException, ItemNotFoundException { - return addOrIncreaseItem(productId,selectedAmount,quantity,reservStart,reservLength,reservPersons, null,null,shipBeforeDate,shipAfterDate,features, attributes,prodCatalogId, - configWrapper,itemType,itemGroupNumber,parentProductId, dispatcher); + return addOrIncreaseItem(productId,selectedAmount, quantity, reservStart, reservLength, reservPersons, null, null,shipBeforeDate,shipAfterDate, features, attributes, prodCatalogId, + configWrapper, itemType, itemGroupNumber, parentProductId, dispatcher); } /** add rental (with accommodation) item to cart */ @@ -602,7 +602,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable { } } else { try { - BigDecimal minQuantity = getMinimumOrderQuantity(getDelegator(),null, productId); + BigDecimal minQuantity = getMinimumOrderQuantity(getDelegator(), null, productId); if (quantity.compareTo(minQuantity) < 0) { quantity = minQuantity; } @@ -3716,7 +3716,7 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable { orderItem.set("selectedAmount", item.getSelectedAmount()); orderItem.set("unitPrice", item.getBasePrice()); orderItem.set("unitListPrice", item.getListPrice()); - orderItem.set("isModifiedPrice",item.getIsModifiedPrice() ? "Y" : "N"); + orderItem.set("isModifiedPrice", item.getIsModifiedPrice() ? "Y" : "N"); orderItem.set("isPromo", item.getIsPromo() ? "Y" : "N"); orderItem.set("shoppingListId", item.getShoppingListId()); @@ -3757,14 +3757,14 @@ public class ShoppingCart implements Iterable<ShoppingCartItem>, Serializable { for (ShoppingCartItem item : cartLines) { if ("RENTAL_ORDER_ITEM".equals(item.getItemType())) { // prepare workeffort when the order item is a rental item GenericValue workEffort = getDelegator().makeValue("WorkEffort"); - workEffort.set("workEffortId",item.getOrderItemSeqId()); // fill temporary with sequence number - workEffort.set("estimatedStartDate",item.getReservStart()); - workEffort.set("estimatedCompletionDate",item.getReservStart(item.getReservLength())); + workEffort.set("workEffortId", item.getOrderItemSeqId()); // fill temporary with sequence number + workEffort.set("estimatedStartDate", item.getReservStart()); + workEffort.set("estimatedCompletionDate", item.getReservStart(item.getReservLength())); workEffort.set("reservPersons", item.getReservPersons()); workEffort.set("reserv2ndPPPerc", item.getReserv2ndPPPerc()); workEffort.set("reservNthPPPerc", item.getReservNthPPPerc()); workEffort.set("accommodationMapId", item.getAccommodationMapId()); - workEffort.set("accommodationSpotId",item.getAccommodationSpotId()); + workEffort.set("accommodationSpotId", item.getAccommodationSpotId()); allWorkEfforts.add(workEffort); } } diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java index f05da16..5518dc5 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java @@ -1895,7 +1895,7 @@ public class ShoppingCartEvents { result = cartHelper.addToCart(catalogId, shoppingListId, shoppingListItemSeqId, productId, null, itemType, itemDescription, null, amount, quantity, null, null, null, null, null, null, - itemGroupNumber, itemAttributes,null); + itemGroupNumber, itemAttributes, null); // no values for price and paramMap (a context for adding attributes) controlDirective = processResult(result, request); if (controlDirective.equals(ERROR)) { // if the add to cart failed, then get out of this loop right away diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java index a210669..18cc05b 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java @@ -107,10 +107,10 @@ public class ShoppingCartHelper { java.sql.Timestamp shipBeforeDate, java.sql.Timestamp shipAfterDate, ProductConfigWrapper configWrapper, String itemGroupNumber, Map<String, ? extends Object> context, String parentProductId) { - return addToCart(catalogId,shoppingListId,shoppingListItemSeqId,productId, - productCategoryId,itemType,itemDescription,price, amount,quantity, - reservStart,reservLength,reservPersons,null,null,shipBeforeDate,shipAfterDate, - configWrapper,itemGroupNumber, context,parentProductId); + return addToCart(catalogId,shoppingListId,shoppingListItemSeqId, productId, + productCategoryId, itemType, itemDescription, price, amount, quantity, + reservStart, reservLength, reservPersons, null, null,shipBeforeDate,shipAfterDate, + configWrapper, itemGroupNumber, context, parentProductId); } /** Overriden for reserveAfterDate. */ @@ -121,10 +121,10 @@ public class ShoppingCartHelper { java.sql.Timestamp shipBeforeDate, java.sql.Timestamp shipAfterDate, ProductConfigWrapper configWrapper, String itemGroupNumber, Map<String, ? extends Object> context, String parentProductId) { - return addToCart(catalogId,shoppingListId,shoppingListItemSeqId,productId, - productCategoryId,itemType,itemDescription,price, amount,quantity, - reservStart,reservLength,reservPersons,null,null,shipBeforeDate,shipAfterDate,null, - configWrapper,itemGroupNumber, context,parentProductId); + return addToCart(catalogId,shoppingListId,shoppingListItemSeqId, productId, + productCategoryId, itemType, itemDescription, price, amount, quantity, + reservStart, reservLength, reservPersons, null, null,shipBeforeDate,shipAfterDate, null, + configWrapper, itemGroupNumber, context, parentProductId); } /** Event to add an item to the shopping cart with accommodation. */ @@ -557,7 +557,7 @@ public class ShoppingCartHelper { } if (requirementAlreadyInCart) { if (Debug.warningOn()) { - Debug.logWarning(UtilProperties.getMessage(RES_ERROR, "OrderTheRequirementIsAlreadyInTheCartNotAdding", UtilMisc.toMap("requirementId",requirementId), cart.getLocale()), MODULE); + Debug.logWarning(UtilProperties.getMessage(RES_ERROR, "OrderTheRequirementIsAlreadyInTheCartNotAdding", UtilMisc.toMap("requirementId", requirementId), cart.getLocale()), MODULE); } continue; } diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java index a4bd3ec..d3f7548 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java @@ -295,10 +295,10 @@ public class ShoppingCartItem implements java.io.Serializable { String itemType, ShoppingCart.ShoppingCartItemGroup itemGroup, LocalDispatcher dispatcher, ShoppingCart cart, Boolean triggerExternalOpsBool, Boolean triggerPriceRulesBool, String parentProductId, Boolean skipInventoryChecks, Boolean skipProductChecks) throws CartItemModifyException, ItemNotFoundException { - return makeItem(cartLocation,productId,selectedAmount,quantity,unitPrice, - reservStart,reservLength,reservPersons,null,null,shipBeforeDate,shipAfterDate, null, - additionalProductFeatureAndAppls, attributes,prodCatalogId, configWrapper, - itemType,itemGroup, dispatcher, cart,triggerExternalOpsBool,triggerPriceRulesBool, + return makeItem(cartLocation, productId,selectedAmount, quantity,unitPrice, + reservStart, reservLength, reservPersons, null, null,shipBeforeDate,shipAfterDate, null, + additionalProductFeatureAndAppls, attributes, prodCatalogId, configWrapper, + itemType, itemGroup, dispatcher, cart,triggerExternalOpsBool,triggerPriceRulesBool, parentProductId,skipInventoryChecks,skipProductChecks); } @@ -383,11 +383,11 @@ public class ShoppingCartItem implements java.io.Serializable { String prodCatalogId, ProductConfigWrapper configWrapper, String itemType, ShoppingCart.ShoppingCartItemGroup itemGroup, LocalDispatcher dispatcher, ShoppingCart cart, Boolean triggerExternalOpsBool, Boolean triggerPriceRulesBool, GenericValue parentProduct, Boolean skipInventoryChecks, Boolean skipProductChecks) throws CartItemModifyException { - return makeItem(cartLocation,product,selectedAmount, - quantity,unitPrice,reservStart,reservLength,reservPersons, - null,null,shipBeforeDate,shipAfterDate, null, additionalProductFeatureAndAppls, attributes, - prodCatalogId, configWrapper,itemType,itemGroup, dispatcher, cart, - triggerExternalOpsBool,triggerPriceRulesBool,parentProduct,skipInventoryChecks,skipProductChecks); + return makeItem(cartLocation, product,selectedAmount, + quantity,unitPrice, reservStart, reservLength, reservPersons, + null, null,shipBeforeDate,shipAfterDate, null, additionalProductFeatureAndAppls, attributes, + prodCatalogId, configWrapper, itemType, itemGroup, dispatcher, cart, + triggerExternalOpsBool,triggerPriceRulesBool, parentProduct,skipInventoryChecks,skipProductChecks); } /** diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java index c9254d8..32c5617 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartServices.java @@ -131,7 +131,7 @@ public class ShoppingCartServices { cart.setIsGift(idx, isGift); } } else { - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderCartShipGroupNotFound", UtilMisc.toMap("groupIndex",groupIndex), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderCartShipGroupNotFound", UtilMisc.toMap("groupIndex", groupIndex), locale)); } return ServiceUtil.returnSuccess(); } @@ -139,7 +139,7 @@ public class ShoppingCartServices { public static Map<String, Object>setPaymentOptions(DispatchContext dctx, Map<String, Object> context) { Locale locale = (Locale) context.get("locale"); - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderServiceNotYetImplemented",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderServiceNotYetImplemented", locale)); } public static Map<String, Object>setOtherOptions(DispatchContext dctx, Map<String, Object> context) { @@ -770,7 +770,7 @@ public class ShoppingCartServices { termDays = Long.parseLong(quoteTerm.getString("termDays").trim()); } String orderItemSeqId = quoteTerm.getString("quoteItemSeqId"); - cart.addOrderTerm(quoteTerm.getString("termTypeId"), orderItemSeqId,termValue, termDays, quoteTerm.getString("textValue"),quoteTerm.getString("description")); + cart.addOrderTerm(quoteTerm.getString("termTypeId"), orderItemSeqId,termValue, termDays, quoteTerm.getString("textValue"), quoteTerm.getString("description")); } } @@ -885,7 +885,7 @@ public class ShoppingCartServices { configWrapper = ProductConfigWorker.loadProductConfigWrapper(delegator, dispatcher, quoteItem.getString("configId"), productId, productStoreId, null, null, currency, locale, userLogin); } try { - itemIndex = cart.addItemToEnd(productId, amount, quantity, quoteUnitPrice, reservStart, reservLength, reservPersons,null,null, null, null, null, configWrapper, null, dispatcher, !applyQuoteAdjustments, quoteUnitPrice.compareTo(BigDecimal.ZERO) == 0, Boolean.FALSE, Boolean.FALSE); + itemIndex = cart.addItemToEnd(productId, amount, quantity, quoteUnitPrice, reservStart, reservLength, reservPersons, null, null, null, null, null, configWrapper, null, dispatcher, !applyQuoteAdjustments, quoteUnitPrice.compareTo(BigDecimal.ZERO) == 0, Boolean.FALSE, Boolean.FALSE); } catch (ItemNotFoundException | CartItemModifyException e) { Debug.logError(e, MODULE); @@ -1122,15 +1122,15 @@ public class ShoppingCartServices { if (shoppingCart != null) { String isoCode = shoppingCart.getCurrency(); result.put("totalQuantity", shoppingCart.getTotalQuantity()); - result.put("currencyIsoCode",isoCode); + result.put("currencyIsoCode", isoCode); result.put("subTotal", shoppingCart.getSubTotal()); - result.put("subTotalCurrencyFormatted",org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getSubTotal(), isoCode, locale)); + result.put("subTotalCurrencyFormatted", org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getSubTotal(), isoCode, locale)); result.put("totalShipping", shoppingCart.getTotalShipping()); - result.put("totalShippingCurrencyFormatted",org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getTotalShipping(), isoCode, locale)); + result.put("totalShippingCurrencyFormatted", org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getTotalShipping(), isoCode, locale)); result.put("totalSalesTax",shoppingCart.getTotalSalesTax()); - result.put("totalSalesTaxCurrencyFormatted",org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getTotalSalesTax(), isoCode, locale)); + result.put("totalSalesTaxCurrencyFormatted", org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getTotalSalesTax(), isoCode, locale)); result.put("displayGrandTotal", shoppingCart.getDisplayGrandTotal()); - result.put("displayGrandTotalCurrencyFormatted",org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getDisplayGrandTotal(), isoCode, locale)); + result.put("displayGrandTotalCurrencyFormatted", org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getDisplayGrandTotal(), isoCode, locale)); BigDecimal orderAdjustmentsTotal = OrderReadHelper.calcOrderAdjustments(OrderReadHelper.getOrderHeaderAdjustments(shoppingCart.getAdjustments(), null), shoppingCart.getSubTotal(), true, true, true); result.put("displayOrderAdjustmentsTotalCurrencyFormatted", org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(orderAdjustmentsTotal, isoCode, locale)); Map<String, Object> cartItemData = new HashMap<>(); @@ -1139,8 +1139,8 @@ public class ShoppingCartServices { cartItemData.put("displayItemQty_" + cartLineIndex, cartLine.getQuantity()); cartItemData.put("displayItemPrice_" + cartLineIndex, org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(cartLine.getDisplayPrice(), isoCode, locale)); cartItemData.put("displayItemSubTotal_" + cartLineIndex, cartLine.getDisplayItemSubTotal()); - cartItemData.put("displayItemSubTotalCurrencyFormatted_" + cartLineIndex ,org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(cartLine.getDisplayItemSubTotal(), isoCode, locale)); - cartItemData.put("displayItemAdjustment_" + cartLineIndex ,org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(cartLine.getOtherAdjustments(), isoCode, locale)); + cartItemData.put("displayItemSubTotalCurrencyFormatted_" + cartLineIndex , org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(cartLine.getDisplayItemSubTotal(), isoCode, locale)); + cartItemData.put("displayItemAdjustment_" + cartLineIndex , org.apache.ofbiz.base.util.UtilFormatOut.formatCurrency(cartLine.getOtherAdjustments(), isoCode, locale)); } result.put("cartItemData", cartItemData); } diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java index f02d247..429481c 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java @@ -106,7 +106,7 @@ public final class ProductPromoWorker { Debug.logError(e, "Error looking up store with id " + productStoreId, MODULE); } if (productStore == null) { - Debug.logWarning(UtilProperties.getMessage(RES_ERROR,"OrderNoStoreFoundWithIdNotDoingPromotions", UtilMisc.toMap("productStoreId",productStoreId), cart.getLocale()), MODULE); + Debug.logWarning(UtilProperties.getMessage(RES_ERROR,"OrderNoStoreFoundWithIdNotDoingPromotions", UtilMisc.toMap("productStoreId", productStoreId), cart.getLocale()), MODULE); return productPromos; } @@ -172,7 +172,7 @@ public final class ProductPromoWorker { Debug.logError(e, "Error looking up store with id " + productStoreId, MODULE); } if (productStore == null) { - Debug.logWarning(UtilProperties.getMessage(RES_ERROR,"OrderNoStoreFoundWithIdNotDoingPromotions", UtilMisc.toMap("productStoreId",productStoreId), cart.getLocale()), MODULE); + Debug.logWarning(UtilProperties.getMessage(RES_ERROR,"OrderNoStoreFoundWithIdNotDoingPromotions", UtilMisc.toMap("productStoreId", productStoreId), cart.getLocale()), MODULE); return promoCodes; } try { @@ -212,7 +212,7 @@ public final class ProductPromoWorker { Debug.logError(e, "Error looking up store with id " + productStoreId, MODULE); } if (productStore == null) { - Debug.logWarning(UtilProperties.getMessage(RES_ERROR,"OrderNoStoreFoundWithIdNotDoingPromotions", UtilMisc.toMap("productStoreId",productStoreId), cart.getLocale()), MODULE); + Debug.logWarning(UtilProperties.getMessage(RES_ERROR,"OrderNoStoreFoundWithIdNotDoingPromotions", UtilMisc.toMap("productStoreId", productStoreId), cart.getLocale()), MODULE); return productPromoList; } @@ -994,7 +994,7 @@ public final class ProductPromoWorker { } else if ("PPC_GTE".equals(operatorEnumId)) { if (compare >= 0) return true; } else { - Debug.logWarning(UtilProperties.getMessage(RES_ERROR,"OrderAnUnSupportedProductPromoCondCondition", UtilMisc.toMap("operatorEnumId",operatorEnumId) , cart.getLocale()), MODULE); + Debug.logWarning(UtilProperties.getMessage(RES_ERROR,"OrderAnUnSupportedProductPromoCondCondition", UtilMisc.toMap("operatorEnumId", operatorEnumId) , cart.getLocale()), MODULE); return false; } } diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java index 013dab3..58c24f0 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/shipping/ShippingEvents.java @@ -146,7 +146,7 @@ public class ShippingEvents { BigDecimal shippableTotal, String partyId, String productStoreShipMethId) { return getShipGroupEstimate(dispatcher, delegator, orderTypeId, shipmentMethodTypeId, carrierPartyId, carrierRoleTypeId, shippingContactMechId, productStoreId, null, itemInfo, - shippableWeight, shippableQuantity, shippableTotal, partyId,productStoreShipMethId); + shippableWeight, shippableQuantity, shippableTotal, partyId, productStoreShipMethId); } public static Map<String, Object> getShipGroupEstimate(LocalDispatcher dispatcher, Delegator delegator, String orderTypeId, diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java index 0373e5c..a5affe8 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/shoppinglist/ShoppingListServices.java @@ -93,7 +93,7 @@ public class ShoppingListServices { startDate = UtilDateTime.getYearStart(UtilDateTime.nowTimestamp(), 0, interval); break; default: - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderInvalidFrequencyForShoppingListRecurrence",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderInvalidFrequencyForShoppingListRecurrence", locale)); } } @@ -108,7 +108,7 @@ public class ShoppingListServices { recInfo = RecurrenceInfo.makeInfo(delegator, startTime, frequency, interval, -1, endTime); } catch (RecurrenceInfoException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToCreateShoppingListRecurrenceInformation",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToCreateShoppingListRecurrenceInformation", locale)); } Debug.logInfo("Next Recurrence - " + UtilDateTime.getTimestamp(recInfo.next()), MODULE); @@ -271,7 +271,7 @@ public class ShoppingListServices { orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne(); if (orderHeader == null) { - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToLocateOrder", UtilMisc.toMap("orderId",orderId), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToLocateOrder", UtilMisc.toMap("orderId", orderId), locale)); } String productStoreId = orderHeader.getString("productStoreId"); @@ -294,7 +294,7 @@ public class ShoppingListServices { newListResult = dispatcher.runSync("createShoppingList", serviceCtx, 90, true); } catch (GenericServiceException e) { Debug.logError(e, "Problems creating new ShoppingList", MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToCreateNewShoppingList",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToCreateNewShoppingList", locale)); } // check for errors @@ -312,7 +312,7 @@ public class ShoppingListServices { shoppingList = EntityQuery.use(delegator).from("ShoppingList").where("shoppingListId", shoppingListId).queryOne(); if (shoppingList == null) { - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderNoShoppingListAvailable",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderNoShoppingListAvailable", locale)); } shoppingListTypeId = shoppingList.getString("shoppingListTypeId"); @@ -321,7 +321,7 @@ public class ShoppingListServices { orh = new OrderReadHelper(orderHeader); } catch (IllegalArgumentException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToLoadOrderReadHelper", UtilMisc.toMap("orderId",orderId), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToLoadOrderReadHelper", UtilMisc.toMap("orderId", orderId), locale)); } List<GenericValue> orderItems = orh.getOrderItems(); diff --git a/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java b/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java index 3560f42..7608e35 100644 --- a/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java +++ b/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java @@ -75,7 +75,7 @@ public class ZipSalesServices { // do security check if (!security.hasPermission("SERVICE_INVOKE_ANY", userLogin)) { - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderYouDoNotHavePermissionToLoadTaxTables",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderYouDoNotHavePermissionToLoadTaxTables", locale)); } // get a now stamp (we'll use 2000-01-01) @@ -87,7 +87,7 @@ public class ZipSalesServices { tdf = DataFile.makeDataFile(UtilURL.fromResource(dataFile), flatTable); } catch (DataFileException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToReadZipSalesDataFile",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToReadZipSalesDataFile", locale)); } // locate the file to be imported @@ -101,7 +101,7 @@ public class ZipSalesServices { tri = tdf.makeRecordIterator(tUrl); } catch (DataFileException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderProblemGettingTheRecordIterator",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderProblemGettingTheRecordIterator", locale)); } if (tri != null) { while (tri.hasNext()) { @@ -142,7 +142,7 @@ public class ZipSalesServices { delegator.createOrStore(newValue); } catch (GenericEntityException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderErrorWritingRecordsToTheDatabase",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderErrorWritingRecordsToTheDatabase", locale)); } // console log @@ -156,13 +156,13 @@ public class ZipSalesServices { rdf = DataFile.makeDataFile(UtilURL.fromResource(dataFile), ruleTable); } catch (DataFileException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToReadZipSalesDataFile",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToReadZipSalesDataFile", locale)); } // locate the file to be imported URL rUrl = UtilURL.fromResource(ruleFileLocation); if (rUrl == null) { - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToLocateRuleFileFromLocation", UtilMisc.toMap("ruleFileLocation",ruleFileLocation), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderUnableToLocateRuleFileFromLocation", UtilMisc.toMap("ruleFileLocation", ruleFileLocation), locale)); } RecordIterator rri = null; @@ -170,7 +170,7 @@ public class ZipSalesServices { rri = rdf.makeRecordIterator(rUrl); } catch (DataFileException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderProblemGettingTheRecordIterator",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderProblemGettingTheRecordIterator", locale)); } if (rri != null) { while (rri.hasNext()) { @@ -198,7 +198,7 @@ public class ZipSalesServices { delegator.storeAll(UtilMisc.toList(newValue)); } catch (GenericEntityException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderErrorWritingRecordsToTheDatabase",locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,"OrderErrorWritingRecordsToTheDatabase", locale)); } // console log diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java index c728ad0..8c1fc41 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigWrapper.java @@ -572,7 +572,7 @@ public class ProductConfigWrapper implements Serializable { BigDecimal listPrice = BigDecimal.ZERO; BigDecimal price = BigDecimal.ZERO; // Get the component's price - Map<String, Object> fieldMap = UtilMisc.toMap("product", oneComponent.getRelatedOne("ProductProduct", false), "prodCatalogId", catalogId, "webSiteId", webSiteId, "currencyUomId", currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin", autoUserLogin, "productStoreId",productStoreId); + Map<String, Object> fieldMap = UtilMisc.toMap("product", oneComponent.getRelatedOne("ProductProduct", false), "prodCatalogId", catalogId, "webSiteId", webSiteId, "currencyUomId", currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin", autoUserLogin, "productStoreId", productStoreId); Map<String, Object> priceMap = dispatcher.runSync("calculateProductPrice", fieldMap); if (ServiceUtil.isError(priceMap)) { String errorMessage = ServiceUtil.getErrorMessage(priceMap); @@ -646,7 +646,7 @@ public class ProductConfigWrapper implements Serializable { } // Get the component's price - Map<String, Object> fieldMap = UtilMisc.toMap("product", oneComponentProduct, "prodCatalogId", pcw.catalogId, "webSiteId", pcw.webSiteId, "currencyUomId", pcw.currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin", pcw.autoUserLogin, "productStoreId",productStoreId); + Map<String, Object> fieldMap = UtilMisc.toMap("product", oneComponentProduct, "prodCatalogId", pcw.catalogId, "webSiteId", pcw.webSiteId, "currencyUomId", pcw.currencyUomId, "productPricePurposeId", "COMPONENT_PRICE", "autoUserLogin", pcw.autoUserLogin, "productStoreId", productStoreId); Map<String, Object> priceMap = pcw.getDispatcher().runSync("calculateProductPrice", fieldMap); Map<String, Object> purchasePriceResultMap = dispatcher.runSync("calculateProductPrice", fieldMap); if (ServiceUtil.isError(purchasePriceResultMap)) { diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/RotateImage.java b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/RotateImage.java index 662b86f..ccde800 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/RotateImage.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/RotateImage.java @@ -111,7 +111,7 @@ public class RotateImage { BufferedImage bufNewImg = new BufferedImage(w, h, bufImgType); Graphics2D g = bufNewImg.createGraphics(); g.rotate(Math.toRadians(Double.parseDouble(angle)), w / 2.0, h / 2.0); - g.drawImage(bufImg,0,0,null); + g.drawImage(bufImg,0,0, null); g.dispose(); String mimeType = imageName.substring(imageName.lastIndexOf('.') + 1); diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java index 4952935..993f1cd 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java @@ -907,7 +907,7 @@ public class InventoryServices { } List<GenericValue> productPrices = null; try { - productPrices = EntityQuery.use(delegator).from("ProductPrice").where("productId",productId).orderBy("-fromDate").cache(true).queryList(); + productPrices = EntityQuery.use(delegator).from("ProductPrice").where("productId", productId).orderBy("-fromDate").cache(true).queryList(); } catch (GenericEntityException e) { Debug.logError(e, MODULE); } diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java index 2e69bf4..269af27 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java @@ -1240,7 +1240,7 @@ nextProd: if ( UtilValidate.isNotEmpty(isMarketingPackage) && isMarketingPackage) { Map<String, Object> resultOutput = new HashMap<>(); - resultOutput = dispatcher.runSync("getMktgPackagesAvailable", UtilMisc.toMap("productId" ,productId)); + resultOutput = dispatcher.runSync("getMktgPackagesAvailable", UtilMisc.toMap("productId" , productId)); Debug.logWarning("Error getting available marketing package.", MODULE); BigDecimal availableInventory = (BigDecimal) resultOutput.get("availableToPromiseTotal"); diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java b/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java index 1b20418..56a99a1 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/store/ProductStoreWorker.java @@ -479,7 +479,7 @@ public final class ProductStoreWorker { } public static List<GenericValue> getProductSurveys(Delegator delegator, String productStoreId, String productId, String surveyApplTypeId, String parentProductId) { - return getSurveys(delegator, productStoreId, null, productId, surveyApplTypeId,parentProductId); + return getSurveys(delegator, productStoreId, null, productId, surveyApplTypeId, parentProductId); } public static List<GenericValue> getSurveys(Delegator delegator, String productStoreId, String groupName, String productId, String surveyApplTypeId, String parentProductId) { diff --git a/applications/product/src/main/java/org/apache/ofbiz/product/supplier/SupplierProductServices.java b/applications/product/src/main/java/org/apache/ofbiz/product/supplier/SupplierProductServices.java index d301035..249e515 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/product/supplier/SupplierProductServices.java +++ b/applications/product/src/main/java/org/apache/ofbiz/product/supplier/SupplierProductServices.java @@ -69,7 +69,7 @@ public class SupplierProductServices { product = EntityQuery.use(delegator).from("Product").where("productId", productId).cache().queryOne(); if (product == null) { results = ServiceUtil.returnSuccess(); - results.put("supplierProducts",null); + results.put("supplierProducts", null); return results; } List<GenericValue> supplierProducts = product.getRelated("SupplierProduct", null, null, true); diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java index f0841a8..02785ff 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java +++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/shipment/ShipmentServices.java @@ -1152,7 +1152,7 @@ public class ShipmentServices { String carrierPartyId = primaryOrderItemShipGroup.getString("carrierPartyId"); String carrierRoleTypeId = primaryOrderItemShipGroup.getString("carrierRoleTypeId"); GenericValue productStoreShipmentMeth = EntityQuery.use(delegator).from("ProductStoreShipmentMeth") - .where("productStoreId",productStoreId, "shipmentMethodTypeId", shipmentMethodTypeId, + .where("productStoreId", productStoreId, "shipmentMethodTypeId", shipmentMethodTypeId, "partyId", carrierPartyId, "roleTypeId", carrierRoleTypeId) .queryFirst(); if (productStoreShipmentMeth != null) { diff --git a/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java b/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java index 182b687..eef3357 100644 --- a/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java +++ b/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java @@ -1660,7 +1660,7 @@ public class UpsServices { } private static void addPackageElement(DispatchContext dctx, Document requestDoc, Element shipmentElement, List<Map<String, Object>> shippableItemInfo, Map<String, BigDecimal> packageMap, BigDecimal minWeight) { - BigDecimal packageWeight = checkForDefaultPackageWeight(ShipmentWorker.calcPackageWeight(dctx,packageMap, shippableItemInfo, BigDecimal.ZERO), minWeight); + BigDecimal packageWeight = checkForDefaultPackageWeight(ShipmentWorker.calcPackageWeight(dctx, packageMap, shippableItemInfo, BigDecimal.ZERO), minWeight); Element packageElement = UtilXml.addChildElement(shipmentElement, "Package", requestDoc); Element packagingTypeElement = UtilXml.addChildElement(packageElement, "PackagingType", requestDoc); UtilXml.addChildElementValue(packagingTypeElement, "Code", "00", requestDoc); @@ -2911,7 +2911,7 @@ public class UpsServices { for (String thisServiceCode : upsRateCodeMap.keySet()) { if (serviceCode.equals(thisServiceCode)) { BigDecimal newRate = upsRateCodeMap.get(serviceCode); - thisUpsRateCodeMap.put(serviceCode,newRate); + thisUpsRateCodeMap.put(serviceCode, newRate); shippingRates.add(thisUpsRateCodeMap); } } diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java index b7d5600..dcbd6f0 100644 --- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java +++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java @@ -67,13 +67,13 @@ import org.apache.ofbiz.entity.util.EntityUtil; * Sub-tasks: WorkEffortAssoc.workEffortIdTo,workEffortIdFrom,workEffortAssocTypeId=WORK_EFF_BREAKDOWN for sub-tasks OR: (specific assoc and all sub-tasks) * Sub-tasks: WorkEffort.workEffortParentId tree * WorkEffortGoodStandard.productId - * WorkEffortPartyAssignment.partyId,roleTypeId + * WorkEffortPartyAssignment.partyId, roleTypeId * Planned for later: * WorkEffortFixedAssetAssign.fixedAssetId * WorkEffortContent.contentId,workEffortContentTypeId - * WorkEffortBilling.invoiceId,invoiceItemSeqId + * WorkEffortBilling.invoiceId, invoiceItemSeqId * CommunicationEventWorkEff.communicationEventId - * TimeEntry.partyId,rateTypeId,timesheetId,invoiceId,invoiceItemSeqId + * TimeEntry.partyId, rateTypeId,timesheetId, invoiceId, invoiceItemSeqId */ public class WorkEffortSearch { diff --git a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java index 9274cdd..c58f4da 100644 --- a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java +++ b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java @@ -196,14 +196,14 @@ public class WorkEffortSearchSession { String workEffortId=(String) parameters.get("SEARCH_WORK_EFFORT_ID"); String workEffortAssocTypeId=(String) parameters.get("workEffortAssocTypeId"); boolean includeAllSubWorkEfforts =!"N".equalsIgnoreCase((String) parameters.get("SEARCH_SUB_WORK_EFFORTS")); - searchAddConstraint(new WorkEffortSearch.WorkEffortAssocConstraint(workEffortId,workEffortAssocTypeId,includeAllSubWorkEfforts), session); + searchAddConstraint(new WorkEffortSearch.WorkEffortAssocConstraint(workEffortId,workEffortAssocTypeId, includeAllSubWorkEfforts), session); constraintsChanged = true; } // add a Work Effort Party Assignment to the search if (UtilValidate.isNotEmpty(parameters.get("partyId"))) { String partyId=(String) parameters.get("partyId"); String roleTypeId=(String) parameters.get("roleTypeId"); - searchAddConstraint(new WorkEffortSearch.PartyAssignmentConstraint(partyId,roleTypeId), session); + searchAddConstraint(new WorkEffortSearch.PartyAssignmentConstraint(partyId, roleTypeId), session); constraintsChanged = true; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |