X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=7d2d873151eecc9fe2ca6d7f5958f425bf47014b;hb=bd3a0f6ac3ce9370ee13b9c325e137e2ab533fce;hp=1a04ff61c384fd2ddc0cb29a805ed17a558e2d76;hpb=4dbbbee37e78a035022974d19b3b80aeaead6049;p=freeside.git
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 1a04ff61c..7d2d87315 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -158,7 +158,7 @@ print '
', $cust_main->comments,
+ print " Comments". &ntable("#cccccc"). "".
+ &ntable("#cccccc",2).
+ ' '.
+ encode_entities($cust_main->comments).
' ';
}
@@ -266,12 +266,37 @@ foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
$part_pkg->comment;
}
-print ' ';
+print ' ';
+
+print ' '.
+ qq! !;
print <
function cust_pkg_areyousure(href) {
- if (confirm("Permanantly delete included services and cancel this package?") == true)
+ if (confirm("Permanently delete included services and cancel this package?") == true)
window.location.href = href;
}
@@ -364,7 +389,8 @@ foreach my $package (@packages) {
for ( qw( setup bill susp expire cancel ) ) {
print "", ( $package->getfield($_)
- ? time2str("%D", $package->getfield($_) )
+ ? time2str("%D %l:%M:%S%P %z ",
+ $package->getfield($_) )
: ' '
), ' ',
;
@@ -459,7 +485,7 @@ foreach my $bill (@bills) {
$payment->payinfo,
$cust_bill_pay->amount,
);
- $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4)
+ $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
if $payby eq 'CARD';
my $target = "$payby$payinfo";
$payby =~ s/^BILL$/Check #/ if $payinfo;
@@ -489,7 +515,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;
@@ -521,7 +568,7 @@ foreach my $payment (@unapplied_payments) {
my $payby = $payment->payby;
my $payinfo = $payment->payinfo;
#false laziness w/above
- $payinfo = substr($payinfo,0,4). 'x'x(length($payinfo)-4)
+ $payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
if $payby eq 'CARD';
my $target = "$payby$payinfo";
$payby =~ s/^BILL$/Check #/ if $payinfo;
@@ -576,10 +623,10 @@ foreach my $item (sort keyfield_numerically @history) {
( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
" ",
"",
- ( $payment ? "- \$".sprintf("%.2f",$payment) : '' ),
+ ( $payment ? "- \$".sprintf("%.2f",$payment) : '' ),
" ",
"",
- ( $credit ? "- \$".sprintf("%.2f",$credit) : '' ),
+ ( $credit ? "- \$".sprintf("%.2f",$credit) : '' ),
" ",
"",
( $refund ? "\$".sprintf("%.2f",$refund) : '' ),