+function cust_pkg_areyousure(href) {
+ if (confirm("Permanantly delete included services and cancel this package?") == true)
+ window.location.href = href;
+}
+
+END
+
print qq!
Packages !,
# qq!
Click on package number to view/edit package.!,
qq!( Order and cancel packages (preserves services) )!,
@@ -292,8 +309,25 @@ foreach my $package (@packages) {
my $pkg = $package->part_pkg->pkg;
my $comment = $package->part_pkg->comment;
my $pkgview = popurl(2). "view/cust_pkg.cgi?$pkgnum";
- my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
- my $rowspan = scalar(@cust_svc) || 1;
+
+ #my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
+ #my $rowspan = scalar(@cust_svc) || 1;
+ my @cust_svc = ();
+ my $rowspan = 0;
+ my %pkg_svc = ();
+ unless ( $package->getfield('cancel') ) {
+ foreach my $pkg_svc (
+ grep { $_->quantity }
+ qsearch('pkg_svc',{'pkgpart'=> $package->pkgpart })
+ ) {
+ $rowspan += ( $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity );
+ }
+ } else {
+ #@cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
+ @cust_svc = ();
+ $rowspan = scalar(@cust_svc) || 1;
+ }
+ $rowspan ||= 1;
my $button_cgi = new CGI;
$button_cgi->param('clone', $package->part_pkg->pkgpart);
@@ -304,9 +338,30 @@ foreach my $package (@packages) {
print $n1, qq!$pkgnum | !,
qq!!,
#qq!$pkg - $comment!,
- qq!$pkg - $comment!,
- qq! ( Edit | Customize ) | !,
- ;
+ qq!$pkg - $comment ( Details )!;
+ # | !;
+
+ #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
+ unless ( $package->getfield('cancel') ) {
+ print ' ( ';
+ if ( $package->getfield('susp') ) {
+ print qq!Unsuspend!;
+ } else {
+ print qq!Suspend!;
+ }
+ print ' | Cancel';
+
+ print ' ) ';
+
+ print ' ( Edit dates | ';
+
+ print qq!Customize )!;
+
+ }
+ print '';
+
for ( qw( setup bill susp expire cancel ) ) {
print "", ( $package->getfield($_)
? time2str("%D", $package->getfield($_) )
@@ -316,14 +371,35 @@ foreach my $package (@packages) {
}
my $n2 = '';
- foreach my $cust_svc ( @cust_svc ) {
- my($label, $value, $svcdb) = $cust_svc->label;
- my($svcnum) = $cust_svc->svcnum;
- my($sview) = popurl(2). "view";
- print $n2,qq! | $label | !,
- qq!$value | !;
- $n2="";
+ #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
+ #foreach my $cust_svc ( @cust_svc ) {
+ foreach my $svcpart ( sort { $a<=>$b } keys %pkg_svc ) {
+ my $svc = qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc');
+ my(@cust_svc)=qsearch('cust_svc',{'pkgnum'=>$pkgnum,
+ 'svcpart'=>$svcpart,
+ });
+ for my $enum ( 1 .. $pkg_svc{$svcpart} ) {
+ my $cust_svc;
+ if ( $cust_svc = shift @cust_svc ) {
+ my($label, $value, $svcdb) = $cust_svc->label;
+ my($svcnum) = $cust_svc->svcnum;
+ my($sview) = popurl(2). "view";
+ print $n2,qq!$label | !,
+ qq!$value | !;
+ } else {
+ print $n2, qq!!.
+ qq!Provision $svc!;
+
+ print qq! !.
+ qq!Link to legacy $svc!
+ if $conf->exists('legacy_link');
+
+ print ' | ';
+ }
+ $n2="
";
+ }
}
+
$n1="
";
}
print "
";
@@ -333,7 +409,7 @@ print "";
print <
-function areyousure(href) {
+function cust_pay_areyousure(href) {
if (confirm("Are you sure you want to delete this payment?")
== true)
window.location.href = href;
@@ -389,7 +465,7 @@ foreach my $bill (@bills) {
$payby =~ s/^BILL$/Check #/ if $payinfo;
$payby =~ s/^(CARD|COMP)$/$1 /;
my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
- ? qq! (delete)!
+ ? qq! (delete)!
: '';
push @history,
"$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete\t\t$paid\t\t\t$target";
@@ -413,7 +489,28 @@ foreach my $bill (@bills) {
}
}
-my @credits = grep { $_->credited > 0 }
+my @credits = grep { scalar(my @array = $_->cust_credit_refund) }
+ qsearch('cust_credit',{'custnum'=>$custnum});
+foreach my $credit (@credits) {
+ my($cref)=$credit->hashref;
+ my(@cust_credit_refund)=
+ qsearch('cust_credit_refund', { 'crednum'=> $cref->{crednum} } );
+ foreach my $cust_credit_refund (@cust_credit_refund) {
+ my $cust_refund = $cust_credit_refund->cust_credit;
+ my($date, $crednum, $amount, $reason, $app_date ) = (
+ $credit->_date,
+ $credit->crednum,
+ $cust_credit_refund->amount,
+ $credit->reason,
+ time2str("%D", $cust_credit_refund->_date),
+ );
+ push @history,
+ "$date\tCredit #$crednum: $reason
".
+ "(applied to refund on $app_date)\t\t\t$amount\t";
+ }
+}
+
+@credits = grep { $_->credited > 0 }
qsearch('cust_credit',{'custnum'=>$custnum});
foreach my $credit (@credits) {
my($cref)=$credit->hashref;
@@ -451,7 +548,7 @@ foreach my $payment (@unapplied_payments) {
$payby =~ s/^BILL$/Check #/ if $payinfo;
$payby =~ s/^(CARD|COMP)$/$1 /;
my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
- ? qq! (delete)!
+ ? qq! (delete)!
: '';
push @history,
$payment->_date. "\t".