projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
edit
/
cust_main
/
first_pkg
/
select-part_pkg.html
diff --git
a/httemplate/edit/cust_main/first_pkg/select-part_pkg.html
b/httemplate/edit/cust_main/first_pkg/select-part_pkg.html
index
871e1cd
..
5f7b688
100644
(file)
--- a/
httemplate/edit/cust_main/first_pkg/select-part_pkg.html
+++ b/
httemplate/edit/cust_main/first_pkg/select-part_pkg.html
@@
-1,14
+1,12
@@
-<
% include('/elements/xmlhttp.html'
,
+<
& /elements/xmlhttp.html
,
'url' => $url_prefix.'misc/svc_acct-domains.cgi',
'subs' => [ $opt{'prefix'}. 'get_domains' ],
'url' => $url_prefix.'misc/svc_acct-domains.cgi',
'subs' => [ $opt{'prefix'}. 'get_domains' ],
- )
-%>
+&>
-<
% include('/elements/xmlhttp.html'
,
+<
& /elements/xmlhttp.html
,
'url' => $url_prefix.'misc/part_svc-columns.cgi',
'subs' => [ $opt{'prefix'}. 'get_part_svc' ],
'url' => $url_prefix.'misc/part_svc-columns.cgi',
'subs' => [ $opt{'prefix'}. 'get_part_svc' ],
- )
-%>
+&>
<INPUT TYPE="hidden" NAME="svcdb" VALUE="">
<INPUT TYPE="hidden" NAME="svcdb" VALUE="">
@@
-101,22
+99,19
@@
</SCRIPT>
</SCRIPT>
-<
% include( '/elements/selectlayers.html'
,
+<
& /elements/selectlayers.html
,
'field' => $opt{'prefix'}. 'pkgpart_svcpart',
'curr_value' => $opt{pkgpart_svcpart},
'options' => \@options,
'labels' => \%labels,
'html_between' => '</TD></TR></TABLE>',
'field' => $opt{'prefix'}. 'pkgpart_svcpart',
'curr_value' => $opt{pkgpart_svcpart},
'options' => \@options,
'labels' => \%labels,
'html_between' => '</TD></TR></TABLE>',
- #'onchange' => $opt{'prefix'}. 'pkgpart_svcpart_changed(this,0);',
'onchange' => $opt{'prefix'}. 'pkgpart_svcpart_changed_too(what,0)',
'onchange' => $opt{'prefix'}. 'pkgpart_svcpart_changed_too(what,0)',
-
'layer_callback' => $layer_callback,
'layermap' => \%layermap,
'layer_callback' => $layer_callback,
'layermap' => \%layermap,
- )
-%>
+&>
<SCRIPT TYPE="text/javascript">
<SCRIPT TYPE="text/javascript">
- pkgpart_svcpart_changed_too( document.
CustomerForm
.pkgpart_svcpart,
+ pkgpart_svcpart_changed_too( document.
<% $opt{form_name} || 'CustomerForm' %>
.pkgpart_svcpart,
<% $opt{saved_domsvc} %>
);
</SCRIPT>
<% $opt{saved_domsvc} %>
);
</SCRIPT>
@@
-132,9
+127,8
@@
$opt{saved_domsvc} = 0 unless $opt{saved_domsvc};
my $url_prefix = $opt{'relurls'} ? '' : $p;
my $url_prefix = $opt{'relurls'} ? '' : $p;
-my @part_pkg = @{$opt{'part_pkg'}};
-
-my @first_svc = ( 'svc_acct', 'svc_phone' );
+my @part_pkg = @{ $opt{'part_pkg'} };
+my @first_svc = @{ $opt{'first_svc'} || [] };
my %pkgpart_svcpart = ();
my %svcdb = ();
my %pkgpart_svcpart = ();
my %svcdb = ();
@@
-147,21
+141,20
@@
foreach my $part_pkg ( @part_pkg ) {
$layermap{$pkgpart_svcpart} = $svcdb{$pkgpart};
}
$layermap{$pkgpart_svcpart} = $svcdb{$pkgpart};
}
-my @options = ( '', map $pkgpart_svcpart{ $_->pkgpart }, @part_pkg );
+my @options = ();
+push @options, '' unless $opt{'disable_empty'};
+push @options, map $pkgpart_svcpart{ $_->pkgpart }, @part_pkg;
+my $label_method = $opt{no_comment} ? 'pkg_price_info' : 'pkg_comment' ;
my %labels = ( '' => ( $opt{'empty_label'} || '(none)' ),
my %labels = ( '' => ( $opt{'empty_label'} || '(none)' ),
- map { $pkgpart_svcpart{ $_->pkgpart } => $_->
pkg_comment
}
+ map { $pkgpart_svcpart{ $_->pkgpart } => $_->
$label_method()
}
@part_pkg
);
my $layer_callback = sub {
my $layer = shift;
@part_pkg
);
my $layer_callback = sub {
my $layer = shift;
- #$layer_fields, $layer_values, $layer_prefix
-
-# my( $pkgpart, $svcpart ) = split('_', $layer);
-# my $svcdb = $svcdb{$pkgpart};
my $svcdb = $layer;
my $svcdb = $layer;
- return '' unless $svcdb;
#'<BR><BR><BR><BR><BR>'
+ return '' unless $svcdb;
#full path cause we're being slung around as a coderef (mason closures?)
include("/edit/cust_main/first_pkg/$svcdb.html", %opt, );
#full path cause we're being slung around as a coderef (mason closures?)
include("/edit/cust_main/first_pkg/$svcdb.html", %opt, );