diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2019-07-26 11:14:05 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2019-07-26 11:14:05 -0700 |
| commit | 07ed221540128b8c75f4cb5a2af1e01b25fa8e18 (patch) | |
| tree | aeec9af09cc1b47752bdf4bc636ff1b64f41310c /httemplate/view | |
| parent | 14f234a943f1e4b5bbc6fe90254b8f5ca677f028 (diff) | |
| parent | 2009d9cee8038aeff5b4313113fc23f546455cf5 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/view')
| -rw-r--r-- | httemplate/view/cust_main/contacts_new.html | 4 | ||||
| -rw-r--r-- | httemplate/view/svc_export/run_script.cgi | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/httemplate/view/cust_main/contacts_new.html b/httemplate/view/cust_main/contacts_new.html index 9252b2197..0fdcc5371 100644 --- a/httemplate/view/cust_main/contacts_new.html +++ b/httemplate/view/cust_main/contacts_new.html @@ -13,7 +13,7 @@ <%$th%>Send messages</TH> <%$th%>Self-service</TH> % foreach my $phone_type (@phone_type) { - <%$th%><% $phone_type->typename |h %></TH> + <%$th%><% $phone_type->typename |h %> phone</TH> % } <%$th%>Comment</TH> </TR> @@ -80,7 +80,7 @@ %} <%once> -my @phone_type = qsearch({table=>'phone_type', order_by=>'weight'}); +my @phone_type = FS::phone_type->get_phone_types(); </%once> <%init> diff --git a/httemplate/view/svc_export/run_script.cgi b/httemplate/view/svc_export/run_script.cgi index ba58bbdd7..f0524991b 100644 --- a/httemplate/view/svc_export/run_script.cgi +++ b/httemplate/view/svc_export/run_script.cgi @@ -14,17 +14,13 @@ my %param = (); } } -my $exportnum; -my $method; -for (grep /^*_script$/, keys %param) { - $exportnum = $param{$param{$_}.'_exportnum'}; - $method = $param{$param{$_}.'_script'}; -} +my $run_script = $param{'key'}; +my $exportnum = $param{$run_script.'_exportnum'}; my $part_export = qsearchs('part_export', { 'exportnum'=> $exportnum, } ) or die "unknown exportnum $exportnum"; -my $class = 'FS::part_export::'.$part_export->{Hash}->{exporttype}.'::'.$method; +my $class = 'FS::part_export::'.$part_export->{Hash}->{exporttype}.'::'.$run_script; my $server = new FS::UI::Web::JSRPC $class, $cgi; |