diff options
Diffstat (limited to 'httemplate')
-rwxr-xr-x | httemplate/browse/part_svc.cgi | 4 | ||||
-rw-r--r-- | httemplate/docs/install.html | 4 | ||||
-rw-r--r-- | httemplate/docs/schema.html | 23 | ||||
-rw-r--r-- | httemplate/docs/upgrade8.html | 19 | ||||
-rwxr-xr-x | httemplate/edit/part_svc.cgi | 6 | ||||
-rwxr-xr-x | httemplate/edit/process/part_svc.cgi | 2 | ||||
-rw-r--r-- | httemplate/index.html | 1 | ||||
-rwxr-xr-x | httemplate/search/cust_main.cgi | 20 |
8 files changed, 60 insertions, 19 deletions
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi index cfb1ad82b..8a564ba9a 100755 --- a/httemplate/browse/part_svc.cgi +++ b/httemplate/browse/part_svc.cgi @@ -1,4 +1,4 @@ -<!-- $Id: part_svc.cgi,v 1.4 2001-09-06 20:41:59 ivan Exp $ --> +<!-- $Id: part_svc.cgi,v 1.5 2001-09-11 00:08:18 ivan Exp $ --> <%= header('Service Definition Listing', menubar( 'Main Menu' => $p) ) %> Services are items you offer to your customers.<BR><BR> @@ -35,7 +35,7 @@ foreach my $field ( @fields ) { my $flag = $part_svc->part_svc_column($field)->columnflag; %> - <%= $n1 %><TD><%= $row %></TD><TD> + <%= $n1 %><TD><%= $field %></TD><TD> <% if ( $flag eq "D" ) { print "Default"; } elsif ( $flag eq "F" ) { print "Fixed"; } diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html index 1529c648e..4bf7b44ea 100644 --- a/httemplate/docs/install.html +++ b/httemplate/docs/install.html @@ -109,9 +109,11 @@ require "/usr/local/apache/conf/handler.pl"; <ul> <li>Restrict access to this web interface. (with <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache</a>) <li>Create the necessary <a href="config.html">configuration files</a>. -<li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', and +<li>Create the `/usr/local/etc/freeside/counters.<i>datasrc</i>', + `/usr/local/etc/freeside/cache.<i>datasrc</i>', and `/usr/local/etc/freeside/export.<i>datasrc</i>' directories for each <i>datasrc</i> (owned by the freeside user). <li>As the freeside user, run bin/fs-setup to create the database tables. + <li>freeside-queued was installed with the Perl modules. Start it now and ensure that is run upon system startup. <li>Now proceed to the initial <a href="admin.html">administration</a> of your installation. </ul> </body> diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html index 32c365ec3..e3fe98096 100644 --- a/httemplate/docs/schema.html +++ b/httemplate/docs/schema.html @@ -43,6 +43,14 @@ <li>otaker - order taker <li>reason </ul> + <li><a name="cust_credit_bill" href="man/FS/cust_credit_bill.html">cust_credit_bill</a> - Credit invoice application. Links a credit to an invoice. + <ul> + <li>creditbillnum - primary key + <li>crednum - <a href="#cust_credit">credit</a> being applied + <li>invnum - <a href="#cust_bill">invoice</a> to which credit is applied + <li>amount - amount applied + <li>_date + </ul> <li><a name="cust_main" href="man/FS/cust_main.html">cust_main</a> - Customers <ul> <li>custnum - primary key @@ -81,6 +89,8 @@ <li>payname - billing name (name on card) <li>tax - tax exempt, Y or null <li>otaker - order taker + <li>referral_custnum + <li>comments </ul> (columns in <i>italics</i> are optional) <li><a name="cust_main_invoice" href="man/FS/cust_main_invoice.html">cust_main_invoice</a> - Invoice destinations for email invoices. Note that a customer can have many email destinations for their invoice (either literal or via svcnum), but only one postal destination. @@ -302,5 +312,18 @@ <li>typenum - <a href="#agent_type">agent type</a> <li>pkgpart - <a href="#part_pkg">Package definition</a> </ul> + <li><a name="queue" href="man/FS/queue.html">queue</a> - job queue + <ul> + <li>jobnum - primary key + <li>job + <li>_date + <li>status + </ul> + <li><a name="queue_arg" href="man/FS/queue_arg.html">queue_arg</a> - job arguments + <ul> + <li>argnum - primary key + <li>jobnum - <a href="#queue">job</a> + <li>arg - argument + </ul> </ul> </body> diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html index 67b0e5fe1..d86adc046 100644 --- a/httemplate/docs/upgrade8.html +++ b/httemplate/docs/upgrade8.html @@ -103,6 +103,19 @@ CREATE TABLE part_svc_column ( columnflag char(1) null ); +CREATE TABLE queue ( + jobnum int primary key, + job varchar not null, + _date int not null, + status varchar(80) not null +); + +CREATE TABLE queue_arg ( + argnum int primary key, + jobnum int not null, + arg varchar null +); +CREATE INDEX queue_arg1 ON queue_arg ( jobnum ); ALTER TABLE svc_acct ADD domsvc integer NOT NULL; ALTER TABLE svc_domain ADD catchall integer NULL; @@ -217,5 +230,9 @@ ALTER TABLE cust_refund DROP COLUMN crednum; </pre></font> </td></tr></table> <li><b>IMPORTANT: After applying the second set of database changes</b>, run bin/dbdef-create again. - <li>create the conf.dbsrc/user_policy as appropriate for your site + <li>create the <a href="config.html#username_policy">user_policy configuration file</a> as appropriate for your site. + <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory + (ownded by the freeside user). + <li>freeside-queued was installed with the Perl modules. Start it now and ensure that is run upon system startup. +</ul> </body> diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi index c0d632fa5..c0a789667 100755 --- a/httemplate/edit/part_svc.cgi +++ b/httemplate/edit/part_svc.cgi @@ -1,4 +1,4 @@ -<!-- $Id: part_svc.cgi,v 1.7 2001-09-06 20:42:00 ivan Exp $ --> +<!-- $Id: part_svc.cgi,v 1.8 2001-09-11 00:08:18 ivan Exp $ --> <% my $part_svc; if ( $cgi->param('error') ) { #error @@ -147,7 +147,7 @@ foreach my $svcdb ( qw( my(@fields) = $svcdb eq 'konq_kludge' ? () - : grep { $_ ne 'svcnum' } fields($svcdb) ); + : grep { $_ ne 'svcnum' } fields($svcdb); #my($rowspan)=scalar(@rows); #my($ptmp)="<TD ROWSPAN=$rowspan>$svcdb</TD>"; @@ -180,7 +180,7 @@ function fixup(what) { my $part_svc_column = $part_svc->part_svc_column($field); my $value = $cgi->param('error') ? $cgi->param("${svcdb}__${field}") - : $$part_svc_column->columnvalue; + : $part_svc_column->columnvalue; my $flag = $cgi->param('error') ? $cgi->param("${svcdb}__${field}_flag") : $part_svc_column->columnflag; diff --git a/httemplate/edit/process/part_svc.cgi b/httemplate/edit/process/part_svc.cgi index 5652c5805..937f7fb4c 100755 --- a/httemplate/edit/process/part_svc.cgi +++ b/httemplate/edit/process/part_svc.cgi @@ -17,7 +17,7 @@ my $new = new FS::part_svc ( { my $error; if ( $svcpart ) { - $error = $new->replace($old); + $error = $new->replace($old, '1.3-COMPAT'); } else { $error = $new->insert; $svcpart=$new->getfield('svcpart'); diff --git a/httemplate/index.html b/httemplate/index.html index f24d354b1..2fbc06221 100644 --- a/httemplate/index.html +++ b/httemplate/index.html @@ -60,6 +60,7 @@ <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>) </UL> <LI><A HREF="browse/nas.cgi">NAS ports</A> + <LI><A HREF="browse/queue.cgi">Joe queue</A> </ul> <li><A NAME="admin">Administration</a> <ul> diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi index 5defaf4af..9dcada7c2 100755 --- a/httemplate/search/cust_main.cgi +++ b/httemplate/search/cust_main.cgi @@ -1,5 +1,5 @@ <% -#<!-- $Id: cust_main.cgi,v 1.4 2001-08-28 16:58:08 ivan Exp $ --> +#<!-- $Id: cust_main.cgi,v 1.5 2001-09-11 00:08:18 ivan Exp $ --> use strict; #use vars qw( $conf %ncancelled_pkgs %all_pkgs $cgi @cust_main $sortby ); @@ -253,13 +253,12 @@ sub lastsearch { } else { - my(%last); + &FS::cust_main::check_and_rebuild_fuzzyfiles; + my $all_last = &FS::cust_main::all_last; - my(@all_last)=map $_->getfield('last'), qsearch('cust_main',{}); - push @all_last, grep $_, map $_->getfield('ship_last'), qsearch('cust_main',{}) - if defined dbdef->table('cust_main')->column('ship_last'); + my %last; if ($last_type{'Fuzzy'}) { - foreach ( amatch($last, [ qw(i) ], @all_last) ) { + foreach ( amatch($last, [ qw(i) ], @$all_last) ) { $last{$_}++; } } @@ -300,13 +299,12 @@ sub companysearch { } else { - my(%company); - my(@all_company)=map $_->company, qsearch('cust_main',{}); - push @all_company, grep $_, map $_->getfield('ship_company'), qsearch('cust_main',{}) - if defined dbdef->table('cust_main')->column('ship_last'); + &FS::cust_main::check_and_rebuild_fuzzyfiles; + my $all_company = &FS::cust_main::all_company; + my %company; if ($company_type{'Fuzzy'}) { - foreach ( amatch($company, [ qw(i) ], @all_company ) ) { + foreach ( amatch($company, [ qw(i) ], @$all_company ) ) { $company{$_}++; } } |