don't use depriciated FS::Bill and FS::Invoice, other miscellania

diff --git a/README b/README
index 286cf03..2e094b1 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Freeside, 1.1.4
+Freeside, 1.1.5

 
 Copyright (C) 1998 Silicon Interactive Software Design.  All rights reserved.
 
 
 Copyright (C) 1998 Silicon Interactive Software Design.  All rights reserved.
 

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index cf5f228..2bf4ef9 100755 (executable)
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -13,6 +13,11 @@
 # agent type was linking to wrong cgi ivan@sisd.com 98-jul-18
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 # agent type was linking to wrong cgi ivan@sisd.com 98-jul-18
 #
 # lose background, FS::CGI ivan@sisd.com 98-sep-2

+#
+# $Log: agent.cgi,v $
+# Revision 1.2  1998-11-07 10:24:22  ivan
+# don't use depriciated FS::Bill and FS::Invoice, other miscellania
+#

 
 use strict;
 use CGI::Base;
 
 use strict;
 use CGI::Base;


@@ -27,20 +32,22 @@ $cgi->get;
 
 SendHeaders(); # one guess.
 print header('Agent Listing', menubar(
 
 SendHeaders(); # one guess.
 print header('Agent Listing', menubar(

-  'Main Menu' => '../',
-  'Add new agent' => '../edit/agent.cgi'
+  'Main Menu'   => '../',
+  'Agent Types' => 'agent_type.cgi',
+#  'Add new agent' => '../edit/agent.cgi'

 )), <<END;
 )), <<END;

-    <BR>
-    Click on agent number to edit.
+Agents are resellers of your service. Agents may be limited to a subset of your
+full offerings (via their type).<BR><BR>

     <TABLE BORDER>
       <TR>
     <TABLE BORDER>
       <TR>

-        <TH><FONT SIZE=-1>Agent #</FONT></TH>
-        <TH>Agent</TH>
+        <TH COLSPAN=2>Agent</TH>

         <TH>Type</TH>
         <TH><FONT SIZE=-1>Freq. (unimp.)</FONT></TH>
         <TH><FONT SIZE=-1>Prog. (unimp.)</FONT></TH>
       </TR>
 END
         <TH>Type</TH>
         <TH><FONT SIZE=-1>Freq. (unimp.)</FONT></TH>
         <TH><FONT SIZE=-1>Prog. (unimp.)</FONT></TH>
       </TR>
 END

