summaryrefslogtreecommitdiff
path: root/FS
diff options
context:
space:
mode:
Diffstat (limited to 'FS')
-rw-r--r--FS/FS/AccessRight.pm8
-rw-r--r--FS/FS/Conf.pm9
-rw-r--r--FS/FS/Schema.pm9
-rw-r--r--FS/FS/bill_batch.pm43
-rw-r--r--FS/FS/cust_bill.pm26
-rw-r--r--FS/FS/part_event/Action/cust_bill_print.pm23
-rw-r--r--FS/FS/part_event/Action/cust_bill_print_pdf.pm26
7 files changed, 120 insertions, 24 deletions
diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 2f6f53101..458f9694e 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -272,9 +272,11 @@ tie my %rights, 'Tie::IxHash',
'Miscellaneous rights' => [
{ rightname=>'Job queue', global=>1 },
{ rightname=>'Time queue', global=>1 },
- { rightname=>'Process batches', global=>1 },
- { rightname=>'Reprocess batches', global=>1 },
- { rightname=>'Redownload resolved batches', global=>1 },
+ { rightname=>'Process batches', global=>1 }, #Process payment batches
+ { rightname=>'Reprocess batches', global=>1 }, #Reprocess payment batches
+ { rightname=>'Redownload resolved batches', global=>1 }, #Redownload resolved payment batches
+ { rightname=>'Process invoice batches', },
+ { rightname=>'Process global invoice batches', global=>1 },
{ rightname=>'Import', global=>1 }, #some of these are ag-virt'ed now? give em their own ACLs
{ rightname=>'Export', global=>1 },
{ rightname=> 'Edit rating data', desc=>'Delete CDRs', global=>1 },
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 774332253..9953ea54b 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1258,7 +1258,14 @@ and customer address. Include units.',
{
'key' => 'invoice_print_pdf',
'section' => 'invoicing',
- 'description' => 'Store postal invoices for download in PDF format rather than printing them directly.',
+ 'description' => 'For all invoice print operations, store postal invoices for download in PDF format rather than printing them directly.',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'invoice_print_pdf-spoolagent',
+ 'section' => 'invoicing',
+ 'description' => 'Store postal invoices PDF downloads in per-agent spools.',
'type' => 'checkbox',
},
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 168fae0ff..6fde8b1e5 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -3339,13 +3339,14 @@ sub tables_hashref {
'bill_batch' => {
'columns' => [
- 'batchnum', 'serial', '', '', '', '',
- 'status', 'char', 'NULL','1', '', '',
- 'pdf', 'blob', 'NULL', '', '', '',
+ 'batchnum', 'serial', '', '', '', '',
+ 'agentnum', 'int', 'NULL', '', '', '',
+ 'status', 'char', 'NULL', '1', '', '',
+ 'pdf', 'blob', 'NULL', '', '', '',
],
'primary_key' => 'batchnum',
'unique' => [],
- 'index' => [],
+ 'index' => [ ['agentnum'] ],
},
'cust_bill_batch' => {
diff --git a/FS/FS/bill_batch.pm b/FS/FS/bill_batch.pm
index 3afe20915..ec5c19456 100644
--- a/FS/FS/bill_batch.pm
+++ b/FS/FS/bill_batch.pm
@@ -2,9 +2,11 @@ package FS::bill_batch;
use strict;
use vars qw( @ISA $me $DEBUG );
+use CAM::PDF;
+use FS::Conf;
use FS::Record qw( qsearch qsearchs dbh );
+use FS::agent;
use FS::cust_bill_batch;
-use CAM::PDF;
@ISA = qw( FS::Record );
$me = '[ FS::bill_batch ]';
@@ -37,6 +39,8 @@ inherits from FS::Record. The following fields are currently supported:
=item batchnum - primary key
+=item agentnum - empty for global batches or agent (see L<FS::agent>)
+
=item status - either 'O' (open) or 'R' (resolved/closed).
=item pdf - blob field for temporarily storing the invoice as a PDF.
@@ -96,26 +100,38 @@ sub close {
return $self->replace;
}
-=back
+sub check {
+ my $self = shift;
+
+ my $error =
+ $self->ut_numbern('batchnum')
+ || $self->ut_foreign_keyn('agentnum', 'agent', 'agentnum')
+ || $self->ut_enum('status', [ 'O', 'R' ] )
+ ;
+ return $error if $error;
-=head1 CLASS METHODS
+ $self->SUPER::check;
+}
-=item get_open_batch
+=item agent
-Returns the currently open batch. There should only be one at a time.
+Returns the agent (see L<FS::agent>) for this invoice batch.
=cut
-sub get_open_batch {
- my $class = shift;
- my $batch = qsearchs('bill_batch', { status => 'O' });
- return $batch if $batch;
- $batch = FS::bill_batch->new({status => 'O'});
- my $error = $batch->insert;
- die $error if $error;
- return $batch;
+sub agent {
+ my $self = shift;
+ qsearchs( 'agent', { 'agentnum' => $self->agentnum } );
}
+=back
+
+=head1 SUBROUTINES
+
+=item process_print_pdf
+
+=cut
+
use Storable 'thaw';
use Data::Dumper;
use MIME::Base64;
@@ -134,7 +150,6 @@ sub process_print_pdf {
die $error if $error;
}
-
=back
=head1 BUGS
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 6e4eba426..7669479eb 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1520,14 +1520,36 @@ isn't an open batch, one will be created.
sub batch_invoice {
my ($self, $opt) = @_;
- my $batch = FS::bill_batch->get_open_batch;
+ my $bill_batch = $self->get_open_bill_batch;
my $cust_bill_batch = FS::cust_bill_batch->new({
- batchnum => $batch->batchnum,
+ batchnum => $bill_batch->batchnum,
invnum => $self->invnum,
});
return $cust_bill_batch->insert($opt);
}
+=item get_open_batch
+
+Returns the currently open batch as an FS::bill_batch object, creating a new
+one if necessary. (A per-agent batch if invoice_print_pdf-spoolagent is
+enabled)
+
+=cut
+
+sub get_open_bill_batch {
+ my $self = shift;
+ my $hashref = { status => 'O' };
+ $hashref->{'agentnum'} = $conf->exists('invoice_print_pdf-spoolagent')
+ ? $self->cust_main->agentnum
+ : '';
+ my $batch = qsearchs('bill_batch', $hashref);
+ return $batch if $batch;
+ $batch = FS::bill_batch->new($hashref);
+ my $error = $batch->insert;
+ die $error if $error;
+ return $batch;
+}
+
=item ftp_invoice [ TEMPLATENAME ]
Sends this invoice data via FTP.
diff --git a/FS/FS/part_event/Action/cust_bill_print.pm b/FS/FS/part_event/Action/cust_bill_print.pm
new file mode 100644
index 000000000..6b3e6f460
--- /dev/null
+++ b/FS/FS/part_event/Action/cust_bill_print.pm
@@ -0,0 +1,23 @@
+package FS::part_event::Action::cust_bill_print;
+
+use strict;
+use base qw( FS::part_event::Action );
+
+sub description { 'Send invoice (print only)'; }
+
+sub eventtable_hashref {
+ { 'cust_bill' => 1 };
+}
+
+sub default_weight { 51; }
+
+sub do_action {
+ my( $self, $cust_bill ) = @_;
+
+ #my $cust_main = $self->cust_main($cust_bill);
+ my $cust_main = $cust_bill->cust_main;
+
+ $cust_bill->print;
+}
+
+1;
diff --git a/FS/FS/part_event/Action/cust_bill_print_pdf.pm b/FS/FS/part_event/Action/cust_bill_print_pdf.pm
new file mode 100644
index 000000000..6b37f389f
--- /dev/null
+++ b/FS/FS/part_event/Action/cust_bill_print_pdf.pm
@@ -0,0 +1,26 @@
+package FS::part_event::Action::cust_bill_print_pdf;
+
+use strict;
+use base qw( FS::part_event::Action );
+
+sub description { 'Send invoice (spool PDF only)'; }
+
+sub eventtable_hashref {
+ { 'cust_bill' => 1 };
+}
+
+sub default_weight { 51; }
+
+sub do_action {
+ my( $self, $cust_bill ) = @_;
+
+ #my $cust_main = $self->cust_main($cust_bill);
+ #my $cust_main = $cust_bill->cust_main;
+
+ my $opt = { $self->options };
+ $opt->{'notice_name'} ||= 'Invoice';
+
+ $cust_bill->batch_invoice($opt);
+}
+
+1;
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-28 14:18:28 +0000