[ofbiz-framework] branch trunk updated: Improved: Purchase Order Email Support (OFBIZ-11864)

This is an automated email from the ASF dual-hosted git repository.

jleroux 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 8b0d137  Improved: Purchase Order Email Support (OFBIZ-11864)
8b0d137 is described below

commit 8b0d137798ef32986f6ea0a7778c07f8750ddd23
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Mon Aug 3 19:41:11 2020 +0200

    Improved: Purchase Order Email Support (OFBIZ-11864)
   
    https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins
   
    There was something I did not understand.
    I got the same locally, but I have no history like in BuildBot.
   
    The only file changed in 1587 is a Groovy files and we get more errors than
    in  preceding build, ie 1586:
    https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1587/steps/check/logs/stdio
    https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1586/steps/check/logs/stdio
   
    The only Java file changed was OrderServices.java in #68d210
    Somehow Buildbot found this commit too early, it was in
    https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1589
   
    Anyway this fixes the formatting
---
 .../java/org/apache/ofbiz/order/order/OrderServices.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

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 da143c4..a8f178b 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
@@ -33,6 +33,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+
 import javax.transaction.Transaction;
 
 import org.apache.commons.lang.StringUtils;
@@ -7412,21 +7413,26 @@ public class OrderServices {
                 GenericValue orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne();
 
                 if (orderHeader != null && "PURCHASE_ORDER".equals(orderHeader.getString("orderTypeId"))) {
-                    GenericValue vendor = EntityQuery.use(delegator).from("OrderRole").where("orderId", orderId, "roleTypeId", "BILL_FROM_VENDOR").queryFirst();
+                    GenericValue vendor = EntityQuery.use(delegator).from("OrderRole").where("orderId", orderId, "roleTypeId", "BILL_FROM_VENDOR")
+                            .queryFirst();
                     if (vendor != null) {
                         String partyIdTo = vendor.getString("partyId");
                         GenericValue contactMech = PartyWorker.findPartyLatestContactMech(partyIdTo, "EMAIL_ADDRESS", delegator);
                         if (contactMech != null && contactMech.getString("infoString") != null) {
-                            GenericValue emailTemplateSetting = EntityQuery.use(delegator).from("EmailTemplateSetting").where("emailTemplateSettingId", emailTemplateSettingId).queryOne();
+                            GenericValue emailTemplateSetting = EntityQuery.use(delegator).from("EmailTemplateSetting")
+                                    .where("emailTemplateSettingId", emailTemplateSettingId).queryOne();
                             if (emailTemplateSetting != null) {
                                 String partyIdFrom = null;
-                                GenericValue company = EntityQuery.use(delegator).from("OrderRole").where("orderId", orderId, "roleTypeId", "BILL_TO_CUSTOMER").queryFirst();
+                                GenericValue company = EntityQuery.use(delegator).from("OrderRole")
+                                        .where("orderId", orderId, "roleTypeId", "BILL_TO_CUSTOMER").queryFirst();
                                 if (company != null) {
                                     partyIdFrom = company.getString("partyId");
                                 }
-                                Map<String, Object> bodyParameters = UtilMisc.toMap("orderId", orderId, "partyIdTo", partyIdTo, "partyIdFrom", partyIdFrom);
+                                Map<String, Object> bodyParameters = UtilMisc.toMap("orderId", orderId, "partyIdTo", partyIdTo, "partyIdFrom",
+                                        partyIdFrom);
 
-                                Map<String, Object> emailCtx = UtilMisc.toMap("emailTemplateSettingId", emailTemplateSettingId, "sendTo", contactMech.getString("infoString"), "bodyParameters", bodyParameters);
+                                Map<String, Object> emailCtx = UtilMisc.toMap("emailTemplateSettingId", emailTemplateSettingId, "sendTo",
+                                        contactMech.getString("infoString"), "bodyParameters", bodyParameters);
                                 emailCtx.put("userLogin", userLogin);
                                 dispatcher.runAsync("sendMailFromTemplateSetting", emailCtx);
                             }