[ofbiz-framework] branch release17.12 updated: Fixed: Order Status History section broken for anonymous order (OFBIZ-11231)

[Pawan Verma-2]

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

pawan pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release17.12 by this push:
     new 6c75966  Fixed: Order Status History section broken for anonymous order (OFBIZ-11231)
6c75966 is described below

commit 6c75966c9076665998825b601cf509d8ad55b2e0
Author: Pawan Verma <[hidden email]>
AuthorDate: Sat Jan 25 12:02:48 2020 +0530

    Fixed: Order Status History section broken for anonymous order
    (OFBIZ-11231)
   
    Reason for the issue: Anonymous orders doen't have associated User login record, so shown statusUserLogin in that case.
---
 applications/order/template/order/OrderInfo.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/order/template/order/OrderInfo.ftl b/applications/order/template/order/OrderInfo.ftl
index 5d32a5d..33c3e77 100644
--- a/applications/order/template/order/OrderInfo.ftl
+++ b/applications/order/template/order/OrderInfo.ftl
@@ -119,7 +119,7 @@ under the License.
                     <div>
                       ${loopStatusItem.get("description",locale)} <#if orderHeaderStatus.statusDatetime?has_content>- ${Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderHeaderStatus.statusDatetime, "", locale, timeZone)?default("0000-00-00 00:00:00")}</#if>
                       &nbsp;
-                      ${uiLabelMap.CommonBy} - ${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, userlogin.getString("partyId"), false)}
+                      ${uiLabelMap.CommonBy} - ${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, userlogin.getString("partyId"), false)!orderHeaderStatus.statusUserLogin!}
                     </div>
                   </#list>
                 </#if>