[freeside-commits] branch master updated. 7721ed875dd38f00f1a2ea3d87e979604131378c
Ivan Kohler
ivan at freeside.biz
Fri Nov 9 10:42:18 PST 2018
The branch, master has been updated
via 7721ed875dd38f00f1a2ea3d87e979604131378c (commit)
from cef4883a6d96015b710e98163a5b5a117d5fa460 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7721ed875dd38f00f1a2ea3d87e979604131378c
Author: Ivan Kohler <ivan at freeside.biz>
Date: Fri Nov 9 10:42:17 2018 -0800
Event fee reporting, RT#81713
diff --git a/FS/FS/cust_event.pm b/FS/FS/cust_event.pm
index 2884f1278..53637c562 100644
--- a/FS/FS/cust_event.pm
+++ b/FS/FS/cust_event.pm
@@ -12,7 +12,7 @@ use FS::cust_bill;
use FS::cust_pay;
use FS::svc_acct;
-$DEBUG = 1;
+$DEBUG = 0;
$me = '[FS::cust_event]';
=head1 NAME
@@ -316,13 +316,13 @@ sub join_sql {
"
JOIN part_event USING ( eventpart )
- LEFT JOIN cust_bill ON ( eventtable = 'cust_bill' AND tablenum = invnum )
- LEFT JOIN cust_pkg ON ( eventtable = 'cust_pkg' AND tablenum = pkgnum )
- LEFT JOIN cust_pay ON ( eventtable = 'cust_pay' AND tablenum = paynum )
- LEFT JOIN cust_pay_batch ON ( eventtable = 'cust_pay_batch' AND tablenum = paybatchnum )
+ LEFT JOIN cust_bill ON ( eventtable = 'cust_bill' AND tablenum = cust_bill.invnum )
+ LEFT JOIN cust_pkg ON ( eventtable = 'cust_pkg' AND tablenum = cust_pkg.pkgnum )
+ LEFT JOIN cust_pay ON ( eventtable = 'cust_pay' AND tablenum = cust_pay.paynum )
+ LEFT JOIN cust_pay_batch ON ( eventtable = 'cust_pay_batch' AND tablenum = cust_pay_batch.paybatchnum )
LEFT JOIN cust_statement ON ( eventtable = 'cust_statement' AND tablenum = cust_statement.statementnum )
- LEFT JOIN cust_svc ON ( eventtable = 'svc_acct' AND tablenum = svcnum )
+ LEFT JOIN cust_svc ON ( eventtable = 'svc_acct' AND tablenum = cust_svc.svcnum )
LEFT JOIN cust_pkg AS cust_pkg_for_svc ON ( cust_svc.pkgnum = cust_pkg_for_svc.pkgnum )
LEFT JOIN cust_main ON (
diff --git a/FS/FS/cust_event_fee.pm b/FS/FS/cust_event_fee.pm
index 5db403932..7b448dd18 100644
--- a/FS/FS/cust_event_fee.pm
+++ b/FS/FS/cust_event_fee.pm
@@ -1,5 +1,5 @@
package FS::cust_event_fee;
-use base qw( FS::Record FS::FeeOrigin_Mixin );
+use base qw( FS::cust_main_Mixin FS::Record FS::FeeOrigin_Mixin );
use strict;
use FS::Record qw( qsearch dbh );
diff --git a/httemplate/search/cust_event_fee.html b/httemplate/search/cust_event_fee.html
new file mode 100644
index 000000000..d21a3c3d1
--- /dev/null
+++ b/httemplate/search/cust_event_fee.html
@@ -0,0 +1,199 @@
+<& elements/search.html,
+ 'title' => 'Billing event fees',
+ 'html_init' => include('.init'),
+ 'menubar' => $menubar,
+ 'name' => 'billing events',
+ 'query' => $sql_query,
+ 'count_query' => $count_sql,
+ 'header' => [ 'Event',
+ 'Event date',
+ 'Fee',
+ 'Invoice',
+ 'Invoice date',
+ FS::UI::Web::cust_header(),
+ ],
+ 'fields' => [
+ 'event',
+ sub { time2str("%b %d %Y %T", $_[0]->_date) },
+ 'itemdesc',
+ $inv_sub,
+ sub { my $d = $_[0]->fee_cust_bill_date;
+ $d ? time2str("%b %d %Y %T", $d) : '' },
+ \&FS::UI::Web::cust_fields,
+ ],
+ 'align' => 'lrlrr'.FS::UI::Web::cust_aligns(),
+ 'links' => [
+ '',
+ '',
+ '',
+ $inv_link,
+ $inv_link,
+ ( map { $_ ne 'Cust. Status' ? $link_cust : '' }
+ FS::UI::Web::cust_header()
+ ),
+ ],
+ 'color' => [
+ '',
+ '',
+ '',
+ '',
+ '',
+ FS::UI::Web::cust_colors(),
+ ],
+ 'style' => [
+ '',
+ '',
+ '',
+ '',
+ '',
+ FS::UI::Web::cust_styles(),
+ ],
+&>
+<%once>
+
+my $inv_sub = sub {
+ my $cust_event_fee = shift;
+ my $fee_invnum = $cust_event_fee->fee_invnum;
+ $fee_invnum || ( $cust_event_fee->nextbill ? '(next bill)' : '(not yet)' );
+};
+
+my $inv_link = sub {
+ $_[0]->fee_invnum
+ ? [ "${p}view/cust_bill.cgi?", 'fee_invnum' ]
+ : '';
+};
+
+my $link_cust = sub {
+ my $cust_event_fee = shift;
+ $cust_event_fee->custnum
+ ? [ "${p}view/cust_main.cgi?", 'custnum' ]
+ : '';
+};
+
+</%once>
+<%shared>
+my @scalars = qw(); #qw( agentnum status custnum invnum pkgnum failed );
+my @lists = qw( eventpart );
+my %search;
+</%shared>
+<%init>
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied"
+ unless $curuser->access_right('Billing event reports');
+
+for my $param (@scalars) {
+ $search{$param} = scalar( $cgi->param($param) )
+ if $cgi->param($param);
+}
+
+#lists
+foreach my $param (@lists) {
+ $search{$param} = [ $cgi->param($param) ];
+}
+
+my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+$search{'beginning'} = $beginning;
+$search{'ending'} = $ending;
+
+my $where = ' WHERE '. FS::cust_event->search_sql_where( \%search );
+
+if ( $cgi->param('billpkgnum') eq 'NULL' ) {
+ $where .= ' AND billpkgnum IS NULL';
+} elsif ( $cgi->param('billpkgnum') eq 'NOT NULL' ) {
+ $where .= ' AND billpkgnum IS NOT NULL';
+}
+
+my $join = '
+ LEFT JOIN cust_event USING (eventnum)
+ LEFT JOIN cust_bill_pkg USING (billpkgnum)
+ LEFT JOIN cust_bill AS fee_cust_bill USING (invnum)
+ LEFT JOIN part_fee ON (cust_event_fee.feepart = part_fee.feepart )
+ '. FS::cust_event->join_sql();
+
+my $sql_query = {
+ 'table' => 'cust_event_fee',
+ 'select' => join(', ',
+ 'cust_event_fee.*',
+ 'cust_event.*',
+ 'part_event.*',
+ 'cust_bill_pkg.invnum AS fee_invnum',
+ 'fee_cust_bill._date AS fee_cust_bill_date',
+ 'part_fee.itemdesc',
+ 'cust_main.custnum',
+ FS::UI::Web::cust_sql_fields(),
+ ),
+ 'hashref' => {},
+ 'extra_sql' => $where,
+ 'order_by' => 'ORDER BY eventfeenum ASC', #'ORDER BY _date ASC',
+ 'addl_from' => $join,
+};
+
+my $count_sql = "SELECT COUNT(*) FROM cust_event_fee $join $where";
+warn join(',', FS::UI::Web::cust_sql_fields() );
+
+my $conf = new FS::Conf;
+
+my $menubar = [];
+
+if ( $curuser->access_right('Delete fees') ) {
+
+#XXX delete fee link
+
+# push @$menubar, 'Re-print these events' =>
+# "javascript:confirm_print_process()",
+# 'Re-email these events' =>
+# "javascript:confirm_email_process()",
+# ;
+#
+# push @$menubar, 'Re-fax these events' =>
+# "javascript:confirm_fax_process()"
+# if $conf->exists('hylafax');
+
+}
+
+</%init>
+<%def .init>
+% # action is part of the target URL, don't need to pass it as a param
+% foreach my $action (qw(print email fax)) {
+<& /elements/progress-init.html,
+ $action.'_form',
+ [ @scalars, @lists, 'beginning', 'ending' ],
+ "../misc/${action}_events.cgi",
+ { 'message' => "Invoices re-${action}ed" }, #would be nice to show the number of them, but...
+ $action.'_', #key
+&>
+<FORM NAME="<% $action %>_form">
+% foreach my $param (@scalars, 'beginning', 'ending') {
+ <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $search{$param} |h %>">
+% }
+% foreach my $param (@lists) {
+% foreach my $value (@{ $search{$param} }) {
+ <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $value |h %>">
+% }
+% }
+</FORM>
+% } # foreach $action
+<SCRIPT TYPE="text/javascript">
+
+function confirm_print_process() {
+ if ( ! confirm("Are you sure you want to reprint these invoices?") ) {
+ return;
+ }
+ print_process();
+}
+function confirm_email_process() {
+ if ( ! confirm("Are you sure you want to re-email these invoices?") ) {
+ return;
+ }
+ email_process();
+}
+function confirm_fax_process() {
+ if ( ! confirm("Are you sure you want to re-fax these invoices?") ) {
+ return;
+ }
+ fax_process();
+}
+</SCRIPT>
+</%def>
diff --git a/httemplate/search/report_cust_event_fee.html b/httemplate/search/report_cust_event_fee.html
new file mode 100644
index 000000000..7aa566401
--- /dev/null
+++ b/httemplate/search/report_cust_event_fee.html
@@ -0,0 +1,49 @@
+<& /elements/header.html, 'Billing event fees' &>
+
+ <FORM ACTION="cust_event_fee.html" METHOD="GET">
+
+ <FONT CLASS="fsinnerbox-title"><% emt('Search options') %></FONT>
+ <TABLE CLASS="fsinnerbox">
+
+<%doc>
+# potentially could search on any of these
+
+ <% include( '/elements/tr-select-agent.html', 'disable_empty'=>0 ) %>
+
+ <% include( '/elements/tr-select-cust_main-status.html',
+ 'label' => 'Customer status',
+ # this field is just called 'status'
+ )
+ %>
+</%doc>
+
+ <& /elements/tr-select-part_event.html,
+ 'label' => 'Events',
+ 'multiple' => 1,
+ 'all_selected' => 1,
+ &>
+
+ <& /elements/tr-select.html,
+ 'label' => 'Invoiced',
+ 'field' => 'billpkgnum',
+ 'curr_value' => '',
+ 'options' => [ '', 'NULL', 'NOT NULL' ],
+ 'labels' => { '' => 'Pending and invoiced',
+ 'NULL' => 'Pending only',
+ 'NOT NULL' => 'Invoiced only',
+ },
+ &>
+
+ <& /elements/tr-input-beginning_ending.html &>
+
+ </TABLE>
+ <BR><INPUT TYPE="submit" VALUE="Get Report">
+ </FORM>
+
+<& /elements/footer.html &>
+<%init>
+
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('Billing event reports');
+
+</%init>
-----------------------------------------------------------------------
Summary of changes:
FS/FS/cust_event.pm | 12 +-
FS/FS/cust_event_fee.pm | 2 +-
httemplate/search/cust_event_fee.html | 199 +++++++++++++++++++++++++++
httemplate/search/report_cust_event_fee.html | 49 +++++++
4 files changed, 255 insertions(+), 7 deletions(-)
create mode 100644 httemplate/search/cust_event_fee.html
create mode 100644 httemplate/search/report_cust_event_fee.html
More information about the freeside-commits
mailing list