Nowhere near done yet, but checking in a snapshot of semi-working code. There is some simultaneous support for both with and without use of the Invoice/Receipt account. I want to do away with them completely, but will need to change how sitelink payments are mapped (right now, they split a payment into multiple parts to match the charge).

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

controllers/leases_controller.php

@@ -71,6 +71,7 @@ class LeasesController extends AppController {
   function jqGridRecordLinks(&$params, &$model, &$records, $links) {
     $links['Lease'] = array('number');
     $links['Unit'] = array('name');
+    $links['Customer'] = array('name');
     return parent::jqGridRecordLinks($params, $model, $records, $links);
   }
 
@@ -107,7 +108,6 @@ class LeasesController extends AppController {
 	     array(// Models
 		   'LeaseType',
 		   'Unit',
-		   'Account' => array('CurrentLedger'),
 		   'Customer',
 		   ),
 	     'conditions' => array(array('Lease.id' => $id)),
@@ -115,23 +115,15 @@ class LeasesController extends AppController {
 	     )
        );
 
-    // Summarize each ledger
-    $this->Lease->statsMerge($lease, 
-			     $this->Lease->stats($lease['Lease']['id']));
-
     // Obtain the overall lease balance
     $this->Lease->statsMerge($lease['Lease'],
 			     array('stats' => $this->Lease->stats($id)));
-    $outstanding_balance = $lease['Lease']['stats']['Account']['Ledger']['balance'];
+    $outstanding_balance = $lease['Lease']['stats']['balance'];
 
     // Determine the lease security deposit
     $deposits = $this->Lease->findSecurityDeposits($lease['Lease']['id']);
     $outstanding_deposit = $deposits['summary']['balance'];
 
-    // Move the Leder stats into our alias 'CurrentLedger'
-    $lease['Account']['CurrentLedger'] += $lease['Account']['Ledger'];
-    unset($lease['Account']['Ledger']);
-
     // Prepare to render
     $title = 'Lease: #' . $lease['Lease']['id'];
     $this->set(compact('lease', 'title',

controllers/ledger_entries_controller.php

@@ -36,6 +36,16 @@ class LedgerEntriesController extends AppController {
 	     array('fields' => array('id', 'name'),
 		   ),
 
+	     'Customer' =>
+	     array('fields' => array('id', 'name'),
+		   ),
+
+	     'Lease' =>
+	     array('fields' => array('id', 'number'),
+		   'Unit' => 
+		   array('fields' => array('id', 'name'),
+			 ),
+		   ),
 	    );
 
     if (isset($params['custom']['account_ftype'])) {
@@ -118,20 +128,64 @@ class LedgerEntriesController extends AppController {
       $conditions[] = array('Reconciliation.'.$ftype.'_ledger_entry_id' => $params['custom']['reconcile_id']);
     }
 
+    if (isset($params['custom']['customer_id'])) {
+      $conditions[] = 
+	array('Customer.id' => $params['custom']['customer_id']);
+
+/*       $Account = new Account(); */
+/*       if (isset($params['custom']['account_ftype']) || */
+/* 	  isset($params['custom']['ledger_id'])) { */
+/* 	$conditions[] =  */
+/* 	  array('OR' => array('Account.id' => $Account->invoiceAccountID(), */
+/* 			      'Account.id' => $Account->receiptAccountID())); */
+/*       } else { */
+/* 	$conditions[] =  */
+/* 	  array('OR' => array('DebitAccount.id' => $Account->invoiceAccountID(), */
+/* 			      //'CreditAccount.id' => $Account->invoiceAccountID(), */
+/* 			      //'DebitAccount.id' => $Account->receiptAccountID(), */
+/* 			      'CreditAccount.id' => $Account->receiptAccountID(), */
+/* 			      )); */
+/*       } */
+    }
+
+    if (isset($params['custom']['lease_id'])) {
+      $conditions[] = 
+	array('Lease.id' => $params['custom']['lease_id']);
+
+/*       $Account = new Account(); */
+/*       if (isset($params['custom']['account_ftype']) || */
+/* 	  isset($params['custom']['ledger_id'])) { */
+/* 	$conditions[] =  */
+/* 	  array('OR' => array('Account.id' => $Account->invoiceAccountID(), */
+/* 			      'Account.id' => $Account->receiptAccountID())); */
+/*       } else { */
+/* 	$conditions[] =  */
+/* 	  array('OR' => array('DebitAccount.id' => $Account->invoiceAccountID(), */
+/* 			      //'CreditAccount.id' => $Account->invoiceAccountID(), */
+/* 			      //'DebitAccount.id' => $Account->receiptAccountID(), */
+/* 			      'CreditAccount.id' => $Account->receiptAccountID(), */
+/* 			      )); */
+/*       } */
+    }
+
+    if (isset($params['custom']['transaction_id'])) {
+      $conditions[] = 
+	array('Transaction.id' => $params['custom']['transaction_id']);
+    }
+
     return $conditions;
   }
 
   function jqGridRecordLinks(&$params, &$model, &$records, $links) {
     $links['Transaction']    = array('id');
     $links['LedgerEntry']    = array('id');
-    if (isset($params['custom']['account_ftype']) || isset($params['custom']['ledger_id'])) {
-      $links['Account']   = array('controller' => 'accounts', 'name');
-    }
-    else {
-      $links['DebitAccount']   = array('controller' => 'accounts', 'name');
-      $links['CreditAccount']  = array('controller' => 'accounts', 'name');
-    }
+    $links['Account']        = array('controller' => 'accounts', 'name');
+    $links['DebitAccount']   = array('controller' => 'accounts', 'name');
+    $links['CreditAccount']  = array('controller' => 'accounts', 'name');
     $links['MonetarySource'] = array('name');
+    $links['Customer']       = array('name');
+    $links['Lease']          = array('number');
+    $links['Unit']           = array('name');
     return parent::jqGridRecordLinks($params, $model, $records, $links);
   }
 
@@ -145,8 +199,13 @@ class LedgerEntriesController extends AppController {
   function jqGridDataOrder(&$params, &$model, $index, $direction) {
 /*     if ($index === 'balance') */
 /*       return ($index .' '. $direction); */
+    $order = parent::jqGridDataOrder($params, $model, $index, $direction);
 
-    return parent::jqGridDataOrder($params, $model, $index, $direction);
+    if ($index === 'Transaction.stamp') {
+      $order[] = 'LedgerEntry.id ' . $direction;
+    }
+
+    return $order;
   }
 
 
@@ -167,6 +226,7 @@ class LedgerEntriesController extends AppController {
     $entry = $this->LedgerEntry->find
       ('first',
        array('contain' => array('MonetarySource.id',
+				'MonetarySource.name',
 				'MonetarySource.MonetaryType.id',
 				'Transaction.id',
 				'Transaction.stamp',
@@ -176,6 +236,9 @@ class LedgerEntriesController extends AppController {
 				'CreditLedger.id',
 				'CreditLedger.sequence',
 				'CreditLedger.account_id',
+				'Customer.id',
+				'Customer.name',
+				'Lease.id',
 				),
 
 	     'fields' => array('LedgerEntry.id',

controllers/units_controller.php

@@ -121,7 +121,7 @@ class UnitsController extends AppController {
     // Get the balance on each lease.
     foreach ($unit['Lease'] AS &$lease) {
       $stats = $this->Unit->Lease->stats($lease['id']);
-      $lease['balance'] = $stats['Account']['Ledger']['balance'];
+      $lease['balance'] = $stats['balance'];
     }
 
     $outstanding_balance = 0;
@@ -130,7 +130,7 @@ class UnitsController extends AppController {
       // Figure out the outstanding balance of the current lease.
       $stats = $this->Unit->stats($id);
       $outstanding_balance =
-	$stats['CurrentLease']['Account']['Ledger']['balance'];
+	$stats['CurrentLease']['balance'];
 
       // Figure out the total security deposit for the current lease.
       $deposits = $this->Unit->Lease->findSecurityDeposits($unit['CurrentLease']['id']);