[freeside-commits] freeside/httemplate/edit part_svc.cgi, 1.53,
1.54 svc_acct.cgi, 1.43, 1.44 svc_broadband.cgi, 1.12,
1.13 svc_Common.html, NONE, 1.1 svc_domain.cgi, 1.13,
1.14 svc_external.cgi, 1.3, 1.4 svc_forward.cgi, 1.18,
1.19 svc_www.cgi, 1.18, 1.19
Ivan,,,
ivan at wavetail.420.am
Fri Dec 29 00:51:34 PST 2006
- Previous message: [freeside-commits] freeside/httemplate/edit/elements
svc_Common.html, 1.2, 1.3 edit.html, 1.10, 1.11
- Next message: [freeside-commits] freeside/FS/FS cust_svc.pm, 1.65,
1.66 part_svc.pm, 1.29, 1.30 svc_broadband.pm, 1.8,
1.9 svc_Common.pm, 1.38, 1.39 svc_domain.pm, 1.46,
1.47 svc_External_Common.pm, NONE, 1.1 svc_external.pm, 1.4,
1.5 svc_Parent_Mixin.pm, NONE, 1.1 svc_forward.pm, 1.19,
1.20 svc_phone.pm, 1.1, 1.2 svc_www.pm, 1.13, 1.14 Record.pm,
1.129, 1.130 cust_main.pm, 1.258, 1.259 registrar.pm, NONE,
1.1 svc_acct.pm, 1.209, 1.210 Schema.pm, 1.39,
1.40 cust_pkg.pm, 1.68, 1.69 pkg_svc.pm, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail:/tmp/cvs-serv4384/httemplate/edit
Modified Files:
part_svc.cgi svc_acct.cgi svc_broadband.cgi svc_domain.cgi
svc_external.cgi svc_forward.cgi svc_www.cgi
Added Files:
svc_Common.html
Log Message:
service refactor!
--- NEW FILE: svc_Common.html ---
<%init>
# false laziness w/view/svc_Common.html
$cgi->param('svcdb') =~ /^(svc_\w+)$/ or die "unparsable svcdb";
my $table = $1;
require "FS/$table.pm";
my %opt;
if ( UNIVERSAL::can("FS::$table", 'table_info') ) {
$opt{'name'} = "FS::$table"->table_info->{'name'};
my $fields = "FS::$table"->table_info->{'fields'};
my %labels = map { $_ => ( ref($fields->{$_})
? $fields->{$_}{'label'}
: $fields->{$_}
);
}
keys %$fields;
$opt{'labels'} = \%labels;
}
</%init>
<% include('elements/svc_Common.html',
'table' => $table,
'post_url' => popurl(1). "process/svc_Common.html",
%opt,
)
%>
Index: svc_domain.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_domain.cgi,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- svc_domain.cgi 23 Aug 2006 22:25:37 -0000 1.13
+++ svc_domain.cgi 29 Dec 2006 08:51:32 -0000 1.14
@@ -1,8 +1,7 @@
-%
-%
%my($svcnum, $pkgnum, $svcpart, $kludge_action, $purpose, $part_svc,
% $svc_domain);
%if ( $cgi->param('error') ) {
+%
% $svc_domain = new FS::svc_domain ( {
% map { $_, scalar($cgi->param($_)) } fields('svc_domain')
% } );
@@ -13,40 +12,41 @@
% $purpose = $cgi->param('purpose');
% $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } );
% die "No part_svc entry!" unless $part_svc;
-%} else {
-% $kludge_action = '';
-% $purpose = '';
-% my($query) = $cgi->keywords;
-% if ( $query =~ /^(\d+)$/ ) { #editing
-% $svcnum=$1;
-% $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
-% or die "Unknown (svc_domain) svcnum!";
%
-% my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-% or die "Unknown (cust_svc) svcnum!";
+%} elsif ( $cgi->param('pkgnum') && $cgi->param('svcpart') ) { #adding
%
-% $pkgnum=$cust_svc->pkgnum;
-% $svcpart=$cust_svc->svcpart;
+% $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum';
+% $pkgnum = $1;
+% $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart';
+% $svcpart = $1;
%
-% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-% die "No part_svc entry!" unless $part_svc;
+% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+% die "No part_svc entry!" unless $part_svc;
%
-% } else { #adding
+% $svc_domain = new FS::svc_domain({});
%
-% $svc_domain = new FS::svc_domain({});
-%
-% foreach $_ (split(/-/,$query)) {
-% $pkgnum=$1 if /^pkgnum(\d+)$/;
-% $svcpart=$1 if /^svcpart(\d+)$/;
-% }
-% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-% die "No part_svc entry!" unless $part_svc;
+% $svcnum='';
%
-% $svcnum='';
+% $svc_domain->set_default_and_fixed;
%
-% $svc_domain->set_default_and_fixed;
+%} else { #editing
%
-% }
+% $kludge_action = '';
+% $purpose = '';
+% my($query) = $cgi->keywords;
+% $query =~ /^(\d+)$/ or die "unparsable svcnum";
+% $svcnum=$1;
+% $svc_domain=qsearchs('svc_domain',{'svcnum'=>$svcnum})
+% or die "Unknown (svc_domain) svcnum!";
+%
+% my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+% or die "Unknown (cust_svc) svcnum!";
+%
+% $pkgnum=$cust_svc->pkgnum;
+% $svcpart=$cust_svc->svcpart;
+%
+% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+% die "No part_svc entry!" unless $part_svc;
%
%}
%my $action = $svcnum ? 'Edit' : 'Add';
Index: svc_www.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_www.cgi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- svc_www.cgi 25 Oct 2006 03:12:09 -0000 1.18
+++ svc_www.cgi 29 Dec 2006 08:51:32 -0000 1.19
@@ -1,10 +1,9 @@
-<!-- mason kludge -->
-%
-%
%my $conf = new FS::Conf;
%
%my( $svcnum, $pkgnum, $svcpart, $part_svc, $svc_www );
+%
%if ( $cgi->param('error') ) {
+%
% $svc_www = new FS::svc_www ( {
% map { $_, scalar($cgi->param($_)) } fields('svc_www')
% } );
@@ -13,38 +12,40 @@
% $svcpart = $cgi->param('svcpart');
% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
% die "No part_svc entry!" unless $part_svc;
-%} else {
-% my($query) = $cgi->keywords;
-% if ( $query =~ /^(\d+)$/ ) { #editing
-% $svcnum=$1;
-% $svc_www=qsearchs('svc_www',{'svcnum'=>$svcnum})
-% or die "Unknown (svc_www) svcnum!";
%
-% my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-% or die "Unknown (cust_svc) svcnum!";
+%} elsif ( $cgi->param('pkgnum') && $cgi->param('svcpart') ) { #adding
%
-% $pkgnum=$cust_svc->pkgnum;
-% $svcpart=$cust_svc->svcpart;
-%
-% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-% die "No part_svc entry!" unless $part_svc;
+% $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum';
+% $pkgnum = $1;
+% $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart';
+% $svcpart = $1;
%
-% } else { #adding
+% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+% die "No part_svc entry!" unless $part_svc;
%
-% foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-% $pkgnum=$1 if /^pkgnum(\d+)$/;
-% $svcpart=$1 if /^svcpart(\d+)$/;
-% }
-% $svc_www = new FS::svc_www { svcpart => $svcpart };
+% $svc_www = new FS::svc_www { svcpart => $svcpart };
%
-% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-% die "No part_svc entry!" unless $part_svc;
+% $svcnum='';
%
-% $svcnum='';
+% $svc_www->set_default_and_fixed;
%
-% $svc_www->set_default_and_fixed;
+%} else { #editing
+%
+% my($query) = $cgi->keywords;
+% $query =~ /^(\d+)$/ or die "unparsable svcnum";
+% $svcnum=$1;
+% $svc_www=qsearchs('svc_www',{'svcnum'=>$svcnum})
+% or die "Unknown (svc_www) svcnum!";
+%
+% my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+% or die "Unknown (cust_svc) svcnum!";
+%
+% $pkgnum=$cust_svc->pkgnum;
+% $svcpart=$cust_svc->svcpart;
+%
+% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+% die "No part_svc entry!" unless $part_svc;
%
-% }
%}
%my $action = $svc_www->svcnum ? 'Edit' : 'Add';
%
Index: part_svc.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/part_svc.cgi,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- part_svc.cgi 25 Oct 2006 02:22:33 -0000 1.53
+++ part_svc.cgi 29 Dec 2006 08:51:32 -0000 1.54
@@ -55,159 +55,37 @@
values, or select an inventory class to manually or automatically fill in
that field.
<BR><BR>
-%
-%
-%#these might belong somewhere else for other user interfaces
-%#pry need to eventually create stuff that's shared amount UIs
-%my $conf = new FS::Conf;
-%my %defs = (
-%
-% 'svc_acct' => {
-% 'dir' => 'Home directory',
-% 'uid' => 'UID (set to fixed and blank for no UIDs)',
-% 'slipip' => 'IP address',
-%# 'popnum' => qq!<A HREF="$p/browse/svc_acct_pop.cgi/">POP number</A>!,
-% 'popnum' => {
-% desc => 'Access number',
-% type => 'select',
-% select_table => 'svc_acct_pop',
-% select_key => 'popnum',
-% select_label => 'city',
-% disable_select => 1,
-% },
-% 'username' => {
-% desc => 'Username',
-% type => 'text',
-% disable_default => 1,
-% disable_fixed => 1,
-% disable_select => 1,
-% },
-% 'quota' => {
-% desc => '',
-% type => 'text',
-% disable_inventory => 1,
-% disable_select => 1,
-% },
-% '_password' => 'Password',
-% 'gid' => 'GID (when blank, defaults to UID)',
-% 'shell' => {
-% #desc =>'Shell (all service definitions should have a default or fixed shell that is present in the <b>shells</b> configuration file, set to blank for no shell tracking)',
-% desc =>'Shell ( set to blank for no shell tracking)',
-% type =>'select',
-% select_list => [ $conf->config('shells') ],
-% disable_inventory => 1,
-% disable_select => 1,
-% },
-% 'finger' => 'Real name (GECOS)',
-% 'domsvc' => {
-% desc =>'svcnum from svc_domain',
-% type =>'select',
-% select_table => 'svc_domain',
-% select_key => 'svcnum',
-% select_label => 'domain',
-% disable_inventory => 1,
-% disable_select => 1,
-% },
-% 'usergroup' => {
-% desc =>'RADIUS groups',
-% type =>'radius_usergroup_selector',
-% disable_select => 1,
-% disable_inventory => 1,
-% },
-% 'seconds' => { desc => '',
-% type => 'text',
-% disable_inventory => 1,
-% disable_select => 1,
-% },
-% },
-%
-% 'svc_domain' => {
-% 'domain' => 'Domain',
-% },
-%
-% 'svc_forward' => {
-% 'srcsvc' => 'service from which mail is to be forwarded',
-% 'dstsvc' => 'service to which mail is to be forwarded',
-% 'dst' => 'someone at another.domain.com to use when dstsvc is 0',
-% },
-%
-%# 'svc_charge' => {
-%# 'amount' => 'amount',
-%# },
-%# 'svc_wo' => {
-%# 'worker' => 'Worker',
-%# '_date' => 'Date',
-%# },
-%
-% 'svc_www' => {
-% #'recnum' => '',
-% #'usersvc' => '',
-% },
-%
-% 'svc_broadband' => {
-% 'speed_down' => 'Maximum download speed for this service in Kbps. 0 denotes unlimited.',
-% 'speed_up' => 'Maximum upload speed for this service in Kbps. 0 denotes unlimited.',
-% 'ip_addr' => 'IP address. Leave blank for automatic assignment.',
-% 'blocknum' => 'Address block.',
-% },
-%
-% 'svc_phone' => {
-% 'countrycode' => { desc => 'Country code',
-% type => 'text',
-% disable_inventory => 1,
-% disable_select => 1,
-% },
-% 'phonenum' => 'Phone number',
-% 'pin' => { desc => 'Personal Identification Number',
-% type => 'text',
-% disable_inventory => 1,
-% disable_select => 1,
-% },
-% },
-%
-% 'svc_external' => {
-% #'id' => '',
-% #'title' => '',
-% },
-%
-%);
-%
-% my %vfields;
-% foreach my $svcdb (grep dbdef->table($_), keys %defs ) {
-% my $self = "FS::$svcdb"->new;
-% $vfields{$svcdb} = {};
-% foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
-% my $pvf = $self->pvf($field);
-% my @list = $pvf->list;
-% if (scalar @list) {
-% $defs{$svcdb}->{$field} = { desc => $pvf->label,
-% type => 'select',
-% select_list => \@list };
-% } else {
-% $defs{$svcdb}->{$field} = $pvf->label;
-% } #endif
-% $vfields{$svcdb}->{$field} = $pvf;
-% warn "\$vfields{$svcdb}->{$field} = $pvf";
-% } #next $field
-% } #next $svcdb
+
+% #YUCK. false laziness w/part_svc.pm. go away virtual fields, please
+% my %vfields;
+% foreach my $svcdb ( FS::part_svc->svc_tables() ) {
+% eval "use FS::$svcdb;";
+% my $self = "FS::$svcdb"->new;
+% $vfields{$svcdb} = {};
+% foreach my $field ($self->virtual_fields) { # svc_Common::virtual_fields with a null svcpart returns all of them
+% my $pvf = $self->pvf($field);
+% $vfields{$svcdb}->{$field} = $pvf;
+% #warn "\$vfields{$svcdb}->{$field} = $pvf";
+% } #next $field
+% } #next $svcdb
%
% #code duplication w/ edit/part_svc.cgi, should move this hash to part_svc.pm
% # and generalize the subs
% # condition sub is tested to see whether to disable display of this choice
% # params: ( $def, $layer, $field ) (see SUB below)
% my $inv_sub = sub {
-% ref($_[0]) && ( $_[0]->{disable_inventory}
-% || $_[0]->{'type'} ne 'text' )
-% };
+% $_[0]->{disable_inventory}
+% || $_[0]->{'type'} ne 'text'
+% };
% tie my %flag, 'Tie::IxHash',
% '' => { 'desc' => 'No default', },
% 'D' => { 'desc' => 'Default',
% 'condition' =>
-% sub { ref($_[0]) && $_[0]->{disable_default} },
+% sub { $_[0]->{disable_default} },
% },
% 'F' => { 'desc' => 'Fixed (unchangeable)',
% 'condition' =>
-% sub { ref($_[0]) && $_[0]->{disable_fixed} },
+% sub { $_[0]->{disable_fixed} },
% },
% 'S' => { 'desc' => 'Selectable Choice',
% 'condition' =>
@@ -229,7 +107,7 @@
%
% my @dbs = $hashref->{svcdb}
% ? ( $hashref->{svcdb} )
-% : qw( svc_acct svc_domain svc_forward svc_www svc_broadband svc_phone svc_external );
+% : FS::part_svc->svc_tables();
%
% tie my %svcdb, 'Tie::IxHash', map { $_=>$_ } grep dbdef->table($_), @dbs;
% my $widget = new HTML::Widgets::SelectLayers(
@@ -291,8 +169,9 @@
% my $part_svc_column = $part_svc->part_svc_column($field);
% my $value = $part_svc_column->columnvalue;
% my $flag = $part_svc_column->columnflag;
-% my $def = $defs{$layer}{$field};
-% my $desc = ref($def) ? $def->{desc} : $def;
+% #my $def = $defs{$layer}{$field};
+% my $def = FS::part_svc->svc_table_fields($layer)->{$field};
+% my $label = $def->{'def_label'} || $def->{'label'};
%
% if ( $bgcolor eq $bgcolor1 ) {
% $bgcolor = $bgcolor2;
@@ -301,14 +180,13 @@
% }
%
% $html .= qq!<TR><TD CLASS="grid" BGCOLOR="$bgcolor" ALIGN="right">!.
-% $field;
-% $html .= "- <FONT SIZE=-1>$desc</FONT>" if $desc;
-% $html .= "</TD>";
-% $flag = '' if ref($def) && $def->{type} eq 'disabled';
+% ( $label || $field ).
+% "</TD>";
+% $flag = '' if $def->{type} eq 'disabled';
%
% $html .= qq!<TD CLASS="grid" BGCOLOR="$bgcolor">!;
%
-% if ( ref($def) && $def->{type} eq 'disabled' ) {
+% if ( $def->{type} eq 'disabled' ) {
%
% $html .= 'No default';
%
@@ -372,7 +250,7 @@
% my $disabled = $flag ? ''
% : 'DISABLED STYLE="background-color: #dddddd"';
%
-% if ( ! ref($def) || $def->{type} eq 'text' ) {
+% if ( !$def->{type} || $def->{type} eq 'text' ) {
%
% my $nodisplay = ' STYLE="display:none"';
% my $is_inv = ( $flag =~ /^[MA]$/ );
Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_acct.cgi,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- svc_acct.cgi 5 Dec 2006 02:37:13 -0000 1.43
+++ svc_acct.cgi 29 Dec 2006 08:51:32 -0000 1.44
@@ -18,39 +18,39 @@
% die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
% @groups = $cgi->param('radius_usergroup');
%
-%} else {
+%} elsif ( $cgi->param('pkgnum') && $cgi->param('svcpart') ) { #adding
%
-% my($query) = $cgi->keywords;
-% if ( $query =~ /^(\d+)$/ ) { #editing
-% $svcnum=$1;
-% $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
-% or die "Unknown (svc_acct) svcnum!";
+% $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum';
+% $pkgnum = $1;
+% $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart';
+% $svcpart = $1;
%
-% my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-% or die "Unknown (cust_svc) svcnum!";
+% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+% die "No part_svc entry!" unless $part_svc;
%
-% $pkgnum=$cust_svc->pkgnum;
-% $svcpart=$cust_svc->svcpart;
+% $svc_acct = new FS::svc_acct({svcpart => $svcpart});
%
-% $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
-% die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
+% $svcnum='';
%
-% @groups = $svc_acct->radius_groups;
+%} else { #editing
%
-% } else { #adding
+% my($query) = $cgi->keywords;
+% $query =~ /^(\d+)$/ or die "unparsable svcnum";
+% $svcnum=$1;
+% $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
+% or die "Unknown (svc_acct) svcnum!";
%
-% foreach $_ (split(/-/,$query)) {
-% $pkgnum=$1 if /^pkgnum(\d+)$/;
-% $svcpart=$1 if /^svcpart(\d+)$/;
-% }
-% $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
-% die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
+% my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+% or die "Unknown (cust_svc) svcnum!";
%
-% $svc_acct = new FS::svc_acct({svcpart => $svcpart});
+% $pkgnum=$cust_svc->pkgnum;
+% $svcpart=$cust_svc->svcpart;
%
-% $svcnum='';
+% $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+% die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
+%
+% @groups = $svc_acct->radius_groups;
%
-% }
%}
%
%my( $cust_pkg, $cust_main ) = ( '', '' );
Index: svc_external.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_external.cgi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- svc_external.cgi 23 Aug 2006 22:25:37 -0000 1.3
+++ svc_external.cgi 29 Dec 2006 08:51:32 -0000 1.4
@@ -1,8 +1,6 @@
-<!-- mason kludge -->
-%
-%
%my( $svcnum, $pkgnum, $svcpart, $part_svc, $svc_external );
%if ( $cgi->param('error') ) {
+%
% $svc_external = new FS::svc_external ( {
% map { $_, scalar($cgi->param($_)) } fields('svc_external')
% } );
@@ -11,38 +9,40 @@
% $svcpart = $cgi->param('svcpart');
% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
% die "No part_svc entry!" unless $part_svc;
-%} else {
-% my($query) = $cgi->keywords;
-% if ( $query =~ /^(\d+)$/ ) { #editing
-% $svcnum=$1;
-% $svc_external=qsearchs('svc_external',{'svcnum'=>$svcnum})
-% or die "Unknown (svc_external) svcnum!";
%
-% my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-% or die "Unknown (cust_svc) svcnum!";
+%} elsif ( $cgi->param('pkgnum') && $cgi->param('svcpart') ) { #adding
%
-% $pkgnum=$cust_svc->pkgnum;
-% $svcpart=$cust_svc->svcpart;
-%
-% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-% die "No part_svc entry!" unless $part_svc;
+% $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum';
+% $pkgnum = $1;
+% $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart';
+% $svcpart = $1;
%
-% } else { #adding
+% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+% die "No part_svc entry!" unless $part_svc;
%
-% foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-% $pkgnum=$1 if /^pkgnum(\d+)$/;
-% $svcpart=$1 if /^svcpart(\d+)$/;
-% }
-% $svc_external = new FS::svc_external { svcpart => $svcpart };
+% $svc_external = new FS::svc_external { svcpart => $svcpart };
%
-% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-% die "No part_svc entry!" unless $part_svc;
+% $svcnum='';
%
-% $svcnum='';
+% $svc_external->set_default_and_fixed;
%
-% $svc_external->set_default_and_fixed;
+%} else { #adding
+%
+% my($query) = $cgi->keywords;
+% $query =~ /^(\d+)$/ or die "unparsable svcnum";
+% $svcnum=$1;
+% $svc_external=qsearchs('svc_external',{'svcnum'=>$svcnum})
+% or die "Unknown (svc_external) svcnum!";
+%
+% my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+% or die "Unknown (cust_svc) svcnum!";
+%
+% $pkgnum=$cust_svc->pkgnum;
+% $svcpart=$cust_svc->svcpart;
+%
+% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+% die "No part_svc entry!" unless $part_svc;
%
-% }
%}
%my $action = $svc_external->svcnum ? 'Edit' : 'Add';
%
Index: svc_broadband.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_broadband.cgi,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- svc_broadband.cgi 29 Dec 2006 08:39:46 -0000 1.12
+++ svc_broadband.cgi 29 Dec 2006 08:51:32 -0000 1.13
@@ -1,10 +1,6 @@
-<!-- mason kludge -->
-%
-%
%# If it's stupid but it works, it's still stupid.
%# -Kristian
%
-%
%use HTML::Widgets::SelectLayers;
%use Tie::IxHash;
%
Index: svc_forward.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_forward.cgi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- svc_forward.cgi 23 Aug 2006 22:25:37 -0000 1.18
+++ svc_forward.cgi 29 Dec 2006 08:51:32 -0000 1.19
@@ -13,39 +13,40 @@
% $svcpart = $cgi->param('svcpart');
% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
% die "No part_svc entry!" unless $part_svc;
-%} else {
%
-% my($query) = $cgi->keywords;
+%} elsif ( $cgi->param('pkgnum') && $cgi->param('svcpart') ) { #adding
%
-% if ( $query =~ /^(\d+)$/ ) { #editing
-% $svcnum=$1;
-% $svc_forward=qsearchs('svc_forward',{'svcnum'=>$svcnum})
-% or die "Unknown (svc_forward) svcnum!";
+% $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum';
+% $pkgnum = $1;
+% $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart';
+% $svcpart = $1;
%
-% my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-% or die "Unknown (cust_svc) svcnum!";
+% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+% die "No part_svc entry!" unless $part_svc;
%
-% $pkgnum=$cust_svc->pkgnum;
-% $svcpart=$cust_svc->svcpart;
-%
-% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-% die "No part_svc entry!" unless $part_svc;
+% $svc_forward = new FS::svc_forward({});
%
-% } else { #adding
+% $svcnum='';
%
-% $svc_forward = new FS::svc_forward({});
+% $svc_forward->set_default_and_fixed;
%
-% foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-% $pkgnum=$1 if /^pkgnum(\d+)$/;
-% $svcpart=$1 if /^svcpart(\d+)$/;
-% }
-% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-% die "No part_svc entry!" unless $part_svc;
+%} else { #editing
%
-% $svcnum='';
+% my($query) = $cgi->keywords;
%
-% $svc_forward->set_default_and_fixed;
-% }
+% $query =~ /^(\d+)$/ or die "unparsable svcnum";
+% $svcnum=$1;
+% $svc_forward=qsearchs('svc_forward',{'svcnum'=>$svcnum})
+% or die "Unknown (svc_forward) svcnum!";
+%
+% my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+% or die "Unknown (cust_svc) svcnum!";
+%
+% $pkgnum=$cust_svc->pkgnum;
+% $svcpart=$cust_svc->svcpart;
+%
+% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+% die "No part_svc entry!" unless $part_svc;
%
%}
%my $action = $svc_forward->svcnum ? 'Edit' : 'Add';
- Previous message: [freeside-commits] freeside/httemplate/edit/elements
svc_Common.html, 1.2, 1.3 edit.html, 1.10, 1.11
- Next message: [freeside-commits] freeside/FS/FS cust_svc.pm, 1.65,
1.66 part_svc.pm, 1.29, 1.30 svc_broadband.pm, 1.8,
1.9 svc_Common.pm, 1.38, 1.39 svc_domain.pm, 1.46,
1.47 svc_External_Common.pm, NONE, 1.1 svc_external.pm, 1.4,
1.5 svc_Parent_Mixin.pm, NONE, 1.1 svc_forward.pm, 1.19,
1.20 svc_phone.pm, 1.1, 1.2 svc_www.pm, 1.13, 1.14 Record.pm,
1.129, 1.130 cust_main.pm, 1.258, 1.259 registrar.pm, NONE,
1.1 svc_acct.pm, 1.209, 1.210 Schema.pm, 1.39,
1.40 cust_pkg.pm, 1.68, 1.69 pkg_svc.pm, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the freeside-commits
mailing list