[Fmsystem-commits] [17118] property, ticket-order: more on layout

[sigurdne]

Revision: 17118
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17118
Author:   sigurdne
Date:     2017-09-25 12:56:37 -0400 (Mon, 25 Sep 2017)
Log Message:
-----------
property, ticket-order: more on layout

Modified Paths:
--------------
    trunk/property/inc/class.uitts.inc.php

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2017-09-25 09:14:20 UTC (rev 
17117)
+++ trunk/property/inc/class.uitts.inc.php      2017-09-25 16:56:37 UTC (rev 
17118)
@@ -3686,6 +3686,7 @@
                                $id = phpgw::get_var('id'); // in case of bigint
                                $show_cost = phpgw::get_var('show_cost', 
'bool');
                        }
+                       
$GLOBALS['phpgw_info']['user']['preferences']['common']['account_display'] = 
'firstname';
 
                        if (!$show_cost)
                        {
@@ -3765,7 +3766,7 @@
                        }
 
                        $order_id = $ticket['order_id'];
-
+//account_display
                        $user_phone = 
$GLOBALS['phpgw_info']['user']['preferences']['property']['cellphone'];
                        $user_email = 
$GLOBALS['phpgw_info']['user']['preferences']['property']['email'];
                        $order_email_template = 
$GLOBALS['phpgw_info']['user']['preferences']['property']['order_email_template'];
@@ -3932,15 +3933,17 @@
                        if($location_exceptions)
                        {
                                $important_imformation .= "<b>" . 
lang('important information') . '</b>';
-                       }
-                       foreach ($location_exceptions as $location_exception)
-                       {
-                               $important_imformation .= "<br/>" . 
$location_exception['category_text'];
+                               $important_imformation_arr = array();
+                               foreach ($location_exceptions as 
$location_exception)
+                               {
+                                       $important_imformation_arr[] = 
$location_exception['category_text'];
 
-                               if($location_exception['location_descr'])
-                               {
-                                       $important_imformation .= "<br/>" . 
$location_exception['location_descr'];
+                                       
if($location_exception['location_descr'])
+                                       {
+                                               $important_imformation_arr[] = 
$location_exception['location_descr'];
+                                       }
                                }
+                               $important_imformation .= "\n" . implode("\n", 
$important_imformation_arr);
                        }
 
                        $body .= '<br/>'. nl2br(str_replace(array