[freeside-commits] branch master updated. 8b7aa84ac466a5094f54fba06e80bab45599bb8d

[Ivan]

The branch, master has been updated
       via  8b7aa84ac466a5094f54fba06e80bab45599bb8d (commit)
      from  374f5934e8dba44b7abb8041af7fc9e640e316a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8b7aa84ac466a5094f54fba06e80bab45599bb8d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Dec 21 18:26:02 2016 -0800

    Add mobile number to ticketing view, RT#73861

diff --git a/FS/FS/UI/Web/small_custview.pm b/FS/FS/UI/Web/small_custview.pm
index e82e332..85bee7d 100644
--- a/FS/FS/UI/Web/small_custview.pm
+++ b/FS/FS/UI/Web/small_custview.pm
@@ -142,16 +142,25 @@ sub small_custview {
   }
 
   $html .= '</TD></TR><TR><TD></TD><TD BGCOLOR="#ffffff">';
-  if ( $cust_main->daytime && $cust_main->night ) {
-    $html .= ( FS::Msgcat::_gettext('daytime') || 'Day' ).
-             ' '. $cust_main->daytime.
-             '<BR>'. ( FS::Msgcat::_gettext('night') || 'Night' ).
-             ' '. $cust_main->night;
-  } elsif ( $cust_main->daytime || $cust_main->night ) {
-    $html .= $cust_main->daytime || $cust_main->night;
+
+  my $num_numbers = 0;
+  $num_numbers++ foreach grep $cust_main->$_(), qw( daytime night mobile );
+  if ( $num_numbers > 1 ) {
+    $html .= ucfirst( FS::Msgcat::_gettext('daytime') ).
+             ' '. $cust_main->daytime. '<BR>'
+      if $cust_main->daytime;
+    $html .= ucfirst( FS::Msgcat::_gettext('night') ).
+             ' '. $cust_main->night. '<BR>'
+      if $cust_main->night;
+    $html .= ucfirst( FS::Msgcat::_gettext('mobile') ).
+             ' '. $cust_main->mobile. '<BR>'
+      if $cust_main->night;
+  } elsif ( $num_numbers ) { # == 1 ) {
+    $html .= ( $cust_main->daytime || $cust_main->night || $cust_main->mobile ).
+             '<BR>';
   }
   if ( $cust_main->fax ) {
-    $html .= '<BR>Fax '. $cust_main->fax;
+    $html .= 'Fax '. $cust_main->fax;
   }
 
   $html .= '</TD></TR></TABLE></TD>';

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/UI/Web/small_custview.pm |   25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)