+#        <TH><FONT SIZE=-1>Agent #</FONT></TH>
+#        <TH>Agent</TH>

 
 my($agent);
 foreach $agent ( sort { 
 
 my($agent);
 foreach $agent ( sort { 


@@ -54,7 +61,8 @@ foreach $agent ( sort {
       <TR>
         <TD><A HREF="../edit/agent.cgi?$hashref->{agentnum}">
           $hashref->{agentnum}</A></TD>
       <TR>
         <TD><A HREF="../edit/agent.cgi?$hashref->{agentnum}">
           $hashref->{agentnum}</A></TD>

-        <TD>$hashref->{agent}</TD>
+        <TD><A HREF="../edit/agent.cgi?$hashref->{agentnum}">
+          $hashref->{agent}</A></TD>

         <TD><A HREF="../edit/agent_type.cgi?$typenum">$atype</A></TD>
         <TD>$hashref->{freq}</TD>
         <TD>$hashref->{prog}</TD>
         <TD><A HREF="../edit/agent_type.cgi?$typenum">$atype</A></TD>
         <TD>$hashref->{freq}</TD>
         <TD>$hashref->{prog}</TD>


@@ -64,8 +72,12 @@ END
 }
 
 print <<END;
 }
 
 print <<END;

+      <TR>
+        <TD COLSPAN=2><A HREF="../edit/agent.cgi"><I>Add new agent</I></A></TD>
+        <TD><A HREF="../edit/agent_type.cgi"><I>Add new agent type</I></A></TD>
+      </TR>

     </TABLE>
     </TABLE>

-    </CENTER>
+

   </BODY>
 </HTML>
 END
   </BODY>
 </HTML>
 END

diff --git a/htdocs/index.html b/htdocs/index.html
index de0667e..d2b5a1e 100755 (executable)
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -72,7 +72,7 @@
             View/Edit agents
           </A>
             - Agents are resellers of your service.  Agents may be limited
             View/Edit agents
           </A>
             - Agents are resellers of your service.  Agents may be limited

-              to a subset of your full offerings (via their agent type).
+              to a subset of your full offerings (via their type).

           <BR>
           <LI><A HREF="browse/part_referral.cgi">
             View/Edit referrals
           <BR>
           <LI><A HREF="browse/part_referral.cgi">
             View/Edit referrals

diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm
index d2ed521..b72a09a 100644 (file)
--- a/site_perl/CGI.pm
+++ b/site_perl/CGI.pm
@@ -47,14 +47,13 @@ sub header {
           $title
         </TITLE>
       </HEAD>
           $title
         </TITLE>
       </HEAD>

-      <BODY>
-        <CENTER>
-          <H1>
+      <BODY BGCOLOR="#ffffff">
+          <FONT COLOR="#FF0000" SIZE=7>

             $title
             $title

-          </H1>
+          </FONT>
+          <BR><BR>

           $menubar
           $menubar

-        </CENTER>
-      <HR>
+      <BR><BR>

 END
 }
 
 END
 }
 


@@ -136,6 +135,11 @@ lose the background, eidiot ivan@sisd.com 98-sep-2
 
 pod ivan@sisd.com 98-sep-12
 
 
 pod ivan@sisd.com 98-sep-12
 

+$Log: CGI.pm,v $
+Revision 1.2  1998-11-07 10:24:23  ivan
+don't use depriciated FS::Bill and FS::Invoice, other miscellania
+
+

 =cut
 
 1;
 =cut
 
 1;

diff --git a/site_perl/cust_bill.pm b/site_perl/cust_bill.pm
index 0023451..bc94242 100644 (file)
--- a/site_perl/cust_bill.pm
+++ b/site_perl/cust_bill.pm
@@ -489,6 +489,11 @@ charges can be negative ivan@sisd.com 98-jul-13
 
 pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
 
 
 pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
 

+$Log: cust_bill.pm,v $
+Revision 1.2  1998-11-07 10:24:24  ivan
+don't use depriciated FS::Bill and FS::Invoice, other miscellania
+
+

 =cut
 
 1;
 =cut
 
 1;

diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm
index ec28273..0ef69cb 100644 (file)
--- a/site_perl/cust_main.pm
+++ b/site_perl/cust_main.pm
@@ -600,6 +600,8 @@ sub collect {
     'custnum' => $self->getfield('custnum'),
   } ) ) {
 
     'custnum' => $self->getfield('custnum'),
   } ) ) {
 

+    bless($cust_bill,"FS::cust_bill");
+

     #this has to be before next's
     my($amount) = sprintf("%.2f", $total_owed < $cust_bill->owed
                                   ? $total_owed
     #this has to be before next's
     my($amount) = sprintf("%.2f", $total_owed < $cust_bill->owed
                                   ? $total_owed


@@ -624,7 +626,7 @@ sub collect {
            && ( $cust_bill->printed * 2592000 ) <= $since
       ) {
 
            && ( $cust_bill->printed * 2592000 ) <= $since
       ) {
 

-        open(LPR,$lpr) or die "Can't open $lpr: $!";
+        open(LPR,"|$lpr") or die "Can't open $lpr: $!";

         print LPR $cust_bill->print_text; #( date )
         close LPR
           or die $! ? "Error closing $lpr: $!"
         print LPR $cust_bill->print_text; #( date )
         close LPR
           or die $! ? "Error closing $lpr: $!"


@@ -807,7 +809,7 @@ Returns the balance for this customer (total owed minus total credited).
 
 sub balance {
   my($self) = @_;
 
 sub balance {
   my($self) = @_;

-  sprintf("%.2f",$self->total_bill - $self->total_credit);
+  sprintf("%.2f",$self->total_owed - $self->total_credited);

 }
 
 =back
 }
 
 =back


@@ -861,6 +863,11 @@ methods, cleaned collect method, source modifications no longer necessary to
 enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 
 enable cybercash, cybercash v3 support, don't need to import
 FS::UID::{datasrc,checkruid} ivan@sisd.com 98-sep-19-21
 

+$Log: cust_main.pm,v $
+Revision 1.2  1998-11-07 10:24:25  ivan
+don't use depriciated FS::Bill and FS::Invoice, other miscellania
+
+

 =cut
 
 1;
 =cut
 
 1;