diff --git a/site/controllers/transactions_controller.php b/site/controllers/transactions_controller.php index 717bb96..b7b42d3 100644 --- a/site/controllers/transactions_controller.php +++ b/site/controllers/transactions_controller.php @@ -468,7 +468,7 @@ class TransactionsController extends AppController { function deposit_slip($id) { // Find the deposit transaction $this->Transaction->id = $id; - $deposit = $this->Transaction->find('first', array('contain' => false)); + $deposit = $this->Transaction->find('first', array('contain' => array('Account'))); // Get a summary of all forms of tender in the deposit $tenders = $this->Transaction->find diff --git a/site/views/transactions/deposit_slip.ctp b/site/views/transactions/deposit_slip.ctp index 99a25c8..176e5df 100644 --- a/site/views/transactions/deposit_slip.ctp +++ b/site/views/transactions/deposit_slip.ctp @@ -2,11 +2,18 @@ //style="display:inline; echo('

Deposit Slip: ' . - FormatHelper::datetime($deposit['Transaction']['stamp']) - . '

' . "\n"); + FormatHelper::date($deposit['Transaction']['stamp']) + . '
' . "\n"); /* echo('(' . */ /* FormatHelper::age($deposit['Transaction']['stamp'], 60) */ /* . ')
' . "\n"); */ +if ($deposit['Account']['external_name'] || $deposit['Account']['external_account']) { + echo('

' . + ($deposit['Account']['external_name'] ? $deposit['Account']['external_name'] : '') . + ($deposit['Account']['external_name'] && $deposit['Account']['external_account'] ? ': ' : '') . + ($deposit['Account']['external_account'] ? 'Account #' . $deposit['Account']['external_account'] : '') . + '


' . "\n"); +} //pr(compact('deposit'));