From c7ff9a58360788ce776022606c4ec3496062013b Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 30 Jan 2002 18:22:54 +0000 Subject: [PATCH] fully working invoice event web interface --- httemplate/browse/part_bill_event.cgi | 14 ++++++-- httemplate/edit/part_bill_event.cgi | 53 ++++++++++++++++++----------- httemplate/edit/process/part_bill_event.cgi | 46 ++++++++++++++++++------- 3 files changed, 79 insertions(+), 34 deletions(-) diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi index cd90bc1da..7ec8a181a 100755 --- a/httemplate/browse/part_bill_event.cgi +++ b/httemplate/browse/part_bill_event.cgi @@ -1,4 +1,4 @@ - + <% my %search; @@ -27,6 +27,8 @@ my $total = scalar(@part_bill_event); param('showdisabled') ? 2 : 3 %>>Event Payby After + Action + Options Code @@ -38,6 +40,8 @@ my $total = scalar(@part_bill_event); my $url = "${p}edit/part_bill_event.cgi?". $part_bill_event->eventpart; use Time::Duration; my $delay = duration_exact($part_bill_event->seconds); + my $plandata = $part_bill_event->plandata; + $plandata =~ s/\n/
/go; %> @@ -53,12 +57,16 @@ my $total = scalar(@part_bill_event); <%= $delay %> - <%= $part_bill_event->eventcode %> + <%= $part_bill_event->plan %> + + <%= $plandata %> + + <%= $part_bill_event->eventcode %> <% } %> - Add a new billing event + Add a new billing event diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi index 939eff360..c41cfe9cf 100755 --- a/httemplate/edit/part_bill_event.cgi +++ b/httemplate/edit/part_bill_event.cgi @@ -1,11 +1,11 @@ - + <% -if ( $cgi->param('eventnum') && $cgi->param('eventnum') =~ /^(\d+)$/ ) { - $cgi->param('eventnum', $1); +if ( $cgi->param('eventpart') && $cgi->param('eventpart') =~ /^(\d+)$/ ) { + $cgi->param('eventpart', $1); } else { - $cgi->param('eventnum', ''); + $cgi->param('eventpart', ''); } my ($query) = $cgi->keywords; @@ -33,8 +33,9 @@ print qq!Error: !, $cgi->param('error'), "" if $cgi->param('error'); -print '
'; - +print ''. + ''; print "Invoice Event #", $hashref->{eventpart} ? $hashref->{eventpart} : "(NEW)"; print ntable("#cccccc",2), <{seconds}/3600; +my $days = $hashref->{seconds}/86400; print < @@ -74,8 +75,9 @@ tie my %events, 'Tie::IxHash', 'fee' => { 'name' => 'Late fee', 'code' => '$cust_main->charge( %%%charge%%%, \'%%%reason%%%\' );', - 'html' => 'Amount
'. - 'Reason ', + 'html' => + 'Amount '. + '
Reason ', 'weight' => 10, }, 'suspend' => { @@ -101,29 +103,42 @@ tie my %events, 'Tie::IxHash', 'weight' => 30 }, - 'Generate invoices' => { + 'bill' => { + 'name' => 'Generate invoices', 'code' => '$cust_main->bill();', - 'pad' => 40, + 'weight' => 40, }, - 'Apply unapplied payments and credits' => { + 'apply' => { + 'name' => 'Apply unapplied payments and credits', 'code' => '$cust_main->apply_payments; $cust_main->apply_credits;', - 'pad' => 50, + 'weight' => 50, }, - 'Collect on invoices' => { + 'collect' => { + 'name' => 'Collect on invoices', 'code' => '$cust_main->collect();', - 'pad' => 60, + 'weight' => 60, }, ; foreach my $event ( keys %events ) { + my %plandata = map { /^(\w+) (.*)$/; ($1, $2); } + split(/\n/, $part_bill_event->plandata); + my $html = $events{$event}{html}; + while ( $html =~ /%%%(\w+)%%%/ ) { + my $field = $1; + $html =~ s/%%%$field%%%/$plandata{$field}/; + } + print ntable( "#cccccc", 2). - qq!$event!; - print ''. $events{$event}{html}. '' if exists $events{$event}{html}; + qq!plan; + print qq!VALUE="!. $event. ":". $events{$event}{weight}. ":". + encode_entities($events{$event}{code}). + qq!">$events{$event}{name}!; + print ''. $html. '' if $html; print qq!!; print ''; } diff --git a/httemplate/edit/process/part_bill_event.cgi b/httemplate/edit/process/part_bill_event.cgi index eb7c53e5d..7c0b54d0d 100755 --- a/httemplate/edit/process/part_bill_event.cgi +++ b/httemplate/edit/process/part_bill_event.cgi @@ -5,21 +5,43 @@ my $eventpart = $cgi->param('eventpart'); my $old = qsearchs('part_bill_event',{'eventpart'=>$eventpart}) if $eventpart; #s/days/seconds/ -$cgi->param('seconds', $cgi->param('days') * 3600 ); - -my $new = new FS::part_bill_event ( { - map { - $_, scalar($cgi->param($_)); - } fields('part_bill_event'), -} ); +$cgi->param('seconds', $cgi->param('days') * 86400 ); my $error; -if ( $eventpart ) { - $error = $new->replace($old); +if ( ! $cgi->param('plan_weight_eventcode') ) { + $error = "Must select an action"; } else { - $error = $new->insert; - $eventpart = $new->getfield('eventpart'); -} + + $cgi->param('plan_weight_eventcode') =~ /^(\w+):(\d+):(.*)$/ + or die "illegal plan_weight_eventcode:". + $cgi->param('plan_weight_eventcode'); + $cgi->param('plan', $1); + $cgi->param('weight', $2); + my $eventcode = $3; + my $plandata = ''; + while ( $eventcode =~ /%%%(\w+)%%%/ ) { + my $field = $1; + my $value = $cgi->param($field); + $eventcode =~ s/%%%$field%%%/$value/; + $plandata .= "$field $value\n"; + } + $cgi->param('eventcode', $eventcode); + $cgi->param('plandata', $plandata); + + my $new = new FS::part_bill_event ( { + map { + $_, scalar($cgi->param($_)); + } fields('part_bill_event'), + } ); + + my $error; + if ( $eventpart ) { + $error = $new->replace($old); + } else { + $error = $new->insert; + $eventpart = $new->getfield('eventpart'); + } +} if ( $error ) { $cgi->param('error', $error); -- 2.11.0