[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 3bbd8a5c852ba095f1914e0a3b70bdafb6a8b36d

[Mark Wells]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  3bbd8a5c852ba095f1914e0a3b70bdafb6a8b36d (commit)
      from  f38a68a13de191bc9fe41975c9ea8c84cafb6209 (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 3bbd8a5c852ba095f1914e0a3b70bdafb6a8b36d
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Feb 1 08:53:33 2013 -0800

    show declined batch payments in customer display, #21117

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 9c5c2d8..1db74ef 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -206,6 +206,17 @@ sub cust_main {
   qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 }
 
+=item pay_batch
+
+Returns the payment batch this payment belongs to (L<FS::pay_batch).
+
+=cut
+
+sub pay_batch {
+  my $self = shift;
+  FS::pay_batch->by_key($self->batchnum);
+}
+
 #you know what, screw this in the new world of events.  we should be able to
 #get the event defs to retry (remove once.pm condition, add every.pm) without
 #mucking about with statuses of previous cust_event records.  right?
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 7cf47fa..d46bc82 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -490,6 +490,17 @@ foreach my $cust_pay_pending ($cust_main->cust_pay_pending_attempt) {
     #'target'  => $target, #XXX
   };
 }
+#declined batch payments
+foreach my $cust_pay_batch (
+  $cust_main->cust_pay_batch(hashref => {status => 'Declined'})
+) {
+  my $pay_batch = $cust_pay_batch->pay_batch;
+  push @history, {
+    'date'    => $pay_batch->upload,
+    'desc'    => include('payment_history/attempted_batch_payment.html', $cust_pay_batch, %opt),
+    'void_payment' => $cust_pay_batch->amount,
+  };
+}
 
 #credits (some false laziness w/payments)
 foreach my $cust_credit ($cust_main->cust_credit) {
diff --git a/httemplate/view/cust_main/payment_history/attempted_batch_payment.html b/httemplate/view/cust_main/payment_history/attempted_batch_payment.html
new file mode 100644
index 0000000..95947f5
--- /dev/null
+++ b/httemplate/view/cust_main/payment_history/attempted_batch_payment.html
@@ -0,0 +1,13 @@
+<I><% mt('Payment attempt') |h %> <% $info |h %></I>
+<%init>
+
+my( $cust_pay_batch, %opt ) = @_;
+
+my ($payby,$payinfo) = translate_payinfo($cust_pay_batch);
+$payby = translate_payby($payby,$payinfo);
+my $info = $payby ? "($payby$payinfo)" : '';
+
+$info .= ': '. $cust_pay_batch->error_message
+  if length($cust_pay_batch->error_message);
+
+</%init>

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_pay_batch.pm                            |   11 +++++++++++
 httemplate/view/cust_main/payment_history.html     |   11 +++++++++++
 .../payment_history/attempted_batch_payment.html   |   13 +++++++++++++
 3 files changed, 35 insertions(+), 0 deletions(-)
 create mode 100644 httemplate/view/cust_main/payment_history/attempted_batch_payment.html