From 4c9347994ca4e1aefdb622d9f51ac8687e6a177b Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 7 Nov 1998 10:24:25 +0000 Subject: [PATCH] don't use depriciated FS::Bill and FS::Invoice, other miscellania --- README | 2 +- htdocs/browse/agent.cgi | 28 ++++++++++++++++++++-------- htdocs/index.html | 2 +- site_perl/CGI.pm | 16 ++++++++++------ site_perl/cust_bill.pm | 5 +++++ site_perl/cust_main.pm | 11 +++++++++-- 6 files changed, 46 insertions(+), 18 deletions(-) diff --git a/README b/README index 286cf03bb..2e094b156 100644 --- 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. diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi index cf5f2281f..2bf4ef9d3 100755 --- 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 +# +# $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; @@ -27,20 +32,22 @@ $cgi->get; 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' )), < - 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).

- - + END +# +# my($agent); foreach $agent ( sort { @@ -54,7 +61,8 @@ foreach $agent ( sort { - + @@ -64,8 +72,12 @@ END } print < + + +

Agent #	Agent	Agent		Type	Freq. (unimp.)	Prog. (unimp.)
Agent #	Agent
$hashref->{agentnum}	$hashref->{agent}	+ $hashref->{agent}	$atype	$hashref->{freq}	$hashref->{prog}	Add new agent		Add new agent type

- + END diff --git a/htdocs/index.html b/htdocs/index.html index de0667e59..d2b5a1e93 100755 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -72,7 +72,7 @@ View/Edit agents - 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).

View/Edit referrals diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm index d2ed52122..b72a09a6b 100644 --- a/site_perl/CGI.pm +++ b/site_perl/CGI.pm @@ -47,14 +47,13 @@ sub header { $title - - -

+ + $title -

+ +

$menubar - -

+

END } @@ -136,6 +135,11 @@ lose the background, eidiot ivan@sisd.com 98-sep-2 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; diff --git a/site_perl/cust_bill.pm b/site_perl/cust_bill.pm index 00234519a..bc9424233 100644 --- 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 +$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; diff --git a/site_perl/cust_main.pm b/site_perl/cust_main.pm index ec282731e..0ef69cba4 100644 --- a/site_perl/cust_main.pm +++ b/site_perl/cust_main.pm @@ -600,6 +600,8 @@ sub collect { '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 @@ -624,7 +626,7 @@ sub collect { && ( $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: $!" @@ -807,7 +809,7 @@ Returns the balance for this customer (total owed minus total credited). sub balance { my($self) = @_; - sprintf("%.2f",$self->total_bill - $self->total_credit); + sprintf("%.2f",$self->total_owed - $self->total_credited); } =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 +$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; -- 2.11.0