[freeside-commits] branch master updated. c06ef78a4489576a58581a06d366a0d1f040d2e5
Ivan
ivan at 420.am
Sun Jan 18 14:48:35 PST 2015
The branch, master has been updated
via c06ef78a4489576a58581a06d366a0d1f040d2e5 (commit)
via 5aa599f2cda2c7923c162440e94ed8a931ffe8ac (commit)
via 79387d4530ffb226794c6c4c5c8c5a7284ae29da (commit)
from b236325052e32facaad168cbf0f370eebd4fd1f9 (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 c06ef78a4489576a58581a06d366a0d1f040d2e5
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sun Jan 18 14:48:34 2015 -0800
fix order package for quotes: don't display irrelevant fields, RT#22232 et al
diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 672e142..799165f 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -77,43 +77,47 @@
<& /elements/tr-input-pkg-quantity.html, curr_value => $quantity &>
-% if ( $cust_main && $cust_main->payby =~ /^(CARD|CHEK)$/ ) {
-% my $what = lc(FS::payby->shortname($cust_main->payby));
+% unless ( $quotationnum ) {
+
+% if ( $cust_main && $cust_main->payby =~ /^(CARD|CHEK)$/ ) {
+% my $what = lc(FS::payby->shortname($cust_main->payby));
+ <TR>
+ <TH ALIGN="right"><% mt("Disable automatic $what charge") |h %> </TH>
+ <TD COLSPAN=6><INPUT TYPE="checkbox" NAME="no_auto" VALUE="Y"></TD>
+ </TR>
+% }
+
<TR>
- <TH ALIGN="right"><% mt("Disable automatic $what charge") |h %> </TH>
- <TD COLSPAN=6><INPUT TYPE="checkbox" NAME="no_auto" VALUE="Y"></TD>
+ <TH ALIGN="right"><% mt('Start') |h %> </TD>
+ <TD COLSPAN=6>
+ <INPUT TYPE="radio" NAME="start" ID="start_now" VALUE="" <% $cgi->param('start') eq '' ? 'CHECKED' : ''%>>Now
+
+ <INPUT TYPE="radio" NAME="start" ID="start_on_hold" VALUE="on_hold" <% $cgi->param('start') eq 'on_hold' ? 'CHECKED' : ''%>>On hold
+
+ <INPUT TYPE="radio" NAME="start" ID="start_on_date" VALUE="on_date" <% $cgi->param('start') eq 'date' ? 'CHECKED' : ''%>>On date
+
+ <& /elements/input-date-field.html,{
+ 'name' => 'start_date',
+ 'format' => $date_format,
+ 'value' => '',
+ 'noinit' => 1,
+ } &>
+ </TD>
</TR>
-% }
-<TR>
- <TH ALIGN="right"><% mt('Start') |h %> </TD>
- <TD COLSPAN=6>
- <INPUT TYPE="radio" NAME="start" ID="start_now" VALUE="" <% $cgi->param('start') eq '' ? 'CHECKED' : ''%>>Now
-
- <INPUT TYPE="radio" NAME="start" ID="start_on_hold" VALUE="on_hold" <% $cgi->param('start') eq 'on_hold' ? 'CHECKED' : ''%>>On hold
-
- <INPUT TYPE="radio" NAME="start" ID="start_on_date" VALUE="on_date" <% $cgi->param('start') eq 'date' ? 'CHECKED' : ''%>>On date
-
- <& /elements/input-date-field.html,{
- 'name' => 'start_date',
- 'format' => $date_format,
- 'value' => '',
- 'noinit' => 1,
- } &>
- </TD>
-</TR>
-
-<TR>
- <TH ALIGN="right"><% mt('Contract end date') |h %> </TD>
- <TD COLSPAN=6>
- <& /elements/input-date-field.html,{
- 'name' => 'contract_end',
- 'format' => $date_format,
- 'value' => '',
- 'noinit' => 1,
- } &>
- </TD>
-</TR>
+ <TR>
+ <TH ALIGN="right"><% mt('Contract end date') |h %> </TD>
+ <TD COLSPAN=6>
+ <& /elements/input-date-field.html,{
+ 'name' => 'contract_end',
+ 'format' => $date_format,
+ 'value' => '',
+ 'noinit' => 1,
+ } &>
+ </TD>
+ </TR>
+
+% }
</TABLE><BR>
commit 5aa599f2cda2c7923c162440e94ed8a931ffe8ac
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sun Jan 18 14:42:40 2015 -0800
fix coordinate links with aposrophies, RT#31079
diff --git a/httemplate/elements/coord-links.html b/httemplate/elements/coord-links.html
index c885ade..45b8132 100644
--- a/httemplate/elements/coord-links.html
+++ b/httemplate/elements/coord-links.html
@@ -40,7 +40,7 @@ my $query = 'name='. uri_escape_utf8($name).
';lon='. $longitude;
my $js_name = $name;
-$js_name =~ s/[<>"]/ /g;
+$js_name =~ s/[<>"']/ /g;
$m->interp->apply_escapes($js_name, 'js_string');
$js_name =~ s/^'//;
$js_name =~ s/'$//;
commit 79387d4530ffb226794c6c4c5c8c5a7284ae29da
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sun Jan 18 14:41:37 2015 -0800
fix contact self-service password reset link vs. outlook, RT#32657
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index c232c45..9443a7d 100755
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
use strict;
-use vars qw($DEBUG $cgi $session_id $form_max $template_dir);
+use vars qw($DEBUG $cgi $session_id $pw_session_id $form_max $template_dir);
use subs qw(do_template);
use CGI;
use CGI::Carp qw(fatalsToBrowser);
@@ -97,7 +97,7 @@ my $action = 'myaccount'; # sensible default
if ( $cgi->param('action') =~ /^process_forgot_password_session_(\w+)$/ ) {
$action = 'process_forgot_password_session';
- $session_id = $1;
+ $pw_session_id = $1;
} elsif ( $cgi->param('action') =~ /^(\w+)$/ ) {
if (grep {$_ eq $1} @actions) {
$action = $1;
@@ -1059,7 +1059,7 @@ sub process_forgot_password {
sub process_forgot_password_session {
$action = 'process_forgot_password';
check_reset_passwd(
- 'session_id' => $session_id,
+ 'session_id' => $pw_session_id,
);
}
-----------------------------------------------------------------------
Summary of changes:
fs_selfservice/FS-SelfService/cgi/selfservice.cgi | 6 +-
httemplate/elements/coord-links.html | 2 +-
httemplate/misc/order_pkg.html | 72 +++++++++++----------
3 files changed, 42 insertions(+), 38 deletions(-)
More information about the freeside-commits
mailing list