More work cleaning up and testing the use of charge waivers, as well as security deposit utilizations. Much of this was just around the concept of determining balances, which wasn't / isn't very straightforward. It's not hard to calculate a balance for a particular sitation, but it is difficult to generalize. I think it's reasonable as it now stands, but the StatementEntry::stats algorithm is certainly subject to change. Also, I didn't double check every case which called the stats() function, so I highly suspect we'll find cases where the code is not expecting the new return values, either symantically or logically.

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@480 97e9348a-65ac-dc4b-aefc-98561f571b83

controllers/leases_controller.php

@@ -222,109 +222,13 @@ class LeasesController extends AppController {
    *    to prevent feature overload on the receipt page.
    */
 
-  function apply_deposit($id = null) {
-    // Create some models for convenience
-    $A = new Account();
-
-    if ($this->data) {
-      // Handle the move out based on the data given
-      pr($this->data);
-      $this->Lease->releaseSecurityDeposits($this->data['Lease']['id']);
-      die();
-
-      // Assume this will succeed
-      $ret = true;
-
-      // Go through the entered payments
-      $receipt_transaction = array_intersect_key($this->data,
-						 array('Transaction'=>1,
-						       'transaction_id'=>1));
-    foreach ($data['StatementEntry'] AS $entry) {
-      // Create the receipt entry, and reconcile the credit side
-      // of the double-entry (which should be A/R) as a payment.
-      $ids = $this->StatementEntry->Ledger->Account->postLedgerEntry
-	($receipt_transaction,
-	 array_intersect_key($entry, array('MonetarySource'=>1))
-	 + array_intersect_key($entry, array('account_id'=>1)),
-	 array('debit_ledger_id' => $A->currentLedgerID($entry['account_id']),
-	       'credit_ledger_id' => $A->currentLedgerID($A->receiptAccountID()),
-	       'customer_id' => $customer_id,
-	       'lease_id' => $lease_id)
-	 + $entry,
-	 'receipt');
-
-      if ($ids['error'])
-	$ret = false;
-
-    $db = &$model->getDataSource();
-    $fields = $db->fields($model, $model->alias);
-    $fields[] = ("SUM(IF(Account.id IS NULL, 0," .
-		 "       IF(LedgerEntry.debit_ledger_id = Account.id," .
-		 "          1, -1))" .
-		 "    * IF(LedgerEntry.amount IS NULL, 0, LedgerEntry.amount))" .
-		 " AS 'balance'");
-    return $fields;
-      $receipt_transaction = array_intersect_key($ids,
-						 array('transaction_id'=>1,
-						       'split_transaction_id'=>1));
-    }
-
-      $this->Lease->moveOut($this->data['Lease']['id'],
-			    'VACANT',
-			    $this->data['Lease']['moveout_date'],
-			    //true // Close this lease, if able
-			    false
-			    );
-
-      $this->redirect(array('controller' => 'leases',
-			    'action' => 'view',
-			    $this->data['Lease']['id']));
-      $this->autoRender = false;
-      return;
-    }
-
-    $A = new Account();
-
-    $lease = $this->Lease->find
-      ('first', array
-       ('contain' => array
-	(// Models
-	 'Unit' =>
-	 array('order'  => array('sort_order'),
-	       'fields' => array('id', 'name'),
-	       ),
-
-	 'Customer' =>
-	 array('fields' => array('id', 'name'),
-	       ),
-	 ),
-
-	'conditions' => array(array('Lease.id' => $id),
-			      array('Lease.close_date' => null),
-			      ),
-	));
-
-
-    // Get the lease balance, part of lease stats
-    $this->Lease->statsMerge($lease['Lease'],
-			     array('stats' => $this->Lease->stats($id)));
-
-    // Determine the lease security deposit
-    $deposit_balance = $this->Lease->securityDeposits($lease['Lease']['id']);
-    $this->set(compact('deposit_balance'));
-    $this->set('customer', $lease['Customer']);
-    $this->set('unit',     $lease['Unit']);
-    $this->set('lease',    $lease['Lease']);
-    $this->set('account',  array('id' => $A->securityDepositAccountID()));
-
-/*     $redirect = array('controller' => 'leases', */
-/* 		      'action' => 'view', */
-/* 		      $id); */
-
-    $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
-	      $lease['Unit']['name'] . ': ' .
-	      $lease['Customer']['name'] . ': Utilize Security Deposit');
-    $this->set(compact('title', 'redirect'));
+  function apply_deposit($id) {
+    $this->Lease->releaseSecurityDeposits($id);
+    pr("PREVENTING REDIRECT");
+    $this->render('fake');
+    $this->redirect(array('controller' => 'leases',
+			  'action' => 'view',
+			  $id));
   }