diff options
author | Ivan Kohler <ivan@freeside.biz> | 2016-05-13 17:28:09 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2016-05-13 17:28:09 -0700 |
commit | 2ec92076c7dae5648da28e510efa1f733da9fd76 (patch) | |
tree | a32157c57824633517caab962baf56ae89c4dacc /httemplate/misc | |
parent | ec443f3ab9fd937325691b17974ea5aa7dce264d (diff) | |
parent | 039d72ae9e7adf98f46c3b4219100d57208c3685 (diff) |
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
Diffstat (limited to 'httemplate/misc')
-rw-r--r-- | httemplate/misc/make_appointment.html | 32 | ||||
-rw-r--r-- | httemplate/misc/process/payment.cgi | 5 |
2 files changed, 27 insertions, 10 deletions
diff --git a/httemplate/misc/make_appointment.html b/httemplate/misc/make_appointment.html index 6f308e0a8..79c3c2c89 100644 --- a/httemplate/misc/make_appointment.html +++ b/httemplate/misc/make_appointment.html @@ -6,13 +6,10 @@ <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $cgi->param('custnum') |h %>"> -% my @sched_item = qsearch('sched_item', { 'disabled' => '', }); -% my @username = map $_->access_user->username, @sched_item; -% foreach my $username (@username) { - <INPUT TYPE="hidden" NAME="username" VALUE="<% $username |h %>"> -% } - -Length: +<TABLE> +<TR> +<TD STYLE="text-align: right">Length:</TD> +<TD> <SELECT NAME="LengthMin"> % for ( my $hours = .5; $hours < 10.5; $hours += .5 ) { % my $min = $hours * 60; @@ -21,9 +18,26 @@ Length: ><% $hours %> hour<% $hours > 1 ? 's' : '' %> % } </SELECT> -<BR> -<BR> +</TD> +</TR> + +% my @sched_item = qsearch('sched_item', { 'disabled' => '', }); +% my @username = map $_->access_user->username, @sched_item; + +<TR> +<TD STYLE="text-align: right">Installer:</TD> +<TD> +<SELECT NAME="username" ID="username_select" MULTIPLE> +% foreach my $username (@username) { + <OPTION SELECTED><% $username |h %></OPTION> +% } +</SELECT> +</TD> +</TR> +</TABLE> + +<BR> <INPUT TYPE="submit" VALUE="Schedule appointment"> </FORM> diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi index a475786dd..dcfcc0b85 100644 --- a/httemplate/misc/process/payment.cgi +++ b/httemplate/misc/process/payment.cgi @@ -164,7 +164,10 @@ if ( $cgi->param('save') ) { #false laziness w/FS:;cust_main::realtime_bop - check both to make sure # working correctly if ( $payby eq 'CARD' && - grep { $_ eq cardtype($payinfo) } $conf->config('cvv-save') ) { + ( (grep { $_ eq cardtype($payinfo) } $conf->config('cvv-save')) + || $conf->exists('business-onlinepayment-verification') + ) + ) { $new->set( 'paycvv' => $paycvv ); } else { $new->set( 'paycvv' => ''); |