From: Ivan Kohler Date: Wed, 13 Sep 2017 00:12:03 +0000 (-0700) Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=6f94e176aa7b143eb9f1fa5c3a1cdd362361636f;hp=2f0ad153c1481f9fbe257834319919008c45a275 Merge branch 'master' of git.freeside.biz:/home/git/freeside --- diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 6a02b0b14..ed72354dd 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -900,7 +900,7 @@ my $validate_email = sub { $_[0] =~ { 'key' => 'email-to-voice_domain', 'section' => 'email_to_voice_services', - 'description' => 'The domain name used to send emails to a 3rd party email to voice service. You will be able to select a phone number to append to this domain on the email customer page or when using the email to voice billing event action.', + 'description' => 'The domain name that phone numbers will be attached to for sending email to voice emails via a 3rd party email to voice service. You will get this domain from your email to voice service provider. This is utilized on the email customer page or when using the email to voice billing event action. There you will be able to select the phone number for the email to voice service.', 'type' => 'text', 'per_agent' => 1, }, diff --git a/httemplate/elements/change_password.html b/httemplate/elements/change_password.html index 463384f2f..7d95e19dc 100644 --- a/httemplate/elements/change_password.html +++ b/httemplate/elements/change_password.html @@ -13,7 +13,7 @@ % }
% if (!$opt{'noformtag'}) { -
+ % } <% $change_id_input %> @@ -33,9 +33,6 @@ 'contactnum' => $opt{'contact_num'}, 'submitid' => $change_button_id, &> -% if ( $error ) { -
<% $error |h %> -% } % if (!$opt{'noformtag'}) {
@@ -58,6 +55,16 @@ function <%$pre%>toggle(toggle, clear) { toggle ? 'none' : 'inline'; % } } + +function checkPasswordValidation() { + var validationResult = document.getElementById('<%$pre%>password_result').innerHTML; + if (validationResult.match(/Password valid!/)) { + return true; + } + else { + return false; + } +} <%init> my %opt = @_; diff --git a/httemplate/elements/validate_password.html b/httemplate/elements/validate_password.html index 3d23a552c..4057f5d3f 100644 --- a/httemplate/elements/validate_password.html +++ b/httemplate/elements/validate_password.html @@ -22,6 +22,17 @@ should be the input id plus '_result'. + + +

Please select your location on the map

+ + + + + +
+ +

+ Census Tract:

+ +
+
+
+ + + + + +<%init> + +local $SIG{__DIE__}; #disable Mason error trap + +my $DEBUG = 0; + +my $census_year = $cgi->param('census_year'); +my $pre = $cgi->param('pre'); +my $zip_code = $cgi->param('zip_code'); +my $address = $cgi->param('address'); +my $loc = $zip_code ? $zip_code : $address; + + \ No newline at end of file diff --git a/httemplate/misc/process/change-password.html b/httemplate/misc/process/change-password.html index be83786cd..a3e060168 100644 --- a/httemplate/misc/process/change-password.html +++ b/httemplate/misc/process/change-password.html @@ -7,6 +7,7 @@ % $cgi->param('contactnum', $contactnum); % $cgi->param("changepw${contactnum}_error", $error); % } +% $cgi->param('error', $error); % } else { % if ($svcnum) { $cgi->query_string($svcnum); } % elsif ($contactnum) { $cgi->query_string($contactnum); } @@ -52,7 +53,7 @@ if ($svcnum) { ! $part_svc->restrict_edit_password ) ); - my $error = $svc_acct->is_password_allowed($newpass) + $error = $svc_acct->is_password_allowed($newpass) || $svc_acct->set_password($newpass) || $svc_acct->replace; @@ -63,7 +64,7 @@ elsif ($contactnum) { my $contact = qsearchs('contact', { 'contactnum' => $contactnum } ) or return { 'error' => "Contact not found" . $contactnum }; - my $error = $contact->is_password_allowed($newpass) + $error = $contact->is_password_allowed($newpass) || $contact->change_password($newpass); # annoyingly specific to view/svc_acct.cgi, for now... diff --git a/httemplate/misc/xmlhttp-censustract.html b/httemplate/misc/xmlhttp-censustract.html new file mode 100644 index 000000000..8a7686047 --- /dev/null +++ b/httemplate/misc/xmlhttp-censustract.html @@ -0,0 +1,14 @@ +<% $return %>\ +<%init> + +my $DEBUG = 0; + +my $conf = new FS::Conf; + +my $return = {}; +my $url = "http://data.fcc.gov/api/block/find?format=json&censusYear=" . $cgi->param('census_year') . "&latitude=" . $cgi->param('lat') . "&longitude=" . $cgi->param('lon'); + +use LWP::Simple; +my $return = get $url; + + \ No newline at end of file diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi index 747477989..026effb45 100755 --- a/httemplate/view/svc_acct.cgi +++ b/httemplate/view/svc_acct.cgi @@ -20,8 +20,9 @@ "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')", ) &> -% } +% } +<& /elements/error.html &> <& elements/svc_radius_usage.html, 'svc' => $svc_acct,