diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/browse/part_sb_field.cgi | 31 | ||||
| -rw-r--r-- | httemplate/browse/part_virtual_field.cgi | 39 | ||||
| -rw-r--r-- | httemplate/docs/upgrade10.html | 54 | ||||
| -rw-r--r-- | httemplate/edit/part_router_field.cgi | 71 | ||||
| -rw-r--r-- | httemplate/edit/part_sb_field.cgi | 79 | ||||
| -rw-r--r-- | httemplate/edit/part_virtual_field.cgi | 92 | ||||
| -rw-r--r-- | httemplate/edit/process/router.cgi | 41 | ||||
| -rw-r--r-- | httemplate/edit/process/svc_broadband.cgi | 36 | ||||
| -rwxr-xr-x | httemplate/edit/router.cgi | 4 | ||||
| -rwxr-xr-x | httemplate/view/svc_acct.cgi | 5 | ||||
| -rw-r--r-- | httemplate/view/svc_broadband.cgi | 21 |
11 files changed, 159 insertions, 314 deletions
diff --git a/httemplate/browse/part_sb_field.cgi b/httemplate/browse/part_sb_field.cgi deleted file mode 100644 index 4c9641e86..000000000 --- a/httemplate/browse/part_sb_field.cgi +++ /dev/null @@ -1,31 +0,0 @@ -<%= header('svc_broadband extended fields', menubar('Main Menu' => $p)) %> -<% - -my @psf = qsearch('part_sb_field', {}); -my $block; -my $p2 = popurl(2); - -%> - -<% if ($cgi->param('error')) { %> - <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT> - <BR><BR> -<% } %> - -<A HREF="<%=$p2%>edit/part_sb_field.cgi"><I>Add a new field</I></A><BR><BR> - -<%=table()%> -<TH><TD>Field name</TD><TD>Service type</TD></TH> -<% foreach $psf (sort {$a->name cmp $b->name} @psf) { %> - <TR> - <TD></TD> - <TD> - <A HREF="<%=$p2%>edit/part_sb_field.cgi?<%=$psf->sbfieldpart%>"> - <%=$psf->name%></A></TD> - <TD><%=$psf->part_svc->svc%></TD> - </TR> -<% } %> -</TABLE> -</BODY> -</HTML> - diff --git a/httemplate/browse/part_virtual_field.cgi b/httemplate/browse/part_virtual_field.cgi new file mode 100644 index 000000000..9bb5c1373 --- /dev/null +++ b/httemplate/browse/part_virtual_field.cgi @@ -0,0 +1,39 @@ +<%= header('Virtual field definitions', menubar('Main Menu' => $p)) %> +<% + +my %pvfs; +my $block; +my $p2 = popurl(2); +my $dbtable; + +foreach (qsearch('part_virtual_field', {})) { + push @{ $pvfs{$_->dbtable} }, $_; +} +%> + +<% if ($cgi->param('error')) { %> + <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT> + <BR><BR> +<% } %> + +<A HREF="<%=$p2%>edit/part_virtual_field.cgi"><I>Add a new field</I></A><BR><BR> + +<% foreach $dbtable (sort { $a cmp $b } keys (%pvfs)) { %> +<H3><%=$dbtable%></H3> + +<%=table()%> +<TH><TD>Field name</TD><TD>Description</TD></TH> +<% foreach $pvf (sort {$a->name cmp $b->name} @{ $pvfs{$dbtable} }) { %> + <TR> + <TD></TD> + <TD> + <A HREF="<%=$p2%>edit/part_virtual_field.cgi?<%=$pvf->vfieldpart%>"> + <%=$pvf->name%></A></TD> + <TD><%=$pvf->label%></TD> + </TR> +<% } %> +</TABLE> +<% } %> +</BODY> +</HTML> + diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html index 1035510db..4c2c17b85 100644 --- a/httemplate/docs/upgrade10.html +++ b/httemplate/docs/upgrade10.html @@ -14,6 +14,24 @@ CREATE TABLE cust_bill_pkg_detail ( ); CREATE INDEX cust_bill_pkg_detail1 ON cust_bill_pkg_detail ( pkgnum, invnum ); +CREATE TABLE part_virtual_field ( + vfieldpart int NOT NULL, + dbtable varchar(32) NOT NULL, + name varchar(32) NOT NULL, + check_block text, + list_source text, + length integer, + label varchar(80), + PRIMARY KEY (vfieldpart) +); + +CREATE TABLE virtual_field ( + recnum integer NOT NULL, + vfieldpart integer NOT NULL, + value varchar(128) NOT NULL, + PRIMARY KEY (vfieldpart, recnum) +); + CREATE TABLE router ( routernum serial, routername varchar(80), @@ -26,22 +44,6 @@ CREATE TABLE part_svc_router ( routernum int NOT NULL ); -CREATE TABLE part_router_field ( - routerfieldpart serial, - name varchar(80), - length int NOT NULL, - check_block text, - list_source text, - PRIMARY KEY (routerfieldpart) -); - -CREATE TABLE router_field ( - routerfieldpart int NOT NULL, - routernum int NOT NULL, - value varchar(128) -); -CREATE UNIQUE INDEX router_field1 ON router_field ( routerfieldpart, routernum ); - CREATE TABLE addr_block ( blocknum serial, routernum int NOT NULL, @@ -51,24 +53,6 @@ CREATE TABLE addr_block ( ); CREATE UNIQUE INDEX addr_block1 ON addr_block ( blocknum, routernum ); -CREATE TABLE part_sb_field ( - sbfieldpart serial, - svcpart int NOT NULL, - name varchar(80) NOT NULL, - length int NOT NULL, - check_block text NULL, - list_source text NULL, - PRIMARY key (sbfieldpart) -); -CREATE UNIQUE INDEX part_sb_field1 ON part_sb_field ( sbfieldpart, svcpart ); - -CREATE TABLE sb_field ( - sbfieldpart int NOT NULL, - svcnum int NOT NULL, - value varchar(128) -); -CREATE UNIQUE INDEX sb_field1 ON sb_field ( sbfieldpart, svcnum ); - CREATE TABLE svc_broadband ( svcnum int NOT NULL, blocknum int NOT NULL, @@ -112,7 +96,7 @@ optionally: mandatory again: dbdef-create username -create-history-tables username cust_bill_pkg_detail router part_svc_router part_router_field router_field addr_block part_sb_field sb_field svc_broadband +create-history-tables username cust_bill_pkg_detail router part_svc_router addr_block svc_broadband dbdef-create username diff --git a/httemplate/edit/part_router_field.cgi b/httemplate/edit/part_router_field.cgi deleted file mode 100644 index 02962b1c0..000000000 --- a/httemplate/edit/part_router_field.cgi +++ /dev/null @@ -1,71 +0,0 @@ -<!-- mason kludge --> -<% -my ($routerfieldpart, $part_router_field); - -if ( $cgi->param('error') ) { - $part_router_field = new FS::part_router_field ( { - map { $_, scalar($cgi->param($_)) } fields('part_router_field')}); - $routerfieldpart = $part_router_field->routerfieldpart; -} else { - my($query) = $cgi->keywords; - if ( $query =~ /^(\d+)$/ ) { #editing - $routerfieldpart=$1; - $part_router_field=qsearchs('part_router_field', - {'routerfieldpart' => $routerfieldpart}) - or die "Unknown routerfieldpart!"; - - } else { #adding - $part_router_field = new FS::part_router_field({}); - } -} -my $action = $part_router_field->routerfieldpart ? 'Edit' : 'Add'; - -my $p1 = popurl(1); -print header("$action Router Extended Field Definition", - menubar('Main Menu' => $p, - 'View all Extended Fields' => $p. 'browse/generic.cgi?part_router_field') - ); - -print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'), - "</FONT>" - if $cgi->param('error'); -%> -<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD=POST> - -<INPUT TYPE="hidden" NAME="table" VALUE="part_router_field"> -<INPUT TYPE="hidden" NAME="routerfieldpart" VALUE="<%= - $routerfieldpart%>"> -Field #<B><%=$routerfieldpart or "(NEW)"%></B><BR><BR> - -<%=ntable("#cccccc",2)%> - <TR> - <TD ALIGN="right">Name</TD> - <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%= - $part_router_field->name%>"></TD> - </TR> - <TR> - <TD ALIGN="right">Length</TD> - <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%= - $part_router_field->length%>"></TD> - </TR> - <TR> - <TD ALIGN="right">check_block</TD> - <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%= - $part_router_field->check_block%></TEXTAREA></TD> - </TR> - <TR> - <TD ALIGN="right">list_source</TD> - <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%= - $part_router_field->list_source%></TEXTAREA></TD> - </TR> -</TABLE><BR><INPUT TYPE="submit" VALUE="Submit"> - -</FORM> - -<BR><BR> -<FONT SIZE=-2>If you don't understand what <I>check_block</I> and -<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>. We mean it.</FONT> - - -</BODY> -</HTML> diff --git a/httemplate/edit/part_sb_field.cgi b/httemplate/edit/part_sb_field.cgi deleted file mode 100644 index 9e0cc9e4f..000000000 --- a/httemplate/edit/part_sb_field.cgi +++ /dev/null @@ -1,79 +0,0 @@ -<!-- mason kludge --> -<% -my ($sbfieldpart, $part_sb_field); - -if ( $cgi->param('error') ) { - $part_sb_field = new FS::part_sb_field ( { - map { $_, scalar($cgi->param($_)) } fields('part_sb_field')}); - $sbfieldpart = $part_sb_field->sbfieldpart; -} else { - my($query) = $cgi->keywords; - if ( $query =~ /^(\d+)$/ ) { #editing - $sbfieldpart=$1; - $part_sb_field=qsearchs('part_sb_field', - {'sbfieldpart' => $sbfieldpart}) - or die "Unknown sbfieldpart!"; - - } else { #adding - $part_sb_field = new FS::part_sb_field({}); - } -} -my $action = $part_sb_field->sbfieldpart ? 'Edit' : 'Add'; - -my $p1 = popurl(1); -print header("$action svc_broadband Extended Field Definition", ''); - -print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'), - "</FONT>" - if $cgi->param('error'); -%> -<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD="POST"> - -<INPUT TYPE="hidden" NAME="table" VALUE="part_sb_field"> -<INPUT TYPE="hidden" NAME="redirect_ok" - VALUE="<%=popurl(2)%>browse/part_sb_field.cgi"> -<INPUT TYPE="hidden" NAME="sbfieldpart" VALUE="<%= - $sbfieldpart%>"> -Field #<B><%=$sbfieldpart or "(NEW)"%></B><BR><BR> - -<%=ntable("#cccccc",2)%> - <TR> - <TD ALIGN="right">Name</TD> - <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%= - $part_sb_field->name%>"></TD> - </TR> - <TR> - <TD ALIGN="right">Length</TD> - <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%= - $part_sb_field->length%>"></TD> - </TR> - <TR> - <TD ALIGN="right">Service</TD> - <TD><SELECT SIZE=1 NAME="svcpart"><% - foreach my $part_svc (qsearch('part_svc', {svcdb => 'svc_broadband'})) { - %><OPTION VALUE="<%=$part_svc->svcpart%>"<%= - ($part_svc->svcpart == $part_sb_field->svcpart) ? ' SELECTED' : ''%>"> - <%=$part_svc->svc%> - <% } %> - </SELECT></TD> - <TR> - <TD ALIGN="right">check_block</TD> - <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%= - $part_sb_field->check_block%></TEXTAREA></TD> - </TR> - <TR> - <TD ALIGN="right">list_source</TD> - <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%= - $part_sb_field->list_source%></TEXTAREA></TD> - </TR> -</TABLE><BR><INPUT TYPE="submit" VALUE="Submit"> - -</FORM> - -<BR><BR> -<FONT SIZE=-2>If you don't understand what <I>check_block</I> and -<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>. We mean it.</FONT> - - -</BODY> -</HTML> diff --git a/httemplate/edit/part_virtual_field.cgi b/httemplate/edit/part_virtual_field.cgi new file mode 100644 index 000000000..8bc84387f --- /dev/null +++ b/httemplate/edit/part_virtual_field.cgi @@ -0,0 +1,92 @@ +<!-- mason kludge --> +<% +my ($vfieldpart, $part_virtual_field); + +if ( $cgi->param('error') ) { + $part_virtual_field = new FS::part_virtual_field ( { + map { $_, scalar($cgi->param($_)) } fields('part_virtual_field')}); + $vfieldpart = $part_virtual_field->vfieldpart; +} else { + my($query) = $cgi->keywords; + if ( $query =~ /^(\d+)$/ ) { #editing + $vfieldpart=$1; + $part_virtual_field=qsearchs('part_virtual_field', + {'vfieldpart' => $vfieldpart}) + or die "Unknown vfieldpart!"; + + } else { #adding + $part_virtual_field = new FS::part_virtual_field({}); + } +} +my $action = $part_virtual_field->vfieldpart ? 'Edit' : 'Add'; + +my $p1 = popurl(1); +print header("$action Virtual Field Definition", ''); + +print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'), + "</FONT>" + if $cgi->param('error'); +%> +<FORM ACTION="<%=$p1%>process/generic.cgi" METHOD="POST"> + +<INPUT TYPE="hidden" NAME="table" VALUE="part_virtual_field"> +<INPUT TYPE="hidden" NAME="redirect_ok" + VALUE="<%=popurl(2)%>browse/part_virtual_field.cgi"> +<INPUT TYPE="hidden" NAME="vfieldpart" VALUE="<%= + $vfieldpart%>"> +Field #<B><%=$vfieldpart or "(NEW)"%></B><BR><BR> + +<%=ntable("#cccccc",2)%> + <TR> + <TD ALIGN="right">Name</TD> + <TD><INPUT TYPE="text" NAME="name" MAXLENGTH=15 VALUE="<%= + $part_virtual_field->name%>"></TD> + </TR> + <TR> + <TD ALIGN="right">Table</TD> + <TD><% if ($action eq 'Add') { %> + <SELECT SIZE=1 NAME="dbtable"><% + my $dbdef = dbdef; # ick + foreach my $dbtable ($dbdef->tables) { + if ($dbtable !~ /^h_/ + and $dbdef->table($dbtable)->primary_key) { %> + <OPTION VALUE="<%=$dbtable%>"><%=$dbtable%></OPTION><% + } + } + %></SELECT><% + } else { # Edit + %><%=$part_virtual_field->dbtable%> + <INPUT TYPE="hidden" NAME="dbtable" VALUE="<%=$part_virtual_field->dbtable%>"> + <% } %> + </TD> + <TR> + <TD ALIGN="right">Label</TD> + <TD><INPUT TYPE="text" NAME="label" MAXLENGTH="20" VALUE="<%= + $part_virtual_field->label%>"></TD> + </TR> + <TR> + <TD ALIGN="right">Length</TD> + <TD><INPUT TYPE="text" NAME="length" MAXLENGTH=4 VALUE="<%= + $part_virtual_field->length%>"></TD> + </TR> + <TR> + <TD ALIGN="right">Check</TD> + <TD><TEXTAREA COLS="20" ROWS="4" NAME="check_block"><%= + $part_virtual_field->check_block%></TEXTAREA></TD> + </TR> + <TR> + <TD ALIGN="right">List source</TD> + <TD><TEXTAREA COLS="20" ROWS="4" NAME="list_source"><%= + $part_virtual_field->list_source%></TEXTAREA></TD> + </TR> +</TABLE><BR><INPUT TYPE="submit" VALUE="Submit"> + +</FORM> + +<BR><BR> +<FONT SIZE=-2>If you don't understand what <I>check_block</I> and +<I>list_source</I> mean, <B>LEAVE THEM BLANK</B>. We mean it.</FONT> + + +</BODY> +</HTML> diff --git a/httemplate/edit/process/router.cgi b/httemplate/edit/process/router.cgi index 1b7fc3805..7e40c48a7 100644 --- a/httemplate/edit/process/router.cgi +++ b/httemplate/edit/process/router.cgi @@ -19,19 +19,16 @@ my $error = ''; my $routernum = $cgi->param('routernum'); my $routername = $cgi->param('routername'); my $old = qsearchs('router', { routernum => $routernum }); -my @old_rf; my @old_psr; my $new = new FS::router { - routernum => $routernum, - routername => $routername, - svcnum => 0 - }; + map { + ($_, scalar($cgi->param($_))); + } fields('router') +}; if($old) { - if($old->routername ne $new->routername) { - $error = $new->replace($old); - } #else do nothing + $error = $new->replace($old); } else { $error = $new->insert; $routernum = $new->routernum; @@ -49,21 +46,6 @@ if ($old) { } } check($error); - @old_rf = $old->router_field; - foreach $rf (@old_rf) { - if(my $new_val = $cgi->param('rf_'.$rf->routerfieldpart)) { - if($new_val ne $rf->value) { - my $new_rf = new FS::router_field - { routernum => $routernum, - value => $new_val, - routerfieldpart => $rf->routerfieldpart }; - $error = $new_rf->replace($rf); - } #else do nothing - } else { - $error = $rf->delete; - } - check($error); - } } foreach($cgi->param) { @@ -77,23 +59,10 @@ foreach($cgi->param) { $error = $new_psr->insert; } check($error); - } elsif($cgi->param($_) ne '' and /^rf_(\d+)$/) { - my $part = $1; - if(my @x = grep {$_->routerfieldpart == $part} @old_rf) { - # already handled all of these - } else { - my $new_rf = new FS::router_field - { routernum => $routernum, - value => $cgi->param('rf_'.$part), - routerfieldpart => $part }; - $error = $new_rf->insert; - check($error); - } } } - # Yay, everything worked! $dbh->commit or die $dbh->errstr; print $cgi->redirect(popurl(3). "browse/router.cgi"); diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi index ab8b9f9d8..4912a3a9f 100644 --- a/httemplate/edit/process/svc_broadband.cgi +++ b/httemplate/edit/process/svc_broadband.cgi @@ -9,11 +9,10 @@ my $dbh = FS::UID::dbh; $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!"; my $svcnum = $1; -my $old; my @old_sbf; +my $old; if ( $svcnum ) { $old = qsearchs('svc_broadband', { 'svcnum' => $svcnum } ) or die "fatal: can't find broadband service (svcnum $svcnum)!"; - @old_sbf = $old->sb_field; } else { $old = ''; } @@ -32,39 +31,6 @@ if ( $svcnum ) { $svcnum = $new->svcnum; } -unless ($error) { - my $sb_field; - - foreach ($cgi->param) { - #warn "\$cgi->param $_: " . $cgi->param($_); - if(/^sbf_(\d+)/) { - my $part = $1; - #warn "\$part $part"; - $sb_field = new FS::sb_field - { svcnum => $svcnum, - value => $cgi->param($_), - sbfieldpart => $part }; - if (my @x = grep { $_->sbfieldpart eq $part } @old_sbf) { - #if (my $old_sb_field = (grep { $_->sbfieldpart eq $part} @old_Sbf)[0]) { - #warn "array: " . scalar(@x); - if (length($sb_field->value) && ($sb_field->value ne $x[0]->value)) { - #warn "replacing " . $x[0]->value . " with " . $sb_field->value; - $error = $sb_field->replace($x[0]); - #$error = $sb_field->replace($old_sb_field); - } elsif (length($sb_field->value) == 0) { - #warn "delete"; - $error = $x[0]->delete; - } - } else { - if (length($sb_field->value) > 0) { - #warn "insert"; - $error = $sb_field->insert; - } - # else do nothing - } - } - } -} if ( $error ) { $cgi->param('error', $error); diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi index de0fa6dbe..5c365a21e 100755 --- a/httemplate/edit/router.cgi +++ b/httemplate/edit/router.cgi @@ -26,7 +26,7 @@ if($cgi->param('error')) { %> <FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT> <% } %> -<FORM ACTION="<%=popurl(1)%>process/generic.cgi" METHOD=POST> +<FORM ACTION="<%=popurl(1)%>process/router.cgi" METHOD=POST> <INPUT TYPE="hidden" NAME="table" VALUE="router"> <INPUT TYPE="hidden" NAME="redirect_ok" VALUE="<%=$p3%>/browse/router.cgi"> <INPUT TYPE="hidden" NAME="redirect_error" VALUE="<%=$p3%>/edit/router.cgi"> @@ -59,7 +59,7 @@ foreach my $part_svc ( qsearch('part_svc', { svcdb => 'svc_broadband', <BR> <INPUT TYPE="checkbox" NAME="svcpart_<%=$part_svc->svcpart%>"<%= qsearchs('part_svc_router', { svcpart => $part_svc->svcpart, - routernum => $routernum } ) ? 'CHECKED' : ''%> VALUE="ON"> + routernum => $routernum } ) ? ' CHECKED' : ''%> VALUE="ON"> <A HREF="<%=${p}%>edit/part_svc.cgi?<%=$part_svc->svcpart%>"> <%=$part_svc->svcpart%>: <%=$part_svc->svc%></A> <% } %> diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi index 83cea05f7..4e01db341 100755 --- a/httemplate/view/svc_acct.cgi +++ b/httemplate/view/svc_acct.cgi @@ -206,11 +206,6 @@ foreach (sort { $a cmp $b } $svc_acct->virtual_fields) { %> </TABLE></TD></TR></TABLE> <% -foreach (sort { $a cmp $b } keys(%{$sb_field})) { - print q!<TR><TD ALIGN="right">! . $_ . - q!</TD><TD BGCOLOR="#ffffff">! . $sb_field->{$_} . - q!</TD></TR>!; -} print '<BR><BR>'; diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi index dd5997d92..677a4b058 100644 --- a/httemplate/view/svc_broadband.cgi +++ b/httemplate/view/svc_broadband.cgi @@ -69,26 +69,7 @@ foreach (sort { $a cmp $b } $svc_broadband->virtual_fields) { $svc_broadband->getfield($_)), "\n"; } - -# foreach my $sb_field -# ( qsearch('sb_field', { svcnum => $svcnum }) ) { -# my $part_sb_field = qsearchs('part_sb_field', -# { sbfieldpart => $sb_field->sbfieldpart }); -# print q!<TR><TD ALIGN="right">! . $part_sb_field->name . -# q!</TD><TD BGCOLOR="#ffffff">! . $sb_field->value . -# q!</TD></TR>!; -# } -# print '</TABLE>'; - - - my $sb_field = $svc_broadband->sb_field_hashref; - foreach (sort { $a cmp $b } keys(%{$sb_field})) { - print q!<TR><TD ALIGN="right">! . $_ . - q!</TD><TD BGCOLOR="#ffffff">! . $sb_field->{$_} . - q!</TD></TR>!; - } - print '</TABLE>'; - +print '</TABLE>'; print '<BR>'. joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>' |