Attempt to disable debugging, only turning it on if needed. I did this change earlier, so I don't completely recall, but I believe this doesn't working, because it turns on debugging too late.

git-svn-id: file:///svn-source/pmgr/branches/v0.3_php5.3_support@1008 97e9348a-65ac-dc4b-aefc-98561f571b83

build.cmd

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

db/schema.sql

@@ -25,9 +25,9 @@
 -- REVISIT <AP>: 20090511
 --   By not specifying the database, the script can
 --   make the determination of which one to use.
--- DROP DATABASE IF EXISTS `property_manager`;
--- CREATE DATABASE `property_manager`;
--- USE `property_manager`;
+DROP DATABASE IF EXISTS `property_manager`;
+CREATE DATABASE `property_manager`;
+USE `property_manager`;
 
 
 -- ######################################################################
@@ -241,7 +241,7 @@ CREATE TABLE `pmgr_contacts_methods` (
 -- ######################################################################
 -- ######################################################################
 -- ##
--- ## GROUPS
+-- ## GROUPS / USERS
 -- ##
 
 
@@ -256,59 +256,15 @@ CREATE TABLE `pmgr_groups` (
   --   code may not be userful
   `code`                 VARCHAR(12) NOT NULL, -- User style "id"
   `name`                 VARCHAR(80) NOT NULL,
+
+  -- Lower ranks are given higher priority
+  `rank`                 SMALLINT UNSIGNED NOT NULL DEFAULT 100,
   `comment`              VARCHAR(255) DEFAULT NULL,
 
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_group_options
-
-DROP TABLE IF EXISTS `pmgr_group_options`;
-CREATE TABLE `pmgr_group_options` (
-  `group_id`             INT(10) UNSIGNED NOT NULL,
-  `name`                 VARCHAR(50)  NOT NULL,
-  `value`                VARCHAR(255) NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (`group_id`, `name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_group_permissions
-
-DROP TABLE IF EXISTS `pmgr_group_permissions`;
-CREATE TABLE `pmgr_group_permissions` (
-  `group_id`             INT(10) UNSIGNED NOT NULL,
-  `name`                 CHAR(30) NOT NULL,
-  `access`               ENUM('ALLOWED',
-                              'DENIED',
-                              'FORCED')
-                           NOT NULL DEFAULT 'ALLOWED',
-  `comment`              VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (`group_id`, `name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ##
--- ## USERS
--- ##
-
 
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
@@ -318,14 +274,10 @@ DROP TABLE IF EXISTS `pmgr_users`;
 CREATE TABLE `pmgr_users` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
   `code`                 VARCHAR(12) NOT NULL, -- User style "id"
-
-  -- Login details.  Passwords are not yet used (and so NULL).
-  `login`                VARCHAR(30)  NOT NULL,
-  `salt`                 CHAR(12)     DEFAULT NULL,
-  `passhash`             VARCHAR(255) DEFAULT NULL,
+  `login`                VARCHAR(30) NOT NULL,
 
   -- Contact information for this user
-  `contact_id`           INT(10) UNSIGNED NOT NULL,
+  `contact_id`           INT(10) UNSIGNED DEFAULT NULL,
 
   -- Specific comments
   `comment`              VARCHAR(255) DEFAULT NULL,
@@ -334,18 +286,208 @@ CREATE TABLE `pmgr_users` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
+
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ##
+-- ## OPTIONS
+-- ##
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_options
+
+DROP TABLE IF EXISTS `pmgr_options`;
+CREATE TABLE `pmgr_options` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `name`                 VARCHAR(50)  NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  UNIQUE KEY `name_key` (`name`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_option_values
+
+DROP TABLE IF EXISTS `pmgr_option_values`;
+CREATE TABLE `pmgr_option_values` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `option_id`            INT(10) UNSIGNED NOT NULL,
+  `value`                VARCHAR(255) NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_default_options
+
+DROP TABLE IF EXISTS `pmgr_default_options`;
+CREATE TABLE `pmgr_default_options` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `option_value_id`      INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_group_options
+
+DROP TABLE IF EXISTS `pmgr_group_options`;
+CREATE TABLE `pmgr_group_options` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `group_id`             INT(10) UNSIGNED NOT NULL,
+  `option_value_id`      INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  KEY `group_key` (`group_id`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
 -- TABLE pmgr_user_options
 
 DROP TABLE IF EXISTS `pmgr_user_options`;
 CREATE TABLE `pmgr_user_options` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
   `user_id`              INT(10) UNSIGNED NOT NULL,
-  `name`                 VARCHAR(50)  NOT NULL,
-  `value`                VARCHAR(255) NOT NULL,
+  `option_value_id`      INT(10) UNSIGNED NOT NULL,
   `comment`              VARCHAR(255) DEFAULT NULL,
+  KEY `user_key` (`user_id`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-  PRIMARY KEY (`user_id`, `name`)
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_site_options
+
+DROP TABLE IF EXISTS `pmgr_site_options`;
+CREATE TABLE `pmgr_site_options` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `site_id`              INT(10) UNSIGNED NOT NULL,
+  `option_value_id`      INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  KEY `site_key` (`site_id`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+
+
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ##
+-- ## PERMISSIONS
+-- ##
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_permissions
+
+DROP TABLE IF EXISTS `pmgr_permissions`;
+CREATE TABLE `pmgr_permissions` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `name`                 VARCHAR(50)  NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  UNIQUE KEY `name_key` (`name`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_permission_values
+
+DROP TABLE IF EXISTS `pmgr_permission_values`;
+CREATE TABLE `pmgr_permission_values` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `permission_id`        INT(10) UNSIGNED NOT NULL,
+  `access`               ENUM('ALLOW',
+                              'DENY')
+                           NOT NULL DEFAULT 'DENY',
+  `level`                SMALLINT UNSIGNED DEFAULT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_default_permissions
+
+DROP TABLE IF EXISTS `pmgr_default_permissions`;
+CREATE TABLE `pmgr_default_permissions` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `permission_value_id`  INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_group_permissions
+
+DROP TABLE IF EXISTS `pmgr_group_permissions`;
+CREATE TABLE `pmgr_group_permissions` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `group_id`             INT(10) UNSIGNED NOT NULL,
+  `permission_value_id`  INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  KEY `group_key` (`group_id`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_user_permissions
+
+DROP TABLE IF EXISTS `pmgr_user_permissions`;
+CREATE TABLE `pmgr_user_permissions` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `user_id`              INT(10) UNSIGNED NOT NULL,
+  `permission_value_id`  INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  KEY `user_key` (`user_id`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_site_permissions
+
+DROP TABLE IF EXISTS `pmgr_site_permissions`;
+CREATE TABLE `pmgr_site_permissions` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `site_id`              INT(10) UNSIGNED NOT NULL,
+  `permission_value_id`  INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  KEY `site_key` (`site_id`),
+  PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
@@ -380,46 +522,6 @@ CREATE TABLE `pmgr_sites` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_site_options
-
-DROP TABLE IF EXISTS `pmgr_site_options`;
-CREATE TABLE `pmgr_site_options` (
-  `site_id`              INT(10) UNSIGNED NOT NULL,
-  `name`                 VARCHAR(50)  NOT NULL,
-  `value`                VARCHAR(255) NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (`site_id`, `name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_site_memberships
---
--- Which users are allowed to access which sites,
--- and under which set of group permissions (possibly multiple)
-
--- SELECT U.id, P.name, MAX(P.access)
---  FROM pmgr_users U
---    LEFT JOIN pmgr_site_membership   M ON M.user_id = U.id
---    LEFT JOIN pmgr_groups            G ON G.id = M.group_id
---    LEFT JOIN pmgr_group_permissions P ON P.group_id = G.id
--- GROUP BY U.id, P.name
-
-DROP TABLE IF EXISTS `pmgr_site_memberships`;
-CREATE TABLE `pmgr_site_memberships` (
-  `site_id`              INT(10) UNSIGNED NOT NULL,
-  `user_id`              INT(10) UNSIGNED NOT NULL,
-  `group_id`             INT(10) UNSIGNED NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (`site_id`, `user_id`, `group_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
 -- TABLE pmgr_site_areas
@@ -437,6 +539,38 @@ CREATE TABLE `pmgr_site_areas` (
 
 
 
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ##
+-- ## MEMBERSHIPS
+-- ##
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_memberships
+--
+-- Which users are allowed to access which sites,
+-- and under which set of group permissions (possibly multiple)
+
+DROP TABLE IF EXISTS `pmgr_memberships`;
+CREATE TABLE `pmgr_memberships` (
+  `site_id`              INT(10) UNSIGNED NOT NULL,
+  `user_id`              INT(10) UNSIGNED NOT NULL,
+  `group_id`             INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`site_id`, `user_id`, `group_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
 -- ######################################################################
 -- ######################################################################
 -- ######################################################################
@@ -475,8 +609,6 @@ CREATE TABLE `pmgr_units` (
                               'LIENED')
                            NOT NULL DEFAULT 'VACANT',
 
-  `current_lease_id`     INT(10) UNSIGNED DEFAULT NULL,
-
   `sort_order`           MEDIUMINT UNSIGNED NOT NULL,
   `walk_order`           MEDIUMINT UNSIGNED NOT NULL,
 
@@ -878,7 +1010,7 @@ INSERT INTO `pmgr_accounts` (`type`, `name`)
   VALUES
   ('ASSET',      'A/R'                ),
   ('LIABILITY',  'A/P'                ),
-  ('LIABILITY',  'Customer Credit'    );
+  ('LIABILITY',  'Credit'             );
 INSERT INTO `pmgr_accounts` (`type`, `name`, `receipts`)
   VALUES
   ('ASSET',      'Cash',              1),
@@ -971,6 +1103,7 @@ CREATE TABLE `pmgr_transactions` (
 			      'CREDIT_NOTE', -- Inverse of Sales Invoice
 			      'PAYMENT', -- Actual payment
                               'DEPOSIT',
+                              'AUTO_DEPOSIT', -- Fundamentally same as DEPOSIT
                               'WITHDRAWAL',
                               'CLOSE',   -- Essentially an internal (not accounting) transaction
 --                               'CREDIT',
@@ -1148,6 +1281,9 @@ CREATE TABLE `pmgr_tender_types` (
   -- include credit cards, debit cards, and ACH transfers.
   `tillable`             TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
 
+  -- Should these items be deposited automatically?
+  `auto_deposit`         TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
+
   -- Names of the 4 data fields (or NULL if not used)
   -- Not the most robust of solutions, especially since
   -- it requires (or strongly implicates) that all fields
@@ -1171,6 +1307,10 @@ CREATE TABLE `pmgr_tender_types` (
   -- account, either distinct or non-distinct from others
   `account_id`           INT(10) UNSIGNED NOT NULL,
   
+  -- Which account should these items be deposited in?
+  -- This may or may not actually be used for all types
+  -- but will likely get used for auto deposit items.
+  `deposit_account_id`   INT(10) UNSIGNED DEFAULT NULL,
 
   `comment`              VARCHAR(255) DEFAULT NULL,
 
@@ -1220,6 +1360,8 @@ CREATE TABLE `pmgr_tenders` (
   `ledger_entry_id`        INT(10) UNSIGNED NOT NULL,
   -- The ledger entry if this tender is marked NSF
   `nsf_ledger_entry_id`    INT(10) UNSIGNED DEFAULT NULL,
+  -- The ledger entry if this actual deposit transaction
+  `deposit_ledger_entry_id` INT(10) UNSIGNED DEFAULT NULL,
   -- The deposit transaction that included these monies
   `deposit_transaction_id` INT(10) UNSIGNED DEFAULT NULL,
   -- The NSF transaction coming back from the bank.

db/scratch.sql

@@ -1,85 +0,0 @@
--- Delete bad transaction(s)
-DELETE M
- FROM 
- pmgr_ledger_entries LE,
- pmgr_tenders M
- WHERE 
- M.ledger_entry_id = LE.id AND
- LE.transaction_id
- IN (467);
-DELETE LE
- FROM 
- pmgr_ledger_entries LE
- WHERE 
- LE.transaction_id
- IN (467);
-DELETE SE
- FROM 
- pmgr_statement_entries SE
- WHERE 
- SE.transaction_id
- IN (467);
-DELETE T
- FROM 
- pmgr_transactions T
- WHERE 
- T.id
- IN (467);
-
--- Delete bad transaction, one variable setting
-SET @tid = 467;
-DELETE M FROM  pmgr_ledger_entries LE, pmgr_tenders M
- WHERE M.ledger_entry_id = LE.id AND LE.transaction_id = @tid;
-DELETE LE FROM pmgr_ledger_entries LE
- WHERE LE.transaction_id = @tid;
-DELETE SE FROM pmgr_statement_entries SE
- WHERE SE.transaction_id = @tid;
-DELETE T FROM pmgr_transactions T
- WHERE T.id = @tid;
-
-
--- Determine economic conditions
-SELECT `status`, COUNT(id), SUM(rent) FROM pmgr_units
-GROUP BY `status` WITH ROLLUP;
-
-
--- Check that transaction totals add up correctly
-SELECT T.id, T.type, T.amount,
--- T.type, A.type, E.crdr,
- SUM(IF(E.account_id = T.account_id,
-        IF(A.type IN ('ASSET','EXPENSE') XOR E.crdr='DEBIT',-1,1),0)
-     *E.amount) AS Tamt,  
- SUM(IF(E.account_id = T.account_id,
-        0,IF(A.type IN ('ASSET','EXPENSE') XOR E.crdr='DEBIT',-1,1))
-     *E.amount) AS Oamt,  
- COUNT(E.id) AS Ecnt
-FROM pmgr_transactions T
--- LEFT JOIN pmgr_statement_entries E ON E.transaction_id = T.id  
- LEFT JOIN pmgr_ledger_entries E ON E.transaction_id = T.id 
- LEFT JOIN pmgr_accounts A ON A.id = T.account_id -- E.account_id
--- WHERE 
- -- E.account_id != T.account_id
- GROUP BY T.id 
-   HAVING
-    (T.type = 'INVOICE' AND Tamt <> T.amount) 
-      OR      
-    (T.type <> 'INVOICE' AND Oamt <> T.amount)    
-      OR      
-    (Tamt * -1 <> Oamt)
-
-
--- Verify that statement entries all have the correct type
-SELECT SE.id, SE.type, T.id, T.type
- FROM pmgr_statement_entries SE
- LEFT JOIN pmgr_transactions T ON T.id = SE.transaction_id 
-WHERE
- ((T.type = 'RECEIPT' OR T.type = 'CREDIT_NOTE') AND
-  SE.type NOT IN ('DISBURSEMENT', 'WAIVER', 'REVERSAL', 'WRITEOFF', 'SURPLUS')
- ) 
- OR
- ((T.type = 'INVOICE' OR T.type = 'PAYMENT') AND
-  SE.type NOT IN ('CHARGE', 'PAYMENT', 'REFUND')
- )  
- -- catch other types not considered in this query
- OR T.type NOT IN ('RECEIPT', 'CREDIT_NOTE', 'INVOICE', 'PAYMENT')
-

requirements.txt

@@ -1,68 +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
- ? - 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
- ? - 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
- X - Flag unit as overlocked
- X - Flag unit as evicting
- X - Flag unit as normal status
- X - Flag unit as dirty
-   - Enter notes when communicating with Customer
- X - Accept pre-payments
- X - Record Customer Move-Out from Unit
- X - Record utilization of Security Deposit
- X - Record issuing of a refund
-   - Record Deposit into Petty Cash
-   - Record Payment from Petty Cash to expenses
- X - Record Petty Cash to refund.
- X - Write Off Bad Debt
- X - Perform a Deposit
- X - Close the Books (nightly / weekly, etc)
- X - Determine Rents Collected for a given period.

site/.htaccess

@@ -2,4 +2,24 @@
     RewriteEngine on
     RewriteRule    ^$    webroot/    [L]
     RewriteRule    (.*) webroot/$1    [L]
- </IfModule>
+ </IfModule>
+
+# Lets deny everyone -- its a clean slate!
+order deny,allow
+deny from all
+
+# Now allow local access
+# Localhost
+# allow from 127.0.0
+# Local subnet
+# allow from 192.168.7
+
+# Provide a mechanism for user authentication
+AuthType Digest
+AuthName "Property Manager"
+AuthUserFile "D:/Website/auth/pmgr.htpasswd"
+Require valid-user
+
+# Instead of satisfy all (too restrictive)
+# This allows EITHER local domain OR authenticated user
+satisfy any

site/app_controller.php

@@ -35,16 +35,350 @@
  * @subpackage    cake.app
  */
 class AppController extends Controller {
+  var $uses = array('Option', 'Permission');
   var $helpers = array('Html', 'Form', 'Javascript', 'Format', 'Time', 'Grid');
   var $components = array('DebugKit.Toolbar');
 
+  var $sidemenu   = array('areas' => array('SITE' => false, 'REPORT' => false, 'CONTROLLER' => false, 'ACTION' => false, 'SANDBOX' => false));
+  var $std_area   = 10;
+  var $admin_area = 20;
+  var $dev_area   = 30;
+  var $op_area    = 40;
+  var $new_area   = 50;
+
   function __construct() {
     $this->params['dev']   = false;
     $this->params['admin'] = false;
     parent::__construct();
   }
 
-  function sideMenuLinks() {
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: dev/admin()
+   *  - Indicates if the user has dev/admin access
+   */
+  function dev()   { return !empty($this->params['dev']); }
+  function admin() { return !empty($this->params['admin']); }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: sideMenuAreaVerify
+   *  - Verifies the validity of the sidemenu area/subarea/priority,
+   *    and ensures the class member is set to appropriately handle it.
+   */
+
+  function sideMenuAreaVerify(&$area, $subarea, $priority = null) {
+    $area = strtoupper($area);
+    if (!array_key_exists($area, $this->sidemenu['areas']))
+      $this->INTERNAL_ERROR("Sidemenu link '{$area}': Unknown");
+
+    if ($area == 'SITE')
+      $name = 'Navigation';
+    elseif ($area == 'CONTROLLER')
+      $name = Inflector::humanize($this->params['controller']);
+    elseif ($area == 'ACTION')
+      $name = Inflector::humanize(Inflector::singularize($this->params['controller']));
+    elseif ($area == 'REPORT')
+      $name = 'Reports';
+    elseif ($area == 'SANDBOX')
+      $name = 'Sandbox';
+
+    if (empty($this->sidemenu['areas'][$area]))
+      $this->sidemenu['areas'][$area]
+	= array('enable' => true, 'name' => $name, 'subareas' => array());
+
+    if (empty($subarea))
+      return;
+
+    $subname = $name;
+    if ($subarea == $this->std_area)
+      $subname .= '';
+    elseif ($subarea == $this->op_area)
+      //$subname .= '-Ops';
+      $subname = 'Actions';
+    elseif ($subarea == $this->new_area)
+      //$subname .= '-New';
+      $subname = 'Creation';
+    elseif ($subarea == $this->admin_area)
+      $subname .= '-Admin';
+    elseif ($subarea == $this->dev_area)
+      $subname .= '-Dev';
+    else
+      $subname .= '-' . $subarea;
+
+    if (empty($this->sidemenu['areas'][$area]['subareas'][$subarea]))
+	$this->sidemenu['areas'][$area]['subareas'][$subarea]
+	  = array('enable' => true, 'name' => $subname, 'priorities' => array());
+
+    if (empty($priority))
+      return;
+
+    if (empty($this->sidemenu['areas'][$area]['subareas'][$subarea]['priorities'][$priority]))
+      $this->sidemenu['areas'][$area]['subareas'][$subarea]['priorities'][$priority]
+	= array();
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: sideMenuAreaName
+   *  - Sets the name of the sidemenu area/subarea
+   */
+
+  function sideMenuAreaName($name, $area, $subarea = null) {
+    $this->sideMenuAreaVerify($area, $subarea);
+    if (empty($subarea))
+      $this->sidemenu['areas'][$area]['name'] = $name;
+    else
+      $this->sidemenu['areas'][$area]['subareas'][$subarea]['name'] = $name;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: sideMenuAreaActivate
+   *  - Sets the selected area/subarea to be active when the
+   *    page is first loaded.
+   */
+
+  function sideMenuAreaActivate($area, $subarea = null) {
+    $this->sidemenu['active'] = compact('area', 'subarea');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: sideMenuEnable
+   *  - Enables/Disables an area or subarea of the sidemenu
+   */
+
+  function sideMenuEnable($area, $subarea = null, $enable = true) {
+    $this->sideMenuAreaVerify($area, $subarea);
+    if (isset($subarea))
+      $this->sidemenu['areas'][$area]['subareas'][$subarea]['enable'] = $enable;
+    else
+      $this->sidemenu['areas'][$area]['enable'] = $enable;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addSideMenuLink
+   *  - Adds another link to the sidemenu area/subarea/priority
+   */
+
+  function addSideMenuLink($name, $url, $extra, $area, $subarea = null, $priority = 10) {
+    if (empty($subarea))
+      $subarea = $this->std_area;
+    $this->sideMenuAreaVerify($area, $subarea);
+    $this->sidemenu['areas'][$area]['subareas'][$subarea]['priorities'][$priority][]
+      = array('name' => $name, 'url' => $url) + (empty($extra) ? array() : $extra);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addDefaultSideMenuLinks
+   *  - Adds the standard links present on all generated pages
+   */
+
+  function addDefaultSideMenuLinks() {
+
+    $this->addSideMenuLink('Site Map',
+			   array('controller' => 'maps', 'action' => 'view', 1), null,
+			   'SITE');
+    $this->addSideMenuLink('Unit Sizes',
+			   array('controller' => 'unit_sizes', 'action' => 'index'), null,
+			   'SITE');
+    $this->addSideMenuLink('Units',
+			   array('controller' => 'units', 'action' => 'index'), null,
+			   'SITE');
+    $this->addSideMenuLink('Leases',
+			   array('controller' => 'leases', 'action' => 'index'), null,
+			   'SITE');
+    $this->addSideMenuLink('Customers',
+			   array('controller' => 'customers', 'action' => 'index'), null,
+			   'SITE');
+    $this->addSideMenuLink('Deposits',
+			   array('controller' => 'transactions', 'action' => 'deposit'), null,
+			   'SITE');
+
+    $this->addSideMenuLink('Accounts',
+			   array('controller' => 'accounts', 'action' => 'index'), null,
+			   'SITE', $this->admin_area);
+    $this->addSideMenuLink('Contacts',
+			   array('controller' => 'contacts', 'action' => 'index'), null,
+			   'SITE', $this->admin_area);
+    $this->addSideMenuLink('Ledgers',
+			   array('controller' => 'ledgers', 'action' => 'index'), null,
+			   'SITE', $this->admin_area);
+    $this->addSideMenuLink('Tenders',
+			   array('controller' => 'tenders', 'action' => 'index'), null,
+			   'SITE', $this->admin_area);
+    $this->addSideMenuLink('Transactions',
+			   array('controller' => 'transactions', 'action' => 'index'), null,
+			   'SITE', $this->admin_area);
+    $this->addSideMenuLink('Ldgr Entries',
+			   array('controller' => 'ledger_entries', 'action' => 'index'), null,
+			   'SITE', $this->admin_area);
+    $this->addSideMenuLink('Stmt Entries',
+			   array('controller' => 'statement_entries', 'action' => 'index'), null,
+			   'SITE', $this->admin_area);
+
+    $this->addSideMenuLink('Un-Nuke',
+			   '#', array('htmlAttributes' =>
+				      array('onclick' => '$(".pr-section").show(); return false;')),
+			   'SITE', $this->dev_area);
+    $this->addSideMenuLink('New Ledgers',
+			   array('controller' => 'accounts', 'action' => 'newledger'), null,
+			   'SITE', $this->dev_area);
+    //array('name' => 'RESET DATA',  array('controller' => 'accounts', 'action' => 'reset_data'));
+
+
+    $this->addSideMenuLink('New Receipt',
+			   array('controller' => 'customers', 'action' => 'receipt'), null,
+			   'SITE', $this->op_area);
+    $this->addSideMenuLink('New Invoice',
+			   array('controller' => 'leases', 'action' => 'invoice'), null,
+			   'SITE', $this->op_area);
+    $this->addSideMenuLink('Move-In',
+			   array('controller' => 'customers', 'action' => 'move_in'), null,
+			   'SITE', $this->op_area);
+    $this->addSideMenuLink('Move-Out',
+			   array('controller' => 'leases', 'action' => 'move_out'), null,
+			   'SITE', $this->op_area);
+    $this->addSideMenuLink('New Deposit',
+			   array('controller' => 'tenders', 'action' => 'deposit'), null,
+			   'SITE', $this->op_area);
+    if ($this->admin())
+      $this->addSideMenuLink('Assess Charges',
+			     array('controller' => 'leases', 'action' => 'assess_all'), null,
+			     'SITE', $this->op_area);
+
+    if ($this->admin()) {
+      $acct = new Account;
+      $this->addSideMenuLink('Collected Rent',
+			     array('controller' => 'accounts',
+				   'action' => 'collected',
+				   $acct->rentAccountID()), null,
+			     'REPORT');
+      $this->addSideMenuLink('Unpaid Charges',
+			     array('controller' => 'statement_entries', 'action' => 'unpaid'), null,
+			     'REPORT');
+      $this->addSideMenuLink('Lease Up',
+			     array('controller' => 'leases', 'action' => 'overview'), null,
+			     'REPORT');
+      $this->addSideMenuLink('Unit Summary',
+			     array('controller' => 'units', 'action' => 'overview'), null,
+			     'REPORT');
+      $this->addSideMenuLink('Monthly Charges',
+			     array('controller' => 'statement_entries', 'action' => 'chargesbymonth'), null,
+			     'REPORT');
+    }
+    else {
+      $this->sideMenuEnable('REPORT', null, false);
+    }
+
+
+
+
+    $url_components = array('plugin', 'controller', 'action', 'named');
+    if (devbox()) {
+/*       $sources = ConnectionManager::sourceList(); */
+/*       $db = ConnectionManager::getDataSource($sources[0])->config['database']; */
+/*       $this->sideMenuAreaName($db, 'SANDBOX', $this->std_area); */
+      $this->sideMenuAreaName('DevBox', 'SANDBOX', $this->std_area);
+      $this->addSideMenuLink('Rebuild DevBox',
+			     array('controller' => 'util', 'action' => 'rebuild_devbox'), null,
+			     'SANDBOX');
+    }
+    elseif (sandbox()) {
+      $this->addSideMenuLink('Rebuild Sandbox',
+			     array('controller' => 'util', 'action' => 'rebuild_sandbox'), null,
+			     'SANDBOX');
+      $this->addSideMenuLink('Leave Sandbox',
+			     array('sand_route' => false)
+			     + array_intersect_key($this->params, array_flip($url_components))
+			     + $this->params['pass'],
+			     null, 'SANDBOX');
+    }
+    else {
+      $this->addSideMenuLink('Enter Sandbox',
+			     array('sand_route' => true)
+			     + array_intersect_key($this->params, array_flip($url_components))
+			     + $this->params['pass'],
+			     null, 'SANDBOX');
+    }
+
+    // REVISIT <AP>: 20090824
+    //  Depending on preference, we may put this into the gridView
+    //  function, making the links available only when navigating.
+    $this->addGridViewSideMenuLinks();
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * virtual: addGridViewSideMenuLinks
+   *  - Adds the grid view specific navigation links, if overridden.
+   */
+
+  function addGridViewSideMenuLinks() {
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * hook: beforeFilter
+   *  - Called just before the action function
+   */
+
+  function beforeFilter() {
+    $this->params['user']  = $this->Permission->User->currentUser();
+    $this->params['admin'] = $this->Option->enabled('admin');
+    $this->params['dev']   = devbox();
+
+    if ($this->dev() && !$this->Option->enabled('dev'))
+      $this->redirect("/");
+
+    if ($this->dev())
+      Configure::write('debug', 2);
+
+    $this->addDefaultSideMenuLinks();
+    //$this->sideMenuEnable('SITE', $this->op_area, false);
+
+    foreach ($this->sidemenu['areas'] AS $area_name => $area) {
+      if (!$this->dev())
+	$this->sideMenuEnable($area_name, $this->dev_area, false);
+      if (!$this->admin())
+	$this->sideMenuEnable($area_name, $this->admin_area, false);
+    }
+
+    $this->authorize("controller.{$this->params['controller']}");
+    $this->authorize("action.{$this->params['controller']}.{$this->params['action']}");
+
+    $this->log('----------------------------------------------------------------------', 'request');
+    $this->log('----------------------------------------------------------------------', 'request');
+    $this->log($this->params, 'request');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * hook: beforeRender
+   *  - Called just before rendering the page
+   */
+
+  function beforeRender() {
     // Stupid Cake... our constructor sets admin/dev,
     // but cake stomps it somewhere along the way
     // after constructing the CakeError controller.
@@ -53,51 +387,63 @@ class AppController extends Controller {
       $this->params['admin'] = false;
     }
 
-    $menu = array();
-    $menu[] = array('name' => 'Common',      'header' => true);
-    $menu[] = array('name' => 'Site Map',    'url' => array('controller' => 'maps',       'action' => 'view', 1));
-    $menu[] = array('name' => 'Units',       'url' => array('controller' => 'units',      'action' => 'index'));
-    $menu[] = array('name' => 'Leases',      'url' => array('controller' => 'leases',     'action' => 'index'));
-    $menu[] = array('name' => 'Customers',   'url' => array('controller' => 'customers',  'action' => 'index'));
-    $menu[] = array('name' => 'Deposits',    'url' => array('controller' => 'transactions', 'action' => 'deposit'));
+    foreach ($this->sidemenu['areas'] AS $aname => &$area) {
+      if (empty($area['enable']))
+	$area = array();
+      if (empty($area['subareas']))
+	continue;
+      ksort($area['subareas']);
 
-    if ($this->params['admin']) {
-      $menu[] = array('name' => 'Admin',      'header' => true);
-      $menu[] = array('name' => 'Accounts',    'url' => array('controller' => 'accounts',   'action' => 'index'));
-      $menu[] = array('name' => 'Contacts',    'url' => array('controller' => 'contacts',   'action' => 'index'));
-      $menu[] = array('name' => 'Ledgers',     'url' => array('controller' => 'ledgers',    'action' => 'index'));
-      $menu[] = array('name' => 'Tenders',     'url' => array('controller' => 'tenders', 'action' => 'index'));
-      $menu[] = array('name' => 'Transactions', 'url' => array('controller' => 'transactions', 'action' => 'index'));
-      $menu[] = array('name' => 'Ldgr Entries', 'url' => array('controller' => 'ledger_entries', 'action' => 'index'));
-      $menu[] = array('name' => 'Stmt Entries', 'url' => array('controller' => 'statement_entries', 'action' => 'index'));
-      $menu[] = array('name' => 'New Ledgers', 'url' => array('controller' => 'accounts',   'action' => 'newledger'));
-      $menu[] = array('name' => 'Assess Charges', 'url' => array('controller' => 'leases', 'action' => 'assess_all'));
+      foreach ($area['subareas'] AS $sname => &$subarea) {
+	if (empty($subarea['enable']))
+	  $subarea = array();
+	if (empty($subarea['priorities']))
+	  continue;
+	ksort($subarea['priorities']);
+
+	foreach ($subarea['priorities'] AS $pname => &$priority) {
+	  if (empty($priority))
+	    unset($subarea['priorities'][$pname]);
+	}
+	unset($priority);
+
+	if (empty($subarea['priorities']))
+	  unset($area['subareas'][$sname]);
+      }
+      unset($subarea);
+
+      if (empty($area['subareas']))
+	unset($this->sidemenu['areas'][$aname]);
+    }
+    unset($area);
+
+    // Activate a default section (unless already specified)
+    foreach (array_reverse(array_diff_key($this->sidemenu['areas'], array('SANDBOX'=>1))) AS $area_name => $area) {
+      if (empty($area))
+	continue;
+
+      if (empty($this->sidemenu['active']) ||
+	  empty($this->sidemenu['areas'][$this->sidemenu['active']['area']]))
+	$this->sideMenuAreaActivate($area_name);
     }
 
-    if ($this->params['dev']) {
-      $menu[] = array('name' => 'Development', 'header' => true);
-      $menu[] = array('name' => 'Un-Nuke',    'url' => '#', 'htmlAttributes' =>
-		      array('onclick' => '$(".pr-section").show(); return false;'));
-      $menu[] = array('name' => 'New Ledgers', 'url' => array('controller' => 'accounts',    'action' => 'newledger'));
-      //array('name' => 'RESET DATA',  'url' => array('controller' => 'accounts',   'action' => 'reset_data'));
-    }
+    // If generating reports, don't display the controller menu.
+    // Each report comes from a controller, but there is no need
+    // to present the controller actions, so remove that section
+    // from the menu.
+    if ($this->sidemenu['active']['area'] == 'REPORT')
+      $this->sideMenuEnable('CONTROLLER', null, false);
 
-    return $menu;
+    //pr($this->sidemenu);
+    $this->set('sidemenu', $this->sidemenu);
   }
 
-  function beforeFilter() {
-    $this->params['dev'] =
-      (!empty($this->params['dev_route']));
-    $this->params['admin'] =
-      (!empty($this->params['admin_route']) || !empty($this->params['dev_route']));
 
-    if (!$this->params['dev'])
-      Configure::write('debug', '0');
-  }
-
-  function beforeRender() {
-    $this->set('sidemenu', $this->sideMenuLinks());
-  }
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: redirect
+   */
 
   function redirect($url, $status = null, $exit = true) {
     // OK, since the controller will not be able to
@@ -127,28 +473,6 @@ class AppController extends Controller {
     return parent::redirect($url, $status, $exit);
   }
 
-  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);
-  }
-
 
   /**************************************************************************
    **************************************************************************
@@ -156,8 +480,14 @@ class AppController extends Controller {
    * helper: gridView
    *  - called by derived controllers to create an index listing
    */
+  function index() {
+    $names = Inflector::humanize(Inflector::pluralize($this->params['controller']));
+    $this->gridView('All ' . $names, 'all');
+  }
 
   function gridView($title, $action = null, $element = null) {
+    $this->sideMenuEnable('SITE', $this->op_area);
+    $this->sideMenuAreaActivate('CONTROLLER');
     $this->set('title', $title);
     // The resulting page will contain a grid, which will
     // use ajax to obtain the actual data for this action
@@ -294,6 +624,7 @@ class AppController extends Controller {
       $xml = preg_replace("/</", "&lt;", $xml);
       $xml = preg_replace("/>/", "&gt;", $xml);
       echo ("\n<PRE>\n$xml\n</PRE>\n");
+      $this->render_empty();
     }
   }
 
@@ -314,15 +645,12 @@ class AppController extends Controller {
     // Grouping (which would not be typical)
     $query['group'] = $this->gridDataCountGroup($params, $model);
 
-    // DEBUG PURPOSES ONLY!
-    $params['count_query'] = $query;
-
     // Get the number of records prior to pagination
     return $this->gridDataCountExecute($params, $model, $query);
   }
 
   function gridDataCountExecute(&$params, &$model, $query) {
-    return $model->find('count', $query);
+    return $this->gridDataFind($params, $model, 'count', $query);
   }
 
   function gridDataCountTables(&$params, &$model) {
@@ -540,6 +868,9 @@ class AppController extends Controller {
     $page  = ($params['page'] <= 1) ? 1 : (($params['page'] > $total) ? $total : $params['page']);
     $start = $limit * ($page - 1);
 
+    // Adjust the limit upward, if multiple pages were requested.
+    $limit *= empty($params['npage']) ? 1 : $params['npage'];
+
     return compact('record_count', 'limit', 'page', 'start', 'total');
   }
 
@@ -571,14 +902,11 @@ class AppController extends Controller {
 					      isset($params['sidx']) ? $params['sidx'] : null,
 					      isset($params['sord']) ? $params['sord'] : null);
 
-    // DEBUG PURPOSES ONLY!
-    $params['query'] = $query;
-
     return $this->gridDataRecordsExecute($params, $model, $query);
   }
 
   function gridDataRecordsExecute(&$params, &$model, $query) {
-    return $model->find('all', $query);
+    return $this->gridDataFind($params, $model, 'all', $query);
   }
 
   function gridDataTables(&$params, &$model) {
@@ -620,12 +948,24 @@ class AppController extends Controller {
 			  'value' => $params['filtValue']);
     }
 
+    // Translate a user specified date into the SQL date format
+    foreach ($searches AS &$search) {
+      if (preg_match('/(_date|stamp)$/', $search['field']) &&
+	  preg_match('%(\d{1,2})[-/](\d{1,2})[-/](\d{2,4})%', $search['value'], $matches)) {
+	$search['value'] = sprintf('%04d%02d%02d',
+				   $matches[3] + ($matches[3] < 50 ? 2000 : ($matches[3] < 100 ? 1900 : 0)),
+				   $matches[2], $matches[1]);
+      }
+    }
+    unset($search);
+
     $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' => ''),
+		 'in' => array('op' => 'IN',   'pre' => '(', 'post' => ')'),
 		 'bw' => array('op' => 'LIKE', 'pre' => '',  'post' => '%'),
 		 'ew' => array('op' => 'LIKE', 'pre' => '%', 'post' => ''),
 		 'cn' => array('op' => 'LIKE', 'pre' => '%', 'post' => '%'),
@@ -675,6 +1015,13 @@ class AppController extends Controller {
     return $start . ', ' . $limit;
   }
 
+  function gridDataFind(&$params, &$model, $type, $query) {
+    if ($params['debug'])
+      $params['queries'][] = compact('type', 'query');
+
+    return $model->find($type, $query);
+  }
+
 
   /**************************************************************************
    **************************************************************************
@@ -695,6 +1042,7 @@ class AppController extends Controller {
     $this->gridDataPostProcessLinks($params, $model, $records, array());
 
     // DEBUG PURPOSES ONLY!
+    //if ($params['debug'])
     //$params['records'] = $records;
   }
 
@@ -772,6 +1120,7 @@ class AppController extends Controller {
 	    continue;
 
 	  // DEBUG PURPOSES ONLY!
+	  //if ($params['debug'])
 	  //$params['linkrecord'][] = compact('table', 'field', 'id', 'controller', 'record');
 	  $record[$table][$field] =
 	    '<A HREF="' .
@@ -802,9 +1151,8 @@ class AppController extends Controller {
   }
 
   function gridDataOutputHeader(&$params, &$model) {
-    if (!$params['debug']) {
+    if (!$params['debug'])
       header("Content-type: text/xml;charset=utf-8");
-    }
   }
 
   function gridDataOutputXMLHeader(&$params, &$model) {
@@ -820,7 +1168,8 @@ class AppController extends Controller {
   }
 
   function gridDataOutputSummary(&$params, &$model, $pagination) {
-    echo " <params><![CDATA[\n" . print_r($params, true) . "\n]]></params>\n";
+    if ($params['debug'])
+      echo " <params><![CDATA[\n" . print_r($params, true) . "\n]]></params>\n";
     echo " <page>{$pagination['page']}</page>\n";
     echo " <total>{$pagination['total']}</total>\n";
     echo " <records>{$pagination['record_count']}</records>\n";
@@ -861,20 +1210,32 @@ class AppController extends Controller {
 
   function gridDataOutputRecordCell(&$params, &$model, &$record, $field, $data) {
     // be sure to put text data in CDATA
-    if (preg_match("/^\d*$/", $data))
+    if (preg_match("/^[\d.]*$/", $data))
       echo "  <cell>$data</cell>\n"; 
     else
       echo "  <cell><![CDATA[$data]]></cell>\n"; 
   }
 
+  function authorize($name) {
+    if ($this->Permission->deny($name))
+      $this->UNAUTHORIZED("Unauthorized: $name");
+  }
+
+  function UNAUTHORIZED($msg) {
+    //$this->redirect('controller' => '???', 'action' => 'login');
+    //$this->render('/unauthorized');
+    $this->set('message', '<H2>' . $msg . '</H2>');
+    $this->render_empty();
+  }
+
   function INTERNAL_ERROR($msg, $depth = 0) {
     INTERNAL_ERROR($msg, false, $depth+1);
     $this->render_empty();
-    $this->_stop();
   }
 
   function render_empty() {
-    $this->render('/empty');
+    echo $this->render('/empty');
+    $this->_stop();
   }
 
 }

site/app_helper.php

@@ -39,7 +39,7 @@ App::import('Core', 'Helper');
 class AppHelper extends Helper {
 
   function url($url = null, $full = false) {
-    foreach(array('admin_route', 'dev_route') AS $mod) {
+    foreach(array('sand_route', 'dev_route') AS $mod) {
       if (isset($this->params[$mod]) && is_array($url) && !isset($url[$mod]))
             $url[$mod] = $this->params[$mod];
     }

site/app_model.php

@@ -42,6 +42,10 @@ class AppModel extends Model {
   var $useNullForEmpty = true;
   var $formatDateFields = true;
 
+  // Loaded related models with no association
+  var $knows = array();
+  var $app_knows = array('Option');
+
   // Default Log Level, if not specified at the function level
   var $default_log_level = 5;
 
@@ -58,16 +62,35 @@ class AppModel extends Model {
   var $max_log_level;
 
 
-  // REVISIT <AP>: 20090730
-  //  Why is this constructor crashing?
-  //  Clearly it's in some sort of infinite
-  //  loop, but it seems the correct way
-  //  to have a constructor call the parent...
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: __construct
+   */
+
+  function __construct($id = false, $table = null, $ds = null) {
+    parent::__construct($id, $table, $ds);
+
+    $this->knows = array_merge($this->app_knows, $this->knows);
+    //$this->pr(1, array('knows' => $this->knows));
+    foreach ($this->knows as $alias => $modelName) {
+      if (is_numeric($alias)) {
+	$alias = $modelName;
+      }
+
+      // Don't overwrite any existing alias
+      if (!empty($this->{$alias}) || get_class($this) == $alias)
+	continue;
+
+      $model = array('class' => $modelName, 'alias' => $alias);
+      if (PHP5) {
+	$this->{$alias} = ClassRegistry::init($model);
+      } else {
+	$this->{$alias} =& ClassRegistry::init($model);
+      }
+    }
+  }
 
-/*   function __construct() { */
-/*     parent::__construct(); */
-/*     $this->prClassLevel(5, 'Model'); */
-/*   } */
 
   /**************************************************************************
    **************************************************************************
@@ -81,7 +104,8 @@ class AppModel extends Model {
     $caller = array_shift($trace);
     $caller = array_shift($trace);
     if (empty($class))
-      $class = $caller['class'];
+      $class = get_class($this);
+    $this->pr(50, compact('class', 'level'));
     $this->class_log_level[$class] = $level;
   }
 
@@ -90,9 +114,10 @@ class AppModel extends Model {
     $caller = array_shift($trace);
     $caller = array_shift($trace);
     if (empty($class))
-      $class = $caller['class'];
+      $class = get_class($this);
     if (empty($function))
       $function = $caller['function'];
+    $this->pr(50, compact('class', 'function', 'level'));
     $this->function_log_level["{$class}-{$function}"] = $level;
   }
 
@@ -280,7 +305,9 @@ class AppModel extends Model {
       if (preg_match("/^_/", $name) && !$all)
 	unset($vars[$name]);
     }
-    pr($vars);
+    //$vars['class'] = get_class_vars(get_class($this));
+
+    $this->pr(1, $vars);
   }
 
 
@@ -480,9 +507,9 @@ class AppModel extends Model {
       return date('Y-m-d', strtotime($dateString));
   }
 
-  function INTERNAL_ERROR($msg, $depth = 0) {
-    INTERNAL_ERROR($msg, false, $depth+1);
-    echo $this->requestAction(array('controller' => 'accounts',
+  function INTERNAL_ERROR($msg, $depth = 0, $force_stop = false) {
+    INTERNAL_ERROR($msg, $force_stop, $depth+1);
+    echo $this->requestAction(array('controller' => 'util',
 				    'action' => 'render_empty'),
 			      array('return', 'bare' => false)
 			      );

site/build_devbox.cmd

@@ -0,0 +1,5 @@
+@echo off
+mysqldump --user=pmgr --password=pmgruser --opt property_manager > H:\pmgr_dev.sql
+mysql --user=pmgr --password=pmgruser --database=pmgr_dev < H:\pmgr_dev.sql
+del H:\pmgr_dev.sql
+echo Build Complete!

site/build_sandbox.cmd

@@ -0,0 +1,5 @@
+@echo off
+mysqldump --user=pmgr --password=pmgruser --opt property_manager > H:\pmgr_sand.sql
+mysql --user=pmgr --password=pmgruser --database=pmgr_sand < H:\pmgr_sand.sql
+del H:\pmgr_sand.sql
+echo Build Complete!

site/config/bootstrap.php

@@ -32,7 +32,36 @@
  *
  */
 
+function _box($type) {
+  static $box = array('type' => null, 'test' => array());
+  if (!isset($box['type']) && !isset($box['test'][$type])) {
+    $r = Router::requestRoute();
+/*     if (!preg_match("/gridData/", $_SERVER['REQUEST_URI'])) { */
+/*       print("<PRE>Route:\n");print_r($r);print("\n</PRE>\n"); */
+/*     } */
+    $box['test'][$type] = !empty($r[3]["${type}_route"]);
+    if ($box['test'][$type])
+      $box['type'] = $type;
+  }
+  return $box['type'] == $type;
+}
+
+function sandbox() { return _box('sand'); }
+function devbox()  { return _box('dev'); }
+
+function server_request_var($var) {
+  if (preg_match("/^HTTP_ACCEPT|REMOTE_PORT/", $var))
+    return false;
+  return (preg_match("/^HTTP|REQUEST|REMOTE/", $var));
+}
+
 function INTERNAL_ERROR($message, $exit = true, $drop = 0) {
+  $O = new Object();
+  for ($i=0; $i<3; ++$i) {
+    $O->log(str_repeat("\\", 80));
+    $O->log(str_repeat("/", 80));
+  }
+  $O->log("INTERNAL ERROR: $message");
   echo '<DIV class="internal-error" style="color:#000; background:#c22; padding:0.5em 1.5em 0.5em 1.5em;">' . "\n";
   echo '<H1 style="color:#000; margin-bottom:0.2em; font-size:2em;">INTERNAL ERROR:</H1>' . "\n";
   echo '<H2 style="color:#000; margin-top:0; margin-left:1.5em; font-size:1.5em">' . $message . '</H2>' . "\n";
@@ -40,8 +69,10 @@ function INTERNAL_ERROR($message, $exit = true, $drop = 0) {
   echo '<BR>It is a problem within the application itself and should be reported to the administrator.</H4>' . "\n";
 
   // Print out the entire stack trace
+  $O->log(str_repeat("-", 30));
+  $O->log("Stack:");
   echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nStack Trace:\n";
-  echo '<OL style="margin-left:1.5em";>' . "\n";
+  echo '<OL style="margin-top:0.5em; margin-left:0.0em";>' . "\n";
   $trace = array_slice(debug_backtrace(false), $drop);
   for ($i = 0; $i < count($trace); ++$i) {
     $bline = $trace[$i]['line'];
@@ -57,14 +88,36 @@ function INTERNAL_ERROR($message, $exit = true, $drop = 0) {
       $bclas = null;
     }
 
+    $O->log("   $bfile:$bline (" . ($bclas ? "$bclas::$bfunc" : "entry point") . ")");
     echo("<LI>$bfile:$bline (" . ($bclas ? "$bclas::$bfunc" : "entry point") . ")</LI>\n");
   }
   echo "</OL>\n";
 
+  $O->log(str_repeat("-", 30));
+  $O->log("HTTP Request:");
   echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nHTTP Request:\n";
-  echo '<P><PRE style="color:#000; background:#c22;">' . "\n";
-  print_r($_REQUEST);
-  echo "\n</PRE>\n";
+  echo '<UL style="margin-top:0.5em; margin-left:0.0em";>' . "\n";
+  foreach($_REQUEST AS $k => $v) {
+    $O->log(sprintf("   %-20s => %s", $k, $v));
+    echo("<LI>$k =&gt; $v</LI>\n");
+  }
+  echo "</UL>\n";
+
+  $O->log(str_repeat("-", 30));
+  $O->log("Server:");
+  $SRV = array_intersect_key($_SERVER, array_flip(array_filter(array_keys($_SERVER), 'server_request_var')));
+  echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nServer:\n";
+  echo '<UL style="margin-top:0.5em; margin-left:0.0em";>' . "\n";
+  foreach($SRV AS $k => $v) {
+    if ($k == 'REQUEST_TIME')
+      $v = date('c', $v);
+    $O->log(sprintf("   %-20s => %s", $k, $v));
+    echo("<LI>$k =&gt; $v</LI>\n");
+  }
+  echo "</UL>\n";
+
+  echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\n";
+  echo date('c') . "<BR>\n";
 
   echo '</DIV>';
   if ($exit)

site/config/core.php

@@ -38,7 +38,7 @@
  * In production mode, flash messages redirect after a time interval.
  * In development mode, you need to click the flash message to continue.
  */
-	Configure::write('debug', 2);
+	Configure::write('debug', 0);
 /**
  * Application wide charset encoding
  */
@@ -117,7 +117,7 @@
 /**
  * The name of CakePHP's session cookie.
  */
-	Configure::write('Session.cookie', 'CAKEPHP');
+	Configure::write('Session.cookie', 'PMGR');
 /**
  * Session time out time (in seconds).
  * Actual value depends on 'Security.level' setting.

site/config/database.php

@@ -10,5 +10,12 @@ class DATABASE_CONFIG {
 		'database' => 'property_manager',
 		'prefix' => 'pmgr_',
 	);
+
+	function __construct() {
+		if (devbox())
+			$this->default['database'] = 'pmgr_dev';
+		if (sandbox())
+			$this->default['database'] = 'pmgr_sand';
+	}
 }
 ?>

site/config/routes.php

@@ -27,25 +27,49 @@
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 
+$default_path = array('controller' => 'maps', 'action' => 'view', '1');
+
 /**
  * Here, we are connecting '/' (base path) to our site map.
  * It's hardcoded to map #1, but at some point we'll implement
  * a login mechanism and the default path will be to log on instead.
  */
-Router::connect('/', array('controller' => 'maps', 'action' => 'view', '1'));
+Router::connect('/', $default_path);
 
 /*
- * Route for admin functionality
+ * Route for sandbox functionality
  */
-Router::connect('/admin/:controller/:action/*',
-		array('action' => null, 'admin_route' => true)
-		);
+Router::connect('/sand',
+		array('sand_route' => true) + $default_path);
+Router::connect('/sand/:controller/:action/*',
+		array('sand_route' => true, 'action' => null));
+/* Unfortunately, for some reason we need an extra route to solve
+ * a bug with form generation.  When $this->data is set by the
+ * controller, and a URL is generated by the FormHelper, this
+ * route is required to ensure the form action is correct.  An
+ * example of a broken page is for /customers/edit/XX.  It appears
+ * the page location uses the route above, it's only URL generation
+ * that seems to be broken.
+ */
+Router::connect('/sand/:controller/:action/:id/*',
+		array('sand_route' => true,'action' => null, 'id'=>null));
 
 /*
- * Route for development functionality
+ * Route for developement functionality
  */
+Router::connect('/dev',
+		array('dev_route' => true) + $default_path);
 Router::connect('/dev/:controller/:action/*',
-		array('action' => null, 'dev_route' => true)
-		);
+		array('dev_route' => true, 'action' => null));
+/* Unfortunately, for some reason we need an extra route to solve
+ * a bug with form generation.  When $this->data is set by the
+ * controller, and a URL is generated by the FormHelper, this
+ * route is required to ensure the form action is correct.  An
+ * example of a broken page is for /customers/edit/XX.  It appears
+ * the page location uses the route above, it's only URL generation
+ * that seems to be broken.
+ */
+Router::connect('/dev/:controller/:action/:id/*',
+		array('dev_route' => true,'action' => null, 'id'=>null));
 
 ?>

site/controllers/accounts_controller.php

@@ -2,30 +2,38 @@
 
 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')),
-	  );
-
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Asset',
+			   array('controller' => 'accounts', 'action' => 'asset'), null,
+			   'CONTROLLER', $this->admin_area);
+    $this->addSideMenuLink('Liability',
+			   array('controller' => 'accounts', 'action' => 'liability'), null,
+			   'CONTROLLER', $this->admin_area);
+    $this->addSideMenuLink('Equity',
+			   array('controller' => 'accounts', 'action' => 'equity'), null,
+			   'CONTROLLER', $this->admin_area);
+    $this->addSideMenuLink('Income',
+			   array('controller' => 'accounts', 'action' => 'income'), null,
+			   'CONTROLLER', $this->admin_area);
+    $this->addSideMenuLink('Expense',
+			   array('controller' => 'accounts', 'action' => 'expense'), null,
+			   'CONTROLLER', $this->admin_area);
+    $this->addSideMenuLink('All',
+			   array('controller' => 'accounts', 'action' => 'all'), null,
+			   'CONTROLLER', $this->admin_area);
   }
 
-  
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -39,7 +47,7 @@ class AccountsController extends AppController {
   function equity()    { $this->gridView('Equity Accounts'); }
   function income()    { $this->gridView('Income Accounts'); }
   function expense()   { $this->gridView('Expense Accounts'); }
-  function all()       { $this->gridView('All Accounts',       'all'); }
+  function all()       { $this->gridView('All Accounts', 'all'); }
 
 
   /**************************************************************************
@@ -90,9 +98,8 @@ class AccountsController extends AppController {
       $conditions[] = array('Account.type' => strtoupper($params['action']));
     }
 
-    // REVISIT <AP>: 20090811
-    //  No security issues have been worked out yet
-    $conditions[] = array('Account.level >=' => 10);
+    $conditions[] = array('Account.level >=' =>
+			  $this->Permission->level('controller.accounts'));
 
     return $conditions;
   }
@@ -173,9 +180,8 @@ class AccountsController extends AppController {
 			 ('order' => array('CloseTransaction.stamp' => 'DESC'))),
 		   ),
 	     'conditions' => array(array('Account.id' => $id),
-				   // REVISIT <AP>: 20090811
-				   //  No security issues have been worked out yet
-				   array('Account.level >=' => 10),
+				   array('Account.level >=' =>
+					 $this->Permission->level('controller.accounts')),
 				   ),
 	     )
        );
@@ -189,12 +195,12 @@ class AccountsController extends AppController {
     $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));
+    $this->addSideMenuLink('New Ledger',
+			   array('action' => 'newledger', $id), null,
+			   'ACTION', $this->admin_area);
+    $this->addSideMenuLink('Collected',
+			   array('action' => 'collected', $id), null,
+			   'ACTION', $this->admin_area);
 
     // Prepare to render
     $title = 'Account: ' . $account['Account']['name'];

site/controllers/contacts_controller.php

@@ -2,19 +2,7 @@
 
 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);
-  }
-
-  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -35,19 +23,34 @@ class ContactsController extends AppController {
    *    to jqGrid.
    */
 
+  function gridDataFilterTablesConfig(&$params, &$model, $table) {
+    $config = parent::gridDataFilterTablesConfig($params, $model, $table);
+
+    // Special case for Customer; We need the Contact/Customer relationship
+    if ($table == 'Customer')
+      $config = array('fields' => array('ContactsCustomer.type',
+					'ContactsCustomer.active'),
+		      'conditions' => array('ContactsCustomer.active' => true),
+		      );
+
+    return $config;
+  }
+
   function gridDataOrder(&$params, &$model, $index, $direction) {
     $order = parent::gridDataOrder($params, $model, $index, $direction);
-    if ($index === 'Contact.last_name') {
-      $order[] = 'Contact.first_name ' . $direction;
-    }
-    if ($index === 'Contact.first_name') {
-      $order[] = 'Contact.last_name ' . $direction;
-    }
+
+    // After sorting by whatever the user wants, add these
+    // defaults into the sort mechanism.  If we're already
+    // sorting by one of them, it will only be redundant,
+    // and should cause no harm (possible a longer query?)
+    $order[] = 'Contact.last_name ' . $direction;
+    $order[] = 'Contact.first_name ' . $direction;
+
     return $order;
   }
 
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
-    $links['Contact'] = array('id');
+    $links['Contact'] = array('display_name');
     return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
@@ -78,13 +81,9 @@ class ContactsController extends AppController {
 	));
 
     // 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->addSideMenuLink('Edit',
+			   array('action' => 'edit', $id), null,
+			   'ACTION');
 
     // Prepare to render.
     $title = 'Contact: ' . $contact['Contact']['display_name'];

site/controllers/customers_controller.php

@@ -1,28 +1,42 @@
 <?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');
+  var $components = array('RequestHandler');
 
+  // DEBUG FUNCTION ONLY!
+  // Call without id to update ALL customers
+  function force_update($id = null) {
+    $this->Customer->update($id);
+    $this->redirect(array('action'=>'index'));
+  }
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Current',
+			   array('controller' => 'customers', 'action' => 'current'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Past',
+			   array('controller' => 'customers', 'action' => 'past'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('All',
+			   array('controller' => 'customers', 'action' => 'all'), null,
+			   'CONTROLLER');
+
+/*     $this->addSideMenuLink('New Customer', */
+/* 			   array('controller' => 'customers', 'action' => 'add'), null, */
+/* 			   'CONTROLLER', $this->new_area); */
   }
 
-  
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -81,19 +95,29 @@ class CustomersController extends AppController {
     return $conditions;
   }
 
-  function gridDataOrder(&$params, &$model, $index, $direction) {
-    $order = array();
-    $order[] = parent::gridDataOrder($params, $model, $index, $direction);
+  function gridDataFilterTablesConfig(&$params, &$model, $table) {
+    $config = parent::gridDataFilterTablesConfig($params, $model, $table);
 
-    if ($index !== 'PrimaryContact.last_name')
-      $order[] = parent::gridDataOrder($params, $model,
-					 'PrimaryContact.last_name', $direction);
-    if ($index !== 'PrimaryContact.first_name')
-      $order[] = parent::gridDataOrder($params, $model,
-					 'PrimaryContact.first_name', $direction);
-    if ($index !== 'Customer.id')
-      $order[] = parent::gridDataOrder($params, $model,
-					 'Customer.id', $direction);
+    // Special case for Contact; We need the Contact/Customer relationship
+    if ($table == 'Contact')
+      $config = array('fields' => array('ContactsCustomer.type',
+					'ContactsCustomer.active'),
+		      'conditions' => array('ContactsCustomer.active' => true),
+		      );
+
+    return $config;
+  }
+
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+    $order = parent::gridDataOrder($params, $model, $index, $direction);
+
+    // After sorting by whatever the user wants, add these
+    // defaults into the sort mechanism.  If we're already
+    // sorting by one of them, it will only be redundant,
+    // and should cause no harm (possible a longer query?)
+    $order[] = 'PrimaryContact.last_name ' . $direction;
+    $order[] = 'PrimaryContact.first_name ' . $direction;
+    $order[] = 'Customer.id ' . $direction;
 
     return $order;
   }
@@ -111,14 +135,18 @@ class CustomersController extends AppController {
    *  - Sets up the move-in page for the given customer.
    */
 
-  function move_in($id = null) {
+  function move_in($id = null, $unit_id = null) {
     $customer = array();
     $unit = array();
 
-    if (isset($id)) {
+    if (!empty($id)) {
       $this->Customer->recursive = -1;
       $customer = current($this->Customer->read(null, $id));
     }
+    if (!empty($unit_id)) {
+      $this->Customer->Lease->Unit->recursive = -1;
+      $unit = current($this->Customer->Lease->Unit->read(null, $unit_id));
+    }
     $this->set(compact('customer', 'unit'));
 
     $title = 'Customer Move-In';
@@ -219,52 +247,76 @@ class CustomersController extends AppController {
     $outstanding_deposit = $this->Customer->securityDepositBalance($id);
 
     // Figure out if this customer has any non-closed leases
-    $show_moveout = false;
-    $show_payment = false;
+    $show_moveout = false; $moveout_lease_id = null;
+    $show_payment = false; $payment_lease_id = null;
     foreach ($customer['Lease'] AS $lease) {
-      if (!isset($lease['close_date']))
+      if (!isset($lease['close_date'])) {
+	if ($show_payment)
+	  $payment_lease_id = null;
+	else
+	  $payment_lease_id = $lease['id'];
 	$show_payment = true;
-      if (!isset($lease['moveout_date']))
+      }
+      if (!isset($lease['moveout_date'])) {
+	if ($show_moveout)
+	  $moveout_lease_id = null;
+	else
+	  $moveout_lease_id = $lease['id'];
 	$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 || $outstanding_balance > 0)
-      $this->sidemenu_links[] =
-	array('name' => 'New Receipt',
-	      'url' => array('action' => 'receipt',
-			     $id));
+      $this->addSideMenuLink('New Receipt',
+			     array('action' => 'receipt', $id), null,
+			     'ACTION');
+
+    if ($show_payment) {
+/*       $ids = $this->Customer->leaseIds($id, true); */
+/*       if (count($ids) == 1) */
+/* 	$lease_id = $ids[0]; */
+/*       else */
+/* 	$lease_id = null; */
+
+      $this->addSideMenuLink('New Invoice',
+			     array('controller' => 'leases',
+				   'action' => 'invoice',
+				   $payment_lease_id), null,
+			     'ACTION');
+    }
+
+    $this->addSideMenuLink('Move-In',
+			   array('action' => 'move_in', $id), null,
+			   'ACTION');
+
+    if ($show_moveout) {
+      $this->addSideMenuLink('Move-Out',
+			     array('controller' => 'leases',
+				   'action' => 'move_out',
+				   $moveout_lease_id), null,
+			     'ACTION');
+    }
 
     if (!$show_moveout && $outstanding_balance > 0)
-      $this->sidemenu_links[] =
-	array('name' => 'Write-Off',
-	      'url' => array('action' => 'bad_debt',
-			     $id));
+      $this->addSideMenuLink('Write-Off',
+			     array('action' => 'bad_debt', $id), null,
+			     'ACTION');
 
     if ($outstanding_balance < 0)
-      $this->sidemenu_links[] =
-	array('name' => 'Issue Refund',
-	      'url' => array('action' => 'refund', $id));
+      $this->addSideMenuLink('Issue Refund',
+			     array('action' => 'refund', $id), null,
+			     'ACTION');
+
+    $this->addSideMenuLink('Edit',
+			   array('action' => 'edit', $id), null,
+			   'ACTION');
+
+    if ($this->admin())
+      $this->addSideMenuLink('Merge',
+			     array('action' => 'merge', $id), null,
+			     'ACTION');
 
     // Prepare to render.
     $title = 'Customer: ' . $customer['Customer']['name'];
@@ -322,11 +374,51 @@ class CustomersController extends AppController {
 	$this->redirect(array('action'=>'view', $this->Customer->id));
 
       // Since this is a new customer, go to the move in screen.
-      $this->redirect(array('action'=>'move_in', $this->Customer->id));
+      // First set the move-in unit id, if there is one, ...
+      if (empty($this->data['movein']['Unit']['id']))
+	$unit_id = null;
+      else
+	$unit_id = $this->data['movein']['Unit']['id'];
+
+      // ... then redirect
+      $this->redirect(array('action'=>'move_in',
+			    $this->Customer->id,
+			    $unit_id,
+			    ));
     }
 
     if ($id) {
-      $this->data = $this->Customer->details($id);
+      // REVISIT <AP>: 20090816
+      //  This should never need to be done by a controller.
+      //  However, until things stabilize, this gives the
+      //  user a way to update any cached items on the
+      //  customer, by just clicking Edit then Cancel.
+      $this->Customer->update($id);
+
+      // Get details on this customer, its contacts and leases
+      $customer = $this->Customer->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),
+	  ));
+
+      $this->data = $customer;
       $title = 'Customer: ' . $this->data['Customer']['name'] . " : Edit";
     }
     else {
@@ -355,10 +447,46 @@ class CustomersController extends AppController {
    *  - Add a new customer
    */
 
-  function add() {
+  function add($unit_id = null) {
+    $this->set('movein', array('Unit' => array('id' => $unit_id)));
     $this->edit();
   }
 
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: merge
+   *  - Merges two customers
+   */
+
+  function merge($id = null) {
+    if ($id) {
+      $this->Customer->recursive = -1;
+      $customer = $this->Customer->read(null, $id);
+      $customer = $customer['Customer'];
+      if (empty($customer))
+	$this->INTERNAL_ERROR("Customer $id does not exist");
+      $this->set('dst_customer', $customer);
+      $this->set('dst_name', $customer['name']);
+      $this->set('dst_id', $id);
+    }
+    else {
+      $this->INTERNAL_ERROR("Merge called with invalid customer");
+    }
+  }
+
+  function mergeFinal() {
+    if (!$this->RequestHandler->isPost()) {
+      echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
+      return;
+    }
+
+    $post = $this->params['form'];
+    $this->Customer->merge($post['dst-id'], $post['src-id'],
+			   unserialize($post['contact-ids']));
+    $this->redirect(array('action'=>'view', $post['dst-id']));
+  }
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************

site/controllers/double_entries_controller.php

@@ -2,20 +2,7 @@
 
 class DoubleEntriesController 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);
-  }
-
-  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -47,6 +34,9 @@ class DoubleEntriesController extends AppController {
        array('contain' => array('Ledger' => array('Account')),
 	     'conditions' => array('DebitEntry.id' => $entry['DebitEntry']['id']),
 	     ));
+    $entry['Ledger']['link'] =
+      $entry['Ledger']['Account']['level'] >=
+      $this->Permission->level('controller.accounts');
     $entry['DebitLedger'] = $entry['Ledger'];
     unset($entry['Ledger']);
 
@@ -55,6 +45,9 @@ class DoubleEntriesController extends AppController {
        array('contain' => array('Ledger' => array('Account')),
 	     'conditions' => array('CreditEntry.id' => $entry['CreditEntry']['id']),
 	     ));
+    $entry['Ledger']['link'] =
+      $entry['Ledger']['Account']['level'] >=
+      $this->Permission->level('controller.accounts');
     $entry['CreditLedger'] = $entry['Ledger'];
     unset($entry['Ledger']);
 

site/controllers/leases_controller.php

@@ -2,26 +2,32 @@
 
 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' => 'Delinquent', 'url' => array('controller' => 'leases', 'action' => 'delinquent')),
-	  array('name' => 'All',        'url' => array('controller' => 'leases', 'action' => 'all')),
-	  );
-
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Active',
+			   array('controller' => 'leases', 'action' => 'active'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Closed',
+			   array('controller' => 'leases', 'action' => 'closed'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Delinquent',
+			   array('controller' => 'leases', 'action' => 'delinquent'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('All',
+			   array('controller' => 'leases', 'action' => 'all'), null,
+			   'CONTROLLER');
   }
 
-  
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -29,11 +35,11 @@ class LeasesController extends AppController {
    *  - Generate a listing of leases
    */
 
-  function index()      { $this->all(); }
-  function active()     { $this->gridView('Active Leases'); }
+  function index()      { $this->active(); }
+  function active()     { $this->gridView('Active Leases', 'active'); }
   function delinquent() { $this->gridView('Delinquent Leases'); }
   function closed()     { $this->gridView('Closed Leases'); }
-  function all()        { $this->gridView('All Leases', 'all'); }
+  function all()        { $this->gridView('All Leases'); }
 
 
   /**************************************************************************
@@ -170,49 +176,54 @@ class LeasesController extends AppController {
   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']
 			    );
 
-      $this->redirect($this->data['redirect']);
+      $lease = $this->Lease->find
+	('first', array
+	 ('contain' => array('Customer.id'),
+	  'conditions' => array(array('Lease.id' => $this->data['Lease']['id'])),
+	  ));
+
+      $this->redirect(array('controller' => 'customers',
+			    'action' => 'view',
+			    $lease['Customer']['id']));
     }
 
-    if (!isset($id))
-      die("Oh Nooooo!!");
+    if (isset($id)) {
+      $lease = $this->Lease->find
+	('first', array
+	 ('contain' => array
+	  (// Models
+	   'Unit' =>
+	   array('order'  => array('sort_order'),
+		 'fields' => array('id', 'name'),
+		 ),
 
-    $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'),
+		 ),
+	   ),
 
-	 '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']);
 
-	'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']);
+      $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
+		$lease['Unit']['name'] . ': ' .
+		$lease['Customer']['name'] . ': Move-Out');
+    }
+    else {
+      $title = 'Move-Out';
+    }
 
-    $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->set(compact('title'));
     $this->render('/leases/move');
   }
 
@@ -387,6 +398,10 @@ class LeasesController extends AppController {
     $this->set(compact('default_late'));
 
     if ($type === 'move-in') {
+      // Make sure we have a valid lease that we're moving in
+      if (empty($lease))
+	$this->redirect(array('action' => 'index'));
+
       $movein = array();
       $movein['time'] = strtotime($lease['Lease']['movein_date']);
       $movein['effective_time'] = strtotime($lease['Lease']['movein_date']);
@@ -429,6 +444,64 @@ class LeasesController extends AppController {
     $this->redirect(array('action'=>'index'));
   }
 
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: overview
+   *  - Displays lease up information
+   */
+  function overview($months = 12) {
+
+    $overview = array('months' => array());
+
+    for ($month = 0; $month < $months; ++$month) {
+    //for ($month = 12; $month >= 0; --$month) {
+      $this_month = "(DATE(NOW() - INTERVAL $month MONTH - INTERVAL DAY(NOW())-1 DAY))";
+      $next_month = "($this_month + INTERVAL 1 MONTH)";
+
+      $row = $this->Lease->find
+	('first', array('link' => array(),
+			'fields' => array("MONTHNAME($this_month) AS month",
+					  "YEAR($this_month) AS year"),
+			));
+
+      $mname = $row[0]['month'] .', '. $row[0]['year'];
+      $overview['months'][$mname] = array('name' => $mname);
+
+      foreach(array('start'  => array('before' => $this_month, 'after' => $this_month),
+		    'finish' => array('before' => $next_month, 'after' => $next_month),
+		    'peak'   => array('before' => $next_month, 'after' => $this_month))
+	      AS $type => $parm) {
+	$count = $this->Lease->find
+	  ('count', 
+	   array('link' => array(),
+		 'conditions' => array("movein_date < {$parm['before']}",
+				       "(moveout_date IS NULL OR moveout_date >= {$parm['after']})",
+				       ),
+		 ));
+	$overview['months'][$mname][$type] = $count;
+      }
+
+      foreach(array('movein', 'moveout') AS $mvinout) {
+	$count = $this->Lease->find
+	  ('count', 
+	   array('link' => array(),
+		 'conditions' => array("{$mvinout}_date < $next_month",
+				       "{$mvinout}_date >= $this_month")
+		 ));
+	$overview['months'][$mname][$mvinout] = $count;
+      }
+    }
+
+    // Enable the Reports menu section
+    $this->sideMenuAreaActivate('REPORT');
+
+    // Prepare to render.
+    $this->set('title', 'Lease Up Report');
+    $this->set(compact('overview'));
+  }
+
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -467,28 +540,21 @@ class LeasesController extends AppController {
     // yet still have an outstanding balance.  This can happen if someone
     // were to reverse charges, or if a payment should come back NSF.
     if (!isset($lease['Lease']['close_date']) || $outstanding_balance > 0) {
-      $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->addSideMenuLink('Move-Out',
+			       array('action' => 'move_out', $id), null,
+			       'ACTION');
 
       if (!isset($lease['Lease']['close_date']))
-	$this->sidemenu_links[] =
-	  array('name' => 'New Invoice', 'url' => array('action' => 'invoice',
-							$id));
+	$this->addSideMenuLink('New Invoice',
+			       array('action' => 'invoice', $id), null,
+			       'ACTION');
 
-      $this->sidemenu_links[] =
-	array('name' => 'New Receipt', 'url' => array('controller' => 'customers',
-						      'action' => 'receipt',
-						      $lease['Customer']['id']));
-
-/*       if ($outstanding_balance < 0) */
-/* 	$this->sidemenu_links[] = */
-/* 	  array('name' => 'Transfer Credit to Customer', */
-/* 		'url' => array('action' => 'promote_surplus', $id)); */
+      $this->addSideMenuLink('New Receipt',
+			     array('controller' => 'customers',
+				   'action' => 'receipt',
+				   $lease['Customer']['id']), null,
+			     'ACTION');
 
       // REVISIT <AP>:
       //  Not allowing refund to be issued from the lease, as
@@ -500,19 +566,19 @@ class LeasesController extends AppController {
 	$this->INTERNAL_ERROR("Should not have a customer lease credit.");
 
 /*       if ($outstanding_balance < 0) */
-/* 	$this->sidemenu_links[] = */
-/* 	  array('name' => 'Issue Refund', */
-/* 		'url' => array('action' => 'refund', $id)); */
+/* 	$this->addSideMenuLink('Issue Refund', */
+/* 			       array('action' => 'refund', $id), null, */
+/* 			       'ACTION'); */
 
       if (isset($lease['Lease']['moveout_date']) && $outstanding_balance > 0)
-	$this->sidemenu_links[] =
-	  array('name' => 'Write-Off', 'url' => array('action' => 'bad_debt',
-						      $id));
+	$this->addSideMenuLink('Write-Off',
+			       array('action' => 'bad_debt', $id), null,
+			       'ACTION');
 
       if ($this->Lease->closeable($id))
-	$this->sidemenu_links[] =
-	  array('name' => 'Close', 'url' => array('action' => 'close',
-						  $id));
+	$this->addSideMenuLink('Close',
+			       array('action' => 'close', $id), null,
+			       'ACTION');
     }
 
     // Prepare to render

site/controllers/ledger_entries_controller.php

@@ -2,19 +2,6 @@
 
 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);
-  }
-
   
   /**************************************************************************
    **************************************************************************
@@ -130,8 +117,12 @@ class LedgerEntriesController extends AppController {
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
     $links['LedgerEntry']    = array('id');
     $links['Transaction']    = array('id');
-    $links['Ledger']         = array('id');
-    $links['Account']        = array('controller' => 'accounts', 'name');
+    // REVISIT <AP>: 20090827
+    //  Need to take 'level' into account
+    if ($this->Permission->allow('controller.accounts')) {
+      $links['Ledger']         = array('id');
+      $links['Account']        = array('name');
+    }
     $links['Tender']         = array('name');
     return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
@@ -157,12 +148,8 @@ class LedgerEntriesController extends AppController {
 	      array('fields' => array('id', 'sequence', 'name'),
 		    'Account' => 
 		    array('fields' => array('id', 'name', 'type'),
-			  'conditions' =>
-			  // REVISIT <AP>: 20090811
-			  //  No security issues have been worked out yet
-			  array('Account.level >=' => 5),
-			),
-		  ),
+			  ),
+		    ),
 
 	      'Tender' =>
 	      array('fields' => array('id', 'name'),
@@ -202,6 +189,13 @@ class LedgerEntriesController extends AppController {
     else
       $entry['DoubleEntry'] = $entry['DebitDoubleEntry'];
 
+    // REVISIT <AP>: 20090816
+    //  This page doesn't seem very useful, let's just keep it
+    //  all to the double entry view.
+    $this->redirect(array('controller' => 'double_entries',
+			  'action' => 'view',
+			  $entry['DoubleEntry']['id']));
+
     // Prepare to render.
     $title = "Ledger Entry #{$entry['LedgerEntry']['id']}";
     $this->set(compact('entry', 'title'));

site/controllers/ledgers_controller.php

@@ -2,25 +2,29 @@
 
 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
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Current',
+			   array('controller' => 'ledgers', 'action' => 'current'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Closed',
+			   array('controller' => 'ledgers', 'action' => 'closed'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('All',
+			   array('controller' => 'ledgers', 'action' => 'all'), null,
+			   'CONTROLLER');
   }
 
-  
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -82,32 +86,32 @@ class LedgersController extends AppController {
       $conditions[] = array('Ledger.close_transaction_id !=' => null);
     }
 
-    // REVISIT <AP>: 20090811
-    //  No security issues have been worked out yet
-    $conditions[] = array('Account.level >=' => 10);
+    $conditions[] = array('Account.level >=' =>
+			  $this->Permission->level('controller.accounts'));
 
     return $conditions;
   }
 
   function gridDataOrder(&$params, &$model, $index, $direction) {
-    $id_sequence = false;
-    if ($index === 'id_sequence') {
-      $id_sequence = true;
-      $index = 'Ledger.account_id';
-    }
-
     $order = parent::gridDataOrder($params, $model, $index, $direction);
 
-    if ($id_sequence) {
-      $order[] = 'Ledger.sequence ' . $direction;
-    }
+    // After sorting by whatever the user wants, add these
+    // defaults into the sort mechanism.  If we're already
+    // sorting by one of them, it will only be redundant,
+    // and should cause no harm (possible a longer query?)
+    $order[] = 'Account.name ' . $direction;
+    $order[] = 'Ledger.sequence ' . $direction;
 
     return $order;
   }
 
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
-    $links['Ledger'] = array('id_sequence');
-    $links['Account'] = array('name');
+    // REVISIT <AP>: 20090827
+    //  Need to take 'level' into account
+    if ($this->Permission->allow('controller.accounts')) {
+      $links['Ledger'] = array('sequence');
+      $links['Account'] = array('name');
+    }
     return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
@@ -127,9 +131,8 @@ class LedgersController extends AppController {
 		   'Account',
 		   ),
 	     'conditions' => array(array('Ledger.id' => $id),
-				   // REVISIT <AP>: 20090811
-				   //  No security issues have been worked out yet
-				   array('Account.level >=' => 10),
+				   array('Account.level >=' =>
+					 $this->Permission->level('controller.accounts')),
 				   ),
 	     )
        );

site/controllers/maps_controller.php

@@ -52,6 +52,7 @@ class MapsController extends AppController {
       $this->Session->setFlash(__('Invalid Item.', true));
       $this->redirect(array('action'=>'index'));
     }
+    $this->sideMenuEnable('SITE', $this->op_area);
     $this->set('info', $this->mapInfo($id, $requested_width));
     $this->set('title', "Site Map");
   }
@@ -95,8 +96,10 @@ class MapsController extends AppController {
 		   array('fields' => array()),
 
 		   'CurrentLease' =>
-		   array('fields' => array($this->Map->Unit->CurrentLease->
-					   delinquentField('CurrentLease'))),
+		   array('fields' => array('id', 'paid_through_date',
+					   $this->Map->Unit->CurrentLease->
+					   delinquentField('CurrentLease')),
+			 'Customer'),
 
 		   'UnitSize' =>
 		   array('fields' => array('id', 'depth', 'width',
@@ -166,12 +169,13 @@ class MapsController extends AppController {
 	       'n-s'    => $unit['MapsUnit']['transpose'] ? 0 : 1,
 	       'status' => (($unit['Unit']['status'] === 'OCCUPIED' &&
 			     !empty($unit[0]['delinquent']))
-			    ? 'LATE' : $unit['Unit']['status'])
+			    ? 'LATE' : $unit['Unit']['status']),
+	       'data' => $unit,
 	       );
     }
 
 /*     pr($info); */
-/*     $this->render('/empty'); */
+/*     $this->render('/empty'); exit(); */
     return $info;
   }
 

site/controllers/statement_entries_controller.php

@@ -2,20 +2,7 @@
 
 class StatementEntriesController 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);
-  }
-
-  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -24,6 +11,7 @@ class StatementEntriesController extends AppController {
    */
 
   function index()   { $this->gridView('All Statement Entries'); }
+  function unpaid()  { $this->gridView('Unpaid Charges', 'unreconciled'); }
 
 
   /**************************************************************************
@@ -60,7 +48,17 @@ class StatementEntriesController extends AppController {
 
     if (!empty($params['post']['custom']['statement_entry_id'])) {
       $link['ChargeEntry']        = array();
-      $link['DisbursementEntry']  = array();
+      // This query actually represents a union...
+      // Unpaid Charge/Surplus:  ChargeID -  NULL;   DisbursementID -  NULL
+      // Paid Charge/Refund:     ChargeID -  NULL;   DisbursementID - !NULL
+      // Disbursement/Reversal:  ChargeID - !NULL;   DisbursementID -  NULL
+      // <EMPTY SET>:            ChargeID - !NULL;   DisbursementID - !NULL
+      //
+      // The query is really slow unless we add the `id` condition to the join.
+      // A cleaner query would be nice, but we must work within the Cake framework.
+      $link['DisbursementEntry']  = array('conditions' =>
+					  '`DisbursementEntry`.`id` = '
+					  . $params['post']['custom']['statement_entry_id']);
     }
 
     return array('link' => $link);
@@ -121,23 +119,10 @@ class StatementEntriesController extends AppController {
     if (isset($customer_id))
       $conditions[] = array('StatementEntry.customer_id' => $customer_id);
 
-    if (isset($statement_entry_id)) {
+    if (isset($statement_entry_id))
       $conditions[] = array('OR' =>
 			    array(array('ChargeEntry.id' => $statement_entry_id),
 				  array('DisbursementEntry.id' => $statement_entry_id)));
-    }
-
-    if ($params['action'] === 'unreconciled') {
-      $query = array('conditions' => $conditions);
-      $set = $this->StatementEntry->reconciledSet('CHARGE', $query, true);
-
-      $entries = array();
-      foreach ($set['entries'] AS $entry)
-	$entries[] = $entry['StatementEntry']['id'];
-
-      $conditions[] = array('StatementEntry.id' => $entries);
-      $params['userdata']['balance'] = $set['summary']['balance'];
-    }
 
     return $conditions;
   }
@@ -145,7 +130,10 @@ class StatementEntriesController extends AppController {
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
     $links['StatementEntry'] = array('id');
     $links['Transaction']    = array('id');
-    $links['Account']        = array('name');
+    // REVISIT <AP>: 20090827
+    //  Need to take 'level' into account
+    if ($this->Permission->allow('controller.accounts'))
+      $links['Account']        = array('name');
     $links['Customer']       = array('name');
     $links['Lease']          = array('number');
     $links['Unit']           = array('name');
@@ -159,33 +147,48 @@ class StatementEntriesController extends AppController {
     // defaults into the sort mechanism.  If we're already
     // sorting by one of them, it will only be redundant,
     // and should cause no harm (possible a longer query?)
-    $order[] = 'Transaction.stamp ' . $direction;
-    $order[] = 'StatementEntry.effective_date ' . $direction;
+    if ($index != 'Transaction.stamp' &&
+	$index != 'StatementEntry.effective_date') {
+      $order[] = 'Transaction.stamp ' . $direction;
+      $order[] = 'StatementEntry.effective_date ' . $direction;
+    }
     $order[] = 'StatementEntry.id ' . $direction;
 
     return $order;
   }
 
+  function gridDataCountExecute(&$params, &$model, $query) {
+    if ($params['action'] === 'unreconciled') {
+      // REVISIT <AP> 20100413:
+      //   This is a lame solution, as it runs the same queries twice
+      //   (and causes code duplication).  However, I'm not in the mood
+      //   to flush out an actual "count" solution at the moment, and I
+      //   also don't want to cache the results in $params (although
+      //   that is probably the most sensible solution).  So, I'll just
+      //   calculate the reconciled set both times and live with the
+      //   performance and maintenance penalty
+      $lquery = array('conditions' => $query['conditions']);
+      $set = $this->StatementEntry->reconciledSet('CHARGE', $lquery, true);
+      return count($set['entries']);
+    }
+
+    return parent::gridDataCountExecute($params, $model, $query);
+  }
+
   function gridDataRecordsExecute(&$params, &$model, $query) {
-/*     if ($params['action'] === '???') { */
-/*       $tquery = array_diff_key($query, array('fields'=>1,'group'=>1,'limit'=>1,'order'=>1)); */
-/*       $tquery['fields'] = array("IF(StatementEntry.type = 'CHARGE'," . */
-/* 				"   SUM(COALESCE(DisbursementEntry.amount,0))," . */
-/* 				"   SUM(COALESCE(ChargeEntry.amount,0)))" . */
-/* 				" AS 'applied'", */
 
-/* 				"StatementEntry.amount - (" . */
-/* 				"IF(StatementEntry.type = 'CHARGE'," . */
-/* 				"   SUM(COALESCE(DisbursementEntry.amount,0))," . */
-/* 				"   SUM(COALESCE(ChargeEntry.amount,0)))" . */
-/* 				") AS 'balance'", */
-/* 				); */
+    if ($params['action'] === 'unreconciled') {
+      $lquery = array('conditions' => $query['conditions']);
+      $set = $this->StatementEntry->reconciledSet('CHARGE', $lquery, true);
+
+      $entries = array();
+      foreach ($set['entries'] AS $entry)
+    	$entries[] = $entry['StatementEntry']['id'];
+
+      $query['conditions'] = array('StatementEntry.id' => $entries);
+      $params['userdata']['balance'] = $set['summary']['balance'];
+    }
 
-/*       //pr(compact('tquery')); */
-/*       $total = $model->find('first', $tquery); */
-/*       $params['userdata']['total']   = $total[0]['applied']; */
-/*       $params['userdata']['balance'] = $total[0]['balance']; */
-/*     } */
     if ($params['action'] === 'collected') {
       $tquery = array_diff_key($query, array('fields'=>1,'group'=>1,'limit'=>1,'order'=>1));
       $tquery['fields'] = array("SUM(COALESCE(StatementEntry.amount,0)) AS 'total'");
@@ -203,9 +206,42 @@ class StatementEntriesController extends AppController {
    * action: reverse the ledger entry
    */
 
-  function reverse($id) {
-    $this->StatementEntry->reverse($id);
-    $this->redirect(array('action'=>'view', $id));
+  function reverse($id = null) {
+    if ($this->data) {
+      //pr($this->data); die();
+
+      $this->StatementEntry->reverse
+	($this->data['StatementEntry']['id'],
+	 $this->data['Transaction']['stamp'],
+	 $this->data['Transaction']['comment']);
+
+      $this->redirect(array('action'=>'view',
+			    $this->data['StatementEntry']['id']));
+      $this->INTERNAL_ERROR('SHOULD HAVE REDIRECTED');
+    }
+
+    $this->StatementEntry->id = $id;
+    $entry = $this->StatementEntry->find
+      ('first', array
+       ('contain' => array('Customer', 'Transaction', 'Account'),
+	));
+
+    if (empty($entry)) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('controller' => 'customers',
+			    'action'=>'index'));
+    }
+
+    if (!$this->StatementEntry->reversable($id)) {
+      $this->Session->setFlash(__('Item not reversable.', true));
+      $this->redirect(array('action'=>'view', $id));
+    }
+
+    // Prepare to render.
+    $title = ("Charge #{$entry['StatementEntry']['id']}" .
+	      " : {$entry['StatementEntry']['amount']}" .
+	      " : Reverse");
+    $this->set(compact('entry', 'title'));
   }
 
 
@@ -221,6 +257,53 @@ class StatementEntriesController extends AppController {
   }
 
 
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: chargesbymonth
+   *  - Displays charges by month
+   */
+
+  function chargesbymonth($months = 12) {
+    $result = $this->StatementEntry->find
+      ('all',
+       array('link' => array('Account' => array('fields' => 'name')),
+	     'fields' => array_merge(array('MONTHNAME(effective_date) AS month',
+					   'YEAR(effective_date) AS year'),
+				     $this->StatementEntry->chargeDisbursementFields(true)),
+	     'conditions' => array('Account.type' => 'INCOME',
+				   'effective_date >= DATE(NOW() - INTERVAL '.($months-1).' MONTH - INTERVAL DAY(NOW())-1 DAY)',
+				   'effective_date <= NOW()',
+				   ),
+	     'group' => array('YEAR(effective_date)', 'MONTH(effective_date)', 'Account.id'),
+	     'order' => array('YEAR(effective_date) DESC', 'MONTH(effective_date) DESC', 'Account.name'),
+	     ));
+
+    $overview = array('months' => array(), 'charges' => 0);
+    foreach ($result AS $row) {
+      $mname = $row[0]['month'] .', '. $row[0]['year'];
+      if (empty($overview['months'][$mname]))
+	$overview['months'][$mname] = array('name' => $mname,
+					   'subs' => array(),
+					   'charges' => 0);
+      $month = &$overview['months'][$mname];
+      $month['subs'][] = array('name' => $row['Account']['name'],
+			       'charges' => $row[0]['balance']);
+
+      $month['charges'] += $row[0]['balance'];
+      $overview['charges'] += $row[0]['balance'];
+    }
+
+    // Enable the Reports menu section
+    $this->sideMenuAreaActivate('REPORT');
+
+    // Prepare to render.
+    $this->set('months', $months);
+    $this->set('title', 'Monthly Charges');
+    $this->set(compact('overview'));
+  }
+
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -233,15 +316,12 @@ class StatementEntriesController extends AppController {
       ('first',
        array('contain' => array
 	     ('Transaction' => array('fields' => array('id', 'type', 'stamp')),
-	      'Account' => array('id', 'name', 'type'),
+	      'Account' => array('id', 'name', 'type', 'level'),
 	      'Customer' => array('fields' => array('id', 'name')),
-	      'Lease' => array('fields' => array('id')),
+	      'Lease' => array('fields' => array('id', 'number')),
 	      ),
 
 	     'conditions' => array(array('StatementEntry.id' => $id),
-				   // REVISIT <AP>: 20090811
-				   //  No security issues have been worked out yet
-				   array('Account.level >=' => 5)
 				   ),
 	     ));
 
@@ -250,6 +330,10 @@ class StatementEntriesController extends AppController {
       $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
     }
 
+    $entry['Account']['link'] =
+      $entry['Account']['level'] >=
+      $this->Permission->level('controller.accounts');
+
     $stats = $this->StatementEntry->stats($id);
 
     if (in_array(strtoupper($entry['StatementEntry']['type']), $this->StatementEntry->debitTypes()))
@@ -260,24 +344,16 @@ class StatementEntriesController extends AppController {
 
     if (strtoupper($entry['StatementEntry']['type']) === 'CHARGE') {
 
-      $reversable = $this->StatementEntry->reversable($id);
-
       // Set up dynamic menu items
-      if ($reversable || $stats['balance'] > 0)
-	$this->sidemenu_links[] =
-	  array('name' => 'Operations', 'header' => true);
-
-      if ($reversable)
-	$this->sidemenu_links[] =
-	  array('name' => 'Reverse',
-		'url' => array('action' => 'reverse',
-			       $id));
+      if ($this->StatementEntry->reversable($id))
+	$this->addSideMenuLink('Reverse',
+			       array('action' => 'reverse', $id), null,
+			       'ACTION');
 
       if ($stats['balance'] > 0)
-	$this->sidemenu_links[] =
-	  array('name' => 'Waive Balance',
-		'url' => array('action' => 'waive',
-			       $id));
+	$this->addSideMenuLink('Waive Balance',
+			       array('action' => 'waive', $id), null,
+			       'ACTION');
     }
 
     // Prepare to render.

site/controllers/tenders_controller.php

@@ -2,20 +2,7 @@
 
 class TendersController 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);
-  }
-
-  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -75,7 +62,7 @@ class TendersController extends AppController {
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
     $links['Tender']      = array('name', 'id');
     $links['Customer']    = array('name');
-    $links['TenderType']  = array('name');
+    //$links['TenderType']  = array('name');
     return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
@@ -163,17 +150,6 @@ class TendersController extends AppController {
 	));
 
 
-    // Set up dynamic menu items
-    $this->sidemenu_links[] =
-      array('name' => 'Operations', 'header' => true);
-
-    // Watch out for the special "Closing" entries
-    if (!empty($tender['TenderType']['id']))
-      $this->sidemenu_links[] =
-	array('name' => 'Edit',
-	      'url' => array('action' => 'edit',
-			     $id));
-
     if (!empty($tender['Tender']['deposit_transaction_id'])
 	&& empty($tender['Tender']['nsf_transaction_id'])
 	// Hard to tell what types of items can come back as NSF.
@@ -181,12 +157,18 @@ class TendersController extends AppController {
 	// (or if we're in development mode)
 	&& (!empty($tender['TenderType']['data1_name']) || !empty($this->params['dev']))
 	) {
-      $this->sidemenu_links[] =
-	array('name' => 'NSF',
-	      'url' => array('action' => 'nsf',
-			     $id));
+      $this->addSideMenuLink('NSF',
+			     array('action' => 'nsf', $id), null,
+			     'ACTION');
     }
 
+    // Watch out for the special "Closing" entries, which have
+    // tender_type_id set to NULL.  Otherwise, allow editing.
+    if (!empty($tender['TenderType']['id']))
+      $this->addSideMenuLink('Edit',
+			     array('action' => 'edit', $id), null,			     
+			     'ACTION');
+
     // Prepare to render.
     $title = "Tender #{$tender['Tender']['id']} : {$tender['Tender']['name']}";
     $this->set(compact('tender', 'title'));

site/controllers/transactions_controller.php

@@ -4,26 +4,38 @@ 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')),
-	  array('name' => 'Invoices',     'url' => array('controller' => 'transactions', 'action' => 'invoice')),
-	  array('name' => 'Receipts',     'url' => array('controller' => 'transactions', 'action' => 'receipt')),
-	  array('name' => 'Deposits',     'url' => array('controller' => 'transactions', 'action' => 'deposit')),
-	  );
-
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Invoices',
+			   array('controller' => 'transactions', 'action' => 'invoice'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Receipts',
+			   array('controller' => 'transactions', 'action' => 'receipt'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Deposits',
+			   array('controller' => 'transactions', 'action' => 'deposit'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('All',
+			   array('controller' => 'transactions', 'action' => 'all'), null,
+			   'CONTROLLER');
+
+    // REVISIT <AP>: 20090824
+    //  Right now, we wish to keep things simple.  Don't make these
+    //  links available to non-admin users.
+    if (empty($this->params['admin']))
+      $this->sideMenuEnable('CONTROLLER', $this->std_area, false);
   }
 
-  
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -36,13 +48,18 @@ class TransactionsController extends AppController {
   function invoice()  { $this->gridView('Invoices'); }
   function receipt()  { $this->gridView('Receipts'); }
   function deposit()  {
-    $this->sidemenu_links = array
-      (array('name' => 'Operations', 'header' => true),
-       array('name' => 'New Deposit', 'url' => array('controller' => 'tenders',
-						     'action' => 'deposit')));
+/*     $this->addSideMenuLink('New Deposit', */
+/* 			   array('controller' => 'tenders', 'action' => 'deposit'), null, */
+/* 			   'CONTROLLER', $this->new_area); */
     $this->gridView('Deposits');
   }
 
+  function gridView($title, $action = null, $element = null) {
+    if ($title != 'Deposits')
+      $this->set('include', array('Customer'));
+    parent::gridView($title, $action, $element);
+  }
+
 
   /**************************************************************************
    **************************************************************************
@@ -66,6 +83,7 @@ class TransactionsController extends AppController {
     $link = $this->gridDataCountTables($params, $model);
     $link['link']['StatementEntry'] = array('fields' => array());
     $link['link']['DepositTender'] = array('fields' => array());
+    $link['link']['Customer'] = array('fields' => array('id', 'name'));
     return $link;
   }
 
@@ -84,16 +102,13 @@ class TransactionsController extends AppController {
     if (in_array($params['action'], array('invoice', 'receipt', 'deposit')))
       $conditions[] = array('Transaction.type' => strtoupper($params['action']));
 
-    // REVISIT <AP>: 20090811
-    //  No security issues have been worked out yet
-    $conditions[] = array('Account.level >=' => 5);
-
     return $conditions;
   }
 
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
     $links['Transaction'] = array('id', 'action' => ($params['action'] == 'deposit'
 						     ? 'deposit_slip' : 'view'));
+    $links['Customer'] = array('name');
     return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
@@ -105,7 +120,7 @@ class TransactionsController extends AppController {
    *  - handles the creation of a charge invoice
    */
 
-  function postInvoice() {
+  function postInvoice($redirect = true) {
     if (!$this->RequestHandler->isPost()) {
       echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
       return;
@@ -120,6 +135,17 @@ class TransactionsController extends AppController {
       die("<H1>INVOICE FAILED</H1>");
     }
 
+    if ($redirect) {
+      if (!empty($this->data['Customer']['id']))
+	$this->redirect(array('controller' => 'customers',
+			      'action'     => 'receipt',
+			      $this->data['Customer']['id']));
+      else
+	$this->redirect(array('controller' => 'leases',
+			      'action'     => 'view',
+			      $this->data['Lease']['id']));
+    }
+
     $this->layout = null;
     $this->autoLayout = false;
     $this->autoRender = false; 
@@ -133,7 +159,7 @@ class TransactionsController extends AppController {
    *  - handles the creation of a receipt
    */
 
-  function postReceipt() {
+  function postReceipt($redirect = true) {
     if (!$this->RequestHandler->isPost()) {
       echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
       return;
@@ -157,6 +183,11 @@ class TransactionsController extends AppController {
       die("<H1>RECEIPT FAILED</H1>");
     }
 
+    if ($redirect)
+      $this->redirect(array('controller' => 'customers',
+			    'action'     => 'view',
+			    $this->data['Customer']['id']));
+
     $this->layout = null;
     $this->autoLayout = false;
     $this->autoRender = false; 
@@ -269,7 +300,7 @@ class TransactionsController extends AppController {
       $this->Session->setFlash(__('Unable to Create Deposit', true));
       $this->redirect(array('controller' => 'tenders', 'action'=>'deposit'));
     }
-      
+
     // Present the deposit slip to the user
     $this->redirect(array('controller' => 'transactions',
 			  'action' => 'deposit_slip',
@@ -370,9 +401,11 @@ class TransactionsController extends AppController {
    *    irreversibly destroys the data.  It is not for normal use.
    */
 
-  function destroy($id = null) {
+  function destroy($id) {
+    $this->Transaction->id = $id;
+    $customer_id = $this->Transaction->field('customer_id');
     $this->Transaction->destroy($id);
-    //$this->redirect(array('action' => 'index'));
+    $this->redirect(array('controller' => 'customers', 'action' => 'view', $customer_id));
   }
 
 
@@ -388,42 +421,35 @@ class TransactionsController extends AppController {
       ('first',
        array('contain' =>
 	     array(// Models
-		   'Account(id,name)',
-		   'Ledger(id,name)',
+		   'Account(id,name,level)',
+		   'Ledger(id,sequence)',
 		   'NsfTender(id,name)',
 		   ),
 	     'conditions' => array(array('Transaction.id' => $id),
-				   // REVISIT <AP>: 20090811
-				   //  No security issues have been worked out yet
-				   array('OR' =>
-					 array(array('Account.level >=' => 5),
-					       array('Account.id' => null))),
 				   ),
 	     ));
 
-    // REVISIT <AP>: 20090815
-    //  for debug purposes only (pr output)
-    $this->Transaction->stats($id);
-
     if (empty($transaction)) {
       $this->Session->setFlash(__('Invalid Item.', true));
       $this->redirect(array('action'=>'index'));
     }
 
-    if ($transaction['Transaction']['type'] === 'DEPOSIT' || $this->params['dev']) {
-      $this->sidemenu_links[] =
-	array('name' => 'Operations',    'header' => true);
+    $transaction['Account']['link'] =
+      $transaction['Account']['level'] >=
+      $this->Permission->level('controller.accounts');
 
-      if ($transaction['Transaction']['type'] === 'DEPOSIT')
-	$this->sidemenu_links[] =
-	  array('name' => 'View Slip',  'url' => array('action' => 'deposit_slip', $id));
-      if ($this->params['dev'])
-	$this->sidemenu_links[] =
-	  array('name' => 'Destroy',    'url' => array('action' => 'destroy', $id),
-		'confirmMessage' => ("This may leave the database in an unstable state." .
-				     " Do NOT do this unless you know what you're doing." .
-				     " Proceed anyway?"));
-    }
+    if ($transaction['Transaction']['type'] === 'DEPOSIT')
+      $this->addSideMenuLink('View Slip',
+			     array('action' => 'deposit_slip', $id), null,
+			     'ACTION');
+
+    $this->addSideMenuLink('Destroy',
+			   array('action' => 'destroy', $id),
+			   array('confirmMessage' =>
+				 "This may leave the database in an unstable state." .
+				 " Do NOT do this unless you know what you're doing." .
+				 " Proceed anyway?"),
+			   'ACTION', $this->admin_area);
 
     // OK, prepare to render.
     $title = 'Transaction #' . $transaction['Transaction']['id'];
@@ -440,15 +466,12 @@ class TransactionsController extends AppController {
    */
 
   function deposit_slip($id) {
-    // Build a container for the deposit slip data
-    $deposit = array('types' => array());
-
-    $this->id = $id;
-    $deposit +=
-      $this->Transaction->find('first', array('contain' => false));
+    // Find the deposit transaction
+    $this->Transaction->id = $id;
+    $deposit = $this->Transaction->find('first', array('contain' => false));
 
     // Get a summary of all forms of tender in the deposit
-    $result = $this->Transaction->find
+    $tenders = $this->Transaction->find
       ('all',
        array('link' => array('DepositTender' =>
 			     array('fields' => array(),
@@ -463,16 +486,17 @@ class TransactionsController extends AppController {
 	     'group' => 'TenderType.id',
 	     ));
 
-    if (empty($result)) {
-      die();
+    // Verify the deposit exists, and that something was actually deposited
+    if (empty($deposit) || empty($tenders)) {
       $this->Session->setFlash(__('Invalid Deposit.', true));
       $this->redirect(array('action'=>'deposit'));
     }
 
     // Add the summary to our deposit slip data container
-    foreach ($result AS $type) {
-      $deposit['types'][$type['TenderType']['id']] =
-	$type['TenderType'] + $type[0];
+    $deposit['types'] = array();
+    foreach ($tenders AS $tender) {
+      $deposit['types'][$tender['TenderType']['id']] =
+	$tender['TenderType'] + $tender[0];
     }
 
     $deposit_total = 0;
@@ -482,10 +506,9 @@ class TransactionsController extends AppController {
     if ($deposit['Transaction']['amount'] != $deposit_total)
       $this->INTERNAL_ERROR("Deposit items do not add up to deposit slip total");
 
-    $this->sidemenu_links[] =
-      array('name' => 'Operations',    'header' => true);
-    $this->sidemenu_links[] =
-      array('name' => 'View Transaction',  'url' => array('action' => 'view', $id));
+    $this->addSideMenuLink('View',
+			   array('action' => 'view', $id), null,
+			   'ACTION');
 
     $title = 'Deposit Slip';
     $this->set(compact('title', 'deposit'));

site/controllers/unit_sizes_controller.php

@@ -0,0 +1,255 @@
+<?php
+
+class UnitSizesController extends AppController {
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
+   */
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('1 Bedroom',
+			   array('controller' => 'unit_sizes', 'action' => 'bd1'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('2 Bedroom',
+			   array('controller' => 'unit_sizes', 'action' => 'bd2'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('3 Bedroom',
+			   array('controller' => 'unit_sizes', 'action' => 'bd3'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('4+ Bedroom',
+			   array('controller' => 'unit_sizes', 'action' => 'bd4'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Auto',
+			   array('controller' => 'unit_sizes', 'action' => 'auto'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Boat',
+			   array('controller' => 'unit_sizes', 'action' => 'boat'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('RV',
+			   array('controller' => 'unit_sizes', 'action' => 'rv'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('All',
+			   array('controller' => 'unit_sizes', 'action' => 'all'), null,
+			   'CONTROLLER');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index / unavailable / vacant / occupied / all
+   *  - Generate a listing of units
+   */
+
+  function index()       { $this->all(); }
+  function bd1()         { $this->gridView('Sizes for 1 Bedroom'); }
+  function bd2()         { $this->gridView('Sizes for 2 Bedrooms'); }
+  function bd3()         { $this->gridView('Sizes for 3 Bedroom'); }
+  function bd4()         { $this->gridView('Sizes for 4+ Bedroom'); }
+  function auto()        { $this->gridView('Sizes for an Automobile'); }
+  function boat()        { $this->gridView('Sizes for a Boat'); }
+  function rv()          { $this->gridView('Sizes for an RV'); }
+  function all()         { $this->gridView('All Unit Sizes', 'all'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
+   *    these virtual functions ensure that the correct data is passed
+   *    to jqGrid.
+   */
+
+  function gridDataCountTables(&$params, &$model) {
+    return array('link' => array('UnitType'));
+  }
+
+  function gridDataTables(&$params, &$model) {
+    $tables = $this->gridDataCountTables($params, $model);
+    $tables['link']['Unit'] = array();
+    return $tables;
+  }
+
+  function gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+    $fields[] = 'ROUND(UnitSize.width/12, 1) AS width';
+    $fields[] = 'ROUND(UnitSize.depth/12, 1) AS depth';
+    $fields[] = 'ROUND(UnitSize.height/12, 1) AS height';
+    $fields[] = 'ROUND(UnitSize.width/12 * UnitSize.depth/12, 0) AS sqft';
+    $fields[] = 'ROUND(UnitSize.width/12 * UnitSize.depth/12 * UnitSize.height/12, 0) AS cuft';
+    $fields[] = 'ROUND(UnitSize.rent / (UnitSize.width/12 * UnitSize.depth/12), 2) AS sqcost';
+    $fields[] = 'ROUND(UnitSize.rent / (UnitSize.width/12 * UnitSize.depth/12 * UnitSize.height/12), 2) AS cucost';
+
+    $fields[] = 'COUNT(Unit.id) AS units';
+    $fields[] = 'SUM(IF(' . $this->UnitSize->Unit->conditionUnavailable() . ', 1, 0)) AS unavailable';
+    $fields[] = 'SUM(IF(' . $this->UnitSize->Unit->conditionAvailable() . ', 1, 0)) AS available';
+    $fields[] = 'SUM(IF(' . $this->UnitSize->Unit->conditionOccupied() . ', 1, 0)) AS occupied';
+    $fields[] = 'SUM(IF(' . $this->UnitSize->Unit->conditionOccupied() . ', 0, 1)) / COUNT(unit.id) AS vacancy';
+    $fields[] = 'SUM(IF(' . $this->UnitSize->Unit->conditionOccupied() . ', 1, 0)) / COUNT(unit.id) AS occupancy';
+
+    return $fields;
+  }
+
+  function gridDataConditions(&$params, &$model) {
+    $conditions = parent::gridDataConditions($params, $model);
+
+    // REVISIT <AP>: 20090825
+    //  Sizes should come from the database.
+    //  For now, I took an assumed average need, then bracketed
+    //  with +/- 50 sqft.  This gives a 100sqft range for each.
+    if ($params['action'] === 'bd1') { // 75 sqft
+      $conditions[] = array('UnitType.id' => array_keys($this->UnitSize->UnitType->enclosedTypes()));
+      $conditions[] = '(UnitSize.width/12 * UnitSize.depth/12) <= 125';
+    }
+    elseif ($params['action'] === 'bd2') { // 125 sqft
+      $conditions[] = array('UnitType.id' => array_keys($this->UnitSize->UnitType->enclosedTypes()));
+      $conditions[] = '(UnitSize.width/12 * UnitSize.depth/12) >= 75';
+      $conditions[] = '(UnitSize.width/12 * UnitSize.depth/12) <= 175';
+    }
+    elseif ($params['action'] === 'bd3') { // 175 sqft
+      $conditions[] = array('UnitType.id' => array_keys($this->UnitSize->UnitType->enclosedTypes()));
+      $conditions[] = '(UnitSize.width/12 * UnitSize.depth/12) >= 125';
+      $conditions[] = '(UnitSize.width/12 * UnitSize.depth/12) <= 225';
+    }
+    elseif ($params['action'] === 'bd4') { // 225 sqft
+      $conditions[] = array('UnitType.id' => array_keys($this->UnitSize->UnitType->enclosedTypes()));
+      $conditions[] = '(UnitSize.width/12 * UnitSize.depth/12) >= 175';
+    }
+    elseif (in_array($params['action'], array('auto', 'boat', 'rv'))) {
+      $conditions[] = array('UnitType.id' =>
+			    array_merge(array_keys($this->UnitSize->UnitType->enclosedTypes()),
+					array_keys($this->UnitSize->UnitType->outdoorTypes())));
+      list($width, $depth, $height) = array(8, 15, null);
+      if ($params['action'] === 'auto')
+	$depth = 15;
+      elseif ($params['action'] === 'boat')
+	$depth = 15;
+      elseif ($params['action'] === 'rv')
+	list($width, $depth, $height) = array(10, 25, 12);
+
+      $conditions[] = "(UnitSize.width/12) >= $width";
+      $conditions[] = "(UnitSize.depth/12) >= $depth";
+      if (isset($height))
+	$conditions[] = array('OR' =>
+			      array("(UnitSize.height/12) >= $height",
+				    //"UnitSize.height IS NULL",
+				    array('UnitType.id' =>
+					  array_keys($this->UnitSize->UnitType->outdoorTypes())),
+				    ));
+    }
+
+    return $conditions;
+  }
+
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+    if ($index == 'UnitType.name')
+      $index = 'UnitType.code';
+
+    $order = parent::gridDataOrder($params, $model, $index, $direction);
+
+    // After sorting by whatever the user wants, add these
+    // defaults into the sort mechanism.  If we're already
+    // sorting by one of them, it will only be redundant,
+    // and should cause no harm (possible a longer query?)
+    $order[] = 'UnitType.code ' . $direction;
+    $order[] = 'sqft ' . $direction;
+    $order[] = 'UnitSize.rent ' . $direction;
+
+    return $order;
+  }
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['UnitSize'] = array('name');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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 UnitSize and related fields
+    $this->UnitSize->id = $id;
+    $size = $this->UnitSize->find
+      ('first', array
+       ('contain' => array('UnitType'),
+	'fields' => array('UnitSize.*', 'UnitType.*',
+			  'ROUND(UnitSize.width/12, 1) AS width',
+			  'ROUND(UnitSize.depth/12, 1) AS depth',
+			  'ROUND(UnitSize.height/12, 1) AS height',
+			  'ROUND(UnitSize.width/12 * UnitSize.depth/12, 0) AS sqft',
+			  'ROUND(UnitSize.width/12 * UnitSize.depth/12 * UnitSize.height/12, 0) AS cuft'),
+	));
+    $size['UnitSize'] = $size[0] + $size['UnitSize'];
+    unset($size[0]);
+
+    $this->set(compact('size'));
+    $this->set('stats', $this->UnitSize->stats($id));
+
+    // Prepare to render.
+    $title = "Unit Size : {$size['UnitSize']['name']}";
+    $this->set(compact('title'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: edit
+   *  - Edit unit_size information
+   */
+
+  function edit($id = null) {
+    $this->INTERNAL_ERROR('NOT READY');
+    if (isset($this->data)) {
+      // Check to see if the operation was cancelled.
+      if (isset($this->params['form']['cancel'])) {
+	if (empty($this->data['UnitSize']['id']))
+	  $this->redirect(array('action'=>'index'));
+
+	$this->redirect(array('action'=>'view', $this->data['UnitSize']['id']));
+      }
+
+      // Make sure we have unit_size data
+      if (empty($this->data['UnitSize']) || empty($this->data['UnitSize']['id']))
+	$this->redirect(array('action'=>'index'));
+
+      // Save the unit_size and all associated data
+      $this->UnitSize->create();
+      $this->UnitSize->id = $this->data['UnitSize']['id'];
+      if (!$this->UnitSize->save($this->data, false)) {
+	$this->Session->setFlash("UNIT_SIZE SAVE FAILED", true);
+	pr("UNIT_SIZE SAVE FAILED");
+      }
+
+      $this->redirect(array('action'=>'view', $this->UnitSize->id));
+    }
+
+    if ($id) {
+      $this->data = $this->UnitSize->findById($id);
+    } else {
+      $this->redirect(array('action'=>'index'));
+    }
+
+    // Prepare to render.
+    $title = ('UnitSize ' . $this->data['UnitSize']['name'] .
+	      " : Edit");
+    $this->set(compact('title'));
+  }
+}

site/controllers/units_controller.php

@@ -2,26 +2,38 @@
 
 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
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Unavailable',
+			   array('controller' => 'units', 'action' => 'unavailable'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Vacant',
+			   array('controller' => 'units', 'action' => 'vacant'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Occupied',
+			   array('controller' => 'units', 'action' => 'occupied'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Overlocked',
+			   array('controller' => 'units', 'action' => 'locked'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Liened',
+			   array('controller' => 'units', 'action' => 'liened'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('All',
+			   array('controller' => 'units', 'action' => 'all'), null,
+			   'CONTROLLER');
   }
 
-  
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -33,6 +45,8 @@ class UnitsController extends AppController {
   function unavailable() { $this->gridView('Unavailable Units'); }
   function vacant()      { $this->gridView('Vacant Units'); }
   function occupied()    { $this->gridView('Occupied Units'); }
+  function locked()      { $this->gridView('Overlocked Units'); }
+  function liened()      { $this->gridView('Liened Units'); }
   function all()         { $this->gridView('All Units', 'all'); }
 
 
@@ -81,6 +95,7 @@ class UnitsController extends AppController {
   function gridDataFields(&$params, &$model) {
     $fields = parent::gridDataFields($params, $model);
 
+    $fields[] = 'ROUND(UnitSize.width/12 * UnitSize.depth/12, 0) AS sqft';
     return array_merge($fields,
 		       $this->Unit->Lease->StatementEntry->chargeDisbursementFields(true));
   }
@@ -100,6 +115,12 @@ class UnitsController extends AppController {
     elseif ($params['action'] === 'unoccupied') {
       $conditions[] = array('NOT' => array($this->Unit->conditionOccupied()));
     }
+    elseif ($params['action'] === 'locked') {
+      $conditions[] = $this->Unit->conditionLocked();
+    }
+    elseif ($params['action'] === 'liened') {
+      $conditions[] = $this->Unit->conditionLiened();
+    }
 
     return $conditions;
   }
@@ -139,7 +160,7 @@ class UnitsController extends AppController {
     $customer = array();
     $unit = array();
 
-    if (isset($id)) {
+    if (!empty($id)) {
       $this->Unit->recursive = -1;
       $unit = current($this->Unit->read(null, $id));
     }
@@ -189,6 +210,84 @@ class UnitsController extends AppController {
   }
 
 
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: lock/unlock
+   *  - Transitions the unit into / out of the LOCKED state
+   */
+
+  function status($id, $status) {
+    $this->Unit->updateStatus($id, $status, true);
+    $this->redirect(array('action' => 'view', $id));
+  }
+  function lock($id)    { $this->status($id, 'LOCKED'); }
+  function unlock($id)  { $this->status($id, 'OCCUPIED'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: overview
+   *  - Displays overview information for all units
+   */
+  function overview() {
+    $result = $this->Unit->find
+      ('all',
+       array('link' => array('UnitSize' => array('fields' => array(), 'UnitType' => array('fields' => array('name')))),
+	     'fields' => array('status', 'COUNT(Unit.id) AS cnt', 'SUM(Unit.rent) AS rents'),
+	     //'conditions' => array('
+	     'group' => array('UnitType.id', 'Unit.status'),
+	     'order' => array('UnitType.name', 'Unit.status')
+	     ));
+
+    $overview = array('types' => array(), 'count' => 0, 'rents' => 0);
+    foreach ($result AS $row) {
+      $utname = $row['UnitType']['name'];
+      if (empty($overview['types'][$utname]))
+	$overview['types'][$utname] = array('name' => $utname,
+					    'subs' => array(),
+					    'count' => 0,
+					    'rents' => 0,
+					    'phys_pct' => 0,
+					    'econ_pct' => 0);
+      $type = &$overview['types'][$utname];
+      $type['subs'][] = array('name' => $row['Unit']['status'],
+			      'count' => $row[0]['cnt'],
+			      'rents' => $row[0]['rents'],
+			      'phys_subpct' => 0,
+			      'phys_totpct' => 0,
+			      'econ_subpct' => 0,
+			      'econ_totpct' => 0);
+
+
+      $type['count'] += $row[0]['cnt'];
+      $type['rents'] += $row[0]['rents'];
+
+      $overview['count'] += $row[0]['cnt'];
+      $overview['rents'] += $row[0]['rents'];
+    }
+
+    foreach ($overview['types'] AS &$type) {
+      foreach ($type['subs'] AS &$sub) {
+	$sub['phys_subpct'] = $sub['count'] / $type['count'];
+	$sub['econ_subpct'] = $sub['rents'] / $type['rents'];
+	$sub['phys_totpct'] = $sub['count'] / $overview['count'];
+	$sub['econ_totpct'] = $sub['rents'] / $overview['rents'];
+      }
+      $type['phys_pct'] = $type['count'] / $overview['count'];
+      $type['econ_pct'] = $type['rents'] / $overview['rents'];
+    }
+
+    // Enable the Reports menu section
+    $this->sideMenuAreaActivate('REPORT');
+
+    // Prepare to render.
+    $this->set('title', 'Unit Overview');
+    $this->set(compact('overview'));
+  }
+
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -232,39 +331,66 @@ class UnitsController extends AppController {
       $outstanding_deposit = $this->Unit->Lease->securityDepositBalance($unit['CurrentLease']['id']);
     }
 
-    // Set up dynamic menu items
-    $this->sidemenu_links[] =
-      array('name' => 'Operations', 'header' => true);
+    // If the unit is occupied, but not locked, provide a
+    // mechanism to do so.  This doesn't have to be restricted
+    // to past due customers.  There are times we need to
+    // overlock customers in good standing, such as if their
+    // lock breaks, is cut, or missing for any reason.
+    if ($this->Unit->occupied($unit['Unit']['status']) &&
+	!$this->Unit->locked($unit['Unit']['status']))
+      $this->addSideMenuLink('Lock',
+			     array('action' => 'Lock', $id), null,
+			     'ACTION');
 
-    $this->sidemenu_links[] =
-      array('name' => 'Edit', 'url' => array('action' => 'edit',
-					     $id));
+    // If the unit is locked, provide an option to unlock it,
+    // unless it's locked due to lien, which is not so simple.
+    if ($this->Unit->locked($unit['Unit']['status']) &&
+	!$this->Unit->liened($unit['Unit']['status']))
+      $this->addSideMenuLink('Unlock',
+			     array('action' => 'unlock', $id), null,
+			     'ACTION');
 
-    if (isset($unit['CurrentLease']['id']) &&
-	!isset($unit['CurrentLease']['moveout_date'])) {
-      $this->sidemenu_links[] =
-	array('name' => 'Move-Out', 'url' => array('action' => 'move_out',
-						   $id));
+    // If there is a current lease on this unit, then provide
+    // a link to move the tenant out.  Current lease for a unit
+    // has a bit different definition than a current lease for
+    // a customer, since a lease stays with a customer until it
+    // is finally closed.  A lease, however, only stays with a
+    // unit while occupied (since a unit is not responsible for
+    // any lingering financial obligations, like a customer is).
+    // Of course, if there is no current lease, provide a link
+    // to move a new tenant in (if the unit is available).
+    if (isset($unit['CurrentLease']['id'])) {
+      $this->addSideMenuLink('Move-Out',
+			     array('action' => 'move_out', $id), null,
+			     'ACTION');
     } elseif ($this->Unit->available($unit['Unit']['status'])) {
-      $this->sidemenu_links[] =
-	array('name' => 'Move-In', 'url' => array('action' => 'move_in',
-						   $id));
+      $this->addSideMenuLink('Move-In',
+			     array('action' => 'move_in', $id), null,
+			     'ACTION');
     } else {
       // Unit is unavailable (dirty, damaged, reserved, business-use, etc)
     }
 
-    if (isset($unit['CurrentLease']['id']) &&
-	!isset($unit['CurrentLease']['close_date'])) {
-      $this->sidemenu_links[] =
-	array('name' => 'New Invoice', 'url' => array('controller' => 'leases',
-						      'action' => 'invoice',
-						      $unit['CurrentLease']['id']));
-      $this->sidemenu_links[] =
-	array('name' => 'New Receipt', 'url' => array('controller' => 'customers',
-						      'action' => 'receipt',
-						      $unit['CurrentLease']['customer_id']));
+    // If there is a current lease, allow new charges to
+    // be added, and payments to be made.
+    if (isset($unit['CurrentLease']['id'])) {
+      $this->addSideMenuLink('New Invoice',
+			     array('controller' => 'leases',
+				   'action' => 'invoice',
+				   $unit['CurrentLease']['id']), null,
+			     'ACTION');
+      $this->addSideMenuLink('New Receipt',
+			     array('controller' => 'customers',
+				   'action' => 'receipt',
+				   $unit['CurrentLease']['customer_id']), null,
+			     'ACTION');
     }
 
+    // Always allow the unit to be edited.
+    $this->addSideMenuLink('Edit',
+			   array('action' => 'edit', $id), null,
+			   'ACTION');
+
     // Prepare to render.
     $title = 'Unit ' . $unit['Unit']['name'];
     $this->set(compact('unit', 'title',
@@ -328,7 +454,6 @@ class UnitsController extends AppController {
     $this->set(compact('unit_sizes'));
 
     // Prepare to render.
-    pr($this->data);
     $this->set(compact('title'));
   }
 

site/controllers/util_controller.php

@@ -0,0 +1,76 @@
+<?php
+
+class UtilController extends AppController {
+
+  var $uses = array();
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: reset_data
+   *  - Development function.  TO BE DELETED
+   */
+
+  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";
+    $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);
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: rebuild_box
+   */
+
+  function rebuild_box($type) {
+    $this->layout = null;
+    $this->autoLayout = false;
+    $this->autoRender = false;
+    Configure::write('debug', '0');
+    $script = preg_replace('%/webroot/index.php$%',
+			   '/build_'.$type.'box.cmd',
+			   $_SERVER['SCRIPT_FILENAME']);
+
+    // REVISIT <AP>: 20090828
+    //  Just use system call
+    $handle = popen($script . ' 2>&1', 'r');
+    while (($read = fread($handle, 2096))) {
+      // Do nothing
+    }
+    pclose($handle);
+
+    $url = $_SERVER['HTTP_REFERER'];
+    if (empty($url))
+      $url = "/";
+
+    $this->redirect($url);
+  }
+
+  function rebuild_sandbox() { $this->rebuild_box('sand'); }
+  function rebuild_devbox()  { $this->rebuild_box('dev'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: logmsg
+   *  - action to allow posting log message data
+   */
+
+  function logmsg() {
+  }
+  
+}

site/models/account.php

@@ -121,25 +121,32 @@ class Account extends AppModel {
    *  - 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 accountPayableAccountID()    { return $this->nameToID('A/P'); }
-  function cashAccountID()              { return $this->nameToID('Cash'); }
-  function checkAccountID()             { return $this->nameToID('Check'); }
-  function moneyOrderAccountID()        { return $this->nameToID('Money Order'); }
-  function achAccountID()               { return $this->nameToID('ACH'); }
-  function concessionAccountID()        { return $this->nameToID('Concession'); }
-  function waiverAccountID()            { return $this->nameToID('Waiver'); }
-  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 customerCreditAccountID()    { return $this->nameToID(
+  function lookup($name, $check = true) {
+    $id = $this->nameToID($name);
+    if (empty($id) && $check)
+      $this->INTERNAL_ERROR("Missing Account '$name'");
+    return $id;
+  }
+
+  function securityDepositAccountID()   { return $this->lookup('Security Deposit'); }
+  function rentAccountID()              { return $this->lookup('Rent'); }
+  function lateChargeAccountID()        { return $this->lookup('Late Charge'); }
+  function nsfAccountID()               { return $this->lookup('NSF'); }
+  function nsfChargeAccountID()         { return $this->lookup('NSF Charge'); }
+  function taxAccountID()               { return $this->lookup('Tax'); }
+  function accountReceivableAccountID() { return $this->lookup('A/R'); }
+  function accountPayableAccountID()    { return $this->lookup('A/P'); }
+  function cashAccountID()              { return $this->lookup('Cash'); }
+  function checkAccountID()             { return $this->lookup('Check'); }
+  function moneyOrderAccountID()        { return $this->lookup('Money Order'); }
+  function achAccountID()               { return $this->lookup('ACH'); }
+  function concessionAccountID()        { return $this->lookup('Concession'); }
+  function waiverAccountID()            { return $this->lookup('Waiver'); }
+  function pettyCashAccountID()         { return $this->lookup('Petty Cash'); }
+  function invoiceAccountID()           { return $this->lookup('Invoice'); }
+  function receiptAccountID()           { return $this->lookup('Receipt'); }
+  function badDebtAccountID()           { return $this->lookup('Bad Debt'); }
+  function customerCreditAccountID()    { return $this->lookup(
   // REVISIT <AP>: 20090816
   //  Use of A/R works, and saves an excess of accounts.
   //  However, a dedicated account is nice, since it can
@@ -181,8 +188,7 @@ class Account extends AppModel {
   function relatedAccounts($attribute, $extra = null) {
     $this->cacheQueries = true;
     $accounts = $this->find('all', array
-			    ('contain' => array('CurrentLedger'),
-			     'fields' => array('Account.id', 'Account.type', 'Account.name', 'CurrentLedger.id'),
+			    ('fields' => array('Account.id', 'Account.name'),
 			     'conditions' => array('Account.'.$attribute => true),
 			     'order' => array('Account.name'),
 			     ) + (isset($extra) ? $extra : array())
@@ -206,21 +212,10 @@ class Account extends AppModel {
    *  - Returns an array of accounts suitable for activity xxx
    */
 
-  function invoiceAccounts() {
-    return $this->relatedAccounts('invoices', array('order' => 'name'));
-  }
-
-  function receiptAccounts() {
-    return $this->relatedAccounts('receipts', array('order' => 'name'));
-  }
-
-  function depositAccounts() {
-    return $this->relatedAccounts('deposits', array('order' => 'name'));
-  }
-
-  function refundAccounts() {
-    return $this->relatedAccounts('refunds', array('order' => 'name'));
-  }
+  function invoiceAccounts()  { return $this->relatedAccounts('invoices'); }
+  function receiptAccounts()  { return $this->relatedAccounts('receipts'); }
+  function depositAccounts()  { return $this->relatedAccounts('deposits'); }
+  function refundAccounts()   { return $this->relatedAccounts('refunds'); }
 
 
   /**************************************************************************
@@ -238,8 +233,8 @@ class Account extends AppModel {
 		  $this->nsfAccountID(),
 		  $this->waiverAccountID(),
 		  $this->badDebtAccountID(),
-		  //$this->nameToID('Closing'),
-		  //$this->nameToID('Equity'),
+		  //$this->lookup('Closing'),
+		  //$this->lookup('Equity'),
 		  )
 	    AS $account_id) {
       $accounts[$account_id] = $this->name($account_id);

site/models/contact.php

@@ -41,14 +41,15 @@ class Contact extends AppModel {
   function saveContact($id, $data) {
 
     // Establish a display name if not already given
-    if (!$data['Contact']['display_name'])
+    if (!$data['Contact']['display_name'] &&
+	$data['Contact']['first_name'] && $data['Contact']['last_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']));
+	$data['Contact']['last_name'] . ', ' . $data['Contact']['first_name'];
+
+    foreach (array('last_name', 'first_name', 'company_name') AS $fld) {
+      if (!$data['Contact']['display_name'] && $data['Contact'][$fld])
+      $data['Contact']['display_name'] = $data['Contact'][$fld];
+    }
 
     // Save the contact data
     $this->create();

site/models/customer.php

@@ -20,15 +20,25 @@ class Customer extends AppModel {
 		),
 		'Lease',
 		'StatementEntry',
-		'ContactsCustomer',
+		'ContactsCustomer' => array(
+			// It would be nice to claim a dependency here, which would
+			// simplify deletion of a customer.  However, for this to work
+			// Cake must have a primaryKey as a single field.  This table
+		        // makes use of a complex key, so we're out of luck.
+			/* 'dependent' => true, */
+		),
 
 		'Transaction',
+		'Tender',
 	);
 
 	var $hasAndBelongsToMany = array(
-		'Contact',
+		'Contact' => array(
+			'unique' => true,
+		),
 	);
 
+	//var $default_log_level = 20;
 
   /**************************************************************************
    **************************************************************************
@@ -54,17 +64,19 @@ class Customer extends AppModel {
    * function: leaseIds
    *  - Returns the lease IDs for the given customer
    */
-  function leaseIds($id) {
+  function leaseIds($id, $current = false) {
+    $Lease = $current ? 'CurrentLease' : 'Lease';
+
     $this->cacheQueries = true;
     $customer = $this->find('first',
 			    array('contain' =>
-				  array('Lease' => array('fields' => array('id'))),
+				  array($Lease => array('fields' => array('id'))),
 				  'fields' => array(),
 				  'conditions' => array(array('Customer.id' => $id))));
     $this->cacheQueries = false;
 
     $ids = array();
-    foreach ($customer['Lease'] AS $lease)
+    foreach ($customer[$Lease] AS $lease)
       $ids[] = $lease['id'];
 
     return $ids;
@@ -101,12 +113,35 @@ class Customer extends AppModel {
     $this->prEnter(compact('id', 'query'));
     $this->queryInit($query);
 
-    $query['conditions'][] = array('StatementEntry.customer_id' => $id);
-    $query['conditions'][] = array('StatementEntry.account_id' =>
-				   $this->StatementEntry->Account->securityDepositAccountID());
+    $sd_account_id =
+      $this->StatementEntry->Account->securityDepositAccountID();
 
-    $stats = $this->StatementEntry->stats(null, $query);
-    return $this->prReturn($stats['account_balance']);
+    $squery = $query;
+    $squery['conditions'][] = array('StatementEntry.customer_id' => $id);
+    $squery['conditions'][] = array('StatementEntry.account_id' => $sd_account_id);
+    $stats = $this->StatementEntry->stats(null, $squery);
+    $this->pr(26, compact('squery', 'stats'));
+
+    // OK, we know now how much we charged for a security
+    // deposit, as well as how much we received to pay for it.
+    // Now we need to know if any has been released.
+    // Yes... this sucks.
+    $lquery = $query;
+    $lquery['link'] = array('Transaction' =>
+			    array('fields' => array(),
+				  'Customer' =>
+				  (empty($query['link'])
+				   ? array('fields' => array())
+				   : $query['link'])));
+    $lquery['conditions'][] = array('Transaction.customer_id' => $id);
+    $lquery['conditions'][] = array('LedgerEntry.account_id' => $sd_account_id);
+    $lquery['conditions'][] = array('LedgerEntry.crdr' => 'DEBIT');
+    $lquery['fields'][] = 'SUM(LedgerEntry.amount) AS total';
+    $released = $this->StatementEntry->Transaction->LedgerEntry->find
+      ('first', $lquery);
+    $this->pr(26, compact('lquery', 'released'));
+
+    return $this->prReturn($stats['Charge']['disbursement'] - $released[0]['total']);
   }
 
 
@@ -167,6 +202,13 @@ class Customer extends AppModel {
     }
     $id = $this->id;
 
+    // Appears that $this->save() "helpfully" choses to add in
+    // any missing data fields, populated with default values.
+    // So, after saving is complete, the fields 'lease_count',
+    // 'past_lease_count', and 'current_lease_count' have all
+    // been reset to zero.  Gee, thanks Cake...
+    $this->update($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.
@@ -208,19 +250,152 @@ class Customer extends AppModel {
    *  - Update any cached or calculated fields
    */
   function update($id) {
+    $this->prEnter(compact('id'));
 
-    // REVISIT <AP>: 20090812
-    //  updateLeaseCount is handled directly when needed.
-    //  Should we simplify by just doing it anyway?
-    //$this->updateLeaseCount($id);
+    if (empty($id)) {
+      $customers = $this->find('all', array('contain' => false, 'fields' => array('id')));
+      foreach ($customers AS $customer) {
+	// This SHOULDN'T happen, but check to be sure
+	// or we'll get infinite recursion.
+	if (empty($customer['Customer']['id']))
+	  continue;
+	$this->update($customer['Customer']['id']);
+      }
+      return;
+    }
+
+    // updateLeaseCount is typically handled directly when needed.
+    // However, this function is used to _ensure_ customer info is
+    // current, so we're obligated to call it anyway.
+    $this->updateLeaseCount($id);
 
     $current_leases =
       $this->find('all',
-		  array('link' => array('CurrentLease' => array('type' => 'INNER')),
+		  // REVISIT <AP>: 20090816
+		  //  Do we need to update leases other than the current ones?
+		  //  It may be necessary.  For example, a non-current lease
+		  //  can still be hit with an NSF item.  In that case, it
+		  //  could have stale data if we look only to current leases.
+		  //array('link' => array('CurrentLease' => array('type' => 'INNER')),
+		  array('link' => array('Lease' => array('type' => 'INNER')),
 			'conditions' => array('Customer.id' => $id)));
 
-    foreach ($current_leases AS $lease)
-      $this->Lease->update($lease['CurrentLease']['id']);
+    foreach ($current_leases AS $lease) {
+      if (!empty($lease['CurrentLease']['id']))
+	$this->Lease->update($lease['CurrentLease']['id']);
+      if (!empty($lease['Lease']['id']))
+	$this->Lease->update($lease['Lease']['id']);
+    }
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: merge
+   *  - Merges two customers into one
+   */
+
+  function merge($dst_id, $src_id, $contacts) {
+    $this->prEnter(compact('dst_id', 'src_id', 'contacts'));
+
+    // Get the entire list of destination customer contacts
+    $dst_contacts = array();
+    $result = $this->find('all',
+			  array('link' => array('ContactsCustomer'),
+			  	'fields' => array('ContactsCustomer.contact_id', 'ContactsCustomer.type'),
+				'conditions' => array(array('id' => $dst_id,
+							    'ContactsCustomer.active' => true))));
+    foreach ($result AS $contact) {
+      $dst_contacts[$contact['ContactsCustomer']['contact_id']] = $contact['ContactsCustomer'];
+    }
+    $this->pr(17, compact('dst_contacts'));
+
+    // Get the entire list of source customer contacts
+    $src_contacts = array();
+    $result = $this->find('all',
+			  array('link' => array('ContactsCustomer'),
+			  	'fields' => array('ContactsCustomer.contact_id', 'ContactsCustomer.type'),
+				'conditions' => array(array('id' => $src_id,
+							    'ContactsCustomer.active' => true))));
+    foreach ($result AS $contact) {
+      $src_contacts[$contact['ContactsCustomer']['contact_id']] = $contact['ContactsCustomer'];
+    }
+    $this->pr(17, compact('src_contacts'));
+
+    // Verify the contacts list are all valid source customer contacts
+    foreach ($contacts AS $contact_id) {
+      if (!array_key_exists($contact_id, $src_contacts))
+	return $this->prReturn(false);
+    }
+
+    // Remove any contacts which are already destination customer contacts
+    $new_contacts = array_diff($contacts, array_keys($dst_contacts));
+    $all_contacts = array_merge($new_contacts, array_keys($dst_contacts));
+    $this->pr(17, compact('new_contacts', 'all_contacts'));
+
+    // For now, we'll assume the operation will succeed.
+    $ret = true;
+
+    // Add each desired source customer contact to the destination customer
+    foreach ($new_contacts AS $contact_id) {
+      $CM = new ContactsCustomer();
+      if (!$CM->save(array('customer_id' => $dst_id)
+		     + $src_contacts[$contact_id], false)) {
+	$ret = false;
+      }
+    }
+
+    $this->Lease->updateAll
+      (array('Lease.customer_id' => $dst_id),
+       array('Lease.customer_id' => $src_id)
+       );
+
+    $this->Tender->updateAll
+      (array('Tender.customer_id' => $dst_id),
+       array('Tender.customer_id' => $src_id)
+       );
+
+    $this->StatementEntry->updateAll
+      (array('StatementEntry.customer_id' => $dst_id),
+       array('StatementEntry.customer_id' => $src_id)
+       );
+
+    $this->Transaction->updateAll
+      (array('Transaction.customer_id' => $dst_id),
+       array('Transaction.customer_id' => $src_id)
+       );
+
+    // Make sure our lease counts, etc are correct
+    $this->update($dst_id);
+
+    // Delete the old customer
+    $this->pr(12, compact('src_id'), "Delete Customer");
+    $this->delete($src_id);
+
+    // Delete all the orphaned customers
+    foreach (array_diff(array_keys($src_contacts), $all_contacts) AS $contact_id) {
+      // Delete un-used or duplicate contacts
+      // REVISIT <AP> 20100702:
+      //   Not sure if we really want to do this.
+      //   On the one hand, they're probably really redundant,
+      //   and only clutter up the list of all contacts.  On the
+      //   other hand, it destroys data, not only losing the
+      //   history, but making it difficult to recover if the
+      //   merge is a mistake.  Additionally, we need to do
+      //   extra checking to ensure that the contact is not
+      //   in use by some other customer.
+      //   We need some sort of Contact.deleted field...
+      $this->pr(12, compact('contact_id'), "Delete Contact");
+      $this->Contact->delete($contact_id);
+    }
+
+    // Finally, delete all customer contact relationships
+    $this->ContactsCustomer->deleteAll
+      (array('customer_id' => $src_id), false);
+
+    // Return the result
+    return $this->prReturn($ret);
   }
 
 

site/models/default_option.php

@@ -0,0 +1,21 @@
+<?php
+class DefaultOption extends AppModel {
+
+  var $belongsTo =
+    array('OptionValue',
+	  );
+
+
+  function values($name = null) {
+    $this->prEnter(compact('name'));
+
+    $query = array();
+    $this->queryInit($query);
+
+    $query['link']['DefaultOption'] = array();
+    $query['link']['DefaultOption']['type'] = 'INNER';
+    $query['link']['DefaultOption']['fields'] = array();
+    return $this->prReturn($this->OptionValue->values($name, $query));
+  }
+
+}

site/models/default_permission.php

@@ -0,0 +1,21 @@
+<?php
+class DefaultPermission extends AppModel {
+
+  var $belongsTo =
+    array('PermissionValue',
+	  );
+
+
+  function values($name = null) {
+    $this->prEnter(compact('name'));
+
+    $query = array();
+    $this->queryInit($query);
+
+    $query['link']['DefaultPermission'] = array();
+    $query['link']['DefaultPermission']['type'] = 'INNER';
+    $query['link']['DefaultPermission']['fields'] = array();
+    return $this->prReturn($this->PermissionValue->values($name, $query));
+  }
+
+}

site/models/double_entry.php

@@ -53,7 +53,7 @@ class DoubleEntry extends AppModel {
    */
 
   function addDoubleEntry($entry1, $entry2, $entry1_tender = null) {
-    $this->prFunctionLevel(16);
+    //$this->prFunctionLevel(16);
     $this->prEnter(compact('entry1', 'entry2', 'entry1_tender'));
 
     $ret = array();

site/models/group.php

@@ -0,0 +1,38 @@
+<?php
+class Group extends AppModel {
+
+  var $hasMany =
+    array('GroupOption',
+	  'Membership',
+	  );
+
+  var $knows = 
+    array('User',
+	  'Site',
+	  );
+
+  static $current_group_ids;
+  function currentGroupIds() {
+    if (empty(self::$current_group_ids))
+      self::$current_group_ids = $this->groupIds();
+
+    if (empty(self::$current_group_ids))
+      // We must force a stop here, since this is typically
+      // called very early on, and so will cause a recursive
+      // crash as we try to render the internal error and
+      // again stumble on this problem.
+      $this->INTERNAL_ERROR('INVALID MEMBERSHIP', 0, true);
+
+    return self::$current_group_ids;
+  }
+
+  function groupIds($user_id = null, $site_id = null) {
+    if (empty($user_id))
+      $user_id = $this->User->currentUserId();
+    if (empty($site_id))
+      $site_id = $this->Site->currentSiteId();
+
+    return $this->Membership->memberGroups($user_id, $site_id);
+  }
+
+}

site/models/group_option.php

@@ -0,0 +1,25 @@
+<?php
+class GroupOption extends AppModel {
+
+  var $belongsTo =
+    array('Group',
+	  'OptionValue',
+	  );
+
+
+  function values($ids, $name = null) {
+    $this->prEnter(compact('id', 'name'));
+
+    $query = array();
+    $this->queryInit($query);
+
+    $query['link']['GroupOption'] = array();
+    $query['link']['GroupOption']['fields'] = array();
+    $query['link']['GroupOption']['Group'] = array();
+    $query['link']['GroupOption']['Group']['fields'] = array();
+    $query['conditions'][] = array('Group.id' => $ids);
+    $query['order'][] = 'Group.rank';
+    return $this->prReturn($this->OptionValue->values($name, $query));
+  }
+
+}

site/models/group_permission.php

@@ -0,0 +1,25 @@
+<?php
+class GroupPermission extends AppModel {
+
+  var $belongsTo =
+    array('Group',
+	  'PermissionValue',
+	  );
+
+
+  function values($ids, $name = null) {
+    $this->prEnter(compact('id', 'name'));
+
+    $query = array();
+    $this->queryInit($query);
+
+    $query['link']['GroupPermission'] = array();
+    $query['link']['GroupPermission']['fields'] = array();
+    $query['link']['GroupPermission']['Group'] = array();
+    $query['link']['GroupPermission']['Group']['fields'] = array();
+    $query['conditions'][] = array('Group.id' => $ids);
+    $query['order'][] = 'Group.rank';
+    return $this->prReturn($this->PermissionValue->values($name, $query));
+  }
+
+}

site/models/lease.php

@@ -148,8 +148,11 @@ class Lease extends AppModel {
 		   array('class' => 'StatementEntry',
 			 'fields' => array(),
 			 'conditions' => array
-			 ('SEx.effective_date = DATE_ADD(StatementEntry.through_date, INTERVAL 1 day)',
-			  'SEx.lease_id = StatementEntry.lease_id',
+			 ('SEx.lease_id = StatementEntry.lease_id',
+			  'SEx.type' => 'CHARGE',
+			  'SEx.account_id' => $rent_account_id,
+			  'SEx.reverse_transaction_id IS NULL',
+			  'SEx.effective_date = DATE_ADD(StatementEntry.through_date, INTERVAL 1 day)',
 			  ),
 			 ),
 		   ),
@@ -159,6 +162,7 @@ class Lease extends AppModel {
 	     'conditions' => array(array('Lease.id' => $id),
 				   array('StatementEntry.type' => 'CHARGE'),
 				   array('StatementEntry.account_id' => $rent_account_id),
+				   array('StatementEntry.reverse_transaction_id IS NULL'),
 				   array('SEx.id' => null),
 				   ),
 	     )
@@ -259,7 +263,9 @@ class Lease extends AppModel {
 
 	     'conditions' =>
 	     array(array('StatementEntry.lease_id' => $id),
-		   array('StatementEntry.account_id' => $rent_account_id)),
+		   array('StatementEntry.account_id' => $rent_account_id),
+		   array('StatementEntry.reverse_transaction_id IS NULL'),
+		   ),
 
 	     'order' => array('StatementEntry.effective_date'),
 	     ),
@@ -278,7 +284,9 @@ class Lease extends AppModel {
       ('CHARGE',
        array('conditions' =>
 	     array(array('StatementEntry.lease_id' => $id),
-		   array('StatementEntry.account_id' => $rent_account_id)),
+		   array('StatementEntry.account_id' => $rent_account_id),
+		   array('StatementEntry.reverse_transaction_id IS NULL'),
+		   ),
 
 	     'order' => array('StatementEntry.through_date DESC'),
 	     ),
@@ -408,7 +416,6 @@ class Lease extends AppModel {
    */
 
   function assessMonthlyLate($id, $date = null) {
-    $this->prFunctionLevel(25);
     $this->prEnter(compact('id', 'date'));
     $this->id = $id;
 
@@ -537,7 +544,7 @@ class Lease extends AppModel {
   function conditionDelinquent($table_name = 'Lease') {
     if (empty($table_name)) $t = ''; else $t = $table_name . '.';
     return ("({$t}close_date IS NULL AND" .
-	    " NOW() > DATE_ADD({$t}paid_through_date, INTERVAL 15 DAY))");
+	    " NOW() > DATE_ADD({$t}paid_through_date, INTERVAL 1 DAY))");
   }
 
   function delinquentDaysSQL($table_name = 'Lease') {
@@ -792,6 +799,8 @@ class Lease extends AppModel {
    *  - Update any cached or calculated fields
    */
   function update($id) {
+    $this->prEnter(compact('id'));
+
     $this->id = $id;
     $this->saveField('charge_through_date', $this->rentChargeThrough($id));
     $this->saveField('paid_through_date', $this->rentPaidThrough($id));

site/models/ledger_entry.php

@@ -127,7 +127,7 @@ class LedgerEntry extends AppModel {
    *  - Inserts new Ledger Entry into the database
    */
   function addLedgerEntry($entry, $tender = null) {
-    $this->prFunctionLevel(16);
+    //$this->prFunctionLevel(16);
     $this->prEnter(compact('entry', 'tender'));
 
     $ret = array('data' => $entry);
@@ -165,53 +165,13 @@ class LedgerEntry extends AppModel {
    */
   function stats($id = null, $query = null, $set = null) {
     $this->queryInit($query);
-    unset($query['group']);
 
-    if (!isset($query['link']['DoubleEntry']))
-      $query['link']['DoubleEntry'] = array();
-/*     if (!isset($query['link']['DoubleEntry']['fields'])) */
-/*       $query['link']['DoubleEntry']['fields'] = array(); */
-
-    if (isset($id))
-      $query['conditions'][] = array('Entry.id' => $id);
-
-    if (isset($set))
-      $set = strtoupper($set);
-
-    //pr(array('stats()', compact('id', 'query', 'set')));
-
-    $rtypes = array('charge', 'disbursement',
-		    // 'debit', 'credit',
-		    );
-
-    $stats = array();
-    foreach($rtypes AS $rtype) {
-      $Rtype = ucfirst($rtype);
-
-      if (($rtype == 'charge'       && (!isset($set) || $set == 'DISBURSEMENT')) ||
-	  ($rtype == 'disbursement' && (!isset($set) || $set == 'CHARGE'))
-	  ) {
-
-	$rquery = $query;
-	$rquery['link'][$Rtype] =
-	  array('fields' => array("SUM(COALESCE(Applied{$Rtype}.amount,0)) AS reconciled"));
-
-	$rquery['fields'] = array();
-	//$rquery['fields'][] = "SUM(DoubleEntry.amount) AS total";
-	$rquery['fields'][] = "SUM(DoubleEntry.amount) - SUM(COALESCE(Applied{$Rtype}.amount,0)) AS balance";
-	$rquery['conditions'][] = array("Applied{$Rtype}.id !=" => null);
-
-	$result = $this->find('first', $rquery);
-	//pr(compact('Rtype', 'rquery', 'result'));
-
-	$sumfld = $Rtype;
-	$stats[$sumfld] = $result[0];
-/* 	if (!isset($stats[$sumfld]['applied'])) */
-/* 	  $stats[$sumfld]['applied'] = 0; */
-      }
-    }
-
-    return $stats;
+    // REVISIT <AP>: 20090816
+    //  This function appeared to be dramatically broken,
+    //  a throwback to an earlier time.  I deleted its
+    //  contents and added this error to ensure it does
+    //  not get used.
+    $this->INTERNAL_ERROR('This function should not be used');
   }
 
 }

site/models/membership.php

@@ -0,0 +1,37 @@
+<?php
+class Membership extends AppModel {
+
+  var $belongsTo =
+    array('User',
+	  'Site',
+	  'Group'
+	  );
+
+  function memberGroups($user_id, $site_id) {
+    $this->prEnter(compact('user_id', 'site_id'));
+
+    $this->cacheQueries = true;
+    $groups = $this->find('all', array
+			  ('recursive' => -1,
+			   'fields' => array('group_id'),
+			   'conditions' => array(array('user_id' => $user_id),
+						 array('site_id' => $site_id)),
+			   ));
+    $this->cacheQueries = false;
+
+    if (empty($groups))
+      return $this->prReturn(null);
+
+    $group_ids = array();
+    foreach ($groups AS $group)
+      $group_ids[] = $group['Membership']['group_id'];
+
+    return $this->prReturn($group_ids);
+  }
+
+  function memberOf($user_id, $site_id) {
+    $groups = $this->memberGroups($user_id, $site_id);
+    return (!empty($groups));
+  }
+
+}

site/models/option.php

@@ -0,0 +1,76 @@
+<?php
+class Option extends AppModel {
+
+  var $hasMany =
+    array('OptionValue',
+	  );
+
+  var $knows =
+    array('User', 'Site', 'Group');
+
+
+  static $option_set = array();
+
+  function getAll($name, $force = false) {
+/*     $this->prClassLevel(30); */
+/*     //$this->OptionValue->prClassLevel(30); */
+/*     $this->Group->Membership->prClassLevel(30); */
+/*     $this->OptionValue->SiteOption->prClassLevel(30); */
+/*     $this->OptionValue->UserOption->prClassLevel(30); */
+/*     $this->OptionValue->GroupOption->prClassLevel(30); */
+/*     $this->OptionValue->DefaultOption->prClassLevel(30); */
+    $this->prEnter(compact('name'));
+
+    if (!empty(self::$option_set[$name]) && !$force)
+      return $this->prReturn(self::$option_set[$name]);
+
+    self::$option_set[$name] = array();
+
+    $site_id   = $this->Site->currentSiteId();
+    $user_id   = $this->User->currentUserId();
+    $group_ids = $this->Group->currentGroupIds();
+
+/*     $site_id = 2; */
+/*     $user_id = 4; */
+/*     $group_ids = $this->Group->groupIds($user_id, $site_id); */
+
+    if (!empty($site_id))
+      self::$option_set[$name] =
+	array_merge(self::$option_set[$name],
+		    $this->OptionValue->SiteOption->values($site_id, $name));
+
+    if (!empty($user_id))
+      self::$option_set[$name] =
+	array_merge(self::$option_set[$name],
+		    $this->OptionValue->UserOption->values($user_id, $name));
+
+    if (!empty($group_ids))
+      self::$option_set[$name] =
+	array_merge(self::$option_set[$name],
+		    $this->OptionValue->GroupOption->values($group_ids, $name));
+
+    self::$option_set[$name] =
+      array_merge(self::$option_set[$name],
+		  $this->OptionValue->DefaultOption->values($name));
+
+    return $this->prReturn(self::$option_set[$name]);
+  }
+
+  function get($name) {
+    $this->prEnter(compact('name'));
+    $values = $this->getAll($name);
+    if (empty($values))
+      return null;
+    return $this->prReturn($values[0]);
+  }
+
+  function enabled($name) {
+    $val = $this->get($name);
+    return (!empty($val));
+  }
+
+  function disabled($name) {
+    return (!$this->enabled($name));
+  }
+
+}

site/models/option_value.php

@@ -0,0 +1,35 @@
+<?php
+class OptionValue extends AppModel {
+
+  var $belongsTo =
+    array('Option',
+	  );
+
+  var $hasMany =
+    array('UserOption',
+	  'SiteOption',
+	  'GroupOption',
+	  'DefaultOption',
+	  );
+
+  function values($name = null, $query = null) {
+    $this->prEnter(compact('name', 'query'));
+    $this->queryInit($query);
+
+    $query['link']['Option'] = array();
+
+    if (!empty($name)) {
+      $query['conditions'][] = array('Option.name' => $name);
+      $query['link']['Option']['fields'] = array();
+    }
+
+    $this->cacheQueries = true;
+    $values = array();
+    foreach ($this->find('all', $query) AS $result)
+      $values[] = $result['OptionValue']['value'];
+    $this->cacheQueries = false;
+
+    return $this->prReturn($values);
+  }
+
+}

site/models/permission.php

@@ -0,0 +1,105 @@
+<?php
+class Permission extends AppModel {
+
+  var $hasMany =
+    array('PermissionValue',
+	  );
+
+  var $knows =
+    array('User', 'Site', 'Group');
+
+  static $permission_set = array();
+
+  function getAll($name, $force = false) {
+/*     $this->prClassLevel(30); */
+/*     $this->PermissionValue->prClassLevel(30); */
+/*     $this->Group->Membership->prClassLevel(30); */
+/*     $this->PermissionValue->SitePermission->prClassLevel(30); */
+/*     $this->PermissionValue->UserPermission->prClassLevel(30); */
+/*     $this->PermissionValue->GroupPermission->prClassLevel(30); */
+/*     $this->PermissionValue->DefaultPermission->prClassLevel(30); */
+    $this->prEnter(compact('name'));
+
+    if (!empty(self::$permission_set[$name]) && !$force)
+      return $this->prReturn(self::$permission_set[$name]);
+
+    self::$permission_set[$name] = array();
+
+    $site_id   = $this->Site->currentSiteId();
+    $user_id   = $this->User->currentUserId();
+    $group_ids = $this->Group->currentGroupIds();
+
+/*     $site_id = 1; */
+/*     $user_id = 2; */
+/*     $group_ids = $this->Group->groupIds($user_id, $site_id); */
+
+    if (empty($group_ids)) {
+      self::$permission_set[$name][$name][] = array('access' => 'DENY', 'level' => null);
+      $site_id = null;
+      $user_id = null;
+    }
+
+    if (!empty($site_id))
+      self::$permission_set[$name] =
+	array_merge(self::$permission_set[$name],
+		    $this->PermissionValue->SitePermission->values($site_id, $name));
+
+    if (!empty($user_id))
+      self::$permission_set[$name] =
+	array_merge(self::$permission_set[$name],
+		    $this->PermissionValue->UserPermission->values($user_id, $name));
+
+    if (!empty($group_ids)) {
+      self::$permission_set[$name] =
+	array_merge(self::$permission_set[$name],
+		    $this->PermissionValue->GroupPermission->values($group_ids, $name));
+
+      self::$permission_set[$name] =
+	array_merge(self::$permission_set[$name],
+		    $this->PermissionValue->DefaultPermission->values($name));
+
+      self::$permission_set[$name][] = array('access' => 'ALLOW', 'level' => null);
+    }
+
+    return $this->prReturn(self::$permission_set[$name]);
+  }
+
+  function get($name) {
+    $this->prEnter(compact('name'));
+
+    // REVISIT <AP>: 20090827
+    //  This is a pretty crappy algorithm.  How do we decide whether DENY really
+    //  means DENY, or whether an ALLOW has priority.  
+    //  Oh well, it works for now...
+    
+    $values = $this->getAll($name);
+    $result = array_shift($values);
+
+    foreach ($values AS $value)
+      if (empty($result['level']) || (!empty($value['level']) && $value['level'] < $result['level']))
+	$result['level'] = $value['level'];
+
+    if ($result['access'] !== 'ALLOW')
+      $result['level'] = 9999999;
+
+    return $this->prReturn($result);
+  }
+
+  function allow($name) {
+    $this->prEnter(compact('name'));
+    $result = $this->get($name);
+    return $this->prReturn($result['access'] === 'ALLOW');
+  }
+
+  function deny($name) {
+    $this->prEnter(compact('name'));
+    return $this->prReturn(!$this->allow($name));
+  }
+
+  function level($name) {
+    $this->prEnter(compact('name'));
+    $result = $this->get($name);
+    return $this->prReturn($result['level']);
+  }
+
+}

site/models/permission_value.php

@@ -0,0 +1,36 @@
+<?php
+class PermissionValue extends AppModel {
+
+  var $belongsTo =
+    array('Permission',
+	  );
+
+  var $hasMany =
+    array('UserPermission',
+	  'SitePermission',
+	  'GroupPermission',
+	  'DefaultPermission',
+	  );
+
+  function values($name = null, $query = null) {
+    $this->prEnter(compact('name', 'query'));
+    $this->queryInit($query);
+
+    $query['link']['Permission'] = array();
+
+    if (!empty($name)) {
+      $query['conditions'][] = array('Permission.name' => $name);
+      $query['link']['Permission']['fields'] = array();
+    }
+
+    $this->cacheQueries = true;
+    $values = array();
+    foreach ($this->find('all', $query) AS $result)
+      $values[] = array('access' => $result['PermissionValue']['access'],
+			'level'  => $result['PermissionValue']['level']);
+    $this->cacheQueries = false;
+
+    return $this->prReturn($values);
+  }
+
+}

site/models/site.php

@@ -1,16 +1,37 @@
 <?php
 class Site extends AppModel {
 
-	var $name = 'Site';
-	var $validate = array(
-		'id' => array('numeric'),
-		'name' => array('notempty')
-	);
+  var $hasMany =
+    array('SiteArea',
+	  'SiteOption',
+	  'Membership',
+	  );
 
-	var $hasMany = array(
-		'SiteArea',
-		'SiteOption',
-	);
+  static $current_site_id;
 
+  function currentSiteId() {
+    if (!empty(self::$current_site_id))
+      return self::$current_site_id;
+
+    // REVISIT <AP>: 20090827
+    //  Must get the actual site
+    $code = 'VSS';
+
+    $site = $this->find
+      ('first',
+       array('recursive' => -1,
+	     'conditions' => compact('code')));
+
+    if (!empty($site['Site']['id']))
+      self::$current_site_id = $site['Site']['id'];
+    else
+      // We must force a stop here, since this is typically
+      // called very early on, and so will cause a recursive
+      // crash as we try to render the internal error and
+      // again stumble on this problem.
+      $this->INTERNAL_ERROR('UNKNOWN SITE', 0, true);
+
+    return self::$current_site_id;
+  }
 }
 ?>

site/models/site_option.php

@@ -0,0 +1,24 @@
+<?php
+class SiteOption extends AppModel {
+
+  var $belongsTo =
+    array('Site',
+	  'OptionValue',
+	  );
+
+
+  function values($id, $name = null) {
+    $this->prEnter(compact('id', 'name'));
+
+    $query = array();
+    $this->queryInit($query);
+
+    $query['link']['SiteOption'] = array();
+    $query['link']['SiteOption']['fields'] = array();
+    $query['link']['SiteOption']['Site'] = array();
+    $query['link']['SiteOption']['Site']['fields'] = array();
+    $query['conditions'][] = array('Site.id' => $id);
+    return $this->prReturn($this->OptionValue->values($name, $query));
+  }
+
+}

site/models/site_permission.php

@@ -0,0 +1,24 @@
+<?php
+class SitePermission extends AppModel {
+
+  var $belongsTo =
+    array('Site',
+	  'PermissionValue',
+	  );
+
+
+  function values($id, $name = null) {
+    $this->prEnter(compact('id', 'name'));
+
+    $query = array();
+    $this->queryInit($query);
+
+    $query['link']['SitePermission'] = array();
+    $query['link']['SitePermission']['fields'] = array();
+    $query['link']['SitePermission']['Site'] = array();
+    $query['link']['SitePermission']['Site']['fields'] = array();
+    $query['conditions'][] = array('Site.id' => $id);
+    return $this->prReturn($this->PermissionValue->values($name, $query));
+  }
+
+}

site/models/statement_entry.php

@@ -23,7 +23,7 @@ class StatementEntry extends AppModel {
 
 	);
 
-	var $default_log_level = array('log' => 30, 'show' => 15);
+	//var $default_log_level = array('log' => 30, 'show' => 15);
 	var $max_log_level = 19;
 
   /**************************************************************************
@@ -185,6 +185,9 @@ class StatementEntry extends AppModel {
   function reversable($id) {
     $this->prEnter(compact('id'));
 
+    if (empty($id))
+      return $this->prReturn(false);
+
     // Verify the item is an actual charge
     $this->id = $id;
     $charge_type = $this->field('type');
@@ -205,7 +208,7 @@ class StatementEntry extends AppModel {
    * function: reverse
    *  - Reverses the charges
    */
-  function reverse($id, $stamp = null) {
+  function reverse($id, $stamp = null, $comment) {
     $this->prEnter(compact('id', 'stamp'));
 
     // Verify the item can be reversed
@@ -222,7 +225,7 @@ class StatementEntry extends AppModel {
 
     // Record the reversal transaction
     $result = $this->Transaction->addReversal
-      ($charge, $stamp, 'Charge Reversal');
+      ($charge, $stamp, $comment ? $comment : 'Charge Reversal');
 
     if (empty($result['error'])) {
       // Mark the charge as reversed
@@ -258,7 +261,7 @@ class StatementEntry extends AppModel {
   }
 
   function reconciledSet($set, $query = null, $unrec = false, $if_rec_include_partial = false) {
-    $this->prFunctionLevel(array('log' => 16, 'show' => 10));
+    //$this->prFunctionLevel(array('log' => 16, 'show' => 10));
     $this->prEnter(compact('set', 'query', 'unrec', 'if_rec_include_partial'));
     $lquery = $this->reconciledSetQuery($set, $query);
     $result = $this->find('all', $lquery);
@@ -291,7 +294,7 @@ class StatementEntry extends AppModel {
     }
 
     return $this->prReturn(array('entries' => $resultset,
-			       'summary' => $this->stats(null, $query)));
+				 'summary' => $this->stats(null, $query)));
   }
 
 
@@ -335,6 +338,72 @@ class StatementEntry extends AppModel {
   }
 
 
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: outstandingDebits
+   *  - Determines all debit types that have not yet been resolved.
+   *    The name is a bit dumb, but it means any statement entry type
+   *    that a positive customer balance could be used to offset. In
+   *    other words, entries that are still in need of matching
+   *    disbursements.  Most notably, this means charges but could
+   *    also mean things like refunds as well.
+   */
+
+  function outstandingDebits($query = null, $customer_id = null,
+			     $lease_id = null, $debit_types = null)
+  {
+    $this->prEnter(compact('query', 'lease_id',
+			   'customer_id', 'charge_ids',
+			   'debit_types'));
+    $this->queryInit($query);
+
+    if (empty($debit_types))
+      $debit_types = $this->debitTypes();
+
+    if (!empty($customer_id))
+      $query['conditions'][] = array('StatementEntry.customer_id' => $customer_id);
+
+    if (!empty($lease_id))
+      $query['conditions'][] = array('StatementEntry.lease_id' => $lease_id);
+
+    /* if (isset($charge_ids)) { */
+    /*   // REVISIT <AP> 20100330: */
+    /*   // Not using $query here, as this code was extracted from its */
+    /*   // original location in assignCredits, and so I'm keeping the */
+    /*   // logic consistent.  It does seem, however, that we shouldn't */
+    /*   // be ignoring $query if passed in.  I'm sure this won't be */
+    /*   // looked at until someone _does_ pass $query in (and it break), */
+    /*   // so hopefully at that time, we can understand what needs to */
+    /*   // happen in that case (requirements are not clear at present). */
+    /*   $lquery = array('contain' => false, */
+    /* 		      'conditions' => array('StatementEntry.id' => $charge_ids)); */
+    /* } else { */
+    /*   $lquery = $query; */
+    /*   // If we're working with a specific lease, then limit charges to it */
+    /*   if (!empty($lease_id)) */
+    /* 	$lquery['conditions'][] = array('StatementEntry.lease_id' => $lease_id); */
+    /* } */
+
+    if (empty($query['order']))
+      $query['order'] = 'StatementEntry.effective_date ASC';
+
+    $debits = array();
+    foreach ($debit_types AS $dtype) {
+      $rset = $this->reconciledSet($dtype, $query, true);
+      $entries = $rset['entries'];
+      $debits = array_merge($debits, $entries);
+      $this->pr(18, compact('dtype', 'entries'), "Outstanding Debit Entries");
+    }
+
+    return $this->prReturn($debits);
+  }
+
+  function outstandingCharges($query = null, $customer_id = null, $lease_id = null) {
+    return $this->outstandingDebits($query, $customer_id, $lease_id, array('CHARGE'));
+  }
+
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -356,9 +425,6 @@ class StatementEntry extends AppModel {
 			   'customer_id', 'lease_id'));
     $this->queryInit($query);
 
-    if (!empty($customer_id))
-      $query['conditions'][] = array('StatementEntry.customer_id' => $customer_id);
-
     if (empty($disbursement_type))
       $disbursement_type = 'DISBURSEMENT';
 
@@ -372,6 +438,9 @@ class StatementEntry extends AppModel {
 	$this->INTERNAL_ERROR("Charge IDs, yet no corresponding receipt");
 
       $lquery = $query;
+      if (!empty($customer_id))
+	$lquery['conditions'][] = array('StatementEntry.customer_id' => $customer_id);
+
       $lquery['conditions'][] = array('StatementEntry.type' => 'SURPLUS');
       // REVISIT <AP>: 20090804
       //  We need to ensure that we're using surplus credits ONLY from either
@@ -420,23 +489,16 @@ class StatementEntry extends AppModel {
 		"Receipt Credit Added");
     }
 
-    // Now find all unpaid charges
-    if (isset($charge_ids)) {
-      $lquery = array('contain' => false,
-		      'conditions' => array('StatementEntry.id' => $charge_ids));
-    } else {
+    // Now find all unpaid charges, using either the specific set
+    // of charges given, or all outstanding charges based on the
+    // query, customer and/or lease
+    if (!empty($charge_ids)) {
+      $this->INTERNAL_ERROR("PERHAPS IMPLEMENTED - THOUGH NEVER TESTED");
       $lquery = $query;
-      // If we're working with a specific lease, then limit charges to it
-      if (!empty($lease_id))
-	$lquery['conditions'][] = array('StatementEntry.lease_id' => $lease_id);
-    }
-    $lquery['order'] = 'StatementEntry.effective_date ASC';
-    $charges = array();
-    foreach ($this->debitTypes() AS $dtype) {
-      $rset = $this->reconciledSet($dtype, $lquery, true);
-      $entries = $rset['entries'];
-      $charges = array_merge($charges, $entries);
-      $this->pr(18, compact('dtype', 'entries'), "Outstanding Debit Entries");
+      $lquery['conditions'][] = array('StatementEntry.id' => $charge_ids);
+      $charges = $this->reconciledSet('CHARGE', $query, true);
+    } else {
+      $charges = $this->outstandingDebits($query, $customer_id, $lease_id);
     }
 
     // Work through all unpaid charges, applying disbursements as we go
@@ -480,14 +542,14 @@ class StatementEntry extends AppModel {
 
 	// Set the disbursement amount to the maximum amount
 	// possible without exceeding the charge or credit balance
-	$disbursement_amount = min($charge['balance'], $credit['balance']);
+	$disbursement_amount = round(min($charge['balance'], $credit['balance']), 2);
 	if (!isset($credit['applied']))
 	  $credit['applied'] = 0;
 
-	$credit['applied'] += $disbursement_amount;
-	$credit['balance'] -= $disbursement_amount;
+	$credit['applied'] = round($credit['applied'] + $disbursement_amount, 2);
+	$credit['balance'] = round($credit['balance'] - $disbursement_amount, 2);
 
-	$this->pr(20, compact('credit'),
+	$this->pr(20, compact('credit', 'disbursement_amount'),
 		  ($credit['balance'] > 0 ? 'Utilized' : 'Exhausted') .
 		  (empty($credit['receipt']) ? ' Credit' : ' Receipt'));
 
@@ -552,12 +614,12 @@ class StatementEntry extends AppModel {
 	}
 
 	// Adjust the charge balance to reflect the new disbursement
-	$charge['balance'] -= $disbursement_amount;
+	$charge['balance'] = round($charge['balance'] - $disbursement_amount, 2);
+	$this->pr(20, compact('charge', 'disbursement_amount'),
+		  ($charge['balance'] > 0 ? 'Unfinished' : 'Fully Paid') . ' Charge');
+
 	if ($charge['balance'] < 0)
 	  die("HOW DID WE GET A NEGATIVE CHARGE AMOUNT?");
-
-	if ($charge['balance'] <= 0)
-	  $this->pr(20, 'Fully Paid Charge');
       }
       // Break the $credit reference to avoid future problems
       unset($credit);
@@ -645,7 +707,7 @@ class StatementEntry extends AppModel {
    *  - Returns summary data from the requested statement entry
    */
   function stats($id = null, $query = null) {
-    $this->prFunctionLevel(array('log' => 16, 'show' => 10));
+    //$this->prFunctionLevel(array('log' => 16, 'show' => 10));
     $this->prEnter(compact('id', 'query'));
 
     $this->queryInit($query);

site/models/tender.php

@@ -8,6 +8,9 @@ class Tender extends AppModel {
 		'DepositTransaction' => array(
 			'className' => 'Transaction',
 		),
+		'DepositLedgerEntry' => array(
+			'className' => 'LedgerEntry',
+		),
 		'NsfTransaction' => array(
 			'className' => 'Transaction',
 			'dependent' => true,
@@ -131,6 +134,7 @@ class Tender extends AppModel {
        ('contain' =>
 	array('LedgerEntry',
 	      'DepositTransaction',
+	      'DepositLedgerEntry',
 	      'NsfTransaction'),
 	));
     $this->pr(20, compact('tender'));

site/models/transaction.php

@@ -50,7 +50,7 @@ class Transaction extends AppModel {
 	);
 
 
-	var $default_log_level = array('log' => 30, 'show' => 15);
+	//var $default_log_level = array('log' => 30, 'show' => 15);
 	//var $max_log_level = 10;
 
   /**************************************************************************
@@ -121,19 +121,114 @@ class Transaction extends AppModel {
 	    'lease_id'    => $lease_id,
 	    );
 
-    // Go through the statement entries and flag as disbursements
-    foreach ($data['Entry'] AS &$entry)
-      $entry += array('type' => 'DISBURSEMENT', // not used
-		      'account_id' =>
-		      (isset($entry['Tender']['tender_type_id'])
-		       ? ($this->LedgerEntry->Tender->TenderType->
-			  accountID($entry['Tender']['tender_type_id']))
-		       : null),
-		      );
+    // Go through the statement entries, making sure the tender
+    // is recorded into the correct account, and then performing
+    // an auto-deposit if necessary.
+    $deposit = array();
+    foreach ($data['Entry'] AS &$entry) {
+      if (empty($entry['Tender']['tender_type_id']))
+	continue;
+
+      $ttype = $this->LedgerEntry->Tender->TenderType->find
+	('first', array('contain' => false,
+			'conditions' =>
+			array('id' => $entry['Tender']['tender_type_id'])));
+      $ttype = $ttype['TenderType'];
+
+      // Set the account for posting.
+      $entry += array('account_id' => $ttype['account_id']);
+
+/*       // Check for auto deposit */
+/*       if (!empty($ttype['auto_deposit'])) { */
+/* 	$deposit[] = array('id' => 0, */
+/* 			   'account_id' => $ttype['deposit_account_id']); */
+/*       } */
+    }
+    unset($entry); // prevent trouble since $entry is reference
 
     $ids = $this->addTransaction($data['control'], $data['Transaction'], $data['Entry']);
     if (isset($ids['transaction_id']))
       $ids['receipt_id'] = $ids['transaction_id'];
+    if (!empty($ids['error']))
+      return $this->prReturn(array('error' => true) + $ids);
+
+    $tender_ids = array();
+    foreach ($ids['entries'] AS $entry) {
+      $entry1 = $entry['DoubleEntry']['Entry1'];
+      if (!empty($entry1['Tender']['tender_id']))
+	$tender_ids[] = $entry1['Tender']['tender_id'];
+    }
+
+    $ids = $this->_autoDeposit($tender_ids, $ids);
+
+    return $this->prReturn($ids);
+  }
+
+  // REVISIT <AP>: 20090817
+  //  Delete after rolling up the old items
+  function _autoDeposit($tender_ids, $ids) {
+    $deposit_tenders = $this->LedgerEntry->Tender->find
+      ('all', array('contain' => array('TenderType' => array('fields' => array()),
+				       'LedgerEntry' => array('fields' => array()),
+				       ),
+		    'fields' => array('TenderType.deposit_account_id',
+				      'TenderType.account_id',
+				      'CONCAT("CREDIT") AS crdr',
+				      'CONCAT("Auto Deposit") AS comment',
+				      'SUM(LedgerEntry.amount) AS amount'),
+		    'conditions' => array('Tender.id' => $tender_ids,
+					  'TenderType.auto_deposit' => true,
+					  ),
+		    'group' => 'TenderType.deposit_account_id',
+		    ));
+
+    if (!empty($deposit_tenders)) {
+      foreach ($deposit_tenders AS &$tender)
+	$tender = $tender[0] + array_diff_key($tender['TenderType'], array('id'=>1));
+
+      $this->pr(10, compact('tender_ids', 'deposit_tenders'));
+
+      // REVISIT <AP>: 20090817
+      //  Multiple tenders could result in deposits to more than one
+      //  account.  We're already mucking with things by having a
+      //  ledger entry that's not involved with the account_id of the
+      //  transaction.  We could handle this by not using the helper
+      //  _splitEntries function, and just building or individual
+      //  entries right here (which we should probably do anyway).
+      //  However, I'm ignoring the issue for now...
+      if (count($deposit_tenders) > 1)
+	$this->INTERNAL_ERROR("Only expecting one tender type");
+
+      $deposit_ids = $this->addTransactionEntries
+	(array('include_ledger_entry'    => true,
+	       'include_statement_entry' => false,
+	       ),
+
+	 array('id' => $ids['transaction_id'],
+	       // REVISIT <AP>: 20090817
+	       // This is an awful cheat, and we're going to
+	       // get burned from it someday.
+	       'type'       => 'DEPOSIT',
+	       'crdr'       => 'DEBIT',
+	       'account_id' => $deposit_tenders[0]['deposit_account_id'],
+	       ),
+
+	 $deposit_tenders);
+
+      $ids['deposit'] = $deposit_ids;
+      if (!empty($deposit_ids['error']))
+	return $this->prReturn(array('error' => true) + $ids);
+
+      if (!empty($tender_ids)) {
+	$entry_id = $deposit_ids['entries'][0]['DoubleEntry']['Entry2']['ledger_entry_id'];
+	$this->pr(10, compact('tender_ids', 'entry_id'));
+	$this->LedgerEntry->Tender->updateAll
+	  (array('Tender.deposit_transaction_id'  => $ids['transaction_id'],
+		 'Tender.deposit_ledger_entry_id' => $entry_id),
+	   array('Tender.id' => $tender_ids)
+	   );
+      }
+    }
 
     return $this->prReturn($ids);
   }
@@ -221,6 +316,7 @@ class Transaction extends AppModel {
       array('assign' => false,
 	    'include_ledger_entry'    => true,
 	    'include_statement_entry' => false,
+	    'update_tender' => true,
 	    );
 
     // Establish the transaction as a deposit
@@ -239,12 +335,14 @@ class Transaction extends AppModel {
 
     // Go through the statement entries and re-group by account id
     $group = array();
-    foreach ($data['Entry'] AS &$entry) {
+    $tender_groups = array();
+    foreach ($data['Entry'] AS $entry) {
       if (!isset($group[$entry['account_id']]))
 	$group[$entry['account_id']] =
 	  array('account_id' => $entry['account_id'],
 		'amount' => 0);
       $group[$entry['account_id']]['amount'] += $entry['amount']; 
+      $tender_groups[$entry['account_id']][] = $entry['tender_id'];
     }
     $data['Entry'] = $group;
 
@@ -252,11 +350,20 @@ class Transaction extends AppModel {
     if (isset($ids['transaction_id']))
       $ids['deposit_id'] = $ids['transaction_id'];
 
-    if (!empty($ids['deposit_id'])) {
-      $this->LedgerEntry->Tender->updateAll
-	(array('Tender.deposit_transaction_id' => $ids['deposit_id']),
-	 array('Tender.id' => $tender_ids)
-	 );
+    $this->pr(21, array_intersect_key($ids, array('deposit_id'=>1))
+	      + array_intersect_key($data['control'], array('update_tender'=>1)));
+
+    if (!empty($ids['deposit_id']) && !empty($data['control']['update_tender'])) {
+      $this->pr(21, compact('tender_groups'));
+      foreach ($tender_groups AS $group => $tender_ids) {
+	$entry_id = $ids['entries'][$group]['DoubleEntry']['Entry2']['ledger_entry_id'];
+	$this->pr(19, compact('group', 'tender_ids', 'entry_id'));
+	$this->LedgerEntry->Tender->updateAll
+	  (array('Tender.deposit_transaction_id'  => $ids['deposit_id'],
+		 'Tender.deposit_ledger_entry_id' => $entry_id),
+	   array('Tender.id' => $tender_ids)
+	   );
+      }
     }
 
     return $this->prReturn($ids);
@@ -279,6 +386,7 @@ class Transaction extends AppModel {
       array('assign' => false,
 	    'include_ledger_entry'    => true,
 	    'include_statement_entry' => false,
+	    'allow_no_entries'        => true,
 	    );
 
     // Establish the transaction as a close
@@ -426,6 +534,8 @@ class Transaction extends AppModel {
 	(in_array($transaction['type'], array('INVOICE', 'RECEIPT'))
 	 && empty($transaction['customer_id']))
 	) {
+      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
+      $this->INTERNAL_ERROR('Transaction verification failed');
       return $this->prReturn(false);
     }
 
@@ -441,6 +551,8 @@ class Transaction extends AppModel {
       }
       if (!empty($se) &&
 	  !$this->StatementEntry->verifyStatementEntry($se)) {
+	// REVISIT <AP>: 20090828; Callers are not yet able to handle errors
+	$this->INTERNAL_ERROR('Transaction entry verification failed');
 	return $this->prReturn(false);
       }
     }
@@ -480,8 +592,11 @@ class Transaction extends AppModel {
 
     // Save transaction to the database
     $this->create();
-    if (!$this->save($transaction))
+    if (!$this->save($transaction)) {
+      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
+      $this->INTERNAL_ERROR('Failed to save Transaction');
       return $this->prReturn(array('error' => true) + $ret);
+    }
     $ret['transaction_id'] = $transaction['id'] = $this->id;
 
     // Add the entries
@@ -554,7 +669,14 @@ class Transaction extends AppModel {
 	$ret['error'] = true;
     }
 
-    $this->Customer->update($transaction['customer_id']);
+    if (!empty($transaction['customer_id'])) {
+      $this->Customer->update($transaction['customer_id']);
+    }
+
+    if (!empty($ret['error']))
+      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
+      $this->INTERNAL_ERROR('Failed to save Transaction');
+
     return $this->prReturn($ret);
   }
 
@@ -575,8 +697,11 @@ class Transaction extends AppModel {
     $this->prEnter(compact('control', 'transaction', 'entries', 'split'));
 
     // Verify that we have a transaction
-    if (empty($transaction['id']))
+    if (empty($transaction['id'])) {
+      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
+      $this->INTERNAL_ERROR('Invalid Transaction ID for adding entries');
       return $this->prReturn(array('error' => true));
+    }
 
     // If the entries are not already split, do so now.
     if ($split) {
@@ -636,6 +761,10 @@ class Transaction extends AppModel {
       }
     }
 
+    if (!empty($ret['error']))
+      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
+      $this->INTERNAL_ERROR('Failed to save Transaction Entries');
+
     return $this->prReturn($ret);
   }
 
@@ -656,8 +785,11 @@ class Transaction extends AppModel {
 
     // Verify that we have a transaction and entries
     if (empty($transaction) ||
-	($transaction['type'] !== 'CLOSE' && empty($entries)))
+	(empty($entries) && empty($control['allow_no_entries']))) {
+      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
+      $this->INTERNAL_ERROR('Split Entries failed to validate');
       return $this->prReturn(array('error' => true));
+    }
 
     // set ledger ID as the current ledger of the specified account
     if (empty($transaction['ledger_id']))
@@ -820,7 +952,13 @@ class Transaction extends AppModel {
     // and recording it in the NSF account.  It has nothing to do
     // with the customer statement (charges, disbursements, credits, etc).
     $bounce_result = $this->addDeposit
-      (array('Transaction' =>
+      (array('control' =>
+	     // This is not a "normal" deposit, so we don't
+	     // want to update the tender deposit transaction id
+	     // (it already has the correct one).
+	     array('update_tender' => false),
+
+	     'Transaction' =>
 	     array('stamp' => $stamp,
 		   'type' => 'WITHDRAWAL',
 		   'crdr' => 'CREDIT'),
@@ -830,7 +968,7 @@ class Transaction extends AppModel {
 			 'account_id' => $this->Account->nsfAccountID(),
 			 'amount'     => $tender['LedgerEntry']['amount'],
 			 ))),
-       $tender['Transaction']['account_id']);
+       $tender['DepositLedgerEntry']['account_id']);
 
     $this->pr(20, compact('bounce_result'));
     $ret['bounce'] = $bounce_result;
@@ -860,8 +998,11 @@ class Transaction extends AppModel {
 	));
 
     $this->pr(20, compact('nsf_ledger_entry'));
-    if (!$nsf_ledger_entry)
+    if (!$nsf_ledger_entry) {
+      // REVISIT <AP>: 20090828; Callers are not yet able to handle errors
+      $this->INTERNAL_ERROR('Failed to locate NSF ledger entry');
       return $this->prReturn(array('error' => true) + $ret);
+    }
 
     // Build a transaction to adjust all of the statement entries
     $rollback =
@@ -902,16 +1043,20 @@ class Transaction extends AppModel {
       }
     }
 
-    // Add the sole ledger entry for this transaction
-    $rollback['Entry'][] =
-      array('include_ledger_entry'    => true,
-	    'include_statement_entry' => false,
-	    'amount'      => $rollback['Transaction']['amount'],
-	    'account_id'  => $this->Account->accountReceivableAccountID(),
-	    );
+    // Add the sole ledger entry for this transaction.  If there
+    // is not a transaction amount, then there is no point in
+    // recording a ledger entry of $0.00
+    if (!empty($rollback['Transaction']['amount'])) {
+      $rollback['Entry'][] =
+	array('include_ledger_entry'    => true,
+	      'include_statement_entry' => false,
+	      'amount'      => $rollback['Transaction']['amount'],
+	      'account_id'  => $this->Account->accountReceivableAccountID(),
+	      );
 
-    // Set the transaction amount to be negative
-    $rollback['Transaction']['amount'] *= -1;
+      // Set the transaction amount to be negative
+      $rollback['Transaction']['amount'] *= -1;
+    }
 
     // Record the transaction, which will un-pay previously paid
     // charges, void any credits, and other similar work.
@@ -966,8 +1111,12 @@ class Transaction extends AppModel {
 	}
       }
     }
-    if (empty($ret['rollback']['error']) && empty($ret['nsf_ledger_entry_id']))
-      $this->INTERNAL_ERROR("NSF LE ID not found under rollback entries");
+    if (empty($ret['rollback']['error']) && empty($ret['nsf_ledger_entry_id'])) {
+      //$this->INTERNAL_ERROR("NSF LE ID not found under rollback entries");
+      // Actually, this can happen if an item is NSF without having ever
+      // been applied to any charges.
+      $ret['nsf_ledger_entry_id'] = null;
+    }
 
     $ret['nsf_transaction_id']  = $ret['bounce']['transaction_id'];
     return $this->prReturn($ret + array('error' => false));

site/models/unit.php

@@ -87,6 +87,23 @@ class Unit extends AppModel {
     return $this->prReturn(true);
   }
 
+  function locked($enum) {
+    return $this->statusCheck($enum, 'LOCKED', false, null, false);
+  }
+
+  function conditionLocked() {
+    //return array('Unit.status' => 'LOCKED');
+    return ('Unit.status >= ' . $this->statusValue('LOCKED'));
+  }
+
+  function liened($enum) {
+    return $this->statusCheck($enum, 'LIENED', false, null, false);
+  }
+
+  function conditionLiened() {
+    return ('Unit.status >= ' . $this->statusValue('LIENED'));
+  }
+
   function occupied($enum) {
     return $this->statusCheck($enum, 'OCCUPIED', false, null, false);
   }
@@ -115,6 +132,7 @@ class Unit extends AppModel {
   }
 
   function available($enum) { return $this->vacant($enum); }
+  function conditionAvailable() { return $this->conditionVacant($enum); }
 
 
   /**************************************************************************

site/models/unit_size.php

@@ -1,25 +1,64 @@
 <?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 $belongsTo = array(
-		'UnitType',
-	);
+  var $hasMany =
+    array(
+	  'Unit',
+	  );
 
-	var $hasMany = array(
-		'Unit',
-	);
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: stats
+   *  - Returns summary data from the requested unit size.
+   */
+
+  function stats($id = null) {
+    $this->prEnter(compact('id'));
+
+    // Right now, we only work with id not null
+    if (!$id)
+      return null;
+
+    $stats = array();
+
+    // Get the total number of units this size
+    $stats['all'] =
+      $this->find('count',
+		  array('link' => array('Unit'),
+			'conditions' => array(array('UnitSize.id' => $id)),
+			));
+
+    // Get numbers for units in the various states
+    foreach (array('unavailable', 'vacant', 'occupied', 'locked', 'liened') AS $status) {
+      $statusfunc = 'condition' . ucfirst($status);
+      $stats[$status] =
+	$this->find('count',
+		    array('link' => array('Unit'),
+			  'conditions' => array(array('UnitSize.id' => $id),
+						$this->Unit->{$statusfunc}()),
+			  ));
+    }
+
+    // Count up each unit by physical status
+    foreach 
+      ($this->find('all',
+		   array('link' => array('Unit' => array('fields' => array())),
+			 'fields' => array('Unit.status', 'COUNT(Unit.id) AS total'),
+			 'conditions' => array(array('UnitSize.id' => $id)),
+			 'group' => 'Unit.status',
+			 )) AS $status) {
+      $stats['status'][$status['Unit']['status']] = $status[0]['total'];
+    }
+
+    // Return the collection
+    return $this->prReturn($stats);
+  }
 
 }
-?>

site/models/unit_type.php

@@ -1,16 +1,50 @@
 <?php
 class UnitType extends AppModel {
 
-	var $name = 'UnitType';
-	var $validate = array(
-		'id' => array('numeric'),
-		'code' => array('notempty'),
-		'name' => array('notempty')
-	);
+  var $hasMany =
+    array(
+	  'UnitSize',
+	  );
 
-	var $hasMany = array(
-		'UnitSize',
-	);
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: relatedTypes
+   *  - Returns an array of types related by similar attributes
+   */
+
+  function relatedTypes($attribute, $extra = null) {
+    $this->cacheQueries = true;
+    $types = $this->find('all', array
+			 ('fields' => array('UnitType.id', 'UnitType.name'),
+			  'conditions' => array('UnitType.'.$attribute => true),
+			  'order' => array('UnitType.name'),
+			  ) + (isset($extra) ? $extra : array())
+			 );
+    $this->cacheQueries = false;
+
+    // Rearrange to be of the form (id => name)
+    $rel_types = array();
+    foreach ($types AS $type) {
+      $rel_types[$type['UnitType']['id']] = $type['UnitType']['name'];
+    }
+
+    return $rel_types;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: xxxTypes
+   *  - Returns an array of types suitable for activity xxx
+   */
+
+  function residentialTypes()  { return $this->relatedTypes('residential'); }
+  function enclosedTypes()     { return $this->relatedTypes('enclosed'); }
+  function climateTypes()      { return $this->relatedTypes('climate'); }
+  function outdoorTypes()      { return $this->relatedTypes('outdoor'); }
+  function coveredTypes()      { return $this->relatedTypes('covered'); }
 
 }
-?>

site/models/user.php

@@ -0,0 +1,39 @@
+<?php
+class User extends AppModel {
+
+  var $hasMany =
+    array('UserOption',
+	  'Membership',
+	  );
+
+  static $current_user_id;
+
+  function currentUser() {
+    if (!empty($_SERVER['REMOTE_USER']))
+      return $_SERVER['REMOTE_USER'];
+
+    return null;
+  }
+
+  function currentUserId() {
+    if (!empty(self::$current_user_id))
+      return self::$current_user_id;
+
+    $user = $this->find
+      ('first',
+       array('recursive' => -1,
+	     'conditions' => array('login' => $this->currentUser())));
+
+    if (!empty($user['User']['id']))
+      self::$current_user_id = $user['User']['id'];
+    else
+      // We must force a stop here, since this is typically
+      // called very early on, and so will cause a recursive
+      // crash as we try to render the internal error and
+      // again stumble on this problem.
+      $this->INTERNAL_ERROR('UNKNOWN USER', 0, true);
+
+    return self::$current_user_id;
+  }
+
+}

site/models/user_option.php

@@ -0,0 +1,24 @@
+<?php
+class UserOption extends AppModel {
+
+  var $belongsTo =
+    array('User',
+	  'OptionValue',
+	  );
+
+
+  function values($id, $name = null) {
+    $this->prEnter(compact('id', 'name'));
+
+    $query = array();
+    $this->queryInit($query);
+
+    $query['link']['UserOption'] = array();
+    $query['link']['UserOption']['fields'] = array();
+    $query['link']['UserOption']['User'] = array();
+    $query['link']['UserOption']['User']['fields'] = array();
+    $query['conditions'][] = array('User.id' => $id);
+    return $this->prReturn($this->OptionValue->values($name, $query));
+  }
+
+}

site/models/user_permission.php

@@ -0,0 +1,24 @@
+<?php
+class UserPermission extends AppModel {
+
+  var $belongsTo =
+    array('User',
+	  'PermissionValue',
+	  );
+
+
+  function values($id, $name = null) {
+    $this->prEnter(compact('id', 'name'));
+
+    $query = array();
+    $this->queryInit($query);
+
+    $query['link']['UserPermission'] = array();
+    $query['link']['UserPermission']['fields'] = array();
+    $query['link']['UserPermission']['User'] = array();
+    $query['link']['UserPermission']['User']['fields'] = array();
+    $query['conditions'][] = array('User.id' => $id);
+    return $this->prReturn($this->PermissionValue->values($name, $query));
+  }
+
+}

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

@@ -1,471 +1,471 @@
-<?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);
-	}
-}
+<?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/tests/cases/views/debug.test.php

@@ -1,144 +1,144 @@
-<?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);
-	}
-}
+<?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 +1,137 @@
-<?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();
-	}
-}
+<?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 +1,358 @@
-<?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();
-	}
-}
+<?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/views/elements/timer_panel.ctp

@@ -30,14 +30,14 @@ $timers = DebugKitDebugger::getTimers();
 ?>
 <h2><?php __('Timers'); ?></h2>
 <p class="request-time">
-	<?php $totalTime = sprintf(__('%s (seconds)', true), $number->precision(DebugKitDebugger::requestTime(), 6)); ?>
+	<?php $totalTime = sprintf(__('%s (seconds)', true), DebugKitDebugger::requestTime()); ?>
 	<?php echo $toolbar->message(__('Total Request Time:', true), $totalTime)?>
 </p>
 
 <?php foreach ($timers as $timerName => $timeInfo):
 	$rows[] = array(
 		$timeInfo['message'],
-		$number->precision($timeInfo['time'], 6)
+		$timeInfo['time']
 	);
 	$headers = array(__('Message', true), __('time in seconds', true));
 endforeach;

site/views/accounts/collected.ctp

@@ -178,20 +178,8 @@ echo $this->element('statement_entries', array
 
 <script type="text/javascript"><!--
   $(document).ready(function(){
-      $("#TxFromDate")
-	.attr('autocomplete', 'off')
-	.datepicker({ constrainInput: true,
-	              numberOfMonths: [1, 1],
-                      showCurrentAtPos: 0,
-                      dateFormat: 'mm/dd/yy' });
-
-      $("#TxThroughDate")
-	.attr('autocomplete', 'off')
-	.datepicker({ constrainInput: true,
-	              numberOfMonths: [1, 1],
-                      showCurrentAtPos: 0,
-                      dateFormat: 'mm/dd/yy' });
-
+      datepicker('TxFromDate');
+      datepicker('TxThroughDate');
       resetForm();
   });
 --></script>

site/views/accounts/view.ctp

@@ -16,7 +16,6 @@ if (isset($account['Account']))
   $account = $account['Account'];
 
 $rows = array();
-$rows[] = array('ID',                $account['id']);
 $rows[] = array('Name',              $account['name']);
 $rows[] = array('Type',              $account['type']);
 $rows[] = array('External Name',     $account['external_name']);
@@ -78,12 +77,12 @@ echo $this->element('ledger_entries', array
 		    (// Grid configuration
 		     'config' => array
 		     ('grid_div_id' => 'ledger-ledger-entry-list',
-		      'caption' => ("Current Ledger: " .
-				    "(". $current_ledger['name'] .")"),
-		      'filter' => array('Ledger.id' => $current_ledger['id']),
+		      'caption' => "Current Ledger: #{$current_ledger['sequence']}",
+		      'filter'  => array('Ledger.id' => $current_ledger['id']),
 		      'exclude' => array('Account', 'Amount', 'Cr/Dr', 'Balance',
 					 empty($account['receipts']) ? 'Tender' : null),
 		      'include' => array('Debit', 'Credit', 'Sub-Total'),
+		      'limit' => 50,
 		      )));
 
 
@@ -102,6 +101,7 @@ echo $this->element('ledger_entries', array
 		      'exclude' => array('Account', 'Amount', 'Cr/Dr', 'Balance',
 					 empty($account['receipts']) ? 'Tender' : null),
 		      'include' => array('Debit', 'Credit', 'Sub-Total'),
+		      'limit' => 50,
 		      )));
 
 

site/views/contacts/edit.ctp

@@ -45,6 +45,7 @@ function contactMethodDiv($obj, $type, $legend, $values = null) {
 	' CLASS="'.$type.'-method-%{id}-source" ' . "\n" .
 	' ID="'.$type.'-method-%{id}-source-'.$stype.'"' . "\n" .
 	' VALUE="'.$stype.'"' . "\n" .
+	($stype == 'new' ? ' CHECKED' . "\n" : '') .
 	' />' . "\n" .
 	' <LABEL FOR="'.$type.'-method-%{id}-source-'.$stype.'">'.$sname.'</LABEL>' . "\n" .
 	' ';
@@ -76,21 +77,30 @@ function contactMethodDiv($obj, $type, $legend, $values = null) {
 	   'fields' => array
 	   (
 	    'preference' => array
-	    ('opts' => array
+	    ('label_attributes' => array('class' => 'required'),
+	     'opts' => array
 	     ('options' => $obj->varstore['methodPreferences'],
 	      'selected' => (isset($values) ? $values['ContactsMethod']['preference'] : null),
-	      )),
+	      ),
+	     'after' => "Intended purpose for this method of communication.",
+	     ),
 
 	    'type' => array
-	    ('opts' => array
+	    ('label_attributes' => array('class' => 'required'),
+	     'opts' => array
 	     ('options' => $obj->varstore['methodTypes'],
 	      'selected' => (isset($values) ? $values['ContactsMethod']['type'] : null),
-	      )),
+	      ),
+	     'after' => "How / Where this communication reaches the contact.",
+	     ),
 
 	    'comment' => array
-	    ('opts' => array
+	    ('label_attributes' => array('class' => 'optional empty'),
+	     'opts' => array
 	     ('value' => (isset($values) ? $values['ContactsMethod']['comment'] : null),
-	      )),
+	      ),
+	     'after' => "Optional: Comments on how this form of communication relates to the contact.",
+	     ),
 
 	    ))) . "\n" .
     
@@ -113,16 +123,23 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
   if ($type === 'phone') {
     if ($stype === 'existing') {
       $fields = array
-	('id' => array('name' => 'Phone/Ext',
+	('id' => array('label_attributes' => array('class' => 'required empty'),
+		       'name' => 'Phone/Ext',
 		       'opts' => array('options' => $obj->varstore['contactPhones'])),
 	 );
     }
     elseif ($stype === 'new') {
       $fields = array
-	('type' => array('opts' => array('options' => $obj->varstore['phoneTypes'])),
-	 'phone' => true,
-	 'ext' => array('name' => "Extension"),
-	 'comment' => true,
+	('type' => array('label_attributes' => array('class' => 'required'),
+			 'opts' => array('options' => $obj->varstore['phoneTypes']),
+			 'after' => "Physical type of the phone."),
+	 'phone' => array('label_attributes' => array('class' => 'required empty'),
+			  'after' => "Required: Phone number."),
+	 'ext' => array('name' => "Extension",
+			'label_attributes' => array('class' => 'optional empty'),
+			'after' => "Optional: Extension number."),
+	 'comment' => array('label_attributes' => array('class' => 'optional empty'),
+			    'after' => "Optional: Comments about this phone number."),
 	 );
     }
     elseif ($stype === 'show') {
@@ -149,12 +166,19 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
     }
     elseif ($stype === 'new') {
       $fields = array
-	('address' => true,
-	 'city' => true,
-	 'state' => true,
-	 'postcode' => array('name' => 'Zip Code'),
-	 'country' => true,
-	 'comment' => true,
+	('address' => array('label_attributes' => array('class' => 'required empty'),
+			    'after' => "Required: First line of mailing address."),
+	 'city' => array('label_attributes' => array('class' => 'required empty'),
+			 'after' => "Required."),
+	 'state' => array('label_attributes' => array('class' => 'required empty'),
+			  'after' => "Required."),
+	 'postcode' => array('name' => 'Zip Code',
+			     'label_attributes' => array('class' => 'required empty'),
+			     'after' => "Required."),
+	 'country' => array('label_attributes' => array('class' => 'optional empty'),
+			    'after' => "Optional: USA is presumed."),
+	 'comment' => array('label_attributes' => array('class' => 'optional empty'),
+			    'after' => "Optional: Comments about this mailing address."),
 	 );
     }
     elseif ($stype === 'show') {
@@ -177,13 +201,16 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
     if ($stype === 'existing') {
       $fields = array
 	('id' => array('name' => 'Email',
+		       'label_attributes' => array('class' => 'required'),
 		       'opts' => array('options' => $obj->varstore['contactEmails'])),
 	 );
     }
     elseif ($stype === 'new') {
       $fields = array
-	('email' => true,
-	 'comment' => true,
+	('email' => array('label_attributes' => array('class' => 'required empty'),
+			    'after' => "Required: E-mail address."),
+	 'comment' => array('label_attributes' => array('class' => 'optional empty'),
+			    'after' => "Optional: Comments about this email address."),
 	 );
     }
     elseif ($stype === 'show') {
@@ -204,7 +231,7 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
     '<div ' . "\n" .
     ' class="'.$type.'-%{id}-div"' . "\n" .
     ' id="'.$type.'-%{id}-'.$stype.'-div"' . "\n" .
-    (isset($values) ? '' : ' STYLE="display:none;"' . "\n") .
+    ((isset($values) || $stype == 'new') ? '' : ' STYLE="display:none;"' . "\n") .
     '>' . "\n" .
 
     $obj->element
@@ -319,8 +346,27 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
       .slideDown();
   }
 
+  function setEmpty(input_elem) {
+    selector = "label[for=" + $(input_elem).attr("id") + "]";
+    if ($(input_elem).val() == '')
+      $(selector).addClass('empty');
+    else
+      $(selector).removeClass('empty');
+  }
+
   $(document).ready(function(){
       resetForm();
+
+      // In case refresh is hit with populated fields
+      $(":input").each(function(i,elem){ setEmpty(elem); });
+
+      // keyup doesn't catch cut from menu
+      $(":input").live('keyup', function(){
+	  setEmpty(this);
+	});
+      $(":input").live('mouseup', function(){
+	  setEmpty(this);
+	});
     });
 
 --></script>
@@ -345,17 +391,30 @@ echo($this->element
       array('class'  => 'item contact detail',
 	    'caption' => isset($this->data['Contact']) ? 'Edit Contact' : 'New Contact',
 	    'fields' => array
-	    ('first_name' => true,
-	     'last_name' => true,
-	     'middle_name' => true,
-	     'display_name' => true,
-	     'company_name' => array('name' => 'Company'),
-	     'id_federal' => array('name' => 'SSN'),
-	     'id_local' => array('name' => 'ID #'),
-	     'id_local_state' => array('name' => 'ID State'),
+	    ('last_name' => array('label_attributes' => array('class' => 'recommended empty'),
+				  'after' => "Recommended."),
+	     'first_name' => array('label_attributes' => array('class' => 'recommended empty'),
+				   'after' => "Recommended."),
+	     'middle_name' => array('label_attributes' => array('class' => 'optional empty'),
+				    'after' => "Optional."),
+	     'company_name' => array('name' => 'Company',
+				     'label_attributes' => array('class' => 'optional empty'),
+				     'after' => "Optional: Company name, if corporate contact."),
+	     'display_name' => array('label_attributes' => array('class' => 'optional empty'),
+				     'after' => "Optional with first/last name; Required otherwise."),
+	     'id_federal' => array('name' => 'SSN',
+				   'label_attributes' => array('class' => 'optional empty'),
+				   'after' => "Optional: Social Security Number."),
+	     'id_local' => array('name' => 'ID #',
+				 'label_attributes' => array('class' => 'recommended empty'),
+				 'after' => "Recommended: Driver's license, for example."),
+	     'id_local_state' => array('name' => 'ID State',
+				       'label_attributes' => array('class' => 'recommended empty'),
+				       'after' => "Recommended: State which issued the ID."),
 	     /* 'id_local_exp' => array('name' => 'ID Expiration', */
 	     /*			        'opts' => array('empty' => true)), */
-	     'comment' => true,
+	     'comment' => array('label_attributes' => array('class' => 'optional empty'),
+				'after' => "Optional: Comments about this contact."),
 	     ))) . "\n");
 
 echo $form->submit('Update') . "\n";

site/views/contacts/view.ctp

@@ -17,16 +17,17 @@ if (isset($contact['Contact']))
   $contact = $contact['Contact'];
 
 $rows = array();
-$rows[] = array('First Name',  $contact['first_name']);
-$rows[] = array('Middle Name', $contact['middle_name']);
-$rows[] = array('Last Name',   $contact['last_name']);
-$rows[] = array('Company',     $contact['company_name']);
-$rows[] = array('SSN',         $contact['id_federal']);
-$rows[] = array('ID',          ($contact['id_local']
-				    . ($contact['id_local']
-				       ? " - ".$contact['id_local_state']
-				       : "")));
-$rows[] = array('Comment',     $contact['comment']);
+$rows[] = array('Display Name', $contact['display_name']);
+$rows[] = array('First Name',   $contact['first_name']);
+$rows[] = array('Middle Name',  $contact['middle_name']);
+$rows[] = array('Last Name',    $contact['last_name']);
+$rows[] = array('Company',      $contact['company_name']);
+$rows[] = array('SSN',          $contact['id_federal']);
+$rows[] = array('ID',           ($contact['id_local']
+				 . ($contact['id_local']
+				    ? " - ".$contact['id_local_state']
+				    : "")));
+$rows[] = array('Comment',      $contact['comment']);
 
 echo $this->element('table',
 		    array('class'   => 'item contact detail',
@@ -135,6 +136,7 @@ echo $this->element('customers', array
 		     'config' => array
 		     ('caption' => 'Related Customers',
 		      'filter' => array('Contact.id' => $contact['id']),
+		      'include' => array('Relationship'),
 		      )));
 
 

site/views/customers/edit.ctp

@@ -42,11 +42,12 @@ function customerContactDiv($obj, $values = null, $primary = false) {
 	' CLASS="contact-%{id}-source" ' . "\n" .
 	' ID="contact-%{id}-source-'.$stype.'"' . "\n" .
 	' VALUE="'.$stype.'"' . "\n" .
-	//' CHECKED' . "\n" .
+	($stype == 'new' ? ' CHECKED' . "\n" : '') .
 	' />' . "\n" .
 	' <LABEL FOR="contact-%{id}-source-'.$stype.'">'.$sname.'</LABEL>' . "\n" .
 	' ';
     }
+    $div .= "<P>(Phone numbers / Addresses can be added later)";
   }
   $div .= "\n";
 
@@ -75,23 +76,35 @@ function customerContactDiv($obj, $values = null, $primary = false) {
 	   (
 	    'Customer.primary_contact_entry' => array
 	    ('name' => 'Primary Contact',
+	     'label_attributes' => array('class' => null),
 	     'no_prefix' => true,
 	     'opts' => array
 	     ('type' => 'radio',
 	      'options' => array('%{id}' => false),
 	      'value' => ($primary ? '%{id}' : 'bogus-value-to-suppress-hidden-input'),
-	      )),
+	      ),
+	     'after' => ("Check this button if this contact will be the primary" .
+			 " contact for this customer (there can be only one primary" .
+			 " contact"),
+	     ),
+
 
 	    'type' => array
-	    ('opts' => array
+	    ('label_attributes' => array('class' => 'required'),
+	     'opts' => array
 	     ('options' => $obj->varstore['contactTypes'],
 	      'selected' => (isset($values) ? $values['ContactsCustomer']['type'] : null),
-	      )),
+	      ),
+	     'after' => "An actual tenant, or just an alternate contact?"
+	     ),
 
 	    'comment' => array
-	    ('opts' => array
+	    ('label_attributes' => array('class' => 'optional empty'),
+	     'opts' => array
 	     ('value' => (isset($values) ? $values['ContactsCustomer']['comment'] : null),
-	      )),
+	      ),
+	     'after' => "Optional: Comments on the relationship between this customer and this contact."
+	     ),
 
 	    ))) . "\n" .
     
@@ -115,22 +128,37 @@ function customerContactTypeDiv($obj, $stype, $values = null) {
   if ($stype === 'existing') {
     $fields = array
       ('id' => array('name' => 'Contact',
-		     'opts' => array('options' => $obj->varstore['contacts'])),
+		     'label_attributes' => array('class' => 'required empty'),
+		     'opts' => array('options' => $obj->varstore['contacts']),
+		     'after' => "Select the existing contact."),
        );
   }
   elseif ($stype === 'new') {
     $fields = array
-      ('first_name' => true,
-       'last_name' => true,
-       'middle_name' => true,
-       'display_name' => true,
-       'company_name' => array('name' => 'Company'),
-       'id_federal' => array('name' => 'SSN'),
-       'id_local' => array('name' => 'ID #'),
-       'id_local_state' => array('name' => 'ID State'),
+      ('last_name' => array('label_attributes' => array('class' => 'recommended empty'),
+			    'after' => "Recommended."),
+       'first_name' => array('label_attributes' => array('class' => 'recommended empty'),
+			     'after' => "Recommended."),
+       'middle_name' => array('label_attributes' => array('class' => 'optional empty'),
+			      'after' => "Optional."),
+       'company_name' => array('name' => 'Company',
+			       'label_attributes' => array('class' => 'optional empty'),
+			       'after' => "Optional: Company name, if corporate contact."),
+       'display_name' => array('label_attributes' => array('class' => 'optional empty'),
+			       'after' => "Optional with first/last name; Required otherwise."),
+       'id_federal' => array('name' => 'SSN',
+			     'label_attributes' => array('class' => 'optional empty'),
+			     'after' => "Optional: Social Security Number."),
+       'id_local' => array('name' => 'ID #',
+			   'label_attributes' => array('class' => 'recommended empty'),
+			   'after' => "Recommended: Driver's license, for example."),
+       'id_local_state' => array('name' => 'ID State',
+				 'label_attributes' => array('class' => 'recommended empty'),
+				 'after' => "Recommended: State which issued the ID."),
        /* 'id_local_exp' => array('name' => 'ID Expiration', */
        /*			        'opts' => array('empty' => true)), */
-       'comment' => true,
+       'comment' => array('label_attributes' => array('class' => 'optional empty'),
+			  'after' => "Optional: Comments about this contact."),
        );
   }
   elseif ($stype === 'show') {
@@ -151,14 +179,14 @@ function customerContactTypeDiv($obj, $stype, $values = null) {
     '<div ' . "\n" .
     ' class="contact-%{id}-div"' . "\n" .
     ' id="contact-%{id}-'.$stype.'-div"' . "\n" .
-    (isset($values) ? '' : ' STYLE="display:none;"' . "\n") .
+    ((isset($values) || $stype == 'new') ? '' : ' STYLE="display:none;"' . "\n") .
     '>' . "\n" .
 
     $obj->element
     ($element,
      array('class'  => "item contact {$class}",
 	   'field_prefix' => 'Contact.%{id}')
-     + compact('rows', 'fields', 'column_class')) .
+     + compact('rows', 'fields', 'row_class', 'column_class')) .
 
     ($stype === 'show'
      ? '<input type="hidden" name="data[Contact][%{id}][id]" value="'.$values['id'].'"/>' . "\n"
@@ -221,8 +249,28 @@ function customerContactTypeDiv($obj, $stype, $values = null) {
       .slideDown();
   }
 
+  function setEmpty(input_elem) {
+    selector = "label[for=" + $(input_elem).attr("id") + "]";
+    //$("#debug").append($(input_elem).attr("id") + ": " + $(input_elem).val() + "<BR>");
+    if ($(input_elem).val() == '')
+      $(selector).addClass('empty');
+    else
+      $(selector).removeClass('empty');
+  }
+
   $(document).ready(function(){
       resetForm();
+
+      // In case refresh is hit with populated fields
+      $(":input").each(function(i,elem){ setEmpty(elem); });
+
+      // keyup doesn't catch cut from menu
+      $(":input").live('keyup', function(){
+	  setEmpty(this);
+	});
+      $(":input").live('mouseup', function(){
+	  setEmpty(this);
+	});
     });
 
 --></script>
@@ -247,8 +295,12 @@ echo($this->element
       array('class'  => 'item customer detail',
 	    'caption' => isset($this->data['Customer']) ? 'Edit Customer' : 'New Customer',
 	    'fields' => array
-	    ('name' => true,
-	     'comment' => true,
+	    ('name' => array('label_attributes' => array('class' => 'optional empty'),
+			     'after' => ("Optional: If this field is left blank, the" .
+					 " customer name will be set to the name of" .
+					 " the primary contact, below.")),
+	     'comment' => array('label_attributes' => array('class' => 'optional empty'),
+				'after' => 'Optional: Comments about this customer.'),
 	     ))) . "\n");
 
 echo $form->submit(isset($this->data['Customer']) ? 'Update' : 'Add New Customer') . "\n";
@@ -268,6 +320,11 @@ echo $form->submit(isset($this->data['Customer']) ? 'Update' : 'Add New Customer
 <?php
 ; // Alignment
 
+if (!empty($movein['Unit']['id']))
+  echo $form->input("movein.Unit.id",
+		    array('type' => 'hidden',
+			  'value' => $movein['Unit']['id'])) . "\n";
+
 echo $form->submit(isset($this->data['Customer']) ? 'Update' : 'Add New Customer') . "\n";
 echo $form->submit('Cancel', array('name' => 'cancel')) . "\n";
 echo $form->end() . "\n";

site/views/customers/merge.ctp

@@ -0,0 +1,176 @@
+<?php /* -*- mode:PHP -*- */ ?>
+
+<div class="customer merge">
+<?php
+; // Editor alignment
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Javascript
+ */
+
+// Warnings _really_ screw up javascript
+$saved_debug_state = Configure::read('debug');
+Configure::write('debug', '0');
+?>
+
+<script type="text/javascript"><!--
+
+// pre-submit callback 
+function verifyRequest() { 
+  if (!$("#src-customer-id").val()) {
+    alert("Must select source customer");
+    return false;
+  }
+
+  rows = $('#<?php echo "contacts-jqGrid"; ?>').getGridParam('selarrrow');
+  $('#<?php echo "contact-ids"; ?>').val(serialize(rows));
+
+  // return false to prevent the form from being submitted; 
+  // anything other than false will allow submission.
+  return true;
+}
+
+function updateContacts() {
+  $('#contacts-jqGrid').clearGridData();
+
+  var filter = new Array();
+  filter['ContactsCustomer.customer_id'] = $("#src-customer-id").val();
+
+  var dynamic_post = new Array();
+  dynamic_post['filter'] = filter;
+
+  $('#contacts-jqGrid').setPostDataItem('dynamic_post_replace', serialize(dynamic_post));
+  $('#contacts-jqGrid')
+    .setGridParam({ page: 1 })
+    .trigger("reloadGrid");
+}
+
+function onRowSelect(grid_id, customer_id) {
+  //$('#output-debug').append("select: "+grid_id+"; "+customer_id+"<BR>\n");
+
+  // Set the item id that will be returned with the form
+  $("#src-customer-id").val(customer_id);
+
+  // Get the item name from the grid
+  $("#src-customer-name").html($(grid_id).getCell(customer_id, "Customer-name"));
+
+  updateContacts();
+
+  $("#customers-list .HeaderButton").click();
+}
+
+function onGridState(grid_id, state) {
+  //$('#output-debug').append("state: "+grid_id+"; "+state+"<BR>\n");
+
+  if (state == 'visible') {
+    $(".customer-selection-invalid").hide();
+    $(".customer-selection-valid").hide();
+  }
+  else {
+    if ($("#src-customer-id").val() > 0) {
+      $(".customer-selection-invalid").hide();
+      $(".customer-selection-valid").show();
+    } else {
+      $(".customer-selection-invalid").show();
+      $(".customer-selection-valid").hide();
+    }
+  }
+}
+
+--></script>
+
+<?php
+; // align
+// Re-Enable warnings
+Configure::write('debug', $saved_debug_state);
+
+echo $form->create(null, array('id' => 'customer-merge-form',
+			       'onsubmit' => 'return verifyRequest();',
+			       'url' => array('controller' => 'customers',
+					      'action' => 'mergeFinal')))."\n";
+
+
+echo '<input type="hidden" id="src-customer-id" name="src-id" value="0" />'."\n";
+echo '<input type="hidden" id="dst-customer-id" name="dst-id" value="'.$dst_id.'" />'."\n";
+
+echo $this->element('customers', array
+		    ('config' => array
+		     ('grid_div_id' => 'customers-list',
+		      'grid_div_class' => 'text-below',
+		      'caption' => ('<A HREF="#" ONCLICK="$(\'#customers-list .HeaderButton\').click();'.
+				    ' return false;">Select Customer</A>'),
+		      'grid_events' => array('onSelectRow' =>
+					     array('ids' =>
+						   'if (ids != null){onRowSelect("#"+$(this).attr("id"), ids);}'),
+					     'onHeaderClick' =>
+					     array('gridstate' =>
+						   'onGridState("#"+$(this).attr("id"), gridstate)'),
+					     ),
+		      'filter' => array('Customer.id !=' => $dst_id),
+		      //'nolinks' => true,
+		      'limit' => 10,
+		      )));
+
+echo ('<DIV CLASS="customer-merge grid-selection-text">' .
+
+      '<DIV CLASS="customer-selection-valid" style="display:none">' .
+      'Destination Customer: <SPAN id="src-customer-name"></SPAN>' .
+      '</DIV>' .
+
+      '<DIV CLASS="customer-selection-invalid" style="display:none">' .
+      'Please select customer to merge into' .
+      '</DIV>' .
+
+      '</DIV>' . "\n");
+
+echo $this->element('contacts', array
+		    (// Grid configuration
+		     'config' => array
+		     (
+		      'grid_div_id' => 'contacts',
+		      'grid_setup' => array('multiselect' => true),
+		      'caption' => 'Source contacts to keep',
+		      'filter'  => array('ContactsCustomer.customer_id' => 0),
+		      'include' => array('Relationship', 'License', 'Comment'),
+		      ),
+		     ));
+
+// Add a hidden item to hold the jqGrid selection,
+// which we'll populate prior to form submission.
+echo "\n";
+echo '<input type="hidden" id="contact-ids" name="contact-ids" value="" />'."\n";
+
+?>
+
+<H3>WARNING!</H3>
+The above selected customer is about to be deleted, and all related data (leases, transactions, etc) will be merged into customer #<?php echo $dst_id ?>: <?php echo $dst_name ?>.  This process is NOT reversible, so please ensure the selections are correct before proceeding.<BR>
+
+<?php
+echo $form->end('Merge Customers') . "\n";
+?>
+
+<div id="output-debug" style="display:none"></div>
+
+<?php
+// Warnings _really_ screw up javascript
+Configure::write('debug', '0');
+?>
+
+<script type="text/javascript"><!--
+  $(document).ready(function(){
+
+      $("#src-customer-id").val(0);
+      $("#src-customer-name").html("INTERNAL ERROR");
+      //onGridState(null, 'visible');
+
+      <?php if ($this->params['dev']): ?>
+      $('#output-debug').show();
+      <?php endif; ?>
+
+  });
+--></script>
+
+</div>

site/views/customers/receipt.ctp

@@ -28,17 +28,61 @@ Configure::write('debug', '0');
       // other available options: 
       //clearForm: true,        // clear all form fields after successful submit 
       //resetForm: true,        // reset the form after successful submit 
+
+      url: "<?php echo $html->url(array('controller' => 'transactions',
+					'action' => 'postReceipt', 0)); ?>"
       }; 
 
     // bind form using 'ajaxForm' 
-    $('#receipt-form').ajaxForm(options); 
+    if ($('#receipt-form').ajaxForm != null)
+      $('#receipt-form').ajaxForm(options);
+    else
+      $('#repeat, label[for=repeat]').remove();
     }); 
  
 // pre-submit callback 
-function verifyRequest(formData, jqForm, options) { 
+function verifyRequest(formData, jqForm, options) {
+  //$("#debug").html('');
+  for (var i = 0; i < formData.length; ++i) {
+    //$("#debug").append(i + ') ' + dump(formData[i]) + '<BR>');
+    if (formData[i]['name'] == "data[Customer][id]" &&
+	!(formData[i]['value'] > 0)) {
+      //$("#debug").append('<P>Missing Customer ID');
+      alert("Please select a customer first.");
+      return false;
+    }
+
+    if (formData[i]['name'] == "data[Transaction][stamp]" &&
+	formData[i]['value'] == '') {
+      //$("#debug").append('<P>Bad Stamp');
+      if (formData[i]['value'] != '')
+	alert(formData[i]['value'] + " is not valid date stamp.  Please correct it.");
+      else
+	alert("Please enter a valid date stamp first.");
+      return false;
+    }
+
+    // Terrible way to accomplish this...
+    for (var j = 0; j < 20; ++j) {
+      if (formData[i]['name'] == "data[Entry]["+j+"][amount]") {
+	var val = formData[i]['value'].replace(/\$/,'');
+	//$("#debug").append('<P>Bad Amount');
+	if (!(val > 0)) {
+	  if (formData[i]['value'] == '')
+	    alert("Please enter an amount first.");
+	  else
+	    alert('"'+formData[i]['value']+'"' + " is not valid amount.  Please correct it.");
+	  return false;
+	}
+      }
+    }
+
+  }
+
+  //$("#debug").append('OK');
+  //return false;
+
   $('#results').html('Working <BLINK>...</BLINK>');
-  // here we could return false to prevent the form from being submitted; 
-  // returning anything other than false will allow the form submit to continue 
   return true; 
 } 
  
@@ -86,11 +130,11 @@ function updateCharges(id) {
   $("#receipt-balance").html("Calculating...");
   $("#receipt-charges-caption").html("Please Wait...");
 
-  var custom = new Array();
-  custom['customer_id'] = id;
+  var filter = new Array();
+  filter['StatementEntry.customer_id'] = id;
 
   var dynamic_post = new Array();
-  dynamic_post['custom'] = custom;
+  dynamic_post['filter'] = filter;
 
   $('#charge-entries-jqGrid').setPostDataItem('dynamic_post_replace', serialize(dynamic_post));
   $('#charge-entries-jqGrid')
@@ -111,21 +155,8 @@ function onGridLoadComplete() {
 function onRowSelect(grid_id, customer_id) {
   // Set the customer id that will be returned with the form
   $("#customer-id").val(customer_id);
-  
-  // Get the item names from the grid
-  //$("#receipt-customer-id").html($(grid_id).getCell(customer_id, 'Customer-id'));
-  // REVISIT <AP>: 20090708
-  //   This is not intended as a long term solution,
-  //   but I need a way to enter data and then view
-  //   the results.  This link will help.
-  $("#receipt-customer-id").html('<A HREF="' +
-				 "<?php echo $html->url(array('controller' => 'customers',
-		                                              'action'     => 'view')); ?>"
-				 + "/" +
-				 $(grid_id).getCell(customer_id, 'Customer-id').replace(/^#/,'') +
-				 '">' +
-				 $(grid_id).getCell(customer_id, 'Customer-id') +
-				 '</A>');
+
+  // Set the customer name, so the user knows who the receipt is for
   $("#receipt-customer-name").html($(grid_id).getCell(customer_id, 'Customer-name'));
 
   // Hide the "no customer" message and show the current customer
@@ -265,6 +296,7 @@ echo $this->element('customers', array
 					     array('gridstate' =>
 						   'onGridState("#"+$(this).attr("id"), gridstate)'),
 					     ),
+		      'action' => 'current',
 		      'nolinks' => true,
 		      'limit' => 10,
 		      )));
@@ -272,8 +304,7 @@ echo $this->element('customers', array
 echo ('<DIV CLASS="receipt grid-selection-text">' .
 
       '<DIV CLASS="customer-selection-valid" style="display:none">' .
-      'Customer <SPAN id="receipt-customer-id"></SPAN>' .
-      ': <SPAN id="receipt-customer-name"></SPAN>' .
+      'Customer: <SPAN id="receipt-customer-name"></SPAN>' .
 
 /*       '<DIV CLASS="supporting">' . */
 /*       '<TABLE>' . */
@@ -302,7 +333,7 @@ echo $this->element('statement_entries', array
 		      'action' => 'unreconciled',
 		      'exclude' => array('Customer', 'Type', 'Debit', 'Credit'),
 		      'include' => array('Applied', 'Balance'),
-		      'remap' => array('Applied' => 'Paid'),
+		      'remap' => array('Received' => 'Paid'),
 		      'limit' => 8,
 		      ),
 		     ));
@@ -376,29 +407,15 @@ Configure::write('debug', '0');
 
 <script type="text/javascript"><!--
   $(document).ready(function(){
-      $("#TransactionStamp")
-	.attr('autocomplete', 'off')
-	.datepicker({ constrainInput: true,
-	              numberOfMonths: [1, 1],
-                      showCurrentAtPos: 0,
-                      dateFormat: 'mm/dd/yy' });
+      datepicker('TransactionStamp');
 
-      $("#receipt-customer-id").html("INTERNAL ERROR");
+      $("#customer-id").val(0);
       $("#receipt-customer-name").html("INTERNAL ERROR");
       $("#receipt-balance").html("INTERNAL ERROR");
       $("#receipt-charges-caption").html("Outstanding Charges");
 
       <?php if (isset($customer['id'])): ?>
       $("#customer-id").val(<?php echo $customer['id']; ?>);
-      //$("#receipt-customer-id").html("<?php echo '#'.$customer['id']; ?>");
-      $("#receipt-customer-id").html('<A HREF="' +
-				     "<?php echo $html->url(array('controller' => 'customers',
-		                                                  'action'     => 'view')); ?>"
-				     + "/" +
-				     "<?php echo $customer['id']; ?>" +
-				     '">#' +
-				     "<?php echo $customer['id']; ?>" +
-				     '</A>');
       $("#receipt-customer-name").html("<?php echo $customer['name']; ?>");
       $("#receipt-balance").html(fmtCurrency("<?php echo $stats['balance']; ?>"));
       onGridState(null, 'hidden');

site/views/customers/view.ctp

@@ -53,15 +53,55 @@ echo '<div CLASS="detail supporting">' . "\n";
 
 
 /**********************************************************************
- * Contacts
+ * Unpaid Charges
  */
 
-echo $this->element('contacts', array
+echo $this->element('statement_entries', array
 		    (// Grid configuration
 		     'config' => array
-		     ('caption' => 'Customer Contacts',
-		      'filter' => array('Customer.id' => $customer['Customer']['id']),
-		      'include' => array('Type', 'Active'),
+		     ('caption' => 'Outstanding Charges',
+		      'limit'   => 10,
+		      'action'  => 'unreconciled',
+		      'filter'  => array('StatementEntry.customer_id' => $customer['Customer']['id']),
+		      'exclude' => array('Customer'),
+		      )));
+
+
+/**********************************************************************
+ * Customer Credits
+ */
+
+echo $this->element('statement_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Oustanding Credits',
+		      'grid_div_id' => 'surplus',
+		      'limit'   => 10,
+		      'filter' => array('Customer.id' => $customer['Customer']['id'],
+					'StatementEntry.type' => 'SURPLUS'),
+		      'exclude' => array('Entry', 'Effective', 'Customer', 'Unit', 'Account', 'Debit', 'Credit'),
+		      'include' => array('Transaction', 'Amount'),
+		      'remap'   => array('Transaction' => 'Receipt'),
+		      )));
+
+
+/**********************************************************************
+ * Receipt History
+ */
+
+echo $this->element('ledger_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Receipts',
+		      'limit'   => 5,
+		      'filter' => array('Customer.id' => $customer['Customer']['id'],
+					'Transaction.type' => 'RECEIPT',
+					'Tender.id !=' => null,
+					//'Account.id !=' => '-AR-'
+					),
+		      'include' => array('Transaction'),
+		      'exclude' => array('Entry', 'Account', 'Cr/Dr'),
+		      'remap'   => array('Transaction' => 'Receipt'),
 		      )));
 
 
@@ -73,8 +113,25 @@ echo $this->element('leases', array
 		    (// Grid configuration
 		     'config' => array
 		     ('caption' => 'Lease History',
-		      'filter' => array('Customer.id' => $customer['Customer']['id']),
+		      'limit'   => 5,
+		      'filter'  => array('Customer.id' => $customer['Customer']['id']),
 		      'exclude' => array('Customer'),
+		      'sort_column' => 'Move-In',
+		      'sort_order'  => 'DESC',
+		      )));
+
+
+/**********************************************************************
+ * Contacts
+ */
+
+echo $this->element('contacts', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Customer Contacts',
+		      'limit'   => 5,
+		      'filter'  => array('Customer.id' => $customer['Customer']['id']),
+		      'include' => array('Relationship'),
 		      )));
 
 
@@ -88,28 +145,8 @@ echo $this->element('statement_entries', array
 		     ('caption' => 'Customer Statement',
 		      'filter' => array('Customer.id' => $customer['Customer']['id'],
 					'type !=' => 'VOID'),
+		      //'include' => array('Sub-Total'),
 		      'exclude' => array('Customer'),
-		      'sort_column' => 'Effective',
-		      'sort_order'  => 'DESC',
-		      )));
-
-
-/**********************************************************************
- * Receipt History
- */
-
-echo $this->element('ledger_entries', array
-		    (// Grid configuration
-		     'config' => array
-		     ('caption' => 'Receipts',
-		      'filter' => array('Customer.id' => $customer['Customer']['id'],
-					'Transaction.type' => 'RECEIPT',
-					'Tender.id !=' => null,
-					//'Account.id !=' => '-AR-'
-					),
-		      'exclude' => array('Account', 'Cr/Dr'),
-		      'sort_column' => 'Date',
-		      'sort_order'  => 'DESC',
 		      )));
 
 

site/views/double_entries/view.ctp

@@ -1,50 +1,17 @@
 <?php /* -*- mode:PHP -*- */
 
-echo '<div class="ledger-entry view">' . "\n";
+echo '<div class="double-entry view">' . "\n";
 
-// The two entry ids, debit and credit, are actually individual
+// The two entries, debit and credit, are actually individual
 // entries in separate accounts (each make up one of the two
-// entries required for "double entry").  This, when we provide
-// reconcile information, we're really providing reconcile info
-// for two independent accounts.  The reconciling entries,
-// therefore, are those on the opposite side of the ledger in
-// each account.  For example, assume this "double" entry is
-//
-//    debit: A/R      credit: Cash    amount: 55
-//
-// Then, our accounts might look like:
-//
-//  RENT      TAX      A/R     CASH     BANK
-// -------  -------  -------  -------  -------
-//    |20      |      20|        |        |     <-- Unrelated
-//    |        |        |20    20|        |     <-- Unrelated
-//    |        |        |        |        |   
-//    |50      |      50|        |        |     <-- Rent paid by this entry
-//    |        |5      5|        |        |     <-- Tax paid by this entry
-//    |        |        |55    55|        |     <-- THIS ENTRY
-//    |        |        |        |        |   
-//    |        |        |        |75    75|     <-- Deposit includes this entry
-//    |        |        |        |        |   
-//
-// In this case, we're looking to provide reconcile information
-// of A/R for (the credit side of) this entry, and also of Cash
-// (for the debit side).  Taking the accounts as individual
-// entries, instead of the "double entry" representation in the
-// database, we're actually providing information on the two
-// A/R entries, 50 & 5, which are both debits, i.e. opposite
-// entries to the credit of A/R.  The cash account entry
-// reconciles against the credit of 75.  Again, this is the
-// opposite entry to the debit of Cash.
-// 
-// Thus, for our debit_ledger_id, we're reconciling against
-// credits, and for our credit_ledger_id, against debits.
+// entries required for "double entry").
 
 
 /**********************************************************************
  **********************************************************************
  **********************************************************************
  **********************************************************************
- * LedgerEntry Detail Main Section
+ * DoubleEntry Detail Main Section
  */
 
 $transaction    = $entry['Transaction'];
@@ -55,7 +22,6 @@ $entries        = array('debit'  => $entry['DebitEntry'],
 $entry          = $entry['DoubleEntry'];
 
 $rows = array();
-$rows[] = array('ID',               $entry['id']);
 $rows[] = array('Transaction',      $html->link('#'.$transaction['id'],
 						array('controller' => 'transactions',
 						      'action'     => 'view',
@@ -64,64 +30,50 @@ $rows[] = array('Timestamp',        FormatHelper::datetime($transaction['stamp']
 $rows[] = array('Comment',          $entry['comment']);
 
 echo $this->element('table',
-		    array('class'   => 'item ledger-entry detail',
-			  'caption' => 'Double Ledger Entry Detail',
+		    array('class'   => 'item double-entry detail',
+			  'caption' => 'Double Ledger Entry',
 			  'rows'    => $rows,
 			  'column_class' => array('field', 'value')));
 
 
+
 /**********************************************************************
- * LedgerEntry Info Box
+ * Debit/Credit Entries
  */
 
-/* echo '<div class="infobox">' . "\n"; */
-/* foreach ($ledgers AS $type => $ledger) { */
-/*   //pr($ledger); */
-/*   if (!$ledger['Account']['trackable']) */
-/*     continue; */
-
-/*   $applied_caption = "Transfers applied"; */
-/*   $remaining_caption = "Unapplied amount"; */
-  
-/*   $rows = array(); */
-/*   $rows[] = array($applied_caption, */
-/* 		  FormatHelper::currency($stats[$type]['amount_reconciled'])); */
-/*   $rows[] = array($remaining_caption, */
-/* 		  FormatHelper::currency($stats[$type]['amount_remaining'])); */
-/*   echo $this->element('table', */
-/* 		      array('class'   => 'item summary', */
-/* 			    'caption' => "{$ledger['Account']['name']} Ledger Entry", */
-/* 			    'rows'    => $rows, */
-/* 			    'column_class' => array('field', 'value'), */
-/* 			    //'suppress_alternate_rows' => true, */
-/* 			    )); */
-/* } */
-
-/* echo '</div>' . "\n"; */
-
 echo ('<DIV CLASS="ledger-double-entry">' . "\n");
 foreach ($ledgers AS $type => $ledger) {
   $rows = array();
 
-  $rows[] = array('ID',        $html->link('#' . $entries[$type]['id'],
-					   array('controller' => 'entries',
-						 'action'     => 'view',
-						 $entries[$type]['id'])));
-  $rows[] = array('Account',   $html->link($ledger['Account']['name'],
-					   array('controller' => 'accounts',
-						 'action'     => 'view',
-						 $ledger['Account']['id'])));
-  $rows[] = array('Ledger',    $html->link('#' . $ledger['Account']['id']
-					   . '-' . $ledger['sequence'],
-					   array('controller' => 'ledgers',
-						 'action'     => 'view',
-						 $ledger['id'])));
+  // REVISIT <AP>: 20090816
+  //  Due to low priority, the ledger_entry/double_entry stuff
+  //  is a bit piecemeal at the moment (trying to reuse old
+  //  code as much as possible).  So, LedgerEntry view is just
+  //  redirecting here.  Of course, presenting a link for the
+  //  LedgerEntry then is, well, quite pointless.
+  $rows[] = array('ID',        '#' . $entries[$type]['id']);
+/*   $rows[] = array('ID',        $html->link('#' . $entries[$type]['id'], */
+/* 					   array('controller' => 'entries', */
+/* 						 'action'     => 'view', */
+/* 						 $entries[$type]['id']))); */
+  $rows[] = array('Account',   ($ledger['link']
+				? $html->link($ledger['Account']['name'],
+					      array('controller' => 'accounts',
+						    'action'     => 'view',
+						    $ledger['Account']['id']))
+				: $ledger['Account']['name']));
+  $rows[] = array('Ledger',    ($ledger['link']
+				? $html->link('#' . $ledger['sequence'],
+					      array('controller' => 'ledgers',
+						    'action'     => 'view',
+						    $ledger['id']))
+				: '#' . $ledger['sequence']));
   $rows[] = array('Amount',    FormatHelper::currency($entries[$type]['amount']));
   //$rows[] = array('Effect',    $ledger['Account']['ftype'] == $type ? 'INCREASE' : 'DECREASE');
 
   echo $this->element('table',
 		      array('class'   => array('item', $type, 'detail'),
-			    'caption' => ucfirst($type) . ' Ledger Entry',
+			    'caption' => ucfirst($type) . ' Entry',
 			    'rows'    => $rows,
 			    'column_class' => array('field', 'value')));
 }

site/views/elements/accounts.ctp

@@ -2,7 +2,6 @@
 
 // Define the table columns
 $cols = array();
-$cols['ID']       = array('index' => 'Account.id',       'formatter' => 'id');
 $cols['Name']     = array('index' => 'Account.name',     'formatter' => 'longname');
 $cols['Type']     = array('index' => 'Account.type',     'formatter' => 'enum');
 $cols['Entries']  = array('index' => 'entries',          'formatter' => 'number');
@@ -15,7 +14,7 @@ $cols['Comment']  = array('index' => 'Account.comment',  'formatter' => 'comment
 $grid
 ->columns($cols)
 ->sortField('Name')
-->defaultFields(array('ID', 'Name'))
+->defaultFields(array('Name'))
 ->searchFields(array('Name'))
 ->render($this, isset($config) ? $config : null,
 	 array_diff(array_keys($cols), array('Comment')));

site/views/elements/contacts.ctp

@@ -2,19 +2,19 @@
 
 // Define the table columns
 $cols = array();
-$cols['ID']          = array('index' => 'Contact.id',              'formatter' => 'id');
-$cols['Last Name']   = array('index' => 'Contact.last_name',       'formatter' => 'name');
-$cols['First Name']  = array('index' => 'Contact.first_name',      'formatter' => 'name');
-$cols['Company']     = array('index' => 'Contact.company_name',    'formatter' => 'longname');
-$cols['Type']        = array('index' => 'ContactsCustomer.type',   'formatter' => 'enum');
-$cols['Active']      = array('index' => 'ContactsCustomer.active', 'formatter' => 'enum');
-$cols['Comment']     = array('index' => 'Contact.comment',         'formatter' => 'comment');
+$cols['Relationship'] = array('index' => 'ContactsCustomer.type',   'formatter' => 'enum');
+$cols['Name']         = array('index' => 'Contact.display_name',    'formatter' => 'longname');
+$cols['Last Name']    = array('index' => 'Contact.last_name',       'formatter' => 'name');
+$cols['First Name']   = array('index' => 'Contact.first_name',      'formatter' => 'name');
+$cols['License']      = array('index' => 'Contact.id_local',        'formatter' => 'name');
+$cols['Company']      = array('index' => 'Contact.company_name',    'formatter' => 'longname');
+$cols['Comment']      = array('index' => 'Contact.comment',         'formatter' => 'comment');
 
 // Render the grid
 $grid
 ->columns($cols)
 ->sortField('Last Name')
-->defaultFields(array('ID', 'Last Name', 'First Name'))
+->defaultFields(array('Last Name', 'First Name'))
 ->searchFields(array('Last Name', 'First Name', 'Company'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Type', 'Active', 'Comment')));
+	 array_diff(array_keys($cols), array('Relationship', 'License', 'Comment')));

site/views/elements/customers.ctp

@@ -2,25 +2,21 @@
 
 // Define the table columns
 $cols = array();
-$cols['ID']            = array('index' => 'Customer.id',                'formatter' => 'id');
 $cols['Relationship']  = array('index' => 'ContactsCustomer.type',      'formatter' => 'enum');
 $cols['Name']          = array('index' => 'Customer.name',              'formatter' => 'longname');
 $cols['Last Name']     = array('index' => 'PrimaryContact.last_name',   'formatter' => 'name');
 $cols['First Name']    = array('index' => 'PrimaryContact.first_name',  'formatter' => 'name');
-$cols['Leases']        = array('index' => 'current_lease_count',        'formatter' => 'number');
+$cols['Units']         = array('index' => 'current_lease_count',        'formatter' => 'number');
+$cols['Past Leases']   = array('index' => 'past_lease_count',           'formatter' => 'number');
+$cols['Leases']        = array('index' => 'lease_count',                'formatter' => 'number');
 $cols['Balance']       = array('index' => 'balance',                    'formatter' => 'currency');
 $cols['Comment']       = array('index' => 'Customer.comment',           'formatter' => 'comment');
 
-
-// Certain fields are only valid with a particular context
-if (!isset($config['filter']['Contact.id']))
-  $grid->invalidFields('Relationship');
-
 // Render the grid
 $grid
 ->columns($cols)
 ->sortField('Name')
-->defaultFields(array('ID', 'Name'))
+->defaultFields(array('Name'))
 ->searchFields(array('Name', 'Last Name', 'First Name'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Comment')));
+	 array_diff(array_keys($cols), array('Relationship', 'Past Leases', 'Comment')));

site/views/elements/double_entries.ctp

@@ -1,116 +0,0 @@
-<?php /* -*- mode:PHP -*- */
-
-// Define the table columns
-$cols = array();
-$cols['Transaction']    = array('index' => 'Transaction.id',      'formatter' => 'id');
-$cols['Entry']          = array('index' => 'LedgerEntry.id',      'formatter' => 'id');
-
-$cols['Date']           = array('index' => 'Transaction.stamp',   'formatter' => 'date');
-$cols['Effective']      = array('index' => 'LedgerEntry.effective_date', 'formatter' => 'date');
-$cols['Through']        = array('index' => 'LedgerEntry.through_date',   'formatter' => 'date');
-
-$cols['Account']        = array('index' => 'Account.name',        'formatter' => 'name');
-$cols['Debit Account']  = array('index' => 'DebitAccount.name',   'formatter' => 'name');
-$cols['Credit Account'] = array('index' => 'CreditAccount.name',  'formatter' => 'name');
-
-$cols['Customer']       = array('index' => 'Customer.name',       'formatter' => 'longname');
-$cols['Lease']          = array('index' => 'Lease.number',        'formatter' => 'id');
-$cols['Unit']           = array('index' => 'Unit.name',           'formatter' => 'name');
-
-$cols['Source']         = array('index' => 'MonetarySource.name', 'formatter' => 'name');
-$cols['Comment']        = array('index' => 'LedgerEntry.comment', 'formatter' => 'comment', 'width'=>150);
-
-$cols['Amount']         = array('index' => 'LedgerEntry.amount',  'formatter' => 'currency');
-$cols['Debit']          = array('index' => 'debit',               'formatter' => 'currency');
-$cols['Credit']         = array('index' => 'credit',              'formatter' => 'currency');
-
-$cols['Last Payment']   = array('index' => 'last_paid',           'formatter' => 'date');
-$cols['Applied']        = array('index' => "applied",             'formatter' => 'currency');
-$cols['Sub-Total']      = array('index' => 'subtotal-LedgerEntry.amount',  'formatter' => 'currency', 'sortable' => false);
-
-
-if (isset($transaction_id) || isset($reconcile_id))
-  $grid->invalidFields('Transaction');
-
-if (!isset($collected_account_id))
-  $grid->invalidFields('Last Payment');
-
-if (isset($account_ftype) || isset($ledger_id) || isset($account_id) || isset($ar_account) || isset($customer_id))
-  $grid->invalidFields(array('Debit Account', 'Credit Account'));
-else
-  $grid->invalidFields('Account');
-
-if (isset($no_account) || $group_by_tx || isset($collected_account_id))
-  $grid->invalidFields(array('Account', 'Debit Account', 'Credit Account'));
-
-if (isset($ledger_id) || isset($account_id) || isset($ar_account) || isset($customer_id)) {
-  $grid->invalidFields('Amount');
-  $cols['Sub-Total']['index'] = 'subtotal-balance';
-} else {
-  $grid->invalidFields(array('Debit', 'Credit'));
-  $cols['Sub-Total']['index'] = 'subtotal-LedgerEntry.amount';
-}
-
-// group_by_tx SHOULD wipe out Customer, but the reality
-// is that it works good at the present, so we'll leave it.
-if (isset($lease_id) || isset($customer_id))
-  $grid->invalidFields(array('Customer'));
-
-if (isset($lease_id) || $group_by_tx)
-  $grid->invalidFields(array('Lease', 'Unit'));
-
-if (!isset($reconcile_id) && !isset($collected_account_id))
-  $grid->invalidFields('Applied');
-else
-  $cols['Sub-Total']['index'] = 'subtotal-applied';
-
-if (isset($account_ftype) || isset($collected_account_id))
-  $grid->invalidFields('Sub-Total');
-
-
-// Now that columns are defined, establish basic grid parameters
-$grid
-->columns($cols)
-->sortField('Date')
-->defaultFields(array('Entry', 'Date', 'Amount', 'Credit', 'Debit'));
-
-
-if (!isset($config['rows']) && !isset($collected_account_id)) {
-  $config['action'] = 'ledger';
-  $grid->limit(50);
-}
-
-if (isset($reconcile_id)) {
-  $config['action'] = 'reconcile';
-  $grid->customData(compact('reconcile_id'))->limit(20);
-}
-
-if (isset($collected_account_id)) {
-  $config['action'] = 'collected';
-  $account_id = $collected_account_id;
-  $grid->limit(50);
-  $grid->sortField('Last Payment');
-}
-
-if (isset($entry_ids))
-  $grid->id_list($entry_ids);
-
-// Set up search fields if requested by caller
-if (isset($searchfields))
-  $grid->searchFields(array('Customer', 'Unit'));
-
-// Include custom data
-$grid->customData(compact('ledger_id', 'account_id', 'ar_account',
-			  'account_type', 'account_ftype', 'monetary_source_id',
-			  'customer_id', 'lease_id', 'transaction_id', 'group_by_tx'));
-
-// Render the grid
-$grid
-->render($this, isset($config) ? $config : null,
-	 array('Transaction', 'Entry', 'Date', 'Effective', 'Last Payment',
-	       'Account', 'Debit Account', 'Credit Account',
-	       'Customer', 'Unit',
-	       'Comment',
-	       'Amount', 'Debit', 'Credit',
-	       'Applied', 'Sub-Total')
-	 );

site/views/elements/form_table.ctp

@@ -32,8 +32,8 @@ foreach ($fields AS $field => $config) {
     $include_after = true;
 }
 
-
-$column_class = array();
+if (empty($column_class))
+  $column_class = array();
 if ($include_before)
   $column_class[] = 'before';
 $column_class[] = 'field';
@@ -79,7 +79,13 @@ foreach ($fields AS $field => $config) {
       $cells[] = null;
   }
 
-  $name = $config['name'];
+  if (empty($config['opts']['label']))
+    $name = $form->label($field, $config['name'],
+			 empty($config['label_attributes'])
+			 ? null : $config['label_attributes']);
+  else
+    $name = $config['name'];
+
   if (isset($config['with_name_before']))
     $name = $config['with_name_before'] . $name;
   elseif (isset($with_name_before))

site/views/elements/jqGrid.ctp

@@ -19,6 +19,7 @@ if (!isset($limitOptions)) {
 }
 sort($limitOptions, SORT_NUMERIC);
 $limitOptions = array_unique($limitOptions, SORT_NUMERIC);
+//$limitOptions[] = 'ALL';  // Would be nice... jqGrid shows 'NaN of NaN'
 
 if (!isset($height))
   $height = 'auto';
@@ -46,12 +47,9 @@ if (!isset($grid_setup))
   $grid_setup = array();
 
 // Do some prework to bring in the appropriate libraries
-$imgpath = '/pmgr/site/css/jqGrid/basic/images';
-$html->css('jqGrid/basic/grid', null, null, false);
-$html->css('jqGrid/jqModal', null, null, false);
-$javascript->link('jqGrid/jquery.jqGrid.js', false);
-$javascript->link('jqGrid/js/jqModal', false);
-$javascript->link('jqGrid/js/jqDnR', false);
+$html->css('ui.jqgrid', null, null, false);
+$javascript->link('jqGrid/grid.locale-en', false);
+$javascript->link('jqGrid/jquery.jqGrid.min', false);
 $javascript->link('pmgr_jqGrid', false);
 
 
@@ -123,6 +121,11 @@ foreach ($jqGridColumns AS $header => &$col) {
       // No special formatting for number
       unset($col['formatter']);
     }
+    elseif ($col['formatter'] === 'percentage') {
+      $col['formatter'] = array('--special' => 'percentageFormatter');
+      $default['width'] = 60;
+      $default['align'] = 'right';
+    }
     elseif ($col['formatter'] === 'currency') {
       // Use our custom formatting for currency
       $col['formatter'] = array('--special' => 'currencyFormatter');
@@ -145,8 +148,14 @@ foreach ($jqGridColumns AS $header => &$col) {
       // No special formatting for name
       unset($col['formatter']);
     }
-    elseif ($col['formatter'] === 'enum') {
+    elseif (preg_match("/^(long|short)?enum$/",
+		       $col['formatter'], $matches)) {
       $default['width'] = 60;
+      if (!empty($matches[1]) && $matches[1] === 'long')
+	$default['width'] *= 1.5;
+      if (!empty($matches[1]) && $matches[1] === 'short')
+	$default['width'] *= 0.7;
+
       //$default['align'] = 'right';
 
       // No special formatting for enum
@@ -163,7 +172,8 @@ foreach ($jqGridColumns AS $header => &$col) {
 
     // Just a rough approximation to ensure columns
     // are wide enough to fully display their header.
-    $min_width = strlen($header) * 10;
+    $min_width = strlen($header) * 7;
+    $min_width = 0; // REVISIT <AP>: 20090829; if/while jqGrid is fixed width
     if ((!isset($default['width']) || $default['width'] < $min_width) && !$default['force'])
       $default['width'] = $min_width;
   }
@@ -187,9 +197,12 @@ if (isset($sort_order)) {
   $sortorder = 'ASC';
 }
 
-if (1) { // debug
+$debug = !empty($this->params['dev']);
+if ($debug)
   $caption .= '<span class="debug grid-query"> :: <span id="'.$grid_id.'-query"></span></span>';
-}
+
+$caption .= ('<span class="grid-error" id="'.$grid_id.'-error"' .
+	     ' style="display:none"> :: Error (Please Reload)</span>');
 
 foreach (array_merge(array('loadComplete' => '', 'loadError' => ''),
 		     $grid_events) AS $event => $statement) {
@@ -199,14 +212,22 @@ foreach (array_merge(array('loadComplete' => '', 'loadError' => ''),
     $statement = current($statement);
   }
 
-  if ($event == 'loadComplete') {
+  if ($event == 'loadComplete' && $debug) {
     $grid_events[$event] = 
       array('--special' => "function($params) {url=jQuery('#{$grid_id}').getGridParam('url');url=url+'/debug:1?'; pd=jQuery('#{$grid_id}').getPostData();$.each(pd,function(i){ url+=i+'='+escape(pd[i])+'&'; }); jQuery('#{$grid_id}-query').html('<A HREF=\"'+url+'\">Grid Query</A><BR>'); $statement;}");
   }
-  elseif ($event == 'loadError') {
+  elseif ($event == 'loadError' && $debug) {
     $grid_events[$event] = 
       array('--special' => "function($params) {url=jQuery('#{$grid_id}').getGridParam('url');url=url+'/debug:1?'; pd=jQuery('#{$grid_id}').getPostData();$.each(pd,function(i){ url+=i+'='+escape(pd[i])+'&'; }); jQuery('#{$grid_id}-query').html('<A HREF=\"'+url+'\">Grid Error Query</A><BR>'); $statement;}");
   }
+  elseif ($event == 'loadComplete' && !$debug) {
+    $grid_events[$event] = 
+      array('--special' => "function($params) {jQuery('#{$grid_id}-error').hide(); $statement;}");
+  }
+  elseif ($event == 'loadError' && !$debug) {
+    $grid_events[$event] = 
+      array('--special' => "function($params) {jQuery('#{$grid_id}-error').show(); $statement;}");
+  }
   else {
     $grid_events[$event] = 
       array('--special' => "function($params) { $statement; }");
@@ -225,13 +246,14 @@ $jqGrid_setup = array_merge
 	 'colNames'    => array_keys($jqGridColumns),
 	 'colModel'    => array('--special' => $jqGridColumns),
 	 'height'      => $height,
+	 'width'       => 700,
 	 'rowNum'      => $limit,
 	 'rowList'     => $limitOptions,
 	 'sortname'    => $sortname,
 	 'sortorder'   => $sortorder,
 	 'caption'     => $caption,
-	 'imgpath'     => $imgpath,
 	 'viewrecords' => true,
+	 'gridview'    => true,
 	 'pager'       => $grid_id.'-pager',
 	 ),
    $grid_events,
@@ -244,67 +266,46 @@ $jqGrid_setup = array_merge
 // to kick this thing off.
 ?>
 
+<?php if ($first_grid): ?>
+<script type="text/javascript"><!--
+var currencyFormatter = function(cellval, opts, rowObject) {
+  if (!cellval)
+    return "";
+  return fmtCurrency(cellval);
+}
+
+var percentageFormatter = function(cellval, opts, rowObject) {
+  var precision;
+  if (typeof(opts.colModel) != 'undefined' &&
+      typeof(opts.colModel.formatoptions) != 'undefined' &&
+      typeof(opts.colModel.formatoptions.precision) != 'undefined')
+    precision = opts.colModel.formatoptions.precision;
+  else
+    precision = 0;
+  amount = cellval.toString().replace(/\%/g,'');
+  amount = (amount*100).toFixed(precision);
+  return amount+'%';
+}
+
+var idFormatter = function(cellval, opts, rowObject) {
+  if (!cellval)
+    return cellval;
+  return '#'+cellval;
+}
+--></script>
+<?php endif; ?>
+
+
 <DIV ID="<?php echo $grid_div_id; ?>" CLASS="<?php echo $grid_div_class; ?>">
 <table id="<?php echo $grid_id; ?>" class="scroll"></table> 
 <div id="<?php echo $grid_id; ?>-pager" class="scroll" style="text-align:right"></div> 
 <script type="text/javascript"><!--
-
 jQuery(document).ready(function(){ 
-  currencyFormatter = function(el, cellval, opts) {
-    if (!cellval)
-      return;
-    $(el).html(fmtCurrency(cellval));
-  }
-
-  idFormatter = function(el, cellval, opts) {
-    if (!cellval)
-      return;
-    $(el).html('#'+cellval);
-  }
-
   jQuery('#<?php echo $grid_id; ?>').jqGrid(
-    <?php echo FormatHelper::phpVarToJavascript($jqGrid_setup); ?>
-  ).navGrid('#<?php echo $grid_id; ?>-pager',
-	    { view:false,
-		edit:false,
-		add:false,
-		del:false,
-		search:true,
-		refresh:true});
-
-<?php
-/*   jQuery('#t_<?php echo $grid_id; ?>').height(25).hide() */
-/*     .filterGrid('#<?php echo $grid_id; ?>', { */
-/*       gridModel:true, */
-/* 	  gridToolbar:true, */
-/* 	  autosearch:true, */
-/* 	  }); */
-
-/*   jQuery('#<?php echo $grid_id; ?>').navGrid('#<?php echo $grid_id; ?>-pager', */
-/* 				   { view:false,   */
-/* 				     edit:false, */
-/* 				       add:false, */
-/* 				       del:false, */
-/* 				       search:false, */
-/* 				       refresh:false}) */
-/*     .navButtonAdd('#<?php echo $grid_id; ?>-pager',{ */
-/*       caption:"Search", */
-/* 	  title:"Toggle Search", */
-/* 	  buttonimg:'<?php echo $imgpath; ?>' + '/find.gif', */
-/* 	  onClickButton:function(){ */
-/* 	  if(jQuery('#t_<?php echo $grid_id; ?>').css("display")=="none") { */
-/* 	    jQuery('#t_<?php echo $grid_id; ?>').css("display",""); */
-/* 	  } else { */
-/* 	    jQuery('#t_<?php echo $grid_id; ?>').css("display","none"); */
-/* 	  } */
-/* 	} */
-/*       }); */
-?>
-
+    <?php echo FormatHelper::phpVarToJavascript($jqGrid_setup) . "\n"; ?>
+  ).navGrid('#<?php echo $grid_id; ?>-pager', { view:false,edit:false,add:false,del:false,search:true,refresh:true});
 });
-
 --></script>
-
 <?php
   if (count($search_fields) > 0) {
     echo('<div>Search By:<BR>' . "\n");

site/views/elements/leases.ctp

@@ -2,24 +2,25 @@
 
 // Define the table columns
 $cols = array();
-$cols['LeaseID']   = array('index' => 'Lease.id',            'hidden' => true);
 $cols['Lease']     = array('index' => 'Lease.number',        'formatter' => 'id');
-$cols['Unit']      = array('index' => 'Unit.name',           'width' => '50',  'align' => 'center');
+$cols['Unit']      = array('index' => 'Unit.name',           'formatter' => 'shortname',  'align' => 'center');
+$cols['Customer id'] = array('index' => 'Customer.id',       'hidden' => true);
 $cols['Customer']  = array('index' => 'Customer.name',       'formatter' => 'longname');
-$cols['Rent']      = array('index' => 'Lease.rent',          'formatter' => 'currency', 'hiddenz' => true);
-$cols['Deposit']   = array('index' => 'Lease.deposit',       'formatter' => 'currency', 'hiddenz' => true);
+$cols['Rent']      = array('index' => 'Lease.rent',          'formatter' => 'currency');
+$cols['Deposit']   = array('index' => 'Lease.deposit',       'formatter' => 'currency');
 $cols['Signed']    = array('index' => 'Lease.lease_date',    'formatter' => 'date');
 $cols['Move-In']   = array('index' => 'Lease.movein_date',   'formatter' => 'date');
 $cols['Move-Out']  = array('index' => 'Lease.moveout_date',  'formatter' => 'date');
 $cols['Closed']    = array('index' => 'Lease.close_date',    'formatter' => 'date');
+$cols['Charge-Thru'] = array('index' => 'Lease.charge_through_date', 'formatter' => 'date');
 $cols['Paid-Thru'] = array('index' => 'Lease.paid_through_date', 'formatter' => 'date');
-$cols['Status']    = array('index' => 'status',              'formatter' => 'enum', 'width' => 100);
+$cols['Status']    = array('index' => 'status',              'formatter' => 'longenum');
 $cols['Balance']   = array('index' => 'balance',             'formatter' => 'currency');
 $cols['Comment']   = array('index' => 'Lease.comment',       'formatter' => 'comment');
 
 if (!empty($this->params['action'])) {
   if ($this->params['action'] === 'closed')
-    $grid->invalidFields(array('Paid-Thru', 'Status'));
+    $grid->invalidFields(array('Charge-Thru', 'Paid-Thru', 'Status'));
   elseif ($this->params['action'] === 'active')
     $grid->invalidFields(array('Closed'));
   elseif ($this->params['action'] === 'delinquent')
@@ -29,8 +30,8 @@ if (!empty($this->params['action'])) {
 // Render the grid
 $grid
 ->columns($cols)
-->sortField('LeaseID')
-->defaultFields(array('LeaseID', 'Lease'))
+->sortField('Lease')
+->defaultFields(array('Lease'))
 ->searchFields(array('Customer', 'Unit'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Signed', 'Status', 'Comment')));
+	 array_diff(array_keys($cols), array('Signed', 'Charge-Thru', 'Status', 'Comment')));

site/views/elements/ledger_entries.ctp

@@ -20,11 +20,11 @@ $cols['Sub-Total']      = array('index' => 'subtotal-balance',    'formatter' =>
 
 // Render the grid
 $grid
-->limit(50)
 ->columns($cols)
-->sortField('Date')
+->sortField('Date', 'DESC')
 ->defaultFields(array('Entry', 'Date', 'Amount'))
 ->searchFields(array('Customer', 'Unit'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Debit', 'Credit', 'Balance', 'Sub-Total', 'Comment')));
+	 array_diff(array_keys($cols), array('Transaction', 'Debit', 'Credit',
+					     'Balance', 'Sub-Total', 'Comment')));
 

site/views/elements/ledgers.ctp

@@ -2,9 +2,8 @@
 
 // Define the table columns
 $cols = array();
-$cols['ID']          = array('index' => 'id_sequence',         'formatter' => 'id');
-$cols['Name']        = array('index' => 'Ledger.name',         'formatter' => 'name');
 $cols['Account']     = array('index' => 'Account.name',        'formatter' => 'longname');
+$cols['Sequence']    = array('index' => 'Ledger.sequence',     'formatter' => 'id');
 $cols['Open Date']   = array('index' => 'PriorCloseTransaction.stamp',    'formatter' => 'date');
 $cols['Close Date']  = array('index' => 'CloseTransaction.stamp',         'formatter' => 'date');
 $cols['Comment']     = array('index' => 'Ledger.comment',      'formatter' => 'comment');
@@ -16,8 +15,8 @@ $cols['Balance']     = array('index' => 'balance',             'formatter' => 'c
 // Render the grid
 $grid
 ->columns($cols)
-->sortField('ID', 'ASC')
-->defaultFields(array('ID', 'Name', 'Account'))
-->searchFields(array('Account', 'Comment'))
+->sortField('Sequence')
+->defaultFields(array('Sequence'))
+->searchFields(array('Comment'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Open Date', 'Comment')));
+	 array_diff(array_keys($cols), array('Account', 'Open Date', 'Comment')));

site/views/elements/maps.ctp

@@ -2,7 +2,6 @@
 
 // Define the table columns
 $cols = array();
-$cols['ID']         = array('index' => 'Map.id',         'formatter' => 'id');
 $cols['Name']       = array('index' => 'Map.name',       'formatter' => 'longname');
 $cols['Site Area']  = array('index' => 'SiteArea.name',  'formatter' => 'longname');
 $cols['Width']      = array('index' => 'Map.width',      'formatter' => 'number');
@@ -13,7 +12,7 @@ $cols['Comment']    = array('index' => 'Map.comment',    'formatter' => 'comment
 $grid
 ->columns($cols)
 ->sortField('Name')
-->defaultFields(array('ID', 'Name'))
+->defaultFields(array('Name'))
 ->searchFields(array('Name'))
 ->render($this, isset($config) ? $config : null,
 	 array_diff(array_keys($cols), array()));

site/views/elements/sidemenu.ctp

@@ -8,17 +8,78 @@
  * @package       pmgr
  */
 
-foreach ($menu AS $item) {
-  if (isset($item['header']))
-    echo('<DIV CLASS="header">' . $item['name'] . '</DIV>' . "\n");
-  elseif (isset($item['hr']))
-    echo('<HR>' . "\n");
-  elseif (isset($item['url']))
-    echo('<DIV CLASS="item">'
-	 . $html->link($item['name'], $item['url'],
-		       isset($item['htmlAttributes']) ? $item['htmlAttributes'] : null,
-		       isset($item['confirmMessage']) ? $item['confirmMessage'] : null,
-		       isset($item['escapeTitle'])    ? $item['escapeTitle'] : null)
+// REVISIT <AP>: 20090823
+//  Add way to slide the entire menu off the page
 
-	 . '</DIV>' . "\n");
+// The sidemenu-container is necessary to define the
+// bounds as the parent of the sidemenu div, which will
+// be heavily manipulated by the accordion module.  If
+// we don't have good control over the parent, the
+// accordion will get confused and behave poorly.
+echo('<DIV ID="sidemenu-container">' . "\n");
+echo('<DIV ID="sidemenu">' . "\n");
+
+$section = 0;
+$active_section = null;
+foreach ($menu['areas'] AS $area_name => $area) {
+  if (empty($area['subareas']))
+    continue;
+
+  foreach ($area['subareas'] AS $subarea_name => $subarea) {
+    if (empty($subarea['priorities']))
+      continue;
+
+    if (!isset($active_section) &&
+	!empty($menu['active']['area']) && $area_name == $menu['active']['area'] &&
+	(empty($menu['active']['subarea']) || $subarea_name == $menu['active']['subarea']))
+      $active_section = $section;
+
+    ++$section;
+
+    echo('<H3' .
+	 //' id="sidemenu-section-'.$area_name.'-'.$subarea_name.'"' .
+	 ' class="sidemenu-header">' .
+	 $subarea['name'] .
+	 "</H3>\n");
+
+    echo('<DIV class="sidemenu-content">' . "\n");
+    foreach ($subarea['priorities'] AS $priority) {
+      foreach ($priority AS $item) {
+	if (isset($item['url'])) {
+	  echo('<DIV CLASS="sidemenu-item">'
+	       . $html->link($item['name'], $item['url'],
+			     isset($item['htmlAttributes']) ? $item['htmlAttributes'] : null,
+			     isset($item['confirmMessage']) ? $item['confirmMessage'] : null,
+			     isset($item['escapeTitle'])    ? $item['escapeTitle'] : null)
+	       . '</DIV>' . "\n");
+	}
+      }
+    }
+    echo('</DIV>' . "\n");
+  }
 }
+
+echo('</DIV>' . "\n"); // End #sidemenu
+echo('</DIV>' . "\n"); // End #sidemenu-container
+
+// Uses both hoverintent, which is a more user friendly mechanism
+// than mouseover, as well as click.  This provides 1) a workable
+// solution for those browsers that don't use pointers, such as
+// a touchscreen, and 2) a means to open the menu if the animation
+// was running while the user moved the pointer to a new menu area.
+$javascript->codeBlock(
+<<<JSCB
+jQuery(document).ready(function(){ 
+    if (jQuery("#sidemenu").accordion != null) {
+      jQuery("#sidemenu").accordion
+	({  fillSpace : true,
+	    event : "click hoverintent",
+	    animated : "bounceslide"
+JSCB
+. (isset($active_section) ? ",\n\t    active : $active_section\n" : '') .
+<<<JSCB
+	});
+    }
+  });
+JSCB
+, array('inline' => false));

site/views/elements/statement_entries.ctp

@@ -9,20 +9,19 @@ $cols['Date']           = array('index' => 'Transaction.stamp',   'formatter' =>
 $cols['Effective']      = array('index' => 'StatementEntry.effective_date', 'formatter' => 'date');
 $cols['Through']        = array('index' => 'StatementEntry.through_date',   'formatter' => 'date');
 
-$cols['Account']        = array('index' => 'Account.name',        'formatter' => 'name');
-
 $cols['Customer']       = array('index' => 'Customer.name',       'formatter' => 'longname');
 $cols['Lease']          = array('index' => 'Lease.number',        'formatter' => 'id');
 $cols['Unit']           = array('index' => 'Unit.name',           'formatter' => 'shortname');
 
 $cols['Comment']        = array('index' => 'StatementEntry.comment', 'formatter' => 'comment', 'width'=>150);
 
-$cols['Type']           = array('index' => 'StatementEntry.type', 'formatter' => 'enum', 'width'=>120);
+$cols['Type']           = array('index' => 'StatementEntry.type', 'formatter' => 'longenum');
+$cols['Account']        = array('index' => 'Account.name',        'formatter' => 'name');
 $cols['Debit']          = array('index' => 'charge',              'formatter' => 'currency');
 $cols['Credit']         = array('index' => 'disbursement',        'formatter' => 'currency');
 
 $cols['Amount']         = array('index' => "StatementEntry.amount", 'formatter' => 'currency');
-$cols['Applied']        = array('index' => "applied",             'formatter' => 'currency');
+$cols['Received']       = array('index' => "applied",             'formatter' => 'currency');
 // 'balance' is already in use as part of charge/disbursement/balance.
 // 'unapplied' isn't quite the right term, but it's not customer visible.
 $cols['Balance']        = array('index' => "unapplied",           'formatter' => 'currency');
@@ -33,17 +32,30 @@ if (isset($subtotal_column))
   $cols['Sub-Total']['index'] =
     'subtotal-' . $cols[$subtotal_column]['index'];
 
+if ((isset($action) && $action == 'unreconciled') ||
+    (isset($config) && isset($config['action']) && $config['action'] == 'unreconciled')) {
+  if (isset($config) && !isset($config['grid_div_id']))
+    $config['grid_div_id'] = 'unpaid';
+  $include_columns = array('Entry', 'Date',
+			   'Effective', 'Customer', 'Unit',
+			   'Account', 'Amount', 'Received', 'Balance');
+}
+else {
+  $include_columns =
+    array_diff(array_keys($cols),
+	       array('Transaction', 'Through', 'Lease',
+		     'Amount', 'Received', 'Balance', 'Sub-Total',
+		     'Comment'));
+}
+
 // Include custom data
 $grid->customData(compact('statement_entry_id'));
 
 // Render the grid
 $grid
 ->columns($cols)
-->sortField('Date')
+->sortField('Date', 'DESC')
 ->defaultFields(array('Entry', 'Date', 'Charge', 'Payment'))
 ->searchFields(array('Customer', 'Unit'))
-->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Through', 'Lease',
-					     'Amount', 'Applied', 'Balance', 'Sub-Total',
-					     'Comment')));
+->render($this, isset($config) ? $config : null, $include_columns);
 

site/views/elements/table.ctp

@@ -52,8 +52,8 @@ if (isset($rows) && is_array($rows) && count($rows)) {
 
   foreach ($rows AS $r => &$row) {
     foreach ($row AS $c => $col) {
-      $cell_class = implode(" ", array_merge(isset(   $row_class[$r]) ?    $row_class[$r] : array(),
-					     isset($column_class[$c]) ? $column_class[$c] : array()));
+      $cell_class = implode(" ", array_merge(empty(   $row_class[$r]) ? array() :    $row_class[$r],
+					     empty($column_class[$c]) ? array() : $column_class[$c]));
       if ($cell_class)
 	$row[$c] = array($col, array('class' => $cell_class));
     }
@@ -65,11 +65,11 @@ if (isset($rows) && is_array($rows) && count($rows)) {
 
   // OK, output the table HTML
   echo('<TABLE' .
-       (isset($id) ? ' ID="'.$id.'"' : '') .
-       (isset($class) ? ' CLASS="'.$class.'"' : '') .
+       (empty($id) ? '' : ' ID="'.$id.'"') .
+       (empty($class) ? '' : ' CLASS="'.$class.'"') .
        '>' . "\n");
 
-  if (isset($caption))
+  if (!empty($caption))
     echo('  <CAPTION>' . $caption . '</CAPTION>' . "\n");
 
   if (isset($headers) && is_array($headers)) {

site/views/elements/tenders.ctp

@@ -2,7 +2,6 @@
 
 // Define the table columns
 $cols = array();
-//$cols['ID']         = array('index' => 'Tender.id',          'formatter' => 'id');
 $cols['Date']       = array('index' => 'Transaction.stamp',  'formatter' => 'date');
 $cols['Customer']   = array('index' => 'Customer.name',      'formatter' => 'longname');
 $cols['Item']       = array('index' => 'Tender.name',        'formatter' => 'longname');
@@ -18,4 +17,4 @@ $grid
 ->defaultFields(array('Date', 'Name', 'Amount'))
 ->searchFields(array('Name', 'Type'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Sub-Total')));
+	 array_diff(array_keys($cols), array('Comment', 'Sub-Total')));

site/views/elements/transactions.ctp

@@ -1,20 +1,25 @@
 <?php /* -*- mode:PHP -*- */
 
+if (isset($include))
+  $include = is_array($include) ? $include : array($include);
+else
+  $include = array();
+
 // Define the table columns
 $cols = array();
 $cols['ID']        = array('index' => 'Transaction.id',            'formatter' => 'id');
 $cols['Type']      = array('index' => 'Transaction.type',          'formatter' => 'enum');
-//$cols['Customer']  = array('index' => 'Customer.name',             'formatter' => 'longname');
+$cols['Customer']  = array('index' => 'Customer.name',             'formatter' => 'longname');
 $cols['Timestamp'] = array('index' => 'Transaction.stamp',         'formatter' => 'date');
 $cols['Amount']    = array('index' => 'Transaction.amount',        'formatter' => 'currency');
-$cols['entries']   = array('index' => 'entries',                   'formatter' => 'number');
+$cols['Entries']   = array('index' => 'entries',                   'formatter' => 'number');
 $cols['Comment']   = array('index' => 'Transaction.comment',       'formatter' => 'comment');
 
 // Render the grid
 $grid
 ->columns($cols)
-->sortField('Timestamp')
+->sortField('Timestamp', 'DESC')
 ->defaultFields(array('ID', 'Timestamp'))
 ->searchFields(array('Type', 'Comment'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Comment')));
+	 array_merge($include, array_diff(array_keys($cols), array('Customer', 'Comment'))));

site/views/elements/unit_sizes.ctp

@@ -0,0 +1,40 @@
+<?php /* -*- mode:PHP -*- */
+
+// Define the table columns
+$cols = array();
+$cols['Size']         = array('index' => 'UnitSize.name',     'formatter' => 'shortname');
+$cols['Type']         = array('index' => 'UnitType.name',     'formatter' => 'shortname');
+$cols['Width']        = array('index' => 'UnitSize.width',    'formatter' => 'number');
+$cols['Depth']        = array('index' => 'UnitSize.depth',    'formatter' => 'number');
+$cols['Height']       = array('index' => 'UnitSize.height',   'formatter' => 'number');
+$cols['Area']         = array('index' => 'sqft',              'formatter' => 'number');
+$cols['Volume']       = array('index' => 'cuft',              'formatter' => 'number');
+$cols['Deposit']      = array('index' => 'UnitSize.deposit',  'formatter' => 'currency');
+$cols['Rent']         = array('index' => 'UnitSize.rent',     'formatter' => 'currency');
+$cols['Per Foot']     = array('index' => 'sqcost',            'formatter' => 'currency');
+$cols['Per Cubic Ft'] = array('index' => 'cucost',            'formatter' => 'currency');
+$cols['Unavailable']  = array('index' => 'unavailable',       'formatter' => 'number');
+$cols['Occupied']     = array('index' => 'occupied',          'formatter' => 'number');
+$cols['Available']    = array('index' => 'available',         'formatter' => 'number');
+$cols['Total']        = array('index' => 'units',             'formatter' => 'number');
+$cols['Occupancy']    = array('index' => 'occupancy',         'formatter' => 'percentage', 'formatoptions' => array('precision' => 0));
+$cols['Vacancy']      = array('index' => 'vacancy',           'formatter' => 'percentage', 'formatoptions' => array('precision' => 0));
+$cols['Comment']      = array('index' => 'Unit.comment',      'formatter' => 'comment');
+
+// Render the grid
+$grid
+->columns($cols)
+->sortField('Area')
+->defaultFields(array('Size', 'Area'))
+->searchFields(array('Size', 'Width', 'Depth', 'Area', 'Deposit', 'Rent'))
+->render($this, isset($config) ? $config : null,
+	 array_diff(array_keys($cols), array('Width', 'Depth',
+					     'Deposit',
+					     'Height', 'Volume',
+					     //'Per Foot',
+					     'Per Cubic Ft',
+					     'Occupied',
+					     //'Total',
+					     'Occupancy',
+					     //'Vacancy',
+					     'Comment')));

site/views/elements/units.ctp

@@ -4,20 +4,23 @@
 $cols = array();
 $cols['Sort']     = array('index' => 'Unit.sort_order', 'hidden' => true);
 $cols['Walk']     = array('index' => 'Unit.walk_order', 'formatter' => 'number');
-$cols['ID']       = array('index' => 'Unit.id',       'formatter' => 'id');
 $cols['Unit']     = array('index' => 'Unit.name',     'formatter' => 'shortname');
 $cols['Size']     = array('index' => 'UnitSize.name', 'formatter' => 'shortname');
+$cols['Area']     = array('index' => 'sqft',          'formatter' => 'number');
 $cols['Rent']     = array('index' => 'Unit.rent',     'formatter' => 'currency');
 $cols['Deposit']  = array('index' => 'Unit.deposit',  'formatter' => 'currency');
-$cols['Status']   = array('index' => 'Unit.status',   'formatter' => 'name'); // We have enough real estate
+$cols['Status']   = array('index' => 'Unit.status',   'formatter' => 'enum');
 $cols['Balance']  = array('index' => 'balance',       'formatter' => 'currency');
 $cols['Comment']  = array('index' => 'Unit.comment',  'formatter' => 'comment');
 
+if (in_array($this->params['action'], array('vacant', 'unavailable')))
+  $grid->invalidFields('Balance');
+
 // Render the grid
 $grid
 ->columns($cols)
 ->sortField('Sort')
-->defaultFields(array('Sort', 'ID', 'Unit'))
+->defaultFields(array('Sort', 'Unit'))
 ->searchFields(array('Unit', 'Size', 'Status'))
 ->render($this, isset($config) ? $config : null,
 	 array_diff(array_keys($cols), array('Walk', 'Deposit', 'Comment')));

site/views/empty.ctp

@@ -1,5 +1,3 @@
 <?php /* -*- mode:PHP -*- */
 if (!empty($message))
    echo $message;
-
-

site/views/helpers/format.php

@@ -47,6 +47,13 @@ class FormatHelper extends AppHelper {
     return $currency;
   }
 
+  function percent($amount, $precision = 2) {
+    if (!isset($amount))
+      return '-';
+
+    return self::$number->toPercentage($amount*100, $precision);
+  }
+
   function date($date, $age = false, $class = null, $time = false) {
     if (!$date) return null;
 
@@ -61,7 +68,7 @@ class FormatHelper extends AppHelper {
     $date_html = '<span class="fmt-date '.$class.'">'.$date_html.'</span>';
 
     if ($age) {
-      $date_html .= ' (' . self::age($date, $class, $time ? 0 : 60*60*24) . ')';
+      $date_html .= ' (' . self::age($date, $class, true, $time ? 0 : 60*60*24) . ')';
       $date_html = '<span class="fmt-dateage '.$class.'">'.$date_html.'</span>';
     }
 
@@ -100,7 +107,7 @@ class FormatHelper extends AppHelper {
     return $comment;
   }
 
-  function age($datetime, $class, $min_span = 0) {
+  function age($datetime, $class, $suffix = false, $min_span = 0) {
     if (!isset($datetime))
       return null;
 
@@ -207,9 +214,12 @@ class FormatHelper extends AppHelper {
 
       $age .= ' ' . self::_n($approx, $unit);
 
-      if ($backwards)
-	$age .= ' ago';
-
+      if ($suffix) {
+	if ($backwards)
+	  $age .= ' from now';
+	else
+	  $age .= ' ago';
+      }
     }
     
     $age = '<span class="fmt-age '.$class.'">'.__($age, true).'</span>';
@@ -265,14 +275,21 @@ class FormatHelper extends AppHelper {
 
 
   // Helper function to convert PHP vars to javascript
-  function phpVarToJavascript($var, $name = '', $depth='', $special = false) {
+  function phpVarToJavascript($var, $name = '', $depth='', $special = false, $pretty = false) {
 
     // Establish a prefix to use before printing $var
-    $prefix = $depth;
+    if ($pretty) {
+      $prefix = $depth;
+      $pretty_sp = " ";
+      $pretty_nl = "\n";
+    }
+    else {
+      $prefix = $pretty_sp = $pretty_nl = '';
+    }
 
     // If given a name, set it up JS style
     if ($name)
-      $prefix .= $name . ": ";
+      $prefix .= $name . ":" . $pretty_sp;
 
     if (!isset($var))
       return $prefix . 'null';
@@ -325,22 +342,22 @@ class FormatHelper extends AppHelper {
     // PHP array indices can be a mix of integer and string based.
     // Just guess here, unless flagged as a special case.
     if (isset($var[0]) || $special)
-      return ($prefix . "[\n"
-	      . implode(",\n",
+      return ($prefix . "[" . $pretty_nl
+	      . implode("," . $pretty_nl,
 			array_map(array('FormatHelper', 'phpVarToJavascript'),
 				  array_values($var),
 				  array(),
 				  array_fill(0, count($var), $depth.'   ')
 				  ))
-	      . "\n$depth]");
+	      . ($pretty ? "\n$depth" : '') . "]");
 
-    return ($prefix . "{\n"
-	    . implode(",\n",
+    return ($prefix . "{" . $pretty_nl
+	    . implode("," . $pretty_nl,
 		      array_map(array('FormatHelper', 'phpVarToJavascript'),
 				array_values($var), array_keys($var),
 				array_fill(0, count($var), $depth.'   ')
 				))
-	    . "\n$depth}");
+	    . ($pretty ? "\n$depth" : '') . "}");
   }
 
 }

site/views/helpers/grid.php

@@ -6,6 +6,7 @@ class GridHelper extends AppHelper {
   var $included, $invalid;
   var $columns;
   var $controller;
+  static $first_grid = true;
 
   function __construct() {
     $this->reset();
@@ -214,12 +215,22 @@ class GridHelper extends AppHelper {
     }
     $this->jqGrid_options['controller'] = $controller;
 
+    // Add in any custom variables requested
+    if (isset($config['custom'])) {
+      $this->customData($config['custom']);
+      unset($config['custom']);
+    }
+
     // Incorporate all other user options
     if (isset($config))
       $this->jqGrid_options = array_merge($this->jqGrid_options, $config);
 
+    // Set flag whether or not this is the first grid
+    $this->jqGrid_options['first_grid'] = self::$first_grid;
+
     //pr(compact('config') + array('jqGrid_options' => $this->jqGrid_options));
     echo $view->element('jqGrid', $this->jqGrid_options);
+    self::$first_grid = false;
 
     // Since we only have one instance of this class
     // as a helper, we must assume it could be used

site/views/layouts/default.ctp

@@ -24,27 +24,80 @@
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+   <?php
+/*    print("<!--\n"); */
+/*    print("SERVER = "); print_r($_SERVER); print("\n"); */
+/*    print("REQUEST = "); print_r($_REQUEST); print("\n"); */
+/*    print("COOKIE = "); print_r($_COOKIE); print("\n"); */
+/*    print("-->\n"); */
+   ?>
 <head>
 	<?php echo $html->charset(); ?>
 	<title>
+                <?php if (devbox()) echo "*DEVBOX* "; ?>
+                <?php if (sandbox()) echo "*SANDBOX* "; ?>
 		Property Manager: <?php echo $title_for_layout; ?>
+                <?php if (sandbox()) echo " *SANDBOX*"; ?>
+                <?php if (devbox()) echo " *DEVBOX*"; ?>
 	</title>
 	<?php
+		// Reset the __scripts variable, which has already been dumped to
+		// $scripts_for_layout.  Elements/Helpers used in the layout may
+		// also have some scripts to add.  They cannot be put into the head
+		// but we can at least put them into a relatively benign place, so
+		// scripts don't have to be dumped inline in possibly awkward spots.
+		// Oh, and yes... I know we're not supposed to be using this variable
+		// directly, and will possibly get burned someday.  Oh well, Cake
+		// hasn't left us a lot of choice, besides writing our own scripts
+		// mechanism _additional_ to what Cake has provided :-/
+		$this->__scripts = array();
+
+ 		if (!empty($_SERVER['HTTPS']))
+			$protocol = 'https://';
+		else
+			$protocol = 'http://';
+
 		echo $html->meta('icon') . "\n";
+
+		$theme = 'smoothness';
+		$theme = 'base';
+		$theme = 'dotluv';
+		$theme = 'dark-hive';
+		$theme = 'start';
+		if (devbox())
+			$theme = 'dotluv';
+		if (sandbox())
+			$theme = 'darkness';
+
 		echo $html->css('cake.generic') . "\n";
+		echo $html->css('themes/'.$theme.'/ui.all') . "\n";
 		echo $html->css('layout') . "\n";
 		echo $html->css('print', null, array('media' => 'print')) . "\n";
 		echo $html->css('sidemenu') . "\n";
-		//echo $html->css('jquery/base/ui.all') . "\n";
-		//echo $html->css('jquery/smoothness/ui.all') . "\n";
-		//echo $html->css('jquery/dotluv/ui.all') . "\n";
-		echo $html->css('jquery/start/ui.all') . "\n";
-		echo $javascript->link('jquery/jquery') . "\n";
-		echo $javascript->link('jquery/jquery-ui') . "\n";
+
+		echo $javascript->link('jquery-1.3.2.min') . "\n";
+		echo $javascript->link('jquery-ui-1.7.2.custom.min') . "\n";
+		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.js') . "\n";
+		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.js') . "\n";
+		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js') . "\n";
+		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js') . "\n";
 		echo $javascript->link('jquery.form') . "\n";
+		echo $javascript->link('jquery.hoverIntent') . "\n";
 		echo $javascript->link('pmgr') . "\n";
 		echo $scripts_for_layout . "\n";
 	?>
+
+	<?php if ($this->params['action'] !== 'INTERNAL_ERROR'): ?>
+	<script type="text/javascript"><!--
+	if (typeof(jQuery) == 'undefined') {
+		window.location.href =
+			"<?php echo $html->url(array('controller' => 'util',
+			                   'action'     => 'INTERNAL_ERROR',
+	                                   'jQuery NOT LOADED!')); ?>";
+	}
+	--></script>
+	<?php endif; ?>
+
 </head>
 <body>
 
@@ -89,5 +142,7 @@
 <?php echo $cakeDebug; ?>
 <?php /* pr($this); */ ?>
 
+<?php echo implode("\n", $this->__scripts) . "\n"; ?>
+
 </body>
 </html>

site/views/leases/invoice.ctp

@@ -10,6 +10,7 @@ $customer = $lease['Customer'];
 if (isset($lease['Lease']))
   $lease = $lease['Lease'];
 
+//pr(compact('unit', 'customer', 'lease', 'movein'));
 
 /**********************************************************************
  **********************************************************************
@@ -25,27 +26,72 @@ Configure::write('debug', '0');
 
 <script type="text/javascript"><!--
 
+  var lease_charge_through;
+
   // prepare the form when the DOM is ready 
   $(document).ready(function() { 
-      var options = { 
+    var options = { 
       target:        '#output-debug',   // target element(s) to be updated with server response 
       beforeSubmit:  verifyRequest,  // pre-submit callback 
       success:       showResponse,  // post-submit callback 
- 
+
       // other available options: 
       //clearForm: true,        // clear all form fields after successful submit 
       //resetForm: true,        // reset the form after successful submit 
-      }; 
 
-      // bind form using 'ajaxForm' 
+      url: "<?php echo $html->url(array('controller' => 'transactions',
+					'action' => 'postInvoice', 0)); ?>"
+      };
+
+    // bind form using 'ajaxForm' 
+    if ($('#invoice-form').ajaxForm != null)
       $('#invoice-form').ajaxForm(options); 
-    }); 
+    else
+      $('#repeat, label[for=repeat]').remove();
+    });
  
 // pre-submit callback 
 function verifyRequest(formData, jqForm, options) { 
+  //$("#debug").html('');
+  for (var i = 0; i < formData.length; ++i) {
+    //$("#debug").append(i + ') ' + dump(formData[i]) + '<BR>');
+    if (formData[i]['name'] == "data[Lease][id]" &&
+	!(formData[i]['value'] > 0)) {
+      //$("#debug").append('<P>Missing Lease ID');
+      alert("Must select a lease first");
+      return false;
+    }
+
+    if (formData[i]['name'] == "data[Transaction][stamp]" &&
+	formData[i]['value'] == '') {
+      //$("#debug").append('<P>Bad Stamp');
+      if (formData[i]['value'] != '')
+	alert(formData[i]['value'] + " is not valid date stamp.  Please correct it.");
+      else
+	alert("Please enter a valid date stamp first.");
+      return false;
+    }
+
+    // Terrible way to accomplish this...
+    for (var j = 0; j < 20; ++j) {
+      if (formData[i]['name'] == "data[Entry]["+j+"][amount]") {
+	var val = formData[i]['value'].replace(/\$/,'');
+	//$("#debug").append('<P>Bad Amount');
+	if (!(val > 0)) {
+	  if (formData[i]['value'] == '')
+	    alert("Please enter an amount for Charge #"+j+", or remove the Charge completely.");
+	  else
+	    alert('"'+formData[i]['value']+'"' + " is not a valid amount for Charge #"+j+".  Please correct it.");
+	  return false;
+	}
+      }
+    }
+  }
+
+  //$("#debug").append('OK');
+  //return false;
+
   $('#results').html('Working <BLINK>...</BLINK>');
-  // here we could return false to prevent the form from being submitted; 
-  // returning anything other than false will allow the form submit to continue 
   return true; 
 } 
  
@@ -65,13 +111,13 @@ function showResponse(responseText, statusText)  {
     if (!$("#repeat").attr("checked")) {
       window.location.href =
       <?php if (empty($movein)): ?>
-	"<?php echo $html->url(array('controller' => 'leases',
+	"<?php echo $html->url(array('controller' => 'customers',
 		                     'action'     => 'view')); ?>"
-	+ "/" + $("#lease-id").val();
+	+ "/" + $("#customer-id").val();
       <?php else: ?>
 	"<?php echo $html->url(array('controller' => 'customers',
 		                     'action'     => 'receipt')); ?>"
-	+ "/" + $("#lease-id").val();
+	+ "/" + $("#customer-id").val();
       <?php endif; ?>
       return;
     }
@@ -98,21 +144,9 @@ function resetForm(nocharge) {
 function onRowSelect(grid_id, lease_id) {
   // Set the item id that will be returned with the form
   $("#lease-id").val(lease_id);
+  $("#customer-id").val($(grid_id).getCell(lease_id, 'Customer-id'));
 
-  // Get the item names from the grid
-  //$("#invoice-lease").html($(grid_id).getCell(lease_id, 'Lease-number'));
-  // REVISIT <AP>: 20090708
-  //   This is not intended as a long term solution,
-  //   but I need a way to enter data and then view
-  //   the results.  This link will help.
-  $("#invoice-lease").html('<A HREF="' +
-			   "<?php echo $html->url(array('controller' => 'leases',
-		                                        'action'     => 'view')); ?>"
-			   + "/" +
-			   $(grid_id).getCell(lease_id, 'Lease-id').replace(/^#/,'') +
-			   '">' +
-			   $(grid_id).getCell(lease_id, 'Lease-number') +
-			   '</A>');
+  $("#invoice-lease").html($(grid_id).getCell(lease_id, 'Lease-number'));
   $("#invoice-unit").html($(grid_id).getCell(lease_id, 'Unit-name'));
   $("#invoice-customer").html($(grid_id).getCell(lease_id, 'Customer-name'));
   $("#invoice-rent").html($(grid_id).getCell(lease_id, 'Lease-rent'));
@@ -120,6 +154,7 @@ function onRowSelect(grid_id, lease_id) {
   $("#invoice-deposit").html($(grid_id).getCell(lease_id, 'Lease-deposit')
 			     ? $(grid_id).getCell(lease_id, 'Lease-deposit')
 			     : '-');
+  lease_charge_through = $(grid_id).getCell(lease_id, 'Lease-charge_through_date')
 
   // Hide the "no lease" message and show the current lease
   $(".lease-selection-invalid").hide();
@@ -145,6 +180,78 @@ function onGridState(grid_id, state) {
   }
 }
 
+function setNextRent(id) {
+  var chg_thru;
+  $('.ChargeForm').each( function(i) {
+      if ($('.ChargeFormThroughDate', this).attr('id') == 'Entry'+id+'ThroughDate')
+	return;
+
+      if ($('.ChargeFormAccount option:selected', this).val() == <?php echo $rentAccount ?>
+	  && $('.ChargeFormThroughDate', this).val()) {
+	var dt = new Date($('.ChargeFormThroughDate', this).val());
+	//$('#debug').append('Rent in ' + i + '; date ' + dt + '<BR>');
+	if (chg_thru == null || dt > chg_thru)
+	  chg_thru = dt;
+      }
+    });
+
+  if (!chg_thru)
+    chg_thru = new Date(lease_charge_through);
+
+  if (chg_thru < dateEOM(chg_thru)) {
+    // Add a charge to finish out the month
+    datepickerSet('Entry'+id+'EffectiveDate', dateTomorrow(chg_thru));
+    datepickerSet('Entry'+id+'ThroughDate',   dateEOM(chg_thru));
+  } else {
+    // Add a whole month's charge for next month
+    datepickerSet('Entry'+id+'EffectiveDate', dateNextBOM(chg_thru));
+    datepickerSet('Entry'+id+'ThroughDate',   dateNextEOM(chg_thru));
+  }
+
+  // Now add in the amount owed based on the calculated
+  // effective and through dates.
+  prorate(id);
+}
+
+function prorate(id) {
+  var edt = datepickerGet('Entry'+id+'EffectiveDate');
+  var tdt = datepickerGet('Entry'+id+'ThroughDate');
+  var rent = $('#invoice-rent').html().replace(/\$/,'');
+
+  // Reset the comment.  It might wipe out a user comment,
+  // but it's probably low risk/concern
+  $('#Entry'+id+'Comment').val('');
+
+  if (edt == null || tdt == null) {
+    alert('Can only prorate with both effective and through dates');
+    rent = 0;
+  }
+  else if (edt > tdt) {
+    alert('Effective date is later than the Through date');
+    rent = 0;
+  }
+  else if (tdt.getMonth() == edt.getMonth() + 1 && 
+	   edt.getDate()   == tdt.getDate()  + 1) {
+    // appears to be anniversary billing, one full cycle
+  }
+  else if (edt.getTime() == dateBOM(edt).getTime() &&
+	   tdt.getTime() == dateEOM(edt).getTime()) {
+    // appears to be one full month
+  }
+  else {
+    var one_day=1000*60*60*24;
+    var days = Math.ceil((tdt.getTime()-edt.getTime()+1)/(one_day));
+    var dim = 
+      ((edt.getMonth() == tdt.getMonth())
+       ? dateEOM(edt).getDate() // prorated within the month.
+       : 30); // prorated across months.
+    rent *= days / dim;
+    $('#Entry'+id+'Comment').val('Rent proration: '+days+'/'+dim+' days');
+  }
+
+  $('#Entry'+id+'Amount').val(fmtCurrency(rent));
+}
+
 function addChargeSource(flash) {
   var id = $("#charge-entry-id").val();
   addDiv('charge-entry-id', 'charge', 'charges', flash,
@@ -156,26 +263,32 @@ function addChargeSource(flash) {
 	 echo FormatHelper::phpVarToJavascript
 	 ($this->element('form_table',
 			 array('id' => 'Entry%{id}Form',
-			       'class'  => "item invoice ledger-entry entry",
+			       'class'  => "ChargeForm item invoice ledger-entry entry",
 			       //'with_name_after' => ':',
 			       'field_prefix' => 'Entry.%{id}',
 			       'fields' => array
 			       ("account_id"  => array('name' => 'Account',
 						       'opts' =>
-						       array('options' => $chargeAccounts,
+						       array('class' => 'ChargeFormAccount',
+							     'options' => $chargeAccounts,
 							     'value' => $defaultAccount,
 							     ),
+						       'between' => '<A HREF="#" ONCLICK="setNextRent(\'%{id}\'); return false;">Rent</A>',
 						       ),
 				"effective_date" => array('opts' =>
-							  array('type' => 'text'),
+							  array('class' => 'ChargeFormEffectiveDate',
+								'type' => 'text'),
 							  'between' => '<A HREF="#" ONCLICK="datepickerBOM(\'TransactionStamp\',\'Entry%{id}EffectiveDate\'); return false;">BOM</A>',
 							),
 				"through_date" => array('opts' =>
-							array('type' => 'text'),
+							array('class' => 'ChargeFormThroughDate',
+							      'type' => 'text'),
 							'between' => '<A HREF="#" ONCLICK="datepickerEOM(\'Entry%{id}EffectiveDate\',\'Entry%{id}ThroughDate\'); return false;">EOM</A>',
 							),
-				"amount"       => array('opts' => array('class' => 'invoice amount')),
-				"comment"      => array('opts' => array('size' => 50)),
+				"amount"       => array('opts' => array('class' => 'ChargeFormAmount invoice amount'),
+							'between' => '<A HREF="#" ONCLICK="prorate(\'%{id}\'); return false;">Prorate</A>',
+							),
+				"comment"      => array('opts' => array('class' => 'ChargeFormComment', 'size' => 50)),
 				),
 			       ))) . "+\n";
 	 ?>
@@ -183,19 +296,8 @@ function addChargeSource(flash) {
 	 '</FIELDSET>'
 	 );
 
-  $("#Entry"+id+"EffectiveDate")
-    .attr('autocomplete', 'off')
-    .datepicker({ constrainInput: true,
-	          numberOfMonths: [1, 1],
-	          showCurrentAtPos: 0,
-                  dateFormat: 'mm/dd/yy' });
-
-  $("#Entry"+id+"ThroughDate")
-    .attr('autocomplete', 'off')
-    .datepicker({ constrainInput: true,
-	          numberOfMonths: [1, 1],
-	          showCurrentAtPos: 0,
-                  dateFormat: 'mm/dd/yy' });
+  datepicker("Entry"+id+"EffectiveDate");
+  datepicker("Entry"+id+"ThroughDate");
 
   return id;
   }
@@ -222,6 +324,9 @@ if (empty($movein))
 					       array('gridstate' =>
 						     'onGridState("#"+$(this).attr("id"), gridstate)'),
 					       ),
+			'include' => array('Charge-Thru'),
+			'exclude' => array('Closed', 'Paid-Thru'),
+			'action' => 'active',
 			'nolinks' => true,
 			'limit' => 10,
 			)));
@@ -258,6 +363,11 @@ echo $form->input("Lease.id",
 			'type' => 'hidden',
 			'value' => 0));
 
+echo $form->input("Customer.id",
+		  array('id' => 'customer-id',
+			'type' => 'hidden',
+			'value' => 0));
+
 /* echo '<fieldset CLASS="invoice">' . "\n"; */
 /* echo ' <legend>Invoice</legend>' . "\n"; */
 
@@ -311,20 +421,46 @@ Configure::write('debug', '0');
     $('tr td:nth-child('+col+'), tr th:nth-child('+col+')', this).remove();
   };
 
-  $(document).ready(function(){
-      $("#TransactionStamp")
-	.attr('autocomplete', 'off')
-	.datepicker({ constrainInput: true,
-	              numberOfMonths: [1, 1],
-	              showCurrentAtPos: 0,
-                      dateFormat: 'mm/dd/yy' });
+  function addHidden(id, fld, name) {
+    $('#Entry'+id+fld).after
+      ('<input type="hidden"' +
+       ' name="data[Entry]['+id+']['+name+']"' +
+       ' value="' + $('#Entry'+id+fld).val() + '">');
+  }
 
+  $(document).ready(function(){
+      datepicker('TransactionStamp');
+
+      <?php if (isset($lease['id'])): ?>
+      $("#lease-id").val(<?php echo $lease['id']; ?>);
+      $("#customer-id").val(<?php echo $customer['id']; ?>);
+
+      $("#invoice-lease").html("<?php echo '#'.$lease['number']; ?>");
+      $("#invoice-unit").html("<?php echo $unit['name']; ?>");
+      $("#invoice-customer").html("<?php echo $customer['name']; ?>");
+      $("#invoice-rent").html("<?php echo FormatHelper::currency($lease['rent']); ?>");
+      $("#invoice-late").html("<?php echo FormatHelper::currency($defaultLate); ?>");
+      $("#invoice-deposit").html("<?php echo FormatHelper::currency($lease['deposit']); ?>");
+      lease_charge_through = <?php
+	if ($lease['charge_through_date'])
+	  echo 'new Date("'.date('m/d/Y', strtotime($lease['charge_through_date'])).'")';
+	elseif ($lease['paid_through_date'])
+	  echo 'new Date("'.date('m/d/Y', strtotime($lease['paid_through_date'])).'")';
+	else
+	  echo 'dateYesterday("'.date('m/d/Y', strtotime($lease['movein_date'])).'")';
+      ?>;
+
+      <?php else: ?>
+      $("#lease-id").val(0);
+      $("#customer-id").val(<?php echo empty($movein) ? 0 : $customer['id']; ?>);
       $("#invoice-lease").html("INTERNAL ERROR");
       $("#invoice-unit").html("INTERNAL ERROR");
       $("#invoice-customer").html("INTERNAL ERROR");
       $("#invoice-rent").html("INTERNAL ERROR");
       $("#invoice-late").html("INTERNAL ERROR");
       $("#invoice-deposit").html("INTERNAL ERROR");
+      <?php endif; ?>
+
 
       <?php if (empty($movein)): ?>
 
@@ -336,12 +472,12 @@ Configure::write('debug', '0');
       var id;
       resetForm(true);
 
-      $("#TransactionStamp").datepicker('disable');
+      $("#TransactionStamp").attr('disabled', true);
       $("#TransactionStamp").val("<?php echo date('m/d/Y', $movein['time']); ?>");
       $('#TransactionStamp').after
 	('<input type="hidden"' +
 	 ' name="data[Transaction][stamp]"' +
-	 ' value="<?php echo date('m/d/Y', $movein['time']); ?>">');
+	 ' value="' + $("#TransactionStamp").val() + '">');
       $("#TransactionComment").val('Move-In Charges');
 
       <?php if ($movein['deposit'] != 0): ?>
@@ -349,69 +485,28 @@ Configure::write('debug', '0');
       $('#Entry'+id+'Form').removeCol(2);
       $('#Entry'+id+'Form input, #Entry'+id+'Form select').attr('disabled', true);
       $('#Entry'+id+'EffectiveDate').val("<?php echo date('m/d/Y', $movein['effective_time']); ?>");
-      $('#Entry'+id+'EffectiveDate').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][effective_date]"' +
-	 ' value="<?php echo date('m/d/Y', $movein['effective_time']); ?>">');
+      addHidden(id, 'EffectiveDate', 'effective_date');
       $('#Entry'+id+'AccountId').val(<?php echo $securityDepositAccount; ?>);
-      $('#Entry'+id+'AccountId').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][account_id]"' +
-	 ' value="<?php echo $securityDepositAccount; ?>">');
+      addHidden(id, 'AccountId', 'account_id');
       $('#Entry'+id+'Amount').val("<?php echo FormatHelper::currency($movein['deposit']); ?>");
-      $('#Entry'+id+'Amount').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][amount]"' +
-	 ' value="<?php echo FormatHelper::currency($movein['deposit']); ?>">');
-      //$('#Entry'+id+'Comment').val('Move-In Security Deposit');
+      addHidden(id, 'Amount', 'amount');
       $('#Entry'+id+'Comment').removeAttr('disabled');
       <?php endif; ?>
 
       id = addChargeSource(false);
       $('#Entry'+id+'Form').removeCol(2);
       $('#Entry'+id+'Form input, #Entry'+id+'Form select').attr('disabled', true);
-      $('#Entry'+id+'EffectiveDate').val("<?php echo date('m/d/Y', $movein['effective_time']); ?>");
-      $('#Entry'+id+'EffectiveDate').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][effective_date]"' +
-	 ' value="<?php echo date('m/d/Y', $movein['effective_time']); ?>">');
-      $('#Entry'+id+'ThroughDate').val("<?php echo date('m/d/Y', $movein['through_time']); ?>");
-      $('#Entry'+id+'ThroughDate').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][through_date]"' +
-	 ' value="<?php echo date('m/d/Y', $movein['through_time']); ?>">');
-      $('#Entry'+id+'AccountId').val(<?php echo $rentAccount; ?>);
-      $('#Entry'+id+'AccountId').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][account_id]"' +
-	 ' value="<?php echo $rentAccount; ?>">');
-      $('#Entry'+id+'Amount').val("<?php echo FormatHelper::currency($movein['prorated_rent']); ?>");
-      $('#Entry'+id+'Amount').after
-	('<input type="hidden"' +
-	 ' name="data[Entry]['+id+'][amount]"' +
-	 ' value="<?php echo FormatHelper::currency($movein['prorated_rent']); ?>">');
-      $('#Entry'+id+'Comment').val("<?php echo($movein['prorated'] ? 'Move-In Rent (Prorated)' : ''); ?>");
+      setNextRent(id);
+      addHidden(id, 'EffectiveDate', 'effective_date');
+      addHidden(id, 'ThroughDate', 'through_date');
+      addHidden(id, 'AccountId', 'account_id');
+      addHidden(id, 'Amount', 'amount');
       $('#Entry'+id+'Comment').removeAttr('disabled');
 
       <?php endif; ?>
 
 
       <?php if (isset($lease['id'])): ?>
-      $("#lease-id").val(<?php echo $lease['id']; ?>);
-      //$("#invoice-lease").html("<?php echo '#'.$lease['number']; ?>");
-      $("#invoice-lease").html('<A HREF="' +
-			       "<?php echo $html->url(array('controller' => 'leases',
-		                                            'action'     => 'view')); ?>"
-			       + "/" +
-			       "<?php echo $lease['id']; ?>" +
-			       '">#' +
-			       "<?php echo $lease['number']; ?>" +
-			       '</A>');
-      $("#invoice-unit").html("<?php echo $unit['name']; ?>");
-      $("#invoice-customer").html("<?php echo $customer['name']; ?>");
-      $("#invoice-rent").html("<?php echo FormatHelper::currency($lease['rent']); ?>");
-      $("#invoice-late").html("<?php echo FormatHelper::currency($defaultLate); ?>");
-      $("#invoice-deposit").html("<?php echo FormatHelper::currency($lease['deposit']); ?>");
       onGridState(null, 'hidden');
       <?php else: ?>
       onGridState(null, 'visible');

site/views/leases/move.ctp

@@ -26,14 +26,53 @@ $move_type   = preg_replace("/.*_/", "", $this->action);
 // Reset the form
 function resetForm() {
   $("#customer-id").val(0);
-  $("#move-customer").html("INTERNAL ERROR");
   $("#unit-id").val(0);
+  $("#lease-id").val(0);
+  $("#move-customer").html("INTERNAL ERROR");
   $("#move-unit").html("INTERNAL ERROR");
+  $("#move-lease").html("INTERNAL ERROR");
   datepickerNow('LeaseMoveDate', false);
 }
 
+// pre-submit callback 
+function verifyRequest() { 
+  //$("#debug").html('');
+  <?php if ($move_type === 'out'): ?>
+
+  if (!($("#lease-id").val() > 0)) {
+    //$("#debug").append('<P>Missing Lease ID');
+    alert("Please select the lease");
+    return false;
+  }
+
+  <?php else: ?>
+
+  if (!($("#customer-id").val() > 0)) {
+    //$("#debug").append('<P>Missing Customer ID');
+    alert("Please select the customer");
+    return false;
+  }
+
+  if (!($("#unit-id").val() > 0)) {
+    //$("#debug").append('<P>Missing Unit ID');
+    alert("Please select the unit");
+    return false;
+  }
+
+  <?php endif; ?>
+
+  //$("#debug").append('OK');
+  //return false;
+
+  return true; 
+} 
+
 function onRowSelect(grid_id, item_type, item_id) {
-  cell_name = item_type.charAt(0).toUpperCase() + item_type.substr(1) + "-name";
+  cell_name = item_type.charAt(0).toUpperCase() + item_type.substr(1);
+  if (item_type == 'lease')
+    cell_name += "-number";
+  else
+    cell_name += "-name";
 
   // Set the item id that will be returned with the form
   $("#"+item_type+"-id").val(item_id);
@@ -47,6 +86,22 @@ function onRowSelect(grid_id, item_type, item_id) {
     $("#LeaseDeposit").val($(grid_id).getCell(item_id, 'Unit-deposit'));
   }
 
+  // If a unit was selected, update the "Create new customer" link
+  if (item_type == 'unit') {
+    $("#customer-selection-new-url").attr
+      ('href',
+       "<?php echo
+        $html->url(array('controller' => 'customers',
+	 		 'action'     => 'add')); ?>"
+       + '/' + $("#unit-id").val());
+  }
+
+  // If a lease was selected, update the customer and unit
+  if (item_type == 'lease') {
+    $("#move-unit").html($(grid_id).getCell(item_id, 'Unit-name'));
+    $("#move-customer").html($(grid_id).getCell(item_id, 'Customer-name'));
+  }
+
   // Hide the "no customer" message and show the current customer
   $("."+item_type+"-selection-invalid").hide();
   $("."+item_type+"-selection-valid").show();
@@ -56,12 +111,12 @@ function onRowSelect(grid_id, item_type, item_id) {
 
 function onGridState(grid_id, item_type, state) {
   if (state == 'visible') {
+    $("."+item_type+"-selection-new").show();
     $("."+item_type+"-selection-invalid").hide();
     $("."+item_type+"-selection-valid").hide();
   }
   else {
-    //if ($(grid_id).getGridParam("selrow"))
-    //alert("id:" + $("#"+item_type+"-id").val());
+    $("."+item_type+"-selection-new").hide();
     if ($("#"+item_type+"-id").val() > 0) {
       $("."+item_type+"-selection-invalid").hide();
       $("."+item_type+"-selection-valid").show();
@@ -78,7 +133,42 @@ function onGridState(grid_id, item_type, state) {
 <?php
 ; // align
 
-if ($move_type !== 'out') {
+if ($move_type === 'out') {
+  echo $this->element('leases', array
+		      ('config' => array
+		       ('grid_div_id' => 'leases-list',
+			'grid_div_class' => 'text-below',
+			'caption' => ('<A HREF="#" ONCLICK="$(\'#leases-list .HeaderButton\').click();'.
+				      ' return false;">Select Lease</A>'),
+			'grid_setup' => array('hiddengrid' => isset($lease['id'])),
+			'grid_events' => array('onSelectRow' =>
+					       array('ids' =>
+						     'if (ids != null){onRowSelect("#"+$(this).attr("id"), "lease", ids);}'),
+					       'onHeaderClick' =>
+					       array('gridstate' =>
+						     'onGridState("#"+$(this).attr("id"), "lease", gridstate)'),
+					       ),
+			'exclude' => array('Closed'),
+			'action' => 'active',
+			'nolinks' => true,
+			'limit' => 10,
+			)));
+
+  echo ('<DIV CLASS="move-inout grid-selection-text">' .
+
+	'<DIV CLASS="lease-selection-valid" style="display:none">' .
+	'Lease <SPAN id="move-lease"></SPAN>' . ' / ' .
+	'Unit: <SPAN id="move-unit"></SPAN>' . ' / ' .
+	'Customer: <SPAN id="move-customer"></SPAN>' .
+	'</DIV>' .
+
+	'<DIV CLASS="lease-selection-invalid" style="display:none">' .
+	'Please select lease' .
+	'</DIV>' .
+
+	'</DIV>' . "\n");
+}
+else {
   echo $this->element('customers', array
 		      ('config' => array
 		       ('grid_div_id' => 'customers-list',
@@ -96,22 +186,27 @@ if ($move_type !== 'out') {
 			'nolinks' => true,
 			'limit' => 10,
 			)));
-}
 
-echo ('<DIV CLASS="move-inout grid-selection-text">' .
+  echo ('<DIV CLASS="move-inout grid-selection-text">' .
 
-      '<DIV CLASS="customer-selection-valid" style="display:none">' .
-      'Customer: <SPAN id="move-customer"></SPAN>' .
-      '</DIV>' .
+	'<DIV CLASS="customer-selection-new" style="display:none">' .
+	$html->link('Create a new Customer',
+		    array('controller' => 'customers',
+			  'action'     => 'add',
+			  (empty($unit['id']) ? null : $unit['id'])),
+		    array('id' => 'customer-selection-new-url')) .
+	'</DIV>' .
 
-      '<DIV CLASS="customer-selection-invalid" style="display:none">' .
-      'Please select customer' .
-      '</DIV>' .
+	'<DIV CLASS="customer-selection-valid" style="display:none">' .
+	'Customer: <SPAN id="move-customer"></SPAN>' .
+	'</DIV>' .
 
-      '</DIV>' . "\n");
+	'<DIV CLASS="customer-selection-invalid" style="display:none">' .
+	'Please select customer' .
+	'</DIV>' .
 
+	'</DIV>' . "\n");
 
-if ($move_type !== 'out') {
   echo $this->element('units', array
 		      ('config' => array
 		       ('grid_div_id' => 'units-list',
@@ -132,39 +227,41 @@ if ($move_type !== 'out') {
 			'nolinks' => true,
 			'limit' => 10,
 			)));
+
+  echo ('<DIV CLASS="move-inout grid-selection-text">' .
+
+	'<DIV CLASS="unit-selection-valid" style="display:none">' .
+	'Unit: <SPAN id="move-unit"></SPAN>' .
+	'</DIV>' .
+
+	'<DIV CLASS="unit-selection-invalid" style="display:none">' .
+	'Please select unit' .
+	'</DIV>' .
+
+	'</DIV>' . "\n");
 }
 
-echo ('<DIV CLASS="move-inout grid-selection-text">' .
-
-      '<DIV CLASS="unit-selection-valid" style="display:none">' .
-      'Unit: <SPAN id="move-unit"></SPAN>' .
-      '</DIV>' .
-
-      '<DIV CLASS="unit-selection-invalid" style="display:none">' .
-      'Please select unit' .
-      '</DIV>' .
-
-      '</DIV>' . "\n");
-
 echo $form->create(null, array('id' => 'move-inout-form',
+			       'onsubmit' => 'return verifyRequest();',
 			       'url' => array('controller' => 'leases',
 					      'action' => $move_action)));
 
-echo $form->input("Lease.customer_id",
-		  array('id' => 'customer-id',
-			'type' => 'hidden',
-			'value' => 0));
-
-echo $form->input("Lease.unit_id",
-		  array('id' => 'unit-id',
-			'type' => 'hidden',
-			'value' => 0));
-
 if ($move_type === 'out') {
   echo $form->input('Lease.id',
-		    array('type' => 'hidden',
-			  'value' => $lease['id'],
-			  ));
+		    array('id' => 'lease-id',
+			  'type' => 'hidden',
+			  'value' => 0));
+}
+else {
+  echo $form->input("Lease.customer_id",
+		    array('id' => 'customer-id',
+			  'type' => 'hidden',
+			  'value' => 0));
+
+  echo $form->input("Lease.unit_id",
+		    array('id' => 'unit-id',
+			  'type' => 'hidden',
+			  'value' => 0));
 }
 
 echo $this->element('form_table',
@@ -219,15 +316,23 @@ echo $form->end('Perform Move ' . ucfirst($move_type));
 
 <script type="text/javascript"><!--
   $(document).ready(function(){
-      $("#LeaseMoveDate")
-	.attr('autocomplete', 'off')
-	.datepicker({ constrainInput: true,
-	              numberOfMonths: [1, 1],
-	              showCurrentAtPos: 0,
-                      dateFormat: 'mm/dd/yy' });
-
+      datepicker('LeaseMoveDate');
       resetForm();
 
+      <?php if ($move_type === 'out') { ?>
+
+      <?php if (isset($lease['id'])): ?>
+      $("#lease-id").val(<?php echo $lease['id']; ?>);
+      $("#move-lease").html("#<?php echo $lease['number']; ?>");
+      $("#move-customer").html("<?php echo $customer['name']; ?>");
+      $("#move-unit").html("<?php echo $unit['name']; ?>");
+      onGridState(null, 'lease', 'hidden');
+      <?php else: ?>
+      onGridState(null, 'lease', 'visible');
+      <?php endif; ?>
+
+      <?php } else { /* end (move_type === 'out') */ ?>
+
       <?php if (isset($customer['id'])): ?>
       $("#customer-id").val(<?php echo $customer['id']; ?>);
       $("#move-customer").html("<?php echo $customer['name']; ?>");
@@ -243,6 +348,10 @@ echo $form->end('Perform Move ' . ucfirst($move_type));
       <?php else: ?>
       onGridState(null, 'unit', 'visible');
       <?php endif; ?>
+
+      <?php } /* end (move_type === 'out') */ ?>
+
+
   });
 --></script>
 

site/views/leases/overview.ctp

@@ -0,0 +1,74 @@
+<?php /* -*- mode:PHP -*- */
+
+echo '<div class="lease overview">' . "\n";
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Overview Main Section
+ */
+
+/*
+$rows = array();
+$rows[] = array('',         FormatHelper::currency($overview['']));
+
+echo $this->element('table',
+                    array('class'   => 'item lease detail',
+                          'caption' => '',  
+                          'rows'    => $rows,
+                          'column_class' => array('field', 'value')));
+*/
+
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Supporting Elements Section
+ */
+
+echo '<div CLASS="detail supporting">' . "\n";
+
+$headers = array('', 'Count');
+$row_class = array();
+$rows = array();
+foreach ($overview['months'] AS $month) {
+    $row_class[] = 'subheader';
+    $rows[] = array($month['name']);
+
+    $odd = 1;
+    $row_class[] = array('subitem', $odd ? 'oddrow' : 'evenrow');
+    $rows[] = array('Beginning of Month', $month['start']); $odd = !$odd;
+    $row_class[] = array('subitem', $odd ? 'oddrow' : 'evenrow');
+    $rows[] = array('+ Move-Ins', $month['movein']); $odd = !$odd;
+    $row_class[] = array('subitem', $odd ? 'oddrow' : 'evenrow');
+    $rows[] = array('- Move-Outs', $month['moveout']); $odd = !$odd;
+
+    $row_class[] = 'grand';
+    $rows[] = array('End of ' . $month['name'], $month['finish']);
+}
+
+echo $this->element('table',
+                    array('class'   => 'item lease-overview overview list',
+                          'caption' => 'Leased Units By Month',
+                          'headers' => $headers,
+                          'rows'    => $rows,
+                          'row_class' => $row_class,
+                          'suppress_alternate_rows' => true
+                          ));
+
+?>
+<script type="text/javascript"><!--
+jQuery(document).ready(function(){ 
+        jQuery('table.overview td.subheader').attr('colSpan', 2);
+});
+--></script>
+<?php
+
+
+/* End "detail supporting" div */
+echo '</div>' . "\n";
+
+/* End page div */
+echo '</div>' . "\n";

site/views/leases/view.ctp

@@ -18,7 +18,6 @@ if (isset($lease['Lease']))
 
 $rows = array();
 
-$rows[] = array('ID',               $lease['id']);
 $rows[] = array('Number',           $lease['number']);
 $rows[] = array('Lease Type',       $lease_type['name']);
 $rows[] = array('Unit',             $html->link($unit['name'],
@@ -79,6 +78,21 @@ echo '</div>' . "\n";
 echo '<div CLASS="detail supporting">' . "\n";
 
 
+/**********************************************************************
+ * Unpaid Charges
+ */
+
+echo $this->element('statement_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Outstanding Charges',
+		      'limit'   => 10,
+		      'action'  => 'unreconciled',
+		      'filter'  => array('StatementEntry.lease_id' => $lease['id']),
+		      'exclude' => array('Customer', 'Unit'),
+		      )));
+
+
 /**********************************************************************
  * Lease Account History
  */
@@ -87,30 +101,9 @@ echo $this->element('statement_entries', array
 		    (// Grid configuration
 		     'config' => array
 		     ('caption' => 'Lease Statement',
-		      'filter' => array('Lease.id' => $lease['id']),
+		      'filter'  => array('Lease.id' => $lease['id']),
 		      'include' => array('Through'),
 		      'exclude' => array('Customer', 'Lease', 'Unit'),
-		      'sort_column' => 'Effective',
-		      'sort_order'  => 'DESC',
-		      )));
-
-
-/**********************************************************************
- * Receipt History
- */
-
-echo $this->element('ledger_entries', array
-		    (// Grid configuration
-		     'config' => array
-		     ('caption' => 'Customer Receipts',
-		      'filter' => array('Customer.id' => $customer['id'],
-					'Transaction.type' => 'RECEIPT',
-					'Tender.id !=' => null,
-					//'Account.id !=' => '-AR-'
-					),
-		      'exclude' => array('Account', 'Cr/Dr'),
-		      'sort_column' => 'Date',
-		      'sort_order'  => 'DESC',
 		      )));
 
 

site/views/ledger_entries/view.ctp

@@ -33,7 +33,7 @@ $rows[] = array('Account',          $html->link($account['name'],
 						array('controller' => 'accounts',
 						      'action'     => 'view',
 						      $account['id'])));
-$rows[] = array('Ledger',           $html->link($ledger['name'],
+$rows[] = array('Ledger',           $html->link('#' . $ledger['sequence'],
 						array('controller' => 'ledgers',
 						      'action'     => 'view',
 						      $ledger['id'])));

site/views/ledgers/view.ctp

@@ -16,8 +16,6 @@ if (isset($ledger['Ledger']))
   $ledger = $ledger['Ledger'];
 
 $rows = array();
-$rows[] = array('ID',       $ledger['id']);
-$rows[] = array('Name',     $ledger['name']);
 $rows[] = array('Account',  $html->link($account['name'],
 					array('controller' => 'accounts',
 					      'action'     => 'view',
@@ -74,6 +72,7 @@ echo $this->element('ledger_entries', array
 					 'Amount', 'Cr/Dr', 'Balance',
 					 empty($account['receipts']) ? 'Tender' : null),
 		      'include' => array('Debit', 'Credit', 'Sub-Total'),
+		      'limit' => 50,
 		      )));
 
 

site/views/maps/view.ctp

@@ -6,6 +6,19 @@
  {// for indentation purposes
    // Go through each unit, adding a clickable region for the unit
    foreach ($info['units'] AS $unit){
+     $title = ('Unit #' .
+	       $unit['name'] .
+	       (empty($unit['data']['CurrentLease']['id'])
+		? ''
+		: ('; ' .
+		   /* 	      'Lease #' . */
+		   /* 	      $unit['data']['CurrentLease']['id'] . */
+		   /* 	      '; ' . */
+		   $unit['data']['Customer']['name'] .
+		   '; Paid Through ' .
+		   $unit['data']['CurrentLease']['paid_through_date'])
+		));
+
      echo('    <area shape="rect"' .
 	  ' coords="' .
 	  $unit['left']   . ',' .
@@ -16,8 +29,8 @@
 	  $html->url(array('controller' => 'units',
 			   'action'     => 'view',
 			   $unit['id'])) .
-	  '" alt="' .
-	  $unit['name'] .
+	  '" alt="' . $title .
+	  '" title="' . $title .
 	  '">' . "\n");
    }
  }// for indentation purposes

site/views/statement_entries/chargesbymonth.ctp

@@ -0,0 +1,69 @@
+<?php /* -*- mode:PHP -*- */
+
+echo '<div class="statement_entry overview">' . "\n";
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Overview Main Section
+ */
+
+$rows = array();
+$rows[] = array("$months Month Charges", FormatHelper::currency($overview['charges']));
+
+echo $this->element('table',
+                    array('class'   => 'item statement_entry detail',
+                          'caption' => 'Monthly Charges',  
+                          'rows'    => $rows,
+                          'column_class' => array('field', 'value')));
+
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Supporting Elements Section
+ */
+
+echo '<div CLASS="detail supporting">' . "\n";
+
+$headers = array('Account', 'Amount');
+$row_class = array();
+$rows = array();
+foreach ($overview['months'] AS $month) {
+    $row_class[] = 'subheader';
+    $rows[] = array($month['name']);
+
+    $odd = 1;
+    foreach ($month['subs'] AS $sub) {
+        $row_class[] = array('subitem', $odd ? 'oddrow' : 'evenrow');
+        $rows[] = array($sub['name'], FormatHelper::currency($sub['charges']));
+        $odd = !$odd;
+    }
+    $row_class[] = 'grand';
+    $rows[] = array('Total for '.$month['name'], FormatHelper::currency($month['charges']));
+}
+
+echo $this->element('table',
+                    array('class'   => 'item statement_entry-overview overview list',
+                          'caption' => 'Months',
+                          'headers' => $headers,
+                          'rows'    => $rows,
+                          'row_class' => $row_class,
+                          'suppress_alternate_rows' => true
+                          ));
+
+?>
+<script type="text/javascript"><!--
+jQuery(document).ready(function(){ 
+        jQuery('table.overview td.subheader').attr('colSpan', 2);
+});
+--></script>
+<?php
+
+/* End "detail supporting" div */
+echo '</div>' . "\n";
+
+/* End page div */
+echo '</div>' . "\n";