diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2012-07-26 14:05:08 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2012-07-26 14:05:08 -0700 |
| commit | 8c450aab9bae89373c2c1b35c85597bb52299de3 (patch) | |
| tree | 62e7400162703ad0990f80a2d71b90fc1167e759 /httemplate/edit | |
| parent | 2528cc7b182781a82844d8bbb1b555560487abc7 (diff) | |
| parent | bd647f16de5352722baed016b45baa4e7c695278 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/edit')
| -rw-r--r-- | httemplate/edit/payment_gateway.html | 7 | ||||
| -rw-r--r-- | httemplate/edit/prepay_credit.cgi | 10 | ||||
| -rw-r--r-- | httemplate/edit/radius_group.html | 1 | ||||
| -rw-r--r-- | httemplate/edit/svc_dsl.cgi | 24 |
4 files changed, 27 insertions, 15 deletions
diff --git a/httemplate/edit/payment_gateway.html b/httemplate/edit/payment_gateway.html index 2840df35b..e5897b035 100644 --- a/httemplate/edit/payment_gateway.html +++ b/httemplate/edit/payment_gateway.html @@ -19,8 +19,7 @@ <SCRIPT TYPE="text/javascript"> -% my $json = JSON->new->canonical; - var modulesForNamespace = <% $json->encode(\%modules_for_namespace) %>; + var modulesForNamespace = <% to_json(\%modules_for_namespace, {canonical=>1}) %>; function changeNamespace(what) { var ns = what.value; var select_module = document.getElementById('gateway_module'); @@ -68,7 +67,6 @@ my %modules = ( 'OpenECHO' => 'Business::OnlinePayment', 'PayConnect' => 'Business::OnlinePayment', 'PayflowPro' => 'Business::OnlinePayment', - 'Paymentech' => 'Business::BatchPayment', 'PaymenTech' => 'Business::OnlinePayment', 'PaymentsGateway' => 'Business::OnlinePayment', 'PayPal' => 'Business::OnlinePayment', @@ -90,6 +88,9 @@ my %modules = ( 'VirtualNet' => 'Business::OnlinePayment', 'WesternACH' => 'Business::OnlinePayment', 'WorldPay' => 'Business::OnlinePayment', + + 'KeyBank' => 'Business::BatchPayment', + 'Paymentech' => 'Business::BatchPayment', ); my %modules_for_namespace; diff --git a/httemplate/edit/prepay_credit.cgi b/httemplate/edit/prepay_credit.cgi index f7a1b0801..c03bbf990 100644 --- a/httemplate/edit/prepay_credit.cgi +++ b/httemplate/edit/prepay_credit.cgi @@ -18,13 +18,11 @@ prepaid cards of characters each -<BR>for <SELECT NAME="agentnum"><OPTION>(any agent) -% foreach my $opt_agent ( qsearch('agent', { 'disabled' => '' } ) ) { +<BR>for - <OPTION VALUE="<% $opt_agent->agentnum %>"<% $opt_agent->agentnum == $agentnum ? ' SELECTED' : '' %>><% $opt_agent->agent %> -% } - -</SELECT> +<& /elements/select-agent.html, + 'empty_label' => '(any agent)', +&> <TABLE> <TR><TD>Value: diff --git a/httemplate/edit/radius_group.html b/httemplate/edit/radius_group.html index 025561159..0c99b4c4c 100644 --- a/httemplate/edit/radius_group.html +++ b/httemplate/edit/radius_group.html @@ -8,6 +8,7 @@ 'attrnum' => 'Attribute', 'priority' => 'Priority', }, + 'viewall_dir' => 'browse', 'menubar' => \@menubar, 'edit_callback' => $edit_callback, 'error_callback' => $edit_callback, diff --git a/httemplate/edit/svc_dsl.cgi b/httemplate/edit/svc_dsl.cgi index 1aeadb376..36345b9c5 100644 --- a/httemplate/edit/svc_dsl.cgi +++ b/httemplate/edit/svc_dsl.cgi @@ -52,12 +52,24 @@ my $edit_cb = sub { elsif($export->exporttype eq 'ikano') { @fields = ( 'password', 'monitored', ); - foreach my $hf ( keys %$ti_fields ) { - push @fields, { - field => $hf, - type => 'hidden', - value => $svc_x->$hf, - } unless ( $hf eq 'password' || $hf eq 'monitored' ); + if ( $svc_x->vendor_qual_id ) { + push @fields, { field => 'vendor_qual_id', + type => 'hidden', + value => $svc_x->vendor_qual_id, + }; + } else { + push @fields, 'vendor_qual_id'; + } + + foreach my $hf ( + grep { $_ !~ /^(password|monitored|vendor_qual_id)$/ } + keys %$ti_fields + ) { + push @fields, { + field => $hf, + type => 'hidden', + value => $svc_x->$hf, + }; } } # else add any other export-specific stuff here |