Additional work on generating ledger information. I've been reading up on accounting basics though, and I feel I'm just not going in the right direction. I'm checking this in, since it works somewhat, and will probably try to head in a different direction.

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

app_controller.php

@@ -0,0 +1,54 @@
+<?php
+/* SVN FILE: $Id: app_controller.php 7945 2008-12-19 02:16:01Z gwoo $ */
+/**
+ * Short description for file.
+ *
+ * This file is application-wide controller file. You can put all
+ * application-wide controller-related methods here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app
+ * @since         CakePHP(tm) v 0.2.9
+ * @version       $Revision: 7945 $
+ * @modifiedby    $LastChangedBy: gwoo $
+ * @lastmodified  $Date: 2008-12-18 18:16:01 -0800 (Thu, 18 Dec 2008) $
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+/**
+ * Short description for class.
+ *
+ * Add your application-wide methods in the class below, your controllers
+ * will inherit them.
+ *
+ * @package       cake
+ * @subpackage    cake.app
+ */
+class AppController extends Controller {
+  var $helpers = array('Html', 'Number', 'Time');
+
+  function sideMenuLinks() {
+    return array(
+		 array('name' => 'Common',      'header' => true),
+		 array('name' => 'Site Map',    'url' => array('controller' => 'maps',       'action' => 'view', 1)),
+		 array('name' => 'Tenants',     'url' => array('controller' => 'contacts',   'action' => 'index')),
+		 array('name' => 'Units',       'url' => array('controller' => 'units',      'action' => 'index')),
+		 );
+  }
+
+  function beforeRender() {
+    $this->set('sidemenu', $this->sideMenuLinks());
+  }
+
+}
+?>

app_model.php

@@ -0,0 +1,109 @@
+<?php
+/* SVN FILE: $Id: app_model.php 7945 2008-12-19 02:16:01Z gwoo $ */
+
+/**
+ * Application model for Cake.
+ *
+ * This file is application-wide model file. You can put all
+ * application-wide model-related methods here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app
+ * @since         CakePHP(tm) v 0.2.9
+ * @version       $Revision: 7945 $
+ * @modifiedby    $LastChangedBy: gwoo $
+ * @lastmodified  $Date: 2008-12-18 18:16:01 -0800 (Thu, 18 Dec 2008) $
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+/**
+ * Application model for Cake.
+ *
+ * Add your application-wide methods in the class below, your models
+ * will inherit them.
+ *
+ * @package       cake
+ * @subpackage    cake.app
+ */
+class AppModel extends Model {
+
+  //var $actsAs = array('Containable');
+  var $actsAs = array('Linkable');
+
+  /**
+   * Get Enum Values
+   * Snippet v0.1.3
+   * http://cakeforge.org/snippet/detail.php?type=snippet&id=112
+   *
+   * Gets the enum values for MySQL 4 and 5 to use in selectTag()
+   */
+  function getEnumValues($columnName=null, $respectDefault=false)
+  {
+    if ($columnName==null) { return array(); } //no field specified
+
+    //Get the name of the table
+    $db =& ConnectionManager::getDataSource($this->useDbConfig);
+    $tableName = $db->fullTableName($this, false);
+
+    //Get the values for the specified column (database and version specific, needs testing)
+    $result = $this->query("SHOW COLUMNS FROM {$tableName} LIKE '{$columnName}'");
+
+    //figure out where in the result our Types are (this varies between mysql versions)
+    $types = null;
+    if     ( isset( $result[0]['COLUMNS']['Type'] ) ) {  //MySQL 5
+      $types = $result[0]['COLUMNS']['Type']; $default = $result[0]['COLUMNS']['Default'];
+    }
+    elseif ( isset( $result[0][0]['Type'] ) )         {  //MySQL 4
+      $types = $result[0][0]['Type']; $default = $result[0][0]['Default'];
+    }
+    else   { //types return not accounted for
+      return array();
+    }
+
+    //Get the values
+    return array_flip(array_merge(array(''), // MySQL sets 0 to be the empty string
+				  explode("','", preg_replace("/(enum)\('(.+?)'\)/","\\2", $types))
+				  ));
+  } //end getEnumValues
+
+
+  // Overriding pagination, since the stupid count mechanism blows.
+  // This is also a crappy solution, especially if the query returns
+  // a really large number of rows.  However, trying to untagle this
+  // without changing a bunch of core code is near impossible.
+
+  var $paginate_rows_save;
+  function paginate($conditions, $fields, $order, $limit, $page = 1, $recursive = null, $extra = null) {
+/*     pr("paginate"); */
+/*     pr(array_merge(compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive', 'extra'))); */
+    if ($page > 1 && isset($limit))
+      $offset = ($page - 1) * $limit;
+    else
+      $offset = 0;
+    return array_slice($this->paginate_rows_save, $offset, $limit);
+  }
+  function paginateCount($conditions = null, $recursive = null, $extra = null) {
+/*     pr("paginateCount"); */
+/*     pr(array_merge(compact('conditions', 'recursive', 'extra'))); */
+
+    if (!isset($recursive))
+      $recursive = $this->recursive;
+    $parameters = array_merge(compact('conditions', 'recursive'), $extra);
+    $results = $this->find('all', $parameters);
+
+    $this->paginate_rows_save = $results;
+    return count($this->paginate_rows_save);
+  }
+
+}

build.cmd

@@ -1,3 +0,0 @@
-@echo off
-%~dp0\scripts\sitelink2pmgr.pl %~dp0\db\schema.sql %~dp0db\vss.mdb %*
-echo Done!

config/routes.php

@@ -26,12 +26,14 @@
  * @lastmodified  $Date: 2008-12-18 18:16:01 -0800 (Thu, 18 Dec 2008) $
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-
 /**
- * Here, we are connecting '/' (base path) to our site map.
+ * Here, we are connecting '/' (base path) to controller called 'Pages',
- * It's hardcoded to map #1, but at some point we'll implement
+ * its action called 'display', and we pass a param to select the view file
- * a login mechanism and the default path will be to log on instead.
+ * to use (in this case, /app/views/pages/home.ctp)...
  */
-	Router::connect('/', array('controller' => 'maps', 'action' => 'view', '1'));
+	Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
-
+/**
+ * ...and connect the rest of 'Pages' controller's urls.
+ */
+	Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
 ?>

controllers/charges_controller.php

@@ -0,0 +1,127 @@
+<?php
+
+class ChargesController extends AppController {
+  var $paginate = array('limit' => 100,
+			'group' => 'Charge.id',
+			'order' => array('Charge.charge_date' => 'ASC'));
+
+  var $sidemenu_links =
+    array(array('name' => 'Charges',        'header' => true),
+	  array('name' => 'Cleared',      'url' => array('controller' => 'charges', 'action' => 'cleared')),
+	  array('name' => 'Unresolved',   'url' => array('controller' => 'charges', 'action' => 'unresolved')),
+	  );
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: sideMenuLinks
+   *  - Generates controller specific links for the side menu
+   */
+  function sideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index
+   *  - Lists all charges
+   */
+
+  function index() {
+    $this->all();
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: cleared
+   *  - Lists cleared charges
+   */
+
+  function cleared() {
+    $this->all();
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: unresolved
+   *  - Lists unresolved charges
+   */
+
+  function unresolved() {
+    $this->all();
+  }
+
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: all
+   *  - Lists all charges
+   */
+
+  function all() {
+    $this->paginate = array_merge
+      ($this->paginate,
+       array('link' =>
+	     array(// Models
+		   'ChargeType',
+		   'Receipt',
+		   'Lease' => array('fields' => array('number'))
+		   ),
+	     ));
+
+    $title = 'All Charges';
+    $this->set('title', $title); $this->set('heading', $title);
+    $this->set('charges', $this->paginate());
+    $this->render('index');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific charge
+   */
+
+  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    $this->Charge->Behaviors->attach('Containable');
+    $this->Charge->contain
+      (array(// Models
+	     'ChargeType',
+	     'Receipt',
+	     'Lease' => array('fields' => array('number')),
+	     )
+       );
+    $charge = $this->Charge->read(null, $id);
+    //pr($charge);
+
+    $payment_amount = 0;
+    foreach($charge['Receipt'] AS $receipt)
+      $payment_amount += $receipt['ChargesReceipt']['amount'];
+    $balance_amount = $charge['Charge']['total'] - $payment_amount;
+
+/*     $this->sidemenu_links[] = */
+/*       array('name' => 'Operations',       'header' => true); */
+/*     $this->sidemenu_links[] = */
+/*       array('name' => 'Move-Out',         'url' => array('controller' => 'charges', 'action' => 'move-out')); */
+
+    $title = 'Charge #' . $charge['Charge']['id'];
+    $this->set(compact('charge', 'title',
+		       'payment_amount',
+		       'balance_amount'));
+  }
+}

controllers/contacts_controller.php

@@ -0,0 +1,203 @@
+<?php
+
+class ContactsController extends AppController {
+  var $paginate = array('limit' => 100,
+			'group' => 'Contact.id',
+			'order' => array('Contact.last_name' => 'ASC',
+					 'Contact.first_name' => 'ASC'));
+
+  var $sidemenu_links =
+    array(array('name' => 'Tenants',       'header' => true),
+	  array('name' => 'Current',       'url' => array('controller' => 'contacts', 'action' => 'current')),
+	  array('name' => 'Past',          'url' => array('controller' => 'contacts', 'action' => 'past')),
+	  array('name' => 'All Tenants',   'url' => array('controller' => 'contacts', 'action' => 'tenants')),
+	  array('name' => 'All Contacts',  'url' => array('controller' => 'contacts', 'action' => 'all')),
+	  );
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: sideMenuLinks
+   *  - Generates controller specific links for the side menu
+   */
+  function sideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index
+   *  - Lists all current tenants
+   */
+
+  function index() {
+    $this->current();
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: past
+   *  - Lists all tenants, past and present
+   */
+
+  function tenants() {
+    $this->paginate = array_merge
+      ($this->paginate,
+       array('link' =>
+	     array(// Models
+		   'Lease' =>
+		   array('fields' => array(),
+			 'type' => 'INNER',
+			 ),
+		   ),
+	     'conditions' => array('ContactsLease.type !=' => 'ALTERNATE')
+	     ));
+
+    $title = 'All Tenants';
+    $this->set('title', $title); $this->set('heading', $title);
+    $this->set('contacts', $this->paginate());
+    $this->render('index');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: current
+   *  - Lists all current tenants
+   */
+
+  function current() {
+    $this->paginate = array_merge
+      ($this->paginate,
+       array('link' =>
+	     array(// Models
+		   'Lease' =>
+		   array('fields' => array(),
+			 'type' => 'INNER',
+			 ),
+		   ),
+	     'conditions' => array('ContactsLease.type !=' => 'ALTERNATE',
+				   'Lease.close_date IS NULL')
+	     ));
+
+    $title = 'Current Tenants';
+    $this->set('title', $title); $this->set('heading', $title);
+    $this->set('contacts', $this->paginate());
+    $this->render('index');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: past
+   *  - Lists all past tenants
+   */
+
+  function past() {
+    $this->paginate = array_merge
+      ($this->paginate,
+       array('link' =>
+	     array(// Models
+		   'Lease' =>
+		   array('fields' => array(),
+			 'type' => 'INNER',
+			 ),
+		   ),
+	     'conditions' => array('ContactsLease.type !=' => 'ALTERNATE',
+				   'Lease.close_date IS NOT NULL')
+	     ));
+
+    $title = 'Past Tenants';
+    $this->set('title', $title); $this->set('heading', $title);
+    $this->set('contacts', $this->paginate());
+    $this->render('index');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: all
+   *  - Lists all contacts, including non-tenants
+   */
+
+  function all() {
+    $title = 'All Contacts';
+    $this->set('title', $title); $this->set('heading', $title);
+    $this->set('contacts', $this->paginate());
+    $this->render('index');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific contact
+   */
+
+  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    $this->Contact->Behaviors->attach('Containable');
+    $this->Contact->contain
+      (array(// Models
+	     'ContactPhone',
+	     'ContactEmail',
+	     'ContactAddress',
+	     'Lease' =>
+	     array('order' => 'movein_date',
+		   'conditions' => array('Lease.lease_date IS NOT NULL',
+					 'ContactsLease.type !=' => 'ALTERNATE'),
+		   // Models
+		   'Unit' =>
+		   array('order'  => array('sort_order'),
+			 'fields' => array('id', 'name'),
+			 ),
+		   'Charge' =>
+		   array('order'  => array('charge_date'),
+			 // Models
+			 'ChargeType',
+			 'Receipt',
+			 )
+		   )
+	     )
+       );
+    $contact = $this->Contact->read(null, $id);
+
+    $outstanding_deposit = 0;
+    $outstanding_balance = 0;
+    foreach($contact['Lease'] AS $lease) {
+      foreach($lease['Charge'] AS $charge) {
+	$outstanding_balance += $charge['total'];
+	foreach ($charge['Receipt'] AS $receipt) {
+	  $outstanding_balance -= $receipt['ChargesReceipt']['amount'];
+	  // REVISIT <AP> 20090530:
+	  //   Using hardcoded value for security deposit...
+	  //   That can't be good!
+	  if ($charge['charge_type_id'] == 1)
+	    $outstanding_deposit += $receipt['ChargesReceipt']['amount'];
+	}
+      }
+    }
+
+    $this->sidemenu_links[] =
+      array('name' => 'Operations',       'header' => true);
+    $this->sidemenu_links[] =
+      array('name' => 'Move-Out',         'url' => array('controller' => 'units', 'action' => 'move-out'));
+
+    $title = $contact['Contact']['display_name'];
+    $this->set(compact('contact', 'title',
+		       'outstanding_balance',
+		       'outstanding_deposit'));
+  }
+}

controllers/maps_controller.php

@@ -2,44 +2,22 @@
 
 class MapsController extends AppController {
 
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * action: index / all
+   * action: index
-   *  - Generate a listing of maps
+   *  - Generates a list of all site maps
    *
    * REVISIT <AP> 20090528:
    *  We'll need to present only those site area maps that correspond
    *  to the users particular site.
    */
 
-  function index()    { $this->all(); }
+  function index() {
-  function all()      { $this->jqGridView('All Maps', 'all'); }
+    $this->Map->recursive = 0;
-
+    $this->set('maps', $this->paginate());
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
-   *    these virtual functions ensure that the correct data is passed
-   *    to jqGrid.
-   */
-
-  function jqGridDataTables(&$params, &$model) {
-    return array
-      ('link' => array('SiteArea' => array('fields' => array('SiteArea.id', 'SiteArea.name')),
-		       ),
-       );
   }
 
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['Map'] = array('id');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
-  }
-
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -53,7 +31,6 @@ class MapsController extends AppController {
       $this->redirect(array('action'=>'index'));
     }
     $this->set('info', $this->mapInfo($id, $requested_width));
-    $this->set('title', "Site Map");
   }
 
 
@@ -151,6 +128,22 @@ class MapsController extends AppController {
     return $info;
   }
 
+  // Temporary function
+  function unitStatusList() {
+    return
+      array('DELETED'      => array(),
+	    'DAMAGED'      => array(),
+	    'COMPANY'      => array(),
+	    'UNAVAILABLE'  => array(),
+	    'RESERVED'     => array(),
+	    'DIRTY'        => array(),
+	    'VACANT'       => array(),
+	    'OCCUPIED'     => array(),
+	    'LATE'         => array(),
+	    'LOCKED'       => array(),
+	    'LIENED'       => array(),
+	    );
+  }
 
   /**************************************************************************
    **************************************************************************
@@ -160,10 +153,9 @@ class MapsController extends AppController {
    */
 
   function legend($id = null, $requested_width = 400) {
-    $status = $this->Map->Unit->activeStatusEnums();
+    $status = $this->unitStatusList();
-    //pr($status);
+    $cols = 6;
-    $rows = 2;
+    $rows = (int)((count($status) + $cols - 1) / $cols);
-    $cols = (int)((count($status) + $rows - 1) / $rows);
 
     $info = array('units' => array());
 
@@ -191,7 +183,7 @@ class MapsController extends AppController {
     $item_width *= $screen_adjustment_factor;
     $item_depth *= $screen_adjustment_factor;
 
-    foreach ($status AS $code => $value) {
+    foreach ($status AS $code => $color) {
       $info['units'][] = array('name'   => $code,
 			       'status' => $code,
 			       'width'  => $item_width,
@@ -219,13 +211,9 @@ class MapsController extends AppController {
    */
 
   function image($info, $legend = false) {
-    $debug = false;
-
-    if (!$debug) {
     $this->layout = null;
     $this->autoLayout = false;
     Configure::write('debug', '0');
-    }
 
     // Define our color palate
     // REVISIT <AP>: 20090513
@@ -266,7 +254,9 @@ class MapsController extends AppController {
       $code['fg'] = $component;
     }
 
-    $this->set(compact('info', 'debug'));
+    //pr($info);
+
+    $this->set(compact('info'));
     $this->render('image');
   }
 

controllers/pages_controller.php

@@ -0,0 +1,86 @@
+<?php
+/* SVN FILE: $Id: pages_controller.php 7945 2008-12-19 02:16:01Z gwoo $ */
+/**
+ * Static content controller.
+ *
+ * This file will render views from views/pages/
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @since         CakePHP(tm) v 0.2.9
+ * @version       $Revision: 7945 $
+ * @modifiedby    $LastChangedBy: gwoo $
+ * @lastmodified  $Date: 2008-12-18 18:16:01 -0800 (Thu, 18 Dec 2008) $
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+/**
+ * Static content controller
+ *
+ * Override this controller by placing a copy in controllers directory of an application
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ */
+class PagesController extends AppController {
+/**
+ * Controller name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'Pages';
+/**
+ * Default helper
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array('Html');
+/**
+ * This controller does not use a model
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+/**
+ * Displays a view
+ *
+ * @param mixed What page to display
+ * @access public
+ */
+	function display() {
+		$path = func_get_args();
+
+		$count = count($path);
+		if (!$count) {
+			$this->redirect('/');
+		}
+		$page = $subpage = $title = null;
+
+		if (!empty($path[0])) {
+			$page = $path[0];
+		}
+		if (!empty($path[1])) {
+			$subpage = $path[1];
+		}
+		if (!empty($path[$count - 1])) {
+			$title = Inflector::humanize($path[$count - 1]);
+		}
+		$this->set(compact('page', 'subpage', 'title'));
+		$this->render(join('/', $path));
+	}
+}
+
+?>

controllers/payments_controller.php

@@ -0,0 +1,118 @@
+<?php
+
+class PaymentsController extends AppController {
+  var $paginate = array('limit' => 100,
+			'group' => 'Payment.id',
+			'order' => array('Payment.id' => 'ASC'));
+
+  var $sidemenu_links =
+    array(array('name' => 'Payments',        'header' => true),
+	  array('name' => 'Cleared',      'url' => array('controller' => 'payments', 'action' => 'cleared')),
+	  array('name' => 'Unresolved',   'url' => array('controller' => 'payments', 'action' => 'unresolved')),
+	  );
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: sideMenuLinks
+   *  - Generates controller specific links for the side menu
+   */
+  function sideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index
+   *  - Lists all payments
+   */
+
+  function index() {
+    $this->all();
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: cleared
+   *  - Lists cleared payments
+   */
+
+  function cleared() {
+    $this->all();
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: unresolved
+   *  - Lists unresolved payments
+   */
+
+  function unresolved() {
+    $this->all();
+  }
+
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: all
+   *  - Lists all payments
+   */
+
+  function all() {
+    $this->paginate = array_merge
+      ($this->paginate,
+       array('link' =>
+	     array(// Models
+		   'PaymentType',
+		   'Receipt',
+		   ),
+	     ));
+
+    $title = 'All Payments';
+    $this->set('title', $title); $this->set('heading', $title);
+    $this->set('payments', $this->paginate());
+    $this->render('index');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific payment
+   */
+
+  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    $this->Payment->Behaviors->attach('Containable');
+    $this->Payment->contain
+      (array(// Models
+	     'PaymentType',
+	     'Receipt',
+	     )
+       );
+    $payment = $this->Payment->read(null, $id);
+    //pr($payment);
+
+/*     $this->sidemenu_links[] = */
+/*       array('name' => 'Operations',       'header' => true); */
+/*     $this->sidemenu_links[] = */
+/*       array('name' => 'Move-Out',         'url' => array('controller' => 'payments', 'action' => 'move-out')); */
+
+    $title = 'Payment #' . $payment['Payment']['id'];
+    $this->set(compact('payment', 'title'));
+  }
+}

controllers/receipts_controller.php

@@ -0,0 +1,131 @@
+<?php
+
+class ReceiptsController extends AppController {
+  var $paginate = array('limit' => 100,
+			'group' => 'Receipt.id',
+			'order' => array('Receipt.stamp' => 'ASC'));
+
+  var $sidemenu_links =
+    array(array('name' => 'Receipts',        'header' => true),
+	  array('name' => 'Cleared',      'url' => array('controller' => 'receipts', 'action' => 'cleared')),
+	  array('name' => 'Unresolved',   'url' => array('controller' => 'receipts', 'action' => 'unresolved')),
+	  );
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: sideMenuLinks
+   *  - Generates controller specific links for the side menu
+   */
+  function sideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index
+   *  - Lists all receipts
+   */
+
+  function index() {
+    $this->all();
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: cleared
+   *  - Lists cleared receipts
+   */
+
+  function cleared() {
+    $this->all();
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: unresolved
+   *  - Lists unresolved receipts
+   */
+
+  function unresolved() {
+    $this->all();
+  }
+
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: all
+   *  - Lists all receipts
+   */
+
+  function all() {
+    $this->paginate = array_merge
+      ($this->paginate,
+       array('link' =>
+	     array(// Models
+		   'Charge',
+		   'Payment'
+		   ),
+	     ));
+
+    $title = 'All Receipts';
+    $this->set('title', $title); $this->set('heading', $title);
+    $this->set('receipts', $this->paginate());
+    $this->render('index');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific receipt
+   */
+
+  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    $this->Receipt->Behaviors->attach('Containable');
+    $this->Receipt->contain
+      (array(// Models
+	     'Charge' => array(// Models
+			       'Lease' => array('fields' => array('number')),
+			       'ChargesReceipt',
+			       'ChargeType'),
+	     'Payment' => array(// Models
+			       'PaymentType'),
+	     )
+       );
+    $receipt = $this->Receipt->read(null, $id);
+    //pr($receipt);
+
+    $charge_amount = 0;
+    $payment_amount = 0;
+    foreach($receipt['Charge'] AS $charge)
+      $charge_amount += $charge['ChargesReceipt']['amount'];
+    foreach($receipt['Payment'] AS $payment)
+      $payment_amount += $payment['amount'];
+
+/*     $this->sidemenu_links[] = */
+/*       array('name' => 'Operations',       'header' => true); */
+/*     $this->sidemenu_links[] = */
+/*       array('name' => 'Move-Out',         'url' => array('controller' => 'receipts', 'action' => 'move-out')); */
+
+    $title = 'Receipt #' . $receipt['Receipt']['id'];
+    $this->set(compact('receipt', 'title',
+		       'charge_amount',
+		       'payment_amount'));
+  }
+}

controllers/units_controller.php

@@ -0,0 +1,212 @@
+<?php
+
+class UnitsController extends AppController {
+  var $paginate = array('limit' => 100,
+			'group' => 'Unit.id',
+			'order' => array('Unit.sort_order' => 'ASC'));
+
+  var $sidemenu_links =
+    array(array('name' => 'Units',        'header' => true),
+	  array('name' => 'Occupied',     'url' => array('controller' => 'units', 'action' => 'occupied')),
+	  array('name' => 'Vacant',       'url' => array('controller' => 'units', 'action' => 'vacant')),
+	  array('name' => 'Unavailable',  'url' => array('controller' => 'units', 'action' => 'unavailable')),
+	  array('name' => 'All',          'url' => array('controller' => 'units', 'action' => 'all')),
+	  );
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: sideMenuLinks
+   *  - Generates controller specific links for the side menu
+   */
+  function sideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index
+   *  - Lists all units
+   */
+
+  function index() {
+    $this->all();
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: unavailable
+   *  - Lists unavailable units
+   */
+
+  function unavailable() {
+    $this->paginate = array_merge
+      ($this->paginate,
+       array('link' =>
+	     array(// Models
+		   'UnitSize' => array('fields' => array('name')),
+		   ),
+	     'conditions' => $this->Unit->conditionUnavailable()
+	     ));
+
+    $title = 'Unavailable Units';
+    $this->set('title', $title); $this->set('heading', $title);
+    $this->set('units', $this->paginate());
+    $this->render('index');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: vacant
+   *  - Lists vacant units
+   */
+
+  function vacant() {
+    $this->paginate = array_merge
+      ($this->paginate,
+       array('link' =>
+	     array(// Models
+		   'UnitSize' => array('fields' => array('name')),
+		   ),
+	     'conditions' => $this->Unit->conditionVacant()
+	     ));
+
+    $title = 'Vacant Units';
+    $this->set('title', $title); $this->set('heading', $title);
+    $this->set('units', $this->paginate());
+    $this->render('index');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: occupied
+   *  - Lists occupied units
+   */
+
+  function occupied() {
+    $this->paginate = array_merge
+      ($this->paginate,
+       array('link' =>
+	     array(// Models
+		   'UnitSize' => array('fields' => array('name')),
+		   'Lease' =>    array('fields' => array(),
+
+				       // Models
+				       'Contact' => array('fields' => array('display_name'),
+							  //'type' => 'LEFT',
+							  ),
+				       ),
+		   ),
+	     'conditions' => $this->Unit->conditionOccupied()
+	     ));
+
+    $title = 'Occupied Units';
+    $this->set('title', $title); $this->set('heading', $title);
+    $this->set('units', $this->paginate());
+    $this->render('index');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: all
+   *  - Lists all units
+   */
+
+  function all() {
+    $this->paginate = array_merge
+      ($this->paginate,
+       array('link' =>
+	     array(// Models
+		   'UnitSize' => array('fields' => array('name')),
+		   ),
+	     ));
+
+    $title = 'All Units';
+    $this->set('title', $title); $this->set('heading', $title);
+    $this->set('units', $this->paginate());
+    $this->render('index');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific unit
+   */
+
+  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>''));
+    }
+
+    $this->Unit->Behaviors->attach('Containable');
+    $this->Unit->contain
+      (array(// Models
+	     'UnitSize',
+	     'Lease' =>
+	     array('order' => 'movein_date',
+		   'conditions' => array('Lease.lease_date IS NOT NULL',
+					 ),
+		   // Models
+		   'Contact' =>
+		   array(//'order'  => array('sort_order'),
+			 'fields' => array('id', 'display_name'),
+			 ),
+		   'Charge' =>
+		   array('order'  => array('charge_date'),
+			 // Models
+			 'ChargeType',
+			 'Receipt' => array(// Models
+					    'Payment'
+					    ),
+			 )
+		   )
+	     )
+       );
+    $unit = $this->Unit->read(null, $id);
+    //pr($unit);
+
+    $outstanding_deposit = 0;
+    $outstanding_balance = 0;
+    foreach($unit['Lease'] AS $lease) {
+      foreach($lease['Charge'] AS $charge) {
+	$outstanding_balance += $charge['total'];
+	foreach ($charge['Receipt'] AS $receipt) {
+	  $outstanding_balance -= $receipt['ChargesReceipt']['amount'];
+
+/* 	  foreach($receipt['Payment'] AS $payment) */
+/* 	    $outstanding_balance -= $payment['amount']; */
+
+	  // REVISIT <AP> 20090530:
+	  //   Using hardcoded value for security deposit...
+	  //   That can't be good!
+	  if ($charge['charge_type_id'] == 1)
+	    $outstanding_deposit += $receipt['ChargesReceipt']['amount'];
+	}
+      }
+    }
+
+    $this->sidemenu_links[] =
+      array('name' => 'Operations',       'header' => true);
+    $this->sidemenu_links[] =
+      array('name' => 'Move-Out',         'url' => array('controller' => 'units', 'action' => 'move-out'));
+
+    $title = 'Unit ' . $unit['Unit']['name'];
+    $this->set(compact('unit', 'title',
+		       'outstanding_balance',
+		       'outstanding_deposit'));
+  }
+}

models/account.php

@@ -0,0 +1,29 @@
+<?php
+class Account extends AppModel {
+
+	var $name = 'Account';
+	var $validate = array(
+		'id' => array('numeric'),
+		'name' => array('notempty'),
+		'external_name' => array('notempty')
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+	var $hasMany = array(
+		'ChargeType' => array(
+			'className' => 'ChargeType',
+			'foreignKey' => 'account_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+
+}
+?>

models/behaviors/linkable.php

@@ -0,0 +1,193 @@
+<?php
+/*
+ * LinkableBehavior
+ * Light-weight approach for data mining on deep relations between models. 
+ * Join tables based on model relations to easily enable right to left find operations.
+ * 
+ * Can be used as a alternative to the ContainableBehavior:
+ * - On data fetching only in right to left operations,
+ * wich means that in "one to many" relations (hasMany, hasAndBelongsToMany)
+ * should only be used from the "many to one" tables. i.e:
+ * To fetch all Users assigneds to a Project with ProjectAssignment,
+ * $Project->find('all', array('link' => 'User', 'conditions' => 'project_id = 1')) 
+ *	 - Won't produce the desired result as data came from users table will be lost.
+ * $User->find('all', array('link' => 'Project', 'conditions' => 'project_id = 1'))
+ *   - Will fetch all users related to the specified project in one query
+ * 
+ * - On data mining as a much lighter approach - can reduce 300+ query find operations
+ * in one single query with joins; "or your money back!" ;-)
+ *
+ * - Has the 'fields' param enabled to make it easy to replace Containable usage,
+ * only change the 'contain' param to 'link'.
+ *
+ * Linkable Behavior. Taking it easy in your DB.
+ * RafaelBandeira <rafaelbandeira3(at)gmail(dot)com>
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *  
+ * @version 1.0; 
+ */
+ 
+class LinkableBehavior extends ModelBehavior {
+	
+	protected $_key = 'link';
+	
+	protected $_options = array(
+		'type' => true, 'table' => true, 'alias' => true, 'joins' => true,
+		'conditions' => true, 'fields' => true, 'reference' => true,
+		'class' => true, 'defaults' => true
+	);
+
+	protected $_defaults = array('type' => 'LEFT');
+	
+	public function beforeFind(&$Model, $query) {
+/* 	  pr("Linkable::beforeFind() begin"); pr($query); */
+		if (isset($query[$this->_key])) {
+			$optionsDefaults = $this->_defaults + array('reference' => $Model->alias, $this->_key => array());
+			$optionsKeys = $this->_options + array($this->_key => true);
+			if (!isset($query['fields']) || $query['fields'] === true) {
+			  //$query['fields'] = array_keys($Model->_schema);
+			  $query['fields'] = $Model->getDataSource()->fields($Model);
+			} elseif (!is_array($query['fields'])) {
+			  $query['fields'] = array($query['fields']);
+			}
+			$query = am(array('joins' => array()), $query, array('recursive' => -1));
+			$iterators[] = $query[$this->_key];
+			$cont = 0;
+			do {
+				$iterator = $iterators[$cont];
+				$defaults = $optionsDefaults;
+				if (isset($iterator['defaults'])) {
+					$defaults = array_merge($defaults, $iterator['defaults']);
+					unset($iterator['defaults']);
+				}
+				$iterations = Set::normalize($iterator);
+				foreach ($iterations as $alias => $options) {
+					if (is_null($options)) {
+						$options = array();
+					}
+					$options = am($defaults, compact('alias'), $options);
+					if (empty($options['alias'])) {
+						throw new InvalidArgumentException(sprintf('%s::%s must receive aliased links', get_class($this), __FUNCTION__));
+					}
+
+					if (empty($options['table']) && empty($options['class'])) {
+						$options['class'] = $options['alias'];
+					} elseif (!empty($options['table']) && empty($options['class'])) {
+						$options['class'] = Inflector::classify($options['table']);
+					}
+					$_Model =& ClassRegistry::init($options['class']);			// the incoming model to be linked in query
+					$Reference =& ClassRegistry::init($options['reference']); 	// the already in query model that links to $_Model
+/* 					pr("_Model: $options[class] : $_Model->name ($_Model->alias)"); */
+/* 					pr("Reference: $options[reference] : $Reference->name ($Reference->alias)"); */
+					$db =& $_Model->getDataSource();
+					$associations = $_Model->getAssociated();
+					if (isset($associations[$Reference->alias])) {
+						$type = $associations[$Reference->alias];
+						$association = $_Model->{$type}[$Reference->alias];
+					} else {
+						$_Model->bind($Reference->alias);
+						$type = 'belongsTo';
+						$association = $_Model->{$type}[$Reference->alias];
+						$_Model->unbindModel(array('belongsTo' => array($Reference->alias)));
+					}
+
+					if (empty($options['conditions'])) {
+						if ($type === 'belongsTo') {
+							$modelKey = $_Model->escapeField($association['foreignKey']);
+							$referenceKey = $Reference->escapeField($Reference->primaryKey);
+							$options['conditions'] = "{$referenceKey} = {$modelKey}";
+						} elseif ($type === 'hasAndBelongsToMany') {
+							if (isset($association['with']))
+								$Link =& $_Model->{$association['with']};
+							else
+								$Link =& $_Model->{Inflector::classify($association['joinTable'])};
+
+							$linkAlias = $Link->alias;
+							//$linkAlias = $Link->alias . $options['alias'];
+
+							// Get the foreign key fields (for the link table) directly from
+							// the defined model associations, if they exists.  This is the
+							// users direct specification, and therefore definitive if present.
+							$modelLink = $Link->escapeField($association['foreignKey'], $linkAlias);
+							$referenceLink = $Link->escapeField($association['associationForeignKey'], $linkAlias);
+
+							// If we haven't figured out the foreign keys, see if there is a
+							// model for the link table, and if it has the appropriate
+							// associations with the two tables we're trying to join.
+							if (empty($modelLink) && isset($Link->belongsTo[$_Model->alias]))
+								$modelLink = $Link->escapeField($Link->belongsTo[$_Model->alias]['foreignKey'], $linkAlias);
+							if (empty($referenceLink) && isset($Link->belongsTo[$Reference->alias]))
+								$referenceLink = $Link->escapeField($Link->belongsTo[$Reference->alias]['foreignKey'], $linkAlias);
+
+							// We're running quite thin here.  None of the models spell
+							// out the appropriate linkages.  We'll have to SWAG it.
+							if (empty($modelLink))
+								$modelLink = $Link->escapeField(Inflector::underscore($_Model->alias) . '_id', $linkAlias);
+							if (empty($referenceLink))
+								$referenceLink = $Link->escapeField(Inflector::underscore($Reference->alias) . '_id', $linkAlias);
+
+							// Get the primary key from the tables we're joining.
+							$referenceKey = $Reference->escapeField();
+							$modelKey = $_Model->escapeField();
+								
+							// Join the linkage table to our model.  We'll use an inner join,
+							// as the whole purpose of the linkage table is to make this
+							// connection.  As we are embedding this join, the INNER will not
+							// cause any problem with the overall query, should the user not
+							// be concerned with whether or not the join has any results.
+							// They control that with the 'type' parameter which will be at
+							// the top level join.
+							$options['joins'][] = array('type' =>  'INNER',
+																 'alias' => $options['alias'],
+																 'conditions' => "{$modelKey} = {$modelLink}",
+																 'table' => $db->fullTableName($_Model, true));
+
+							// The user may have specified conditions directly in the model
+							// for this join.  Make sure to adhere to those conditions.
+							if (isset($association['conditions']) && is_array($association['conditions']))
+								$options['conditions'] = $association['conditions'];
+							elseif (!empty($association['conditions']))
+								$options['conditions'] = array($association['conditions']);
+
+							// Now for the top level join.  This will be added into the list
+							// of joins down below, outside of the HABTM specific code.
+							$options['alias'] = $linkAlias;
+							$options['table'] = $Link->getDataSource()->fullTableName($Link);
+							$options['conditions'][] = "{$referenceLink} = {$referenceKey}";
+						} else {
+							$referenceKey = $Reference->escapeField($association['foreignKey']);
+							$modelKey = $_Model->escapeField($_Model->primaryKey);
+							$options['conditions'] = "{$modelKey} = {$referenceKey}";	
+						}
+					}
+					if (empty($options['table'])) {
+						$options['table'] = $db->fullTableName($_Model, true);
+					}
+
+					if (!isset($options['fields']) || !is_array($options['fields']))
+					  $options['fields'] = $db->fields($_Model);
+					elseif (!empty($options['fields']))
+					  $options['fields'] = $db->fields($_Model, null, $options['fields']);
+					    
+					$query['fields'] = array_merge($query['fields'], $options['fields'],
+								       (empty($association['fields']) 
+									? array() : $db->fields($_Model, null, $association['fields'])));
+									       
+
+					$options[$this->_key] = am($options[$this->_key], array_diff_key($options, $optionsKeys));
+					$options = array_intersect_key($options, $optionsKeys);
+					if (!empty($options[$this->_key])) {
+						$iterators[] = $options[$this->_key] + array('defaults' => array_merge($defaults, array('reference' => $options['class'])));
+					}
+					$query['joins'][] = array_intersect_key($options, array('type' => true, 'alias' => true, 'table' => true, 'joins' => true, 'conditions' => true));
+				}
+				++$cont;
+				$notDone = isset($iterators[$cont]);
+			} while ($notDone);
+		}
+/* 		pr("Linkable::beforeFind() end"); pr($query); */
+		return $query;
+	}
+}

models/charge.php

@@ -0,0 +1,53 @@
+<?php
+class Charge extends AppModel {
+
+	var $name = 'Charge';
+	var $validate = array(
+		'id' => array('numeric'),
+		'charge_type_id' => array('numeric'),
+		'lease_id' => array('numeric'),
+		'charge_date' => array('date'),
+		'charge_to_date' => array('date'),
+		'due_date' => array('date'),
+		'amount' => array('money'),
+		'tax' => array('money'),
+		'total' => array('money')
+	);
+
+	var $belongsTo = array(
+		'ChargeType' => array(
+			'className' => 'ChargeType',
+			'foreignKey' => 'charge_type_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+		'Lease' => array(
+			'className' => 'Lease',
+			'foreignKey' => 'lease_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		)
+	);
+
+	var $hasAndBelongsToMany = array(
+		'Receipt' => array(
+			'className' => 'Receipt',
+			'joinTable' => 'charges_receipts',
+			'foreignKey' => 'charge_id',
+			'associationForeignKey' => 'receipt_id',
+			'unique' => true,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'finderQuery' => '',
+			'deleteQuery' => '',
+			'insertQuery' => ''
+		)
+	);
+
+}
+?>

models/charge_type.php

@@ -0,0 +1,39 @@
+<?php
+class ChargeType extends AppModel {
+
+	var $name = 'ChargeType';
+	var $validate = array(
+		'id' => array('numeric'),
+		'name' => array('notempty'),
+		'account_id' => array('numeric')
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+/* 	var $belongsTo = array( */
+/* 		'Account' => array( */
+/* 			'className' => 'Account', */
+/* 			'foreignKey' => 'account_id', */
+/* 			'conditions' => '', */
+/* 			'fields' => '', */
+/* 			'order' => '' */
+/* 		) */
+/* 	); */
+
+	var $hasMany = array(
+		'Charge' => array(
+			'className' => 'Charge',
+			'foreignKey' => 'charge_type_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+
+}
+?>

models/contact.php

@@ -0,0 +1,76 @@
+<?php
+class Contact extends AppModel {
+
+	var $name = 'Contact';
+	var $validate = array(
+		'id' => array('numeric'),
+		'display_name' => array('notempty'),
+		'id_federal' => array('ssn'),
+		'id_exp' => array('date')
+	);
+
+	var $hasAndBelongsToMany = array(
+		'Lease' => array(
+			'className' => 'Lease',
+			'joinTable' => 'contacts_leases',
+			'foreignKey' => 'contact_id',
+			'associationForeignKey' => 'lease_id',
+			'unique' => true,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'finderQuery' => '',
+			'deleteQuery' => '',
+			'insertQuery' => ''
+		),
+		'ContactAddress' => array(
+			'className' => 'ContactAddress',
+			'joinTable' => 'contacts_methods',
+			'foreignKey' => 'contact_id',
+			'associationForeignKey' => 'method_id',
+			'unique' => true,
+			'conditions' => "method = 'POST'",
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'finderQuery' => '',
+			'deleteQuery' => '',
+			'insertQuery' => ''
+		),
+		'ContactPhone' => array(
+			'className' => 'ContactPhone',
+			'joinTable' => 'contacts_methods',
+			'foreignKey' => 'contact_id',
+			'associationForeignKey' => 'method_id',
+			'unique' => true,
+			'conditions' => "method = 'PHONE'",
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'finderQuery' => '',
+			'deleteQuery' => '',
+			'insertQuery' => ''
+		),
+		'ContactEmail' => array(
+			'className' => 'ContactEmail',
+			'joinTable' => 'contacts_methods',
+			'foreignKey' => 'contact_id',
+			'associationForeignKey' => 'method_id',
+			'unique' => true,
+			'conditions' => "method = 'EMAIL'",
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'finderQuery' => '',
+			'deleteQuery' => '',
+			'insertQuery' => ''
+		),
+	);
+
+}
+?>

models/contact_address.php

@@ -0,0 +1,28 @@
+<?php
+class ContactAddress extends AppModel {
+
+	var $name = 'ContactAddress';
+	var $validate = array(
+		'id' => array('numeric'),
+		'postcode' => array('postal')
+	);
+
+	var $hasAndBelongsToMany = array(
+		'Contact' => array(
+			'className' => 'Contact',
+			'joinTable' => 'contacts_methods',
+			'foreignKey' => 'method_id',
+			'associationForeignKey' => 'contact_id',
+			'unique' => true,
+			'conditions' => "method = 'POST'",
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'finderQuery' => '',
+			'deleteQuery' => '',
+			'insertQuery' => ''
+		)
+	);
+}
+?>

models/contact_email.php

@@ -2,7 +2,6 @@
 class ContactEmail extends AppModel {
 
 	var $name = 'ContactEmail';
-	var $displayField = 'email';
 	var $validate = array(
 		'id' => array('numeric'),
 		'email' => array('email')
@@ -16,12 +15,15 @@ class ContactEmail extends AppModel {
 			'associationForeignKey' => 'contact_id',
 			'unique' => true,
 			'conditions' => "method = 'EMAIL'",
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'finderQuery' => '',
+			'deleteQuery' => '',
+			'insertQuery' => ''
 		)
 	);
 
-	function emailList() {
-		return $this->find('list');
-	}
-
 }
 ?>

models/contact_phone.php

@@ -0,0 +1,31 @@
+<?php
+class ContactPhone extends AppModel {
+
+	var $name = 'ContactPhone';
+	var $validate = array(
+		'id' => array('numeric'),
+		//'type' => array('inlist'),
+		'phone' => array('phone'),
+		'ext' => array('numeric')
+	);
+
+	var $hasAndBelongsToMany = array(
+		'Contact' => array(
+			'className' => 'Contact',
+			'joinTable' => 'contacts_methods',
+			'foreignKey' => 'method_id',
+			'associationForeignKey' => 'contact_id',
+			'unique' => true,
+			'conditions' => "method = 'PHONE'",
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'finderQuery' => '',
+			'deleteQuery' => '',
+			'insertQuery' => ''
+		)
+	);
+
+}
+?>

models/lease.php

@@ -0,0 +1,85 @@
+<?php
+class Lease extends AppModel {
+
+	var $name = 'Lease';
+	var $validate = array(
+		'id' => array('numeric'),
+		'number' => array('alphanumeric'),
+		'lease_type_id' => array('numeric'),
+		'unit_id' => array('numeric'),
+		'late_schedule_id' => array('numeric'),
+		'lease_date' => array('date'),
+		'movein_planed_date' => array('date'),
+		'movein_date' => array('date'),
+		'moveout_date' => array('date'),
+		'moveout_planed_date' => array('date'),
+		'notice_given_date' => array('date'),
+		'notice_received_date' => array('date'),
+		'close_date' => array('date'),
+		'deposit' => array('money'),
+		'amount' => array('money'),
+		'next_amount' => array('money'),
+		'next_amount_date' => array('date')
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+	var $belongsTo = array(
+		'LeaseType' => array(
+			'className' => 'LeaseType',
+			'foreignKey' => 'lease_type_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+		'Unit' => array(
+			'className' => 'Unit',
+			'foreignKey' => 'unit_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+		'LateSchedule' => array(
+			'className' => 'LateSchedule',
+			'foreignKey' => 'late_schedule_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		)
+	);
+
+	var $hasMany = array(
+		'Charge' => array(
+			'className' => 'Charge',
+			'foreignKey' => 'lease_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+
+	var $hasAndBelongsToMany = array(
+		'Contact' => array(
+			'className' => 'Contact',
+			'joinTable' => 'contacts_leases',
+			'foreignKey' => 'lease_id',
+			'associationForeignKey' => 'contact_id',
+			'unique' => true,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'finderQuery' => '',
+			'deleteQuery' => '',
+			'insertQuery' => ''
+		)
+	);
+
+}
+?>

models/lease_type.php

@@ -0,0 +1,28 @@
+<?php
+class LeaseType extends AppModel {
+
+	var $name = 'LeaseType';
+	var $validate = array(
+		'id' => array('numeric'),
+		'name' => array('notempty')
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+	var $hasMany = array(
+		'Lease' => array(
+			'className' => 'Lease',
+			'foreignKey' => 'lease_type_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+
+}
+?>

models/map.php

@@ -0,0 +1,44 @@
+<?php
+class Map extends AppModel {
+
+	var $name = 'Map';
+	var $validate = array(
+		'id' => array('numeric'),
+		'site_id' => array('numeric'),
+		'site_area_id' => array('numeric'),
+		'name' => array('notempty'),
+		'width' => array('numeric'),
+		'depth' => array('numeric')
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+	var $belongsTo = array(
+		'SiteArea' => array(
+			'className' => 'SiteArea',
+			'foreignKey' => 'site_area_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		)
+	);
+
+	var $hasAndBelongsToMany = array(
+		'Unit' => array(
+			'className' => 'Unit',
+			'joinTable' => 'maps_units',
+			'foreignKey' => 'map_id',
+			'associationForeignKey' => 'unit_id',
+			'unique' => true,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'finderQuery' => '',
+			'deleteQuery' => '',
+			'insertQuery' => ''
+		)
+	);
+
+}
+?>

models/payment.php

@@ -0,0 +1,31 @@
+<?php
+class Payment extends AppModel {
+
+	var $name = 'Payment';
+	var $validate = array(
+		'id' => array('numeric'),
+		'receipt_id' => array('numeric'),
+		'payment_type_id' => array('numeric'),
+		'amount' => array('money')
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+	var $belongsTo = array(
+		'Receipt' => array(
+			'className' => 'Receipt',
+			'foreignKey' => 'receipt_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+		'PaymentType' => array(
+			'className' => 'PaymentType',
+			'foreignKey' => 'payment_type_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		)
+	);
+
+}
+?>

models/payment_type.php

@@ -0,0 +1,29 @@
+<?php
+class PaymentType extends AppModel {
+
+	var $name = 'PaymentType';
+	var $validate = array(
+		'id' => array('numeric'),
+		'name' => array('notempty'),
+		'tillable' => array('boolean')
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+	var $hasMany = array(
+		'Payment' => array(
+			'className' => 'Payment',
+			'foreignKey' => 'payment_type_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+
+}
+?>

models/receipt.php

@@ -0,0 +1,46 @@
+<?php
+class Receipt extends AppModel {
+
+	var $name = 'Receipt';
+	var $validate = array(
+		'id' => array('numeric'),
+		'stamp' => array('time')
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+	var $hasMany = array(
+		'Payment' => array(
+			'className' => 'Payment',
+			'foreignKey' => 'receipt_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+
+	var $hasAndBelongsToMany = array(
+		'Charge' => array(
+			'className' => 'Charge',
+			'joinTable' => 'charges_receipts',
+			'foreignKey' => 'receipt_id',
+			'associationForeignKey' => 'charge_id',
+			'unique' => true,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'finderQuery' => '',
+			'deleteQuery' => '',
+			'insertQuery' => ''
+		)
+	);
+
+}
+?>

models/site.php

@@ -0,0 +1,41 @@
+<?php
+class Site extends AppModel {
+
+	var $name = 'Site';
+	var $validate = array(
+		'id' => array('numeric'),
+		'name' => array('notempty')
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+	var $hasMany = array(
+		'SiteArea' => array(
+			'className' => 'SiteArea',
+			'foreignKey' => 'site_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+		'SiteOption' => array(
+			'className' => 'SiteOption',
+			'foreignKey' => 'site_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+
+}
+?>

models/site_area.php

@@ -0,0 +1,34 @@
+<?php
+class SiteArea extends AppModel {
+
+	var $name = 'SiteArea';
+	var $validate = array(
+		'id' => array('numeric'),
+		'site_id' => array('numeric'),
+		'name' => array('notempty')
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+	var $belongsTo = array(
+		'Site' => array(
+			'className' => 'Site',
+			'foreignKey' => 'site_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		)
+	);
+
+	var $hasOne = array(
+		'Map' => array(
+			'className' => 'Map',
+			'foreignKey' => 'site_area_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		)
+	);
+
+}
+?>

models/unit.php

@@ -0,0 +1,79 @@
+<?php
+class Unit extends AppModel {
+
+	var $name = 'Unit';
+	var $validate = array(
+		'id' => array('numeric'),
+		'unit_size_id' => array('numeric'),
+		'name' => array('notempty'),
+		'sort_order' => array('numeric'),
+		'walk_order' => array('numeric'),
+		'deposit' => array('money'),
+		'amount' => array('money')
+	);
+
+	var $belongsTo = array(
+		'UnitSize' => array(
+			'className' => 'UnitSize',
+			'foreignKey' => 'unit_size_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+/* 		'Map' => array( */
+/* 			'className' => 'MapsUnit', */
+/* 			'foreignKey' => 'unit_id', */
+/* 			'conditions' => '', */
+/* 			'fields' => '', */
+/* 			'order' => '' */
+/* 		) */
+	);
+
+	var $hasMany = array(
+		'Lease' => array(
+			'className' => 'Lease',
+			'foreignKey' => 'unit_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+
+	function statusEnums() {
+	  static $status_enums;
+	  if (!isset($status_enums))
+	    $status_enums = $this->getEnumValues('status');
+	  return $status_enums;
+	}
+
+	function statusValue($enum) {
+	  $enums = $this->statusEnums();
+	  return $enums[$enum];
+	}
+
+	function occupiedEnumValue() {
+	  return statusValue('OCCUPIED');
+	}
+
+	function conditionOccupied() {
+	  return ('Unit.status >= ' . $this->statusValue('OCCUPIED'));
+	}
+
+	function conditionVacant() {
+	  return ('Unit.status BETWEEN ' .
+		  ($this->statusValue('UNAVAILABLE')+1) .
+		  ' AND ' .
+		  ($this->statusValue('OCCUPIED')-1));
+	}
+
+	function conditionUnavailable() {
+	  return ('Unit.status <= ' . $this->statusValue('UNAVAILABLE'));
+	}
+
+}

models/unit_size.php

@@ -0,0 +1,43 @@
+<?php
+class UnitSize extends AppModel {
+
+	var $name = 'UnitSize';
+	var $validate = array(
+		'id' => array('numeric'),
+		'unit_type_id' => array('numeric'),
+		'code' => array('notempty'),
+		'name' => array('notempty'),
+		'width' => array('numeric'),
+		'depth' => array('numeric'),
+		'deposit' => array('money'),
+		'amount' => array('money')
+	);
+
+	var $belongsTo = array(
+		'UnitType' => array(
+			'className' => 'UnitType',
+			'foreignKey' => 'unit_type_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		)
+	);
+
+	var $hasMany = array(
+		'Unit' => array(
+			'className' => 'Unit',
+			'foreignKey' => 'unit_size_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+
+}
+?>

models/unit_type.php

@@ -0,0 +1,28 @@
+<?php
+class UnitType extends AppModel {
+
+	var $name = 'UnitType';
+	var $validate = array(
+		'id' => array('numeric'),
+		'code' => array('notempty'),
+		'name' => array('notempty')
+	);
+
+	var $hasMany = array(
+		'UnitSize' => array(
+			'className' => 'UnitSize',
+			'foreignKey' => 'unit_type_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+
+}
+?>

requirements.txt

@@ -1,69 +0,0 @@
-N - GATE
-N - ACH / CREDIT CARD PROCESSING
-Y - CREDIT CARD ENTRY
-Y - ACH ENTRY
-P - INVENTORY TRACKING / POS
-Y - UNIT TYPES
-Y - UNIT SIZES
-Y - UNITS
-Y - MOVE IN / OUT
-Y - UNIT TRANSFERS
-Y - LEASE TRACKING (PDF Generation)
-Y - LETTERS (PDF Generation)
-Y - REMINDERS
-Y - MULTIPLE LATE RENT SCHEDULES (Tenant A vs Tenant B)
-Y - ACCOUNTING (assign charges to accounts)
-Y - DETAILED REPORTING (HTML & PDF)
-Y - SITE MAP; HOT CLICKABLE
-P - PROSPECTIVE TENANTS
-Y - MARKETING
-P - RESERVATIONS
-P - MOVE OUT NOTICES
-P - MULTI-SITE (One database, multiple sites)
-Y - GENERATE GEOGRAPHIC MAP OF CUSTOMERS USING GOOGLE!
-    - Major advantage here... MapPoint only choice with competitors
-Y - WEB BASED
-Y - CUSTOMER VIEW / MANAGER VIEW
-Y - CUSTOMERS CAN CREATE ACCOUNTS, VIEW HISTORY
-Y - CUSTOMERS CAN SIGN UP FOR AUTO PAY
-
-
-
-----------------------------------------------------------------------
-----------------------------------------------------------------------
-Operations to be functional
-'X' marks functionality sufficiently completed
-
- X - Create Customer ID/Account
- X - Add Contact information to Customer
- X - Move Customer into Unit
- X - Enter Rent Concessions given
- X - Asses Rent Charges
- X - Asses Late Charges
- X - Asses Security Deposits
- X - Receive and record Checks
- X - Receive and record Money Orders
- X - Receive and record Cash
- X - Receive and record ACH Deposits
- x - Reverse rent charges (early moveout on prepaid occupancy)
- X - Handle NSF checks
- X - Assess NSF Fees
- X - Determine Lease Paid-Through status
-   - Report: List of customers overdue
-   - Flag unit as overlocked
-   - Flag unit as evicting
-   - Flag unit as normal status
-   - Flag unit as dirty
-   - Enter notes when communicating with Customer
-   - Accept pre-payments
-     - NOTE: As a temporary solution, disallow customer to run
-             a credit.  Require charges be entered first.
- X - Record Customer Move-Out from Unit
- X - Record utilization of Security Deposit
-   - Record issuing of a refund
-   - Record Deposit into Petty Cash
-   - Record Payment from Petty Cash to expenses
-   - Record Petty Cash to refund.
- X - Write Off Bad Debt
- X - Perform a Deposit and Close the Books
- X - Determine Rents Collected for a given period.

site/app_controller.php

@@ -1,461 +0,0 @@
-<?php
-/* SVN FILE: $Id: app_controller.php 7945 2008-12-19 02:16:01Z gwoo $ */
-/**
- * Short description for file.
- *
- * This file is application-wide controller file. You can put all
- * application-wide controller-related methods here.
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app
- * @since         CakePHP(tm) v 0.2.9
- * @version       $Revision: 7945 $
- * @modifiedby    $LastChangedBy: gwoo $
- * @lastmodified  $Date: 2008-12-18 18:16:01 -0800 (Thu, 18 Dec 2008) $
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-/**
- * Short description for class.
- *
- * Add your application-wide methods in the class below, your controllers
- * will inherit them.
- *
- * @package       cake
- * @subpackage    cake.app
- */
-class AppController extends Controller {
-  var $helpers = array('Html', 'Form', 'Javascript', 'Format', 'Time', 'Grid');
-  var $components = array('DebugKit.Toolbar');
-
-  function sideMenuLinks() {
-    return array(
-		 array('name' => 'Common',      'header' => true),
-		 array('name' => 'Site Map',    'url' => array('controller' => 'maps',       'action' => 'view', 1)),
-		 array('name' => 'Units',       'url' => array('controller' => 'units',      'action' => 'index')),
-		 array('name' => 'Leases',      'url' => array('controller' => 'leases',     'action' => 'index')),
-		 array('name' => 'Customers',   'url' => array('controller' => 'customers',  'action' => 'index')),
-		 array('name' => 'Accounts',    'url' => array('controller' => 'accounts',   'action' => 'index')),
-		 array('name' => 'Debug',      'header' => true),
-		 array('name' => 'Contacts',    'url' => array('controller' => 'contacts',   'action' => 'index')),
-		 array('name' => 'Ledgers',     'url' => array('controller' => 'ledgers',    'action' => 'index')),
-		 array('name' => 'New Ledgers', 'url' => array('controller' => 'accounts',    'action' => 'newledger')),
-		 array('name' => 'RESET DATA',  'url' => array('controller' => 'accounts',   'action' => 'reset_data')),
-		 );
-  }
-
-  function beforeRender() {
-    $this->set('sidemenu', $this->sideMenuLinks());
-  }
-
-  function reset_data() {
-    $this->layout = null;
-    $this->autoLayout = false;
-    $this->autoRender = false;
-    Configure::write('debug', '0');
-    $script = $_SERVER['DOCUMENT_ROOT'] . '/pmgr/build.cmd';
-    echo "<P>" . date('r') . "\n";
-    //echo "<P>Script: $script" . "\n";
-    $db = & $this->Account->getDataSource();
-    $script .= ' "' . $db->config['database'] . '"';
-    $script .= ' "' . $db->config['login']    . '"';
-    $script .= ' "' . $db->config['password'] . '"';
-    $handle = popen($script . ' 2>&1', 'r');
-    //echo "<P>Handle: $handle; " . gettype($handle) . "\n";
-    echo "<P><PRE>\n";
-    while (($read = fread($handle, 2096))) {
-      echo $read;
-    }
-    echo "</PRE>\n";
-    pclose($handle);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * helper: jqGridView
-   *  - called by function to create an index listing
-   */
-
-  function jqGridView($title, $action = null, $element = null) {
-    $this->set('title', $title);
-    // The resulting page will contain a jqGrid, which will
-    // use ajax to obtain the actual data for this action
-    $this->set('action', $action ? $action : $this->params['action']);
-    $this->render('/elements/' . ($element ? $element : $this->params['controller']));
-  }
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: jqGridData
-   *  - Fetches the actual data requested by jqGrid as XML
-   */
-
-  function jqGridData() {
-    // Grab a copy of the parameters that control this request
-    $params = array();
-    if (isset($this->params['url']) && is_array($this->params['url']))
-      $params = $this->params['url'];
-
-    // Do any preliminary setup necessary
-    $this->jqGridDataSetup($params);
-
-    // Get the top level model for this grid
-    $model = $this->jqGridDataModel($params);
-
-    // Establish the basic query and conditions
-    $query = array_intersect_key($this->jqGridDataCountTables($params, $model),
-				 array('link'=>1, 'contain'=>1));
-    $query['conditions'] = $this->jqGridDataCountConditions($params, $model);
-    $query['group'] = $this->jqGridDataCountGroup($params, $model);
-
-    // DEBUG PURPOSES ONLY!
-    $params['count_query'] = $query;
-
-    // Get the number of records prior to pagination
-    $count = $this->jqGridDataRecordCount($params, $model, $query);
-
-    // Start the query over, this time getting the actual set
-    // of tables needed, not just those needed for counting.
-    $query = array_intersect_key($this->jqGridDataTables($params, $model),
-				 array('link'=>1, 'contain'=>1));
-    $query['conditions'] = $this->jqGridDataConditions($params, $model);
-
-    // Verify a few parameters and determine our starting row
-    $limit = $params['rows'];
-    $total = ($count < 0) ? 0 : ceil($count/$limit);
-    $page  = ($params['page'] <= 1) ? 1 : (($params['page'] > $total) ? $total : $params['page']);
-    $start = $limit*$page - $limit;
-
-    // Grab the actual records taking pagination into account
-    $query['group'] = $this->jqGridDataGroup($params, $model);
-    $query['order'] = $this->jqGridDataOrder($params, $model,
-					     isset($params['sidx']) ? $params['sidx'] : null,
-					     isset($params['sord']) ? $params['sord'] : null);
-    $query['limit'] = $this->jqGridDataLimit($params, $model, $start, $limit);
-    $query['fields'] = $this->jqGridDataFields($params, $model);
-    $results = $this->jqGridDataRecords($params, $model, $query);
-
-    // DEBUG PURPOSES ONLY!
-    $params['query'] = $query;
-
-    // Post process the records
-    $this->jqGridRecordsPostProcess($params, $model, $results);
-
-    // Add in any needed hyperlinks
-    $this->jqGridRecordLinks($params, $model, $results, array());
-
-    // Finally, dump out the data
-    $this->jqGridDataOutputHeader($params, $model);
-    echo "<?xml version='1.0' encoding='utf-8'?>\n";
-    echo "<rows>\n";
-    $this->jqGridDataOutputSummary($params, $model, $page, $total, $count);
-    $this->jqGridDataOutputRecords($params, $model, $results);
-    echo "</rows>\n";
-
-    // Call out to finalize everything
-    $this->jqGridDataFinalize($params);
-  }
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * virtual: jqGridData* functions
-   *  - These set up the context for the jqGrid data, and will
-   *    need to be overridden in the derived class for anything
-   *    other than the most basic of grids.
-   */
-
-  function jqGridDataSetup(&$params) {
-    // Assume we're debugging.
-    // The actual jqGrid request will set this to false
-    $debug = true;
-
-    if (isset($this->passedArgs['debug']))
-      $debug = $this->passedArgs['debug'];
-
-    $params['debug'] = $debug;
-
-    if (!$debug) {
-      $this->layout = null;
-      $this->autoLayout = false;
-      $this->autoRender = false;
-      Configure::write('debug', '0');
-    }
-
-    // Establish some defaults (except for serialized items)
-    $params = array_merge(array('page' => 1,
-				'rows' => 20),
-			  $params);
-
-    // Unserialize our complex structure of fields
-    // This SHOULD always be set, except when debugging
-    if (isset($params['fields']))
-      $params['fields'] = unserialize($params['fields']);
-    else 
-      $params['fields'] = array($this->{$this->modelClass}->alias
-				.'.'.
-				$this->{$this->modelClass}->primarKey);
-
-    // Unserialize the list of ids, if present.
-    if (isset($params['custom']))
-      $params['custom'] = unserialize($params['custom']);
-    else
-      $params['custom'] = null;
-
-    // Unserialize the list of ids, if present.
-    if (isset($params['idlist']))
-      $params['idlist'] = unserialize($params['idlist']);
-
-  }
-
-  function jqGridDataModel(&$params) {
-    return $this->{$this->modelClass};
-  }
-
-  function jqGridDataCountTables(&$params, &$model) {
-    // If not overridden, we use the same tables to
-    // perform our count as we do to for the actual query
-    return $this->jqGridDataTables($params, $model);
-  }
-
-  function jqGridDataTables(&$params, &$model) {
-    return array('contain' => false);
-  }
-
-  function jqGridDataCountConditions(&$params, &$model) {
-    return $this->jqGridDataConditions($params, $model);
-  }
-
-  function jqGridDataConditions(&$params, &$model) {
-    $searches = array();
-
-    if (isset($params['_search']) && $params['_search'] === 'true') {
-      if (isset($params['searchOper'])) {
-	$searches[] = array('op' => $params['searchOper'],
-			    'field' => $params['searchField'],
-			    'value' => $params['searchString']);
-      }
-      else {
-	// DOH! Crappy mechanism puts toolbar search terms
-	// directly into params as name/value pairs.  No
-	// way to know which elements of params are search
-	// terms, so skipping this at the moment.
-      }
-    }
-    elseif (isset($params['filt']) && $params['filt']) {
-      $searches[] = array('op' => 'bw',
-			  'field' => $params['filtField'],
-			  'value' => $params['filtValue']);
-    }
-
-    $ops = array('eq' => array('op' => null,   'pre' => '',  'post' => ''),
-		 'ne' => array('op' => '<>',   'pre' => '',  'post' => ''),
-		 'lt' => array('op' => '<',    'pre' => '',  'post' => ''),
-		 'le' => array('op' => '<=',   'pre' => '',  'post' => ''),
-		 'gt' => array('op' => '>',    'pre' => '',  'post' => ''),
-		 'ge' => array('op' => '>=',   'pre' => '',  'post' => ''),
-		 'bw' => array('op' => 'LIKE', 'pre' => '',  'post' => '%'),
-		 'ew' => array('op' => 'LIKE', 'pre' => '%', 'post' => ''),
-		 'cn' => array('op' => 'LIKE', 'pre' => '%', 'post' => '%'),
-		 );
-
-    $conditions = array();
-    foreach ($searches AS $search) {
-      $op = $ops[$search['op']];
-      $field = $search['field'] . ($op['op'] ? ' '.$op['op'] : '');
-      $value = $op['pre'] . $search['value']. $op['post'];
-      $conditions[] = array($field => $value);
-    }
-
-    if (isset($params['action']) && $params['action'] === 'idlist') {
-      if (count($params['idlist']))
-	$conditions[] = array($model->alias.'.'.$model->primaryKey => $params['idlist']);
-      else
-	$conditions[] = '0=1';
-    }
-
-    return $conditions;
-  }
-
-  function jqGridDataFields(&$params, &$model) {
-    return null;
-  }
-
-  function jqGridDataCountGroup(&$params, &$model) {
-    return null;
-  }
-
-  function jqGridDataGroup(&$params, &$model) {
-    return $model->alias.'.'.$model->primaryKey;
-  }
-
-  function jqGridDataOrder(&$params, &$model, $index, $direction) {
-    return $index ? array($index .' '. $direction) : null;
-  }
-
-  function jqGridDataLimit(&$params, &$model, $start, $limit) {
-    return $start . ', ' . $limit;
-  }
-
-  function jqGridDataRecordCount(&$params, &$model, $query) {
-    return $model->find('count', $query);
-  }
-
-  function jqGridDataRecords(&$params, &$model, $query) {
-    return $model->find('all', $query);
-  }
-
-  function jqGridRecordsPostProcess(&$params, &$model, &$records) {
-    $model_alias = $model->alias;
-    $id          = $model->primaryKey;
-
-    $subtotals = array();
-    foreach ($params['fields'] AS $field) {
-      if (preg_match('/subtotal-(.*)$/', $field, $matches))
-	$subtotals[] = array('field' => $matches[1],
-			     'name' => $field,
-			     'amount' => 0);
-    }
-
-    foreach ($records AS &$record) {
-      $record['jqGrid_id'] = $record[$model_alias][$id];
-      // Add the calculated fields (if any), to the model fields
-      if (isset($record[0])) {
-	$record[$model_alias] += $record[0];
-	unset($record[0]);
-      }
-
-      foreach ($subtotals AS &$subtotal) {
-	$field = $subtotal['field'];
-	if (preg_match("/\./", $field)) {
-	  list($tbl, $col) = explode(".", $field);
-	  $record['subtotal-'.$tbl][$col] =
-	    ($subtotal['amount'] += $record[$tbl][$col]);
-	}
-	else {
-	  $record[$model->alias]['subtotal-'.$field] = 
-	    ($subtotal['amount'] += $record[$model->alias][$field]);
-	}
-      }
-    }
-
-    // DEBUG PURPOSES ONLY!
-    //$params['records'] = $records;
-  }
-
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    // Don't create any links if ordered not to.
-    if (isset($params['nolinks']))
-      return;
-
-    foreach ($links AS $table => $fields) {
-      $special = array('controller', 'id');
-      $controller = Inflector::pluralize(Inflector::underscore($table));
-      $id = 'id';
-      extract(array_intersect_key($fields, array_flip($special)));
-      foreach ($records AS &$record) {
-	if (!isset($record[$table]))
-	  continue;
-
-	foreach (array_diff_key($fields, array_flip($special)) AS $field) {
-	  if (!isset($record[$table][$id]) || !isset($record[$table][$field]))
-	    continue;
-
-	  // DEBUG PURPOSES ONLY!
-	  //$params['linkrecord'][] = compact('table', 'field', 'id', 'controller', 'record');
-	  $record[$table][$field] =
-	    '<A HREF="' .
-	    Router::url(array('controller' => $controller,
-			      'action' => 'view',
-			      $record[$table][$id])) .
-	    '">' .
-	    $record[$table][$field] .
-	    '</A>';
-	}
-      }
-    }
-  }
-
-  function jqGridDataOutputHeader(&$params, &$model) {
-    if ($params['debug']) {
-      ob_start();
-    }
-    else {
-      header("Content-type: text/xml;charset=utf-8");
-    }
-  }
-
-  function jqGridDataOutputSummary(&$params, &$model, $page, $total, $records) {
-    echo " <params><![CDATA[\n" . print_r($params, true) . "\n]]></params>\n";
-    echo " <page>$page</page>\n";
-    echo " <total>$total</total>\n";
-    echo " <records>$records</records>\n";
-
-    if (isset($params['userdata'])) {
-      foreach ($params['userdata'] AS $field => $value)
-	echo ' <userdata name="'.$field.'">' . "{$value}</userdata>\n";
-    }
-  }
-
-  function jqGridDataOutputRecords(&$params, &$model, &$records) {
-    $id_field    = 'jqGrid_id';
-    foreach ($records AS $record) {
-      $this->jqGridDataOutputRecord($params, $model, $record,
-				    $record[$id_field], $params['fields']);
-    }
-  }
-
-  function jqGridDataOutputRecord(&$params, &$model, &$record, $id, $fields) {
-    echo " <row id='$id'>\n";
-    foreach ($fields AS $field) {
-      $this->jqGridDataOutputRecordField($params, $model, $record, $field);
-    }
-    echo " </row>\n";
-  }
-
-  function jqGridDataOutputRecordField(&$params, &$model, &$record, $field) {
-    if (preg_match("/\./", $field)) {
-      list($tbl, $col) = explode(".", $field);
-      $data = $record[$tbl][$col];
-    }
-    else {
-      $data = $record[$model->alias][$field];
-    }
-    $this->jqGridDataOutputRecordCell($params, $model, $record, $field, $data);
-  }
-
-  function jqGridDataOutputRecordCell(&$params, &$model, &$record, $field, $data) {
-    // be sure to put text data in CDATA
-    if (preg_match("/^\d*$/", $data))
-      echo "  <cell>$data</cell>\n"; 
-    else
-      echo "  <cell><![CDATA[$data]]></cell>\n"; 
-  }
-
-  function jqGridDataFinalize(&$params) {
-    if ($params['debug']) {
-      $xml = ob_get_contents();
-      ob_end_clean();
-
-      $xml = preg_replace("/&/", "&amp;", $xml);
-      $xml = preg_replace("/</", "&lt;", $xml);
-      $xml = preg_replace("/>/", "&gt;", $xml);
-
-      echo ("\n<PRE>\n$xml\n</PRE>\n");
-    }
-  }
-}
-?>

site/app_model.php

@@ -1,213 +0,0 @@
-<?php
-/* SVN FILE: $Id: app_model.php 7945 2008-12-19 02:16:01Z gwoo $ */
-
-/**
- * Application model for Cake.
- *
- * This file is application-wide model file. You can put all
- * application-wide model-related methods here.
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
- * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app
- * @since         CakePHP(tm) v 0.2.9
- * @version       $Revision: 7945 $
- * @modifiedby    $LastChangedBy: gwoo $
- * @lastmodified  $Date: 2008-12-18 18:16:01 -0800 (Thu, 18 Dec 2008) $
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-
-/**
- * Application model for Cake.
- *
- * Add your application-wide methods in the class below, your models
- * will inherit them.
- *
- * @package       cake
- * @subpackage    cake.app
- */
-class AppModel extends Model {
-
-  var $actsAs = array('Containable', 'Linkable');
-  var $useNullForEmpty = true;
-  var $formatDateFields = true;
-
-  /**
-   * Get Enum Values
-   * Snippet v0.1.3
-   * http://cakeforge.org/snippet/detail.php?type=snippet&id=112
-   *
-   * Gets the enum values for MySQL 4 and 5 to use in selectTag()
-   */
-  function getEnumValues($columnName=null, $tableName=null)
-  {
-    if ($columnName==null) { return array(); } //no field specified
-
-    if (!isset($tableName)) {
-      //Get the name of the table
-      $db =& ConnectionManager::getDataSource($this->useDbConfig);
-      $tableName = $db->fullTableName($this, false);
-    }
-
-    //Get the values for the specified column (database and version specific, needs testing)
-    $result = $this->query("SHOW COLUMNS FROM {$tableName} LIKE '{$columnName}'");
-
-    //figure out where in the result our Types are (this varies between mysql versions)
-    $types = null;
-    if     ( isset( $result[0]['COLUMNS']['Type'] ) ) {  //MySQL 5
-      $types = $result[0]['COLUMNS']['Type']; $default = $result[0]['COLUMNS']['Default'];
-    }
-    elseif ( isset( $result[0][0]['Type'] ) )         {  //MySQL 4
-      $types = $result[0][0]['Type']; $default = $result[0][0]['Default'];
-    }
-    else   { //types return not accounted for
-      return array();
-    }
-
-    //Get the values
-    return array_flip(array_merge(array(''), // MySQL sets 0 to be the empty string
-				  explode("','", strtoupper(preg_replace("/(enum)\('(.+?)'\)/","\\2", $types)))
-				  ));
-  } //end getEnumValues
-
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: nameToID
-   *  - Returns the ID of the named item
-   */
-  function nameToID($name) {
-    $this->cacheQueries = true;
-    $item = $this->find('first', array
-			('recursive' => -1,
-			 'conditions' => compact('name'),
-			 ));
-    $this->cacheQueries = false;
-    if ($item) {
-      $item = current($item);
-      return $item['id'];
-    }
-    return null;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: statMerge
-   *  - Merges summary data from $b into $a
-   */
-
-  function statsMerge (&$a, $b) {
-    if (!isset($b))
-      return;
-
-    if (!isset($a)) {
-      $a = $b;
-    }
-    elseif (!is_array($a) && !is_array($b)) {
-      $a += $b;
-    }
-    elseif (is_array($a) && is_array($b)) {
-      foreach (array_intersect_key($a, $b) AS $k => $v)
-	{
-	  if (preg_match("/^sp\./", $k))
-	    $a[$k] .= '; ' . $b[$k];
-	  else
-	    $this->statsMerge($a[$k], $b[$k]);
-	}
-      $a = array_merge($a, array_diff_key($b, $a));
-    }
-    else {
-      die ("Can't yet merge array and non-array stats");
-    }
-  }
-
-
-  function recursive_array_replace($find, $replace, &$data) {
-    if (!isset($data))
-      return;
-
-    if (is_array($data)) {
-      foreach ($data as $key => &$value) {
-	  $this->recursive_array_replace($find, $replace, $value);
-      }
-      return;
-    }
-
-    if (isset($replace))
-      $data = preg_replace($find, $replace, $data);
-    elseif (preg_match($find, $data))
-      $data = null;
-  }
-
-  function beforeSave() {
-/*     pr(array('class' => $this->name, */
-/* 	     'alias' => $this->alias, */
-/* 	     'function' => 'AppModel::beforeSave')); */
-
-    // Replace all empty strings with NULL.
-    // If a particular model doesn't like this, they'll have to
-    // override the behavior, or set useNullForEmpty to false.
-    if ($this->useNullForEmpty)
-      $this->recursive_array_replace("/^\s*$/", null, $this->data);
-
-    if ($this->formatDateFields) {
-      $alias = $this->alias;
-
-      foreach ($this->_schema AS $field => $info) {
-	if ($info['type'] == 'date' || $info['type'] == 'timestamp') {
-	  if (isset($this->data[$alias][$field])) {
-/* 	    pr("Fix Date for '$alias'.'$field'; current value = " . */
-/* 	       "'{$this->data[$alias][$field]}'"); */
-	    if ($this->data[$alias][$field] === 'CURRENT_TIMESTAMP')
-	      // Seems CakePHP is broken for the default timestamp.
-	      // It tries to automagically set the value to CURRENT_TIMESTAMP
-	      // which is wholly rejected by MySQL.  Just put it back to NULL
-	      // and let the SQL engine deal with the defaults... it's not
-	      // Cake's place to do this anyway :-/
-	      $this->data[$alias][$field] = null;
-	    else
-	      $this->data[$alias][$field] =
-		$this->dateFormatBeforeSave($this->data[$alias][$field]);
-	  }
-	}
-      }
-    }
-
-    return true;
-  }
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: dateFormatBeforeSave
-   *  - convert dates to database format
-   */
-
-  function dateFormatBeforeSave($dateString) {
-/*     $time = ''; */
-/*     if (preg_match('/(\d+(:\d+))/', $dateString, $match)) */
-/*       $time = ' '.$match[1]; */
-/*     $dateString = preg_replace('/(\d+(:\d+))/', '', $dateString); */
-/*     return date('Y-m-d', strtotime($dateString)) . $time; */
-
-    if (preg_match('/:/', $dateString))
-      return date('Y-m-d H:i:s', strtotime($dateString));
-    else
-      return date('Y-m-d', strtotime($dateString));
-  }
-
-}

site/controllers/accounts_controller.php

@@ -1,297 +0,0 @@
-<?php
-
-class AccountsController extends AppController {
-
-  var $uses = array('Account', 'LedgerEntry');
-
-  var $sidemenu_links =
-    array(array('name' => 'Accounts',        'header' => true),
-	  array('name' => 'All',             'url' => array('controller' => 'accounts', 'action' => 'all')),
-	  array('name' => 'Asset',           'url' => array('controller' => 'accounts', 'action' => 'asset')),
-	  array('name' => 'Liability',       'url' => array('controller' => 'accounts', 'action' => 'liability')),
-	  array('name' => 'Equity',          'url' => array('controller' => 'accounts', 'action' => 'equity')),
-	  array('name' => 'Income',          'url' => array('controller' => 'accounts', 'action' => 'income')),
-	  array('name' => 'Expense',         'url' => array('controller' => 'accounts', 'action' => 'expense')),
-	  array('name' => 'Bank Deposit',    'url' => array('controller' => 'accounts', 'action' => 'deposit')),
-	  );
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
-   */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-  }
-
-  
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: index / asset / liability / equity / income / expense / all
-   *  - Generate a chart of accounts
-   */
-
-  function index()     { $this->all(); }
-  function asset()     { $this->jqGridView('Asset Accounts'); }
-  function liability() { $this->jqGridView('Liability Accounts'); }
-  function equity()    { $this->jqGridView('Equity Accounts'); }
-  function income()    { $this->jqGridView('Income Accounts'); }
-  function expense()   { $this->jqGridView('Expense Accounts'); }
-  function all()       { $this->jqGridView('All Accounts',       'all'); }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
-   *    these virtual functions ensure that the correct data is passed
-   *    to jqGrid.
-   */
-
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
-    if (!isset($params['action']))
-      $params['action'] = 'all';
-  }
-
-  function jqGridDataCountTables(&$params, &$model) {
-    return parent::jqGridDataTables($params, $model);
-  }
-
-  function jqGridDataTables(&$params, &$model) {
-    return array
-      ('link' =>
-       array(// Models
-	     'CurrentLedger' => array
-	     (// Models
-	      'LedgerEntry'
-	      /* REVISIT <AP> 20090615:
-	       *  I'll remove this 'conditions' section on a future checkin,
-	       *  after I've proven out the %{MODEL_ALIAS} feature will be
-	       *  sticking around.
-
-	      => array
-	      ('conditions' =>
-	       array('OR' =>
-		     array('LedgerEntry.debit_ledger_id  = CurrentLedger.id',
-			   'LedgerEntry.credit_ledger_id = CurrentLedger.id'),
-		     ),
-	       ),
-
-	       * END REVISIT
-	       */
-	      ),
-	     ),
-       );
-  }
-
-  function jqGridDataFields(&$params, &$model) {
-    return array
-      ('Account.*',
-       'SUM(IF(LedgerEntry.debit_ledger_id  = CurrentLedger.id,
-               LedgerEntry.amount, NULL)) AS debits',
-       'SUM(IF(LedgerEntry.credit_ledger_id = CurrentLedger.id,
-               LedgerEntry.amount, NULL)) AS credits',
-       "SUM(IF(Account.type IN ('ASSET', 'EXPENSE'),
-	       IF(LedgerEntry.debit_ledger_id = CurrentLedger.id, 1, -1),
-	       IF(LedgerEntry.credit_ledger_id = CurrentLedger.id, 1, -1)
-               ) * IF(LedgerEntry.amount, LedgerEntry.amount, 0)
-           ) AS balance",
-       'COUNT(LedgerEntry.id) AS entries');
-  }
-
-  function jqGridDataConditions(&$params, &$model) {
-    $conditions = parent::jqGridDataConditions($params, $model);
-
-    if (in_array($params['action'], array('asset', 'liability', 'equity', 'income', 'expense'))) {
-      $conditions[] = array('Account.type' => strtoupper($params['action']));
-    }
-
-    return $conditions;
-  }
-
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['Account'] = array('name');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: newledger
-   *  - Close the current account ledger and create a new one,
-   *    carrying forward any balance if necessary.
-   */
-
-  function newledger($id = null) {
-    if (!$this->Account->closeCurrentLedger($id)) {
-      $this->Session->setFlash(__('Unable to create new Ledger.', true));
-    }
-    if ($id)
-      $this->redirect(array('action'=>'view', $id));
-    else
-      $this->redirect(array('action'=>'index'));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: collected
-   *  - Displays the items actually collected for the period
-   *    e.g. How much was collected in rent from 4/1/09 - 5/1/09
-   */
-  function collected($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
-    $payment_accounts = $this->Account->collectableAccounts();
-    //$payment_accounts[$this->Account->nameToID('Bank')] = 'Bank';
-    $default_accounts = array_diff_key($payment_accounts,
-				       array($this->Account->concessionAccountID() => 1));
-    $this->set(compact('payment_accounts', 'default_accounts'));
-
-    $this->Account->recursive = -1;
-    $account = $this->Account->read(null, $id);
-    $account = $account['Account'];
-
-    $title = ($account['name'] . ': Collected Report');
-    $this->set(compact('account', 'title'));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: deposit
-   *  - Prepares the books for a bank deposit
-   */
-  function deposit() {
-    if ($this->data) {
-      // Action the close based on provided data
-      //pr($this->data);
-
-      // Get data about each closed ledger.
-      $deposit = array('total' => 0, 'ledgers' => array());
-      foreach ($this->data['Tillable']['Ledger'] AS $ledger_id => $ledger) {
-	if (!$ledger['checked'])
-	  continue;
-
- 	$ledger_entries =
- 	  $this->Account->Ledger->find
-	  ('all',
-	   array('link' => array
-		 ('Account' =>
-		  array('fields' => array('name')),
-
-		  'LedgerEntry' =>
-		  array('fields' => array('id', 'amount'),
-
-			'MonetarySource' =>
-			array('fields' => array('name')),
-
-			'Customer' =>
-			array('fields' => array('name')),
-
-			//'Transaction' =>
-			//array('fields' => array('stamp')),
-		   ),
-		  ),
-		 'fields' => false,
-		 'conditions' => array(array('Ledger.id' => $ledger_id),
-				       array('LedgerEntry.id IS NOT NULL'),
-				       ),
-		 ));
-
-	$deposit['total'] += $ledger['amount'];
-	$deposit['ledgers'][] = array('id' => $ledger_id,
-				      'name' => $ledger['account_name'],
-				      'total' => $ledger['amount'],
-				      'entries' => $ledger_entries);
-      }
-
-      // Perform the accounting work necessary to close the 
-      // monetary ledgers and deposit into the bank account.
-      $this->Account->closeAndDeposit($deposit['ledgers'], $this->data['Deposit']['Account']['id']);
-
-      $title = 'Account: Deposit Slip';
-      $this->set(compact('title', 'deposit'));
-      $this->render('deposit_slip');
-      return;
-    }
-
-    // Prepare a close page...
-    $tillable_account = $this->Account->relatedAccounts('tillable');
-    $depositable_account = $this->Account->relatedAccounts('depositable');
-
-    foreach ($tillable_account AS &$acct) {
-      $acct['Account']['stats'] = $this->Account->stats($acct['Account']['id']);
-    }
-
-    $title = 'Account: Prepare Deposit';
-    $this->set(compact('title', 'tillable_account', 'depositable_account'));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: view
-   *  - Displays information about a specific account
-   */
-
-  function view($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
-    // Get details about the account and its ledgers (no ledger entries yet)
-    $account = $this->Account->find
-      ('first',
-       array('contain' =>
-	     array(// Models
-		   'CurrentLedger' =>
-		   array('fields' => array('id', 'sequence')),
-
-		   'Ledger' =>
-		   array('Close' => array
-			 ('order' => array('Close.stamp' => 'DESC'))),
-		   ),
-	     'conditions' => array(array('Account.id' => $id)),
-	     )
-       );
-
-    // Get all ledger entries of the CURRENT ledger
-    $entries = $this->Account->findLedgerEntries($id);
-    $account['CurrentLedger']['LedgerEntry'] = $entries['Entries'];
-
-    // Summarize each ledger
-    foreach($account['Ledger'] AS &$ledger)
-      $ledger = array_merge($ledger,
-			    $this->Account->Ledger->stats($ledger['id']));
-
-    // Obtain stats across ALL ledgers for the summary infobox
-    $stats = $this->Account->stats($id, true);
-    $stats = $stats['Ledger'];
-
-    $this->sidemenu_links[] =
-      array('name' => 'Operations',       'header' => true);
-    $this->sidemenu_links[] =
-      array('name' => 'New Ledger',       'url' => array('action' => 'newledger', $id));
-    $this->sidemenu_links[] =
-      array('name' => 'Collected',        'url' => array('action' => 'collected', $id));
-
-    // Prepare to render
-    $title = 'Account: ' . $account['Account']['name'];
-    $this->set(compact('account', 'title', 'stats'));
-  }
-  
-}

site/controllers/contacts_controller.php

@@ -1,204 +0,0 @@
-<?php
-
-class ContactsController extends AppController {
-
-  var $sidemenu_links = array();
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
-   */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-  }
-
-  
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: index / all
-   *  - Generate a listing of contacts
-   */
-
-  function index()       { $this->all(); }
-  function all()         { $this->jqGridView('All Contacts', 'all'); }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
-   *    these virtual functions ensure that the correct data is passed
-   *    to jqGrid.
-   */
-
-  function jqGridDataOrder(&$params, &$model, $index, $direction) {
-    $order = parent::jqGridDataOrder($params, $model, $index, $direction);
-    if ($index === 'Contact.last_name') {
-      $order[] = 'Contact.first_name ' . $direction;
-    }
-    if ($index === 'Contact.first_name') {
-      $order[] = 'Contact.last_name ' . $direction;
-    }
-    return $order;
-  }
-
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['Contact'] = array('id');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: view
-   *  - Displays information about a specific contact
-   */
-
-  function view($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
-    $contact = $this->Contact->find
-      ('first', array
-       ('contain' => array
-	(// Models
-	 'ContactPhone',
-	 'ContactEmail',
-	 'ContactAddress',
-	 'Customer'),
-
-	'conditions' => array('Contact.id' => $id),
-	));
-
-    // Set up dynamic menu items
-    $this->sidemenu_links[] =
-      array('name' => 'Operations', 'header' => true);
-
-    $this->sidemenu_links[] =
-      array('name' => 'Edit',
-	    'url' => array('action' => 'edit',
-			   $id));
-
-    // Prepare to render.
-    $title = 'Contact: ' . $contact['Contact']['display_name'];
-    $this->set(compact('contact', 'title'));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: edit
-   */
-
-  function edit($id = null, $customer_id = null) {
-    if (isset($this->data)) {
-
-      if (isset($this->params['form']['cancel'])) {
-	if (isset($this->data['Contact']['id']))
-	  $this->redirect(array('action'=>'view', $this->data['Contact']['id']));
-/* 	else */
-/* 	  $this->redirect(array('controller' => 'customers', */
-/* 				'action'=>'add', $this->data['Customer']['id'])); */
-	return;
-      }
-
-      // Go through each contact method and strip the bogus ID if new
-      foreach (array_intersect_key($this->data,
-				   array('ContactPhone'=>1,
-					 'ContactAddress'=>1,
-					 'ContactEmail'=>1)) AS $type => $arr) {
-	foreach ($arr AS $idx => $item) {
-	  if (isset($item['source']) && $item['source'] === 'new')
-	    unset($this->data[$type][$idx]['id']);
-	}
-      }
-
-      // Save the contact and all associated data
-      $this->Contact->saveContact($this->data['Contact']['id'], $this->data);
-
-      // Now that the work is done, let the user view the updated contact
-      $this->redirect(array('action'=>'view', $this->data['Contact']['id']));
-      //$this->render('/empty');
-      return;
-    }
-
-    if ($id) {
-      $this->data = $this->Contact->find
-	('first', array
-	 ('contain' => array
-	  (// Models
-	   'ContactPhone',
-	   'ContactEmail',
-	   'ContactAddress',
-	   'Customer'),
-
-	  'conditions' => array('Contact.id' => $id),
-	  ));
-
-      $title = 'Contact: ' . $this->data['Contact']['display_name'] . " : Edit";
-    }
-    else {
-      $title = "Enter New Contact";
-      $this->data = array('ContactPhone' => array(),
-			  'ContactAddress' => array(),
-			  'ContactEmail' => array());
-    }
-
-    $phone_types = array_flip($this->Contact->ContactPhone->getEnumValues('type'));
-    unset($phone_types[0]);
-    // REVISIT <AP> 20090705
-    //   Use this to have a mixed case enum
-    //     array_map('ucfirst', array_map('strtolower', $phone_types))
-    $phone_types = array_combine($phone_types, $phone_types);
-    $this->set(compact('phone_types'));
-
-    $method_types = array_flip($this->Contact->getEnumValues
-			       ('type',
-				$this->Contact->tablePrefix . 'contacts_methods'));
-    unset($method_types[0]);
-    $method_types = array_combine($method_types, $method_types);
-    $this->set(compact('method_types'));
-
-    $method_preferences = array_flip($this->Contact->getEnumValues
-				     ('preference',
-				      $this->Contact->tablePrefix . 'contacts_methods'));
-    unset($method_preferences[0]);
-    $method_preferences = array_combine($method_preferences, $method_preferences);
-    $this->set(compact('method_preferences'));
-
-    $contact_phones = $this->Contact->ContactPhone->phoneList();
-    $this->set(compact('contact_phones'));
-
-    $contact_addresses = $this->Contact->ContactAddress->addressList();
-    $this->set(compact('contact_addresses'));
-
-    $contact_emails = $this->Contact->ContactEmail->emailList();
-    $this->set(compact('contact_emails'));
-
-    // Prepare to render.
-    //pr($this->data);
-    $this->set(compact('title'));
-    $this->render('edit');
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: add
-   *  - Adds a new contact
-   */
-
-  function add($customer_id = null) {
-    $this->edit(null, $customer_id);
-  }
-
-}

site/controllers/customers_controller.php

@@ -1,485 +0,0 @@
-<?php
-
-class CustomersController extends AppController {
-  var $sidemenu_links =
-    array(array('name' => 'Customers',     'header' => true),
-          array('name' => 'Current',       'url' => array('controller' => 'customers', 'action' => 'current')),
-          array('name' => 'Past',          'url' => array('controller' => 'customers', 'action' => 'past')),
-          array('name' => 'All',           'url' => array('controller' => 'customers', 'action' => 'all')),
-          array('name' => 'Add Customer',  'url' => array('controller' => 'customers', 'action' => 'add')),
-          );
-
-  //var $components = array('RequestHandler');
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
-   */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-  }
-
-  
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: index / current / past / all
-   *  - Creates a list of customers
-   */
-
-  function index()   { $this->current(); }
-  function current() { $this->jqGridView('Current Tenants', 'current'); }
-  function past()    { $this->jqGridView('Past Tenants'); }
-  function all()     { $this->jqGridView('All Customers'); }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
-   *    these virtual functions ensure that the correct data is passed
-   *    to jqGrid.
-   */
-
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
-    if (!isset($params['action']))
-      $params['action'] = 'all';
-  }
-
-  function jqGridDataCountTables(&$params, &$model) {
-    return array
-      ('link' =>
-       array(// Models
-	    'PrimaryContact',
-	    'CurrentLease' => array('fields' => array()),
-	     ),
-       );
-  }
-
-  function jqGridDataTables(&$params, &$model) {
-    $link = $this->jqGridDataCountTables($params, $model);
-    $link['link']['LedgerEntry'] = array('fields' => array());
-    $link['link']['LedgerEntry']['Ledger'] = array('fields' => array());
-    $link['link']['LedgerEntry']['Ledger']['Account'] = array('fields' => array());
-    // INNER JOIN would be great, as it would ensure we're only looking
-    // at the ledger entries that we truly want.  However, this also
-    // removes from the query any units that do not yet have a ledger
-    // entry in A/R.  A solution would be to INNER JOIN these tables,
-    // and LEFT JOIN it to the rest.  Grouping of JOINs, however, is
-    // implemented with the 'joins' tag, and is not available through
-    // the Linkable behavior interface.
-    //$link['link']['LedgerEntry']['Ledger']['Account']['type'] = 'INNER';
-    $link['link']['LedgerEntry']['Ledger']['Account']['conditions']
-      = array('Account.id' =>
-	      $this->Customer->LedgerEntry->Ledger->Account->accountReceivableAccountID());
-    return $link;
-  }
-
-  function jqGridDataFields(&$params, &$model) {
-    $db = &$model->getDataSource();
-    $fields = $db->fields($model, $model->alias);
-    $fields[] = ('COUNT(DISTINCT CurrentLease.id) AS lease_count');
-    $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;
-  }
-
-  function jqGridDataConditions(&$params, &$model) {
-    $conditions = parent::jqGridDataConditions($params, $model);
-
-    if ($params['action'] === 'current') {
-      $conditions[] = 'CurrentLease.id IS NOT NULL';
-    }
-    elseif ($params['action'] === 'past') {
-      $conditions[] = 'CurrentLease.id IS NULL';
-    }
-
-    return $conditions;
-  }
-
-  function jqGridDataOrder(&$params, &$model, $index, $direction) {
-    $order = array();
-    $order[] = parent::jqGridDataOrder($params, $model, $index, $direction);
-
-    if ($index !== 'PrimaryContact.last_name')
-      $order[] = parent::jqGridDataOrder($params, $model,
-					 'PrimaryContact.last_name', $direction);
-    if ($index !== 'PrimaryContact.first_name')
-      $order[] = parent::jqGridDataOrder($params, $model,
-					 'PrimaryContact.first_name', $direction);
-    if ($index !== 'Customer.id')
-      $order[] = parent::jqGridDataOrder($params, $model,
-					 'Customer.id', $direction);
-
-    return $order;
-  }
-
-  function jqGridDataRecordCount(&$params, &$model, $query) {
-
-    // We don't have a good way to use the query to obtain
-    // our count.  The problem is that we're relying on the
-    // group by for the query, which will destroy the count,
-    // whether we omit the group by or leave it in.
-    // So, build a fresh query for counting.
-
-    $query['conditions'] = parent::jqGridDataConditions($params, $model);
-
-    $count = $model->find('count',
-			  array_merge(array('link' => array_diff_key($query['link'],
-								     array('CurrentLease'=>1))),
-				      array_diff_key($query, array('link'=>1))));
-				      
-    if ($params['action'] === 'all')
-      return $count;
-
-    $query['conditions'][] = 'CurrentLease.id IS NULL';
-    $count_past = $model->find('count', $query);
-
-    // Since we can't easily count 'current' directly, we
-    // can quickly derive it since 'current' customers
-    // are mutually exclusive to 'past' customers.
-    if ($params['action'] == 'current')
-      $count = $count - $count_past;
-    elseif ($params['action'] == 'past') {
-      $count = $count_past;
-    }
-
-    return $count;
-  }
-
-  function jqGridDataRecords(&$params, &$model, $query) {
-    $customers = parent::jqGridDataRecords($params, $model, $query);
-
-    // Get the balance on each customer.
-    foreach ($customers AS &$customer) {
-      $stats = $this->Customer->stats($customer['Customer']['id']);
-      $customer['Customer']['balance'] = $stats['balance'];
-    }
-
-    return $customers;
-  }
-
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['Customer'] = array('name');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: move_in
-   *  - Sets up the move-in page for the given customer.
-   */
-
-  function move_in($id = null) {
-    $customer = array();
-    $unit = array();
-
-    if (isset($id)) {
-      $this->Customer->recursive = -1;
-      $customer = current($this->Customer->read(null, $id));
-    }
-    $this->set(compact('customer', 'unit'));
-
-    $title = 'Customer Move-In';
-    $this->set(compact('title'));
-    $this->render('/leases/move');
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: move_out
-   *  - prepare to move a customer out of one of their units
-   */
-
-  function move_out($id) {
-
-    $customer = $this->Customer->find
-      ('first', array
-       ('contain' => array
-	(// Models
-	 'Lease' =>
-	 array('conditions' => array('Lease.moveout_date' => null),
-	       // Models
-	       'Unit' =>
-	       array('order'  => array('sort_order'),
-		     'fields' => array('id', 'name'),
-		     ),
-	       ),
-	 ),
-
-	'conditions' => array('Customer.id' => $id),
-	));
-    $this->set('customer', $lease['Customer']);
-    $this->set('unit',     array());
-
-    $redirect = array('controller' => 'customers',
-		      'action' => 'view',
-		      $id);
-
-    $title = $customer['Customer']['name'] . ': Prepare Move-Out';
-    $this->set(compact('title', 'customer', 'redirect'));
-    $this->render('/leases/move');
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: view
-   *  - Displays information about a specific customer
-   */
-
-  function view($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
-    $customer = $this->Customer->details($id);
-
-    $outstanding_balance = $customer['stats']['balance'];
-    $outstanding_deposit = $customer['deposits']['summary']['balance'];
-
-    // Figure out if this customer has any non-closed leases
-    $show_moveout = false;
-    $show_payment = false;
-    foreach ($customer['Lease'] AS $lease) {
-      if (!isset($lease['close_date']))
-	$show_payment = true;
-      if (!isset($lease['moveout_date']))
-	$show_moveout = true;
-    }
-
-    // Set up dynamic menu items
-    $this->sidemenu_links[] =
-      array('name' => 'Operations', 'header' => true);
-
-    $this->sidemenu_links[] =
-      array('name' => 'Edit',
-	    'url' => array('action' => 'edit',
-			   $id));
-
-    $this->sidemenu_links[] =
-      array('name' => 'Move-In',
-	    'url' => array('action' => 'move_in',
-			   $id));
-
-/*     if ($show_moveout) { */
-/*       $this->sidemenu_links[] = */
-/* 	array('name' => 'Move-Out', */
-/* 	      'url' => array('action' => 'move_out', */
-/* 			     $id)); */
-/*     } */
-
-    if ($show_payment) {
-      $this->sidemenu_links[] =
-	array('name' => 'Payment',
-	      'url' => array('action' => 'receipt',
-			     $id));
-    }
-
-    // Prepare to render.
-    $title = 'Customer: ' . $customer['Customer']['name'];
-    $this->set(compact('customer', 'title',
-                       'outstanding_balance',
-                       'outstanding_deposit'));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: edit
-   *  - Edit customer information
-   */
-
-  function edit($id = null) {
-    if (isset($this->data)) {
-      // Check to see if the operation was cancelled.
-      if (isset($this->params['form']['cancel'])) {
-	if (isset($this->data['Customer']['id']))
-	  $this->redirect(array('action'=>'view', $this->data['Customer']['id']));
-	else
-	  $this->redirect(array('action'=>'index'));
-	return;
-      }
-
-      // Make sure we have at least one contact
-      if (!isset($this->data['Contact']) || count($this->data['Contact']) == 0) {
-	$this->Session->setFlash("MUST SPECIFY AT LEAST ONE CONTACT", true);
-	$this->redirect(array('action'=>'view', $this->data['Customer']['id']));
-	return;
-      }
-
-      // Make sure there is a primary contact
-      if (!isset($this->data['Customer']['primary_contact_entry'])) {
-	$this->Session->setFlash("MUST SPECIFY A PRIMARY CONTACT", true);
-	$this->redirect(array('action'=>'view', $this->data['Customer']['id']));
-	return;
-      }
-
-      // Go through each customer and strip the bogus ID if new
-      foreach ($this->data['Contact'] AS &$contact) {
-	if (isset($contact['source']) && $contact['source'] === 'new')
-	  unset($contact['id']);
-      }
-
-      // Save the customer and all associated data
-      if (!$this->Customer->saveCustomer($this->data['Customer']['id'],
-					 $this->data,
-					 $this->data['Customer']['primary_contact_entry'])) {
-	$this->Session->setFlash("CUSTOMER SAVE FAILED", true);
-	pr("CUSTOMER SAVE FAILED");
-      }
-
-      // If existing customer, then view it.  Otherwise, since
-      // this is a new customer, go to the move in screen.
-      if ($this->data['Customer']['id'])
-	$this->redirect(array('action'=>'view', $this->Customer->id));
-      else
-	$this->redirect(array('action'=>'move_in', $this->Customer->id));
-
-      // For debugging, only if the redirects above have been
-      // commented out, otherwise this section isn't reached.
-      $this->render('/empty');
-      return;
-    }
-
-    if ($id) {
-      $this->data = $this->Customer->details($id);
-      $title = 'Customer: ' . $this->data['Customer']['name'] . " : Edit";
-    }
-    else {
-      $title = "Enter New Customer";
-      $this->data = array('Contact' => array(), 'PrimaryContact' => null);
-    }
-
-    $contact_types = array_flip($this->Customer->ContactsCustomer->getEnumValues('type'));
-    unset($contact_types[0]);
-    $contact_types = array_combine($contact_types, $contact_types);
-    $this->set(compact('contact_types'));
-
-    $contacts = $this->Customer->Contact->contactList();
-    $this->set(compact('contacts'));
-
-    // Prepare to render.
-    //pr($this->data);
-    $this->set(compact('title'));
-    $this->render('edit');
-  }
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: add
-   *  - Add a new customer
-   */
-
-  function add() {
-    $this->edit();
-  }
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: receipt
-   *  - Sets up the receipt entry page for the given customer.
-   */
-
-  function receipt($id = null) {
-    if (isset($id)) {
-      $this->Customer->recursive = -1;
-      $customer = $this->Customer->read(null, $id);
-      $customer = $customer['Customer'];
-      $unreconciled = $this->Customer->findUnreconciledLedgerEntries($id);
-      $charges = $unreconciled['debit'];
-    }
-    else {
-      $customer = null;
-      $charges = array('balance' => 0, 'entry' => array());
-    }
-
-    $A = new Account();
-    $payment_accounts = $A->paymentAccounts();
-    $default_account = $A->cashAccountID();
-    $this->set(compact('payment_accounts', 'default_account'));
-
-    $title = ($customer['name'] . ': Payment Entry');
-    $this->set(compact('customer', 'charges', 'title'));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: refund
-   *  - Refunds customer charges
-   */
-
-  function refund() {
-    $entries = $this->Customer->LedgerEntry->find
-      ('all', array
-       ('contain' => false,
-	'conditions' => array('LedgerEntry.id' =>
-			      //array(199,200,201)
-			      61
-			      ),
-	));
-    pr(compact('entries'));
-
-    $this->Customer->LedgerEntry->reverse($entries);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: unreconciledEntries
-   *  - returns the list of unreconciled entries
-   */
-
-  function unreconciled($id) {
-
-    //$this->layout = 'ajax';
-    $this->layout = null;
-    $this->autoLayout = false;
-    $this->autoRender = false;
-    Configure::write('debug', '0');
-    header("Content-type: text/xml;charset=utf-8");
-
-    App::import('Helper', 'Xml');
-    $xml = new XmlHelper();
-
-    // Find the unreconciled entries, then manipulate the structure
-    // slightly to accomodate the format necessary for XML Helper.
-    $unreconciled = $this->Customer->findUnreconciledLedgerEntries($id);
-    $unreconciled = array('entries' =>
-			  array_intersect_key($unreconciled['debit'],
-					      array('entry'=>1, 'balance'=>1)));
-
-    // XML Helper will dump an empty tag if the array is empty
-    if (!count($unreconciled['entries']['entry']))
-      unset($unreconciled['entries']['entry']);
-
-    pr($unreconciled);
-    //$reconciled = $cust->reconcileNewLedgerEntry($cust_id, 'credit', $amount);
-
-    $opts = array();
-    //$opts['format'] = 'tags';
-    echo $xml->header();
-    echo $xml->serialize($unreconciled, $opts);
-  }
-
-}

site/controllers/leases_controller.php

@@ -1,507 +0,0 @@
-<?php
-
-class LeasesController extends AppController {
-
-  var $sidemenu_links =
-    array(array('name' => 'Leases',   'header' => true),
-	  array('name' => 'Active',   'url' => array('controller' => 'leases', 'action' => 'active')),
-	  array('name' => 'Closed',   'url' => array('controller' => 'leases', 'action' => 'closed')),
-	  array('name' => 'All',      'url' => array('controller' => 'leases', 'action' => 'all')),
-	  );
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
-   */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-  }
-
-  
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: index / active / closed / all
-   *  - Generate a listing of leases
-   */
-
-  function index()    { $this->all(); }
-  function active()   { $this->jqGridView('Active Leases'); }
-  function closed()   { $this->jqGridView('Closed Leases'); }
-  function all()      { $this->jqGridView('All Leases', 'all'); }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
-   *    these virtual functions ensure that the correct data is passed
-   *    to jqGrid.
-   */
-
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
-    if (!isset($params['action']))
-      $params['action'] = 'all';
-  }
-
-  function jqGridDataCountTables(&$params, &$model) {
-    return array
-      ('link' => array('Unit'     => array('fields' => array('Unit.id', 'Unit.name')),
-		       'Customer' => array('fields' => array('Customer.id', 'Customer.name'))));
-  }
-
-  function jqGridDataTables(&$params, &$model) {
-    $link = $this->jqGridDataCountTables($params, $model);
-    $link['link']['LedgerEntry'] = array('fields' => array());
-    $link['link']['LedgerEntry']['Ledger'] = array('fields' => array());
-    $link['link']['LedgerEntry']['Ledger']['Account'] = array('fields' => array());
-    // INNER JOIN would be great, as it would ensure we're only looking
-    // at the ledger entries that we truly want.  However, this also
-    // removes from the query any leases that do not yet have a ledger
-    // entry in A/R.  A solution would be to INNER JOIN these tables,
-    // and LEFT JOIN it to the rest.  Grouping of JOINs, however, is
-    // implemented with the 'joins' tag, and is not available through
-    // the Linkable behavior interface.
-    //$link['link']['LedgerEntry']['Ledger']['Account']['type'] = 'INNER';
-    $link['link']['LedgerEntry']['Ledger']['Account']['conditions']
-      = array('Account.id' =>
-	      $this->Lease->LedgerEntry->Ledger->Account->accountReceivableAccountID());
-    return $link;
-  }
-
-  function jqGridDataFields(&$params, &$model) {
-    $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;
-  }
-
-  function jqGridDataConditions(&$params, &$model) {
-    $conditions = parent::jqGridDataConditions($params, $model);
-
-    if ($params['action'] === 'active') {
-      $conditions[] = 'Lease.close_date IS NULL';
-    }
-    elseif ($params['action'] === 'closed') {
-      $conditions[] = 'Lease.close_date IS NOT NULL';
-    }
-
-    return $conditions;
-  }
-
-  function jqGridDataOrder(&$params, &$model, $index, $direction) {
-    // Do not sort by number, which is type varchar and
-    // sorts on an ascii basis.  Sort by ID instead.
-    if ($index === 'Lease.number')
-      $index = 'Lease.id';
-
-    // Instead of sorting by name, sort by defined order
-    if ($index === 'Unit.name')
-      $index = 'Unit.sort_order';
-
-    $order = array();
-    $order[] = parent::jqGridDataOrder($params, $model, $index, $direction);
-
-    // If sorting by anything other than id/number
-    // add sorting by id as a secondary condition.
-    if ($index !== 'Lease.id' && $index !== 'Lease.number')
-      $order[] = parent::jqGridDataOrder($params, $model,
-					 'Lease.id', $direction);
-
-    return $order;
-  }
-
-/*   function jqGridRecordsPostProcess(&$params, &$model, &$records) { */
-/*     foreach ($records AS &$record) { */
-/*       $record['Lease']['through_date'] */
-/* 	= $this->Lease->rentChargeThrough($record['Lease']['id']); */
-/*     } */
-
-/*     parent::jqGridRecordsPostProcess($params, $model, $records); */
-/*   } */
-
-  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);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: move_in
-   *  - execute a move in on a new lease
-   */
-
-  function move_in() {
-    if (!$this->data)
-      die("Should have some data");
-
-    // Handle the move in based on the data given
-    //pr(array('Move-in data', $this->data));
-
-    $lid = $this->Lease->moveIn($this->data['Lease']['customer_id'],
-				$this->data['Lease']['unit_id'],
-				null, null,
-				$this->data['Lease']['movein_date'],
-				$this->data['Lease']['comment']
-				);
-
-    // Since this is a new lease, go to the invoice
-    // screen so we can start assessing charges.
-    $this->redirect(array('action'=>'invoice', $lid));
-
-    // For debugging, only if the redirect above have been
-    // commented out, otherwise this section isn't reached.
-    $this->render('/empty');
-  }
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: move_out
-   *  - prepare or execute a move out on a specific lease
-   */
-
-  function move_out($id = null) {
-    if ($this->data) {
-      // Handle the move out based on the data given
-      //pr($this->data);
-
-      $this->Lease->moveOut($this->data['Lease']['id'],
-			    'VACANT',
-			    $this->data['Lease']['moveout_date'],
-			    //true // Close this lease, if able
-			    false
-			    );
-
-      $this->redirect($this->data['redirect']);
-      $this->autoRender = false;
-      return;
-    }
-
-    if (!isset($id))
-      die("Oh Nooooo!!");
-
-    $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),
-			      ),
-	));
-    $this->set('customer', $lease['Customer']);
-    $this->set('unit',     $lease['Unit']);
-    $this->set('lease',    $lease['Lease']);
-
-    $redirect = array('controller' => 'leases',
-		      'action' => 'view',
-		      $id);
-
-    $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
-	      $lease['Unit']['name'] . ': ' .
-	      $lease['Customer']['name'] . ': Prepare Move-Out');
-    $this->set(compact('title', 'redirect'));
-    $this->render('/leases/move');
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: apply_deposit
-   *  - Applies the security deposit to charges.  This is much
-   *    like a receipt, but it's separated to keep it simple and
-   *    to prevent feature overload on the receipt page.
-   */
-
-  function apply_deposit($id) {
-    $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 = $this->Lease->findSecurityDeposits($lease['Lease']['id']);
-    $this->set(compact('deposit'));
-    $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'));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: bad_debt
-   *  - Writes off remaining charges on a lease.
-   *    REVISIT <AP>: 20090710
-   *     Should this be a customer function?  What customer
-   *     would have only one lease that results in bad debt.
-   */
-
-  function bad_debt($id) {
-    $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 = $this->Lease->findSecurityDeposits($lease['Lease']['id']);
-    if ($deposit['summary']['balance'] > 0)
-      die("Still have un-utilized security deposit");
-
-    $this->set('customer', $lease['Customer']);
-    $this->set('unit',     $lease['Unit']);
-    $this->set('lease',    $lease['Lease']);
-    $this->set('account',  array('id' => $A->badDebtAccountID()));
-
-/*     $redirect = array('controller' => 'leases', */
-/* 		      'action' => 'view', */
-/* 		      $id); */
-
-    $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
-	      $lease['Unit']['name'] . ': ' .
-	      $lease['Customer']['name'] . ': Write Off Bad Debt');
-    $this->set(compact('title', 'redirect'));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: refund
-   *  - Provides user with a refund
-   *    REVISIT <AP>: 20090710
-   *     Should this be a customer function?
-   */
-
-  function refund($id) {
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: close
-   *  - Closes a lease to any further action
-   */
-
-  function close($id) {
-    // REVISIT <AP>: 20090708
-    //  We should probably seek confirmation first...
-    $this->Lease->close($id);
-    $this->redirect(array('action'=>'view', $id));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: invoice
-   *  - Sets up the invoice entry page for the given customer.
-   */
-
-  function invoice($id = null, $type = null) {
-
-    $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),
-			      ),
-	));
-
-    $A = new Account();
-    $charge_accounts = $A->chargeAccounts();
-    $default_account = $A->rentAccountID();
-    $this->set(compact('charge_accounts', 'default_account'));
-
-    // REVISIT <AP> 20090705:
-    //   Of course, the late charge should come from the late_schedule
-    $default_rent = $lease['Lease']['rent'];
-    $default_late = 10;
-    $this->set(compact('default_rent', 'default_late'));
-
-    $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
-	      $lease['Unit']['name'] . ': ' .
-	      $lease['Customer']['name'] . ': Charge Entry');
-    $this->set(compact('title', 'lease', 'charge'));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: view
-   *  - Displays information about a specific lease
-   */
-
-  function view($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
-    // Get details about the lease and its ledgers (no ledger entries yet)
-    $lease = $this->Lease->find
-      ('first',
-       array('contain' =>
-	     array(// Models
-		   'LeaseType',
-		   'Unit',
-		   'Customer',
-		   ),
-	     'conditions' => array(array('Lease.id' => $id)),
-	     )
-       );
-
-    $lease['Lease']['paid_through'] = $this->Lease->rentPaidThrough($id);
-
-
-    $this->set('charge_gaps', $this->Lease->rentChargeGaps($id));
-    $this->set('charge_through', $this->Lease->rentChargeThrough($id));
-
-    // Obtain the overall lease balance
-    $this->Lease->statsMerge($lease['Lease'],
-			     array('stats' => $this->Lease->stats($id)));
-    $outstanding_balance = $lease['Lease']['stats']['balance'];
-
-    // Determine the lease security deposit
-    $deposits = $this->Lease->findSecurityDeposits($lease['Lease']['id']);
-    $outstanding_deposit = $deposits['summary']['balance'];
-
-    // Set up dynamic menu items
-    if (!isset($lease['Lease']['close_date'])) {
-      $this->sidemenu_links[] =
-	array('name' => 'Operations', 'header' => true);
-
-      if (!isset($lease['Lease']['moveout_date']))
-	$this->sidemenu_links[] =
-	  array('name' => 'Move-Out', 'url' => array('action' => 'move_out',
-						     $id));
-
-      $this->sidemenu_links[] =
-	array('name' => 'Charges', 'url' => array('action' => 'invoice',
-						  $id));
-
-      $this->sidemenu_links[] =
-	array('name' => 'Payments', 'url' => array('controller' => 'customers',
-						   'action' => 'receipt',
-						   $lease['Customer']['id']));
-
-      if (isset($lease['Lease']['moveout_date']) && $outstanding_deposit > 0 && $outstanding_balance > 0)
-	$this->sidemenu_links[] =
-	  array('name' => 'Apply Deposit', 'url' => array('action' => 'apply_deposit',
-							  $id));
-
-      if (isset($lease['Lease']['moveout_date']) &&
-	  $outstanding_balance <= 0 &&
-	  ($outstanding_deposit - $outstanding_balance) > 0)
-	$this->sidemenu_links[] =
-	  array('name' => 'Issue Refund', 'url' => array('action' => 'refund',
-							 $id));
-
-      if (isset($lease['Lease']['moveout_date']) && $outstanding_deposit == 0 && $outstanding_balance > 0)
-	$this->sidemenu_links[] =
-	  array('name' => 'Write-Off', 'url' => array('action' => 'bad_debt',
-						      $id));
-
-      if ($this->Lease->closeable($id))
-	$this->sidemenu_links[] =
-	  array('name' => 'Close', 'url' => array('action' => 'close',
-						  $id));
-    }
-
-    // Prepare to render
-    $title = 'Lease: #' . $lease['Lease']['id'];
-    $this->set(compact('lease', 'title',
-		       'outstanding_deposit',
-		       'outstanding_balance'));
-  }
-}

site/controllers/ledger_entries_controller.php

@@ -1,467 +0,0 @@
-<?php
-
-class LedgerEntriesController extends AppController {
-
-  var $sidemenu_links = array();
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
-   */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-  }
-
-  
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
-   *    these virtual functions ensure that the correct data is passed
-   *    to jqGrid.
-   */
-
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
-    if (isset($params['custom']['ar_account'])) {
-      $params['custom']['account_id'] = 
-	$this->LedgerEntry->DebitLedger->Account->accountReceivableAccountID();
-    }
-  }
-
-  function jqGridDataTables(&$params, &$model) {
-    $link =
-      array(// Models
-	     'Transaction' =>
-	     array('fields' => array('id', 'stamp'),
-		   ),
-
-	     'MonetarySource' =>
-	     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'])) {
-      $ftype = $params['custom']['account_ftype'];
-      $ftype = ucfirst($ftype);
-      //$ftype = $this->LedgerEntry->DebitLedger->Account->fundamentalOpposite($ftype);
-      $link[$ftype . 'Ledger'] =
-	array('fields' => array('id', 'sequence'),
-	      'Account' => array('class' => 'Account',
-				 'fields' => array('id', 'name'),
-				 ),
-	      );
-    }
-    elseif (isset($params['custom']['ledger_id'])) {
-      $ledger_id = $params['custom']['ledger_id'];
-      $link['Ledger'] =
-	array('fields' => array('id', 'sequence'),
-	      'conditions' => ("Ledger.id = IF(LedgerEntry.debit_ledger_id = $ledger_id," .
-			       "               LedgerEntry.credit_ledger_id," .
-			       "               LedgerEntry.debit_ledger_id)"),
-	      'Account' => array(
-				 'fields' => array('id', 'name'),
-				 ),
-	      );
-    }
-    elseif ($params['action'] === 'collected') {
-      // Income / Receipt / Money
-      //    debit: A/R       credit: Income  <-- this entry
-      //    debit: Receipt   credit: A/R     <-- ReceiptLedgerEntry, below
-      //    debit: Money     credit: Receipt <-- MoneyLedgerEntry, below
-
-      $link['CreditLedger'] =
-	array('fields' => 'sequence',
-	      'Account' =>
-	      array('fields' => array('id', 'name'),
-		    ),
-	      );
-
-      // We're searching for the Receipt<->A/R entries,
-      // which are debits on the A/R account.  Find the
-      // reconciling entries to that A/R debit.
-      $link['DebitReconciliationLedgerEntry'] =
-	array('alias' => 'ReceiptLedgerEntry',
-
-	      'Transaction' =>
-	      array('alias' => 'ReceiptTransaction'),
-
-	      // Credit Ledger should be A/R;
-	      // Debit Ledger should be Receipt
-	      'DebitLedger' =>
-	      array('alias' => 'ReceiptLedger',
-		    'Account' => array('alias' => 'ReceiptAccount'),
-		    ),
-
-	      // Finally, the Money (Cash/Check/etc) Entry is the one
-	      // which reconciles our ReceiptLedgerEntry debit
-	      'DebitReconciliationLedgerEntry' =>
-	      array('alias' => 'MoneyLedgerEntry',
-		    'linkalias' => 'MoneyLedgerEntryR',
-
-		    // Credit Ledger should be Receipt;
-		    // Debit Ledger should be our Money Account
-		    'DebitLedger' =>
-		    array('alias' => 'MoneyLedger',
-			  'Account' =>
-			  array('alias' => 'MoneyAccount'),
-			  ),
-		    ),
-	      );
-    }
-    else {
-      $link['DebitLedger'] =
-	array('fields' => array('id', 'sequence'),
-	      'DebitAccount' => array('class' => 'Account',
-				      'fields' => array('id', 'name'),
-				      ),
-	      );
-
-      $link['CreditLedger'] =
-	array('fields' => array('id', 'sequence'),
-	      'CreditAccount' => array('class' => 'Account',
-				       'fields' => array('id', 'name'),
-				       ),
-	      );
-    }
-
-    if (isset($params['custom']['account_id'])) {
-      $account_id = $params['custom']['account_id'];
-      $link['Ledger'] =
-	array('fields' => array('id', 'sequence'),
-	      'conditions' => ("Ledger.id = IF(DebitLedger.account_id = $account_id," .
-			       "               LedgerEntry.credit_ledger_id," .
-			       "               LedgerEntry.debit_ledger_id)"),
-	      'Account' => array(
-				 'fields' => array('id', 'name'),
-				 ),
-	      );
-    }
-
-    if (isset($params['custom']['reconcile_id'])) {
-      $ftype = $params['custom']['account_ftype'];
-      $ftype = $this->LedgerEntry->DebitLedger->Account->fundamentalOpposite($ftype);
-      $ftype = ucfirst($ftype);
-      $link[$ftype.'ReconciliationLedgerEntry'] =
-	array('fields' => array('Reconciliation.amount'));
-    }
-
-    return array('link' => $link);
-  }
-
-  function jqGridDataFields(&$params, &$model) {
-    $ledger_id = (isset($params['custom']['ledger_id'])
-		  ? $params['custom']['ledger_id']
-		  : null);
-    $account_id = (isset($params['custom']['account_id'])
-		     ? $params['custom']['account_id']
-		     : null);
-    $account_type = (isset($params['custom']['account_type'])
-		     ? $params['custom']['account_type']
-		     : null);
-
-    $fields = $model->ledgerContextFields2($ledger_id, $account_id, $account_type);
-
-    if (count(array_intersect($params['fields'], array('applied'))) == 1)
-      $fields[] = 'SUM(Reconciliation.amount) AS applied';
-
-    if ($params['action'] === 'collected')
-      $fields[] = 'MAX(ReceiptTransaction.stamp) AS last_paid';
-
-    return $fields;
-  }
-
-  function jqGridDataConditions(&$params, &$model) {
-    $ledger_id = (isset($params['custom']['ledger_id'])
-		  ? $params['custom']['ledger_id']
-		  : null);
-    $account_type = (isset($params['custom']['account_type'])
-		     ? $params['custom']['account_type']
-		     : null);
-
-    $conditions = parent::jqGridDataConditions($params, $model);
-
-    if ($params['action'] === 'collected') {
-      extract($params['custom']);
-
-      if (isset($collected_account_id))
-	$conditions[] = array('Account.id' => $params['custom']['collected_account_id']);
-      else
-	die("INTERNAL ERROR: COLLECTED ACCOUNT ID NOT SET");
-
-      if (!empty($collected_from_date))
-	$conditions[]
-	  = array('ReceiptTransaction.stamp >=' =>
-		  $this->LedgerEntry->Transaction->dateFormatBeforeSave($collected_from_date));
-
-      if (!empty($collected_through_date))
-	$conditions[]
-	  = array('ReceiptTransaction.stamp <=' =>
-		  $this->LedgerEntry->Transaction->dateFormatBeforeSave($collected_through_date . ' 23:59:59'));
-
-      if (isset($collected_payment_accounts))
-	$conditions[] = array('MoneyAccount.id' => $collected_payment_accounts);
-      else
-	$conditions[] = array('NOT' => array(array('MoneyAccount.id' => null)));
-    }
-
-    if ($params['action'] === 'ledger') {
-      $conditions[] = $model->ledgerContextConditions($ledger_id, $account_type);
-    }
-    if (isset($params['custom']['reconcile_id'])) {
-      $ftype = $params['custom']['account_ftype'];
-      //$ftype = $this->LedgerEntry->DebitLedger->Account->fundamentalOpposite($ftype);
-      $conditions[] = array('Reconciliation.'.$ftype.'_ledger_entry_id' => $params['custom']['reconcile_id']);
-    }
-
-    if (isset($params['custom']['account_id'])) {
-      $conditions[] =
-	array('OR' => 
-	      array(array('CreditAccount.id' => $params['custom']['account_id']),
-		    array('DebitAccount.id' => $params['custom']['account_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']);
-    }
-
-    if (isset($params['custom']['monetary_source_id'])) {
-      $conditions[] = 
-	array('MonetarySource.id' => $params['custom']['monetary_source_id']);
-    }
-
-    return $conditions;
-  }
-
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['Transaction']    = array('id');
-    $links['LedgerEntry']    = array('id');
-    $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);
-  }
-
-  function jqGridDataGroup(&$params, &$model) {
-    if (isset($params['custom']['group_by_tx']) && $params['custom']['group_by_tx'])
-      return $model->alias.'.transaction_id';
-
-    return parent::jqGridDataGroup($params, $model);
-  }
-
-  function jqGridDataOrder(&$params, &$model, $index, $direction) {
-/*     if ($index === 'balance') */
-/*       return ($index .' '. $direction); */
-    $order = parent::jqGridDataOrder($params, $model, $index, $direction);
-
-    if ($index === 'Transaction.stamp') {
-      $order[] = 'LedgerEntry.id ' . $direction;
-    }
-
-    return $order;
-  }
-
-  function jqGridDataRecords(&$params, &$model, $query) {
-    if ($params['action'] === 'collected') {
-      $tquery = array_diff_key($query, array('fields'=>1,'group'=>1,'limit'=>1,'order'=>1));
-      $tquery['fields'] = array('SUM(Reconciliation.amount) AS applied');
-      $total = $model->find('first', $tquery);
-
-      $params['userdata']['total'] = $total[0]['applied'];
-    }
-
-    return parent::jqGridDataRecords($params, $model, $query);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: reverse the ledger entry
-   */
-
-  function reverse($id) {
-    $this->LedgerEntry->reverse($id);
-    $this->redirect(array('action'=>'view', $id));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: view
-   *  - Displays information about a specific entry
-   */
-
-  function view($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
-    }
-
-    // Get the LedgerEntry and related fields
-    $entry = $this->LedgerEntry->find
-      ('first',
-       array('contain' => array('MonetarySource.id',
-				'MonetarySource.name',
-				'Transaction.id',
-				'Transaction.stamp',
-				'DebitLedger.id',
-				'DebitLedger.sequence',
-				'DebitLedger.account_id',
-				'CreditLedger.id',
-				'CreditLedger.sequence',
-				'CreditLedger.account_id',
-				'Customer.id',
-				'Customer.name',
-				'Lease.id',
-				),
-
-	     'fields' => array('LedgerEntry.*'),
-
-	     'conditions' => array('LedgerEntry.id' => $id),
-	     ));
-    //pr($entry);
-
-    // Because 'DebitLedger' and 'CreditLedger' both relate to 'Account',
-    // CakePHP will not include them in the LedgerEntry->find (or so it
-    // seems).  We'll have to break out each Account separately.
-
-    // Get the Account from DebitLedger
-    $entry['DebitLedger'] += $this->LedgerEntry->DebitLedger->Account->find
-      ('first',
-       array('contain' => true,
-	     'fields' => array('Account.id', 'Account.name', 'Account.type', 'Account.trackable'),
-	     'conditions' => array('Account.id' => $entry['DebitLedger']['account_id']),
-	     ));
-    $entry['DebitLedger']['Account']['ftype'] =
-      $this->LedgerEntry->DebitLedger->Account
-      ->fundamentalType($entry['DebitLedger']['Account']['type']);
-
-    // Get the Account from CreditLedger
-    $entry['CreditLedger'] += $this->LedgerEntry->CreditLedger->Account->find
-      ('first',
-       array('contain' => true,
-	     'fields' => array('Account.id', 'Account.name', 'Account.type', 'Account.trackable'),
-	     'conditions' => array('Account.id' => $entry['CreditLedger']['account_id']),
-	     ));
-    $entry['CreditLedger']['Account']['ftype'] =
-      $this->LedgerEntry->CreditLedger->Account
-      ->fundamentalType($entry['CreditLedger']['Account']['type']);
-
-    // Get the reconciliation balances for this ledger entry
-    $stats = $this->LedgerEntry->stats($id);
-    $stats['debit']['amount_reconciled']  = $stats['debit_amount_reconciled'];
-    $stats['credit']['amount_reconciled'] = $stats['credit_amount_reconciled'];
-    if ($entry['DebitLedger']['Account']['trackable'])
-      $stats['debit']['amount_remaining'] = $entry['LedgerEntry']['amount'] - $stats['debit']['amount_reconciled'];
-    if ($entry['CreditLedger']['Account']['trackable'])
-      $stats['credit']['amount_remaining'] = $entry['LedgerEntry']['amount'] - $stats['credit']['amount_reconciled'];
-    //pr($stats);
-
-    $reconciled = $this->LedgerEntry->findReconciledLedgerEntries($id);
-    //pr($reconciled);
-
-
-    // REVISIT <AP>: 20090711
-    //  It's not clear whether we should be able to reverse charges that have
-    //  already been paid/cleared/reconciled.  Certainly, that will be the
-    //  case when someone has pre-paid and then moves out early.  However, this
-    //  will work well for items accidentally charged but not yet paid for.
-    if ((!$entry['DebitLedger']['Account']['trackable'] ||
-	 $stats['debit']['amount_reconciled'] == 0) &&
-	(!$entry['CreditLedger']['Account']['trackable'] ||
-	 $stats['credit']['amount_reconciled'] == 0)
-
-	&& 0
-
-	)
-      {
-	// Set up dynamic menu items
-	$this->sidemenu_links[] =
-	  array('name' => 'Operations', 'header' => true);
-
-	$this->sidemenu_links[] =
-	  array('name' => 'Undo',
-		'url' => array('action' => 'reverse',
-			       $id));
-      }
-
-    if ($this->LedgerEntry->Ledger->Account->type
-	($entry['CreditLedger']['Account']['id']) == 'INCOME')
-      {
-	// Set up dynamic menu items
-	$this->sidemenu_links[] =
-	  array('name' => 'Operations', 'header' => true);
-
-	$this->sidemenu_links[] =
-	  array('name' => 'Reverse',
-		'url' => array('action' => 'reverse',
-			       $id));
-      }
-
-    // Prepare to render.
-    $title = "Double Ledger Entry #{$entry['LedgerEntry']['id']}";
-    $this->set(compact('entry', 'title', 'reconciled', 'stats'));
-  }
-}

site/controllers/ledgers_controller.php

@@ -1,150 +0,0 @@
-<?php
-
-class LedgersController extends AppController {
-
-  var $sidemenu_links =
-    array(array('name' => 'Ledgers',      'header' => true),
-	  array('name' => 'Current',      'url' => array('controller' => 'ledgers', 'action' => 'current')),
-	  array('name' => 'Closed',       'url' => array('controller' => 'ledgers', 'action' => 'closed')),
-	  array('name' => 'All',          'url' => array('controller' => 'ledgers', 'action' => 'all')),
-	  );
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
-   */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-  }
-
-  
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: index / current / closed / all
-   *  - Generate a list of ledgers
-   */
-
-  function index()     { $this->all(); }
-  function current()   { $this->jqGridView('Current Ledgers'); }
-  function closed()    { $this->jqGridView('Closed Ledgers');  }
-  function all()       { $this->jqGridView('All Ledgers', 'all'); }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
-   *    these virtual functions ensure that the correct data is passed
-   *    to jqGrid.
-   */
-
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
-    if (!isset($params['action']))
-      $params['action'] = 'all';
-  }
-
-  function jqGridDataCountTables(&$params, &$model) {
-    return array('contain' => false);
-  }
-
-  function jqGridDataTables(&$params, &$model) {
-    return array
-      ('link' =>
-       array(// Models
-	     'Account',
-	     'LedgerEntry',
-	     'Close',
-	     ),
-       );
-  }
-
-  function jqGridDataFields(&$params, &$model) {
-    return array
-      ('Ledger.*',
-       'CONCAT(Account.id, "-", Ledger.sequence) AS id_sequence',
-       'SUM(IF(LedgerEntry.debit_ledger_id  = Ledger.id,
-               LedgerEntry.amount, NULL)) AS debits',
-       'SUM(IF(LedgerEntry.credit_ledger_id = Ledger.id,
-               LedgerEntry.amount, NULL)) AS credits',
-       "SUM(IF(Account.type IN ('ASSET', 'EXPENSE'),
-               IF(LedgerEntry.debit_ledger_id  = Ledger.id, 1, -1),
-               IF(LedgerEntry.credit_ledger_id = Ledger.id, 1, -1)
-              ) * IF(LedgerEntry.amount, LedgerEntry.amount, 0)
-           ) AS balance",
-       'COUNT(LedgerEntry.id) AS entries');
-  }
-
-  function jqGridDataConditions(&$params, &$model) {
-    $conditions = parent::jqGridDataConditions($params, $model);
-
-    if ($params['action'] === 'current') {
-      $conditions[] = array('NOT' => array('Ledger.closed'));
-    }
-    elseif ($params['action'] === 'closed') {
-      $conditions[] = 'Ledger.closed';
-    }
-
-    return $conditions;
-  }
-
-  function jqGridDataOrder(&$params, &$model, $index, $direction) {
-    $id_sequence = false;
-    if ($index === 'id_sequence') {
-      $id_sequence = true;
-      $index = 'Ledger.account_id';
-    }
-
-    $order = parent::jqGridDataOrder($params, $model, $index, $direction);
-
-    if ($id_sequence) {
-      $order[] = 'Ledger.sequence ' . $direction;
-    }
-
-    return $order;
-  }
-
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['Ledger'] = array('id_sequence');
-    $links['Account'] = array('name');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: view
-   *  - Displays information about a specific ledger
-   */
-
-  function view($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
-    // Get details about the ledger itself (no entries yet)
-    $ledger = $this->Ledger->find
-      ('first',
-       array('contain' =>
-	     array(// Models
-		   'Account',
-		   ),
-	     'conditions' => array(array('Ledger.id' => $id)),
-	     )
-       );
-
-    // Get ledger stats for our summary box
-    $stats = $this->Ledger->stats($id);
-
-    // OK, set our view variables and render!
-    $title = 'Ledger: #' . $ledger['Account']['id'] .'-'. $ledger['Ledger']['sequence'];
-    $this->set(compact('ledger', 'title', 'stats'));
-  }
-}

site/controllers/monetary_sources_controller.php

@@ -1,110 +0,0 @@
-<?php
-
-class MonetarySourcesController extends AppController {
-
-  var $sidemenu_links = array();
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
-   */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-  }
-
-  
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: index / all
-   *  - Generate a listing of MonetarySources
-   */
-
-  function index()    { $this->all(); }
-  function all()      { $this->jqGridView('All MonetarySources', 'all'); }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
-   *    these virtual functions ensure that the correct data is passed
-   *    to jqGrid.
-   */
-
-  function jqGridDataTables(&$params, &$model) {
-    return array
-      ('contain' => false,
-       );
-  }
-
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['MonetarySource'] = array('id');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: nsf
-   *  - Marks a monetary source as having insufficient funds.
-   */
-
-  function nsf($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
-    // REVISIT <AP>: 20090713
-    //  For testing purposes, must be deleted
-    $stamp = '2009-07-09';
-
-    $this->MonetarySource->nsf($id, $stamp);
-  }
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: view
-   *  - Displays information about a specific entry
-   */
-
-  function view($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
-    }
-
-    // Get the MonetarySource and related fields
-    $monetary_source = $this->MonetarySource->find
-      ('first', array
-       ('contain' => false,
-	));
-
-    // REVISIT <AP>: 20090713
-    //  Consider allowing the NSF operation only if the source is used on
-    //  a ledger entry that is debited on a "payable" account (perhaps
-    //  even restricted to "payable" ASSET accounts), credited on Receipt
-    //  (or A/R), and reconciles the credit to an entry that debits on a
-    //  "depositable" account.
-
-    // Set up dynamic menu items
-    $this->sidemenu_links[] =
-      array('name' => 'Operations', 'header' => true);
-
-    $this->sidemenu_links[] =
-      array('name' => 'NSF',
-	    'url' => array('action' => 'nsf',
-			   $id));
-
-    // Prepare to render.
-    $title = "Monetary Source #{$monetary_source['MonetarySource']['id']}";
-    $this->set(compact('monetary_source', 'title'));
-  }
-}

site/controllers/transactions_controller.php

@@ -1,166 +0,0 @@
-<?php
-
-class TransactionsController extends AppController {
-
-  var $components = array('RequestHandler');
-
-  var $sidemenu_links =
-    array(array('name' => 'Transactions', 'header' => true),
-	  array('name' => 'All',          'url' => array('controller' => 'transactions', 'action' => 'all')),
-	  );
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
-   */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-  }
-
-  
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: index / all
-   *  - Generate a listing of transactions
-   */
-
-  function index()    { $this->all(); }
-  function all()      { $this->jqGridView('All Transactions', 'all'); }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
-   *    these virtual functions ensure that the correct data is passed
-   *    to jqGrid.
-   */
-
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['Transaction'] = array('id');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: view
-   *  - Displays information about a specific transaction
-   */
-
-  function view($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
-    $transaction = $this->Transaction->find
-      ('first',
-       array('contain' =>
-	     array(// Models
-		   'LedgerEntry' => array('fields' => array('LedgerEntry.id',
-							    'LedgerEntry.amount',
-							    'LedgerEntry.comment'),
-					  //Models
-
-					  'DebitLedger'  => array
-					  ('fields' => array('DebitLedger.id', 'DebitLedger.sequence'),
-					   'Account' => array
-					   ('fields' => array('Account.id', 'Account.name')),
-					   ),
-
-					  'CreditLedger' => array
-					  ('fields' => array('CreditLedger.id', 'CreditLedger.sequence'),
-					   'Account' => array
-					   ('fields' => array('Account.id', 'Account.name')),
-					   ),
-					  ),
-		   ),
-	     'conditions' => array('Transaction.id' => $id),
-	     ));
-
-    // Figure out the transaction total
-    $total = 0;
-    foreach($transaction['LedgerEntry'] AS $entry)
-      $total += $entry['amount'];
-
-    // OK, prepare to render.
-    $title = 'Transaction #' . $transaction['Transaction']['id'];
-    $this->set(compact('transaction', 'title', 'total'));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: postInvoice
-   *  - handles the creation of a charge invoice
-   */
-
-  function postInvoice() {
-    if (!$this->RequestHandler->isPost()) {
-      echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
-      return;
-    }
-
-    if (!$this->Transaction->addInvoice($this->data, null,
-					$this->data['Lease']['id'])) {
-      $this->Session->setFlash("INVOICE FAILED", true);
-      // REVISIT <AP> 20090706:
-      // Until we can work out the session problems,
-      // just die.
-      die("<H1>INVOICE FAILED</H1>");
-    }
-
-    $this->layout = null;
-    $this->autoLayout = false;
-    $this->autoRender = false; 
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: postReceipt
-   *  - handles the creation of a payment receipt
-   */
-
-  function postReceipt() {
-    if (!$this->RequestHandler->isPost()) {
-      echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
-      return;
-    }
-
-    foreach($this->data['LedgerEntry'] AS &$entry) {
-      if (!isset($entry['acct'][$entry['account_id']]))
-	continue;
-
-      $entry['MonetarySource'] = $entry['acct'][$entry['account_id']];
-    }
-
-    pr($this->data);
-    if (!$this->Transaction->addReceipt($this->data,
-					$this->data['Customer']['id'],
-					(isset($this->data['Lease']['id'])
-					 ? $this->data['Lease']['id']
-					 : null ))) {
-      $this->Session->setFlash("RECEIPT FAILED", true);
-      // REVISIT <AP> 20090706:
-      // Until we can work out the session problems,
-      // just die.
-      die("<H1>RECEIPT FAILED</H1>");
-    }
-
-    $this->layout = null;
-    $this->autoLayout = false;
-    $this->autoRender = false; 
- }
-
-
-}

site/controllers/units_controller.php

@@ -1,278 +0,0 @@
-<?php
-
-class UnitsController extends AppController {
-
-  var $sidemenu_links =
-    array(array('name' => 'Units',        'header' => true),
-	  array('name' => 'Occupied',     'url' => array('controller' => 'units', 'action' => 'occupied')),
-	  array('name' => 'Vacant',       'url' => array('controller' => 'units', 'action' => 'vacant')),
-	  array('name' => 'Unavailable',  'url' => array('controller' => 'units', 'action' => 'unavailable')),
-	  array('name' => 'All',          'url' => array('controller' => 'units', 'action' => 'all')),
-	  );
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
-   */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-  }
-
-  
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: index / unavailable / vacant / occupied / all
-   *  - Generate a listing of units
-   */
-
-  function index()       { $this->all(); }
-  function unavailable() { $this->jqGridView('Unavailable Units'); }
-  function vacant()      { $this->jqGridView('Vacant Units'); }
-  function occupied()    { $this->jqGridView('Occupied Units'); }
-  function all()         { $this->jqGridView('All Units', 'all'); }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
-   *    these virtual functions ensure that the correct data is passed
-   *    to jqGrid.
-   */
-
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
-    if (!isset($params['action']))
-      $params['action'] = 'all';
-  }
-
-  function jqGridDataCountTables(&$params, &$model) {
-    $link = array
-      ('link' =>
-       array(// Models
-	     'UnitSize' => array('fields' => array('id', 'name')),
-	     ),
-       );
-
-    if ($params['action'] === 'occupied')
-      $link['Lease'] = array('fields' => array(),
-			     // Models
-			     'Contact' => array('fields' => array('display_name'),
-						//'type' => 'LEFT',
-						),
-			     );
-
-    return $link;
-  }
-
-  function jqGridDataTables(&$params, &$model) {
-    $link = $this->jqGridDataCountTables($params, $model);
-    $link['link']['CurrentLease']['LedgerEntry'] = array('fields' => array());
-    $link['link']['CurrentLease']['LedgerEntry']['Ledger'] = array('fields' => array());
-    $link['link']['CurrentLease']['LedgerEntry']['Ledger']['Account'] = array('fields' => array());
-    // INNER JOIN would be great, as it would ensure we're only looking
-    // at the ledger entries that we truly want.  However, this also
-    // removes from the query any leases that do not yet have a ledger
-    // entry in A/R.  A solution would be to INNER JOIN these tables,
-    // and LEFT JOIN it to the rest.  Grouping of JOINs, however, is
-    // implemented with the 'joins' tag, and is not available through
-    // the Linkable behavior interface.
-    //$link['link']['CurrentLease']['LedgerEntry']['Ledger']['Account']['type'] = 'INNER';
-    $link['link']['CurrentLease']['LedgerEntry']['Ledger']['Account']['conditions']
-      = array('Account.id' =>
-	      $this->Unit->CurrentLease->LedgerEntry->Ledger->Account->accountReceivableAccountID());
-    return $link;
-  }
-
-  function jqGridDataFields(&$params, &$model) {
-    $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))" .
-		 "    * LedgerEntry.amount) AS 'balance'");
-    return $fields;
-  }
-
-  function jqGridDataConditions(&$params, &$model) {
-    $conditions = parent::jqGridDataConditions($params, $model);
-
-    if ($params['action'] === 'unavailable') {
-      $conditions[] = $this->Unit->conditionUnavailable();
-    }
-    elseif ($params['action'] === 'vacant') {
-      $conditions[] = $this->Unit->conditionVacant();
-    }
-    elseif ($params['action'] === 'occupied') {
-      $conditions[] = $this->Unit->conditionOccupied();
-    }
-    elseif ($params['action'] === 'unoccupied') {
-      $conditions[] = array('NOT' => array($this->Unit->conditionOccupied()));
-    }
-
-    return $conditions;
-  }
-
-  function jqGridDataOrder(&$params, &$model, $index, $direction) {
-    // Instead of sorting by name, sort by defined order
-    if ($index === 'Unit.name')
-      $index = 'Unit.sort_order';
-
-    $order = array();
-    $order[] = parent::jqGridDataOrder($params, $model, $index, $direction);
-
-    // If sorting by anything other than name (defined order)
-    // add the sort-order as a secondary condition
-    if ($index !== 'Unit.name')
-      $order[] = parent::jqGridDataOrder($params, $model,
-					 'Unit.sort_order', $direction);
-
-    return $order;
-  }
-
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['Unit'] = array('name');
-    $links['UnitSize'] = array('name');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: move_in
-   *  - Sets up the move-in page for the given unit.
-   */
-
-  function move_in($id = null) {
-    $customer = array();
-    $unit = array();
-
-    if (isset($id)) {
-      $this->Unit->recursive = -1;
-      $unit = current($this->Unit->read(null, $id));
-    }
-
-    $title = 'Unit Move-In';
-    $this->set(compact('customer', 'unit', 'title'));
-    $this->render('/leases/move');
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: move_out
-   *  - prepare or execute a move out on a specific lease
-   */
-
-  function move_out($id) {
-
-    $unit = $this->Unit->find
-      ('first', array
-       ('contain' => array
-	(// Models
-	 'CurrentLease' =>
-	 array(//'conditions' => array('Lease.moveout_date' => null),
-	       // Models
-	       'Customer' =>
-	       array('fields' => array('id', 'name'),
-		     ),
-	       ),
-	 ),
-	'conditions' => array('Unit.id' => $id),
-	));
-    $this->set('customer', $unit['CurrentLease']['Customer']);
-    $this->set('unit',     $unit['Unit']);
-    $this->set('lease',    $unit['CurrentLease']);
-
-    $redirect = array('controller' => 'units',
-		      'action' => 'view',
-		      $id);
-
-    $title = ('Lease #' . $unit['CurrentLease']['number'] . ': ' .
-	      $unit['Unit']['name'] . ': ' .
-	      $unit['CurrentLease']['Customer']['name'] . ': Prepare Move-Out');
-    $this->set(compact('title', 'redirect'));
-    $this->render('/leases/move');
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: view
-   *  - Displays information about a specific unit
-   */
-
-  function view($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>''));
-    }
-
-    $unit = $this->Unit->find
-      ('first',
-       array('contain' =>
-	     array(// Models
-		    'UnitSize',
-		    'Lease' => array('Customer'),
-		    'CurrentLease' => array('Customer')
-		   ),
-	     'conditions' => array('Unit.id' => $id),
-	     ));
-
-    // Get the balance on each lease.
-    foreach ($unit['Lease'] AS &$lease) {
-      $stats = $this->Unit->Lease->stats($lease['id']);
-      $lease['balance'] = $stats['balance'];
-    }
-
-    $outstanding_balance = 0;
-    $outstanding_deposit = 0;
-    if (isset($unit['CurrentLease']['id'])) {
-      // Figure out the outstanding balance of the current lease.
-      $stats = $this->Unit->stats($id);
-      $outstanding_balance =
-	$stats['CurrentLease']['balance'];
-
-      // Figure out the total security deposit for the current lease.
-      $deposits = $this->Unit->Lease->findSecurityDeposits($unit['CurrentLease']['id']);
-      $outstanding_deposit = $deposits['summary']['balance'];
-    }
-
-    // Set up dynamic menu items
-    $this->sidemenu_links[] =
-      array('name' => 'Operations', 'header' => true);
-
-    if (isset($unit['CurrentLease']['id']) &&
-	!isset($unit['CurrentLease']['moveout_date'])) {
-      $this->sidemenu_links[] =
-	array('name' => 'Move-Out', 'url' => array('action' => 'move_out',
-						   $id));
-    } else {
-      $this->sidemenu_links[] =
-	array('name' => 'Move-In', 'url' => array('action' => 'move_in',
-						   $id));
-    }
-
-    if (isset($unit['CurrentLease']['id']) &&
-	!isset($unit['CurrentLease']['close_date'])) {
-      $this->sidemenu_links[] =
-	array('name' => 'Payment', 'url' => array('controller' => 'customers',
-						  'action' => 'receipt',
-						  $unit['CurrentLease']['customer_id']));
-    }
-
-    // Prepare to render.
-    $title = 'Unit ' . $unit['Unit']['name'];
-    $this->set(compact('unit', 'title',
-		       'outstanding_balance',
-		       'outstanding_deposit'));
-  }
-}

site/models/account.php

@@ -1,850 +0,0 @@
-<?php
-class Account extends AppModel {
-
-	var $name = 'Account';
-	var $validate = array(
-		'id' => array('numeric'),
-		'name' => array('notempty'),
-		'external_name' => array('notempty')
-	);
-
-	var $hasOne = array(
-		'CurrentLedger' => array(
-			'className' => 'Ledger',
-			// REVISIT <AP> 20090702:
-			//   I would prefer this statement, which has no
-			//   engine specific code.  However, it doesn't
-			//   work with the Linkable behavior.  I need to
-			//   look into that, just not right now.
-			//'conditions' => array('CurrentLedger.close_id' => null),
-			'conditions' => array('CurrentLedger.close_id IS NULL'),
-		),
-	);
-
-	var $hasMany = array(
-		'Ledger',
-	);
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: type
-   *  - Returns the type of this account
-   */
-  function type($id) {
-    $this->cacheQueries = true;
-    $account = $this->find('first', array
-			   ('recursive' => -1,
-			    'fields' => array('type'),
-			    'conditions' => array(array('Account.id' => $id)),
-			    ));
-    $this->cacheQueries = false;
-
-    return $account['Account']['type'];
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: fundamentalType
-   *  - Returns the fundmental type of the account, credit or debit
-   */
-  function fundamentalType($id_or_type) {
-    if (is_numeric($id_or_type))
-      $type = $this->type($id_or_type);
-    else
-      $type = $id_or_type;
-
-    // Asset and Expense accounts are debit accounts
-    if (in_array(strtoupper($type), array('ASSET', 'EXPENSE')))
-      return 'debit';
-
-    // Otherwise, it's a credit account
-    return 'credit';
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: fundamentalOpposite
-   *  - Returns the opposite fundmental type of the account, credit or debit
-   */
-  function fundamentalOpposite($id_or_type) {
-    if (in_array(strtolower($id_or_type), array('credit', 'debit')))
-      $fund = $id_or_type;
-    else
-      $fund = $this->fundamentalType($id_or_type);
-
-    if ($fund == 'debit')
-      return 'credit';
-
-    return 'debit';
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: name
-   *  - Returns the name of this account
-   */
-  function name($id) {
-    $this->cacheQueries = true;
-    $account = $this->find('first', array
-			   ('recursive' => -1,
-			    'fields' => array('name'),
-			    'conditions' => array(array('Account.id' => $id)),
-			    ));
-    $this->cacheQueries = false;
-
-    return $account['Account']['name'];
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: Account IDs
-   *  - Returns the ID of the desired account
-   */
-
-  function securityDepositAccountID()   { return $this->nameToID('Security Deposit'); }
-  function rentAccountID()              { return $this->nameToID('Rent'); }
-  function lateChargeAccountID()        { return $this->nameToID('Late Charge'); }
-  function nsfAccountID()               { return $this->nameToID('NSF'); }
-  function nsfChargeAccountID()         { return $this->nameToID('NSF Charge'); }
-  function taxAccountID()               { return $this->nameToID('Tax'); }
-  function accountReceivableAccountID() { return $this->nameToID('A/R'); }
-  function cashAccountID()              { return $this->nameToID('Cash'); }
-  function checkAccountID()             { return $this->nameToID('Check'); }
-  function moneyOrderAccountID()        { return $this->nameToID('Money Order'); }
-  function concessionAccountID()        { return $this->nameToID('Concession'); }
-  function pettyCashAccountID()         { return $this->nameToID('Petty Cash'); }
-  function invoiceAccountID()           { return $this->nameToID('Invoice'); }
-  function receiptAccountID()           { return $this->nameToID('Receipt'); }
-  function badDebtAccountID()           { return $this->nameToID('Bad Debt'); }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: fundamentalAccounts
-   *  - Returns an array of accounts by their fundamental type
-   */
-
-  function fundamentalAccounts($ftype) {
-    $this->cacheQueries = true;
-    $account = $this->find('all', array
-			   ('contain' => array('CurrentLedger'),
-			    'fields' => array('Account.id', 'Account.type', 'Account.name', 'CurrentLedger.id'),
-			    'conditions' => array('Account.type' => strtoupper($ftype))
-			    ));
-    $this->cacheQueries = false;
-
-    return $account;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: relatedAccounts
-   *  - Returns an array of accounts related by similar attributes
-   */
-
-  function relatedAccounts($attribute, $extra = null) {
-    $this->cacheQueries = true;
-    $account = $this->find('all', array
-			   ('contain' => array('CurrentLedger'),
-			    'fields' => array('Account.id', 'Account.type', 'Account.name', 'CurrentLedger.id'),
-			    'conditions' => array('Account.'.$attribute => true),
-			    'order' => array('Account.name'),
-			    ) + (isset($extra) ? $extra : array())
-			   );
-    $this->cacheQueries = false;
-
-    return $account;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: chargeAccounts
-   *  - Returns an array of accounts suitable for charges
-   */
-
-  function chargeAccounts() {
-    // Get all accounts that support charges
-    $accounts = $this->relatedAccounts('chargeable', array('order' => 'name'));
-
-    // Rearrange to be of the form (id => name)
-    $charge_accounts = array();
-    foreach ($accounts AS $acct) {
-      $charge_accounts[$acct['Account']['id']] = $acct['Account']['name'];
-    }
-
-    return $charge_accounts;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: paymentAccounts
-   *  - Returns an array of accounts suitable for payments
-   */
-
-  function paymentAccounts() {
-    // Get all accounts that support payments
-    $accounts = $this->relatedAccounts('payable', array('order' => 'name'));
-
-    // Rearrange to be of the form (id => name)
-    $payment_accounts = array();
-    foreach ($accounts AS $acct) {
-      $payment_accounts[$acct['Account']['id']] = $acct['Account']['name'];
-    }
-
-    return $payment_accounts;
-  }
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: collectableAccounts
-   *  - Returns an array of accounts suitable to show income collection
-   */
-
-  function collectableAccounts() {
-    $accounts = $this->paymentAccounts();
-
-    foreach(array($this->nsfAccountID(),
-		  $this->securityDepositAccountID())
-	    AS $account_id) {
-      $accounts[$account_id] = $this->name($account_id);
-    }
-
-    return $accounts;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: currentLedgerID
-   *  - Returns the current ledger ID of the account
-   */
-  function currentLedgerID($id) {
-    $this->cacheQueries = true;
-    $item = $this->find('first', array
-			('contain' => 'CurrentLedger',
-			 'conditions' => array('Account.id' => $id),
-			 ));
-    $this->cacheQueries = false;
-    return $item['CurrentLedger']['id'];
-  }
-
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: ledgers
-   *  - Returns an array of ledger ids from the given account
-   */
-  function ledgers($id, $all = false) {
-    if ($all) {
-      $contain = array('Ledger' => array('fields' => array('Ledger.id')));
-    } else {
-      $contain = array('CurrentLedger' => array('fields' => array('CurrentLedger.id')));
-    }
-
-    $this->cacheQueries = true;
-    $account = $this->find('first', array
-			   ('contain' => $contain,
-			    'fields' => array(),
-			    'conditions' => array(array('Account.id' => $id)),
-			    ));
-    $this->cacheQueries = false;
-
-    if ($all) {
-      $ledger_ids = array();
-      foreach ($account['Ledger'] AS $ledger)
-	array_push($ledger_ids, $ledger['id']);
-    }
-    else {
-      $ledger_ids = array($account['CurrentLedger']['id']);
-    }
-
-/*     pr(array('function' => 'Account::ledgers', */
-/* 	     'args' => compact('id', 'all'), */
-/* 	     'return' => $ledger_ids)); */
-
-    return $ledger_ids;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: closeCurrentLedger
-   *  - Closes the current account ledger, and opens a new one
-   *    with the old balance carried forward.
-   */
-  function closeCurrentLedger($id = null, $close_id = null) {
-    $contain = array('CurrentLedger' => array('fields' => array('CurrentLedger.id')));
-
-    if (!$close_id) {
-      $close = new Close();
-      $close->create();
-      if (!$close->save(array('stamp' => null), false)) {
-	return false;
-      }
-      $close_id = $close->id;
-    }
-
-    $this->cacheQueries = true;
-    $account = $this->find('all', array
-			   ('contain' => $contain,
-			    'fields' => array(),
-			    'conditions' =>
-			    $id ? array(array('Account.id' => $id)) : array()
-			    ));
-    $this->cacheQueries = false;
-    //pr(compact('id', 'account'));
-
-    foreach ($account AS $acct) {
-      if (!$this->Ledger->closeLedger($acct['CurrentLedger']['id'], $close_id))
-	return false;
-    }
-    return true;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findLedgerEntries
-   *  - Returns an array of ledger entries that belong to the given
-   *    account, either just from the current ledger, or from all ledgers.
-   */
-  function findLedgerEntries($id, $all = false, $cond = null, $link = null) {
-/*     pr(array('function' => 'Account::findLedgerEntries', */
-/* 	     'args' => compact('id', 'all', 'cond', 'link'), */
-/* 	     )); */
-
-    $entries = array();
-    foreach ($this->ledgers($id, $all) AS $ledger_id) {
-      $ledger_entries = $this->Ledger->findLedgerEntries
-	($ledger_id, $this->type($id), $cond, $link);
-      $entries = array_merge($entries, $ledger_entries);
-    }
-
-    $stats = $this->stats($id, $all, $cond);
-    $entries = array('Entries' => $entries,
-		     'summary' => $stats['Ledger']);
-
-/*     pr(array('function' => 'Account::findLedgerEntries', */
-/* 	     'args' => compact('id', 'all', 'cond', 'link'), */
-/* 	     'vars' => compact('stats'), */
-/* 	     'return' => compact('entries'), */
-/* 	     )); */
-
-    return $entries;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findLedgerEntriesRelatedToAccount
-   *  - Returns an array of ledger entries that belong to the given
-   *    account, and are related to a specific account, either just from
-   *    the current ledger, or from all ledgers.
-   */
-  function findLedgerEntriesRelatedToAccount($id, $rel_ids, $all = false, $cond = null, $link = null) {
-/*     pr(array('function' => 'Account::findLedgerEntriesRelatedToAccount', */
-/* 	     'args' => compact('id', 'rel_ids', 'all', 'cond', 'link'), */
-/* 	     )); */
-
-    if (!isset($cond))
-      $cond = array();
-    if (!is_array($rel_ids))
-      $rel_ids = array($rel_ids);
-
-    $ledger_ids = array();
-    foreach ($rel_ids AS $rel_id)
-      $ledger_ids = array_merge($ledger_ids, $this->ledgers($rel_id));
-
-    array_push($cond, $this->Ledger->LedgerEntry->conditionEntryAsCreditOrDebit($ledger_ids));
-    $entries = $this->findLedgerEntries($id, $all, $cond, $link);
-
-/*     pr(array('function' => 'Account::findLedgerEntriesRelatedToAccount', */
-/* 	     'args' => compact('id', 'relid', 'all', 'cond', 'link'), */
-/* 	     'vars' => compact('ledger_ids'), */
-/* 	     'return' => compact('entries'), */
-/* 	     )); */
-    return $entries;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findUnreconciledLedgerEntries
-   *  - Returns ledger entries that are not yet reconciled
-   *    (such as charges not paid).
-   */
-
-  function findUnreconciledLedgerEntries($id = null, $fundamental_type = null, $cond = null) {
-    if (!isset($cond))
-      $cond = array();
-    $cond[] = array('Account.id' => $id);
-
-    foreach (($fundamental_type
-	      ? array($fundamental_type)
-	      : array('debit', 'credit')) AS $fund) {
-      $ucfund = ucfirst($fund);
-      $unreconciled[$fund]['entry'] = $this->find
-	('all', array
-	 ('link' => array
-	  ('Ledger' => array
-	   ('fields' => array(),
-	    "LedgerEntry" => array
-	    ('class' => "{$ucfund}LedgerEntry",
-	     'fields' => array('id', 'customer_id', 'lease_id', 'amount'),
-	     "ReconciliationLedgerEntry" => array
-	     ('class' => "{$ucfund}ReconciliationLedgerEntry",
-	      'fields' => array
-	      ("COALESCE(SUM(Reconciliation.amount),0) AS 'reconciled'",
-	       "LedgerEntry.amount - COALESCE(SUM(Reconciliation.amount),0) AS 'balance'",
-	       ),
-	      ),
-	     ),
-	    ),
-	   ),
-	  'group' => ("LedgerEntry.id" .
-		      " HAVING LedgerEntry.amount" .
-		      " <> COALESCE(SUM(Reconciliation.amount),0)"),
-	  'conditions' => $cond,
-	  'fields' => array(),
-	  ));
-      $balance = 0;
-      foreach ($unreconciled[$fund]['entry'] AS &$entry) {
-	$entry = array_merge(array_diff_key($entry["LedgerEntry"], array(0=>true)),
-			     $entry[0]);
-	$balance += $entry['balance'];
-      }
-      $unreconciled[$fund]['balance'] = $balance;
-    }
-
-    return $unreconciled;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: reconcileNewLedgerEntry
-   *  - Returns which ledger entries a new credit/debit would
-   *    reconcile, and how much.
-   *
-   *  - REVISIT <AP> 20090617
-   *    This should be subject to different algorithms, such
-   *    as apply to oldest charges first, newest first, to fees
-   *    before rent, etc.  Until we get there, I'll hardcode
-   *    whatever algorithm is simplest.
-   */
-
-  function reconcileNewLedgerEntry($id, $fundamental_type, $amount, $cond = null) {
-    $ofund = $this->fundamentalOpposite($fundamental_type);
-    $unreconciled = array($ofund => array('entry'=>array(), 'balance'=>0));
-    $applied = 0;
-
-    // if there is no money in the entry, it can reconcile nothing
-    // don't bother wasting time sifting ledger entries.
-    if ($amount > 0) {
-      $unreconciled = $this->findUnreconciledLedgerEntries($id, $ofund, $cond);
-
-      foreach ($unreconciled[$ofund]['entry'] AS $i => &$entry) {
-	// Determine if amount is sufficient to cover the entry
-	if ($amount > $entry['balance'])
-	  $apply = $entry['balance'];
-	elseif ($amount > 0)
-	  $apply = $amount;
-	else {
-	  unset($unreconciled[$ofund]['entry'][$i]);
-	  continue;
-	}
-
-	$entry['applied']     = $apply;
-	$entry['reconciled'] += $apply;
-	$entry['balance']    -= $apply;
-	$applied             += $apply;
-	$amount              -= $apply;
-      }
-    }
-
-    $unreconciled[$ofund]['unapplied']  = $amount;
-    $unreconciled[$ofund]['applied']    = $applied;
-    $unreconciled[$ofund]['balance']   -= $applied;
-    return $unreconciled;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: postLedgerEntry
-   *  - 
-   * transaction_data
-   *   - transaction_id (optional... if set all else is ignored)
-   *   - Transaction
-   *     - stamp (optional... otherwise NOW is used)
-   *     - comment
-   *
-   * monetary_source_data
-   *   - monetary_source_id (optional... if set all else is ignored)
-   *   - account_name
-   *   - MonetarySource
-   *     - name
-   */
-
-  function postLedgerEntry($transaction_data,
-			   $monetary_data,
-			   $entry_data,
-			   $reconcile = null) {
-    //pr(compact('transaction_data', 'monetary_data', 'entry_data', 'reconcile'));
-
-    // Automatically figure out the customer if we have the lease
-    if (isset($entry_data['lease_id']) && !isset($entry_data['customer_id'])) {
-      $L = new Lease();
-      $L->recursive = -1;
-      $lease = $L->read(null, $entry_data['lease_id']);
-      $entry_data['customer_id'] = $lease['Lease']['customer_id'];
-    }
-
-    if (!isset($entry_data['lease_id']))
-      $entry_data['lease_id'] = null;
-
-    if (!isset($entry_data['customer_id']))
-      $entry_data['customer_id'] = null;
-
-    // Get the Transaction squared away
-    if (isset($transaction_data['transaction_id'])) {
-      $transaction_data
-	= array_intersect_key($transaction_data,
-			      array('transaction_id'=>1,
-				    'split_transaction_id'=>1));
-    }
-    elseif (isset($transaction_data['Transaction'])) {
-      $transaction_data
-	= array_intersect_key($transaction_data,
-			      array('Transaction'=>1,
-				    'split_transaction_id'=>1));
-    }
-    else {
-      $transaction_data = array('Transaction'=>array('stamp' => null));
-    }
-
-
-    // Get the Monetary Source squared away
-    if (isset($monetary_data)) {
-      if (!isset($monetary_data['monetary_source_id'])) {
-
-	// Convert Account ID to name or vice versa
-	if (isset($monetary_data['account_id'])) {
-	  $monetary_data['account_name'] = $this->name($monetary_data['account_id']);
-	} elseif (isset($monetary_data['account_name'])) {
-	  $monetary_data['account_id'] = $this->nameToID($monetary_data['account_name']);
-	}
-
-	if ($monetary_data['account_id'] == $this->cashAccountID()) {
-	  // No distinguishing features of Cash, just
-	  // use the shared monetary source
-	  $monetary_data['monetary_source_id'] = 
-	    $this->Ledger->LedgerEntry->MonetarySource->nameToID('Cash');
-	}
-      }
-
-      if (isset($monetary_data['monetary_source_id'])) {
-	$monetary_data
-	  = array_intersect_key($monetary_data,
-				array('monetary_source_id'=>1));
-      }
-      else {
-	// The monetary source needs to be unique
-	// Create a new one dedicated to this entry
-	// Give it a fancy name based on the check number
-	$monetary_data['MonetarySource']['name'] = $monetary_data['account_name'];
-	if ($monetary_data['account_name'] === $this->name($this->checkAccountID()) ||
-	    $monetary_data['account_name'] === $this->name($this->moneyOrderAccountID())) {
-	  $monetary_data['MonetarySource']['name'] .=
-	    ' #' . $monetary_data['MonetarySource']['data1'];
-	}
-
-	$monetary_data
-	  = array_intersect_key($monetary_data,
-				array('MonetarySource'=>1));
-      }
-    }
-    else {
-      $monetary_data = array();
-    }
-
-    // Make sure to clean out any unwanted data from the entry
-    $entry_data
-      = array_diff_key($entry_data,
-		       array('transaction_id'=>1, 'Transaction'=>1,
-			     'monetary_source_id'=>1, 'MonetarySource'=>1));
-
-    // Then add in the transaction and monetary source data
-    //pr(compact('transaction_data', 'monetary_data', 'entry_data'));
-    if (isset($transaction_data))
-      $entry_data += $transaction_data;
-    if (isset($monetary_data))
-      $entry_data += $monetary_data;
-
-    // Set up the debit ledger id
-    if (!isset($entry_data['debit_ledger_id'])) {
-      $entry_data['debit_ledger_id'] =
-	(isset($entry_data['debit_account_id'])
-	 ? $this->currentLedgerID($entry_data['debit_account_id'])
-	 : (isset($entry_data['debit_account_name'])
-	    ? $this->currentLedgerID($this->nameToID($entry_data['debit_account_name']))
-	    : null
-	    )
-	 );
-    }
-
-    // Set up the credit ledger id
-    if (!isset($entry_data['credit_ledger_id'])) {
-      $entry_data['credit_ledger_id'] =
-	(isset($entry_data['credit_account_id'])
-	 ? $this->currentLedgerID($entry_data['credit_account_id'])
-	 : (isset($entry_data['credit_account_name'])
-	    ? $this->currentLedgerID($this->nameToID($entry_data['credit_account_name']))
-	    : null
-	    )
-	 );
-    }
-
-    //pr(array('pre-save', compact('entry_data')));
-    // Create it!
-    $new_entry = new LedgerEntry();
-    $new_entry->create();
-    if (!$new_entry->saveAll($entry_data, array('validate'=>false))) {
-      return array('error' => true);
-    }
-
-    // See if the user has entered some sort of non-array
-    // for the reconcile parameter.
-    if (isset($reconcile) && is_bool($reconcile) && $reconcile) {
-      $reconcile = array('debit' => true, 'credit' => true);
-    }
-    elseif (isset($reconcile) && $reconcile == 'invoice') {
-      $reconcile = array('credit' => 'invoice');
-    }
-    elseif (isset($reconcile) && $reconcile == 'receipt') {
-      $reconcile = array('debit' => 'receipt');
-    }
-    elseif (!isset($reconcile) || !is_array($reconcile)) {
-      $reconcile = array();
-    }
-
-    // Reconcile the new entry... assume we'll have success
-    $err = false;
-    foreach (array_intersect_key($reconcile, array('credit'=>1,'debit'=>1))
-	     AS $dc_type => $reconcile_set) {
-      if (!isset($reconcile_set) || (is_bool($reconcile_set) && !$reconcile_set))
-	continue;
-
-      if ($reconcile_set === 'receipt') {
-	$C = new Customer();
-	$reconciled = $C->reconcileNewLedgerEntry($entry_data['customer_id'],
-						  $this->fundamentalOpposite($dc_type),
-						  $entry_data['amount']);
-
-/* 	pr(array("reconcile receipt", */
-/* 		 compact('reconciled', 'split_transaction', 'transaction_data'))); */
-	$split_transaction = array_intersect_key($transaction_data,
-						 array('Transaction'=>1,
-						       'split_transaction_id'=>1));
-
-	if (isset($split_transaction['split_transaction_id']))
-	  $split_transaction['transaction_id'] = $split_transaction['split_transaction_id'];
-
-	if (is_array($reconciled) && count($reconciled[$dc_type]['entry'])) {
-	  foreach ($reconciled[$dc_type]['entry'] AS $rec) {
-	    //pr(compact('rec', 'split_transaction'));
-	    if (!$rec['applied'])
-	      continue;
-
-	    // Create an entry to handle the splitting of the funds ("Payment")
-	    // and reconcile against the new cash/check/etc entry created above,
-	    // as well as the A/R account.
-
-	    // Payment must debit the Receipt ledger, and credit the A/R ledger
-	    //     debit: Receipt           credit: A/R
-	    $ids = $this->postLedgerEntry
-	      ($split_transaction,
-	       null,
-	       array('debit_ledger_id' => $this->currentLedgerID($this->receiptAccountID()),
-		     'credit_ledger_id' => $this->currentLedgerID($this->accountReceivableAccountID()),
-		     'amount' => $rec['applied'],
-		     'lease_id' => $rec['lease_id'],
-		     'customer_id' => $rec['customer_id'],
-		     ),
-	       array('debit' => array(array('LedgerEntry' => array('id' => $new_entry->id,
-								   'amount' => $rec['applied']))),
-		     'credit' => array(array('LedgerEntry' => array('id' => $rec['id'],
-								    'amount' => $rec['applied']))))
-	       );
-	    // Keep using the same split transaction for all reconciled entries
-	    $split_transaction = array_intersect_key($ids, array('transaction_id'=>1));
-	    //pr(compact('ids', 'split_transaction'));
-	  }
-
-	  //pr("end reconciled is array");
-	}
-
-	//pr("end reconcile receipt");
-      }
-
-      if (is_array($reconcile_set)) {
-	//pr("reconcile_set is array");
-	foreach ($reconcile_set AS $reconcile_entry) {
-	  if (!isset($reconcile_entry['LedgerEntry']['id']))
-	    continue;
-
-	  $amount = $reconcile_entry['LedgerEntry']['amount'];
-	  if (!$amount)
-	    continue;
-
-	  if ($dc_type == 'debit') {
-	    $debit_ledger_entry_id  = $new_entry->id;
-	    $credit_ledger_entry_id = $reconcile_entry['LedgerEntry']['id'];
-	  }
-	  else {
-	    $debit_ledger_entry_id  = $reconcile_entry['LedgerEntry']['id'];
-	    $credit_ledger_entry_id = $new_entry->id;
-	  }
-
-	  $R = new Reconciliation();
-	  $R->create();
-	  if (!$R->save(compact('amount',
-				'debit_ledger_entry_id',
-				'credit_ledger_entry_id'), false))
-	    $err = true;
-	}
-      }
-    }
-
-    $new_entry->recursive = -1;
-    $new_entry->read();
-    //pr(array('post-save', $entry->data));
-
-    $ret = array
-      ('error' => $err,
-       'id' => $new_entry->data['LedgerEntry']['id'],
-       'transaction_id' => $new_entry->data['LedgerEntry']['transaction_id'],
-       'monetary_source_id' => $new_entry->data['LedgerEntry']['monetary_source_id']);
-
-    if (isset($split_transaction['transaction_id']))
-      $ret['split_transaction_id'] = $split_transaction['transaction_id'];
-
-    return $ret;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: closeAndDeposit
-   *  - Closes the current set of ledgers, transferring
-   *    their balances to specified ledger.
-   */
-  function closeAndDeposit($set, $deposit_account_id) {
-
-    $close = new Close();
-    $close->create();
-    if (!$close->save(array('stamp' => null, 'comment' => 'Deposit'), false)) {
-      return false;
-    }
-
-    $transaction = array();
-    foreach ($set AS $ledger) {
-      // REVISIT <AP>: 20090710
-      //  If the user said to include a ledger in the
-      //  set, should we really be excluding it?
-      if ($ledger['total'] == 0)
-	continue;
-
-      $ids = $this->postLedgerEntry
-	($transaction,
-	 null,
-	 array('debit_account_id' => $deposit_account_id,
-	       'credit_ledger_id' => $ledger['id'],
-	       'amount' => $ledger['total']),
-	 // Reconcile the account for cash/check/etc,
-	 // which is the credit side of this entry.
-	 array('credit' => $ledger['entries']));
-      //pr(compact('ids'));
-
-      if ($ids['error'])
-	die("closeAndDeposit : postLedgerEntry returned error!");
-
-      $transaction = array_intersect_key($ids, array('transaction_id'=>1));
-
-      $this->Ledger->closeLedger($ledger['id'], $close->id);
-    }
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: stats
-   *  - Returns summary data from the requested account.
-   */
-
-  function stats($id = null, $all = false, $cond = null) {
-    if (!$id)
-      return null;
-
-    // All old, closed ledgers MUST balance to 0.
-    // However, the user may want the ENTIRE running totals,
-    // (not just the balance), so we may have to query all
-    // ledgers, as dictated by the $all parameter.
-
-    $account = $this->find('first',
-			   array('contain' =>
-				 ($all
-				  ? array('Ledger' => array
-					  ('fields' => array('id')))
-				  : array('CurrentLedger' => array
-					  ('fields' => array('id')))
-				  ),
-				 'conditions' => array
-				 (array('Account.id' => $id))
-				 ));
-
-    $stats = array();
-    if ($all) {
-      foreach ($account['Ledger'] AS $ledger)
-	$this->statsMerge($stats['Ledger'],
-			  $this->Ledger->stats($ledger['id'], $cond));
-    }
-    else {
-      $stats['Ledger'] =
-	$this->Ledger->stats($account['CurrentLedger']['id'], $cond);
-    }
-
-    return $stats;
-  }
-
-}
-?>

site/models/behaviors/linkable.php

@@ -1,406 +0,0 @@
-<?php
-/*
- * LinkableBehavior
- * Light-weight approach for data mining on deep relations between models. 
- * Join tables based on model relations to easily enable right to left find operations.
- * 
- * Can be used as a alternative to the ContainableBehavior:
- * - On data fetching only in right to left operations,
- * wich means that in "one to many" relations (hasMany, hasAndBelongsToMany)
- * should only be used from the "many to one" tables. i.e:
- * To fetch all Users assigneds to a Project with ProjectAssignment,
- * $Project->find('all', array('link' => 'User', 'conditions' => 'project_id = 1')) 
- *	 - Won't produce the desired result as data came from users table will be lost.
- * $User->find('all', array('link' => 'Project', 'conditions' => 'project_id = 1'))
- *   - Will fetch all users related to the specified project in one query
- * 
- * - On data mining as a much lighter approach - can reduce 300+ query find operations
- * in one single query with joins; "or your money back!" ;-)
- *
- * - Has the 'fields' param enabled to make it easy to replace Containable usage,
- * only change the 'contain' param to 'link'.
- *
- * Linkable Behavior. Taking it easy in your DB.
- * RafaelBandeira <rafaelbandeira3(at)gmail(dot)com>
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *  
- * @version 1.0; 
- */
-
-
-/**********************************************************************
- * NOTE TO <AP> 20090615:
- * This structure should be linkable (it was my test case).
-
-    $entry = $this->LedgerEntry->find
-      ('first',
-       array('link' => array('DebitLedger' =>
-			     array(
-				   'fields' => array('id'),
-				   'alias' => 'MyDebitLedger',
-				   'Account' =>
-				   array(
-					 'fields' => array('id'),
-					 'alias' => 'MyDebitAccount'),
-				   ),
-			     
-			     'MyCreditLedger' =>
-			     array(
-				   'fields' => array('id'),
-				   'class' => 'CreditLedger',
-				   'MyCreditAccount' =>
-				   array(
-					 'fields' => array('id'),
-					 'class' => 'Account'),
-				   ),
-
-			     'MyOtherLedger' =>
-			     array(
-				   'fields' => array('id'),
-				   'class' => 'Ledger',
-				   'alias' => 'AliasToMyOtherLedger',
-				   'Account' =>
-				   array(
-					 'fields' => array('id'),
-					 'alias' => 'AliasToMyOtherAccount'),
-				   ),
-			     ),
-
-	     'conditions' => array('LedgerEntry.id' => $id),
-	     ));
-**********************************************************************/
-
- 
-class LinkableBehavior extends ModelBehavior {
-	
-	protected $_key = 'link';
-	
-	protected $_options = array(
-		'type' => true, 'table' => true, 'alias' => true, 'joins' => true,
-		'conditions' => true, 'fields' => true, 'reference' => true,
-		'class' => true, 'defaults' => true, 'linkalias' => true,
-	);
-
-	protected $_defaults = array('type' => 'LEFT');
-	
-	function pr($lev, $mixed) {
-		if ($lev >= 5)
-			return;
-
-		pr($mixed);
-		return;
-
-		$trace = debug_backtrace(false);
-		//array_shift($trace);
-		$calls = array();
-		foreach ($trace AS $call) {
-			$call = array_intersect_key($call,
-						    array('file'=>1,
-							  'line'=>1,
-							  //'class'=>1,
-							  'function'=>1,
-							  ));
-			$calls[] = implode("; ", $call);
-		}
-		pr(array('debug' => $mixed, 'stack' => $calls));
-	}
-
-	/*
-	 * This is a function for made recursive str_replaces in an array
-	 * NOTE: The palacement of this function is terrible, but I don't
-	 *       know if I really want to go down this path or not.
-	 */
-	function recursive_array_replace($find, $replace, &$data) {
-		if (!isset($data))
-			return;
-
-		if (is_array($data)) {
-			foreach ($data as $key => $value) {
-				if (is_array($value)) {
-					$this->recursive_array_replace($find, $replace, $data[$key]);
-				} else {
-					$data[$key] = str_replace($find, $replace, $value);
-				}
-			}
-		} else {
-			$data = str_replace($find, $replace, $data);
-		}
-	}
-
-	public function beforeFind(&$Model, $query) {
-		$this->pr(10,
-			  array('function' => 'Linkable::beforeFind',
-				'args' => array('Model->alias' => '$Model->alias') + compact('query'),
-				));
-		if (isset($query[$this->_key])) {
-			$optionsDefaults = $this->_defaults + array('reference' =>
-			                                            array('class' => $Model->alias,
-			                                                  'alias' => $Model->alias),
-			                                            $this->_key => array());
-			$optionsKeys = $this->_options + array($this->_key => true);
-			if (!isset($query['fields']) || $query['fields'] === true) {
-			  //$query['fields'] = array_keys($Model->_schema);
-			  $query['fields'] = $Model->getDataSource()->fields($Model);
-			} elseif (!is_array($query['fields'])) {
-			  $query['fields'] = array($query['fields']);
-			}
-			$query = am(array('joins' => array()), $query, array('recursive' => -1));
-			$iterators[] = $query[$this->_key];
-			$cont = 0;
-			do {
-				$iterator = $iterators[$cont];
-				$defaults = $optionsDefaults;
-				if (isset($iterator['defaults'])) {
-					$defaults = array_merge($defaults, $iterator['defaults']);
-					unset($iterator['defaults']);
-				}
-				$iterations = Set::normalize($iterator);
-				$this->pr(25,
-					  array('checkpoint' => 'Iterations',
-						compact('iterations'),
-						));
-				foreach ($iterations as $alias => $options) {
-					if (is_null($options)) {
-						$options = array();
-					}
-					$options = am($defaults, compact('alias'), $options);
-					if (empty($options['alias'])) {
-						throw new InvalidArgumentException(sprintf('%s::%s must receive aliased links', get_class($this), __FUNCTION__));
-					}
-
-					if (empty($options['class']))
-						$options['class'] = $alias;
-
-					if (!isset($options['conditions']))
-						$options['conditions'] = array();
-					elseif (!is_array($options['conditions']))
-						$options['conditions'] = array($options['conditions']);
-
-					$this->pr(20,
-						  array('checkpoint' => 'Begin Model Work',
-							compact('alias', 'options'),
-							));
-
-					$modelClass     = $options['class'];
-					$modelAlias     = $options['alias'];
-					$referenceClass = $options['reference']['class'];
-					$referenceAlias = $options['reference']['alias'];
-
-					$_Model =& ClassRegistry::init($modelClass);         // the incoming model to be linked in query
-					$Reference =& ClassRegistry::init($referenceClass);  // the already in query model that links to $_Model
-					$this->pr(12,
-						  array('checkpoint' => 'Aliases Established',
-							'Model' => ($modelAlias .' : '. $modelClass .
-								    ' ('. $_Model->alias .' : '. $_Model->name .')'),
-							'Reference' => ($referenceAlias .' : '. $referenceClass .
-									' ('. $Reference->alias .' : '. $Reference->name .')'),
-							));
-
-					$db =& $_Model->getDataSource();
-
-					$associatedThroughReference = 0;
-					$association = null;
-
-					// Figure out how these two models are related, creating
-					// a relationship if one doesn't otherwise already exists.
-				        if (($associations = $Reference->getAssociated()) &&
-					    isset($associations[$_Model->alias])) {
-						$this->pr(12, array('checkpoint' => "Reference defines association to _Model"));
-						$associatedThroughReference = 1;
-						$type = $associations[$_Model->alias];
-						$association = $Reference->{$type}[$_Model->alias];
-					}
-					elseif (($associations = $_Model->getAssociated()) &&
-					    isset($associations[$Reference->alias])) {
-						$this->pr(12, array('checkpoint' => "_Model defines association to Reference"));
-						$type = $associations[$Reference->alias];
-						$association = $_Model->{$type}[$Reference->alias];
-					}
-					else {
-						// No relationship... make our best effort to create one.
-						$this->pr(12, array('checkpoint' => "No assocation between _Model and Reference"));
-						$type = 'belongsTo';
-						$_Model->bind($Reference->alias);
-						// Grab the association now, since we'll unbind in a moment.
-						$association = $_Model->{$type}[$Reference->alias];
-						$_Model->unbindModel(array('belongsTo' => array($Reference->alias)));
-					}
-
-					// Determine which model holds the foreign key
-					if (($type === 'hasMany' || $type === 'hasOne') ^ $associatedThroughReference) {
-						$primaryAlias = $referenceAlias;
-						$foreignAlias = $modelAlias;
-						$primaryModel = $Reference;
-						$foreignModel = $_Model;
-					} else {
-						$primaryAlias = $modelAlias;
-						$foreignAlias = $referenceAlias;
-						$primaryModel = $_Model;
-						$foreignModel = $Reference;
-					}
-
-					if ($associatedThroughReference)
-						$associationAlias = $referenceAlias;
-					else
-						$associationAlias = $modelAlias;
-
-					$this->recursive_array_replace("%{MODEL_ALIAS}",
-								       $associationAlias,
-								       $association['conditions']);
-
-					$this->pr(15,
-						  array('checkpoint' => 'Models Established - Check Associations',
-							'primaryModel' => $primaryAlias .' : '. $primaryModel->name,
-							'foreignModel' => $foreignAlias .' : '. $foreignModel->name,
-							compact('type', 'association'),
-							));
-
-					if ($type === 'hasAndBelongsToMany') {
-						if (isset($association['with']))
-							$linkClass = $association['with'];
-						else
-							$linkClass = Inflector::classify($association['joinTable']);
-
-						$Link =& $_Model->{$linkClass};
-
-						if (isset($options['linkalias']))
-							$linkAlias = $options['linkalias'];
-						else
-							$linkAlias = $Link->alias;
-
-						$this->pr(17,
-							  array('checkpoint' => 'Linking HABTM',
-								compact('linkClass', 'linkAlias'),
-								));
-
-						// Get the foreign key fields (for the link table) directly from
-						// the defined model associations, if they exists.  This is the
-						// users direct specification, and therefore definitive if present.
-						$modelLink = $Link->escapeField($association['foreignKey'], $linkAlias);
-						$referenceLink = $Link->escapeField($association['associationForeignKey'], $linkAlias);
-
-						// If we haven't figured out the foreign keys, see if there is a
-						// model for the link table, and if it has the appropriate
-						// associations with the two tables we're trying to join.
-						if (empty($modelLink) && isset($Link->belongsTo[$_Model->alias]))
-							$modelLink = $Link->escapeField($Link->belongsTo[$_Model->alias]['foreignKey'], $linkAlias);
-						if (empty($referenceLink) && isset($Link->belongsTo[$Reference->alias]))
-							$referenceLink = $Link->escapeField($Link->belongsTo[$Reference->alias]['foreignKey'], $linkAlias);
-
-						// We're running quite thin here.  None of the models spell
-						// out the appropriate linkages.  We'll have to SWAG it.
-						if (empty($modelLink))
-							$modelLink = $Link->escapeField(Inflector::underscore($_Model->alias) . '_id', $linkAlias);
-						if (empty($referenceLink))
-							$referenceLink = $Link->escapeField(Inflector::underscore($Reference->alias) . '_id', $linkAlias);
-
-						// Get the primary key from the tables we're joining.
-						$referenceKey = $Reference->escapeField(null, $referenceAlias);
-						$modelKey = $_Model->escapeField(null, $modelAlias);
-								
-						// Join the linkage table to our model.  We'll use an inner join,
-						// as the whole purpose of the linkage table is to make this
-						// connection.  As we are embedding this join, the INNER will not
-						// cause any problem with the overall query, should the user not
-						// be concerned with whether or not the join has any results.
-						// They control that with the 'type' parameter which will be at
-						// the top level join.
-						$options['joins'][] = array('type'  => 'INNER',
-									    'alias' => $modelAlias,
-									    'conditions' => "{$modelKey} = {$modelLink}",
-									    'table' => $db->fullTableName($_Model, true));
-
-						// Now for the top level join.  This will be added into the list
-						// of joins down below, outside of the HABTM specific code.
-						$options['class'] = $linkClass;
-						$options['alias'] = $linkAlias;
-						$options['table'] = $Link->getDataSource()->fullTableName($Link);
-						$options['conditions'][] = "{$referenceLink} = {$referenceKey}";
-					}
-					elseif (isset($association['foreignKey']) && $association['foreignKey']) {
-						$foreignKey = $primaryModel->escapeField($association['foreignKey'], $primaryAlias);
-						$primaryKey = $foreignModel->escapeField($foreignModel->primaryKey, $foreignAlias);
-
-						$this->pr(17,
-							  array('checkpoint' => 'Linking due to foreignKey',
-								compact('foreignKey', 'primaryKey'),
-								));
-
-						// Only differentiating to help show the logical flow.
-						// Either way works and this test can be tossed out
-						if (($type === 'hasMany' || $type === 'hasOne') ^ $associatedThroughReference)
-							$options['conditions'][] = "{$primaryKey} = {$foreignKey}";
-						else
-							$options['conditions'][] = "{$foreignKey} = {$primaryKey}";
-					}
-					else {
-						$this->pr(17,
-							  array('checkpoint' => 'Linking with no logic (expecting user defined)',
-								));
-
-						// No Foreign Key... nothing we can do.
-					}
-
-					$this->pr(19,
-						  array('checkpoint' => 'Conditions',
-							array('options[conditions]' => $options['conditions'],
-							      'association[conditions]' => $association['conditions'],
-							      ),
-							));
-
-					// The user may have specified conditions directly in the model
-					// for this join.  Make sure to adhere to those conditions.
-					if (isset($association['conditions']) && is_array($association['conditions']))
-						$options['conditions'] = array_merge($options['conditions'], $association['conditions']);
-					elseif (!empty($association['conditions']))
-						$options['conditions'][] = $association['conditions'];
-
-					$this->pr(19,
-						  array('checkpoint' => 'Conditions2',
-							array('options[conditions]' => $options['conditions'],
-							      ),
-							));
-
-					if (empty($options['table'])) {
-						$options['table'] = $db->fullTableName($_Model, true);
-					}
-
-					if (!isset($options['fields']) || !is_array($options['fields']))
-					  $options['fields'] = $db->fields($_Model, $modelAlias);
-					elseif (!empty($options['fields']))
-					  $options['fields'] = $db->fields($_Model, $modelAlias, $options['fields']);
-					    
-					$query['fields'] = array_merge($query['fields'], $options['fields'],
-								       (empty($association['fields']) 
-									? array() : $db->fields($_Model, $modelAlias, $association['fields'])));
-									       
-					$options[$this->_key] = am($options[$this->_key], array_diff_key($options, $optionsKeys));
-					$options = array_intersect_key($options, $optionsKeys);
-					if (!empty($options[$this->_key])) {
-						$iterators[] = $options[$this->_key] +
-							array('defaults' =>
-							      array_merge($defaults,
-							                  array('reference' =>
-							                        array('class' => $modelClass,
-							                              'alias' => $modelAlias))));
-					}
-					$query['joins'][] = array_intersect_key($options, array('type' => true, 'alias' => true, 'table' => true, 'joins' => true, 'conditions' => true));
-
-					$this->pr(19,
-						  array('checkpoint' => 'Model Join Complete',
-							compact('options', 'modelClass', 'modelAlias', 'query'),
-							));
-				}
-				++$cont;
-				$notDone = isset($iterators[$cont]);
-			} while ($notDone);
-		}
-		$this->pr(20,
-			  array('function' => 'Linkable::beforeFind',
-				'return' => compact('query'),
-				));
-		return $query;
-	}
-}

site/models/close.php

@@ -1,12 +0,0 @@
-<?php
-class Close extends AppModel {
-
-	var $belongsTo = array(
-	);
-
-	var $hasMany = array(
-		'Ledger',
-	);
-
-}
-?>

site/models/contact.php

@@ -1,136 +0,0 @@
-<?php
-class Contact extends AppModel {
-
-	var $displayField = 'display_name';
-
-	var $validate = array(
-		'id' => array('numeric'),
-		'display_name' => array('notempty'),
-		'id_federal' => array('ssn'),
-		'id_exp' => array('date')
-	);
-
-	var $hasMany = array(
-		'ContactsMethod',
-		'ContactsCustomer',
-	);
-
-	var $hasAndBelongsToMany = array(
-		'Customer',
-		'ContactAddress' => array(
-			'joinTable' => 'contacts_methods',
-			'associationForeignKey' => 'method_id',
-			'unique' => true,
-			'conditions' => "method = 'ADDRESS'",
-		),
-		'ContactPhone' => array(
-			'joinTable' => 'contacts_methods',
-			'associationForeignKey' => 'method_id',
-			'unique' => true,
-			'conditions' => "method = 'PHONE'",
-		),
-		'ContactEmail' => array(
-			'joinTable' => 'contacts_methods',
-			'associationForeignKey' => 'method_id',
-			'unique' => true,
-			'conditions' => "method = 'EMAIL'",
-		),
-	);
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: saveContact
-   *  - Saves the contact and related data
-   */
-
-  function saveContact($id, $data) {
-
-    // Establish a display name if not already given
-    if (!$data['Contact']['display_name'])
-      $data['Contact']['display_name'] =
-	(($data['Contact']['first_name'] &&
-	  $data['Contact']['last_name'])
-	 ? $data['Contact']['last_name'] . ', ' . $data['Contact']['first_name']
-	 : ($data['Contact']['first_name']
-	    ? $data['Contact']['first_name']
-	    : $data['Contact']['last_name']));
-
-    // Save the contact data
-    $this->create();
-    if ($id)
-      $this->id = $id;
-    if (!$this->save($data, false)) {
-      return false;
-    }
-    $id = $this->id;
-
-    // Remove all associated ContactMethods, as it ensures
-    // any entries deleted by the user actually get deleted
-    // in the system.  We'll recreate the needed ones anyway.
-    // REVISIT <AP>: 20090706
-    //  Appears that $this->save() is already doing the
-    //  delete.  I would have thought this would only happen
-    //  on a saveAll??
-/*     $this->ContactsMethod->deleteAll */
-/*       (array('contact_id' => $id), false); */
-
-    // At this point, since we've saved data to contact,
-    // we'll proceed forward as much as possible, even
-    // if we encounter an error.  For now, we'll assume
-    // the operation will succeed.
-    $ret = true;
-
-    // Iterate each type of contact method, adding them into
-    // the database as needed and associating with this contact.
-    foreach (array('phone', 'address', 'email') AS $type) {
-      $class = 'Contact' . ucfirst($type);
-      $enum = strtoupper($type);
-
-      // Nothing to do if this contact method isn't used
-      if (!isset($data[$class]))
-	continue;
-
-      // Go through each entry of this contact method
-      foreach ($data[$class] AS &$item) {
-
-	// If the user has entered all new data, we need to
-	// save that as a brand new entry.
-	if (!isset($item['id'])) {
-	  $I = new $class();
-	  $I->create();
-	  if (!$I->save($item, false)) {
-	    $ret = false;
-	    continue;
-	  }
-	  $item['id'] = $I->id;
-	}
-
-	// Update the ContactsMethod to reflect the appropriate IDs
-	$item['ContactsMethod']['contact_id'] = $id;
-	$item['ContactsMethod']['method_id'] = $item['id'];
-	$item['ContactsMethod']['method'] = $enum;
-
-	// Save the relationship between contact and phone/email/address
-	$CM = new ContactsMethod();
-	if (!$CM->save($item['ContactsMethod'], false)) {
-	  $ret = false;
-	}
-      }
-    }
-
-    // Return the result
-    return $ret;
-  }
-
-  function contactList() {
-    return $this->find('list',
-		       array('order' =>
-			     //array('last_name', 'first_name', 'middle_name'),
-			     array('display_name'),
-			     ));
-  }
-
-}
-?>

site/models/contact_address.php

@@ -1,46 +0,0 @@
-<?php
-class ContactAddress extends AppModel {
-
-	var $name = 'ContactAddress';
-	var $validate = array(
-		'id' => array('numeric'),
-		'postcode' => array('postal')
-	);
-
-	var $hasMany = array(
-		'ContactsMethod' => array(
-			'foreignKey' => 'method_id',
-			'conditions' => "method = 'ADDRESS'",
-		)
-	);
-
-	var $hasAndBelongsToMany = array(
-		'Contact' => array(
-			'className' => 'Contact',
-			'joinTable' => 'contacts_methods',
-			'foreignKey' => 'method_id',
-			'associationForeignKey' => 'contact_id',
-			'unique' => true,
-			'conditions' => "method = 'ADDRESS'",
-		)
-	);
-
-	function addressList() {
-		$results = $this->find('all',
-				       array('contain' => false,
-					     'fields' => array('id', 'address', 'city', 'state', 'postcode'),
-					     'order' => array('state', 'city', 'postcode', 'address')));
-
-		$list = array();
-		foreach ($results as $key => $val) {
-			$list[$val['ContactAddress']['id']]
-				= preg_replace("/\n/", ", ", $val['ContactAddress']['address'])
-				. ', ' . $val['ContactAddress']['city']
-				. ', ' . $val['ContactAddress']['state']
-				. ' ' . $val['ContactAddress']['postcode']
-				;
-		}
-		return $list;
-	}
-}
-?>

site/models/contact_phone.php

@@ -1,46 +0,0 @@
-<?php
-class ContactPhone extends AppModel {
-
-	var $validate = array(
-		'id' => array('numeric'),
-		//'type' => array('inlist'),
-		'phone' => array('phone'),
-		'ext' => array('numeric')
-	);
-
-	var $hasMany = array(
-		'ContactsMethod' => array(
-			'foreignKey' => 'method_id',
-			'conditions' => "method = 'PHONE'",
-		)
-	);
-
-	var $hasAndBelongsToMany = array(
-		'Contact' => array(
-			'className' => 'Contact',
-			'joinTable' => 'contacts_methods',
-			'foreignKey' => 'method_id',
-			'associationForeignKey' => 'contact_id',
-			'unique' => true,
-			'conditions' => "method = 'PHONE'",
-		)
-	);
-
-	function phoneList() {
-		$results = $this->find('all',
-				       array('contain' => false,
-					     'fields' => array('id', 'phone', 'ext'),
-					     'order' => array('phone', 'ext')));
-
-		App::Import('Helper', 'Format');
-		$list = array();
-		foreach ($results as $key => $val) {
-			$list[$val['ContactPhone']['id']]
-				= FormatHelper::phone($val['ContactPhone']['phone'],
-						      $val['ContactPhone']['ext']);
-		}
-		return $list;
-	}
-
-}
-?>

site/models/contacts_customer.php

@@ -1,11 +0,0 @@
-<?php
-class ContactsCustomer extends AppModel {
-	var $primaryKey = false;
-
-	var $belongsTo = array(
-		'Contact',
-		'Customer',
-	);
-
-}
-?>

site/models/contacts_method.php

@@ -1,25 +0,0 @@
-<?php
-class ContactsMethod extends AppModel {
-	var $primaryKey = false;
-
-	var $belongsTo = array(
-		'Contact',
-		'ContactAddress' => array(
-			'foreignKey' => 'method_id',
-			'conditions' => "method = 'ADDRESS'",
-			//'unique' => true,
-		),
-		'ContactPhone' => array(
-			'foreignKey' => 'method_id',
-			'conditions' => "method = 'PHONE'",
-			//'unique' => true,
-		),
-		'ContactEmail' => array(
-			'foreignKey' => 'method_id',
-			'conditions' => "method = 'EMAIL'",
-			//'unique' => true,
-		),
-	);
-
-}
-?>

site/models/customer.php

@@ -1,285 +0,0 @@
-<?php
-class Customer extends AppModel {
-
-	var $name = 'Customer';
-	var $validate = array(
-		'id' => array('numeric'),
-		'name' => array('notempty'),
-	);
-
-	var $belongsTo = array(
-		'PrimaryContact' => array(
-			'className' => 'Contact',
-		),
-	);
-
-	var $hasMany = array(
-		'CurrentLease' => array(
-			'className' => 'Lease',
-			'conditions' => 'CurrentLease.close_date IS NULL',
-		),
-		'Lease',
-		'LedgerEntry',
-		'ContactsCustomer',
-	);
-
-	var $hasAndBelongsToMany = array(
-		'Contact',
-		'Transaction' => array(
-			'joinTable' => 'ledger_entries',
-			'foreignKey' => 'customer_id',
-			'associationForeignKey' => 'transaction_id',
-		),
-	);
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: accountId
-   *  - Returns the account ID for the given customer
-   */
-  function accountId($id) {
-    $this->cacheQueries = true;
-    $customer = $this->find('first',
-			    array('contain' => false,
-				  'fields' => array('account_id'),
-				  'conditions' => array(array('Customer.id' => $id))));
-    $this->cacheQueries = false;
-
-    return $customer['Customer']['account_id'];
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: leaseIds
-   *  - Returns the lease IDs for the given customer
-   */
-  function leaseIds($id) {
-    $this->cacheQueries = true;
-    $customer = $this->find('first',
-			    array('contain' =>
-				  array('Lease' => array('fields' => array('id'))),
-				  'fields' => array(),
-				  'conditions' => array(array('Customer.id' => $id))));
-    $this->cacheQueries = false;
-
-    $ids = array();
-    foreach ($customer['Lease'] AS $lease)
-      $ids[] = $lease['id'];
-
-    return $ids;
-  }
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findSecurityDeposits
-   *  - Returns an array of security deposit entries
-   */
-  function findSecurityDeposits($id, $link = null) {
-/*     pr(array('function' => 'Customer::findSecurityDeposits', */
-/* 	     'args' => compact('id', 'link'), */
-/* 	     )); */
-
-    $A = new Account();
-    $entries = $A->findLedgerEntries
-      ($A->securityDepositAccountID(),
-       true, array('LedgerEntry.customer_id' => $id), $link);
-
-/*     pr(array('function' => 'Customer::findSecurityDeposits', */
-/* 	     'args' => compact('id', 'link'), */
-/* 	     'vars' => compact('customer'), */
-/* 	     'return' => compact('entries'), */
-/* 	     )); */
-
-    return $entries;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findUnreconciledLedgerEntries
-   *  - Returns ledger entries that are not yet reconciled
-   *    (such as charges not paid).
-   */
-
-  function findUnreconciledLedgerEntries($id = null, $fundamental_type = null) {
-    $A = new Account();
-    $unreconciled = $A->findUnreconciledLedgerEntries
-      ($A->accountReceivableAccountID(),
-       $fundamental_type,
-       array('LedgerEntry.customer_id' => $id));
-
-    return $unreconciled;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: reconcileNewLedgerEntry
-   *  - Returns which ledger entries a new credit/debit would
-   *    reconcile, and how much.
-   *
-   *  - REVISIT <AP> 20090617
-   *    This should be subject to different algorithms, such
-   *    as apply to oldest charges first, newest first, to fees
-   *    before rent, etc.  Until we get there, I'll hardcode
-   *    whatever algorithm is simplest.
-   */
-
-  function reconcileNewLedgerEntry($id, $fundamental_type, $amount) {
-    $A = new Account();
-    $reconciled = $A->reconcileNewLedgerEntry
-      ($A->accountReceivableAccountID(),
-       $fundamental_type,
-       $amount,
-       array('LedgerEntry.customer_id' => $id));
-
-    return $reconciled;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: details
-   *  - Returns detail information for the customer
-   */
-
-  function details($id = null) {
-    // Query the DB for need information.
-    $customer = $this->find
-      ('first', array
-       ('contain' => array
-	(// Models
-	 'Contact' =>
-	 array('order'  => array('Contact.display_name'),
-	       // Models
-	       'ContactPhone',
-	       'ContactEmail',
-	       'ContactAddress',
-	       ),
-	 'Lease' =>
-	 array('Unit' =>
-	       array('order'  => array('sort_order'),
-		     'fields' => array('id', 'name'),
-		     ),
-	       ),
-	 ),
-
-	'conditions' => array('Customer.id' => $id),
-	));
-
-    // Figure out the outstanding balance for this customer
-    $customer['stats'] = $this->stats($id);
-
-    // Figure out the total security deposit for the current lease.
-    $customer['deposits'] = $this->findSecurityDeposits($id);
-
-    return $customer;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: saveCustomer
-   *  - Saves the customer and related data
-   */
-
-  function saveCustomer($id, $data, $primary_contact_entry) {
-
-    // Go through each contact, and create new ones as needed
-    foreach ($data['Contact'] AS &$contact) {
-      if (isset($contact['id']))
-	continue;
-
-      $I = new Contact();
-      $I->create();
-      if (!$I->save($contact, false)) {
-	return false;
-      }
-      $contact['id'] = $I->id;
-    }
-
-    // Set the primary contact ID based on caller selection
-    $data['Customer']['primary_contact_id']
-      = $data['Contact'][$primary_contact_entry]['id'];
-
-    // Provide a default customer name if not specified
-    if (!$data['Customer']['name']) {
-      $this->Contact->recursive = -1;
-      $pcontact = $this->Contact->read(null, $data['Customer']['primary_contact_id']);
-      $data['Customer']['name'] = $pcontact['Contact']['display_name'];
-    }
-
-    // Save the customer data
-    $this->create();
-    if ($id)
-      $this->id = $id;
-    if (!$this->save($data, false)) {
-      return false;
-    }
-    $id = $this->id;
-
-    // Remove all associated Customer Contacts, as it ensures
-    // any entries deleted by the user actually get deleted
-    // in the system.  We'll recreate the needed ones anyway.
-    // REVISIT <AP>: 20090706
-    //  Appears that $this->save() is already doing the
-    //  delete.  I would have thought this would only happen
-    //  on a saveAll??
-/*     $this->ContactsCustomer->deleteAll */
-/*       (array('customer_id' => $id), false); */
-
-    // At this point, since we've saved data to customer,
-    // we'll proceed forward as much as possible, even
-    // if we encounter an error.  For now, we'll assume
-    // the operation will succeed.
-    $ret = true;
-
-    // Go through each entry of this customer method
-    foreach ($data['Contact'] AS &$contact) {
-      // Update the ContactsCustomer to reflect the appropriate IDs
-      $contact['ContactsCustomer']['customer_id'] = $id;
-      $contact['ContactsCustomer']['contact_id'] = $contact['id'];
-
-      // Save the relationship between customer and contact
-      $CM = new ContactsCustomer();
-      if (!$CM->save($contact['ContactsCustomer'], false)) {
-	$ret = false;
-      }
-    }
-
-    // Return the result
-    return $ret;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: stats
-   *  - Returns summary data from the requested customer.
-   */
-
-  function stats($id = null) {
-    if (!$id)
-      return null;
-
-    $A = new Account();
-    $stats = $A->stats($A->accountReceivableAccountID(), true,
-		       array('LedgerEntry.customer_id' => $id));
-
-    // Pull to the top level and return
-    $stats = $stats['Ledger'];
-    return $stats;
-  }
-
-}
-?>

site/models/lease.php

@@ -1,506 +0,0 @@
-<?php
-class Lease extends AppModel {
-
-	var $name = 'Lease';
-	var $validate = array(
-		'id' => array('numeric'),
-		'number' => array('alphanumeric'),
-		'lease_type_id' => array('numeric'),
-		'unit_id' => array('numeric'),
-		'late_schedule_id' => array('numeric'),
-		'lease_date' => array('date'),
-		'movein_planned_date' => array('date'),
-		'movein_date' => array('date'),
-		'moveout_date' => array('date'),
-		'moveout_planned_date' => array('date'),
-		'notice_given_date' => array('date'),
-		'notice_received_date' => array('date'),
-		'close_date' => array('date'),
-		'deposit' => array('money'),
-		'rent' => array('money'),
-		'next_rent' => array('money'),
-		'next_rent_date' => array('date')
-	);
-
-	var $belongsTo = array(
-		'LeaseType',
-		'Unit',
-		'Customer',
-		'LateSchedule',
-	);
-
-	var $hasMany = array(
-		'LedgerEntry',
-	);
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: accountId
-   *  - Returns the accountId of the given lease
-   */
-  function accountId($id) {
-    $A = new Account();
-    return $A->invoiceAccountID();
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findAccountEntries
-   *  - Returns an array of ledger entries from the account of the given
-   *    lease.
-   */
-  function findAccountEntries($id, $all = false, $cond = null, $link = null) {
-/*     pr(array('function' => 'Lease::findAccountEntries', */
-/* 	     'args' => compact('id', 'all', 'cond', 'link'), */
-/* 	     )); */
-
-    if (!isset($cond))
-      $cond = array();
-    $cond[] = array('LedgerEntry.lease_id' => $id);
-
-    $A = new Account();
-    $entries = $A->findLedgerEntries($this->accountId($id),
-				     $all, $cond, $link);
-
-/*     pr(array('function' => 'Lease::findAccountEntries', */
-/* 	     'args' => compact('id', 'all', 'cond', 'link'), */
-/* 	     'vars' => compact('lease'), */
-/* 	     'return' => compact('entries'), */
-/* 	     )); */
-    return $entries;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findSecurityDeposits
-   *  - Returns an array of security deposit entries
-   */
-  function findSecurityDeposits($id, $link = null) {
-/*     pr(array('function' => 'Lease::findSecurityDeposits', */
-/* 	     'args' => compact('id', 'link'), */
-/* 	     )); */
-
-    $A = new Account();
-    $entries = $A->findLedgerEntries
-      ($A->securityDepositAccountID(),
-       true, array('LedgerEntry.lease_id' => $id), $link);
-
-/*     pr(array('function' => 'Lease::findSecurityDeposits', */
-/* 	     'args' => compact('id', 'link'), */
-/* 	     'vars' => compact('lease'), */
-/* 	     'return' => compact('entries'), */
-/* 	     )); */
-    return $entries;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findUnreconciledLedgerEntries
-   *  - Returns ledger entries that are not yet reconciled
-   *    (such as charges not paid).
-   */
-
-  function findUnreconciledLedgerEntries($id = null, $fundamental_type = null) {
-    $A = new Account();
-    return $A->findUnreconciledLedgerEntries
-      ($this->accountId($id), $fundamental_type, array('LedgerEntry.lease_id' => $id));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: reconcileNewLedgerEntry
-   *  - Returns which ledger entries a new credit/debit would
-   *    reconcile, and how much.
-   *
-   *  - REVISIT <AP> 20090617
-   *    This should be subject to different algorithms, such
-   *    as apply to oldest charges first, newest first, to fees
-   *    before rent, etc.  Until we get there, I'll hardcode
-   *    whatever algorithm is simplest.
-   */
-
-  function reconcileNewLedgerEntry($id, $fundamental_type, $amount) {
-    $A = new Account();
-    return $A->reconcileNewLedgerEntry
-      ($this->accountId($id), $fundamental_type, $amount, array('LedgerEntry.lease_id' => $id));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: rentLastCharges
-   *  - Returns a list of rent charges from this lease that
-   *    do not have sequential followup charges.  Under normal
-   *    circumstances, there would only be one entry, which is
-   *    the most recent rent charge.  However, it's possible
-   *    that there are several, indicating a problem with lease.
-   */
-
-  function rentLastCharges($id) {
-    $A = new Account();
-    $entries = $this->find
-      ('all',
-       array('link' =>
-	     array(// Models
-		   'LedgerEntry' => array
-		   ('Ledger' => array
-		    ('fields' => array(),
-		     'Account' => array
-		     ('fields' => array(),
-		      'Ledger' => array
-		      ('alias' => 'Lx',
-		       'fields' => array(),
-		       'LedgerEntry' => array
-		       ('alias' => 'LEx',
-			'fields' => array(),
-			'conditions' => array
-			('LEx.effective_date = DATE_ADD(LedgerEntry.through_date, INTERVAL 1 day)',
-			 'LEx.lease_id = LedgerEntry.lease_id',
-			 )
-			),
-		       ),
-		      ),
-		     ),
-		    ),
-		   
-		   ),
-	     //'fields' => array('id', 'amount', 'effective_date', 'through_date'),
-	     'fields' => array(),
-	     'conditions' => array(array('Lease.id' => $id),
-				   array('Account.id' => $A->rentAccountID()),
-				   array('LEx.id' => null),
-				   ),
-	     )
-       );
-    return $entries;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: rentChargeGaps
-   *  - Checks for gaps in rent charges
-   */
-
-  function rentChargeGaps($id) {
-    $entries = $this->rentLastCharges($id);
-    if ($entries && count($entries) > 1)
-      return true;
-    return false;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: rentChargeThrough
-   *  - Determines the date that rent has been charged through
-   *    Returns one of:
-   *      null:   There are gaps in the charges
-   *      false:  There are not yet any charges
-   *      date:   The date rent has been charged through
-   */
-
-  function rentChargeThrough($id) {
-    $entries = $this->rentLastCharges($id);
-    if (!$entries)
-      return false;
-    if (count($entries) != 1)
-      return null;
-    return $entries[0]['LedgerEntry']['through_date'];
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: rentPaidThrough
-   *  - Determines the date of the first unpaid rent
-   */
-
-  function rentPaidThrough($id) {
-
-    // Income / Receipt / Money
-    //    debit: A/R       credit: Income  <-- this entry
-    //    debit: Receipt   credit: A/R     <-- ReceiptLedgerEntry, below
-    //    debit: Money     credit: Receipt <-- MoneyLedgerEntry, below
-
-    $query = array
-      ('link' => array
-       (
-	'CreditLedger' =>
-	array('fields' => array(),
-	      'Account' =>
-	      array('fields' => array(),
-		    ),
-	      ),
-
-	// We're searching for the Receipt<->A/R entries,
-	// which are debits on the A/R account.  Find the
-	// reconciling entries to that A/R debit.
-	'DebitReconciliationLedgerEntry' =>
-	array('alias' => 'ReceiptLedgerEntry',
-	      'fields' => array(),
-
-	      // Finally, the Money (Cash/Check/etc) Entry is the one
-	      // which reconciles our ReceiptLedgerEntry debit
-	      'DebitReconciliationLedgerEntry' =>
-	      array('alias' => 'MoneyLedgerEntry',
-		    'linkalias' => 'MoneyLedgerEntryR',
-		    'fields' => array('SUM(COALESCE(MoneyLedgerEntryR.amount,0)) AS paid'),
-		    ),
-	      ),
-	),
-
-       'fields' => array('LedgerEntry.amount',
-			 'DATE_SUB(LedgerEntry.effective_date, INTERVAL 1 DAY) AS paid_through',
-			 ),
-
-       'group' => 'LedgerEntry.id HAVING paid <> LedgerEntry.amount',
-
-       'conditions' => array(array('LedgerEntry.lease_id' => $id),
-			     array('Account.id' => $this->LedgerEntry->Ledger->Account->rentAccountID()),
-			     ),
-       'order' => array('LedgerEntry.effective_date',
-			),
-       );
-
-    $rent = $this->LedgerEntry->find('first', $query);
-    if ($rent)
-      return $rent[0]['paid_through'];
-
-    $query['fields'] = 'LedgerEntry.through_date';
-    $query['order'] = 'LedgerEntry.through_date DESC';
-    $query['group'] = 'LedgerEntry.id';
-    $rent = $this->LedgerEntry->find('first', $query);
-    if ($rent)
-      return $rent['LedgerEntry']['through_date'];
-
-    return null;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: moveIn
-   *  - Moves the specified customer into the specified lease
-   */
-
-  function moveIn($customer_id, $unit_id,
-		  $deposit = null, $rent = null,
-		  $stamp = null, $comment = null) {
-
-    $lt = $this->LeaseType->find('first',
-				 array('conditions' =>
-				       array('code' => 'SL')));
-
-    // Use NOW if not given a movein date
-    if (!isset($stamp))
-      $stamp = date('Y-m-d G:i:s');
-
-    if (!$comment)
-      $comment = null;
-
-    if (!isset($deposit) || !isset($rent)) {
-      $rates = $this->Unit->find
-	('first',
-	 array('contain' =>
-	       array('UnitSize' =>
-		     array('deposit', 'rent'),
-		     ),
-	       'fields' => array('deposit', 'rent'),
-	       'conditions' => array('Unit.id' => $unit_id),
-	       ));
-
-      $deposit =
-	(isset($deposit)
-	 ? $deposit
-	 : (isset($rates['Unit']['deposit'])
-	    ? $rates['Unit']['deposit']
-	    : (isset($rates['UnitSize']['deposit'])
-	       ? $rates['UnitSize']['deposit']
-	       : 0)));
-
-      $rent =
-	(isset($rent)
-	 ? $rent
-	 : (isset($rates['Unit']['rent'])
-	    ? $rates['Unit']['rent']
-	    : (isset($rates['UnitSize']['rent'])
-	       ? $rates['UnitSize']['rent']
-	       : 0)));
-    }
-      
-
-    // Save this new lease.
-    $this->create();
-    if (!$this->save(array('lease_type_id' => $lt['LeaseType']['id'],
-			   'unit_id' => $unit_id,
-			   'customer_id' => $customer_id,
-			   'lease_date' => $stamp,
-			   'movein_date' => $stamp,
-			   'deposit' => $deposit,
-			   'rent' => $rent,
-			   'comment' => $comment), false)) {
-      return null;
-    }
-
-    // Set the lease number to be the same as the lease ID
-    $this->id;
-    $this->saveField('number', $this->id);
-		      
-    // Update the unit status
-    $this->Unit->updateStatus($unit_id, 'OCCUPIED');
-
-    // REVISIT <AP>: 20090702
-    //   We need to assess the security deposit charge,
-    //   and probably rent as well.  Rent, however, will
-    //   require user parameters to indicate whether it
-    //   was waived, pro-rated, etc.
-
-    // Return the new lease ID
-    return $this->id;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: moveOut
-   *  - Moves the customer out of the specified lease
-   */
-
-  function moveOut($id, $status = 'VACANT',
-		   $stamp = null, $close = false) {
-    // Use NOW if not given a moveout date
-    if (!isset($stamp))
-      $stamp = date('Y-m-d G:i:s');
-
-    // Reset the data
-    $this->create();
-    $this->id = $id;
-
-    // Set the customer move-out date
-    $this->data['Lease']['moveout_date'] = $stamp;
-
-    // Save it!
-    $this->save($this->data, false);
-
-    // Close the lease, if so requested
-    if ($close)
-      $this->close($id, $stamp);
-
-    // Finally, update the unit status
-    $this->recursive = -1;
-    $this->read();
-    $this->Unit->updateStatus($this->data['Lease']['unit_id'], $status);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: close
-   *  - Closes the lease to further action
-   */
-
-  function close($id, $stamp = null) {
-    if (!$this->closeable($id))
-      return false;
-
-    // Reset the data
-    $this->create();
-    $this->id = $id;
-
-    // Use NOW if not given a moveout date
-    if (!isset($stamp))
-      $stamp = date('Y-m-d G:i:s');
-
-    // Set the close date
-    $this->data['Lease']['close_date'] = $stamp;
-
-    // Save it!
-    $this->save($this->data, false);
-    return true;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: closeable
-   *  - Indicates whether or not the lease can be closed
-   */
-
-  function closeable($id) {
-    $this->recursive = -1;
-    $this->read(null, $id);
-
-    // We can't close a lease that's still in use
-    if (!isset($this->data['Lease']['moveout_date']))
-      return false;
-
-    // We can't close a lease that's already closed
-    if (isset($this->data['Lease']['close_date']))
-      return false;
-
-    $deposits = $this->findSecurityDeposits($id);
-    $stats = $this->stats($id);
-
-    // A lease can only be closed if there are no outstanding
-    // security deposits, and if the account balance is zero.
-    if ($deposits['summary']['balance'] != 0 || $stats['balance'] != 0)
-      return false;
-
-    // Apparently this lease meets all the criteria!
-    return true;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: addCharge
-   *  - Adds an additional charge to the lease
-   */
-
-  function addCharge($id, $charge) {
-    
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: stats
-   *  - Returns summary data from the requested lease.
-   */
-
-  function stats($id = null) {
-    if (!$id)
-      return null;
-
-    $A = new Account();
-    $stats = $A->stats($A->accountReceivableAccountID(), true,
-		       array('LedgerEntry.lease_id' => $id));
-
-    // Pull to the top level and return
-    $stats = $stats['Ledger'];
-    return $stats;
-  }
-
-}
-?>

site/models/lease_type.php

@@ -1,15 +0,0 @@
-<?php
-class LeaseType extends AppModel {
-
-	var $name = 'LeaseType';
-	var $validate = array(
-		'id' => array('numeric'),
-		'name' => array('notempty')
-	);
-
-	var $hasMany = array(
-		'Lease',
-	);
-
-}
-?>

site/models/ledger.php

@@ -1,250 +0,0 @@
-<?php
-class Ledger extends AppModel {
-
-  var $name = 'Ledger';
-  var $validate = array(
-    'id' => array('numeric'),
-    'name' => array('notempty'),
-  );
-
-  var $belongsTo = array(
-    'Account',
-    'PriorLedger' => array('className' => 'Ledger'),
-    'Close',
-  );
-
-  var $hasMany = array(
-    'LedgerEntry' => array(
-      'foreignKey' => false,
-
-      // conditions will be used when JOINing tables
-      // (such as find with LinkableBehavior)
-      'conditions' => array('OR' =>
-			    array('LedgerEntry.debit_ledger_id = %{MODEL_ALIAS}.id',
-				  'LedgerEntry.credit_ledger_id = %{MODEL_ALIAS}.id')),
-
-      // finderQuery will be used when tables are put
-      // together across several querys, not with JOIN.
-      // (such as find with ContainableBehavior)
-      'finderQuery' => 'SELECT `LedgerEntry`.*
-                         FROM pmgr_ledger_entries AS `LedgerEntry`
-                         WHERE LedgerEntry.debit_ledger_id = ({$__cakeID__$})
-                            OR LedgerEntry.credit_ledger_id = ({$__cakeID__$})',
-
-      'counterQuery' => ''
-    ),
-    'DebitLedgerEntry' => array(
-      'className' => 'LedgerEntry',
-      'foreignKey' => 'debit_ledger_id',
-      'dependent' => false,
-    ),
-    'CreditLedgerEntry' => array(
-      'className' => 'LedgerEntry',
-      'foreignKey' => 'credit_ledger_id',
-      'dependent' => false,
-    ),
-  );
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: accountID
-   *  - Returns the account ID for the given ledger
-   */
-  function accountID($id) {
-    $this->cacheQueries = true;
-    $item = $this->find('first', array
-			('contain' => 'Account.id',
-			 'conditions' => array('Ledger.id' => $id),
-			 ));
-    $this->cacheQueries = false;
-    return $item['Account']['id'];
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: currentLedgerID
-   *  - Returns the current ledger ID of the account for the given ledger.
-   */
-  function currentLedgerID($id) {
-    return $this->Account->currentLedgerID($this->accountID($id));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: closeLedger
-   *  - Closes the current ledger, and returns a fresh one
-   */
-  function closeLedger($id, $close_id) {
-    $this->recursive = -1;
-
-    $stamp = date('Y-m-d G:i:s');
-    $this->id = $id;
-    $this->read();
-    $this->data['Ledger']['close_id'] = $close_id;
-    $this->save($this->data, false);
-
-    $stats = $this->stats($id);
-
-    $this->read();
-    $this->data['Ledger']['id'] = null;
-    $this->data['Ledger']['close_id'] = null;
-    $this->data['Ledger']['prior_ledger_id'] = $id;
-    $this->data['Ledger']['comment'] = null;
-    ++$this->data['Ledger']['sequence'];
-    $this->id = null;
-    $this->save($this->data, false);
-    //pr($this->data);
-
-    if ($stats['balance'] == 0)
-      return $this->id;
-
-    $this->read();
-    $ftype = $this->Account->fundamentalType($this->data['Ledger']['account_id']);
-    $otype = $this->Account->fundamentalOpposite($ftype);
-
-    // Create a transaction for balance transfer
-    $transaction = new Transaction();
-    $transaction->create();
-    if (!$transaction->save(array(), false)) {
-      return null;
-    }
-
-    // Create an entry to carry the balance forward
-    $carry_entry_data = array
-      ($ftype.'_ledger_id' => $this->id,
-       $otype.'_ledger_id' => $id,
-       'transaction_id' => $transaction->id,
-       'amount' => $stats['balance'],
-       'comment' => "Ledger Balance Forward",
-       );
-
-    $carry_entry = new LedgerEntry();
-    $carry_entry->create();
-    if (!$carry_entry->save($carry_entry_data, false)) {
-      return null;
-    }
-
-    return $this->id;
-    }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findLedgerEntries
-   *  - Returns an array of ledger entries that belong to a given
-   *    ledger. There is extra work done... see the LedgerEntry model.
-   */
-  function findLedgerEntries($id, $account_type = null, $cond = null, $link = null) {
-/*     pr(array('function' => 'Ledger::findLedgerEntries', */
-/* 	     'args' => compact('id', 'account_type', 'cond', 'link'), */
-/* 	     )); */
-
-    if (!isset($account_type)) {
-      $ledger = $this->find('first', array
-			    ('contain' => array
-			     ('Account' => array
-			      ('fields' => array('type'),
-			       ),
-			      ),
-			     'fields' => array(),
-			     'conditions' => array(array('Ledger.id' => $id)),
-			     ));
-      $account_type = $ledger['Account']['type'];
-    }
-
-    // If the requested entries are limited by date, we must calculate
-    // a balance forward, or the resulting balance will be thrown off.
-    //
-    // REVISIT <AP>: This obviously is more general than date.
-    //               As such, it will not work (or, only work if the
-    //               condition only manages to exclude the first parts
-    //               of the ledger, nothing in the middle or at the
-    //               end. For now, I'll just create an 'other' entry,
-    //               not necessarily a balance forward.
-
-    $bf = array();
-    if (0 && isset($cond)) {
-      //$date = '<NOT IMPLEMENTED>';
-      $stats = $this->stats($id, array('NOT' => array($cond)));
-      $bf = array(array(array('debit' => $stats['debits'],
-			      'credit' => $stats['credits'],
-			      'balance' => $stats['balance']),
-
-			'LedgerEntry' => array('id' => null,
-					       //'comment' => "Balance Forward from $date"),
-					       'comment' => "-- SUMMARY OF EXCLUDED ENTRIES --"),
-
-			'Transaction' => array('id' => null,
-					       //'stamp' => $date,
-					       'stamp' => null,
-					       'comment' => null),
-			));
-    }
-
-    $entries = $this->LedgerEntry->findInLedgerContext($id, $account_type, $cond, $link);
-/*     pr(array('function' => 'Ledger::findLedgerEntries', */
-/* 	     'args' => compact('id', 'account_type', 'cond', 'link'), */
-/* 	     'vars' => compact('ledger'), */
-/* 	     'return' => compact('entries'), */
-/* 	     )); */
-    return $entries;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: stats
-   *  - Returns summary data from the requested ledger.
-   */
-  function stats($id, $cond = null) {
-    if (!isset($cond))
-      $cond = array();
-    $cond[] = array('Ledger.id' => $id);
-
-    $stats = $this->find
-      ('first', array
-       ('link' =>
-	array(// Models
-	      'Account' => array('fields' => array()),
-	      //'LedgerEntry' => array('fields' => array()),
-	      'LedgerEntry' =>
-	      array('fields' => array(),
-		    'Transaction' => array('fields' => array('stamp')),
-		    ),
-	      ),
-	'fields' =>
-	array("SUM(IF(LedgerEntry.debit_ledger_id  = Ledger.id,
-                      LedgerEntry.amount, NULL)) AS debits",
-	      "SUM(IF(LedgerEntry.credit_ledger_id = Ledger.id,
-                      LedgerEntry.amount, NULL)) AS credits",
-	      "SUM(IF(Account.type IN ('ASSET', 'EXPENSE'),
-                      IF(LedgerEntry.debit_ledger_id  = Ledger.id, 1, -1),
-                      IF(LedgerEntry.credit_ledger_id = Ledger.id, 1, -1)
-                      ) * IF(LedgerEntry.amount, LedgerEntry.amount, 0)
-                   ) AS balance",
-	      "COUNT(LedgerEntry.id) AS entries"),
-	'conditions' => $cond,
-	'group' => 'Ledger.id',
-	));
-
-    // The fields are all tucked into the [0] index,
-    // and the rest of the array is useless (empty).
-    $stats = $stats[0];
-
-    // Make sure we have a non-null balance
-    if (!isset($stats['balance']))
-      $stats['balance'] = 0;
-
-    return $stats;
-  }
-
-}
-?>

site/models/ledger_entry.php

@@ -1,525 +0,0 @@
-<?php
-class LedgerEntry extends AppModel {
-
-	var $name = 'LedgerEntry';
-	var $validate = array(
-		'id' => array('numeric'),
-		'transaction_id' => array('numeric'),
-		'amount' => array('money')
-	);
-
-	var $hasMany = array(
-		'DebitReconciliation' => array(
-			'className' => 'Reconciliation',
-			'foreignKey' => 'debit_ledger_entry_id',
-		),
-		'CreditReconciliation' => array(
-			'className' => 'Reconciliation',
-			'foreignKey' => 'credit_ledger_entry_id',
-		),
-	);
-	var $belongsTo = array(
-		'MonetarySource',
-		'Transaction',
-		'Customer',
-		'Lease',
-
-		'DebitLedger' => array(
-			'className' => 'Ledger',
-			'foreignKey' => 'debit_ledger_id',
-		),
-		'CreditLedger' => array(
-			'className' => 'Ledger',
-			'foreignKey' => 'credit_ledger_id',
-		),
-
-		'Ledger' => array(
-			'foreignKey' => false,
-			// conditions will be used when JOINing tables
-			// (such as find with LinkableBehavior)
-			'conditions' => array('OR' =>
-			    array('%{MODEL_ALIAS}.debit_ledger_id  = Ledger.id',
-				  '%{MODEL_ALIAS}.credit_ledger_id = Ledger.id')),
-
-			// finderQuery will be used when tables are put
-			// together across several querys, not with JOIN.
-			// (such as find with ContainableBehavior)
-			'finderQuery' => 'NOT-IMPLEMENTED',
-
-			'counterQuery' => ''
-		),
-
-	);
-
-	var $hasAndBelongsToMany = array(
-		'DebitReconciliationLedgerEntry' => array(
-			'className' => 'LedgerEntry',
-			'joinTable' => 'reconciliations',
-			'foreignKey' => 'credit_ledger_entry_id',
-			'associationForeignKey' => 'debit_ledger_entry_id',
-		),
-		// STUPID CakePHP bug screws up when using Containable
-		// and CLASS contains CLASS.  This extra HABTM give the
-		// option of multiple depths on one CLASS, since there
-		// isn't an alias specification for Containable.
-		'DebitReconciliationLedgerEntry2' => array(
-			'className' => 'LedgerEntry',
-			'joinTable' => 'reconciliations',
-			'foreignKey' => 'credit_ledger_entry_id',
-			'associationForeignKey' => 'debit_ledger_entry_id',
-		),
-		'CreditReconciliationLedgerEntry' => array(
-			'className' => 'LedgerEntry',
-			'joinTable' => 'reconciliations',
-			'foreignKey' => 'debit_ledger_entry_id',
-			'associationForeignKey' => 'credit_ledger_entry_id',
-		),
-	);
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: conditionEntryAsCreditOrDebit
-   *  - returns the condition necessary to match a set of
-   *    Ledgers to all related LedgerEntries
-   */
-  function conditionEntryAsCreditOrDebit($ledger_ids) {
-    return array('OR' =>
-		 array(array('debit_ledger_id'  => $ledger_ids),
-		       array('credit_ledger_id' => $ledger_ids)));
-  }
-
-    
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: ledgerContext query helpers
-   *  - Returns parameters necessary to generate a query which
-   *    puts ledger entries into the context of a ledger.  Since
-   *    debit/credit depends on the account type, it is required
-   *    as an argument for each function to avoid having to
-   *    query the ledger/account to find it out.
-   */
-  function ledgerContextFields($ledger_id = null, $account_type = null) {
-    $fields = array('id', 'effective_date', 'through_date',
-		    'lease_id', 'customer_id', 'comment', 'amount');
-
-    if (isset($ledger_id)) {
-      $fields[] = ("IF(LedgerEntry.debit_ledger_id = $ledger_id," .
-		   "   LedgerEntry.amount, NULL) AS debit");
-      $fields[] = ("IF(LedgerEntry.credit_ledger_id = $ledger_id," .
-		   "   LedgerEntry.amount, NULL) AS credit");
-
-      if (isset($account_type)) {
-	if (in_array($account_type, array('ASSET', 'EXPENSE')))
-	  $ledger_type = 'debit';
-	else
-	  $ledger_type = 'credit';
-
-	$fields[] = ("(IF(LedgerEntry.{$ledger_type}_ledger_id = $ledger_id," .
-		     "    1, -1) * LedgerEntry.amount) AS balance");
-      }
-    }
-
-    return $fields;
-  }
-
-  function ledgerContextFields2($ledger_id = null, $account_id = null, $account_type = null) {
-    $fields = array('id', 'effective_date', 'through_date', 'comment', 'amount');
-
-    if (isset($ledger_id)) {
-      $fields[] = ("IF(LedgerEntry.debit_ledger_id = $ledger_id," .
-		   "   SUM(LedgerEntry.amount), NULL) AS debit");
-      $fields[] = ("IF(LedgerEntry.credit_ledger_id = $ledger_id," .
-		   "   SUM(LedgerEntry.amount), NULL) AS credit");
-
-      if (isset($account_id) || isset($account_type)) {
-	$Account = new Account();
-	$account_ftype = $Account->fundamentalType($account_id ? $account_id : $account_type);
-	$fields[] = ("(IF(LedgerEntry.{$account_ftype}_ledger_id = $ledger_id," .
-		     "    1, -1) * SUM(LedgerEntry.amount)) AS balance");
-      }
-    }
-    elseif (isset($account_id)) {
-      $fields[] = ("IF(DebitLedger.account_id = $account_id," .
-		   "   SUM(LedgerEntry.amount), NULL) AS debit");
-      $fields[] = ("IF(CreditLedger.account_id = $account_id," .
-		   "   SUM(LedgerEntry.amount), NULL) AS credit");
-
-      $Account = new Account();
-      $account_ftype = ucfirst($Account->fundamentalType($account_id));
-      $fields[] = ("(IF({$account_ftype}Ledger.account_id = $account_id," .
-		   "    1, -1) * SUM(LedgerEntry.amount)) AS balance");
-    }
-
-    return $fields;
-  }
-
-
-  function ledgerContextConditions($ledger_id, $account_type) {
-    if (isset($ledger_id)) {
-      return array
-	('OR' =>
-	 array(array('LedgerEntry.debit_ledger_id' => $ledger_id),
-	       array('LedgerEntry.credit_ledger_id' => $ledger_id)),
-	 );
-    }
-
-    return array();
-  }      
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findInLedgerContext
-   *  - Returns an array of ledger entries that belong to a given ledger.
-   *    There is extra logic to also figure out whether the ledger_entry
-   *    amount is either a credit, or a debit, depending on how it was
-   *    written into the ledger, as well as whether the amount increases or
-   *    decreases the balance depending on the particular account type of
-   *    the ledger.
-   */
-  function findInLedgerContext($ledger_id, $account_type, $cond = null, $link = null) {
-    if (!isset($link))
-      $link = array('Transaction');
-
-    if (!isset($cond))
-      $cond = array();
-
-    $fields = $this->ledgerContextFields($ledger_id, $account_type);
-    $cond[] = $this->ledgerContextConditions($ledger_id, $account_type);
-    $order  = array('Transaction.stamp');
-
-    $entries = $this->find
-      ('all',
-       array('link'       => $link,
-	     'fields'     => $fields,
-	     'conditions' => $cond,
-	     'order'      => $order,
-	     ));
-
-    return $entries;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findReconciledLedgerEntries
-   *  - Returns ledger entries that are reconciled to the given entry.
-   *    (such as payments towards a charge).
-   */
-
-  function findReconciledLedgerEntries($id = null, $fundamental_type = null) {
-    foreach (($fundamental_type
-	      ? array($fundamental_type)
-	      : array('debit', 'credit')) AS $fund) {
-      $ucfund = ucfirst($fund);
-      $reconciled[$fund]['entry'] = $this->find
-	('all', array
-	 ('link' => array
-	  ("ReconciliationLedgerEntry" => array
-	   ('class' => "{$ucfund}ReconciliationLedgerEntry",
-	    'fields' => array
-	    ('id',
-	     "COALESCE(SUM(Reconciliation.amount),0) AS 'reconciled'",
-	     "LedgerEntry.amount - COALESCE(SUM(Reconciliation.amount),0) AS 'balance'",
-	     ),
-	    ),
-	   ),
-	  'group' => ("ReconciliationLedgerEntry.id"),
-	  'conditions' => array('LedgerEntry.id' => $id),
-	  'fields' => array(),
-	  ));
-      //pr($reconciled);
-      $balance = 0;
-      foreach ($reconciled[$fund]['entry'] AS &$entry) {
-	$entry = array_merge($entry["ReconciliationLedgerEntry"], $entry[0]);
-	$balance += $entry['balance'];
-      }
-      $reconciled[$fund]['balance'] = $balance;
-    }
-
-    return $reconciled;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: reverse
-   *  - Reverses the ledger entry
-   */
-
-  function reverse1($id, $amount = null, $transaction_id = null, $rec_id = null) {
-/*     pr(array('LedgerEntry::reverse', */
-/* 	     compact('id', 'amount', 'transaction_id', 'rec_id'))); */
-
-    // Get the LedgerEntry and related fields
-    $entry = $this->find
-      ('first',
-       array('contain' => array('MonetarySource.id',
-				'Transaction.id',
-				'DebitLedger.id',
-				'DebitLedger.account_id',
-				'CreditLedger.id',
-				'CreditLedger.account_id',
-				'DebitReconciliationLedgerEntry'
-/* 				=> */
-/* 				array('DebitLedger.id', */
-/* 				      'DebitLedger.account_id', */
-/* 				      'CreditLedger.id', */
-/* 				      'CreditLedger.account_id', */
-/* 				      ) */
-				,
-				'CreditReconciliationLedgerEntry'
-/* 				=> */
-/* 				array('DebitLedger.id', */
-/* 				      'DebitLedger.account_id', */
-/* 				      'CreditLedger.id', */
-/* 				      'CreditLedger.account_id', */
-/* 				      ) */
-				,
-				'Customer.id',
-				'Lease.id',
-				),
-
-	     'fields' => array('LedgerEntry.*'),
-
-	     'conditions' => array(array('LedgerEntry.id' => $id),
-/* 				   array('NOT' => */
-/* 					 array('OR' =>  */
-/* 					       array(array('DebitReconciliationLedgerEntry.id' => $rec_id), */
-/* 						     array('CreditReconciliationLedgerEntry.id' => $rec_id), */
-/* 						     ), */
-/* 					       ), */
-/* 					 ), */
-				   ),
-	     ));
-    //pr($entry);
-
-    if (!isset($amount))
-      $amount = $entry['LedgerEntry']['amount'];
-
-    $A = new Account();
-
-    $ids = $this->Ledger->Account->postLedgerEntry
-      (array('transaction_id' => $transaction_id),
-       null,
-       array('debit_ledger_id' => $A->currentLedgerID($entry['CreditLedger']['account_id']),
-	     'credit_ledger_id' => $A->currentLedgerID($entry['DebitLedger']['account_id']),
-	     'effective_date' => $entry['LedgerEntry']['effective_date'],
-	     //'effective_date' => $entry['LedgerEntry']['effective_date'],
-	     'amount' => $amount,
-	     'lease_id' => $entry['Lease']['id'],
-	     'customer_id' => $entry['Customer']['id'],
-	     'comment' => "Reversal of Ledger Entry #{$id}",
-	     ),
-       array('debit' => array(array('LedgerEntry' => array('id' => $entry['LedgerEntry']['id'],
-							   'amount' => $amount,
-							   ))),
-	     'credit' => array(array('LedgerEntry' => array('id' => $entry['LedgerEntry']['id'],
-							    'amount' => $amount,
-							    ))),
-	     ));
-
-    if ($ids['error'])
-      return null;
-
-    $tid = $ids['transaction_id'];
-
-    pr(compact('entry'));
-      
-    foreach (array('Debit', 'Credit') AS $dc_type) {
-      foreach ($entry[$dc_type . 'ReconciliationLedgerEntry'] AS $RLE) {
-	pr(array('checkpoint' => "Reverse $dc_type LE",
-		 compact('id', 'rec_id', 'RLE')));
-	if ($RLE['id'] == $rec_id) {
-	  pr(array('checkpoint' => "Skipping Reverse $dc_type LE, due to rec_id",
-		   compact('id', 'RLE')));
-	  continue;
-	}
-
-	if (!$this->reverse($RLE['id'], $RLE['Reconciliation']['amount'], $tid, $id))
-	  $ids['error'] = true;
-	
-/* 	$rids = $this->Ledger->Account->postLedgerEntry */
-/* 	  (array('transaction_id' => $tid), */
-/* 	   null, */
-/* 	   array('debit_ledger_id' => $A->currentLedgerID($RLE['CreditLedger']['account_id']), */
-/* 		 'credit_ledger_id' => $A->currentLedgerID($RLE['DebitLedger']['account_id']), */
-/* 		 'effective_date' => $RLE['effective_date'], */
-/* 		 //'effective_date' => $RLE['effective_date'], */
-/* 		 'amount' => $RLE['Reconciliation']['amount'], */
-/* 		 'lease_id' => $entry['Lease']['id'], */
-/* 		 'customer_id' => $entry['Customer']['id'], */
-/* 		 'comment' => "Reversal of Ledger Entry #{$RLE['id']}", */
-/* 		 ), */
-/* 	   array('debit' => array(array('LedgerEntry' => array('id' => $RLE['id'], */
-/* 							       'amount' => $RLE['Reconciliation']['amount'], */
-/* 							       ))), */
-/* 		 'credit' => array(array('LedgerEntry' => array('id' => $RLE['id'], */
-/* 								'amount' => $RLE['Reconciliation']['amount'], */
-/* 								))), */
-/* 		 )); */
-
-/* 	if ($rids['error']) */
-/* 	  $ids['error'] = true; */
-      }
-    }
-
-    if ($ids['error'])
-      return null;
-
-    return $ids['id'];
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: reverse
-   *  - Reverses the charges
-   *
-   * SAMPLE MOVE IN w/ PRE PAYMENT
-   * DEPOSIT   RENT      A/R    RECEIPT   CHECK    PETTY    BANK
-   * -------  -------  -------  -------  -------  -------  -------
-   *    |25      |      25|        |        |        |        |    
-   *    |        |20    20|        |        |        |        |    
-   *    |        |20    20|        |        |        |        |    
-   *    |        |20    20|        |        |        |        |    
-   *    |        |        |25    25|        |        |        |     
-   *    |        |        |20    20|        |        |        |     
-   *    |        |        |20    20|        |        |        |     
-   *    |        |        |20    20|        |        |        |     
-   *    |        |        |        |85    85|        |        |     
-   *    |        |        |        |        |85      |      85|     
-
-   * MOVE OUT and REFUND FINAL MONTH
-   * DEPOSIT   RENT      C/P    RECEIPT   CHECK    PETTY    BANK
-   * -------  -------  -------  -------  -------  -------  -------
-   *  25|        |        |25      |        |        |        |    t20   e20a
-   *    |      20|        |20      |        |        |        |    t20   e20b
-
-   * -ONE REFUND CHECK-
-   *    |        |      25|        |25      |        |        |    t30   e30a
-   *    |        |      20|        |20      |        |        |    t30   e30b
-   *    |        |        |      45|        |        |        |45  t40   e40
-   * -OR MULTIPLE-
-   *    |        |      15|        |15      |        |        |    t50a  e50a
-   *    |        |        |      15|        |        |15      |    t60a  e60a
-   *    |        |      30|        |30      |        |        |    t50b  e50b
-   *    |        |        |      30|        |        |        |30  t60b  e60b
-   *    |        |        |        |        |        |        |     
-
-
-OPTION 1
-   *    |-25     |     -25|        |        |        |        |     
-   *    |        |-20  -20|        |        |        |        |     
-   *    |        |        |-25  -25|        |        |        |     
-   *    |        |        |-20  -20|        |        |        |     
-
-OPTION 2
-   *    |-25     |        |     -25|        |        |        |     
-   *    |        |-20     |     -20|        |        |        |     
-   *    |        |        |        |-15     |     -15|        |    
-   *    |        |        |        |-30     |        |     -30|    
-   *    |        |        |        |        |        |        |     
-   *
-   */
-  function reverse($ledger_entries, $stamp = null) {
-    pr(array('LedgerEntry::reverse',
-	     compact('ledger_entries', 'stamp')));
-
-    // If the user only wants to reverse one ID, we'll allow it
-    if (!is_array($ledger_entries))
-      $ledger_entries = $this->find
-	('all', array
-	 ('contain' => false,
-	  'conditions' => array('LedgerEntry.id' => $ledger_entries)));
-
-    $A = new Account();
-
-    $ar_account_id = $A->accountReceivableAccountID();
-    $receipt_account_id = $A->receiptAccountID();
-
-    $transaction_id = null;
-    foreach ($ledger_entries AS $entry) {
-      $entry = $entry['LedgerEntry'];
-      $amount = -1*$entry['amount'];
-
-      if (isset($entry['credit_account_id']))
-	$refund_account_id = $entry['credit_account_id'];
-      elseif (isset($entry['CreditLedger']['Account']['id']))
-	$refund_account_id = $entry['CreditLedger']['Account']['id'];
-      elseif (isset($entry['credit_ledger_id']))
-	$refund_account_id = $this->Ledger->accountID($entry['credit_ledger_id']);
-      else
-	return null;
-
-      // post new refund in the income account
-      $ids = $A->postLedgerEntry
-	(array('transaction_id' => $transaction_id),
-	 null,
-	 array('debit_ledger_id' => $A->currentLedgerID($ar_account_id),
-	       'credit_ledger_id' => $A->currentLedgerID($refund_account_id),
-	       'effective_date' => $entry['effective_date'],
-	       'through_date' => $entry['through_date'],
-	       'amount' => $amount,
-	       'lease_id' => $entry['lease_id'],
-	       'customer_id' => $entry['customer_id'],
-	       'comment' => "Refund; Entry #{$entry['id']}",
-	       ),
-	 array('debit'  => array
-	       (array('LedgerEntry' =>
-		      array('id' => $entry['id'],
-			    'amount' => $amount))),
-	       )
-	 );
-
-      if ($ids['error'])
-	return null;
-      $transaction_id = $ids['transaction_id'];
-      
-      pr(array('checkpoint' => 'Posted Refund Ledger Entry',
-	       compact('ids', 'amount', 'refund_account_id', 'ar_account_id')));
-    }
-
-    return true;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: stats
-   *  - Returns summary data from the requested ledger entry
-   */
-  function stats($id) {
-
-    $query = array
-      (
-       'fields' => array("SUM(Reconciliation.amount) AS 'reconciled'"),
-
-       'conditions' => array(isset($cond) ? $cond : array(),
-			     array('LedgerEntry.id' => $id)),
-
-       'group' => 'LedgerEntry.id',
-       );
-
-    // Get the applied amounts on the debit side
-    $query['link'] =
-      array('DebitReconciliationLedgerEntry' => array('alias' => 'DRLE', 'DRLETransaction' => array('class' => 'Transaction')));
-    $tmpstats = $this->find('first', $query);
-    $stats['debit_amount_reconciled'] = $tmpstats[0]['reconciled'];
-
-    // Get the applied amounts on the credit side
-    $query['link'] =
-      array('CreditReconciliationLedgerEntry' => array('alias' => 'CRLE', 'CRLETransaction' => array('class' => 'Transaction')));
-    $tmpstats = $this->find('first', $query);
-    $stats['credit_amount_reconciled'] = $tmpstats[0]['reconciled'];
-
-    return $stats;
-  }
-
-}

site/models/map.php

@@ -1,23 +0,0 @@
-<?php
-class Map extends AppModel {
-
-	var $name = 'Map';
-	var $validate = array(
-		'id' => array('numeric'),
-		'site_id' => array('numeric'),
-		'site_area_id' => array('numeric'),
-		'name' => array('notempty'),
-		'width' => array('numeric'),
-		'depth' => array('numeric')
-	);
-
-	var $belongsTo = array(
-		'SiteArea',
-	);
-
-	var $hasAndBelongsToMany = array(
-		'Unit',
-	);
-
-}
-?>

site/models/monetary_source.php

@@ -1,268 +0,0 @@
-<?php
-class MonetarySource extends AppModel {
-
-	var $name = 'MonetarySource';
-	var $validate = array(
-		'id' => array('numeric'),
-		'name' => array('notempty'),
-		'tillable' => array('boolean')
-	);
-
-	var $belongsTo = array(
-	);
-
-	var $hasMany = array(
-		'LedgerEntry',
-	);
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: nsf
-   *  - Flags the ledger entry as having insufficient funds
-   *  - NOTE: nsf only works if given the monetary source id
-   *          to transaction e3, below
-   *  - NOTE: In order to show that the rent formerly considered 
-   *          "collected" is now recognized in reverse, we must
-   *          credit A/R with a negative amount in order to
-   *          reconcile it against the Rent<->A/R ledger entry.
-   *
-   *   FEE     RENT      A/R    RECEIPT   CHECK     NSF     BANK
-   * -------  -------  -------  -------  -------  -------  -------
-   *    |        |30    30|        |        |        |        |     t1 e1a  : R e2/e7a  : 
-   *    |        |20    20|        |        |        |        |     t1 e1b  : R e2/e7b  : 
-   *    |        |        |        |        |        |        |     
-   *    |        |        |30    30|        |        |        |     t2 e2a  : R e3      : R e1a
-   *    |        |        |20    20|        |        |        |     t2 e2b  : R e3      : R e1b
-   *    |        |        |        |50    50|        |        |     t2 e3   : R e4      : R e2
-   *    |        |        |        |        |        |        |     
-   *    |        |        |        |        |50      |      50|     t3 e4   :           : R e3
-   *    |        |        |        |        |        |        |     
-   *    |        |        |        |        |        |-50  -50|     t4 e5   :           : R e6
-   *    |        |        |        |-50     |     -50|        |     t5 e6   : R e5      : R e7a/e7b
-   *    |        |        |-30  -30|        |        |        |     t6 e7a  : R e6      : R e1a
-   *    |        |        |-20  -20|        |        |        |     t6 e7b  : R e6      : R e1b
-   *    |35      |      35|        |        |        |        |     t6 e8
-   *
-   */
-
-  function nsf($id, $stamp = null) {
-    pr(array('MonetarySource::nsf',
-	     compact('id')));
-
-    $A = new Account();
-
-    // Get the LedgerEntries that use this monetary source
-    $source = $this->find
-      ('first',
-       array('contain' =>
-	     array(/* e3 */
-		   'LedgerEntry' =>
-		   array('Transaction.id',
-			 'MonetarySource.id',
-			 'Customer.id',
-			 'Lease.id',
-
-			 /* e3 debit */
-			 'DebitLedger' => /* e.g. CHECK Ledger */
-			 array('fields' => array(),
-			       
-			       'Account' => /* e.g. CHECK Account */
-			       array('fields' => array('id', 'name'),
-				     'conditions' =>
-				     array('Account.payable' => 1,
-					   'Account.type' => 'ASSET'),
-				     ),
-			       ),
-
-			 /* e3 credit */
-			 'CreditLedger' => /* i.e. RECEIPT Ledger */
-			 array('fields' => array('id'),
-			       'Account' => /* i.e. RECEIPT Account */
-			       array('fields' => array('id', 'name'),
-				     'conditions' =>
-				     array('Account.id' => $A->receiptAccountID()),
-				     ),
-			       ),
-
-			 /* e2 */
-			 'DebitReconciliationLedgerEntry' =>
-			 array(/* e2 credit */
-			       'CreditLedger' => /* i.e. A/R Ledger */
-			       array('fields' => array(),
-
-				     'Account' => /* i.e. A/R Account */
-				     array('fields' => array(),
-					   'conditions' =>
-					   array('Account.id' => $A->accountReceivableAccountID()),
-					   ),
-				     ),
-
-			       /* e1 */
-			       // STUPID CakePHP bug screws up CLASS contains CLASS.
-			       // Use the same class, but with different name.
-			       'DebitReconciliationLedgerEntry2',
-			       ),
-
-			 /* e4 */
-			 'CreditReconciliationLedgerEntry' =>
-			 array(/* e4 debit */
-			       'DebitLedger' => /* e.g. BANK Ledger */
-			       array('fields' => array('id'),
-				     'Account' => /* e.g. BANK Account */
-				     array('fields' => array('id', 'name'),
-					   'conditions' =>
-					   array('Account.depositable' => 1),
-					   ),
-				     ),
-			       ),
-			 ),
-		   ),
-
-	     'conditions' => array(array('MonetarySource.id' => $id)),
-	     ));
-    pr($source);
-
-    $nsf_account_id = $A->nsfAccountID();
-    $nsf_fee_account_id = $A->nsfChargeAccountID();
-    $ar_account_id = $A->accountReceivableAccountID();
-    $receipt_account_id = $A->receiptAccountID();
-
-    $t4_id = null;
-    $t5_id = null;
-    foreach ($source['LedgerEntry'] AS $e3) {
-      // We expect only a single e4 entry
-      $e4 = $e3['CreditReconciliationLedgerEntry'];
-      if (count($e4) < 1)
-	continue;
-      if (count($e4) > 1)
-	die('Too many e4 entries');
-
-      // Pullup e4 from the single member array
-      $e4 = $e4[0];
-
-      // e3 amount
-      $amount = -$e3['amount'];
-
-      // e4 account
-      $bank_account_id = $e4['DebitLedger']['account_id'];
-
-      // post new e5
-      $e5_ids = $A->postLedgerEntry
-	(array('transaction_id' => $t4_id),
-	 null,
-	 array('debit_ledger_id' => $A->currentLedgerID($bank_account_id),
-	       'credit_ledger_id' => $A->currentLedgerID($nsf_account_id),
-	       'effective_date' => $stamp,
-	       'amount' => $amount,
-	       'lease_id' => $e3['lease_id'],
-	       'customer_id' => $e3['customer_id'],
-	       'comment' => "NSF Bank Reversal; Monetary Source #{$id}",
-	       )
-	 );
-
-      if ($e5_ids['error'])
-	return null;
-      $t4_id = $e5_ids['transaction_id'];
-      
-      pr(array('checkpoint' => 'Posted Ledger Entry e5',
-	       compact('e5_ids', 'amount')));
-
-      // post new e6... this will be our crossover point
-      // from typical positive entries to negative entries.
-      // Therefore, no reconciliation on this account.
-      $e6_ids = $A->postLedgerEntry
-	(array('transaction_id' => $t5_id),
-	 array('monetary_source_id' => $e3['monetary_source_id']),
-	 array('debit_ledger_id' => $A->currentLedgerID($nsf_account_id),
-	       'credit_ledger_id' => $A->currentLedgerID($receipt_account_id),
-	       'effective_date' => $stamp,
-	       'amount' => $amount,
-	       'lease_id' => $e3['lease_id'],
-	       'customer_id' => $e3['customer_id'],
-	       'comment' => "NSF tracker; Monetary Source #{$id}",
-	       ),
-	 array('debit'  => array
-	       (array('LedgerEntry' =>
-		      array('id' => $e5_ids['id'],
-			    'amount' => $amount))),
-	       )
-	 );
-
-      if ($e6_ids['error'])
-	return null;
-      $t5_id = $e6_ids['transaction_id'];
-      
-      pr(array('checkpoint' => 'Posted Ledger Entry e6',
-	       compact('e6_ids', 'amount')));
-
-      $t6_id = null;
-      foreach ($e3['DebitReconciliationLedgerEntry'] AS $e2) {
-	foreach ($e2['DebitReconciliationLedgerEntry2'] AS $e1) {
-	  $amount = -1*$e1['Reconciliation']['amount'];
-
-	  // post new e7
-	  $e7_ids = $A->postLedgerEntry
-	    (array('transaction_id' => $t6_id),
-	     null,
-	     array('debit_ledger_id' => $A->currentLedgerID($receipt_account_id),
-		   'credit_ledger_id' => $A->currentLedgerID($ar_account_id),
-		   'effective_date' => $stamp,
-		   'amount' => $amount,
-		   'lease_id' => $e1['lease_id'],
-		   'customer_id' => $e1['customer_id'],
-		   'comment' => "NSF Receipt; Monetary Source #{$id}",
-		   ),
-	     array('debit'  => array
-		   (array('LedgerEntry' =>
-			  array('id' => $e6_ids['id'],
-				'amount' => $amount))),
-
-		   'credit' => array
-		   (array('LedgerEntry' =>
-			  array('id' => $e1['id'],
-				'amount' => $amount))),
-		   )
-	     );
-
-	  if ($e7_ids['error'])
-	    return null;
-	  $t6_id = $e7_ids['transaction_id'];
-
-	  pr(array('checkpoint' => 'Posted Ledger Entry e7',
-		   compact('e7_ids', 'amount')));
-	}
-      }
-    }
-
-    // Cheat for now
-    $customer_id = $source['LedgerEntry'][0]['customer_id'];
-    $lease_id = null;
-
-    // post new e8
-    $e8_ids = $A->postLedgerEntry
-      (array('transaction_id' => $t6_id),
-       null,
-       array('debit_ledger_id' => $A->currentLedgerID($ar_account_id),
-	     'credit_ledger_id' => $A->currentLedgerID($nsf_fee_account_id),
-	     'effective_date' => $stamp,
-	     'amount' => 35,
-	     'lease_id' => $lease_id,
-	     'customer_id' => $customer_id,
-	     'comment' => "NSF Fee; Monetary Source #{$id}",
-	     )
-       );
-
-    if ($e8_ids['error'])
-      return null;
-
-    pr(array('checkpoint' => 'Posted Ledger Entry e8',
-	     compact('e8_ids')));
-
-    return true;
-  }
-
-
-}
-?>

site/models/reconciliation.php

@@ -1,15 +0,0 @@
-<?php
-class Reconciliation extends AppModel {
-
-	var $belongsTo = array(
-		'DebitLedgerEntry' => array(
-			'className' => 'LedgerEntry',
-			//'foreignKey' => 'credit_ledger_entry_id',
-		),
-		'CreditLedgerEntry' => array(
-			'className' => 'LedgerEntry',
-			//'foreignKey' => 'credit_ledger_entry_id',
-		),
-	);
-
-}

site/models/site.php

@@ -1,16 +0,0 @@
-<?php
-class Site extends AppModel {
-
-	var $name = 'Site';
-	var $validate = array(
-		'id' => array('numeric'),
-		'name' => array('notempty')
-	);
-
-	var $hasMany = array(
-		'SiteArea',
-		'SiteOption',
-	);
-
-}
-?>

site/models/site_area.php

@@ -1,20 +0,0 @@
-<?php
-class SiteArea extends AppModel {
-
-	var $name = 'SiteArea';
-	var $validate = array(
-		'id' => array('numeric'),
-		'site_id' => array('numeric'),
-		'name' => array('notempty')
-	);
-
-	var $belongsTo = array(
-		'Site',
-	);
-
-	var $hasOne = array(
-		'Map',
-	);
-
-}
-?>

site/models/transaction.php

@@ -1,108 +0,0 @@
-<?php
-class Transaction extends AppModel {
-
-	var $name = 'Transaction';
-
-	var $validate = array(
-		'stamp' => array('date')
-	);
-
-	var $belongsTo = array(
-	);
-
-	var $hasMany = array(
-		'LedgerEntry',
-	);
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: addInvoice
-   *  - Adds a new invoice transaction
-   */
-
-  function addInvoice($data, $customer_id, $lease_id = null) {
-    // Create some models for convenience
-    $A = new Account();
-
-    //pr(compact('data', 'customer_id', 'lease_id'));
-
-    // Assume this will succeed
-    $ret = true;
-
-    // Determine the total charges on the invoice
-    $grand_total = 0;
-    foreach ($data['LedgerEntry'] AS $entry)
-      $grand_total += $entry['amount'];
-
-    // Go through the entered charges
-    $invoice_transaction = array_intersect_key($data, array('Transaction'=>1, 'transaction_id'=>1));
-    foreach ($data['LedgerEntry'] AS $entry) {
-      //pr(compact('entry'));
-      // Create the receipt entry, and reconcile the credit side
-      // of the double-entry (which should be A/R) as a payment.
-      $ids = $this->LedgerEntry->Ledger->Account->postLedgerEntry
-	($invoice_transaction,
-	 array_intersect_key($entry, array('MonetarySource'=>1))
-	 + array_intersect_key($entry, array('account_id'=>1)),
-	 array('debit_ledger_id' => $A->currentLedgerID($A->accountReceivableAccountID()),
-	       'credit_ledger_id' => $A->currentLedgerID($entry['account_id']),
-	       'customer_id' => $customer_id,
-	       'lease_id' => $lease_id)
-	 + $entry
-	 );
-
-      if ($ids['error'])
-	$ret = false;
-
-      $invoice_transaction = array_intersect_key($ids, array('transaction_id'=>1));
-    }
-
-    return $ret;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: addReceipt
-   *  - Adds a new receipt transaction
-   */
-
-  function addReceipt($data, $customer_id, $lease_id = null) {
-    // Create some models for convenience
-    $A = new Account();
-
-    // Assume this will succeed
-    $ret = true;
-
-    // Go through the entered payments
-    $receipt_transaction = array_intersect_key($data, array('Transaction'=>1, 'transaction_id'=>1));
-    foreach ($data['LedgerEntry'] 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->LedgerEntry->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;
-
-      $receipt_transaction = array_intersect_key($ids,
-						 array('transaction_id'=>1,
-						       'split_transaction_id'=>1));
-    }
-
-    return $ret;
-  }
-
-}
-?>

site/models/unit.php

@@ -1,119 +0,0 @@
-<?php
-class Unit extends AppModel {
-
-	var $name = 'Unit';
-	var $validate = array(
-		'id' => array('numeric'),
-		'unit_size_id' => array('numeric'),
-		'name' => array('notempty'),
-		'sort_order' => array('numeric'),
-		'walk_order' => array('numeric'),
-		'deposit' => array('money'),
-		'amount' => array('money')
-	);
-
-	var $belongsTo = array(
-		'UnitSize',
-	);
-
-	var $hasOne = array(
-		'CurrentLease' => array(
-			'className' => 'Lease',
-			'conditions' => 'CurrentLease.moveout_date IS NULL',
-		),
-	);
-
-	var $hasMany = array(
-		'Lease',
-	);
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * helpers: status enumerations
-   */
-
-  function statusEnums() {
-    static $status_enums;
-    if (!isset($status_enums))
-      $status_enums = $this->getEnumValues('status');
-    return $status_enums;
-  }
-
-  function activeStatusEnums() {
-    return array_diff_key($this->statusEnums(), array(''=>1, 'DELETED'=>1));
-  }
-
-  function statusValue($enum) {
-    $enums = $this->statusEnums();
-    return $enums[$enum];
-  }
-
-  function occupiedEnumValue() {
-    return statusValue('OCCUPIED');
-  }
-
-  function conditionOccupied() {
-    return ('Unit.status >= ' . $this->statusValue('OCCUPIED'));
-  }
-
-  function conditionVacant() {
-    return ('Unit.status BETWEEN ' .
-      ($this->statusValue('UNAVAILABLE')+1) .
-      ' AND ' .
-      ($this->statusValue('OCCUPIED')-1));
-  }
-
-  function conditionUnavailable() {
-    return ('Unit.status <= ' . $this->statusValue('UNAVAILABLE'));
-  }
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: updateStatus
-   *  - Update the given unit to the given status
-   */
-  function updateStatus($id, $status) {
-    $this->id = $id;
-    //pr(compact('id', 'status'));
-    $this->saveField('status', $status);
-  }
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: stats
-   *  - Returns summary data from the requested customer.
-   */
-
-  function stats($id = null) {
-    if (!$id)
-      return null;
-
-    // Get the basic information necessary
-    $unit = $this->find('first',
-			array('contain' => array
-			      ('Lease' => array
-			       ('fields' => array('Lease.id')),
-
-			       'CurrentLease' => array
-			       ('fields' => array('CurrentLease.id'))),
-
-			      'conditions' => array
-			      (array('Unit.id' => $id)),
-			      ));
-
-    // Get the stats for the current lease
-    $stats['CurrentLease'] = $this->Lease->stats($unit['CurrentLease']['id']);
-
-    // Sum the stats for all leases together
-    foreach ($unit['Lease'] AS $lease) {
-      $this->statsMerge($stats['Lease'], $this->Lease->stats($lease['id']));
-    }
-
-    // Return the collection
-    return $stats;
-  }
-
-}

site/models/unit_size.php

@@ -1,25 +0,0 @@
-<?php
-class UnitSize extends AppModel {
-
-	var $name = 'UnitSize';
-	var $validate = array(
-		'id' => array('numeric'),
-		'unit_type_id' => array('numeric'),
-		'code' => array('notempty'),
-		'name' => array('notempty'),
-		'width' => array('numeric'),
-		'depth' => array('numeric'),
-		'deposit' => array('money'),
-		'amount' => array('money')
-	);
-
-	var $belongsTo = array(
-		'UnitType',
-	);
-
-	var $hasMany = array(
-		'Unit',
-	);
-
-}
-?>

site/models/unit_type.php

@@ -1,16 +0,0 @@
-<?php
-class UnitType extends AppModel {
-
-	var $name = 'UnitType';
-	var $validate = array(
-		'id' => array('numeric'),
-		'code' => array('notempty'),
-		'name' => array('notempty')
-	);
-
-	var $hasMany = array(
-		'UnitSize',
-	);
-
-}
-?>

site/plugins/debug_kit/README

@@ -1,5 +0,0 @@
-To install copy the debug_kit directory to the plugins folder and include the toolbar component in your app_controller.php:
-
-$components = array('DebugKit.Toolbar');
-
-+ Set debug mode to at least 1.

site/plugins/debug_kit/controllers/components/toolbar.php

@@ -1,471 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * DebugKit DebugToolbar Component
- *
- *
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright 2006-2008, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.
- * @since         CakePHP v 1.2.0.4487
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-class ToolbarComponent extends Object {
-/**
- * Controller instance reference
- *
- * @var object
- */
-	var $controller;
-/**
- * Components used by DebugToolbar
- *
- * @var array
- */
-	var $components = array('RequestHandler');
-/**
- * The default panels the toolbar uses.
- * which panels are used can be configured when attaching the component
- *
- * @var array
- */
-	var $_defaultPanels = array('session', 'request', 'sqlLog', 'timer', 'log', 'memory', 'variables');
-/**
- * Loaded panel objects.
- *
- * @var array
- */
-	var $panels = array();
-
-/**
- * fallback for javascript settings
- *
- * @var array
- **/
-	var $_defaultJavascript = array(
-		'behavior' => '/debug_kit/js/js_debug_toolbar'
-	);
-/**
- * javascript files component will be using.
- *
- * @var array
- **/
-	var $javascript = array();
-/**
- * initialize
- *
- * If debug is off the component will be disabled and not do any further time tracking
- * or load the toolbar helper.
- *
- * @return bool
- **/
-	function initialize(&$controller, $settings) {
-		if (Configure::read('debug') == 0) {
-			$this->enabled = false;
-			return false;
-		}
-		App::import('Vendor', 'DebugKit.DebugKitDebugger');
-		
-		DebugKitDebugger::startTimer('componentInit', __('Component initialization and startup', true));
-		if (!isset($settings['panels'])) {
-			$settings['panels'] = $this->_defaultPanels;
-		}
-
-		if (isset($settings['javascript'])) {
-			$settings['javascript'] = $this->_setJavascript($settings['javascript']);
-		} else {
-			$settings['javascript'] = $this->_defaultJavascript;
-		}
-		$this->_loadPanels($settings['panels']);
-		unset($settings['panels']);
-		
-		$this->_set($settings);
-		$this->controller =& $controller;
-		return false;
-	}
-
-/**
- * Component Startup
- *
- * @return bool
- **/
-	function startup(&$controller) {
-		$currentViewClass = $controller->view;
-		$this->_makeViewClass($currentViewClass);
-		$controller->view = 'DebugKit.Debug';
-		if (!isset($controller->params['url']['ext']) || (isset($controller->params['url']['ext']) && $controller->params['url']['ext'] == 'html')) {
-			$format = 'Html';
-		} else {
-			$format = 'FirePhp';
-		}
-		$controller->helpers['DebugKit.Toolbar'] = array('output' => sprintf('DebugKit.%sToolbar', $format));
-		$panels = array_keys($this->panels);
-		foreach ($panels as $panelName) {
-			$this->panels[$panelName]->startup($controller);
-		}
-		DebugKitDebugger::stopTimer('componentInit');
-		DebugKitDebugger::startTimer('controllerAction', __('Controller Action', true));
-	}
-/**
- * beforeRender callback
- *
- * Calls beforeRender on all the panels and set the aggregate to the controller.
- *
- * @return void
- **/
-	function beforeRender(&$controller) {
-		DebugKitDebugger::stopTimer('controllerAction');
-		$vars = array();
-		$panels = array_keys($this->panels);
-
-		foreach ($panels as $panelName) {
-			$panel =& $this->panels[$panelName];
-			$vars[$panelName]['content'] = $panel->beforeRender($controller);
-			$elementName = Inflector::underscore($panelName) . '_panel';
-			if (isset($panel->elementName)) {
-				$elementName = $panel->elementName;
-			}
-			$vars[$panelName]['elementName'] = $elementName;
-			$vars[$panelName]['plugin'] = $panel->plugin;
-			$vars[$panelName]['disableTimer'] = true;
-		}
-
-		$controller->set(array('debugToolbarPanels' => $vars, 'debugToolbarJavascript' => $this->javascript));
-		DebugKitDebugger::startTimer('controllerRender', __('Render Controller Action', true));
-	}
-
-/**
- * Load Panels used in the debug toolbar
- *
- * @return 	void
- * @access protected
- **/
-	function _loadPanels($panels) {
-		foreach ($panels as $panel) {
-			$className = $panel . 'Panel';
-			if (!class_exists($className) && !App::import('Vendor',  $className)) {
-				trigger_error(sprintf(__('Could not load DebugToolbar panel %s', true), $panel), E_USER_WARNING);
-				continue;
-			}
-			$panelObj =& new $className();
-			if (is_subclass_of($panelObj, 'DebugPanel') || is_subclass_of($panelObj, 'debugpanel')) {
-				$this->panels[$panel] =& $panelObj;
-			}
-		}
-	}
-
-/**
- * Set the javascript to user scripts.
- *
- * Set either script key to false to exclude it from the rendered layout.
- *
- * @param array $scripts Javascript config information
- * @return array
- * @access protected
- **/
-	function _setJavascript($scripts) {
-		$behavior = false;
-		if (!is_array($scripts)) {
-			$scripts = (array)$scripts;
-		}
-		if (isset($scripts[0])) {
-			$behavior = $scripts[0];
-		}
-		if (isset($scripts['behavior'])) {
-			$behavior = $scripts['behavior'];
-		}
-		if (!$behavior) {
-			return array();
-		} elseif ($behavior === true) {
-			$behavior = 'js';
-		}
-		if (strpos($behavior, '/') !== 0) {
-			$behavior .= '_debug_toolbar';
-		}
-		$pluginFile = APP . 'plugins' . DS . 'debug_kit' . DS . 'vendors' . DS . 'js' . DS . $behavior . '.js';
-		if (file_exists($pluginFile)) {
-			$behavior = '/debug_kit/js/' . $behavior . '.js';
-		}
-		return compact('behavior');
-	}
-/**
- * Makes the DoppleGangerView class if it doesn't already exist.
- * This allows DebugView to be compatible with all view classes.
- *
- * @param string $baseClassName 
- * @access protected
- * @return void
- */
-	function _makeViewClass($baseClassName) {
-		if (!class_exists('DoppelGangerView')) {
-			App::import('View', $baseClassName);
-			if (strpos('View', $baseClassName) === false) {
-				$baseClassName .= 'View';
-			}
-			$class = "class DoppelGangerView extends $baseClassName {}";
-			eval($class);
-		}
-	}
-}
-
-/**
- * Debug Panel
- *
- * Abstract class for debug panels.
- *
- * @package       cake.debug_kit
- */
-class DebugPanel extends Object {
-/**
- * Defines which plugin this panel is from so the element can be located.
- *
- * @var string
- */
-	var $plugin = null;
-/**
- * startup the panel
- *
- * Pull information from the controller / request
- *
- * @param object $controller Controller reference.
- * @return void
- **/
-	function startup(&$controller) { }
-
-/**
- * Prepare output vars before Controller Rendering.
- *
- * @param object $controller Controller reference.
- * @return void
- **/
-	function beforeRender(&$controller) { }
-}
-
-/**
- * Variables Panel
- *
- * Provides debug information on the View variables.
- *
- * @package       cake.debug_kit.panels
- **/
-class VariablesPanel extends DebugPanel {
-	var $plugin = 'debug_kit';
-}
-
-/**
- * Session Panel
- *
- * Provides debug information on the Session contents.
- *
- * @package       cake.debug_kit.panels
- **/
-class SessionPanel extends DebugPanel {
-	var $plugin = 'debug_kit';
-/**
- * beforeRender callback
- *
- * @param object $controller
- * @access public
- * @return array
- */
-	function beforeRender(&$controller) {
-		return $controller->Session->read();
-	}
-}
-
-/**
- * Request Panel
- *
- * Provides debug information on the Current request params.
- *
- * @package       cake.debug_kit.panels
- **/
-class RequestPanel extends DebugPanel {
-	var $plugin = 'debug_kit';
-/**
- * beforeRender callback - grabs request params
- *
- * @return array
- **/
-	function beforeRender(&$controller) {
-		$out = array();
-		$out['params'] = $controller->params;
-		if (isset($controller->Cookie)) {
-			$out['cookie'] = $controller->Cookie->read();
-		}
-		$out['get'] = $_GET;
-		$out['currentRoute'] = Router::currentRoute();
-		return $out;
-	}
-}
-
-/**
- * Timer Panel
- *
- * Provides debug information on all timers used in a request.
- *
- * @package       cake.debug_kit.panels
- **/
-class TimerPanel extends DebugPanel {
-	var $plugin = 'debug_kit';
-/**
- * startup - add in necessary helpers
- *
- * @return void
- **/
-	function startup(&$controller) {
-		if (!in_array('Number', $controller->helpers)) {
-			$controller->helpers[] = 'Number';
-		}
-	}
-}
-
-/**
- * Memory Panel
- *
- * Provides debug information on the memory consumption.
- *
- * @package       cake.debug_kit.panels
- **/
-class MemoryPanel extends DebugPanel {
-	var $plugin = 'debug_kit';
-/**
- * startup - add in necessary helpers
- *
- * @return void
- **/
-	function startup(&$controller) {
-		if (!in_array('Number', $controller->helpers)) {
-			$controller->helpers[] = 'Number';
-		}
-	}
-}
-
-/**
- * sqlLog Panel
- *
- * Provides debug information on the SQL logs and provides links to an ajax explain interface.
- *
- * @package       cake.debug_kit.panels
- **/
-class sqlLogPanel extends DebugPanel {
-	var $plugin = 'debug_kit';
-
-	var $dbConfigs = array();
-/**
- * get db configs.
- *
- * @param string $controller
- * @access public
- * @return void
- */
-	function startUp(&$controller) {
-		if (!class_exists('ConnectionManager')) {
-			$this->dbConfigs = array();
-			return false;
-		}
-		$this->dbConfigs = ConnectionManager::sourceList();
-		return true;
-	}
-/**
- * Get Sql Logs for each DB config
- *
- * @param string $controller
- * @access public
- * @return void
- */
-	function beforeRender(&$controller) {
-		$queryLogs = array();
-		if (!class_exists('ConnectionManager')) {
-			return array();
-		}
-		foreach ($this->dbConfigs as $configName) {
-			$db =& ConnectionManager::getDataSource($configName);
-			if ($db->isInterfaceSupported('showLog')) {
-				ob_start();
-				$db->showLog();
-				$queryLogs[$configName] = ob_get_clean();
-			}
-		}
-		return $queryLogs;
-	}
-}
-
-/**
- * Log Panel - Reads log entries made this request.
- *
- * @package       cake.debug_kit.panels
- */
-class LogPanel extends DebugPanel {
-	var $plugin = 'debug_kit';
-/**
- * Log files to scan
- *
- * @var array
- */
-	var $logFiles = array('error.log', 'debug.log');
-/**
- * startup
- *
- * @return void
- **/
-	function startup(&$controller) {
-		if (!class_exists('CakeLog')) {
-			App::import('Core', 'Log');
-		}
-	}
-/**
- * beforeRender Callback
- *
- * @return array
- **/
-	function beforeRender(&$controller) {
-		$this->startTime = DebugKitDebugger::requestStartTime();
-		$this->currentTime = DebugKitDebugger::requestTime();
-		$out = array();
-		foreach ($this->logFiles as $log) {
-			$file = LOGS . $log;
-			if (!file_exists($file)) {
-				continue;
-			}
-			$out[$log] = $this->_parseFile($file);
-		}
-		return $out;
-	}
-/**
- * parse a log file and find the relevant entries
- *
- * @param string $filename Name of file to read
- * @access protected
- * @return array
- */
-	function _parseFile($filename) {
-		$file =& new File($filename);
-		$contents = $file->read();
-		$timePattern = '/(\d{4}-\d{2}\-\d{2}\s\d{1,2}\:\d{1,2}\:\d{1,2})/';
-		$chunks = preg_split($timePattern, $contents, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-		for ($i = 0, $len = count($chunks); $i < $len; $i += 2) {
-			if (strtotime($chunks[$i]) < $this->startTime) {
-				unset($chunks[$i], $chunks[$i + 1]);
-			}
-		}
-		return array_values($chunks);
-	}
-}
-?>

site/plugins/debug_kit/debug_kit_app_controller.php

@@ -1,32 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * Debug Kit App Controller
- *
- * 
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright 2006-2008, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.
- * @since         CakePHP v 1.2.0.4487
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-class DebugKitAppController extends AppController {
-	
-}
-?>

site/plugins/debug_kit/debug_kit_app_model.php

@@ -1,32 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * Debug Kit App Model
- *
- * 
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright 2006-2008, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.
- * @since         CakePHP v 1.2.0.4487
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-class DebugKitAppModel extends AppModel {
-	
-}
-?>

site/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php

@@ -1,323 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * DebugToolbar Test
- *
- * 
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright 2006-2008, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.
- * @since         CakePHP v 1.2.0.4487
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-App::import('Component', 'DebugKit.Toolbar');
-
-class TestToolbarComponent extends ToolbarComponent {
-
-	function loadPanels($panels) {
-		$this->_loadPanels($panels);
-	}
-
-}
-
-Mock::generate('DebugPanel');
-
-/**
-* DebugToolbar Test case
-*/
-class DebugToolbarTestCase extends CakeTestCase {
-	
-	function setUp() {
-		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
-		Router::parse('/');
-		$this->Controller =& ClassRegistry::init('Controller');
-		$this->Controller->Component =& ClassRegistry::init('Component');
-		$this->Controller->Toolbar =& ClassRegistry::init('TestToolBarComponent', 'Component');
-	}
-
-/**
- * test Loading of panel classes
- *
- * @return void
- **/
-	function testLoadPanels() {
-		$this->Controller->Toolbar->loadPanels(array('session', 'request'));
-		$this->assertTrue(is_a($this->Controller->Toolbar->panels['session'], 'SessionPanel'));
-		$this->assertTrue(is_a($this->Controller->Toolbar->panels['request'], 'RequestPanel'));
-
-		$this->expectError();
-		$this->Controller->Toolbar->loadPanels(array('randomNonExisting', 'request'));
-	}
-	
-/**
- * test loading of vendor panels from test_app folder
- *
- * @access public
- * @return void
- */
-	function testVendorPanels() {
-		$_back = Configure::read('vendorPaths');
-		Configure::write('vendorPaths', array(APP . 'plugins' . DS . 'debug_kit' . DS . 'tests' . DS . 'test_app' . DS . 'vendors' . DS));
-		$this->Controller->components = array(
-			'DebugKit.Toolbar' => array(
-				'panels' => array('test'),
-			)
-		);
-		$this->Controller->Component->init($this->Controller);
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->assertTrue(isset($this->Controller->Toolbar->panels['test']));
-		$this->assertTrue(is_a($this->Controller->Toolbar->panels['test'], 'TestPanel'));
-
-		Configure::write('vendorPaths', $_back);
-	}
-
-/**
- * test initialize
- *
- * @return void
- * @access public
- **/
-	function testInitialize() {
-		$this->Controller->components = array('DebugKit.Toolbar');
-		$this->Controller->Component->init($this->Controller);
-		$this->Controller->Component->initialize($this->Controller);
-
-		$this->assertFalse(empty($this->Controller->Toolbar->panels));
-
-		$timers = DebugKitDebugger::getTimers();
-		$this->assertTrue(isset($timers['componentInit']));
-	}
-	
-/**
- * test startup
- *
- * @return void
- **/
-	function testStartup() {
-		$this->Controller->components = array(
-			'DebugKit.Toolbar' => array(
-				'panels' => array('MockDebug')
-			)
-		);
-		$this->Controller->Component->init($this->Controller);
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Toolbar->panels['MockDebug']->expectOnce('startup');
-		$this->Controller->Toolbar->startup($this->Controller);
-
-		$this->assertEqual(count($this->Controller->Toolbar->panels), 1);
-		$this->assertTrue(isset($this->Controller->helpers['DebugKit.Toolbar']));
-		$this->assertEqual($this->Controller->helpers['DebugKit.Toolbar'], array('output' => 'DebugKit.HtmlToolbar'));
-
-		$timers = DebugKitDebugger::getTimers();
-		$this->assertTrue(isset($timers['controllerAction']));
-	}
-
-/**
- * Test Before Render callback
- *
- * @return void
- **/
-	function testBeforeRender() {
-		$this->Controller->components = array(
-			'DebugKit.Toolbar' => array(
-				'panels' => array('MockDebug', 'session')
-			)
-		);
-		$this->Controller->Component->init($this->Controller);
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Toolbar->panels['MockDebug']->expectOnce('beforeRender');
-		$this->Controller->Toolbar->beforeRender($this->Controller);
-		
-		$this->assertTrue(isset($this->Controller->viewVars['debugToolbarPanels']));
-		$vars = $this->Controller->viewVars['debugToolbarPanels'];
-
-		$expected = array(
-			'plugin' => 'debug_kit',
-			'elementName' => 'session_panel',
-			'content' => $this->Controller->Session->read(),
-			'disableTimer' => true,
-		);
-		$this->assertEqual($expected, $vars['session']);
-	}
-
-/**
- * test alternate javascript library use
- *
- * @return void
- **/
-	function testAlternateJavascript() {
-		$this->Controller->components = array(
-			'DebugKit.Toolbar'
-		);
-		$this->Controller->Component->init($this->Controller);
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->Controller->Component->beforeRender($this->Controller);
-		$this->assertTrue(isset($this->Controller->viewVars['debugToolbarJavascript']));
-		$expected = array(
-			'behavior' => '/debug_kit/js/js_debug_toolbar',
-		);
-		$this->assertEqual($this->Controller->viewVars['debugToolbarJavascript'], $expected);
-		
-		$this->Controller->components = array(
-			'DebugKit.Toolbar' => array(
-				'javascript' => 'jquery',
-			),
-		);
-		$this->Controller->Component->init($this->Controller);
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->Controller->Component->beforeRender($this->Controller);
-		$this->assertTrue(isset($this->Controller->viewVars['debugToolbarJavascript']));
-		$expected = array(
-			'behavior' => '/debug_kit/js/jquery_debug_toolbar.js',
-		);
-		$this->assertEqual($this->Controller->viewVars['debugToolbarJavascript'], $expected);
-
-
-		$this->Controller->components = array(
-			'DebugKit.Toolbar' => array(
-				'javascript' => false
-			)
-		);
-		$this->Controller->Component->init($this->Controller);
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->Controller->Component->beforeRender($this->Controller);
-		$this->assertTrue(isset($this->Controller->viewVars['debugToolbarJavascript']));
-		$expected = array();
-		$this->assertEqual($this->Controller->viewVars['debugToolbarJavascript'], $expected);
-		
-
-		$this->Controller->components = array(
-			'DebugKit.Toolbar' => array(
-				'javascript' => array('my_library'),
-			),
-		);
-		$this->Controller->Component->init($this->Controller);
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->Controller->Component->beforeRender($this->Controller);
-		$this->assertTrue(isset($this->Controller->viewVars['debugToolbarJavascript']));
-		$expected = array(
-			'behavior' => 'my_library_debug_toolbar'
-		);
-		$this->assertEqual($this->Controller->viewVars['debugToolbarJavascript'], $expected);
-
-		$this->Controller->components = array(
-			'DebugKit.Toolbar' => array(
-				'javascript' => array('/my/path/to/file')
-			),
-		);
-		$this->Controller->Component->init($this->Controller);
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->Controller->Component->beforeRender($this->Controller);
-		$this->assertTrue(isset($this->Controller->viewVars['debugToolbarJavascript']));
-		$expected = array(
-			'behavior' => '/my/path/to/file',
-		);
-		$this->assertEqual($this->Controller->viewVars['debugToolbarJavascript'], $expected);
-
-		$this->Controller->components = array(
-			'DebugKit.Toolbar' => array(
-				'javascript' => '/js/custom_behavior',
-			),
-		);
-		$this->Controller->Component->init($this->Controller);
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->Controller->Component->beforeRender($this->Controller);
-		$this->assertTrue(isset($this->Controller->viewVars['debugToolbarJavascript']));
-		$expected = array(
-			'behavior' => '/js/custom_behavior',
-		);
-		$this->assertEqual($this->Controller->viewVars['debugToolbarJavascript'], $expected);
-	}
-/**
- * Test alternate javascript existing in the plugin.
- *
- * @return void
- **/
-	function testExistingAlterateJavascript() {
-		$filename = APP . 'plugins' . DS . 'debug_kit' . DS . 'vendors' . DS . 'js' . DS . 'test_alternate_debug_toolbar.js';
-		$this->skipIf(!is_writable(dirname($filename)), 'Skipping existing javascript test, debug_kit/vendors/js must be writable');
-		
-		@touch($filename);
-		$this->Controller->components = array(
-			'DebugKit.Toolbar' => array(
-				'javascript' => 'test_alternate',
-			),
-		);
-		$this->Controller->Component->init($this->Controller);
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->Controller->Component->beforeRender($this->Controller);
-		$this->assertTrue(isset($this->Controller->viewVars['debugToolbarJavascript']));
-		$expected = array(
-			'behavior' => '/debug_kit/js/test_alternate_debug_toolbar.js',
-		);
-		$this->assertEqual($this->Controller->viewVars['debugToolbarJavascript'], $expected);
-		@unlink($filename);
-	}
-/**
- * test the Log panel log reading.
- *
- * @return void
- **/
-	function testLogPanel() {
-		usleep(20);
-		$this->Controller->log('This is a log I made this request');
-		$this->Controller->log('This is the second  log I made this request');
-		$this->Controller->log('This time in the debug log!', LOG_DEBUG);
-		
-		$this->Controller->components = array(
-			'DebugKit.Toolbar' => array(
-				'panels' => array('log', 'session')
-			)
-		);
-		$this->Controller->Component->init($this->Controller);
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->Controller->Component->beforeRender($this->Controller);
-		$result = $this->Controller->viewVars['debugToolbarPanels']['log'];
-		
-		$this->assertEqual(count($result['content']), 2);
-		$this->assertEqual(count($result['content']['error.log']), 4);
-		$this->assertEqual(count($result['content']['debug.log']), 2);
-		
-		$this->assertEqual(trim($result['content']['debug.log'][1]), 'Debug: This time in the debug log!');
-		$this->assertEqual(trim($result['content']['error.log'][1]), 'Error: This is a log I made this request');
-	}
-
-
-/**
- * teardown
- *
- * @return void
- **/
-	function tearDown() {
-		unset($this->Controller);
-		if (class_exists('DebugKitDebugger')) {
-			DebugKitDebugger::clearTimers();
-		}
-	}
-}
-?>

site/plugins/debug_kit/tests/cases/test_objects.php

@@ -1,62 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * Common test objects used in DebugKit tests
- *
- * Long description for file
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- *  Licensed under The Open Group Test Suite License
- *  Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc.
- * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
- * @package       cake.tests
- * @subpackage    cake.tests.cases.libs
- * @since         CakePHP(tm) v 1.2.0.5432
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
- */
-/**
- * TestFireCake class allows for testing of FireCake
- *
- * @package debug_kit.tests.
- */
-class TestFireCake extends FireCake {
-	var $sentHeaders = array();
-
-	function _sendHeader($name, $value) {
-		$_this = FireCake::getInstance();
-		$_this->sentHeaders[$name] = $value;
-	}
-/**
- * skip client detection as headers are not being sent.
- *
- * @access public
- * @return void
- */	
-	function detectClientExtension() {
-		return true;
-	}
-/**
- * Reset the fireCake
- *
- * @return void
- **/
-	function reset() {
-		$_this = FireCake::getInstance();
-		$_this->sentHeaders = array();
-		$_this->_messageIndex = 1;
-	}
-}
-
-?>

site/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php

@@ -1,157 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * DebugKit Debugger Test Case File
- *
- * Long description for file
- *
- * PHP versions 4 and 5
- *
- * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
- * Copyright 2005-2008, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- *  Licensed under The Open Group Test Suite License
- *  Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc.
- * @link          https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
- * @package       cake.tests
- * @subpackage    cake.tests.cases.libs
- * @since         CakePHP(tm) v 1.2.0.5432
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
- */
-App::import('Core', 'Debugger');
-App::import('Vendor', 'DebugKit.DebugKitDebugger');
-
-require_once APP . 'plugins' . DS . 'debug_kit' . DS . 'tests' . DS . 'cases' . DS . 'test_objects.php';
-
-/**
- * Short description for class.
- *
- * @package       cake.tests
- * @subpackage    cake.tests.cases.libs
- */
-class DebugKitDebuggerTest extends CakeTestCase {
-/**
- * setUp method
- *
- * @access public
- * @return void
- */
-	function setUp() {
-		Configure::write('log', false);
-		if (!defined('SIMPLETESTVENDORPATH')) {
-			if (file_exists(APP . DS . 'vendors' . DS . 'simpletest' . DS . 'reporter.php')) {
-				define('SIMPLETESTVENDORPATH', 'APP' . DS . 'vendors');
-			} else {
-				define('SIMPLETESTVENDORPATH', 'CORE' . DS . 'vendors');
-			}
-		}
-	}
-
-/**
- * Start Timer test
- *
- * @return void
- **/
-	function testTimers() {
-		$this->assertTrue(DebugKitDebugger::startTimer('test1', 'this is my first test'));
-		usleep(5000);
-		$this->assertTrue(DebugKitDebugger::stopTimer('test1'));
-		$elapsed = DebugKitDebugger::elapsedTime('test1');
-		$this->assertTrue($elapsed > 0.0050);
-
-		$this->assertTrue(DebugKitDebugger::startTimer('test2', 'this is my second test'));
-		sleep(1);
-		$this->assertTrue(DebugKitDebugger::stopTimer('test2'));
-		$elapsed = DebugKitDebugger::elapsedTime('test2');
-		$this->assertTrue($elapsed > 1);
-
-		DebugKitDebugger::startTimer('test3');
-		$this->assertFalse(DebugKitDebugger::elapsedTime('test3'));
-		$this->assertFalse(DebugKitDebugger::stopTimer('wrong'));
-	}
-
-/**
- * testRequestTime
- *
- * @access public
- * @return void
- */
-	function testRequestTime() {
-		$result1 = DebugKitDebugger::requestTime();
-		usleep(50);
-		$result2 = DebugKitDebugger::requestTime();
-		$this->assertTrue($result1 < $result2);
-	}
-
-/**
- * test getting all the set timers.
- *
- * @return void
- **/
-	function testGetTimers() {
-		DebugKitDebugger::clearTimers();
-		DebugKitDebugger::startTimer('test1', 'this is my first test');
-		DebugKitDebugger::stopTimer('test1');
-		usleep(50);
-		DebugKitDebugger::startTimer('test2');
-		DebugKitDebugger::stopTimer('test2');
-		$timers = DebugKitDebugger::getTimers();
-
-		$this->assertEqual(count($timers), 2);
-		$this->assertTrue(is_float($timers['test1']['time']));
-		$this->assertTrue(isset($timers['test1']['message']));
-		$this->assertTrue(isset($timers['test2']['message']));
-	}
-	
-/**
- * test memory usage
- *
- * @return void
- **/
-	function testMemoryUsage() {
-		$result = DebugKitDebugger::getMemoryUse();
-		$this->assertTrue(is_int($result));
-		
-		$result = DebugKitDebugger::getPeakMemoryUse();
-		$this->assertTrue(is_int($result));
-	}
-/**
- * test _output switch to firePHP
- *
- * @return void
- */
-	function testOutput() {
-		$firecake =& FireCake::getInstance('TestFireCake');
-		Debugger::invoke(DebugKitDebugger::getInstance('DebugKitDebugger'));
-		Debugger::output('fb');
-		$foo .= '';
-		$result = $firecake->sentHeaders;
-		
-		$this->assertPattern('/GROUP_START/', $result['X-Wf-1-1-1-1']);
-		$this->assertPattern('/ERROR/', $result['X-Wf-1-1-1-2']);
-		$this->assertPattern('/GROUP_END/', $result['X-Wf-1-1-1-5']);
-		
-		Debugger::invoke(Debugger::getInstance('Debugger'));
-		Debugger::output();
-	}
-
-/**
- * tearDown method
- *
- * @access public
- * @return void
- */
-	function tearDown() {
-		Configure::write('log', true);
-	}
-
-}
-?>

site/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php

@@ -1,336 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * CakeFirePHP test case
- *
- * 
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright 2006-2008, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright       Copyright 2006-2008, Cake Software Foundation, Inc.
- * @link            http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package         debug_kit
- * @subpackage      cake.debug_kit.tests
- * @since           CakePHP v 1.2.0.4487
- * @version         
- * @modifiedby      
- * @lastmodified    
- * @license         http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-App::import('Vendor', 'DebugKit.FireCake');
-
-require_once APP . 'plugins' . DS . 'debug_kit' . DS . 'tests' . DS . 'cases' . DS . 'test_objects.php';
-/**
- * Test Case For FireCake
- *
- * @package debug_kit.tests
- */
-class FireCakeTestCase extends CakeTestCase {
-/**
- * setup test
- *
- * Fill FireCake with TestFireCake instance.
- *
- * @access public
- * @return void
- */
-	function setUp() {
-		$this->firecake =& FireCake::getInstance('TestFireCake');
-	}	
-/**
- * test getInstance cheat.
- *
- * If this fails the rest of the test is going to fail too.
- *
- * @return void
- **/
-	function testGetInstanceOverride() {
-		$instance =& FireCake::getInstance();
-		$instance2 =& FireCake::getInstance();
-		$this->assertReference($instance, $instance2);
-		$this->assertIsA($instance, 'FireCake');
-		$this->assertIsA($instance, 'TestFireCake', 'Stored instance is not a copy of TestFireCake, test case is broken.');
-	}	
-/**
- * testsetoption
- *
- * @return void
- **/
-	function testSetOptions() {
-		FireCake::setOptions(array('includeLineNumbers' => false));
-		$this->assertEqual($this->firecake->options['includeLineNumbers'], false);
-	}
-/**
- * test Log()
- *
- * @access public
- * @return void
- */	
-	function testLog() {
-		FireCake::setOptions(array('includeLineNumbers' => false));
-		FireCake::log('Testing');
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-Protocol-1']));
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Plugin-1']));
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Structure-1']));
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 1);
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '26|[{"Type":"LOG"},"Testing"]|');
-		
-		FireCake::log('Testing', 'log-info');
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-2'], '45|[{"Type":"LOG","Label":"log-info"},"Testing"]|');
-	}
-/**
- * test info()
- *
- * @access public
- * @return void
- */	
-	function testInfo() {
-		FireCake::setOptions(array('includeLineNumbers' => false));
-		FireCake::info('I have information');
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-Protocol-1']));
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Plugin-1']));
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Structure-1']));
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 1);
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '38|[{"Type":"INFO"},"I have information"]|');
-
-		FireCake::info('I have information', 'info-label');
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-2'], '59|[{"Type":"INFO","Label":"info-label"},"I have information"]|');
-	}
-/**
- * test info()
- *
- * @access public
- * @return void
- */	
-	function testWarn() {
-		FireCake::setOptions(array('includeLineNumbers' => false));
-		FireCake::warn('A Warning');
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-Protocol-1']));
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Plugin-1']));
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Structure-1']));
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 1);
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '29|[{"Type":"WARN"},"A Warning"]|');
-
-		FireCake::warn('A Warning', 'Bzzz');
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-2'], '44|[{"Type":"WARN","Label":"Bzzz"},"A Warning"]|');
-	}
-/**
- * test error()
- *
- * @access public
- * @return void
- **/
-	function testError() {
-		FireCake::setOptions(array('includeLineNumbers' => false));
-		FireCake::error('An error');
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-Protocol-1']));
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Plugin-1']));
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Structure-1']));
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 1);
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '29|[{"Type":"ERROR"},"An error"]|');
-		
-		FireCake::error('An error', 'wonky');
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-2'], '45|[{"Type":"ERROR","Label":"wonky"},"An error"]|');
-	}
-/**
- * test dump()
- *
- * @return void
- **/
-	function testDump() {
-		FireCake::dump('mydump', array('one' => 1, 'two' => 2));
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-2-1-1'], '28|{"mydump":{"one":1,"two":2}}|');
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Structure-2']));
-	}
-/**
- * test table() generation
- *
- * @return void
- **/
-	function testTable() {
-		$table[] = array('Col 1 Heading','Col 2 Heading');
-		$table[] = array('Row 1 Col 1','Row 1 Col 2');
-		$table[] = array('Row 2 Col 1','Row 2 Col 2');
-		$table[] = array('Row 3 Col 1','Row 3 Col 2');
-		FireCake::table('myTrace', $table);
-		$expected = '162|[{"Type":"TABLE","Label":"myTrace"},[["Col 1 Heading","Col 2 Heading"],["Row 1 Col 1","Row 1 Col 2"],["Row 2 Col 1","Row 2 Col 2"],["Row 3 Col 1","Row 3 Col 2"]]]|';
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], $expected);
-	}
-/**
- * testStringEncoding
- *
- * @return void
- **/
-	function testStringEncode() {
-		$result = $this->firecake->stringEncode(array(1,2,3));
-		$this->assertEqual($result, array(1,2,3));
-
-		$this->firecake->setOptions(array('maxArrayDepth' => 3));
-		$deep = array(1 => array(2 => array(3)));
-		$result = $this->firecake->stringEncode($deep);
-		$this->assertEqual($result, array(1 => array(2 => '** Max Array Depth (3) **')));
-
-		$obj =& FireCake::getInstance();
-		$result = $this->firecake->stringEncode($obj);
-		$this->assertTrue(is_array($result));
-		$this->assertEqual($result['_defaultOptions']['useNativeJsonEncode'], true);
-		$this->assertEqual($result['_log'], null);
-		$this->assertEqual($result['_encodedObjects'][0], '** Recursion (TestFireCake) **');
-	}
-/**
- * test trace()
- *
- * @return void
- **/
-	function testTrace() {
-		FireCake::trace('myTrace');
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-Protocol-1']));
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Plugin-1']));
-		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Structure-1']));
-		$dump = $this->firecake->sentHeaders['X-Wf-1-1-1-1'];
-		$this->assertPattern('/"Message":"myTrace"/', $dump);
-		$this->assertPattern('/"Trace":\[/', $dump);
-	}
-/**
- * test enabling and disabling of FireCake output
- *
- * @return void
- **/
-	function testEnableDisable() {
-		FireCake::disable();
-		FireCake::trace('myTrace');
-		$this->assertTrue(empty($this->firecake->sentHeaders));
-		
-		FireCake::enable();
-		FireCake::trace('myTrace');
-		$this->assertFalse(empty($this->firecake->sentHeaders));
-	}
-/**
- * test correct line continuation markers on multi line headers.
- *
- * @access public
- * @return void
- */	
-	function testMultiLineOutput() {
-		FireCake::trace('myTrace');
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 3);
-		$header = $this->firecake->sentHeaders['X-Wf-1-1-1-1'];
-		$this->assertEqual(substr($header, -2), '|\\');
-		
-		$header = $this->firecake->sentHeaders['X-Wf-1-1-1-2'];
-		$this->assertEqual(substr($header, -2), '|\\');
-		
-		$header = $this->firecake->sentHeaders['X-Wf-1-1-1-3'];
-		$this->assertEqual(substr($header, -1), '|');
-	}
-	
-/**
- * test inclusion of line numbers
- *
- * @return void
- **/
-	function testIncludeLineNumbers() {
-		FireCake::setOptions(array('includeLineNumbers' => true));
-		FireCake::info('Testing');
-		$result = $this->firecake->sentHeaders['X-Wf-1-1-1-1'];
-		$this->assertPattern('/"File"\:"APP.*fire_cake.test.php/', $result);
-		$this->assertPattern('/"Line"\:\d+/', $result);
-	}
-/**
- * test Group messages
- *
- * @return void
- **/
-	function testGroup() {
-		FireCake::setOptions(array('includeLineNumbers' => false));
-		FireCake::group('test');
-		FireCake::info('my info');
-		FireCake::groupEnd();
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '44|[{"Type":"GROUP_START","Label":"test"},null]|');
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-3'], '27|[{"Type":"GROUP_END"},null]|');
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 3);
-	}
-/**
- * test fb() parameter parsing
- *
- * @return void
- **/
-	function testFbParameterParsing() {
-		FireCake::setOptions(array('includeLineNumbers' => false));
-		FireCake::fb('Test');
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '23|[{"Type":"LOG"},"Test"]|');
-
-		FireCake::fb('Test', 'warn');
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-2'], '24|[{"Type":"WARN"},"Test"]|');
-
-		FireCake::fb('Test', 'Custom label', 'warn');
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-3'], '47|[{"Type":"WARN","Label":"Custom label"},"Test"]|');
-
-		$this->expectError();
-		$this->assertFalse(FireCake::fb('Test', 'Custom label', 'warn', 'more parameters'));
-
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 3);
-	}
-/**
- * Test defaulting to log if incorrect message type is used
- *
- * @return void
- **/
-	function testIncorrectMessageType() {
-		FireCake::setOptions(array('includeLineNumbers' => false));
-		FireCake::fb('Hello World', 'foobared');
-		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '30|[{"Type":"LOG"},"Hello World"]|');
-	}
-/**
- * testClientExtensionDetection.
- *
- * @return void
- **/
-	function testDetectClientExtension() {
-		$back = env('HTTP_USER_AGENT');
-		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.0.4) Gecko/2008102920 Firefox/3.0.4 FirePHP/0.2.1';
-		$this->assertTrue(FireCake::detectClientExtension());
-		
-		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.0.4) Gecko/2008102920 Firefox/3.0.4 FirePHP/0.0.4';
-		$this->assertFalse(FireCake::detectClientExtension());
-		
-		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.0.4) Gecko/2008102920 Firefox/3.0.4';
-		$this->assertFalse(FireCake::detectClientExtension());
-		$_SERVER['HTTP_USER_AGENT'] = $back;
-	}	
-/**
- * test of Non Native JSON encoding.
- *
- * @return void
- **/
-	function testNonNativeEncoding() {
-		FireCake::setOptions(array('useNativeJsonEncode' => false));
-		$json = FireCake::jsonEncode(array('one' => 1, 'two' => 2));
-		$this->assertEqual($json, '{"one":1,"two":2}');
-		
-		$json = FireCake::jsonEncode(array(1,2,3));
-		$this->assertEqual($json, '[1,2,3]');
-		
-		$json = FireCake::jsonEncode(FireCake::getInstance());
-		$this->assertPattern('/"options"\:\{"maxObjectDepth"\:\d*,/', $json);
-	}
-/**
- * reset the FireCake counters and headers.
- *
- * @access public
- * @return void
- */
-	function tearDown() {
-		TestFireCake::reset();
-	}
-}
-?>

site/plugins/debug_kit/tests/cases/views/debug.test.php

@@ -1,144 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * DebugView test Case
- *
- * 
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright 2006-2008, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package       cake
- * @subpackage    cake.cake.libs.
- * @since         CakePHP v 1.2.0.4487
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-App::import('Core', 'View');
-
-if (!class_exists('DoppelGangerView')) {
-	class DoppelGangerView extends View {}
-}
-
-App::import('View', 'DebugKit.Debug');
-App::import('Vendor', 'DebugKit.DebugKitDebugger');
-/**
- * Debug View Test Case
- *
- * @package       debug_kit.tests
- */
-class DebugViewTestCase extends CakeTestCase {
-/**
- * set Up test case
- *
- * @return void
- **/
-	function setUp() {
-		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
-		Router::parse('/');
-		$this->Controller =& ClassRegistry::init('Controller');
-		$this->View  =& new DebugView($this->Controller, false);
-		$this->_debug = Configure::read('debug');
-	}
-	
-/**
- * start Case - switch view paths
- *
- * @return void
- **/
-	function startCase() {
-		$this->_viewPaths = Configure::read('viewPaths');
-		Configure::write('viewPaths', array(
-			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
-			APP . 'plugins' . DS . 'debug_kit' . DS . 'views'. DS, 
-			ROOT . DS . LIBS . 'view' . DS
-		));
-	}
-	
-/**
- * test that element timers are working
- *
- * @return void
- **/
-	function testElementTimers() {
-		$result = $this->View->element('test_element');
-		$this->assertPattern('/^this is the test element$/', $result);
-
-		$result = DebugKitDebugger::getTimers();
-		$this->assertTrue(isset($result['render_test_element.ctp']));
-	}
-
-/**
- * test rendering and ensure that timers are being set.
- *
- * @access public
- * @return void
- */
-	function testRenderTimers() {
-		$this->Controller->viewPath = 'posts';
-		$this->Controller->action = 'index';
-		$this->Controller->params = array(
-			'action' => 'index',
-			'controller' => 'posts',
-			'plugin' => null,
-			'url' => array('url' => 'posts/index'),
-			'base' => null,
-			'here' => '/posts/index',
-		);
-		$this->Controller->layout = 'default';
-		$View =& new DebugView($this->Controller, false);
-		$View->render('index');
-		
-		$result = DebugKitDebugger::getTimers();
-		$this->assertEqual(count($result), 3);
-		$this->assertTrue(isset($result['viewRender']));
-		$this->assertTrue(isset($result['render_default.ctp']));
-		$this->assertTrue(isset($result['render_index.ctp']));
-	}
-	
-/**
- * Test for correct loading of helpers into custom view
- *
- * @return void
- */
-	function testLoadHelpers() {
-		$loaded = array();
-		$result = $this->View->_loadHelpers($loaded, array('Html', 'Javascript', 'Number'));
-		$this->assertTrue(is_object($result['Html']));
-		$this->assertTrue(is_object($result['Javascript']));
-		$this->assertTrue(is_object($result['Number']));
-	}
-
-/**
- * reset the view paths
- *
- * @return void
- **/
-	function endCase() {
-		Configure::write('viewPaths', $this->_viewPaths);
-	}
-
-/**
- * tear down function
- *
- * @return void
- **/
-	function tearDown() {
-		unset($this->View, $this->Controller);
-		DebugKitDebugger::clearTimers();
-		Configure::write('debug', $this->_debug);
-	}
-}
-?>

site/plugins/debug_kit/tests/cases/views/helpers/fire_php_toobar.test.php

@@ -1,137 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * Toolbar Abstract Helper Test Case
- *
- * 
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright 2006-2008, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright		Copyright 2006-2008, Cake Software Foundation, Inc.
- * @link			http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package			cake
- * @subpackage		debug_kit.tests.views.helpers
- * @version			$Revision$
- * @modifiedby		$LastChangedBy$
- * @lastmodified	$Date$
- * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-App::import('Helper', 'DebugKit.FirePhpToolbar');
-App::import('Core', array('View', 'Controller'));
-require_once APP . 'plugins' . DS . 'debug_kit' . DS . 'tests' . DS . 'cases' . DS . 'test_objects.php';
-
-FireCake::getInstance('TestFireCake');
-
-class FirePhpToolbarHelperTestCase extends CakeTestCase {
-/**
- * setUp
- *
- * @return void
- **/
-	function setUp() {
-		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
-		Router::parse('/');
-
-		$this->Toolbar =& new ToolbarHelper(array('output' => 'DebugKit.FirePhpToolbar'));
-		$this->Toolbar->FirePhpToolbar =& new FirePhpToolbarHelper();
-
-		$this->Controller =& ClassRegistry::init('Controller');
-		if (isset($this->_debug)) {
-			Configure::write('debug', $this->_debug);
-		}
-	}
-/**
- * start Case - switch view paths
- *
- * @return void
- **/
-	function startCase() {
-		$this->_viewPaths = Configure::read('viewPaths');
-		Configure::write('viewPaths', array(
-			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
-			APP . 'plugins' . DS . 'debug_kit' . DS . 'views'. DS, 
-			ROOT . DS . LIBS . 'view' . DS
-		));
-		$this->_debug = Configure::read('debug');
-		$this->firecake =& FireCake::getInstance();
-	}
-/**
- * test neat array (dump)creation
- *
- * @return void
- */
-	function testMakeNeatArray() {
-		$this->Toolbar->makeNeatArray(array(1,2,3));
-		$result = $this->firecake->sentHeaders;
-		$this->assertTrue(isset($result['X-Wf-1-1-1-1']));
-		$this->assertPattern('/\[1,2,3\]/', $result['X-Wf-1-1-1-1']);
-	}
-/**
- * testAfterlayout element rendering
- *
- * @return void
- */
-	function testAfterLayout(){
-		$this->Controller->viewPath = 'posts';
-		$this->Controller->action = 'index';
-		$this->Controller->params = array(
-			'action' => 'index',
-			'controller' => 'posts',
-			'plugin' => null,
-			'url' => array('url' => 'posts/index', 'ext' => 'xml'),
-			'base' => null,
-			'here' => '/posts/index',
-		);
-		$this->Controller->layout = 'default';
-		$this->Controller->uses = null;
-		$this->Controller->components = array('DebugKit.Toolbar');
-		$this->Controller->constructClasses();
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->Controller->Component->beforeRender($this->Controller);
-		$result = $this->Controller->render();
-		$this->assertNoPattern('/debug-toolbar/', $result);
-		$result = $this->firecake->sentHeaders;
-		$this->assertTrue(is_array($result));
-		
-	}
-/**
- * endTest()
- *
- * @return void
- */
-	function endTest() {
-		TestFireCake::reset();
-	}
-/**
- * reset the view paths
- *
- * @return void
- **/
-	function endCase() {
-		Configure::write('viewPaths', $this->_viewPaths);
-	}
-
-/**
- * tearDown
- *
- * @access public
- * @return void
- */
-	function tearDown() {
-		unset($this->Toolbar, $this->Controller);
-		ClassRegistry::removeObject('view');
-		ClassRegistry::flush();
-		Router::reload();
-	}
-}
-?>

site/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php

@@ -1,358 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * Toolbar HTML Helper Test Case
- *
- * 
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright 2006-2008, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright		Copyright 2006-2008, Cake Software Foundation, Inc.
- * @link			http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package			cake
- * @subpackage		debug_kit.tests.views.helpers
- * @version			$Revision$
- * @modifiedby		$LastChangedBy$
- * @lastmodified	$Date$
- * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-App::import('Helper', array('DebugKit.HtmlToolbar', 'Html', 'Javascript'));
-App::import('Core', array('View', 'Controller'));
-
-class HtmlToolbarHelperTestCase extends CakeTestCase {
-/**
- * setUp
- *
- * @return void
- **/
-	function setUp() {
-		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
-		Router::parse('/');
-		
-		$this->Toolbar =& new ToolbarHelper(array('output' => 'DebugKit.HtmlToolbar'));
-		$this->Toolbar->HtmlToolbar =& new HtmlToolbarHelper();
-		$this->Toolbar->HtmlToolbar->Html =& new HtmlHelper();
-		$this->Toolbar->HtmlToolbar->Javascript =& new JavascriptHelper();
-		
-		$this->Controller =& ClassRegistry::init('Controller');
-		if (isset($this->_debug)) {
-			Configure::write('debug', $this->_debug);
-		}
-	}
-
-/**
- * start Case - switch view paths
- *
- * @return void
- **/
-	function startCase() {
-		$this->_viewPaths = Configure::read('viewPaths');
-		Configure::write('viewPaths', array(
-			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
-			APP . 'plugins' . DS . 'debug_kit' . DS . 'views'. DS, 
-			ROOT . DS . LIBS . 'view' . DS
-		));
-		$this->_debug = Configure::read('debug');
-	}
-
-/**
- * test Neat Array formatting
- *
- * @return void
- **/
-	function testMakeNeatArray() {
-		$in = false;
-		$result = $this->Toolbar->makeNeatArray($in);
-		$expected = array(
-			'ul' => array('class' => 'neat-array depth-0'),
-			'<li', '<strong', '0' , '/strong', '(false)', '/li',
-			'/ul'
-		);
-		$this->assertTags($result, $expected);
-
-		$in = null;
-		$result = $this->Toolbar->makeNeatArray($in);
-		$expected = array(
-			'ul' => array('class' => 'neat-array depth-0'),
-			'<li', '<strong', '0' , '/strong', '(null)', '/li',
-			'/ul'
-		);
-		$this->assertTags($result, $expected);
-
-		$in = true;
-		$result = $this->Toolbar->makeNeatArray($in);
-		$expected = array(
-			'ul' => array('class' => 'neat-array depth-0'),
-			'<li', '<strong', '0' , '/strong', '(true)', '/li',
-			'/ul'
-		);
-		$this->assertTags($result, $expected);
-
-		$in = array('key' => 'value');
-		$result = $this->Toolbar->makeNeatArray($in);
-		$expected = array(
-			'ul' => array('class' => 'neat-array depth-0'),
-			'<li', '<strong', 'key', '/strong', 'value', '/li',
-			'/ul'
-		);
-		$this->assertTags($result, $expected);
-
-		$in = array('key' => null);
-		$result = $this->Toolbar->makeNeatArray($in);
-		$expected = array(
-			'ul' => array('class' => 'neat-array depth-0'),
-			'<li', '<strong', 'key', '/strong', '(null)', '/li',
-			'/ul'
-		);
-		$this->assertTags($result, $expected);
-
-		$in = array('key' => 'value', 'foo' => 'bar');
-		$result = $this->Toolbar->makeNeatArray($in);
-		$expected = array(
-			'ul' => array('class' => 'neat-array depth-0'),
-			'<li', '<strong', 'key', '/strong', 'value', '/li',
-			'<li', '<strong', 'foo', '/strong', 'bar', '/li',
-			'/ul'
-		);
-		$this->assertTags($result, $expected);
-
-		$in = array(
-			'key' => 'value', 
-			'foo' => array(
-				'this' => 'deep',
-				'another' => 'value'
-			)
-		);
-		$result = $this->Toolbar->makeNeatArray($in);
-		$expected = array(
-			'ul' => array('class' => 'neat-array depth-0'),
-			'<li', '<strong', 'key', '/strong', 'value', '/li',
-			'<li', '<strong', 'foo', '/strong',
-				array('ul' => array('class' => 'neat-array depth-1')),
-				'<li', '<strong', 'this', '/strong', 'deep', '/li',
-				'<li', '<strong', 'another', '/strong', 'value', '/li',
-				'/ul',
-			'/li',
-			'/ul'
-		);
-		$this->assertTags($result, $expected);
-
-		$in = array(
-			'key' => 'value', 
-			'foo' => array(
-				'this' => 'deep',
-				'another' => 'value'
-			),
-			'lotr' => array(
-				'gandalf' => 'wizard',
-				'bilbo' => 'hobbit'
-			)
-		);
-		$result = $this->Toolbar->makeNeatArray($in, 1);
-		$expected = array(
-			'ul' => array('class' => 'neat-array depth-0 expanded'),
-			'<li', '<strong', 'key', '/strong', 'value', '/li',
-			'<li', '<strong', 'foo', '/strong', 
-				array('ul' => array('class' => 'neat-array depth-1')),
-				'<li', '<strong', 'this', '/strong', 'deep', '/li',
-				'<li', '<strong', 'another', '/strong', 'value', '/li',
-				'/ul',
-			'/li',
-			'<li', '<strong', 'lotr', '/strong', 
-				array('ul' => array('class' => 'neat-array depth-1')),
-				'<li', '<strong', 'gandalf', '/strong', 'wizard', '/li',
-				'<li', '<strong', 'bilbo', '/strong', 'hobbit', '/li',
-				'/ul',
-			'/li',
-			'/ul'
-		);
-		$this->assertTags($result, $expected);
-
-		$result = $this->Toolbar->makeNeatArray($in, 2);
-		$expected = array(
-			'ul' => array('class' => 'neat-array depth-0 expanded'),
-			'<li', '<strong', 'key', '/strong', 'value', '/li',
-			'<li', '<strong', 'foo', '/strong', 
-				array('ul' => array('class' => 'neat-array depth-1 expanded')),
-				'<li', '<strong', 'this', '/strong', 'deep', '/li',
-				'<li', '<strong', 'another', '/strong', 'value', '/li',
-				'/ul',
-			'/li',
-			'<li', '<strong', 'lotr', '/strong',
-				array('ul' => array('class' => 'neat-array depth-1 expanded')),
-				'<li', '<strong', 'gandalf', '/strong', 'wizard', '/li',
-				'<li', '<strong', 'bilbo', '/strong', 'hobbit', '/li',
-				'/ul',
-			'/li',
-			'/ul'
-		);
-		$this->assertTags($result, $expected);
-
-		$in = array('key' => 'value', 'array' => array());
-		$result = $this->Toolbar->makeNeatArray($in);
-		$expected = array(
-			'ul' => array('class' => 'neat-array depth-0'),
-			'<li', '<strong', 'key', '/strong', 'value', '/li',
-			'<li', '<strong', 'array', '/strong', '(empty)', '/li',
-			'/ul'
-		);
-		$this->assertTags($result, $expected);
-	}
-
-/**
- * Test injection of toolbar
- *
- * @return void
- **/
-	function testInjectToolbar() {
-		$this->Controller->viewPath = 'posts';
-		$this->Controller->action = 'index';
-		$this->Controller->params = array(
-			'action' => 'index',
-			'controller' => 'posts',
-			'plugin' => null,
-			'url' => array('url' => 'posts/index'),
-			'base' => null,
-			'here' => '/posts/index',
-		);
-		$this->Controller->helpers = array('Html', 'Javascript', 'DebugKit.Toolbar');
-		$this->Controller->layout = 'default';
-		$this->Controller->uses = null;
-		$this->Controller->components = array('DebugKit.Toolbar');
-		$this->Controller->constructClasses();
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->Controller->Component->beforeRender($this->Controller);
-		$result = $this->Controller->render();
-		$result = str_replace(array("\n", "\r"), '', $result);
-		$this->assertPattern('#<div id\="debug-kit-toolbar">.+</div></body>#', $result);
-	}
-
-/**
- * test injection of javascript
- *
- * @return void
- **/
-	function testJavascriptInjection() {
-		$this->Controller->viewPath = 'posts';
-		$this->Controller->uses = null;
-		$this->Controller->action = 'index';
-		$this->Controller->params = array(
-			'action' => 'index',
-			'controller' => 'posts',
-			'plugin' => null,
-			'url' => array('url' => 'posts/index'),
-			'base' => '/',
-			'here' => '/posts/index',
-		);
-		$this->Controller->helpers = array('Javascript', 'Html');
-		$this->Controller->components = array('DebugKit.Toolbar');
-		$this->Controller->layout = 'default';
-		$this->Controller->constructClasses();
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->Controller->Component->beforeRender($this->Controller);
-		$result = $this->Controller->render();
-		$result = str_replace(array("\n", "\r"), '', $result);
-		$this->assertPattern('#<script\s*type="text/javascript"\s*src="/debug_kit/js/js_debug_toolbar.js"\s*>\s?</script>#', $result);
-	}
-
-/**
- * test Injection of user defined javascript
- *
- * @return void
- **/
-	function testCustomJavascriptInjection() {
-		$this->Controller->viewPath = 'posts';
-		$this->Controller->uses = null;
-		$this->Controller->action = 'index';
-		$this->Controller->params = array(
-			'action' => 'index',
-			'controller' => 'posts',
-			'plugin' => null,
-			'url' => array('url' => 'posts/index'),
-			'base' => '/',
-			'here' => '/posts/index',
-		);
-		$this->Controller->helpers = array('Javascript', 'Html');
-		$this->Controller->components = array('DebugKit.Toolbar' => array('javascript' => array('my_custom')));
-		$this->Controller->layout = 'default';
-		$this->Controller->constructClasses();
-		$this->Controller->Component->initialize($this->Controller);
-		$this->Controller->Component->startup($this->Controller);
-		$this->Controller->Component->beforeRender($this->Controller);
-		$result = $this->Controller->render();
-		$result = str_replace(array("\n", "\r"), '', $result);
-		$this->assertPattern('#<script\s*type="text/javascript"\s*src="js/my_custom_debug_toolbar.js"\s*>\s?</script>#', $result);
-	}
-/**
- * test message creation
- *
- * @return void
- */
-	function testMessage() {
-		$result = $this->Toolbar->message('test', 'one, two');
-		$expected = array(
-			'<p',
-				'<strong', 'test', '/strong',
-				' one, two',
-			'/p',
-		);
-		$this->assertTags($result, $expected);
-	}
-/**
- * Test Table generation
- *
- * @return void
- */
-	function testTable() {
-		$rows = array(
-			array(1,2),
-			array(3,4),
-		);
-		$result = $this->Toolbar->table($rows);
-		$expected = array(
-			'table' => array('class' =>'debug-table'),
-			array('tr' => array('class' => 'odd')),
-			'<td', '1', '/td',
-			'<td', '2', '/td',
-			'/tr',
-			array('tr' => array('class' => 'even')),
-			'<td', '3', '/td',
-			'<td', '4', '/td',
-			'/tr',
-			'/table'
-		);
-		$this->assertTags($result, $expected);
-	}
-/**
- * reset the view paths
- *
- * @return void
- **/
-	function endCase() {
-		Configure::write('viewPaths', $this->_viewPaths);
-	}
-	
-/**
- * tearDown
- *
- * @access public
- * @return void
- */
-	function tearDown() {
-		unset($this->Toolbar, $this->Controller);
-		ClassRegistry::removeObject('view');
-		ClassRegistry::flush();
-	}
-}
-?>

site/plugins/debug_kit/tests/test_app/vendors/test_panel.php

@@ -1,33 +0,0 @@
-<?php
-/* SVN FILE: $Id$ */
-/**
- * Test Panel 
- *
- * 
- *
- * PHP versions 4 and 5
- *
- * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
- * Copyright 2006-2008, Cake Software Foundation, Inc.
- *								1785 E. Sahara Avenue, Suite 490-204
- *								Las Vegas, Nevada 89104
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @filesource
- * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
- * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
- * @package       cake.debug_kit
- * @subpackage    cake.debug_kit.tests
- * @version       $Revision$
- * @modifiedby    $LastChangedBy$
- * @lastmodified  $Date$
- * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
- */
-class TestPanel extends DebugPanel {
-	function startup(&$controller) {
-		$controller->testPanel = true;
-	}
-}
-?>

site/plugins/debug_kit/vendors/css/debug_toolbar.css

@@ -1,165 +0,0 @@
-/* @override http://localhost/cake_debug_kit/debug_kit/css/debug_toolbar.css */
-#debug-kit-toolbar {
-	position: fixed;
-	top: 0px;
-	right:0px;
-	width: 100%;
-	height: 1%;
-	overflow: visible;
-	z-index:10000;
-}
-/* panel tabs */
-#debug-kit-toolbar #panel-tabs {
-	float: right;
-	list-style: none;
-	margin: 0;
-}
-#debug-kit-toolbar .panel-tab {
-	clear: none;
-	float: left;
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-#debug-kit-toolbar .panel-tab a {
-	float: left;
-	clear: none;
-	background: #efefef;
-	color: #222;
-	padding: 6px;
-	border-right: 1px solid #ccc;
-	font-size: 12px;
-	line-height: 16px;
-	margin: 0;
-	display: block;
-}
-#debug-kit-toolbar .panel-tab .active,
-#debug-kit-toolbar .panel-tab a:hover {
-	background: #fff;
-}
-#debug-kit-toolbar .panel-tab.icon a {
-	padding: 4px;
-}
-
-/* Hovering over link shows tab, useful for no js  */
-#debug-kit-toolbar .panel-tab a:hover + .panel-content,
-#debug-kit-toolbar .panel-tab a + .panel-content:hover {
-	display: block;
-}
-
-/* panel content */
-#debug-kit-toolbar .panel-content {
-	position: absolute;
-	text-align: left;
-	width: auto;
-	top:28px;
-	right:0px;
-	background: #fff;
-	color: #000;
-	width:96%;
-	padding:20px 2%;
-	max-height: 550px;
-	overflow:auto;
-	border-bottom: 3px solid #333;
-}
-
-/* Hide panel content by default */
-.panel-content {
-	display: none;
-}
-
-.panel-content p {
-	margin: 1em 0;
-}
-.panel-content h2 {
-	padding: 0;
-	margin-top:0;
-}
-.panel-content h3 {
-	padding: 0;
-	margin-top: 1em;
-}
-.panel-content .info {
-	padding: 4px;
-	border-top: 1px dashed #6c6cff;
-	border-bottom: 1px dashed #6c6cff;
-}
-
-/* panel tables */
-table.debug-table {
-	width: auto;
-	border: 0;
-}
-table.debug-table td,
-table.debug-table th {
-	text-align: left;
-	border: 0;
-	padding: 3px;
-}
-table.debug-table th {
-	border-bottom: 1px solid #222;
-	background: 0;;
-}
-table.debug-table tr.even td {
-	background:#efefef;
-}
-
-/** code tables **/
-#debug-kit-toolbar .code-table td {
-	white-space: pre;
-	font-family: monaco, corsiva, "courier new", courier, monospaced;
-}
-#debug-kit-toolbar .code-table td:first-child {
-	width: 15%;
-}
-#debug-kit-toolbar .code-table td:last-child {
-	width: 80%;
-}
-
-
-.panel-content.request {
-	display: block;
-}
-
-
-/** Neat Array styles **/
-.neat-array {
-	padding: 1px 2px 1px 20px;
-	background: #CE9E23;
-	list-style: none;
-	margin: 0;
-}
-.neat-array .neat-array {
-	padding: 0 0 0 20px;
-}
-.neat-array li {
-	background: #FEF6E5;
-	border-top: 1px solid #CE9E23;
-	border-bottom: 1px solid #CE9E23;
-	margin: 0;
-	line-height: 1.5em;
-}
-.neat-array li:hover {
-	background: #fff;
-}
-.neat-array li strong {
-	padding: 0 8px;
-}
-
-/* expandable sections */
-.neat-array li.expandable {
-	cursor: pointer;
-}
-.neat-array li.expandable.expanded > strong:before {
-	content: 'v ';
-}
-.neat-array li.expandable.collapsed > strong:before,
-.neat-array li.expandable.expanded .expandable.collapsed > strong:before {
-	content: '> ';
-}
-
-.neat-array li {
-	cursor: default;
-}
-