X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fphonenumber.html;h=b1ae2aa2aa661948324c89397a1c87fbfd799d39;hb=51bf0e9b404cd6e4ae84435230447619269f77c0;hp=6e16ec0ad9b94c5ae7fd90726938d84bcb6ec9c4;hpb=580330233cbf32c58d9f29dc391bd2ebd83e16d5;p=freeside.git
diff --git a/httemplate/elements/phonenumber.html b/httemplate/elements/phonenumber.html
index 6e16ec0ad..b1ae2aa2a 100644
--- a/httemplate/elements/phonenumber.html
+++ b/httemplate/elements/phonenumber.html
@@ -1,17 +1,31 @@
-<%
- my( $number, %opt ) = @_;
- my $conf = new FS::Conf;
- ( my $snumber = $number ) =~ s/\D//g;
-%>
-
-
-
-
-<% if ( length($number) ) { %>
- <%= $number %>
- <% if ( $opt{'callable'} && $conf->config('vonage-username') ) { %>
-
- <% } %>
-<% } else { %>
+
+
+
+
+
+% if ( length($number) ) {
+
+ <% $number %>
+
+% if ( $opt{'callable'} && $curuser->option('vonage-username') ) {
+
+
+
+% }
+%
+% } else {
+
-<% } %>
+
+% }
+<%init>
+
+my( $number, %opt ) = @_;
+( my $snumber = $number ) =~ s/\D//g;
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+( my $vonage_number = $curuser->option('vonage-fromnumber') ) =~ s/\D//g;
+$vonage_number =~ /^1/ or $vonage_number = "1$vonage_number";
+
+%init>