X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main.cgi;h=7dbdc13566d46ae1309860505154e6a93e16173a;hb=4ff72381c99c7508f6028d2c44a2ec5c455e4670;hp=0610bc324004b67d58f33a749d99bdd5e342e053;hpb=96fd4cf172f2b9fbdd00f7b7fe7a7797132b88c2;p=freeside.git
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 0610bc324..7dbdc1356 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -83,9 +83,13 @@ print '',
$cust_main->country,
'',
;
- print '
Day Phone | ',
+ my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
+ my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
+ print ' |
'. $daytime_label.
+ ' | ',
$cust_main->daytime || ' ', ' |
',
- 'Night Phone | ',
+ ' |
'. $night_label.
+ ' | ',
$cust_main->night || ' ', ' |
',
'Fax | ',
$cust_main->fax || ' ', ' |
',
@@ -122,10 +126,10 @@ print '',
$cust_main->get("${pre}country"),
'',
;
- print 'Day Phone | ',
+ print '
'. $daytime_label. ' | ',
'',
$cust_main->get("${pre}daytime") || ' ', ' |
',
- 'Night Phone | '.
+ '
'. $night_label. ' | '.
'',
$cust_main->get("${pre}night") || ' ', ' |
',
'Fax | ',
@@ -188,6 +192,8 @@ print ' | ';
print ' ';
+if ( $conf->config('payby-default') ne 'HIDE' ) {
+
my @invoicing_list = $cust_main->invoicing_list;
print "Billing information (",
qq!!, "Bill now)",
@@ -215,6 +221,16 @@ print ' ';
' |
Name on card | ',
$cust_main->payname, ' |
'
;
+ } elsif ( $cust_main->payby eq 'CHEK' ) {
+ my( $account, $aba ) = split('@', $cust_main->payinfo );
+ print 'Electronic check',
+ 'Account number | ',
+ $account, ' |
',
+ 'ABA/Routing code | ',
+ $aba, ' |
',
+ 'Bank name | ',
+ $cust_main->payname, ' |
'
+ ;
} elsif ( $cust_main->payby eq 'BILL' ) {
print 'Billing';
print 'P.O. | ',
@@ -236,6 +252,8 @@ print ' ';
print " |
";
+}
+
print '';
if ( defined $cust_main->dbdef_table->column('comments')
@@ -268,30 +286,34 @@ foreach my $type_pkgs ( qsearch('type_pkgs',{'typenum'=> $agent->typenum }) ) {
print '
';
-print '
'.
- qq!
!;
-print qq!
!;
+}
print <
@@ -370,6 +392,9 @@ foreach my $package (@packages) {
qq!$pkg - $comment ( Details )!;
# | !;
+ print qq! ( !.
+ 'Change package )';
+
#false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
unless ( $package->getfield('cancel') ) {
print ' ( ';
@@ -445,51 +470,144 @@ function cust_pay_areyousure(href) {
== true)
window.location.href = href;
}
+function cust_pay_unapply_areyousure(href) {
+ if (confirm("Are you sure you want to unapply this payment?")
+ == true)
+ window.location.href = href;
+}
END
-#formatting
-print qq!
Payment History!.
- qq! ( !.
- qq!!.
- qq!Post payment | !.
- qq!!.
- qq!Post credit )!;
-
-#get payment history
-#
-# major problem: this whole thing is way too sloppy.
-# minor problem: the description lines need better formatting.
-
-my @history = (); #needed for mod_perl :)
-
-my %target = ();
-
-my @bills = qsearch('cust_bill',{'custnum'=>$custnum});
-foreach my $bill (@bills) {
- my($bref)=$bill->hashref;
- my $bpre = ( $bill->owed > 0 )
- ? ' Open '
- : '';
- my $bpost = ( $bill->owed > 0 ) ? '' : '';
- push @history,
- $bref->{_date} . qq!\t${bpre}Invoice #! . $bref->{invnum} .
- qq! (Balance \$! . $bill->owed . qq!)$bpost\t! .
- $bref->{charged} . qq!\t\t\t!;
-
- my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );
-# my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
-# my($payment);
-# foreach $payment (@payments) {
- foreach my $cust_bill_pay (@cust_bill_pay) {
- my $payment = $cust_bill_pay->cust_pay;
- my($date,$invnum,$payby,$payinfo,$paid)=($payment->_date,
- $cust_bill_pay->invnum,
- $payment->payby,
- $payment->payinfo,
- $cust_bill_pay->amount,
- );
+if ( $conf->config('payby-default') ne 'HIDE' ) {
+
+ #formatting
+ print qq!
Payment History!.
+ qq! ( !.
+ qq!!.
+ qq!Post payment | !.
+ qq!!.
+ qq!Post credit )!;
+
+ #get payment history
+ #
+ # major problem: this whole thing is way too sloppy.
+ # minor problem: the description lines need better formatting.
+
+ my @history = (); #needed for mod_perl :)
+
+ my %target = ();
+
+ my @bills = qsearch('cust_bill',{'custnum'=>$custnum});
+ foreach my $bill (@bills) {
+ my($bref)=$bill->hashref;
+ my $bpre = ( $bill->owed > 0 )
+ ? ' Open '
+ : '';
+ my $bpost = ( $bill->owed > 0 ) ? '' : '';
+ push @history,
+ $bref->{_date} . qq!\t${bpre}Invoice #! . $bref->{invnum} .
+ qq! (Balance \$! . $bill->owed . qq!)$bpost\t! .
+ $bref->{charged} . qq!\t\t\t!;
+
+ my(@cust_bill_pay)=qsearch('cust_bill_pay',{'invnum'=> $bref->{invnum} } );
+ # my(@payments)=qsearch('cust_pay',{'invnum'=> $bref->{invnum} } );
+ # my($payment);
+ foreach my $cust_bill_pay (@cust_bill_pay) {
+ my $payment = $cust_bill_pay->cust_pay;
+ my($date,$invnum,$payby,$payinfo,$paid)=($payment->_date,
+ $cust_bill_pay->invnum,
+ $payment->payby,
+ $payment->payinfo,
+ $cust_bill_pay->amount,
+ );
+ $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;
+ $payby =~ s/^(CARD|COMP)$/$1 /;
+ my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
+ ? qq! (delete)!
+ : '';
+ my $unapply =
+ $payment->closed !~ /^Y/i && $conf->exists('unapplypayments')
+ ? qq! (unapply)!
+ : '';
+ push @history,
+ "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete$unapply\t\t$paid\t\t\t$target";
+ }
+
+ my(@cust_credit_bill)=
+ qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
+ foreach my $cust_credit_bill (@cust_credit_bill) {
+ my $cust_credit = $cust_credit_bill->cust_credit;
+ my($date, $invnum, $crednum, $amount, $reason, $app_date ) = (
+ $cust_credit->_date,
+ $cust_credit_bill->invnum,
+ $cust_credit_bill->crednum,
+ $cust_credit_bill->amount,
+ $cust_credit->reason,
+ time2str("%D", $cust_credit_bill->_date),
+ );
+ push @history,
+ "$date\tCredit #$crednum: $reason
".
+ "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t";
+ }
+ }
+
+ 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;
+ push @history,
+ $cref->{_date} . "\t" .
+ qq!!.
+ 'Unapplied credit #' .
+ $cref->{crednum} . ": ".
+ $cref->{reason} . "\t\t\t" . $credit->credited . "\t";
+ }
+
+ my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
+ foreach my $refund (@refunds) {
+ my($rref)=$refund->hashref;
+ my($refundnum) = (
+ $refund->refundnum,
+ );
+
+ push @history,
+ $rref->{_date} . "\tRefund #$refundnum, (" .
+ $rref->{payby} . " " . $rref->{payinfo} . ") by " .
+ $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
+ $rref->{refund};
+ }
+
+ my @unapplied_payments =
+ grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
+ foreach my $payment (@unapplied_payments) {
+ my $payby = $payment->payby;
+ my $payinfo = $payment->payinfo;
+ #false laziness w/above
$payinfo = 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4))
if $payby eq 'CARD';
my $target = "$payby$payinfo";
@@ -499,161 +617,72 @@ foreach my $bill (@bills) {
? qq! (delete)!
: '';
push @history,
- "$date\tPayment, Invoice #$invnum ($payby$payinfo)$delete\t\t$paid\t\t\t$target";
- }
-
- my(@cust_credit_bill)=
- qsearch('cust_credit_bill', { 'invnum'=> $bref->{invnum} } );
- foreach my $cust_credit_bill (@cust_credit_bill) {
- my $cust_credit = $cust_credit_bill->cust_credit;
- my($date, $invnum, $crednum, $amount, $reason, $app_date ) = (
- $cust_credit->_date,
- $cust_credit_bill->invnum,
- $cust_credit_bill->crednum,
- $cust_credit_bill->amount,
- $cust_credit->reason,
- time2str("%D", $cust_credit_bill->_date),
- );
- push @history,
- "$date\tCredit #$crednum: $reason
".
- "(applied to invoice #$invnum on $app_date)\t\t\t$amount\t";
+ $payment->_date. "\t".
+ 'Unapplied payment #' .
+ $payment->paynum . " ($payby$payinfo) ".
+ '('.
+ "apply)$delete".
+ "\t\t" . $payment->unapplied . "\t\t\t$target";
}
-}
-
-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;
- push @history,
- $cref->{_date} . "\t" .
- qq!!.
- 'Unapplied credit #' .
- $cref->{crednum} . ": ".
- $cref->{reason} . "\t\t\t" . $credit->credited . "\t";
-}
-
-my(@refunds)=qsearch('cust_refund',{'custnum'=> $custnum } );
-foreach my $refund (@refunds) {
- my($rref)=$refund->hashref;
- my($refundnum) = (
- $refund->refundnum,
- );
-
- push @history,
- $rref->{_date} . "\tRefund #$refundnum, (" .
- $rref->{payby} . " " . $rref->{payinfo} . ") by " .
- $rref->{otaker} . " - ". $rref->{reason} . "\t\t\t\t" .
- $rref->{refund};
-}
-
-my @unapplied_payments =
- grep { $_->unapplied > 0 } qsearch('cust_pay', { 'custnum' => $custnum } );
-foreach my $payment (@unapplied_payments) {
- my $payby = $payment->payby;
- my $payinfo = $payment->payinfo;
- #false laziness w/above
- $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;
- $payby =~ s/^(CARD|COMP)$/$1 /;
- my $delete = $payment->closed !~ /^Y/i && $conf->exists('deletepayments')
- ? qq! (delete)!
- : '';
- push @history,
- $payment->_date. "\t".
- 'Unapplied payment #' .
- $payment->paynum . " ($payby$payinfo) ".
- '('.
- "apply)$delete".
- "\t\t" . $payment->unapplied . "\t\t\t$target";
-}
-
- #formatting
- print &table(), <
- Date |
- Description |
- Charge |
- Payment |
- In-house Credit |
- Refund |
- Balance |
-
+
+ #formatting
+ print &table(), <
+ Date |
+ Description |
+ Charge |
+ Payment |
+ In-house Credit |
+ Refund |
+ Balance |
+
END
+
+ #display payment history
+
+ my $balance = 0;
+ foreach my $item (sort keyfield_numerically @history) {
+ my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item);
+ $charge ||= 0;
+ $payment ||= 0;
+ $credit ||= 0;
+ $refund ||= 0;
+ $balance += $charge - $payment;
+ $balance -= $credit - $refund;
+ $balance = sprintf("%.2f", $balance);
+ $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
+ $target = '' unless defined $target;
+
+ print "";
+ print qq!! unless $target && $target{$target}++;
+ print time2str("%D",$date);
+ print '' if $target && $target{$target} == 1;
+ print " | ",
+ "$desc | ",
+ "",
+ ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
+ " | ",
+ "",
+ ( $payment ? "- \$".sprintf("%.2f",$payment) : '' ),
+ " | ",
+ "",
+ ( $credit ? "- \$".sprintf("%.2f",$credit) : '' ),
+ " | ",
+ "",
+ ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
+ " | ",
+ "\$" . $balance,
+ " | ",
+ "\n";
+ }
+
+ print "";
-#display payment history
-
-my $balance = 0;
-foreach my $item (sort keyfield_numerically @history) {
- my($date,$desc,$charge,$payment,$credit,$refund,$target)=split(/\t/,$item);
- $charge ||= 0;
- $payment ||= 0;
- $credit ||= 0;
- $refund ||= 0;
- $balance += $charge - $payment;
- $balance -= $credit - $refund;
- $balance = sprintf("%.2f", $balance);
- $balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
- $target = '' unless defined $target;
-
- print "
";
- print qq!! unless $target && $target{$target}++;
- print time2str("%D",$date);
- print '' if $target && $target{$target} == 1;
- print " | ",
- "$desc | ",
- "",
- ( $charge ? "\$".sprintf("%.2f",$charge) : '' ),
- " | ",
- "",
- ( $payment ? "- \$".sprintf("%.2f",$payment) : '' ),
- " | ",
- "",
- ( $credit ? "- \$".sprintf("%.2f",$credit) : '' ),
- " | ",
- "",
- ( $refund ? "\$".sprintf("%.2f",$refund) : '' ),
- " | ",
- "\$" . $balance,
- " | ",
- "\n";
}
-#formatting
-print "";
-
-#end
-
-#formatting
-print <
-