Initial thoughts on the charge reversal. It's obviously not working yet, or I wouldn't leave it hanging on a branch.

git-svn-id: file:///svn-source/pmgr/branches/alt_reversal_20090806@502 97e9348a-65ac-dc4b-aefc-98561f571b83

build.cmd

@@ -0,0 +1,3 @@
+@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`;
+-- DROP DATABASE IF EXISTS `property_manager`;
-CREATE DATABASE `property_manager`;
+-- CREATE DATABASE `property_manager`;
-USE `property_manager`;
+-- USE `property_manager`;
 
 
 -- ######################################################################
@@ -241,7 +241,7 @@ CREATE TABLE `pmgr_contacts_methods` (
 -- ######################################################################
 -- ######################################################################
 -- ##
--- ## GROUPS / USERS
+-- ## GROUPS
 -- ##
 
 
@@ -256,103 +256,80 @@ 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_users
-
-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`                VARCHAR(30) NOT NULL,
-
-  -- Contact information for this user
-  `contact_id`           INT(10) UNSIGNED DEFAULT NULL,
-
-  -- Specific comments
-  `comment`              VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (`id`)
-) 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,
+  `name`                 VARCHAR(50)  NOT NULL,
+  `value`                VARCHAR(255) NOT NULL,
   `comment`              VARCHAR(255) DEFAULT NULL,
-  KEY `group_key` (`group_id`),
+
+  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
+-- ##
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_users
+
+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,
+
+  -- Contact information for this user
+  `contact_id`           INT(10) UNSIGNED NOT NULL,
+
+  -- Specific comments
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
@@ -363,131 +340,12 @@ CREATE TABLE `pmgr_group_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,
-  `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;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- 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,
+  `value`                VARCHAR(255) NOT NULL,
   `comment`              VARCHAR(255) DEFAULT NULL,
-  UNIQUE KEY `name_key` (`name`),
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-
+  PRIMARY KEY (`user_id`, `name`)
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- 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;
 
 
@@ -522,6 +380,46 @@ 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
@@ -539,38 +437,6 @@ 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;
-
-
 -- ######################################################################
 -- ######################################################################
 -- ######################################################################
@@ -605,10 +471,13 @@ CREATE TABLE `pmgr_units` (
                               'DIRTY',
                               'VACANT',
                               'OCCUPIED',
+                              'LATE', -- NOT SURE
                               'LOCKED',
                               '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,
 
@@ -856,9 +725,6 @@ CREATE TABLE `pmgr_leases` (
   `notice_received_date` DATE DEFAULT NULL,
   `close_date`           DATE DEFAULT NULL,
 
-  `charge_through_date`  DATE DEFAULT NULL,
-  `paid_through_date`    DATE DEFAULT NULL,
-
   `deposit`              FLOAT(12,2) DEFAULT NULL,
   `rent`                 FLOAT(12,2) DEFAULT NULL,
 
@@ -1006,46 +872,47 @@ CREATE TABLE `pmgr_accounts` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 LOCK TABLES `pmgr_accounts` WRITE;
+INSERT INTO `pmgr_accounts` (`type`, `name`, `level`)
+  VALUES
+  ('EQUITY',     'Equity',            1),
+  ('LIABILITY',  'Loan',              1);
 INSERT INTO `pmgr_accounts` (`type`, `name`)
   VALUES
   ('ASSET',      'A/R'                ),
-  ('LIABILITY',  'A/P'                ),
+-- REVISIT <AP>: 20090710 : We don't really need NSF, as it
-  ('LIABILITY',  'Credit'             );
+-- will always run a zero balance.  However, it will help
-INSERT INTO `pmgr_accounts` (`type`, `name`, `receipts`)
+-- us identify how serious the NSF situation is.
-  VALUES
-  ('ASSET',      'Cash',              1),
-  ('ASSET',      'Check',             1),
-  ('ASSET',      'Money Order',       1),
-  ('ASSET',      'ACH',               1),
-  ('EXPENSE',    'Concession',        1);
-INSERT INTO `pmgr_accounts` (`type`, `name`)
-  VALUES
   ('ASSET',      'NSF'                ),
-  ('EXPENSE',    'Waiver'             ),
+  ('LIABILITY',  'A/P'                );
-  ('EXPENSE',    'Bad Debt'           );
+INSERT INTO `pmgr_accounts` (`type`, `name`, `receipts`, `refunds`)
+  VALUES
+  ('ASSET',      'Cash',              1, 0),
+  ('ASSET',      'Check',             1, 0),
+  ('ASSET',      'Money Order',       1, 0),
+  ('ASSET',      'ACH',               1, 0),
+  ('ASSET',      'Closing',           0, 0), -- REVISIT <AP>: Temporary
+  ('EXPENSE',    'Concession',        1, 0),
+  ('EXPENSE',    'Waiver',            0, 0);
+INSERT INTO `pmgr_accounts` (`type`, `name`, `refunds`, `deposits`)
+  VALUES
+-- REVISIT <AP>: 20090710 : We probably don't really want petty cash depositable.
+--                          This is just for testing our deposit code
+  ('ASSET',      'Petty Cash',        1, 1);
 INSERT INTO `pmgr_accounts` (`type`, `name`, `invoices`)
   VALUES
-  ('LIABILITY',  'Tax',               0),
+  ('LIABILITY',  'Tax',               1),
   ('LIABILITY',  'Security Deposit',  1),
   ('INCOME',     'Rent',              1),
   ('INCOME',     'Late Charge',       1),
   ('INCOME',     'NSF Charge',        1),
-  ('INCOME',     'Cleaning',          1),
   ('INCOME',     'Damage',            1);
+INSERT INTO `pmgr_accounts` (`type`, `name`, `deposits`, `refunds`)
+  VALUES
+  ('ASSET',      'Bank',              1, 1);
 INSERT INTO `pmgr_accounts` (`type`, `name`)
   VALUES
+  ('EXPENSE',    'Bad Debt'           ),
   ('EXPENSE',    'Maintenance'        );
-INSERT INTO `pmgr_accounts` (`type`, `name`, `refunds`)
-  VALUES
-  ('ASSET',      'Petty Cash',        1);
-INSERT INTO `pmgr_accounts` (`type`, `name`, `level`, `deposits`, `refunds`)
-  VALUES
-  ('ASSET',      'Bank',              6, 1, 1);
-INSERT INTO `pmgr_accounts` (`type`, `name`, `level`)
-  VALUES
-  ('ASSET',      'Closing',           6),
-  ('LIABILITY',  'Loan',              1),
-  ('EQUITY',     'Equity',            1);
 UNLOCK TABLES;
 
 
@@ -1103,8 +970,6 @@ 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',
 --                               'REFUND',
@@ -1212,7 +1077,6 @@ CREATE TABLE `pmgr_statement_entries` (
   `type`                 ENUM('CHARGE',        -- Invoiced Charge to Customer
 			      'DISBURSEMENT',  -- Disbursement of Receipt Funds
                               'REVERSAL',      -- Reversal of a charge
-                              'WRITEOFF',      -- Write-off bad debt
                               'VOUCHER',       -- Agreement to pay
                               'PAYMENT',       -- Payment of a Voucher
                               'REFUND',        -- Payment due to refund
@@ -1254,9 +1118,6 @@ CREATE TABLE `pmgr_statement_entries` (
   -- Allow the disbursement to reconcile against the charge
   `charge_entry_id`      INT(10) UNSIGNED DEFAULT NULL,
 
-  -- The transaction that reversed this charge, if any
-  `reverse_transaction_id` INT(10) UNSIGNED DEFAULT NULL,
-
   `comment`              VARCHAR(255) DEFAULT NULL,
 
   PRIMARY KEY (`id`)
@@ -1281,9 +1142,6 @@ 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
@@ -1296,21 +1154,11 @@ CREATE TABLE `pmgr_tender_types` (
   `data3_name`           VARCHAR(80) DEFAULT NULL,
   `data4_name`           VARCHAR(80) DEFAULT NULL,
 
-  -- The field from pmgr_tenders that is used for helping
-  -- to name the tender.  For example, a Check tender type
-  -- might specify data1 as the field, so that tenders
-  -- would be named "Check #0000"
-  `naming_field`         VARCHAR(80) DEFAULT 'id',
-
   -- When we accept legal tender of this form, where does
   -- it go?  Each type of legal tender can specify an
   -- 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,
 
@@ -1360,8 +1208,6 @@ 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.

requirements.txt

@@ -0,0 +1,68 @@
+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,24 +2,4 @@
     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,442 +35,51 @@
  * @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));
+  function sideMenuLinks() {
-  var $std_area   = 10;
+    return array(
-  var $admin_area = 20;
+		 array('name' => 'Common',      'header' => true),
-  var $dev_area   = 30;
+		 array('name' => 'Site Map',    'url' => array('controller' => 'maps',       'action' => 'view', 1)),
-  var $op_area    = 40;
+		 array('name' => 'Units',       'url' => array('controller' => 'units',      'action' => 'index')),
-  var $new_area   = 50;
+		 array('name' => 'Leases',      'url' => array('controller' => 'leases',     'action' => 'index')),
-
+		 array('name' => 'Customers',   'url' => array('controller' => 'customers',  'action' => 'index')),
-  function __construct() {
+		 array('name' => 'Accounts',    'url' => array('controller' => 'accounts',   'action' => 'index')),
-    $this->params['dev']   = false;
+		 array('name' => 'Debug',      'header' => true),
-    $this->params['admin'] = false;
+		 array('name' => 'Un-Nuke',    'url' => '#', 'htmlAttributes' =>
-    parent::__construct();
+		       array('onclick' => '$(".pr-section").show(); return false;')),
+		 array('name' => 'Contacts',    'url' => array('controller' => 'contacts',   'action' => 'index')),
+		 array('name' => 'Ledgers',     'url' => array('controller' => 'ledgers',    'action' => 'index')),
+		 array('name' => 'New Ledgers', 'url' => array('controller' => 'accounts',    'action' => 'newledger')),
+		 array('name' => 'RESET DATA',  'url' => array('controller' => 'accounts',   'action' => 'reset_data')),
+		 );
   }
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: 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,
+    $this->set('sidemenu', $this->sideMenuLinks());
-    // but cake stomps it somewhere along the way
-    // after constructing the CakeError controller.
-    if ($this->name === 'CakeError') {
-      $this->params['dev']   = false;
-      $this->params['admin'] = false;
-    }
-
-    foreach ($this->sidemenu['areas'] AS $aname => &$area) {
-      if (empty($area['enable']))
-	$area = array();
-      if (empty($area['subareas']))
-	continue;
-      ksort($area['subareas']);
-
-      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 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);
-
-    //pr($this->sidemenu);
-    $this->set('sidemenu', $this->sidemenu);
   }
 
-
+  function reset_data() {
-  /**************************************************************************
+    $this->layout = null;
-   **************************************************************************
+    $this->autoLayout = false;
-   **************************************************************************
+    $this->autoRender = false;
-   * override: redirect
+    Configure::write('debug', '0');
-   */
+    $script = $_SERVER['DOCUMENT_ROOT'] . '/pmgr/build.cmd';
-
+    echo "<P>" . date('r') . "\n";
-  function redirect($url, $status = null, $exit = true) {
+    //echo "<P>Script: $script" . "\n";
-    // OK, since the controller will not be able to
+    $db = & $this->Account->getDataSource();
-    // utilize our overriden url function in AppHelper,
+    $script .= ' "' . $db->config['database'] . '"';
-    // we'll have to do it manually here.
+    $script .= ' "' . $db->config['login']    . '"';
-    App::import('Helper', 'Html');
+    $script .= ' "' . $db->config['password'] . '"';
-    $url = HtmlHelper::url($url, true);
+    $handle = popen($script . ' 2>&1', 'r');
-
+    //echo "<P>Handle: $handle; " . gettype($handle) . "\n";
-    if (headers_sent()) {
+    echo "<P><PRE>\n";
-      // If we've already sent the headers, it's because
+    while (($read = fread($handle, 2096))) {
-      // we're debugging, and our debug output has gotten
+      echo $read;
-      // out before the redirect.  That's probably a good
-      // thing, as we don't typically want pages to be
-      // jerked out from under us while trying to read
-      // the debug output.  So, since we can't redirect
-      // anyway, we may as well go with the flow and just
-      // render this page instead, using an empty template
-      $this->set('message',
-		 ("Intended redirect:<P><BR>" .
-		  '<A HREF="'.$url.'">'.$url.'</A>'));
-
-      echo $this->render('/empty');
-      if ($exit)
-	$this->_stop();
     }
-
+    echo "</PRE>\n";
-    return parent::redirect($url, $status, $exit);
+    pclose($handle);
   }
 
 
@@ -480,14 +89,8 @@ 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
@@ -558,10 +161,16 @@ class AppController extends Controller {
   }
 
   function gridDataSetup(&$params) {
-    // Debug only if requested
+    // Assume we're debugging.
-    $params['debug'] = !empty($this->passedArgs['debug']);
+    // The actual grid request will set this to false
+    $debug = true;
 
-    if ($params['debug']) {
+    if (isset($this->passedArgs['debug']))
+      $debug = $this->passedArgs['debug'];
+
+    $params['debug'] = $debug;
+
+    if ($debug) {
       ob_start();
     }
     else {
@@ -624,7 +233,6 @@ 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();
     }
   }
 
@@ -645,12 +253,15 @@ 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 $this->gridDataFind($params, $model, 'count', $query);
+    return $model->find('count', $query);
   }
 
   function gridDataCountTables(&$params, &$model) {
@@ -868,9 +479,6 @@ 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');
   }
 
@@ -902,11 +510,14 @@ 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 $this->gridDataFind($params, $model, 'all', $query);
+    return $model->find('all', $query);
   }
 
   function gridDataTables(&$params, &$model) {
@@ -948,24 +559,12 @@ 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' => '%'),
@@ -1015,13 +614,6 @@ 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);
-  }
-
 
   /**************************************************************************
    **************************************************************************
@@ -1042,7 +634,6 @@ class AppController extends Controller {
     $this->gridDataPostProcessLinks($params, $model, $records, array());
 
     // DEBUG PURPOSES ONLY!
-    //if ($params['debug'])
     //$params['records'] = $records;
   }
 
@@ -1061,7 +652,7 @@ class AppController extends Controller {
     foreach ($records AS &$record) {
       // Add the calculated fields (if any), to the model fields
       if (isset($record[0])) {
-	$record[$model_alias] = $record[0] + $record[$model_alias];
+	$record[$model_alias] += $record[0];
 	unset($record[0]);
       }
     }
@@ -1103,12 +694,9 @@ class AppController extends Controller {
     if (isset($params['post']['nolinks']))
       return;
 
-    App::import('Helper', 'Html');
-
     foreach ($links AS $table => $fields) {
-      $special = array('controller', 'action', 'id');
+      $special = array('controller', 'id');
       $controller = Inflector::pluralize(Inflector::underscore($table));
-      $action = 'view';
       $id = 'id';
       extract(array_intersect_key($fields, array_flip($special)));
       foreach ($records AS &$record) {
@@ -1120,13 +708,12 @@ class AppController extends Controller {
 	    continue;
 
 	  // DEBUG PURPOSES ONLY!
-	  //if ($params['debug'])
 	  //$params['linkrecord'][] = compact('table', 'field', 'id', 'controller', 'record');
 	  $record[$table][$field] =
 	    '<A HREF="' .
-	    HtmlHelper::url(array('controller' => $controller,
+	    Router::url(array('controller' => $controller,
-				  'action' => $action,
+			      'action' => 'view',
-				  $record[$table][$id])) .
+			      $record[$table][$id])) .
 	    '">' .
 	    $record[$table][$field] .
 	    '</A>';
@@ -1151,8 +738,9 @@ 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) {
@@ -1168,8 +756,7 @@ class AppController extends Controller {
   }
 
   function gridDataOutputSummary(&$params, &$model, $pagination) {
-    if ($params['debug'])
+    echo " <params><![CDATA[\n" . print_r($params, true) . "\n]]></params>\n";
-      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";
@@ -1210,33 +797,11 @@ 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();
-  }
-
-  function render_empty() {
-    echo $this->render('/empty');
-    $this->_stop();
-  }
-
 }
 ?>

site/app_helper.php

@@ -37,14 +37,5 @@ App::import('Core', 'Helper');
  * @subpackage    cake.cake
  */
 class AppHelper extends Helper {
-
-  function url($url = null, $full = false) {
-    foreach(array('sand_route', 'dev_route') AS $mod) {
-      if (isset($this->params[$mod]) && is_array($url) && !isset($url[$mod]))
-            $url[$mod] = $this->params[$mod];
-    }
-    return parent::url($url, $full);
-  }
-
 }
 ?>

site/app_model.php

@@ -42,10 +42,6 @@ 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;
 
@@ -62,35 +58,16 @@ class AppModel extends Model {
   var $max_log_level;
 
 
-  /**************************************************************************
+  // REVISIT <AP>: 20090730
-   **************************************************************************
+  //  Why is this constructor crashing?
-   **************************************************************************
+  //  Clearly it's in some sort of infinite
-   * function: __construct
+  //  loop, but it seems the correct way
-   */
+  //  to have a constructor call the parent...
-
-  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'); */
+/*   } */
 
   /**************************************************************************
    **************************************************************************
@@ -104,8 +81,7 @@ class AppModel extends Model {
     $caller = array_shift($trace);
     $caller = array_shift($trace);
     if (empty($class))
-      $class = get_class($this);
+      $class = $caller['class'];
-    $this->pr(50, compact('class', 'level'));
     $this->class_log_level[$class] = $level;
   }
 
@@ -114,10 +90,9 @@ class AppModel extends Model {
     $caller = array_shift($trace);
     $caller = array_shift($trace);
     if (empty($class))
-      $class = get_class($this);
+      $class = $caller['class'];
     if (empty($function))
       $function = $caller['function'];
-    $this->pr(50, compact('class', 'function', 'level'));
     $this->function_log_level["{$class}-{$function}"] = $level;
   }
 
@@ -305,9 +280,7 @@ class AppModel extends Model {
       if (preg_match("/^_/", $name) && !$all)
 	unset($vars[$name]);
     }
-    //$vars['class'] = get_class_vars(get_class($this));
+    pr($vars);
-
-    $this->pr(1, $vars);
   }
 
 
@@ -429,10 +402,6 @@ class AppModel extends Model {
   }
 
 
-  function filter_null($array) {
-    return array_diff_key($array, array_filter($array, 'is_null'));
-  }
-
   function recursive_array_replace($find, $replace, &$data) {
     if (!isset($data))
       return;
@@ -507,12 +476,4 @@ class AppModel extends Model {
       return date('Y-m-d', strtotime($dateString));
   }
 
-  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)
-			      );
-    $this->_stop();
-  }
 }

site/build_devbox.cmd

@@ -1,5 +0,0 @@
-@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

@@ -1,5 +0,0 @@
-@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,48 +32,16 @@
  *
  */
 
-function _box($type) {
+function INTERNAL_ERROR($message) {
-  static $box = array('type' => null, 'test' => array());
+  echo '<DIV class="internal-error" style="color:#000; background:#c22; padding:0.5em 1.5em 0.5em 1.5em;">';
-  if (!isset($box['type']) && !isset($box['test'][$type])) {
+  echo '<H1 style="margin-bottom:0.2em">INTERNAL ERROR:</H1>';
-    $r = Router::requestRoute();
+  echo '<H2 style="margin-top:0; margin-left:1.5em">' . $message . '</H2>';
-/*     if (!preg_match("/gridData/", $_SERVER['REQUEST_URI'])) { */
+  echo '<H4>This error was not caused by anything that you did wrong.';
-/*       print("<PRE>Route:\n");print_r($r);print("\n</PRE>\n"); */
+  echo '<BR>It is a problem within the application itself and should be reported to the administrator.</H4>';
-/*     } */
-    $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";
-  echo '<H4 style="color:#000;">This error was not caused by anything that you did wrong.' . "\n";
-  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));
+  echo "<HR>Stack Trace:<OL>";
-  $O->log("Stack:");
+  $trace = debug_backtrace(false);
-  echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nStack Trace:\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'];
     $bfile = $trace[$i]['file'];
@@ -88,40 +56,12 @@ 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";
+  echo '</OL>';
-
-  $O->log(str_repeat("-", 30));
-  $O->log("HTTP Request:");
-  echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nHTTP Request:\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)
+  die();
-    die();
 }
 
 /**

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', 0);
+	Configure::write('debug', 2);
 /**
  * Application wide charset encoding
  */
@@ -117,7 +117,7 @@
 /**
  * The name of CakePHP's session cookie.
  */
-	Configure::write('Session.cookie', 'PMGR');
+	Configure::write('Session.cookie', 'CAKEPHP');
 /**
  * Session time out time (in seconds).
  * Actual value depends on 'Security.level' setting.

site/config/database.php

@@ -10,12 +10,5 @@ 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,49 +27,11 @@
  * @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('/', $default_path);
+	Router::connect('/', array('controller' => 'maps', 'action' => 'view', '1'));
-
-/*
- * Route for sandbox functionality
- */
-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 developement functionality
- */
-Router::connect('/dev',
-		array('dev_route' => true) + $default_path);
-Router::connect('/dev/:controller/:action/*',
-		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,38 +2,33 @@
 
 class AccountsController extends AppController {
 
+  var $uses = array('Account', 'LedgerEntry');
+
+  var $sidemenu_links =
+    array(array('name' => 'Accounts',        'header' => true),
+	  array('name' => 'All',             'url' => array('controller' => 'accounts', 'action' => 'all')),
+	  array('name' => 'Asset',           'url' => array('controller' => 'accounts', 'action' => 'asset')),
+	  array('name' => 'Liability',       'url' => array('controller' => 'accounts', 'action' => 'liability')),
+	  array('name' => 'Equity',          'url' => array('controller' => 'accounts', 'action' => 'equity')),
+	  array('name' => 'Income',          'url' => array('controller' => 'accounts', 'action' => 'income')),
+	  array('name' => 'Expense',         'url' => array('controller' => 'accounts', 'action' => 'expense')),
+	  array('name' => 'Deposits',        'header' => true),
+	  array('name' => 'Prior Deposits',  'url' => array('controller' => 'transactions', 'action' => 'deposit')),
+	  array('name' => 'New Deposit',     'url' => array('controller' => 'tenders', 'action' => 'deposit')),
+	  );
+
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * override: addGridViewSideMenuLinks
+   * override: sideMenuLinks
-   *  - Adds grid view navigation side menu links
+   *  - Generates controller specific links for the side menu
    */
-
+  function sideMenuLinks() {
-  function addGridViewSideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-    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);
   }
 
-
+  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -47,7 +42,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'); }
 
 
   /**************************************************************************
@@ -98,9 +93,6 @@ class AccountsController extends AppController {
       $conditions[] = array('Account.type' => strtoupper($params['action']));
     }
 
-    $conditions[] = array('Account.level >=' =>
-			  $this->Permission->level('controller.accounts'));
-
     return $conditions;
   }
 
@@ -150,9 +142,12 @@ class AccountsController extends AppController {
     $account = $this->Account->read(null, $id);
     $account = $account['Account'];
 
-    $accounts = $this->Account->collectableAccounts();
+    $payment_accounts = $this->Account->collectableAccounts();
-    $payment_accounts = $accounts['all'];
+    //$payment_accounts[$this->Account->nameToID('Closing')] = 'Closing';
-    $default_accounts = $accounts['default'];
+    //$payment_accounts[$this->Account->nameToID('Equity')] = 'Equity';
+    //$payment_accounts[$id] = 'Reversals';
+    $default_accounts = array_diff_key($this->Account->receiptAccounts(),
+				       array($this->Account->concessionAccountID() => 1));
     $this->set(compact('payment_accounts', 'default_accounts'));
 
     $title = ($account['name'] . ': Collected Report');
@@ -168,6 +163,12 @@ class AccountsController extends AppController {
    */
 
   function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    // Get details about the account and its ledgers (no ledger entries yet)
     $account = $this->Account->find
       ('first',
        array('contain' =>
@@ -179,32 +180,33 @@ class AccountsController extends AppController {
 		   array('CloseTransaction' => array
 			 ('order' => array('CloseTransaction.stamp' => 'DESC'))),
 		   ),
-	     'conditions' => array(array('Account.id' => $id),
+	     'conditions' => array(array('Account.id' => $id)),
-				   array('Account.level >=' =>
-					 $this->Permission->level('controller.accounts')),
-				   ),
 	     )
        );
 
-    if (empty($account)) {
+    // Get all ledger entries of the CURRENT ledger
-      $this->Session->setFlash(__('Invalid Item.', true));
+    $entries = $this->Account->ledgerEntries($id);
-      $this->redirect(array('action'=>'index'));
+    //pr(compact('entries'));
-    }
+    $account['CurrentLedger']['LedgerEntry'] = $entries;
 
     // Obtain stats across ALL ledgers for the summary infobox
     $stats = $this->Account->stats($id, true);
     $stats = $stats['Ledger'];
 
-    $this->addSideMenuLink('New Ledger',
+    $this->sidemenu_links[] =
-			   array('action' => 'newledger', $id), null,
+      array('name' => 'Operations',       'header' => true);
-			   'ACTION', $this->admin_area);
+    $this->sidemenu_links[] =
-    $this->addSideMenuLink('Collected',
+      array('name' => 'New Ledger',       'url' => array('action' => 'newledger', $id));
-			   array('action' => 'collected', $id), null,
+    $this->sidemenu_links[] =
-			   'ACTION', $this->admin_area);
+      array('name' => 'Collected',        'url' => array('action' => 'collected', $id));
 
     // Prepare to render
     $title = 'Account: ' . $account['Account']['name'];
     $this->set(compact('account', 'title', 'stats'));
   }
 
+  function tst($id) {
+    //$entries = $this->Account->($id);
+    pr($entries);
+  }
 }

site/controllers/contacts_controller.php

@@ -2,7 +2,19 @@
 
 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);
+  }
+
+  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -23,34 +35,19 @@ 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') {
-    // After sorting by whatever the user wants, add these
+      $order[] = 'Contact.first_name ' . $direction;
-    // defaults into the sort mechanism.  If we're already
+    }
-    // sorting by one of them, it will only be redundant,
+    if ($index === 'Contact.first_name') {
-    // and should cause no harm (possible a longer query?)
+      $order[] = 'Contact.last_name ' . $direction;
-    $order[] = 'Contact.last_name ' . $direction;
+    }
-    $order[] = 'Contact.first_name ' . $direction;
-
     return $order;
   }
 
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
-    $links['Contact'] = array('display_name');
+    $links['Contact'] = array('id');
     return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
@@ -81,9 +78,13 @@ class ContactsController extends AppController {
 	));
 
     // Set up dynamic menu items
-    $this->addSideMenuLink('Edit',
+    $this->sidemenu_links[] =
-			   array('action' => 'edit', $id), null,
+      array('name' => 'Operations', 'header' => true);
-			   'ACTION');
+
+    $this->sidemenu_links[] =
+      array('name' => 'Edit',
+	    'url' => array('action' => 'edit',
+			   $id));
 
     // Prepare to render.
     $title = 'Contact: ' . $contact['Contact']['display_name'];
@@ -125,6 +126,8 @@ class ContactsController extends AppController {
 
       // Now that the work is done, let the user view the updated contact
       $this->redirect(array('action'=>'view', $this->data['Contact']['id']));
+      //$this->render('/empty');
+      return;
     }
 
     if ($id) {

site/controllers/customers_controller.php

@@ -1,42 +1,28 @@
 <?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: addGridViewSideMenuLinks
+   * override: sideMenuLinks
-   *  - Adds grid view navigation side menu links
+   *  - Generates controller specific links for the side menu
    */
-
+  function sideMenuLinks() {
-  function addGridViewSideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-    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); */
   }
 
-
+  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -95,29 +81,19 @@ class CustomersController extends AppController {
     return $conditions;
   }
 
-  function gridDataFilterTablesConfig(&$params, &$model, $table) {
-    $config = parent::gridDataFilterTablesConfig($params, $model, $table);
-
-    // 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);
+    $order = array();
+    $order[] = parent::gridDataOrder($params, $model, $index, $direction);
 
-    // After sorting by whatever the user wants, add these
+    if ($index !== 'PrimaryContact.last_name')
-    // defaults into the sort mechanism.  If we're already
+      $order[] = parent::gridDataOrder($params, $model,
-    // sorting by one of them, it will only be redundant,
+					 'PrimaryContact.last_name', $direction);
-    // and should cause no harm (possible a longer query?)
+    if ($index !== 'PrimaryContact.first_name')
-    $order[] = 'PrimaryContact.last_name ' . $direction;
+      $order[] = parent::gridDataOrder($params, $model,
-    $order[] = 'PrimaryContact.first_name ' . $direction;
+					 'PrimaryContact.first_name', $direction);
-    $order[] = 'Customer.id ' . $direction;
+    if ($index !== 'Customer.id')
+      $order[] = parent::gridDataOrder($params, $model,
+					 'Customer.id', $direction);
 
     return $order;
   }
@@ -135,18 +111,14 @@ class CustomersController extends AppController {
    *  - Sets up the move-in page for the given customer.
    */
 
-  function move_in($id = null, $unit_id = null) {
+  function move_in($id = null) {
     $customer = array();
     $unit = array();
 
-    if (!empty($id)) {
+    if (isset($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';
@@ -230,93 +202,52 @@ class CustomersController extends AppController {
 	));
     //pr($customer);
 
-    // Determine how long this customer has been with us.
-    $leaseinfo = $this->Customer->find
-      ('first', array
-       ('link' => array('Lease' => array('fields' => array())),
-	'fields' => array('MIN(Lease.movein_date) AS since',
-			  'IF(Customer.current_lease_count = 0, MAX(Lease.moveout_date), NULL) AS until'),
-	'conditions' => array('Customer.id' => $id),
-	'group' => 'Customer.id',
-	));
-    $this->set($leaseinfo[0]);
-
     // Figure out the outstanding balances for this customer
-    //$this->set('stats', $this->Customer->stats($id));
     $outstanding_balance = $this->Customer->balance($id);
     $outstanding_deposit = $this->Customer->securityDepositBalance($id);
 
     // Figure out if this customer has any non-closed leases
-    $show_moveout = false; $moveout_lease_id = null;
+    $show_moveout = false;
-    $show_payment = false; $payment_lease_id = null;
+    $show_payment = false;
     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);
 
-    if ($show_payment || $outstanding_balance > 0)
+    $this->sidemenu_links[] =
-      $this->addSideMenuLink('New Receipt',
+      array('name' => 'Edit',
-			     array('action' => 'receipt', $id), null,
+	    'url' => array('action' => 'edit',
-			     'ACTION');
+			   $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) {
-/*       $ids = $this->Customer->leaseIds($id, true); */
+      $this->sidemenu_links[] =
-/*       if (count($ids) == 1) */
+	array('name' => 'Payment',
-/* 	$lease_id = $ids[0]; */
+	      'url' => array('action' => 'receipt',
-/*       else */
+			     $id));
-/* 	$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->addSideMenuLink('Write-Off',
-			     array('action' => 'bad_debt', $id), null,
-			     'ACTION');
-
     if ($outstanding_balance < 0)
-      $this->addSideMenuLink('Issue Refund',
+      $this->sidemenu_links[] =
-			     array('action' => 'refund', $id), null,
+	array('name' => 'Issue Refund',
-			     'ACTION');
+	      'url' => array('action' => 'refund', $id));
-
-    $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'];
@@ -339,20 +270,23 @@ class CustomersController extends AppController {
       if (isset($this->params['form']['cancel'])) {
 	if (isset($this->data['Customer']['id']))
 	  $this->redirect(array('action'=>'view', $this->data['Customer']['id']));
-
+	else
-	$this->redirect(array('action'=>'index'));
+	  $this->redirect(array('action'=>'index'));
+	return;
       }
 
       // Make sure we have at least one contact
       if (!isset($this->data['Contact']) || count($this->data['Contact']) == 0) {
 	$this->Session->setFlash("MUST SPECIFY AT LEAST ONE CONTACT", true);
 	$this->redirect(array('action'=>'view', $this->data['Customer']['id']));
+	return;
       }
 
       // Make sure there is a primary contact
       if (!isset($this->data['Customer']['primary_contact_entry'])) {
 	$this->Session->setFlash("MUST SPECIFY A PRIMARY CONTACT", true);
 	$this->redirect(array('action'=>'view', $this->data['Customer']['id']));
+	return;
       }
 
       // Go through each customer and strip the bogus ID if new
@@ -369,56 +303,21 @@ class CustomersController extends AppController {
 	pr("CUSTOMER SAVE FAILED");
       }
 
-      // If existing customer, then view it.
+      // If existing customer, then view it.  Otherwise, since
+      // this is a new customer, go to the move in screen.
       if ($this->data['Customer']['id'])
 	$this->redirect(array('action'=>'view', $this->Customer->id));
-
-      // Since this is a new customer, go to the move in screen.
-      // 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'];
+	$this->redirect(array('action'=>'move_in', $this->Customer->id));
 
-      // ... then redirect
+      // For debugging, only if the redirects above have been
-      $this->redirect(array('action'=>'move_in',
+      // commented out, otherwise this section isn't reached.
-			    $this->Customer->id,
+      $this->render('/empty');
-			    $unit_id,
+      return;
-			    ));
     }
 
     if ($id) {
-      // REVISIT <AP>: 20090816
+      $this->data = $this->Customer->details($id);
-      //  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 {
@@ -447,46 +346,10 @@ class CustomersController extends AppController {
    *  - Add a new customer
    */
 
-  function add($unit_id = null) {
+  function add() {
-    $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']));
-  }
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -499,9 +362,20 @@ class CustomersController extends AppController {
       $this->Customer->recursive = -1;
       $customer = $this->Customer->read(null, $id);
       $customer = $customer['Customer'];
+      $unreconciled = $this->Customer->unreconciledCharges($id);
+      //pr($unreconciled);
+      $charges = $unreconciled['entries'];
+      $stats = $unreconciled['summary']['Charge'];
+      // Kludge until we update receipt to have the unpaid
+      // charges grid generated from a dynamic query instead
+      // of simply pre-providing the list of charge IDs
+      foreach ($charges AS &$charge)
+	$charge['id'] = $charge['StatementEntry']['id'];
     }
     else {
       $customer = null;
+      $charges = array();
+      $stats = array('balance' => 0);
     }
 
     $TT = new TenderType();
@@ -510,7 +384,7 @@ class CustomersController extends AppController {
     $this->set(compact('payment_types', 'default_type'));
 
     $title = ($customer['name'] . ': Receipt Entry');
-    $this->set(compact('customer', 'title'));
+    $this->set(compact('customer', 'charges', 'stats', 'title'));
   }
 
 
@@ -521,64 +395,64 @@ class CustomersController extends AppController {
    *  - Refunds customer charges
    */
 
-  function refund($id) {
+  function refund() {
-    $customer = $this->Customer->find
+    $entries = $this->Customer->StatementEntry->find
-      ('first', array
+      ('all', array
        ('contain' => false,
-	'conditions' => array(array('Customer.id' => $id),
+	'conditions' => array('StatementEntry.id' =>
+			      //array(199,200,201)
+			      61
 			      ),
 	));
-    if (empty($customer)) {
+    pr(compact('entries'));
-      $this->redirect(array('action'=>'view', $id));
-    }
 
-    // Determine the customer balance, bailing if the customer owes money
+    $this->Customer->refund($entries);
-    $balance = $this->Customer->balance($id);
-    if ($balance >= 0) {
-      $this->redirect(array('action'=>'view', $id));
-    }
-
-    // The refund will be for a positive amount
-    $balance *= -1;
-
-    // Get the accounts capable of paying the refund
-    $refundAccounts = $this->Customer->StatementEntry->Account->refundAccounts();
-    $defaultAccount = current($refundAccounts);
-    $this->set(compact('refundAccounts', 'defaultAccount'));
-
-    // Prepare to render
-    $title = ($customer['Customer']['name'] . ': Refund');
-    $this->set(compact('title', 'customer', 'balance'));
-    $this->render('/transactions/refund');
   }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * action: bad_debt
+   * action: unreconciled
-   *  - Sets up the write-off entry page, so that the
+   *  - returns the list of unreconciled entries
-   *    user can write off remaining charges of a customer.
    */
 
-  function bad_debt($id) {
+  function unreconciled($id) {
-    $this->Customer->id = $id;
-    $customer = $this->Customer->find
-      ('first', array
-       ('contain' => false,
-	));
 
-    // Make sure we have a valid customer to write off
+    //$this->layout = 'ajax';
-    if (empty($customer))
+    $this->layout = null;
-      $this->redirect(array('action' => 'index'));
+    $this->autoLayout = false;
+    $this->autoRender = false;
+    Configure::write('debug', '0');
+    header("Content-type: text/xml;charset=utf-8");
 
-    // Get the customer balance
+    App::import('Helper', 'Xml');
-    $balance = $this->Customer->balance($id);
+    $xml = new XmlHelper();
 
-    // Prepare to render
+    // Find the unreconciled entries, then manipulate the structure
-    $title = ($customer['Customer']['name'] . ': Write Off Bad Debt');
+    // slightly to accomodate the format necessary for XML Helper.
-    $this->set(compact('title', 'customer', 'balance'));
+    $unreconciled = $this->Customer->unreconciledCharges($id);
-    $this->render('/transactions/bad_debt');
+
+    foreach ($unreconciled['entries'] AS &$entry)
+      $entry = array_intersect_key($entry['StatementEntry'],
+				   array('id'=>1));
+
+    $unreconciled = array('entries' =>
+			  array('entry'   => $unreconciled['entries'],
+				'balance' => $unreconciled['summary']['balance']));
+
+    // XML Helper will dump an empty tag if the array is empty
+    if (empty($unreconciled['entries']['entry']))
+      unset($unreconciled['entries']['entry']);
+
+/*     pr(compact('unreconciled')); */
+/*     echo htmlspecialchars($xml->serialize($unreconciled)); */
+/*     $this->render('/fake'); */
+
+    $opts = array();
+    //$opts['format'] = 'tags';
+    echo $xml->header();
+    echo $xml->serialize($unreconciled, $opts);
   }
 
 }

site/controllers/double_entries_controller.php

@@ -2,7 +2,20 @@
 
 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);
+  }
+
+  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -23,34 +36,6 @@ class DoubleEntriesController extends AppController {
 	     'conditions' => array('DoubleEntry.id' => $id),
 	     ));
 
-    $entry += $this->DoubleEntry->DebitEntry->Transaction->find
-      ('first',
-       array('contain' => false,
-	     'conditions' => array('id' => $entry['DebitEntry']['transaction_id']),
-	     ));
-
-    $entry += $this->DoubleEntry->DebitEntry->find
-      ('first',
-       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']);
-
-    $entry += $this->DoubleEntry->CreditEntry->find
-      ('first',
-       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']);
-
     // Prepare to render.
     $title = "Double Ledger Entry #{$entry['DoubleEntry']['id']}";
     $this->set(compact('entry', 'title'));

site/controllers/leases_controller.php

@@ -2,32 +2,25 @@
 
 class LeasesController extends AppController {
 
+  var $sidemenu_links =
+    array(array('name' => 'Leases',   'header' => true),
+	  array('name' => 'Active',   'url' => array('controller' => 'leases', 'action' => 'active')),
+	  array('name' => 'Closed',   'url' => array('controller' => 'leases', 'action' => 'closed')),
+	  array('name' => 'All',      'url' => array('controller' => 'leases', 'action' => 'all')),
+	  );
+
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * override: addGridViewSideMenuLinks
+   * override: sideMenuLinks
-   *  - Adds grid view navigation side menu links
+   *  - Generates controller specific links for the side menu
    */
-
+  function sideMenuLinks() {
-  function addGridViewSideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-    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');
   }
 
-
+  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -35,11 +28,10 @@ class LeasesController extends AppController {
    *  - Generate a listing of leases
    */
 
-  function index()      { $this->active(); }
+  function index()    { $this->all(); }
-  function active()     { $this->gridView('Active Leases', 'active'); }
+  function active()   { $this->gridView('Active Leases'); }
-  function delinquent() { $this->gridView('Delinquent Leases'); }
+  function closed()   { $this->gridView('Closed Leases'); }
-  function closed()     { $this->gridView('Closed Leases'); }
+  function all()      { $this->gridView('All Leases', 'all'); }
-  function all()        { $this->gridView('All Leases'); }
 
 
   /**************************************************************************
@@ -71,8 +63,6 @@ class LeasesController extends AppController {
 
   function gridDataFields(&$params, &$model) {
     $fields = parent::gridDataFields($params, $model);
-    $fields[] = ("IF(" . $this->Lease->conditionDelinquent() . "," .
-		 "   'DELINQUENT', 'CURRENT') AS 'status'");
     return array_merge($fields,
 		       $this->Lease->StatementEntry->chargeDisbursementFields(true));
   }
@@ -83,9 +73,6 @@ class LeasesController extends AppController {
     if ($params['action'] === 'active') {
       $conditions[] = 'Lease.close_date IS NULL';
     }
-    elseif ($params['action'] === 'delinquent') {
-      $conditions[] = $this->Lease->conditionDelinquent();
-    }
     elseif ($params['action'] === 'closed') {
       $conditions[] = 'Lease.close_date IS NOT NULL';
     }
@@ -148,22 +135,21 @@ class LeasesController extends AppController {
 
     // Handle the move in based on the data given
     //pr(array('Move-in data', $this->data));
-    foreach (array('deposit', 'rent') AS $currency) {
-      $this->data['Lease'][$currency]
-	= str_replace('$', '', $this->data['Lease'][$currency]);
-    }
 
     $lid = $this->Lease->moveIn($this->data['Lease']['customer_id'],
 				$this->data['Lease']['unit_id'],
-				$this->data['Lease']['deposit'],
+				null, null,
-				$this->data['Lease']['rent'],
 				$this->data['Lease']['movein_date'],
 				$this->data['Lease']['comment']
 				);
 
     // Since this is a new lease, go to the invoice
     // screen so we can start assessing charges.
-    $this->redirect(array('action'=>'invoice', $lid, 'move-in'));
+    $this->redirect(array('action'=>'invoice', $lid));
+
+    // For debugging, only if the redirect above have been
+    // commented out, otherwise this section isn't reached.
+    $this->render('/empty');
   }
 
   /**************************************************************************
@@ -176,54 +162,51 @@ 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->data['Lease']['moveout_date'],
+			    //true // Close this lease, if able
+			    false
 			    );
 
-      $lease = $this->Lease->find
+      $this->redirect($this->data['redirect']);
-	('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)) {
+    if (!isset($id))
-      $lease = $this->Lease->find
+      die("Oh Nooooo!!");
-	('first', array
-	 ('contain' => array
-	  (// Models
-	   'Unit' =>
-	   array('order'  => array('sort_order'),
-		 'fields' => array('id', 'name'),
-		 ),
 
-	   'Customer' =>
+    $lease = $this->Lease->find
-	   array('fields' => array('id', 'name'),
+      ('first', array
-		 ),
+       ('contain' => array
-	   ),
+	(// Models
+	 'Unit' =>
+	 array('order'  => array('sort_order'),
+	       'fields' => array('id', 'name'),
+	       ),
 
-	  'conditions' => array(array('Lease.id' => $id),
+	 'Customer' =>
-				array('Lease.close_date' => null),
+	 array('fields' => array('id', 'name'),
-				),
+	       ),
-	  ));
+	 ),
-      $this->set('customer', $lease['Customer']);
-      $this->set('unit',     $lease['Unit']);
-      $this->set('lease',    $lease['Lease']);
 
-      $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
+	'conditions' => array(array('Lease.id' => $id),
-		$lease['Unit']['name'] . ': ' .
+			      array('Lease.close_date' => null),
-		$lease['Customer']['name'] . ': Move-Out');
+			      ),
-    }
+	));
-    else {
+    $this->set('customer', $lease['Customer']);
-      $title = 'Move-Out';
+    $this->set('unit',     $lease['Unit']);
-    }
+    $this->set('lease',    $lease['Lease']);
 
-    $this->set(compact('title'));
+    $redirect = array('controller' => 'leases',
+		      'action' => 'view',
+		      $id);
+
+    $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
+	      $lease['Unit']['name'] . ': ' .
+	      $lease['Customer']['name'] . ': Prepare Move-Out');
+    $this->set(compact('title', 'redirect'));
     $this->render('/leases/move');
   }
 
@@ -238,6 +221,8 @@ class LeasesController extends AppController {
 
 /*   function promote_surplus($id) { */
 /*     $this->Lease->promoteSurplus($id); */
+/*     pr("PREVENTING REDIRECT"); */
+/*     $this->render('fake'); */
 /*     $this->redirect(array('controller' => 'leases', */
 /* 			  'action' => 'view', */
 /* 			  $id)); */
@@ -288,7 +273,6 @@ class LeasesController extends AppController {
 	      $lease['Unit']['name'] . ': ' .
 	      $lease['Customer']['name'] . ': Refund');
     $this->set(compact('title', 'lease', 'balance'));
-    $this->render('/transactions/refund');
   }
 
 
@@ -301,7 +285,6 @@ class LeasesController extends AppController {
    */
 
   function bad_debt($id) {
-    $this->Lease->id = $id;
     $lease = $this->Lease->find
       ('first', array
        ('contain' => array
@@ -309,14 +292,20 @@ class LeasesController extends AppController {
 	 'Unit' => array('fields' => array('id', 'name')),
 	 'Customer' => array('fields' => array('id', 'name')),
 	 ),
+
+	'conditions' => array(array('Lease.id' => $id),
+			      // Make sure lease is not closed...
+			      array('Lease.close_date' => null),
+			      ),
 	));
 
     // Make sure we have a valid lease to write off
     if (empty($lease))
       $this->redirect(array('action' => 'view', $id));
 
-    // Get the lease balance
+    // Get the lease balance, part of lease stats
-    $balance = $this->Lease->balance($id);
+    $stats = $this->Lease->stats($id);
+    $balance = $stats['balance'];
 
     // Prepare to render
     $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
@@ -334,23 +323,9 @@ class LeasesController extends AppController {
    *  - Closes a lease to any further action
    */
 
-  // REVISIT <AP>: 20090809
-  //  While cleaning up the sitelink data, then delete reldep()
-  function reldep($id) {
-    $this->Lease->id = $id;
-    $stamp = $this->Lease->field('moveout_date');
-    $this->Lease->releaseSecurityDeposits($id, $stamp);
-    $this->redirect(array('action'=>'view', $id));
-  }
-
   function close($id) {
     // REVISIT <AP>: 20090708
     //  We should probably seek confirmation first...
-    if (!$this->Lease->closeable($id)) {
-      $this->INTERNAL_ERROR("This lease is not ready to close");
-      $this->redirect(array('action'=>'view', $id));
-    }
-
     $this->Lease->close($id);
     $this->redirect(array('action'=>'view', $id));
   }
@@ -387,34 +362,13 @@ class LeasesController extends AppController {
     $A = new Account();
     $charge_accounts = $A->invoiceAccounts();
     $default_account = $A->rentAccountID();
-    $rent_account    = $A->rentAccountID();
+    $this->set(compact('charge_accounts', 'default_account'));
-    $security_deposit_account = $A->securityDepositAccountID();
-    $this->set(compact('charge_accounts', 'default_account',
-		       'rent_account', 'security_deposit_account'));
 
     // REVISIT <AP> 20090705:
     //   Of course, the late charge should come from the late_schedule
+    $default_rent = $lease['Lease']['rent'];
     $default_late = 10;
-    $this->set(compact('default_late'));
+    $this->set(compact('default_rent', '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']);
-      $movein_date = getdate($movein['effective_time']);
-      $movein['through_time'] = mktime(0, 0, 0, $movein_date['mon'] + 1, 0, $movein_date['year']);
-      $days_in_month = idate('d', $movein['through_time']);
-      $movein['prorated_days'] = $days_in_month - $movein_date['mday'] + 1;
-      $movein['prorated_rent'] = $lease['Lease']['rent'] * $movein['prorated_days'] / $days_in_month;
-      $movein['prorated'] = $movein['prorated_days'] != $days_in_month;
-      $movein['deposit'] = $lease['Lease']['deposit'];
-      $this->set(compact('movein'));
-    }
-
 
     $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
 	      $lease['Unit']['name'] . ': ' .
@@ -423,85 +377,6 @@ class LeasesController extends AppController {
   }
 
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: assess_rent/late
-   *  - Assesses the new monthly rent/late charge, if need be
-   */
-
-  function assess_rent($date = null) {
-    $this->Lease->assessMonthlyRentAll($date);
-    $this->redirect(array('action'=>'index'));
-  }
-  function assess_late($date = null) {
-    $this->Lease->assessMonthlyLateAll($date);
-    $this->redirect(array('action'=>'index'));
-  }
-  function assess_all($date = null) {
-    $this->Lease->assessMonthlyRentAll($date);
-    $this->Lease->assessMonthlyLateAll($date);
-    $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'));
-  }
-
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -520,65 +395,62 @@ class LeasesController extends AppController {
       ('first',
        array('contain' =>
 	     array(// Models
-		   'LeaseType(id,name)',
+		   'LeaseType',
-		   'Unit(id,name)',
+		   'Unit',
-		   'Customer(id,name)',
+		   'Customer',
 		   ),
-	     'fields' => array('Lease.*', $this->Lease->delinquentField()),
 	     'conditions' => array(array('Lease.id' => $id)),
 	     )
        );
-    $lease['Lease'] += $lease[0];
-    unset($lease[0]);
 
-    // Figure out the outstanding balances for this lease
+    $lease['Lease']['paid_through'] = $this->Lease->rentPaidThrough($id);
+
+
+    $this->set('charge_gaps', $this->Lease->rentChargeGaps($id));
+    $this->set('charge_through', $this->Lease->rentChargeThrough($id));
+
+     // Figure out the outstanding balances for this lease
     $outstanding_balance = $this->Lease->balance($id);
     $outstanding_deposit = $this->Lease->securityDepositBalance($id);
 
-    // Set up dynamic menu items.  Normally, these will only be present
+    // Set up dynamic menu items
-    // on an open lease, but it's possible for a lease to be closed, and
+    if (!isset($lease['Lease']['close_date'])) {
-    // yet still have an outstanding balance.  This can happen if someone
+      $this->sidemenu_links[] =
-    // were to reverse charges, or if a payment should come back NSF.
+	array('name' => 'Operations', 'header' => true);
-    if (!isset($lease['Lease']['close_date']) || $outstanding_balance > 0) {
+
       if (!isset($lease['Lease']['moveout_date']))
-	$this->addSideMenuLink('Move-Out',
+	$this->sidemenu_links[] =
-			       array('action' => 'move_out', $id), null,
+	  array('name' => 'Move-Out', 'url' => array('action' => 'move_out',
-			       'ACTION');
+						     $id));
 
-      if (!isset($lease['Lease']['close_date']))
+      $this->sidemenu_links[] =
-	$this->addSideMenuLink('New Invoice',
+	array('name' => 'Charges', 'url' => array('action' => 'invoice',
-			       array('action' => 'invoice', $id), null,
+						  $id));
-			       'ACTION');
 
-      $this->addSideMenuLink('New Receipt',
+      $this->sidemenu_links[] =
-			     array('controller' => 'customers',
+	array('name' => 'Payments', 'url' => array('controller' => 'customers',
-				   'action' => 'receipt',
+						   'action' => 'receipt',
-				   $lease['Customer']['id']), null,
+						   $lease['Customer']['id']));
-			     'ACTION');
-
-      // REVISIT <AP>:
-      //  Not allowing refund to be issued from the lease, as
-      //  in fact, we should never have a positive lease balance.
-      //  I'll flag this at the moment, since we might get one
-      //  when a charge is reimbursed; a bug that we'll either
-      //  need to fix, or we'll have to revisit this assumption.
-      if ($outstanding_balance < 0)
-	$this->INTERNAL_ERROR("Should not have a customer lease credit.");
 
 /*       if ($outstanding_balance < 0) */
-/* 	$this->addSideMenuLink('Issue Refund', */
+/* 	$this->sidemenu_links[] = */
-/* 			       array('action' => 'refund', $id), null, */
+/* 	  array('name' => 'Transfer Credit to Customer', */
-/* 			       'ACTION'); */
+/* 		'url' => array('action' => 'promote_surplus', $id)); */
+
+      if ($outstanding_balance < 0)
+	$this->sidemenu_links[] =
+	  array('name' => 'Issue Refund',
+		'url' => array('action' => 'refund', $id));
 
       if (isset($lease['Lease']['moveout_date']) && $outstanding_balance > 0)
-	$this->addSideMenuLink('Write-Off',
+	$this->sidemenu_links[] =
-			       array('action' => 'bad_debt', $id), null,
+	  array('name' => 'Write-Off', 'url' => array('action' => 'bad_debt',
-			       'ACTION');
+						      $id));
 
       if ($this->Lease->closeable($id))
-	$this->addSideMenuLink('Close',
+	$this->sidemenu_links[] =
-			       array('action' => 'close', $id), null,
+	  array('name' => 'Close', 'url' => array('action' => 'close',
-			       'ACTION');
+						  $id));
     }
 
     // Prepare to render

site/controllers/ledger_entries_controller.php

@@ -2,6 +2,19 @@
 
 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);
+  }
+
   
   /**************************************************************************
    **************************************************************************
@@ -117,12 +130,8 @@ class LedgerEntriesController extends AppController {
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
     $links['LedgerEntry']    = array('id');
     $links['Transaction']    = array('id');
-    // REVISIT <AP>: 20090827
+    $links['Ledger']         = array('id');
-    //  Need to take 'level' into account
+    $links['Account']        = array('controller' => 'accounts', 'name');
-    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);
   }
@@ -136,6 +145,12 @@ class LedgerEntriesController extends AppController {
    */
 
   function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
+    }
+
+    // Get the Entry and related fields
     $entry = $this->LedgerEntry->find
       ('first',
        array('contain' => array
@@ -148,16 +163,13 @@ class LedgerEntriesController extends AppController {
 	      array('fields' => array('id', 'sequence', 'name'),
 		    'Account' => 
 		    array('fields' => array('id', 'name', 'type'),
-			  ),
+			),
-		    ),
+		  ),
 
 	      'Tender' =>
 	      array('fields' => array('id', 'name'),
 		    ),
 
-	      'DebitDoubleEntry' => array('id'),
-	      'CreditDoubleEntry' => array('id'),
-
 	      'DebitEntry'  => array('fields' => array('id', 'crdr')),
 	      'CreditEntry' => array('fields' => array('id', 'crdr')),
 	      ),
@@ -165,11 +177,6 @@ class LedgerEntriesController extends AppController {
 	     'conditions' => array('LedgerEntry.id' => $id),
 	     ));
 
-    if (empty($entry) || empty($entry['Ledger']['Account'])) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
-    }
-
     if (!empty($entry['DebitEntry']) && !empty($entry['CreditEntry']))
       die("LedgerEntry has both a matching DebitEntry and CreditEntry");
     if (empty($entry['DebitEntry']) && empty($entry['CreditEntry']))
@@ -184,18 +191,6 @@ class LedgerEntriesController extends AppController {
     else
       $entry['MatchingEntry'] = $entry['DebitEntry'][0];
 
-    if (empty($entry['DebitDoubleEntry']['id']))
-      $entry['DoubleEntry'] = $entry['CreditDoubleEntry'];
-    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,29 +2,25 @@
 
 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: addGridViewSideMenuLinks
+   * override: sideMenuLinks
-   *  - Adds grid view navigation side menu links
+   *  - Generates controller specific links for the side menu
    */
-
+  function sideMenuLinks() {
-  function addGridViewSideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-    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');
   }
 
-
+  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -54,21 +50,24 @@ class LedgersController extends AppController {
   }
 
   function gridDataCountTables(&$params, &$model) {
+    // Our count should NOT include anything extra,
+    // so we need the virtual function to prevent
+    // the base class from just calling our
+    // gridDataTables function.
+    return parent::gridDataTables($params, $model);
+  }
+
+  function gridDataTables(&$params, &$model) {
     return array
       ('link' =>
        array(// Models
 	     'Account',
+	     'LedgerEntry',
+	     'CloseTransaction',
 	     ),
        );
   }
 
-  function gridDataTables(&$params, &$model) {
-    $tables = $this->gridDataCountTables($params, $model);
-    $tables['link'][] = 'LedgerEntry';
-    $tables['link'][] = 'CloseTransaction';
-    return $tables;
-  }
-
   function gridDataFields(&$params, &$model) {
     $fields = parent::gridDataFields($params, $model);
     $fields[] = 'CONCAT(Account.id, "-", Ledger.sequence) AS id_sequence';
@@ -86,32 +85,28 @@ class LedgersController extends AppController {
       $conditions[] = array('Ledger.close_transaction_id !=' => null);
     }
 
-    $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);
 
-    // After sorting by whatever the user wants, add these
+    if ($id_sequence) {
-    // defaults into the sort mechanism.  If we're already
+      $order[] = 'Ledger.sequence ' . $direction;
-    // 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) {
-    // REVISIT <AP>: 20090827
+    $links['Ledger'] = array('id_sequence');
-    //  Need to take 'level' into account
+    $links['Account'] = array('name');
-    if ($this->Permission->allow('controller.accounts')) {
-      $links['Ledger'] = array('sequence');
-      $links['Account'] = array('name');
-    }
     return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
@@ -124,24 +119,22 @@ class LedgersController extends AppController {
    */
 
   function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    // Get details about the ledger itself (no entries yet)
     $ledger = $this->Ledger->find
       ('first',
        array('contain' =>
 	     array(// Models
 		   'Account',
 		   ),
-	     'conditions' => array(array('Ledger.id' => $id),
+	     'conditions' => array(array('Ledger.id' => $id)),
-				   array('Account.level >=' =>
-					 $this->Permission->level('controller.accounts')),
-				   ),
 	     )
        );
 
-    if (empty($ledger)) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
     // Get ledger stats for our summary box
     $stats = $this->Ledger->stats($id);
 

site/controllers/maps_controller.php

@@ -52,7 +52,6 @@ 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");
   }
@@ -86,35 +85,11 @@ class MapsController extends AppController {
 		  'units' => array());
 
     // Find all of the map/unit information from this SiteArea
-    $map = $this->Map->find('first', array('contain' => false,
+    $this->Map->recursive = 2;
-					   'conditions' => array('id' => $id)));
+    $this->Map->SiteArea->unbindModel(array('hasOne' => array('Map')));
-
+    $map = $this->Map->read(null, $id);
-    $units = $this->Map->Unit->find
+    //pr($map);
-      ('all',
+    
-       array('link' =>
-	     array('Map' =>
-		   array('fields' => array()),
-
-		   'CurrentLease' =>
-		   array('fields' => array('id', 'paid_through_date',
-					   $this->Map->Unit->CurrentLease->
-					   delinquentField('CurrentLease')),
-			 'Customer'),
-
-		   'UnitSize' =>
-		   array('fields' => array('id', 'depth', 'width',
-					   'MapsUnit.pt_top',
-					   'MapsUnit.pt_left',
-					   'MapsUnit.transpose')),
-		   ),
-	     'fields' => array('id', 'name', 'status'),
-	     'conditions' => array('Map.id' => $id),
-	     ));
-
-/*     pr(compact('map', 'units')); */
-/*     $this->render('/empty'); */
-/*     return; */
-
     /*****
      * The preference would be to leave all things "screen" related
      * to reside in the view.  However, two separate views need this
@@ -138,7 +113,7 @@ class MapsController extends AppController {
     $info['depth'] = $bottom * $screen_adjustment_factor;
 
     // Go through each unit in the map, calculating the map location
-    foreach ($units AS $unit) {
+    foreach ($map['Unit'] AS $unit) {
       $lft = $unit['MapsUnit']['pt_left'] + $boundary_adjustment;
       $top = $unit['MapsUnit']['pt_top']  + $boundary_adjustment;
 
@@ -157,9 +132,10 @@ class MapsController extends AppController {
       $width *= $screen_adjustment_factor;
       $depth *= $screen_adjustment_factor;
 
+      //$info['units'][$unit['id']] =
       $info['units'][] =
-	array( 'id'     => $unit['Unit']['id'],
+	array( 'id'     => $unit['id'],
-	       'name'   => $unit['Unit']['name'],
+	       'name'   => $unit['name'],
 	       'left'   => $lft,
 	       'right'  => $lft + $width,
 	       'top'    => $top,
@@ -167,15 +143,11 @@ class MapsController extends AppController {
 	       'width'  => $width,
 	       'depth'  => $depth,
 	       'n-s'    => $unit['MapsUnit']['transpose'] ? 0 : 1,
-	       'status' => (($unit['Unit']['status'] === 'OCCUPIED' &&
+	       'status' => $unit['status']
-			     !empty($unit[0]['delinquent']))
-			    ? 'LATE' : $unit['Unit']['status']),
-	       'data' => $unit,
 	       );
     }
 
-/*     pr($info); */
+    //pr($info);
-/*     $this->render('/empty'); exit(); */
     return $info;
   }
 
@@ -188,10 +160,8 @@ class MapsController extends AppController {
    */
 
   function legend($id = null, $requested_width = 400) {
-    $status = array_keys($this->Map->Unit->activeStatusEnums());
+    $status = $this->Map->Unit->activeStatusEnums();
-    $occupied_key = array_search('OCCUPIED', $status);
+    //pr($status);
-    array_splice($status, $occupied_key+1, 0, array('LATE'));
-
     $rows = 2;
     $cols = (int)((count($status) + $rows - 1) / $rows);
 
@@ -221,7 +191,7 @@ class MapsController extends AppController {
     $item_width *= $screen_adjustment_factor;
     $item_depth *= $screen_adjustment_factor;
 
-    foreach ($status AS $code) {
+    foreach ($status AS $code => $value) {
       $info['units'][] = array('name'   => $code,
 			       'status' => $code,
 			       'width'  => $item_width,
@@ -271,9 +241,9 @@ class MapsController extends AppController {
     $info['palate']['unit']['DIRTY']['bg']        = array('red' => 128, 'green' => 192, 'blue' => 192);
     $info['palate']['unit']['VACANT']['bg']       = array('red' =>   0, 'green' => 255, 'blue' => 128);
     $info['palate']['unit']['OCCUPIED']['bg']     = array('red' =>   0, 'green' => 128, 'blue' => 255);
-    $info['palate']['unit']['LATE']['bg']         = array('red' => 255, 'green' => 192, 'blue' => 192);
+    $info['palate']['unit']['LATE']['bg']         = array('red' => 255, 'green' =>  64, 'blue' =>  64);
-    $info['palate']['unit']['LOCKED']['bg']       = array('red' => 255, 'green' =>  64, 'blue' =>  64);
+    $info['palate']['unit']['LOCKED']['bg']       = array('red' => 255, 'green' => 128, 'blue' => 128);
-    $info['palate']['unit']['LIENED']['bg']       = array('red' => 255, 'green' =>   0, 'blue' => 128);
+    $info['palate']['unit']['LIENED']['bg']       = array('red' => 255, 'green' => 192, 'blue' => 192);
 
     // Determine text color to go with each background
     foreach ($info['palate']['unit'] AS &$code) {

site/controllers/statement_entries_controller.php

@@ -2,7 +2,20 @@
 
 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);
+  }
+
+  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -11,7 +24,6 @@ class StatementEntriesController extends AppController {
    */
 
   function index()   { $this->gridView('All Statement Entries'); }
-  function unpaid()  { $this->gridView('Unpaid Charges', 'unreconciled'); }
 
 
   /**************************************************************************
@@ -23,7 +35,7 @@ class StatementEntriesController extends AppController {
    *    to jqGrid.
    */
 
-  function gridDataCountTables(&$params, &$model) {
+  function gridDataTables(&$params, &$model) {
     $link =
       array(// Models
 	    'Transaction' =>
@@ -46,36 +58,27 @@ class StatementEntriesController extends AppController {
 		  ),
 	    );
 
-    if (!empty($params['post']['custom']['statement_entry_id'])) {
+    if (isset($params['post']['custom']['statement_entry_id'])) {
-      $link['ChargeEntry']        = array();
+      $link['DisbursementEntry'] = array();
-      // This query actually represents a union...
+      $link['ChargeEntry']  = array();
-      // 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']);
     }
 
+/*     if ($params['action'] === 'collected') { */
+/*       $link['DisbursementEntry'] = array('Receipt' => array('class' => 'Transaction')); */
+/*       $link['ChargeEntry']  = array('Invoice' => array('class' => 'Transaction')); */
+/*     } */
+
+/*     if (count(array_intersect($params['fields'], array('applied'))) == 1) { */
+/*       $link['DisbursementEntry'] = array(); */
+/*       $link['ChargeEntry']  = array(); */
+/*     } */
+/*     elseif (isset($params['post']['custom']['customer_id']) || isset($params['post']['custom']['lease_id'])) { */
+/*       $link['DisbursementEntry'] = array(); */
+/*     } */
+
     return array('link' => $link);
   }
 
-  function gridDataTables(&$params, &$model) {
-    $tables = $this->gridDataCountTables($params, $model);
-
-    if (in_array('applied', $params['post']['fields'])) {
-      $tables['link'] +=
-	array('ChargeEntry'       => array(),
-	      'DisbursementEntry' => array());
-    }
-
-    return $tables;
-  }
-
   function gridDataFields(&$params, &$model) {
     $fields = parent::gridDataFields($params, $model);
 
@@ -84,13 +87,11 @@ class StatementEntriesController extends AppController {
 		   "   SUM(COALESCE(DisbursementEntry.amount,0))," .
 		   "   SUM(COALESCE(ChargeEntry.amount,0)))" .
 		   " AS 'applied'");
-    }
-    if (in_array('unapplied', $params['post']['fields'])) {
       $fields[] = ("StatementEntry.amount - (" .
 		   "IF(StatementEntry.type = 'CHARGE'," .
 		   "   SUM(COALESCE(DisbursementEntry.amount,0))," .
 		   "   SUM(COALESCE(ChargeEntry.amount,0)))" .
-		   ") AS 'unapplied'");
+		   ") AS 'balance'");
     }
 
     $fields = array_merge($fields,
@@ -116,13 +117,11 @@ class StatementEntriesController extends AppController {
     if (isset($account_id))
       $conditions[] = array('StatementEntry.account_id' => $account_id);
 
-    if (isset($customer_id))
+    if (isset($statement_entry_id)) {
-      $conditions[] = array('StatementEntry.customer_id' => $customer_id);
-
-    if (isset($statement_entry_id))
       $conditions[] = array('OR' =>
 			    array(array('ChargeEntry.id' => $statement_entry_id),
 				  array('DisbursementEntry.id' => $statement_entry_id)));
+    }
 
     return $conditions;
   }
@@ -130,10 +129,7 @@ class StatementEntriesController extends AppController {
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
     $links['StatementEntry'] = array('id');
     $links['Transaction']    = array('id');
-    // REVISIT <AP>: 20090827
+    $links['Account']        = array('name');
-    //  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');
@@ -147,49 +143,34 @@ 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?)
-    if ($index != 'Transaction.stamp' &&
+    $order[] = 'Transaction.stamp ' . $direction;
-	$index != 'StatementEntry.effective_date') {
+    $order[] = 'StatementEntry.effective_date ' . $direction;
-      $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 (in_array('applied', $params['post']['fields'])) {
+      $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'",
 
-    if ($params['action'] === 'unreconciled') {
+				"StatementEntry.amount - (" .
-      $lquery = array('conditions' => $query['conditions']);
+				"IF(StatementEntry.type = 'CHARGE'," .
-      $set = $this->StatementEntry->reconciledSet('CHARGE', $lquery, true);
+				"   SUM(COALESCE(DisbursementEntry.amount,0))," .
+				"   SUM(COALESCE(ChargeEntry.amount,0)))" .
+				") AS 'balance'",
+				);
 
-      $entries = array();
+      //pr(compact('tquery'));
-      foreach ($set['entries'] AS $entry)
+      $total = $model->find('first', $tquery);
-    	$entries[] = $entry['StatementEntry']['id'];
+      $params['userdata']['total']   = $total[0]['applied'];
-
+      $params['userdata']['balance'] = $total[0]['balance'];
-      $query['conditions'] = array('StatementEntry.id' => $entries);
-      $params['userdata']['balance'] = $set['summary']['balance'];
     }
-
+    else {
-    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'");
       $total = $model->find('first', $tquery);
@@ -206,42 +187,10 @@ class StatementEntriesController extends AppController {
    * action: reverse the ledger entry
    */
 
-  function reverse($id = null) {
+  function reverse($id) {
-    if ($this->data) {
+    $this->StatementEntry->reverse($id);
-      //pr($this->data); die();
+    $this->render('/FAKE');
-
+    $this->redirect(array('action'=>'view', $id));
-      $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'));
   }
 
 
@@ -257,53 +206,6 @@ 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'));
-  }
-
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -312,27 +214,25 @@ class StatementEntriesController extends AppController {
    */
 
   function view($id = null) {
-    $entry = $this->StatementEntry->find
+    if (!$id) {
-      ('first',
-       array('contain' => array
-	     ('Transaction' => array('fields' => array('id', 'type', 'stamp')),
-	      'Account' => array('id', 'name', 'type', 'level'),
-	      'Customer' => array('fields' => array('id', 'name')),
-	      'Lease' => array('fields' => array('id', 'number')),
-	      ),
-
-	     'conditions' => array(array('StatementEntry.id' => $id),
-				   ),
-	     ));
-
-    if (empty($entry)) {
       $this->Session->setFlash(__('Invalid Item.', true));
       $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
     }
 
-    $entry['Account']['link'] =
+    // Get the StatementEntry and related fields
-      $entry['Account']['level'] >=
+    $entry = $this->StatementEntry->find
-      $this->Permission->level('controller.accounts');
+      ('first',
+       array('contain' => array
+	     ('Transaction' => array('fields' => array('id', 'type', 'stamp')),
+	      'Account' => array('id', 'name', 'type'),
+	      'Customer' => array('fields' => array('id', 'name')),
+	      'Lease' => array('fields' => array('id')),
+	      ),
+
+	     'conditions' => array('StatementEntry.id' => $id),
+	     ));
+    
+    $reconciled = $this->StatementEntry->reconciledEntries($id);
 
     $stats = $this->StatementEntry->stats($id);
 
@@ -344,21 +244,34 @@ class StatementEntriesController extends AppController {
 
     if (strtoupper($entry['StatementEntry']['type']) === 'CHARGE') {
 
+      $reversal = $this->StatementEntry->find
+	('first',
+	 array('link' => array('DisbursementEntry'),
+	       'conditions' => array(array('StatementEntry.id' => $id),
+				     array('DisbursementEntry.type' => 'REVERSAL')),
+	       ));
+
       // Set up dynamic menu items
-      if ($this->StatementEntry->reversable($id))
+      if (empty($reversal) || $stats['balance'] > 0)
-	$this->addSideMenuLink('Reverse',
+	$this->sidemenu_links[] =
-			       array('action' => 'reverse', $id), null,
+	  array('name' => 'Operations', 'header' => true);
-			       'ACTION');
+
+      if (empty($reversal))
+	$this->sidemenu_links[] =
+	  array('name' => 'Reverse',
+		'url' => array('action' => 'reverse',
+			       $id));
 
       if ($stats['balance'] > 0)
-	$this->addSideMenuLink('Waive Balance',
+	$this->sidemenu_links[] =
-			       array('action' => 'waive', $id), null,
+	  array('name' => 'Waive Balance',
-			       'ACTION');
+		'url' => array('action' => 'waive',
+			       $id));
     }
 
     // Prepare to render.
     $title = "Statement Entry #{$entry['StatementEntry']['id']}";
-    $this->set(compact('entry', 'title', 'stats'));
+    $this->set(compact('entry', 'title', 'reconciled', 'stats'));
   }
 
 }

site/controllers/tenders_controller.php

@@ -2,7 +2,20 @@
 
 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);
+  }
+
+  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -62,7 +75,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);
   }
 
@@ -102,33 +115,15 @@ class TendersController extends AppController {
    */
 
   function nsf($id = null) {
-    if ($this->data) {
-      $result = $this->Tender->nsf
-	($this->data['Tender']['id'],
-	 $this->data['Transaction']['stamp'],
-	 $this->data['Transaction']['comment']);
-      $this->redirect(array('controller' => 'tenders',
-			    'action' => 'view',
-			    $this->data['Tender']['id']));
-    }
-
     if (!$id) {
       $this->Session->setFlash(__('Invalid Item.', true));
       $this->redirect(array('action'=>'index'));
     }
 
-    $this->Tender->id = $id;
+    $this->Tender->nsf($id);
-    $tender = $this->Tender->find
+    $this->redirect(array('action'=>'view', $id));
-      ('first', array
-       ('contain' => array('Customer', 'LedgerEntry' => array('Transaction')),
-	));
-
-    // Prepare to render.
-    $title = "Tender #{$tender['Tender']['id']} : {$tender['Tender']['name']} : NSF";
-    $this->set(compact('tender', 'title'));
   }
 
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -143,7 +138,6 @@ class TendersController extends AppController {
     }
 
     // Get the Tender and related fields
-    $this->Tender->id = $id;
     $tender = $this->Tender->find
       ('first', array
        ('contain' => array('TenderType', 'Customer', 'LedgerEntry' => array('Transaction')),
@@ -154,87 +148,20 @@ class TendersController extends AppController {
 	&& empty($tender['Tender']['nsf_transaction_id'])
 	// Hard to tell what types of items can come back as NSF.
 	// For now, assume iff it is a named item, it can be NSF.
-	// (or if we're in development mode)
+	&& !empty($tender['TenderType']['data1_name'])
-	&& (!empty($tender['TenderType']['data1_name']) || !empty($this->params['dev']))
 	) {
-      $this->addSideMenuLink('NSF',
+      // Set up dynamic menu items
-			     array('action' => 'nsf', $id), null,
+      $this->sidemenu_links[] =
-			     'ACTION');
+	array('name' => 'Operations', 'header' => true);
+
+      $this->sidemenu_links[] =
+	array('name' => 'NSF',
+	      'url' => array('action' => 'nsf',
+			     $id));
     }
 
-    // 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']}";
+    $title = "Tender #{$tender['Tender']['id']}";
     $this->set(compact('tender', 'title'));
   }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: edit
-   *  - Edit tender information
-   */
-
-  function edit($id = null) {
-    if (isset($this->data)) {
-      // Check to see if the operation was cancelled.
-      if (isset($this->params['form']['cancel'])) {
-	if (empty($this->data['Tender']['id']))
-	  $this->redirect(array('action'=>'index'));
-
-	$this->redirect(array('action'=>'view', $this->data['Tender']['id']));
-      }
-
-      // Make sure we have tender data
-      if (empty($this->data['Tender']) || empty($this->data['Tender']['id']))
-	$this->redirect(array('action'=>'index'));
-
-      // Figure out which tender type was chosen
-      // REVISIT <AP>: 20090810; Not ready to change tender type
-      // $tender_type_id = $this->data['Tender']['tender_type_id'];
-      $tender_type_id = $this->Tender->field('tender_type_id');
-      if (empty($tender_type_id))
-	$this->redirect(array('action'=>'view', $this->data['Tender']['id']));
-
-      // Get data fields from the selected tender type
-      $this->data['Tender'] += $this->data['type'][$tender_type_id];
-      unset($this->data['type']);
-
-      // Save the tender and all associated data
-      $this->Tender->create();
-      $this->Tender->id = $this->data['Tender']['id'];
-      if (!$this->Tender->save($this->data, false)) {
-	$this->Session->setFlash("TENDER SAVE FAILED", true);
-	pr("TENDER SAVE FAILED");
-      }
-
-      $this->redirect(array('action'=>'view', $this->Tender->id));
-    }
-
-    if ($id) {
-      $this->data = $this->Tender->findById($id);
-    } else {
-      $this->redirect(array('action'=>'index'));
-    }
-
-    $tender_types = $this->Tender->TenderType->find
-      ('list', array('order' => array('name')));
-    $this->set(compact('tender_types'));
-
-    $types = $this->Tender->TenderType->find('all', array('contain' => false));
-    $this->set(compact('types'));
-
-    // Prepare to render.
-    $title = ('Tender #' . $this->data['Tender']['id'] .
-	      ' : ' . $this->data['Tender']['name'] .
-	      " : Edit");
-    $this->set(compact('title'));
-  }
 }

site/controllers/transactions_controller.php

@@ -4,38 +4,26 @@ 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: addGridViewSideMenuLinks
+   * override: sideMenuLinks
-   *  - Adds grid view navigation side menu links
+   *  - Generates controller specific links for the side menu
    */
-
+  function sideMenuLinks() {
-  function addGridViewSideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-    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);
   }
 
-
+  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -47,18 +35,7 @@ class TransactionsController extends AppController {
   function all()      { $this->gridView('All Transactions', 'all'); }
   function invoice()  { $this->gridView('Invoices'); }
   function receipt()  { $this->gridView('Receipts'); }
-  function deposit()  {
+  function deposit()  { $this->gridView('Deposits'); }
-/*     $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);
-  }
 
 
   /**************************************************************************
@@ -71,19 +48,13 @@ class TransactionsController extends AppController {
    */
 
   function gridDataCountTables(&$params, &$model) {
-    return array
+    return parent::gridDataTables($params, $model);
-      ('link' =>
-       array(// Models
-	     'Account' => array('fields' => array()),
-	     ),
-       );
   }
 
   function gridDataTables(&$params, &$model) {
     $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;
   }
 
@@ -106,9 +77,7 @@ class TransactionsController extends AppController {
   }
 
   function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
-    $links['Transaction'] = array('id', 'action' => ($params['action'] == 'deposit'
+    $links['Transaction'] = array('id');
-						     ? 'deposit_slip' : 'view'));
-    $links['Customer'] = array('name');
     return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
@@ -120,7 +89,7 @@ class TransactionsController extends AppController {
    *  - handles the creation of a charge invoice
    */
 
-  function postInvoice($redirect = true) {
+  function postInvoice() {
     if (!$this->RequestHandler->isPost()) {
       echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
       return;
@@ -135,17 +104,6 @@ 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; 
@@ -159,7 +117,7 @@ class TransactionsController extends AppController {
    *  - handles the creation of a receipt
    */
 
-  function postReceipt($redirect = true) {
+  function postReceipt() {
     if (!$this->RequestHandler->isPost()) {
       echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
       return;
@@ -183,11 +141,6 @@ 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; 
@@ -300,7 +253,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',
@@ -322,6 +275,9 @@ class TransactionsController extends AppController {
     }
 
     $data = $this->data;
+    $data['Entry'][0]['account_id'] =
+      $this->Transaction->Account->badDebtAccountID();
+
     if (empty($data['Customer']['id']))
       $data['Customer']['id'] = null;
     if (empty($data['Lease']['id']))
@@ -329,9 +285,9 @@ class TransactionsController extends AppController {
 
     pr(compact('data'));
 
-    if (!$this->Transaction->addWriteOff($data,
+    if (!$this->Transaction->addReceipt($data,
-					 $data['Customer']['id'],
+					$data['Customer']['id'],
-					 $data['Lease']['id'])) {
+					$data['Lease']['id'])) {
       $this->Session->setFlash("WRITE OFF FAILED", true);
       // REVISIT <AP> 20090706:
       // Until we can work out the session problems,
@@ -339,6 +295,8 @@ class TransactionsController extends AppController {
       die("<H1>WRITE-OFF FAILED</H1>");
     }
 
+    $this->render('/fake');
+
     // Return to viewing the lease/customer
     if (empty($data['Lease']['id']))
       $this->redirect(array('controller' => 'customers',
@@ -380,6 +338,8 @@ class TransactionsController extends AppController {
       die("<H1>REFUND FAILED</H1>");
     }
 
+    $this->render('/fake');
+
     // Return to viewing the lease/customer
     if (empty($data['Lease']['id']))
       $this->redirect(array('controller' => 'customers',
@@ -392,23 +352,6 @@ class TransactionsController extends AppController {
   }
 
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: destroy
-   *  - Deletes a transaction and associated entries
-   *  - !!WARNING!!  This should be used with EXTREME caution, as it
-   *    irreversibly destroys the data.  It is not for normal use.
-   */
-
-  function destroy($id) {
-    $this->Transaction->id = $id;
-    $customer_id = $this->Transaction->field('customer_id');
-    $this->Transaction->destroy($id);
-    $this->redirect(array('controller' => 'customers', 'action' => 'view', $customer_id));
-  }
-
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -417,39 +360,34 @@ class TransactionsController extends AppController {
    */
 
   function view($id = null) {
-    $transaction = $this->Transaction->find
+    if (!$id) {
-      ('first',
-       array('contain' =>
-	     array(// Models
-		   'Account(id,name,level)',
-		   'Ledger(id,sequence)',
-		   'NsfTender(id,name)',
-		   ),
-	     'conditions' => array(array('Transaction.id' => $id),
-				   ),
-	     ));
-
-    if (empty($transaction)) {
       $this->Session->setFlash(__('Invalid Item.', true));
       $this->redirect(array('action'=>'index'));
     }
 
-    $transaction['Account']['link'] =
+    $transaction = $this->Transaction->find
-      $transaction['Account']['level'] >=
+      ('first',
-      $this->Permission->level('controller.accounts');
+       array('contain' =>
+	     array(// Models
+		   'Account' =>
+		   array('fields' => array('Account.id',
+					   'Account.name'),
+			 ),
 
-    if ($transaction['Transaction']['type'] === 'DEPOSIT')
+		   'Ledger' =>
-      $this->addSideMenuLink('View Slip',
+		   array('fields' => array('Ledger.id',
-			     array('action' => 'deposit_slip', $id), null,
+					   'Ledger.name'),
-			     'ACTION');
+			 ),
+		   ),
+	     'conditions' => array('Transaction.id' => $id),
+	     ));
 
-    $this->addSideMenuLink('Destroy',
+    if ($transaction['Transaction']['type'] === 'DEPOSIT') {
-			   array('action' => 'destroy', $id),
+      $this->sidemenu_links[] =
-			   array('confirmMessage' =>
+	array('name' => 'Operations',    'header' => true);
-				 "This may leave the database in an unstable state." .
+      $this->sidemenu_links[] =
-				 " Do NOT do this unless you know what you're doing." .
+	array('name' => 'View Slip',  'url' => array('action' => 'deposit_slip', $id));
-				 " Proceed anyway?"),
+    }
-			   'ACTION', $this->admin_area);
 
     // OK, prepare to render.
     $title = 'Transaction #' . $transaction['Transaction']['id'];
@@ -466,12 +404,15 @@ class TransactionsController extends AppController {
    */
 
   function deposit_slip($id) {
-    // Find the deposit transaction
+    // Build a container for the deposit slip data
-    $this->Transaction->id = $id;
+    $deposit = array('types' => array());
-    $deposit = $this->Transaction->find('first', array('contain' => false));
+
+    $this->id = $id;
+    $deposit +=
+      $this->Transaction->find('first', array('contain' => false));
 
     // Get a summary of all forms of tender in the deposit
-    $tenders = $this->Transaction->find
+    $result = $this->Transaction->find
       ('all',
        array('link' => array('DepositTender' =>
 			     array('fields' => array(),
@@ -486,29 +427,32 @@ class TransactionsController extends AppController {
 	     'group' => 'TenderType.id',
 	     ));
 
-    // Verify the deposit exists, and that something was actually deposited
+    if (empty($result)) {
-    if (empty($deposit) || empty($tenders)) {
+      die();
       $this->Session->setFlash(__('Invalid Deposit.', true));
       $this->redirect(array('action'=>'deposit'));
     }
 
     // Add the summary to our deposit slip data container
-    $deposit['types'] = array();
+    foreach ($result AS $type) {
-    foreach ($tenders AS $tender) {
+      $deposit['types'][$type['TenderType']['id']] =
-      $deposit['types'][$tender['TenderType']['id']] =
+	$type['TenderType'] + $type[0];
-	$tender['TenderType'] + $tender[0];
     }
 
-    $deposit_total = 0;
+    // For each form of tender in the deposit, get the deposit items
-    foreach ($deposit['types'] AS $type)
+/*     foreach ($deposit['types'] AS $type_id => &$type) { */
-      $deposit_total += $type['total'];
+/*       $type['entries'] = $this->Transaction->DepositTender->find */
+/* 	('all', */
+/* 	 array('contain' => array('Customer', 'LedgerEntry'), */
+/* 	       'conditions' => array(array('DepositTender.deposit_transaction_id' => $id), */
+/* 				     array('DepositTender.tender_type_id' => $type_id)), */
+/* 	       )); */
+/*     } */
 
-    if ($deposit['Transaction']['amount'] != $deposit_total)
+    $this->sidemenu_links[] =
-      $this->INTERNAL_ERROR("Deposit items do not add up to deposit slip total");
+      array('name' => 'Operations',    'header' => true);
-
+    $this->sidemenu_links[] =
-    $this->addSideMenuLink('View',
+      array('name' => 'View Transaction',  'url' => array('action' => 'view', $id));
-			   array('action' => 'view', $id), null,
-			   'ACTION');
 
     $title = 'Deposit Slip';
     $this->set(compact('title', 'deposit'));

site/controllers/unit_sizes_controller.php

@@ -1,255 +0,0 @@
-<?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,38 +2,26 @@
 
 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: addGridViewSideMenuLinks
+   * override: sideMenuLinks
-   *  - Adds grid view navigation side menu links
+   *  - Generates controller specific links for the side menu
    */
-
+  function sideMenuLinks() {
-  function addGridViewSideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-    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');
   }
 
-
+  
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -45,8 +33,6 @@ 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'); }
 
 
@@ -95,7 +81,6 @@ 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));
   }
@@ -115,12 +100,6 @@ 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;
   }
@@ -160,7 +139,7 @@ class UnitsController extends AppController {
     $customer = array();
     $unit = array();
 
-    if (!empty($id)) {
+    if (isset($id)) {
       $this->Unit->recursive = -1;
       $unit = current($this->Unit->read(null, $id));
     }
@@ -210,84 +189,6 @@ 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'));
-  }
-
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -331,66 +232,37 @@ class UnitsController extends AppController {
       $outstanding_deposit = $this->Unit->Lease->securityDepositBalance($unit['CurrentLease']['id']);
     }
 
-    // If the unit is occupied, but not locked, provide a
+    // Set up dynamic menu items
-    // mechanism to do so.  This doesn't have to be restricted
+    $this->sidemenu_links[] =
-    // to past due customers.  There are times we need to
+      array('name' => 'Operations', 'header' => true);
-    // 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');
 
-    // If the unit is locked, provide an option to unlock it,
+    $this->sidemenu_links[] =
-    // unless it's locked due to lien, which is not so simple.
+      array('name' => 'Edit', 'url' => array('action' => 'edit',
-    if ($this->Unit->locked($unit['Unit']['status']) &&
+					     $id));
-	!$this->Unit->liened($unit['Unit']['status']))
-      $this->addSideMenuLink('Unlock',
-			     array('action' => 'unlock', $id), null,
-			     'ACTION');
 
-    // If there is a current lease on this unit, then provide
+    if (isset($unit['CurrentLease']['id']) &&
-    // a link to move the tenant out.  Current lease for a unit
+	!isset($unit['CurrentLease']['moveout_date'])) {
-    // has a bit different definition than a current lease for
+      $this->sidemenu_links[] =
-    // a customer, since a lease stays with a customer until it
+	array('name' => 'Move-Out', 'url' => array('action' => 'move_out',
-    // is finally closed.  A lease, however, only stays with a
+						   $id));
-    // 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->addSideMenuLink('Move-In',
-			     array('action' => 'move_in', $id), null,
-			     'ACTION');
     } else {
-      // Unit is unavailable (dirty, damaged, reserved, business-use, etc)
+      $this->sidemenu_links[] =
+	array('name' => 'Move-In', 'url' => array('action' => 'move_in',
+						   $id));
     }
 
-    // If there is a current lease, allow new charges to
+    if (isset($unit['CurrentLease']['id']) &&
-    // be added, and payments to be made.
+	!isset($unit['CurrentLease']['close_date'])) {
-    if (isset($unit['CurrentLease']['id'])) {
+      $this->sidemenu_links[] =
-      $this->addSideMenuLink('New Invoice',
+	array('name' => 'Charge', 'url' => array('controller' => 'leases',
-			     array('controller' => 'leases',
+						 'action' => 'invoice',
-				   'action' => 'invoice',
+						 $unit['CurrentLease']['id']));
-				   $unit['CurrentLease']['id']), null,
+      $this->sidemenu_links[] =
-			     'ACTION');
+	array('name' => 'Payment', 'url' => array('controller' => 'customers',
-      $this->addSideMenuLink('New Receipt',
+						  'action' => 'receipt',
-			     array('controller' => 'customers',
+						  $unit['CurrentLease']['customer_id']));
-				   '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',
@@ -433,6 +305,11 @@ class UnitsController extends AppController {
       }
 
       $this->redirect(array('action'=>'view', $this->Unit->id));
+
+      // For debugging, only if the redirects above have been
+      // commented out, otherwise this section isn't reached.
+      $this->render('/fake');
+      return;
     }
 
     if ($id) {
@@ -454,6 +331,7 @@ class UnitsController extends AppController {
     $this->set(compact('unit_sizes'));
 
     // Prepare to render.
+    pr($this->data);
     $this->set(compact('title'));
   }
 

site/controllers/util_controller.php

@@ -1,76 +0,0 @@
-<?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,42 +121,24 @@ class Account extends AppModel {
    *  - Returns the ID of the desired account
    */
 
-  function lookup($name, $check = true) {
+  function securityDepositAccountID()   { return $this->nameToID('Security Deposit'); }
-    $id = $this->nameToID($name);
+  function rentAccountID()              { return $this->nameToID('Rent'); }
-    if (empty($id) && $check)
+  function lateChargeAccountID()        { return $this->nameToID('Late Charge'); }
-      $this->INTERNAL_ERROR("Missing Account '$name'");
+  function nsfAccountID()               { return $this->nameToID('NSF'); }
-    return $id;
+  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 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 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
-  //  quickly be spotted how much is _really_ due, vs
-  //  how much has been pre-paid.  Customer credits in
-  //  A/R is not as clear, although a report is an
-  //  obvious solution.
-								 //'A/R'
-								 'Credit'
-								 ); }
 
   /**************************************************************************
    **************************************************************************
@@ -188,7 +170,8 @@ class Account extends AppModel {
   function relatedAccounts($attribute, $extra = null) {
     $this->cacheQueries = true;
     $accounts = $this->find('all', array
-			    ('fields' => array('Account.id', 'Account.name'),
+			    ('contain' => array('CurrentLedger'),
+			     'fields' => array('Account.id', 'Account.type', 'Account.name', 'CurrentLedger.id'),
 			     'conditions' => array('Account.'.$attribute => true),
 			     'order' => array('Account.name'),
 			     ) + (isset($extra) ? $extra : array())
@@ -212,10 +195,21 @@ class Account extends AppModel {
    *  - Returns an array of accounts suitable for activity xxx
    */
 
-  function invoiceAccounts()  { return $this->relatedAccounts('invoices'); }
+  function invoiceAccounts() {
-  function receiptAccounts()  { return $this->relatedAccounts('receipts'); }
+    return $this->relatedAccounts('invoices', array('order' => 'name'));
-  function depositAccounts()  { return $this->relatedAccounts('deposits'); }
+  }
-  function refundAccounts()   { return $this->relatedAccounts('refunds'); }
+
+  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'));
+  }
 
 
   /**************************************************************************
@@ -228,28 +222,12 @@ class Account extends AppModel {
   function collectableAccounts() {
     $accounts = $this->receiptAccounts();
 
-    foreach(array($this->customerCreditAccountID(),
+    foreach(array($this->nsfAccountID(),
-		  $this->securityDepositAccountID(),
+		  $this->securityDepositAccountID())
-		  $this->nsfAccountID(),
-		  $this->waiverAccountID(),
-		  $this->badDebtAccountID(),
-		  //$this->lookup('Closing'),
-		  //$this->lookup('Equity'),
-		  )
 	    AS $account_id) {
       $accounts[$account_id] = $this->name($account_id);
     }
 
-    $accounts['all'] = $accounts['default'] = $accounts;
-
-    foreach(array($this->concessionAccountID(),
-		  $this->waiverAccountID(),
-		  $this->badDebtAccountID(),
-		  )
-	    AS $account_id) {
-      unset($accounts['default'][$account_id]);
-    }
-
     return $accounts;
   }
 
@@ -365,7 +343,6 @@ class Account extends AppModel {
     $this->queryInit($query);
     $query['link'] = array('Account' => $query['link']);
 
-    $stats = array();
     foreach ($this->ledgers($id, $all) AS $ledger)
       $this->statsMerge($stats['Ledger'],
 			$this->Ledger->stats($ledger, $query));

site/models/contact.php

@@ -41,15 +41,14 @@ 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']['last_name'] . ', ' . $data['Contact']['first_name'];
+	(($data['Contact']['first_name'] &&
-
+	  $data['Contact']['last_name'])
-    foreach (array('last_name', 'first_name', 'company_name') AS $fld) {
+	 ? $data['Contact']['last_name'] . ', ' . $data['Contact']['first_name']
-      if (!$data['Contact']['display_name'] && $data['Contact'][$fld])
+	 : ($data['Contact']['first_name']
-      $data['Contact']['display_name'] = $data['Contact'][$fld];
+	    ? $data['Contact']['first_name']
-    }
+	    : $data['Contact']['last_name']));
 
     // Save the contact data
     $this->create();

site/models/customer.php

@@ -20,25 +20,15 @@ class Customer extends AppModel {
 		),
 		'Lease',
 		'StatementEntry',
-		'ContactsCustomer' => array(
+		'ContactsCustomer',
-			// 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' => array(
+		'Contact',
-			'unique' => true,
-		),
 	);
 
-	//var $default_log_level = 20;
 
   /**************************************************************************
    **************************************************************************
@@ -64,19 +54,17 @@ class Customer extends AppModel {
    * function: leaseIds
    *  - Returns the lease IDs for the given customer
    */
-  function leaseIds($id, $current = false) {
+  function leaseIds($id) {
-    $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;
@@ -113,35 +101,12 @@ class Customer extends AppModel {
     $this->prEnter(compact('id', 'query'));
     $this->queryInit($query);
 
-    $sd_account_id =
+    $query['conditions'][] = array('StatementEntry.customer_id' => $id);
-      $this->StatementEntry->Account->securityDepositAccountID();
+    $query['conditions'][] = array('StatementEntry.account_id' =>
+				   $this->StatementEntry->Account->securityDepositAccountID());
 
-    $squery = $query;
+    $stats = $this->StatementEntry->stats(null, $query);
-    $squery['conditions'][] = array('StatementEntry.customer_id' => $id);
+    return $this->prReturn($stats['account_balance']);
-    $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']);
   }
 
 
@@ -177,8 +142,10 @@ class Customer extends AppModel {
 	continue;
 
       $I = new Contact();
-      if (!$I->saveContact(null, array('Contact' => $contact)))
+      $I->create();
+      if (!$I->save($contact, false)) {
 	return false;
+      }
       $contact['id'] = $I->id;
     }
 
@@ -202,13 +169,6 @@ 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.
@@ -243,162 +203,6 @@ class Customer extends AppModel {
   }
 
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: update
-   *  - Update any cached or calculated fields
-   */
-  function update($id) {
-    $this->prEnter(compact('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',
-		  // 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) {
-      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

@@ -1,21 +0,0 @@
-<?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

@@ -1,21 +0,0 @@
-<?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,27 +53,12 @@ class DoubleEntry extends AppModel {
    */
 
   function addDoubleEntry($entry1, $entry2, $entry1_tender = null) {
-    //$this->prFunctionLevel(16);
+/*     pr(array('DoubleEntry::addDoubleEntry' => */
-    $this->prEnter(compact('entry1', 'entry2', 'entry1_tender'));
+/* 	     compact('entry1', 'entry2', 'entry1_tender'))); */
 
     $ret = array();
     if (!$this->verifyDoubleEntry($entry1, $entry2, $entry1_tender))
-      return $this->prReturn(array('error' => true) + $ret);
+      return array('error' => true) + $ret;
-
-    // Handle the case where a double entry involves the same
-    // exact ledger.  This would not serve any useful purpose.
-    // It is not, however, an error.  It is semantically correct
-    // just not really logically correct.  To make this easier,
-    // just ensure ledger_id is set for each entry, even though
-    // it would be handled later by the LedgerEntry model.
-    //array($entry1, $entry2) AS &$entry) {
-    for ($i=1; $i <= 2; ++$i) {
-      if (empty(${'entry'.$i}['ledger_id']))
-	${'entry'.$i}['ledger_id'] =
-	  $this->DebitEntry->Account->currentLedgerID(${'entry'.$i}['account_id']);
-    }
-    if ($entry1['ledger_id'] == $entry2['ledger_id'])
-      return $this->prReturn(array('error' => false));
 
     // Since this model only relates to DebitEntry and CreditEntry...
     $LE = new LedgerEntry();
@@ -82,13 +67,13 @@ class DoubleEntry extends AppModel {
     $result = $LE->addLedgerEntry($entry1, $entry1_tender);
     $ret['Entry1'] = $result;
     if ($result['error'])
-      return $this->prReturn(array('error' => true) + $ret);
+      return array('error' => true) + $ret;
     
     // Add the second ledger entry to the database
     $result = $LE->addLedgerEntry($entry2);
     $ret['Entry2'] = $result;
     if ($result['error'])
-      return $this->prReturn(array('error' => true) + $ret);
+      return array('error' => true) + $ret;
 
     // Now link them as a double entry
     $double_entry = array();
@@ -97,13 +82,15 @@ class DoubleEntry extends AppModel {
     $double_entry['credit_entry_id'] = 
       ($entry1['crdr'] === 'CREDIT') ? $ret['Entry1']['ledger_entry_id'] : $ret['Entry2']['ledger_entry_id'];
 
-    $ret['data'] = $double_entry;
+/*     pr(array('DoubleEntry::addDoubleEntry' => */
+/* 	     array('checkpoint' => 'Pre-Save') */
+/* 	     + compact('double_entry'))); */
 
     $this->create();
     if (!$this->save($double_entry))
-      return $this->prReturn(array('error' => true) + $ret);
+      return array('error' => true) + $ret;
 
     $ret['double_entry_id'] = $this->id;
-    return $this->prReturn($ret + array('error' => false));
+    return $ret + array('error' => false);
   }
 }

site/models/group.php

@@ -1,38 +0,0 @@
-<?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

@@ -1,25 +0,0 @@
-<?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

@@ -1,25 +0,0 @@
-<?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

@@ -12,7 +12,7 @@ class Lease extends AppModel {
 		'StatementEntry',
 	);
 
-	//var $default_log_level = array('log' => 30, 'show' => 30);
+	//var $default_log_level = array('log' => 30, 'show' => 15);
 
   /**************************************************************************
    **************************************************************************
@@ -44,26 +44,26 @@ class Lease extends AppModel {
     $this->prEnter(compact('id', 'query'));
     $this->queryInit($query);
 
-    // REVISIT <AP>: 20090807
-    //  Let's try simplifying the security deposit issue.
-    //  Presume that security deposits are NOT used at all,
-    //  until the customer moves out of the unit.  At that
-    //  time, the ENTIRE deposit is converted to customer
-    //  credit.  Piece of cake.
-    //  For more information, see file revision history,
-    //  including the revision just before this, r503.
-
-    $this->id = $id;
-    $moveout_date = $this->field('moveout_date');
-    if (!empty($moveout_date))
-      return $this->prReturn(0);
-
     $query['conditions'][] = array('StatementEntry.lease_id' => $id);
     $query['conditions'][] = array('StatementEntry.account_id' =>
 				   $this->StatementEntry->Account->securityDepositAccountID());
 
+    // REVISIT <AP>: 20090804
+    //  Dilemma... how to handle security deposits used to pay
+    //  charges on the lease, yet are not part of the lease
+    //  security deposit(s)?  For example, Lease A & Lease B,
+    //  each with $25 Sec. Dep.  Move out of Lease A, and
+    //  promote the lease surplus to the customer.  A new
+    //  charge on Lease B for $15, which is assigned $15/$25
+    //  from the promoted Lease A surplus.  They way this
+    //  function works at present, it will presume the $15 is
+    //  part of the security deposit balance, and will end up
+    //  calculating it as only $10, which is wrong.  Perhaps
+    //  the fix is to release security deposits into some sort
+    //  of income account.
+
     $stats = $this->StatementEntry->stats(null, $query);
-    return $this->prReturn($stats['Charge']['disbursement']);
+    return $this->prReturn($stats['account_balance']);
   }
 
 
@@ -113,12 +113,8 @@ class Lease extends AppModel {
     $customer_id = $secdeps[0]['StatementEntry']['customer_id'];
     $lease_id    = $secdeps[0]['StatementEntry']['lease_id'];
 
-    // Add receipt of the security deposit funds.  Do NOT
-    // flag them as part of the lease, as all received funds
-    // are only associated with the customer, for future
-    // (or present) disbursement on any lease.
     $result = $this->StatementEntry->Transaction->addReceipt
-      ($release, $customer_id, null);
+      ($release, $customer_id, $lease_id);
 
     return $this->prReturn($result);
   }
@@ -148,11 +144,8 @@ class Lease extends AppModel {
 		   array('class' => 'StatementEntry',
 			 'fields' => array(),
 			 'conditions' => array
-			 ('SEx.lease_id = StatementEntry.lease_id',
+			 ('SEx.effective_date = DATE_ADD(StatementEntry.through_date, INTERVAL 1 day)',
-			  'SEx.type' => 'CHARGE',
+			  'SEx.lease_id = StatementEntry.lease_id',
-			  'SEx.account_id' => $rent_account_id,
-			  'SEx.reverse_transaction_id IS NULL',
-			  'SEx.effective_date = DATE_ADD(StatementEntry.through_date, INTERVAL 1 day)',
 			  ),
 			 ),
 		   ),
@@ -162,7 +155,6 @@ 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),
 				   ),
 	     )
@@ -172,35 +164,6 @@ class Lease extends AppModel {
   }
 
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: lateCharges
-   *  - Returns a list of late charges from this lease
-   */
-
-  function lateCharges($id) {
-    $this->prEnter(compact('id'));
-    $late_account_id = $this->StatementEntry->Account->lateChargeAccountID();
-    $entries = $this->StatementEntry->find
-      ('all',
-       array('link' =>
-	     array(// Models
-		   'Lease',
-		   ),
-
-	     //'fields' => array('id', 'amount', 'effective_date', 'through_date'),
-	     'conditions' => array(array('Lease.id' => $id),
-				   array('StatementEntry.type' => 'CHARGE'),
-				   array('StatementEntry.account_id' => $late_account_id),
-				   ),
-	     )
-       );
-
-    return $this->prReturn($entries);
-  }
-
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -263,9 +226,7 @@ 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'),
 	     ),
@@ -284,9 +245,7 @@ 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'),
 	     ),
@@ -304,261 +263,6 @@ class Lease extends AppModel {
   }
 
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: assessMonthlyRent
-   *  - Charges rent for the month, if not already charged.
-   */
-
-  function assessMonthlyRent($id, $date = null) {
-    $this->prEnter(compact('id', 'date'));
-    $this->id = $id;
-
-    if (empty($date))
-      $date = time();
-
-    if (is_string($date))
-      $date = strtotime($date);
-
-    // REVISIT <AP>: 20090808
-    //  Anniversary Billing not supported
-    $anniversary = 0 && $this->field('anniversary_billing');
-    if (empty($anniversary)) {
-      $date_parts = getdate($date);
-      $date = mktime(0, 0, 0, $date_parts['mon'], 1, $date_parts['year']);
-    }
-
-    // Make sure we're not trying to assess rent on a closed lease
-    $close_date = $this->field('close_date');
-    $this->pr(17, compact('close_date'));
-    if (!empty($close_date))
-      return $this->prReturn(null);
-
-    // Don't assess rent after customer has moved out
-    $moveout_date = $this->field('moveout_date');
-    $this->pr(17, compact('moveout_date'));
-    if (!empty($moveout_date) && strtotime($moveout_date) < $date)
-      return $this->prReturn(null);
-
-    // Determine when the customer has already been charged through
-    // and, of course, don't charge them if they've already been.
-    $charge_through_date = strtotime($this->rentChargeThrough($id));
-    $this->pr(17, compact('date', 'charge_through_date')
-	      + array('date_str' => date('Y-m-d', $date),
-		      'charge_through_date_str' => date('Y-m-d', $charge_through_date)));
-    if ($charge_through_date >= $date)
-      return $this->prReturn(null);
-
-    // OK, it seems we're going to go ahead and charge the customer
-    // on this lease.  Calculate the new charge through date, which
-    // is 1 day shy of 1 month from $date.  For example, if we're
-    // charging for 8/1/09, charge through will be 8/31/09, and
-    // charging for 8/15/09, charge through will be 9/14/09.
-    $date_parts = getdate($date);
-    $charge_through_date = mktime(0, 0, 0,
-				  $date_parts['mon']+1,
-				  $date_parts['mday']-1,
-				  $date_parts['year']);
-
-    // Build the invoice transaction
-    $invoice = array('Transaction' => array(), 'Entry' => array());
-    // REVISIT <AP>: 20090808
-    //  Keeping Transaction.stamp until the existing facility
-    //  is up to date.  Then we want the stamp to be now()
-    //  (and so can just delete the next line).
-    $invoice['Transaction']['stamp'] = date('Y-m-d', $date);
-    $invoice['Entry'][] =
-      array('effective_date' => date('Y-m-d', $date),
-	    'through_date' => date('Y-m-d', $charge_through_date),
-	    'amount' => $this->field('rent'),
-	    'account_id' => $this->StatementEntry->Account->rentAccountId(),
-	    );
-
-    // Record the invoice and return the result
-    $this->pr(21, compact('invoice'));
-    $result = $this->StatementEntry->Transaction->addInvoice
-      ($invoice, null, $id);
-    return $this->prReturn($result);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: assessMonthlyRentAll
-   *  - Ensures rent has been charged on all open leases
-   */
-
-  function assessMonthlyRentAll($date = null) {
-    $this->prEnter(compact('date'));
-    $leases = $this->find
-      ('all', array('contain' => false,
-		    'conditions' => array('Lease.close_date' => null),
-		    ));
-
-    $ret = array('Lease' => array());
-    foreach ($leases AS $lease) {
-      $result = $this->assessMonthlyRent($lease['Lease']['id'], $date);
-      $ret['Lease'][$lease['Lease']['id']] = $result;
-      if ($result['error'])
-	$ret['error'] = true;
-    }
-    return $this->prReturn($ret + array('error' => false));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: assessMonthlyLate
-   *  - Assess late charges for the month, if not already charged.
-   */
-
-  function assessMonthlyLate($id, $date = null) {
-    $this->prEnter(compact('id', 'date'));
-    $this->id = $id;
-
-    if (empty($date))
-      $date = time();
-
-    if (is_string($date))
-      $date = strtotime($date);
-
-    // REVISIT <AP>: 20090808
-    //  Anniversary Billing not supported
-    $anniversary = 0 && $this->field('anniversary_billing');
-    if (empty($anniversary)) {
-      $date_parts = getdate($date);
-      $date = mktime(0, 0, 0, $date_parts['mon'], 11, $date_parts['year']);
-    }
-
-    // Don't assess a late charge if the late charge date hasn't
-    // even come yet.  This is questionable whether we really
-    // should restrict, since the user could know what they're
-    // doing, and/or the server clock could be off (although that
-    // would certainly have much larger ramifications).  But, the
-    // fact is that this check likely handles the vast majority
-    // of the expected behavior, and presents an issue for very
-    // few users, if any at all.
-    if ($date > time())
-      return $this->prReturn(null);
-
-    // Make sure we're not trying to assess late charges on a closed lease
-    $close_date = $this->field('close_date');
-    $this->pr(17, compact('close_date'));
-    if (!empty($close_date))
-      return $this->prReturn(null);
-
-    // Don't assess late charges after customer has moved out
-    $moveout_date = $this->field('moveout_date');
-    $this->pr(17, compact('moveout_date'));
-    if (!empty($moveout_date) && strtotime($moveout_date) < $date)
-      return $this->prReturn(null);
-
-    // Determine when the customer has been charged through for rent
-    // and don't mark them as late if they haven't even been charged rent
-    $charge_through_date = strtotime($this->rentChargeThrough($id));
-    $this->pr(17, compact('date', 'charge_through_date')
-	      + array('date_str' => date('Y-m-d', $date),
-		      'charge_through_date_str' => date('Y-m-d', $charge_through_date)));
-    if ($charge_through_date <= $date)
-      return $this->prReturn(null);
-
-    // Determine if the customer is actually late.  This is based on
-    // when they've paid through, plus 10 days before they're late.
-    // REVISIT <AP>: 20090813
-    //   Of course, 10 days is a terrible hardcode.  This should be
-    //   driven from the late schedule, saved as part of the lease
-    //   (when finally implemented).
-    $paid_through_date = strtotime($this->rentPaidThrough($id));
-    $this->pr(17, compact('date', 'paid_through_date')
-	      + array('date_str' => date('Y-m-d', $date),
-		      'paid_through_date_str' => date('Y-m-d', $paid_through_date)));
-    $date_parts = getdate($paid_through_date);
-    $paid_through_date = mktime(0, 0, 0, $date_parts['mon'], $date_parts['mday']+10, $date_parts['year']);
-    if ($paid_through_date >= $date)
-      return $this->prReturn(null);
-
-    // Determine if the customer has already been charged a late fee
-    // and, of course, don't charge them if they've already been.
-    $late_charges = $this->lateCharges($id);
-    foreach ($late_charges AS $late) {
-      if (strtotime($late['StatementEntry']['effective_date']) == $date)
-	return $this->prReturn(null);
-    }
-
-    // Build the invoice transaction
-    $invoice = array('Transaction' => array(), 'Entry' => array());
-    // REVISIT <AP>: 20090808
-    //  Keeping Transaction.stamp until the existing facility
-    //  is up to date.  Then we want the stamp to be now()
-    //  (and so can just delete the next line).
-    $invoice['Transaction']['stamp'] = date('Y-m-d', $date);
-    $invoice['Entry'][] =
-      array('effective_date' => date('Y-m-d', $date),
-	    'amount' => 10,
-	    'account_id' => $this->StatementEntry->Account->lateChargeAccountId(),
-	    );
-
-    // Record the invoice and return the result
-    $this->pr(21, compact('invoice'));
-    $result = $this->StatementEntry->Transaction->addInvoice
-      ($invoice, null, $id);
-    return $this->prReturn($result);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: assessMonthlyLateAll
-   *  - Ensures rent has been charged on all open leases
-   */
-
-  function assessMonthlyLateAll($date = null) {
-    $this->prEnter(compact('date'));
-    $leases = $this->find
-      ('all', array('contain' => false,
-		    'conditions' => array('Lease.close_date' => null),
-		    ));
-
-    $ret = array('Lease' => array());
-    foreach ($leases AS $lease) {
-      $result = $this->assessMonthlyLate($lease['Lease']['id'], $date);
-      $ret['Lease'][$lease['Lease']['id']] = $result;
-      if ($result['error'])
-	$ret['error'] = true;
-    }
-    return $this->prReturn($ret + array('error' => false));
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * functions: delinquency
-   *  - SQL fragments to determine whether a lease is delinquent
-   */
-
-  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 1 DAY))");
-  }
-
-  function delinquentDaysSQL($table_name = 'Lease') {
-    if (empty($table_name)) $t = ''; else $t = $table_name . '.';
-    return ("IF(" . $this->conditionDelinquent($table_name) . "," .
-	    "   DATEDIFF(NOW(), {$t}paid_through_date)-1," .
-	    "   NULL)");
-  }
-
-  function delinquentField($table_name = 'Lease') {
-    return ($this->delinquentDaysSQL($table_name) . " AS 'delinquent'");
-  }
-
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -657,7 +361,7 @@ class Lease extends AppModel {
    */
 
   function moveOut($id, $status = 'VACANT',
-		   $stamp = null, $close = true)
+		   $stamp = null, $close = false)
   {
     $this->prEnter(compact('id', 'status', 'stamp', 'close'));
 
@@ -747,13 +451,12 @@ class Lease extends AppModel {
     if (isset($this->data['Lease']['close_date']))
       return $this->prReturn(false);
 
-    // A lease can only be closed if there are no outstanding
+    $deposit_balance = $this->securityDepositBalance($id);
-    // security deposits ...
+    $stats = $this->stats($id);
-    if ($this->securityDepositBalance($id) != 0)
-      return $this->prReturn(false);
 
-    // ... and if the account balance is zero.    
+    // A lease can only be closed if there are no outstanding
-    if ($this->balance($id) != 0)
+    // security deposits, and if the account balance is zero.
+    if ($deposit_balance != 0)
       return $this->prReturn(false);
 
     // Apparently this lease meets all the criteria!
@@ -792,25 +495,6 @@ class Lease extends AppModel {
   }
 
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: update
-   *  - 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));
-
-    $moveout = $this->field('moveout_date');
-    if (empty($moveout))
-      $this->Unit->update($this->field('unit_id'));
-  }
-
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************

site/models/ledger_entry.php

@@ -8,22 +8,8 @@ class LedgerEntry extends AppModel {
 	);
 
 	var $hasOne = array(
-		'Tender' => array(
+		'Tender',
-			'dependent' => true,
+		'DoubleEntry',
-		),
-		'DebitDoubleEntry' => array(
-			'className' => 'DoubleEntry',
-		        'foreignKey' => 'debit_entry_id',
-			'dependent' => true,
-		),
-		'CreditDoubleEntry' => array(
-			'className' => 'DoubleEntry',
-		        'foreignKey' => 'credit_entry_id',
-			'dependent' => true,
-		),
-		'DoubleEntry' => array(
-		        'foreignKey' => false,
-		),
 	);
 
 	var $hasMany = array(
@@ -127,20 +113,24 @@ class LedgerEntry extends AppModel {
    *  - Inserts new Ledger Entry into the database
    */
   function addLedgerEntry($entry, $tender = null) {
-    //$this->prFunctionLevel(16);
+/*     pr(array('LedgerEntry::addLedgerEntry' => */
-    $this->prEnter(compact('entry', 'tender'));
+/* 	     compact('entry', 'tender'))); */
 
-    $ret = array('data' => $entry);
+    $ret = array();
     if (!$this->verifyLedgerEntry($entry, $tender))
-      return $this->prReturn(array('error' => true) + $ret);
+      return array('error' => true) + $ret;
 
     if (empty($entry['ledger_id']))
       $entry['ledger_id'] = 
 	$this->Account->currentLedgerID($entry['account_id']);
 
+/*     pr(array('LedgerEntry::addLedgerEntry' => */
+/* 	     array('checkpoint' => 'Pre-Save') */
+/* 	     + compact('entry'))); */
+
     $this->create();
     if (!$this->save($entry))
-      return $this->prReturn(array('error' => true) + $ret);
+      return array('error' => true) + $ret;
 
     $ret['ledger_entry_id'] = $this->id;
 
@@ -150,10 +140,10 @@ class LedgerEntry extends AppModel {
       $result = $this->Tender->addTender($tender);
       $ret['Tender'] = $result;
       if ($result['error'])
-	return $this->prReturn(array('error' => true) + $ret);
+	return array('error' => true) + $ret;
     }
 
-    return $this->prReturn($ret + array('error' => false));
+    return $ret + array('error' => false);
   }
 
 
@@ -165,13 +155,53 @@ class LedgerEntry extends AppModel {
    */
   function stats($id = null, $query = null, $set = null) {
     $this->queryInit($query);
+    unset($query['group']);
 
-    // REVISIT <AP>: 20090816
+    if (!isset($query['link']['DoubleEntry']))
-    //  This function appeared to be dramatically broken,
+      $query['link']['DoubleEntry'] = array();
-    //  a throwback to an earlier time.  I deleted its
+/*     if (!isset($query['link']['DoubleEntry']['fields'])) */
-    //  contents and added this error to ensure it does
+/*       $query['link']['DoubleEntry']['fields'] = array(); */
-    //  not get used.
+
-    $this->INTERNAL_ERROR('This function should not be used');
+    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;
   }
 
 }

site/models/maps_unit.php

@@ -0,0 +1,15 @@
+<?php
+class MapsUnit extends AppModel {
+
+	var $name = 'MapsUnit';
+	var $validate = array(
+		'id' => array('numeric'),
+		'map_id' => array('numeric'),
+		'unit_id' => array('numeric'),
+		'pt_top' => array('numeric'),
+		'pt_left' => array('numeric'),
+		'transpose' => array('boolean')
+	);
+
+}
+?>

site/models/membership.php

@@ -1,37 +0,0 @@
-<?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

@@ -1,76 +0,0 @@
-<?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

@@ -1,35 +0,0 @@
-<?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

@@ -1,105 +0,0 @@
-<?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

@@ -1,36 +0,0 @@
-<?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,37 +1,16 @@
 <?php
 class Site extends AppModel {
 
-  var $hasMany =
+	var $name = 'Site';
-    array('SiteArea',
+	var $validate = array(
-	  'SiteOption',
+		'id' => array('numeric'),
-	  'Membership',
+		'name' => array('notempty')
-	  );
+	);
 
-  static $current_site_id;
+	var $hasMany = array(
+		'SiteArea',
+		'SiteOption',
+	);
 
-  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

@@ -1,24 +0,0 @@
-<?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

@@ -1,24 +0,0 @@
-<?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

@@ -18,13 +18,11 @@ class StatementEntry extends AppModel {
 		'DisbursementEntry' => array(
 			'className' => 'StatementEntry',
 			'foreignKey' => 'charge_entry_id',
-			'dependent' => true,
 		),
 
 	);
 
-	//var $default_log_level = array('log' => 30, 'show' => 15);
+	var $default_log_level = array('log' => 30, 'show' => 15);
-	var $max_log_level = 19;
 
   /**************************************************************************
    **************************************************************************
@@ -37,7 +35,7 @@ class StatementEntry extends AppModel {
   }
 
   function creditTypes() {
-    return array('DISBURSEMENT', 'WAIVER', 'REVERSAL', 'WRITEOFF', 'SURPLUS');
+    return array('DISBURSEMENT', 'WAIVER', 'REVERSAL', 'SURPLUS');
   }
 
   function voidTypes() {
@@ -125,13 +123,16 @@ class StatementEntry extends AppModel {
   function addStatementEntry($entry) {
     $this->prEnter(compact('entry'));
 
-    $ret = array('data' => $entry);
+    $ret = array();
     if (!$this->verifyStatementEntry($entry))
-      return $this->prReturn(array('error' => true, 'verify_data' => $entry) + $ret);
+      return array('error' => true, 'verify_data' => $entry) + $ret;
+
+    $this->pr(20, array('checkpoint' => 'Pre-Save')
+	      + compact('entry'));
 
     $this->create();
     if (!$this->save($entry))
-      return $this->prReturn(array('error' => true, 'save_data' => $entry) + $ret);
+      return array('error' => true, 'save_data' => $entry) + $ret;
 
     $ret['statement_entry_id'] = $this->id;
     return $this->prReturn($ret + array('error' => false));
@@ -154,7 +155,7 @@ class StatementEntry extends AppModel {
     $charge = $charge['StatementEntry'];
 
     if ($charge['type'] !== 'CHARGE')
-      $this->INTERNAL_ERROR("Waiver item is not CHARGE.");
+      INTERNAL_ERROR("Waiver item is not CHARGE.");
 
     // Query the stats to get the remaining balance
     $stats = $this->stats($id);
@@ -167,6 +168,7 @@ class StatementEntry extends AppModel {
     // Add the charge waiver
     $waiver['Entry'][] =
       array('amount'      => $stats['Charge']['balance'],
+	    'account_id'  => $this->Account->waiverAccountID(),
 	    'comment'     => null,
 	    );
 
@@ -176,64 +178,89 @@ class StatementEntry extends AppModel {
   }
 
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: reversable
-   *  - Returns true if the charge can be reversed; false otherwise
-   */
-  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');
-    if ($charge_type !== 'CHARGE')
-      return $this->prReturn(false);
-
-    // Determine anything reconciled against the charge
-    $reverse_transaction_id = $this->field('reverse_transaction_id');
-    if (!empty($reverse_transaction_id))
-      return $this->prReturn(false);
-
-    return $this->prReturn(true);
-  }
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
    * function: reverse
    *  - Reverses the charges
+   *
    */
-  function reverse($id, $stamp = null, $comment) {
+  function reverse($id, $balance = false, $stamp = null) {
-    $this->prEnter(compact('id', 'stamp'));
+    $this->prEnter(compact('id', 'balance', 'stamp'));
 
-    // Verify the item can be reversed
+    $ret = array();
-    if (!$this->reversable($id))
-      $this->INTERNAL_ERROR("Item is not reversable.");
 
-    // Get the basic information about this charge
+    // Get the basic information about the entry to be reversed.
-    $charge = $this->find('first', array('contain' => true));
+    $this->recursive = -1;
-    //$charge = $charge['StatementEntry'];
+    $charge = $this->read(null, $id);
+    $charge = $charge['StatementEntry'];
+
+    if ($charge['type'] !== 'CHARGE')
+      INTERNAL_ERROR("Reversal item is not CHARGE.");
+
+    // Build a transaction
+    $reversal = array('Transaction' => array(), 'Entry' => array());
+    $reversal['Transaction']['stamp']   = $stamp;
+    $reversal['Transaction']['comment'] = "Credit Note: Charge Reversal";
+
+    $voided_entry_transactions = array();
+    $reconciled = $this->reconciledEntries($id);
+    $this->pr(21, compact('reconciled'));
+
+    if ($reconciled && !$balance) {
+      foreach ($reconciled['entries'] AS $entry) {
+	if ($entry['DisbursementEntry']['type'] === 'REVERSAL')
+	  INTERNAL_ERROR("Charge has already been reversed");
+
+/* 	$voided_entry_transactions[$entry['DisbursementEntry']['transaction_id']] */
+/* 	  = array_intersect_key($entry['DisbursementEntry'], */
+/* 				array('customer_id'=>1, 'lease_id'=>1)); */
+
+/* 	$reversal['Entry'][] = */
+/* 	  array_intersect_key($entry['DisbursementEntry'], */
+/* 			      array_flip(array('amount', 'account_id', 'charge_entry_id'))) */
+/* 	  + array('type'        => 'SURPLUS', */
+/* 		  'comment'     => 'Release of funds applied to reversed charge', */
+/* 		  ); */
+      }
+/*       $this->pr(17, compact('voided_entry_transactions')); */
+    }
 
     // Query the stats to get the remaining balance
     $stats = $this->stats($id);
-    $charge['paid'] = $stats['Charge']['disbursement'];
+
+    // Add the charge reversal
+    $reversal['Entry'][] =
+      array('charge_entry_id'  => $id,
+	    'amount'           => -1 * $stats['Charge'][$balance ? 'balance' : 'total'],
+	    'account_id'       => $charge['account_id'],
+	    'comment'          => 'Charge Reversal',
+	    );
 
     // Record the reversal transaction
     $result = $this->Transaction->addReversal
-      ($charge, $stamp, $comment ? $comment : 'Charge Reversal');
+      ($reversal, $id, $charge['customer_id'], $charge['lease_id']);
+    $this->pr(21, compact('result'));
+    $ret['reversal'] = $result;
+    if ($result['error'])
+      $ret['error'] = true;
 
-    if (empty($result['error'])) {
+    foreach ($voided_entry_transactions AS $transaction_id => $tx) {
-      // Mark the charge as reversed
+      $result = $this->assignCredits
-      $this->id = $id;
+	(null,
-      $this->saveField('reverse_transaction_id', $result['transaction_id']);
+	 $transaction_id,
+	 null,
+	 null,
+	 $tx['customer_id'],
+	 $tx['lease_id']
+	 );
+      $this->pr(21, compact('result'));
+      $ret['assigned'][] = $result;
+      if ($result['error'])
+	$ret['error'] = true;
     }
 
-    return $this->prReturn($result);
+    return $this->prReturn($ret + array('error' => false));
   }
 
 
@@ -294,7 +321,7 @@ class StatementEntry extends AppModel {
     }
 
     return $this->prReturn(array('entries' => $resultset,
-				 'summary' => $this->stats(null, $query)));
+			       'summary' => $this->stats(null, $query)));
   }
 
 
@@ -338,72 +365,6 @@ 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'));
-  }
-
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -425,6 +386,9 @@ 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';
 
@@ -432,15 +396,11 @@ class StatementEntry extends AppModel {
 
     // First, find all known credits, unless this call is to make
     // credit adjustments to a specific charge
-    if (empty($receipt_id)) {
+    // REVISIT <AP>: 20090806
-
+    //  If the theory below is correct, we should only search for
-      if (!empty($charge_ids))
+    //  explicit credits if we don't have a receipt_id
-	$this->INTERNAL_ERROR("Charge IDs, yet no corresponding receipt");
+    if (empty($charge_ids)) {
-
       $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
@@ -464,13 +424,20 @@ class StatementEntry extends AppModel {
 		"Credits Established");
     }
     else {
-      // Establish credit from the (newly added) receipt
+      if (empty($receipt_id))
+	INTERNAL_ERROR("Can't make adjustments to a charge without a receipt ID.");
+    }
+
+    // Next, establish credit from the newly added receipt
+    $receipt_credit = null;
+    if (!empty($receipt_id)) {
       $lquery =
 	array('link' =>
 	      array('StatementEntry',
 		    'LedgerEntry' =>
 		    array('conditions' =>
-			  array('LedgerEntry.account_id <> Transaction.account_id')
+			  array('LedgerEntry.account_id !=' =>
+				$this->Account->accountReceivableAccountID()),
 			  ),
 		    ),
 	      'conditions' => array('Transaction.id' => $receipt_id),
@@ -478,190 +445,173 @@ class StatementEntry extends AppModel {
 	      );
       $receipt_credit = $this->Transaction->find('first', $lquery);
       if (!$receipt_credit)
-	$this->INTERNAL_ERROR("Unable to locate receipt.");
+	INTERNAL_ERROR("Unable to locate receipt.");
+
+      //$reconciled = $this->reconciledEntries($id);
 
       $stats = $this->Transaction->stats($receipt_id);
-      $receipt_credit['balance'] = $stats['undisbursed'];
+      $receipt_credit['balance'] =
+	$receipt_credit['Transaction']['amount'] - $stats['Disbursement']['total'];
 
-      $receipt_credit['receipt'] = true;
+      $this->pr(18, compact('receipt_credit'),
-      $credits = array($receipt_credit);
-      $this->pr(18, compact('credits'),
 		"Receipt Credit Added");
     }
 
-    // Now find all unpaid charges, using either the specific set
+    // Now find all unpaid charges
-    // of charges given, or all outstanding charges based on the
+    if (isset($charge_ids)) {
-    // query, customer and/or lease
+      $lquery = array('contain' => false,
-    if (!empty($charge_ids)) {
+		      'conditions' => array('StatementEntry.id' => $charge_ids));
-      $this->INTERNAL_ERROR("PERHAPS IMPLEMENTED - THOUGH NEVER TESTED");
-      $lquery = $query;
-      $lquery['conditions'][] = array('StatementEntry.id' => $charge_ids);
-      $charges = $this->reconciledSet('CHARGE', $query, true);
     } else {
-      $charges = $this->outstandingDebits($query, $customer_id, $lease_id);
+      $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");
+    }
+
+    // Initialize our list of used credits
+    $used_credits = array();
+
+    // REVISIT <AP>: 20090806
+    //  Testing a theory.  We should never have
+    //  explicit credits, as well as a new receipt,
+    //  and yet have outstanding charges.
+    if (!empty($credits) && !empty($receipt_credit) && !empty($charges))
+      INTERNAL_ERROR("Explicit credits that haven't already been applied.");
 
     // Work through all unpaid charges, applying disbursements as we go
     foreach ($charges AS $charge) {
+
       $this->pr(20, compact('charge'),
 		'Process Charge');
 
+      // Check that we have available credits.
+      // Technically, this isn't necessary, since the loop
+      // will handle everything just fine.  However, this
+      // just saves extra processing if/when there is no
+      // means to resolve a charge anyway.
+      if (empty($credits) && empty($receipt_credit['balance'])) {
+	$this->pr(17, 'No more available credits');
+	break;
+      }
+
       $charge['balance'] = $charge['StatementEntry']['balance'];
-
+      while ($charge['balance'] > 0 &&
-      // Use explicit credits before using the new receipt credit
+	     (!empty($credits) || !empty($receipt_credit['balance']))) {
-      foreach ($credits AS &$credit) {
-	if (empty($charge['balance']))
-	  break;
-	if ($charge['balance'] < 0)
-	  $this->INTERNAL_ERROR("Negative Charge Balance");
-
-	if (!isset($credit['balance']))
-	  $credit['balance'] = $credit['StatementEntry']['amount'];
-
-	if (empty($credit['balance']))
-	  continue;
-	if ($credit['balance'] < 0)
-	  $this->INTERNAL_ERROR("Negative Credit Balance");
 
 	$this->pr(20, compact('charge'),
 		  'Attempt Charge Reconciliation');
 
-	if (empty($credit['receipt']))
+	// Use explicit credits before using implicit credits
+	// (Not sure it matters though).
+	if (!empty($credits)) {
+	  // Peel off the first credit available
+	  $credit =& $credits[0];
+	  $disbursement_date = $credit['StatementEntry']['effective_date'];
+	  $disbursement_transaction_id = $credit['StatementEntry']['transaction_id'];
 	  $disbursement_account_id = $credit['StatementEntry']['account_id'];
-	else
-	  $disbursement_account_id = $credit['LedgerEntry']['account_id'];
 
-	// REVISIT <AP>: 20090811
+	  if (!isset($credit['balance']))
-	//  Need to come up with a better strategy for handling
+	    $credit['balance'] = $credit['StatementEntry']['amount'];
-	//  concessions.  For now, just restricting concessions
+	}
-	//  to apply only towards rent will resolve the most
+	elseif (!empty($receipt_credit['balance'])) {
-	//  predominant (or only) needed usage case.
+	  // Use our only receipt credit
-	if ($disbursement_account_id == $this->Account->concessionAccountID() &&
+	  $credit =& $receipt_credit;
-	    $charge['StatementEntry']['account_id'] != $this->Account->rentAccountID())
+	  $disbursement_date = $credit['Transaction']['stamp'];
-	  continue;
+	  $disbursement_transaction_id = $credit['Transaction']['id'];
+	  $disbursement_account_id = $credit['LedgerEntry']['account_id'];
+	}
+	else {
+	  die("HOW DID WE GET HERE WITH NO SURPLUS?");
+	}
 
 	// Set the disbursement amount to the maximum amount
 	// possible without exceeding the charge or credit balance
-	$disbursement_amount = round(min($charge['balance'], $credit['balance']), 2);
+	$disbursement_amount = min($charge['balance'], $credit['balance']);
 	if (!isset($credit['applied']))
 	  $credit['applied'] = 0;
 
-	$credit['applied'] = round($credit['applied'] + $disbursement_amount, 2);
+	$credit['applied'] += $disbursement_amount;
-	$credit['balance'] = round($credit['balance'] - $disbursement_amount, 2);
+	$credit['balance'] -= $disbursement_amount;
 
-	$this->pr(20, compact('credit', 'disbursement_amount'),
+	$this->pr(20, compact('credit'),
 		  ($credit['balance'] > 0 ? 'Utilized' : 'Exhausted') .
-		  (empty($credit['receipt']) ? ' Credit' : ' Receipt'));
+		  (!empty($credits) ? ' Credit' : ' Receipt'));
 
-	if (strtotime($charge['StatementEntry']['effective_date']) >
+	if ($credit['balance'] < 0)
-	    strtotime($credit['StatementEntry']['effective_date']))
+	  die("HOW DID WE END UP WITH NEGATIVE SURPLUS BALANCE?");
-	  $disbursement_edate = $charge['StatementEntry']['effective_date'];
-	else
-	  $disbursement_edate = $credit['StatementEntry']['effective_date'];
 
-	if (empty($credit['receipt'])) {
+	// If we've exhausted the credit, get it out of the
-	  // Explicit Credit
+	// available credit pool (but keep track of it for later).
-	  $result = $this->Transaction->addTransactionEntries
+	if ($credit['balance'] <= 0 && !empty($credits))
-	    (array('include_ledger_entry'    => true,
+	  $used_credits[] = array_shift($credits);
-		   'include_statement_entry' => true),
-	     array('type'        => 'INVOICE',
-		   'id'          => $credit['StatementEntry']['transaction_id'],
-		   'account_id'  => $this->Account->accountReceivableAccountID(),
-		   'crdr'        => 'CREDIT',
-		   'customer_id' => $charge['StatementEntry']['customer_id'],
-		   'lease_id'    => $charge['StatementEntry']['lease_id'],
-		   ),
-	     array
-	     (array('type'            => $disbursement_type,
-		    'effective_date'  => $disbursement_edate,
-		    'account_id'      => $credit['StatementEntry']['account_id'],
-		    'amount'          => $disbursement_amount,
-		    'charge_entry_id' => $charge['StatementEntry']['id'],
-		    ),
-		 ));
 
-	  $ret['Disbursement'][] = $result;
+	// Add a disbursement that uses the available credit to pay the charge
-	  if ($result['error'])
+	$disbursement = array('type' => $disbursement_type,
-	    $ret['error'] = true;
+			 'account_id' => $disbursement_account_id,
-	}
+			 'amount'     => $disbursement_amount,
-	else {
+			 'effective_date' => $disbursement_date,
-	  // Receipt Credit
+			 'transaction_id' => $disbursement_transaction_id,
+			 'customer_id' => $charge['StatementEntry']['customer_id'],
+			 'lease_id' => $charge['StatementEntry']['lease_id'],
+			 'charge_entry_id' => $charge['StatementEntry']['id'],
+			 'comment' => null,
+			 );
 
-	  if (strtotime($charge['StatementEntry']['effective_date']) >
+	$this->pr(20, compact('disbursement'),
-	      strtotime($credit['Transaction']['stamp']))
+		  'New Disbursement Entry');
-	    $disbursement_edate = $charge['StatementEntry']['effective_date'];
-	  else
-	    $disbursement_edate = $credit['Transaction']['stamp'];
 
-	  // Add a disbursement that uses the available credit to pay the charge
+	$result = $this->addStatementEntry($disbursement);
-	  $disbursement =
+	$ret['Disbursement'][] = $result;
-	    array('type'            => $disbursement_type,
+	if ($result['error'])
-		  'effective_date'  => $disbursement_edate,
+	  $ret['error'] = true;
-		  'amount'          => $disbursement_amount,
-		  'account_id'      => $credit['LedgerEntry']['account_id'],
-		  'transaction_id'  => $credit['Transaction']['id'],
-		  'customer_id'     => $charge['StatementEntry']['customer_id'],
-		  'lease_id'        => $charge['StatementEntry']['lease_id'],
-		  'charge_entry_id' => $charge['StatementEntry']['id'],
-		  'comment'         => null,
-		  );
-
-	  $this->pr(20, compact('disbursement'), 'New Disbursement Entry');
-	  $result = $this->addStatementEntry($disbursement);
-	  $ret['Disbursement'][] = $result;
-	  if ($result['error'])
-	    $ret['error'] = true;
-	}
 
 	// Adjust the charge balance to reflect the new disbursement
-	$charge['balance'] = round($charge['balance'] - $disbursement_amount, 2);
+	$charge['balance'] -= $disbursement_amount;
-	$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);
     }
 
-    $this->pr(18, compact('credits'),
+    // Partially used credits must be added to the used list
-	      'Disbursements complete');
+    if (isset($credits[0]['applied']))
+      $used_credits[] = array_shift($credits);
+      
+    $this->pr(18, compact('credits', 'used_credits', 'receipt_credit'),
+	      'Disbursements added');
 
     // Clean up any explicit credits that have been used
-    foreach ($credits AS $credit) {
+    foreach ($used_credits AS $credit) {
-      if (!empty($credit['receipt']))
-	continue;
-
-      if (empty($credit['applied']))
-	continue;
-
       if ($credit['balance'] > 0) {
 	$this->pr(20, compact('credit'),
 		  'Update Credit Entry');
 
-	$this->id = $credit['StatementEntry']['id'];
+ 	$this->id = $credit['StatementEntry']['id'];
 	$this->saveField('amount', $credit['balance']);
       }
       else {
 	$this->pr(20, compact('credit'),
 		  'Delete Exhausted Credit Entry');
 
-	$this->delete($credit['StatementEntry']['id'], false);
+	$this->del($credit['StatementEntry']['id'], false);
       }
     }
 
-    // Check for any implicit receipt credits, converting
+    // Convert non-exhausted receipt credit to an explicit one
-    // into explicit credits if there is a remaining balance.
+    if (!empty($receipt_credit['balance'])) {
-    foreach ($credits AS $credit) {
+      $credit =& $receipt_credit;
-      if (empty($credit['receipt']))
-	continue;
 
-      if (empty($credit['balance']))
-	continue;
-
-      // See if there is an existing explicit credit
-      // for this transaction.
       $explicit_credit = $this->find
 	('first', array('contain' => false,
 			'conditions' =>
@@ -669,31 +619,30 @@ class StatementEntry extends AppModel {
 			      array('type' => 'SURPLUS')),
 			));
 
-      if (!empty($explicit_credit)) {
+      if (empty($explicit_credit)) {
-	// REVISIT <AP>: 20090815
+	$this->pr(18, compact('credit'),
-	//  Testing whether or not this case occurs
+		  'Create Explicit Credit');
-	$this->INTERNAL_ERROR('Existing explicit credit unexpected');
 
-	// Since there IS an existing explicit credit, we must update
+	$result = $this->addStatementEntry
-	// its balance instead of creating a new one, since it has
+	  (array('type'           => 'SURPLUS',
-	// already been incorporated in the overall credit balance.
+		 'account_id'     => $credit['LedgerEntry']['account_id'],
-	// If we were to create a new one, we would erroneously create
+		 'amount'         => $credit['balance'],
-	// an excess of credit available.
+		 'effective_date' => $credit['Transaction']['stamp'],
+		 'transaction_id' => $credit['Transaction']['id'],
+		 'customer_id'    => $customer_id,
+		 'lease_id'       => $lease_id,
+		 ));
+	$ret['Credit'] = $result;
+	if ($result['error'])
+	  $ret['error'] = true;
+      }
+      else {
 	$this->pr(18, compact('explicit_credit', 'credit'),
-		  'Update existing explicit credit');
+		  'Update Explicit Credit');
 	$EC = new StatementEntry();
 	$EC->id = $explicit_credit['StatementEntry']['id'];
 	$EC->saveField('amount', $credit['balance']);
-	continue;
       }
-
-      if (!empty($ret['receipt_balance']))
-	$this->INTERNAL_ERROR('Only one receipt expected in assignCredits');
-
-      // Give caller the information necessary to create an explicit
-      // credit from the passed receipt, which we've not exhausted.
-      $this->pr(18, compact('credit'), 'Convert to explicit credit');
-      $ret['receipt_balance'] = $credit['balance'];
     }
 
     return $this->prReturn($ret + array('error' => false));
@@ -707,7 +656,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' => 19, 'show' => 10));
     $this->prEnter(compact('id', 'query'));
 
     $this->queryInit($query);

site/models/tender.php

@@ -8,73 +8,12 @@ class Tender extends AppModel {
 		'DepositTransaction' => array(
 			'className' => 'Transaction',
 		),
-		'DepositLedgerEntry' => array(
-			'className' => 'LedgerEntry',
-		),
 		'NsfTransaction' => array(
 			'className' => 'Transaction',
-			'dependent' => true,
 		),
 	);
 
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: afterSave
-   *  - Performs any work needed after the save occurs
-   */
-
-  function afterSave($created) {
-    // Come up with a (not necessarily unique) name for the tender.
-    // For checks & money orders, this will be based on the check
-    // number.  For other types of tender, we'll just use the
-    // generic name of the tender type, and the tender ID
-
-    // Determine our tender type, and set the ID of that model
-    $this->TenderType->id = $this->field('tender_type_id');
-
-    // REVISIT <AP>: 20090810
-    //  The only tender expected to have no tender type
-    //  is our special "Closing" tender.
-    if (empty($this->TenderType->id))
-      $newname = 'Closing';
-    else {
-      $newname      = $this->TenderType->field('name');
-      $naming_field = $this->TenderType->field('naming_field');
-      if (!empty($naming_field))
-	$newname .= ' #' . $this->field($naming_field);
-    }
-
-    if ($newname !== $this->field('name'))
-      $this->saveField('name', $newname);
-
-    return parent::afterSave($created);
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: beforeDelete
-   *  - Performs any work needed before the delete occurs
-   */
-
-  function beforeDelete($cascade = true) {
-    // REVISIT <AP>: 20090814
-    //  Experimental, and incomplete mechanism to protect
-    //  against trying to delete data that shouldn't be deleted.
-
-    $deposit_id = $this->field('deposit_transaction_id');
-    pr(compact('deposit_id'));
-    // If this tender has already been deposited, it would
-    // be a rats nest to figure out how to delete this tender.
-    if (!empty($deposit_id))
-      return false;
-
-    return parent::beforeDelete($cascade);
-  }
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -104,10 +43,29 @@ class Tender extends AppModel {
   function addTender($tender) {
     $this->prEnter(compact('tender'));
 
-    $ret = array('data' => $tender);
+    $ret = array();
     if (!$this->verifyTender($tender))
       return $this->prReturn(array('error' => true) + $ret);
 
+    // Come up with a (not necessarily unique) name for the tender.
+    // For checks & money orders, this will be based on the check
+    // number.  For other types of tender, we'll just use the
+    // generic name of the monetary account.
+    // REVISIT <AP>: 20090723
+    //  I would like to have cash named "Cash #1234", where
+    //  the number would correspond to either the Tender ID
+    //  or the LedgerEntry ID.
+    if (empty($tender['name']) && !empty($tender['account_id'])) {
+      $tender['name'] = $this->LedgerEntry->Account->name($tender['account_id']);
+      if ($tender['account_id'] == $this->LedgerEntry->Account->checkAccountID() ||
+	  $tender['account_id'] == $this->LedgerEntry->Account->moneyOrderAccountID()) {
+	$tender['name'] .= ' #' . $tender['data1'];
+      }
+    }
+
+    $this->pr(20, array('Tender' => $tender),
+	      'Pre-Save');
+
     $this->create();
     if (!$this->save($tender))
       return $this->prReturn(array('error' => true) + $ret);
@@ -122,10 +80,31 @@ class Tender extends AppModel {
    **************************************************************************
    * function: nsf
    *  - Flags the ledger entry as having insufficient funds
+   *
+   *  Steps:
+   *   - Get information from Check (C1); for amount $A
+   *   - Find Bank Deposit matching to Tender
+   *   - New Transaction (T1)
+   *   - New Bank Deposit (D1)
+   *   - New Tender (N1); NSF; D1, 
+   *   - Add new LedgerEntry (L1a); T1; debit:bank; -$A
+   *   - Add new LedgerEntry (L1b); T1; credit:NSF; -$A
+   *   - Add new LedgerEntry (L2a); T1; debit:NSF;  -$A; N1
+   *   - Add new LedgerEntry (L2b); T1; credit:A/R; -$A
+   *   - For Tx associated with LE associated with C1:
+   *     - For each Disbursement SE of Tx:
+   *     - Add new StatementEntry (S1n); T1; DISBURSEMENT; -1*S1n.amount
+   *   - New Transaction (T2) (?????)
+   *   - Add new StatementEntry (S2); T2; CHARGE; NSF; $35
+   *   - Add new LedgerEntry (L3a); T2; credit:NSF-Fee; $35
+   *   - Add new LedgerEntry (L3b); T2; debit:A/R; $35
+   *   - Set C1.nsf_tx = T1
+   *   - Re-Reconcile (customer may have running credit)
    */
 
-  function nsf($id, $stamp = null, $comment = null) {
+  function nsf($id, $stamp = null) {
-    $this->prEnter(compact('id', 'stamp', 'comment'));
+    $this->prFunctionLevel(30);
+    $this->prEnter(compact('id'));
 
     // Get information about this NSF item.
     $this->id = $id;
@@ -134,7 +113,6 @@ class Tender extends AppModel {
        ('contain' =>
 	array('LedgerEntry',
 	      'DepositTransaction',
-	      'DepositLedgerEntry',
 	      'NsfTransaction'),
 	));
     $this->pr(20, compact('tender'));
@@ -150,15 +128,16 @@ class Tender extends AppModel {
     unset($tender['NsfTransaction']);
 
     $T = new Transaction();
-    $result = $T->addNsf($tender, $stamp, $comment);
+    $result = $T->addNsf($tender, $stamp);
-    if (empty($result['error'])) {
+    if ($result['error'])
-      // Flag the tender as NSF, using the items created from addNsf
+      return $this->prReturn(false);
-      $this->id = $id;
-      $this->saveField('nsf_transaction_id', $result['nsf_transaction_id']);
-      $this->saveField('nsf_ledger_entry_id', $result['nsf_ledger_entry_id']);
-    }
 
-    return $this->prReturn($result);
+    // Flag the tender as NSF, using the items created from addNsf
+    $this->id = $id;
+    $this->saveField('nsf_transaction_id', $result['nsf_transaction_id']);
+    $this->saveField('nsf_ledger_entry_id', $result['nsf_ledger_entry_id']);
+
+    return $this->prReturn(true);
   }
 
 

site/models/unit.php

@@ -55,67 +55,10 @@ class Unit extends AppModel {
     return $this->statusValue('OCCUPIED');
   }
 
-  function statusCheck($id_or_enum,
-		       $min = null, $min_strict = false,
-		       $max = null, $max_strict = false)
-  {
-    $this->prEnter(compact('id_or_enum', 'min', 'min_strict', 'max', 'max_strict'));
-
-    if (is_int($id_or_enum)) {
-      $this->id = $id_or_enum;
-      $id_or_enum = $this->field('status');
-    }
-
-    $enum_val = $this->statusValue($id_or_enum);
-    if (isset($min) && is_string($min))
-      $min = $this->statusValue($min);
-    if (isset($max) && is_string($max))
-      $max = $this->statusValue($max);
-
-    $this->pr(17, compact('enum_val', 'min', 'min_strict', 'max', 'max_strict'));
-
-    if (isset($min) &&
-	($enum_val < $min ||
-	 ($min_strict && $enum_val == $min)))
-      return $this->prReturn(false);
-
-    if (isset($max) &&
-	($enum_val > $max ||
-	 ($max_strict && $enum_val == $max)))
-      return $this->prReturn(false);
-
-    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);
-  }
-
   function conditionOccupied() {
     return ('Unit.status >= ' . $this->statusValue('OCCUPIED'));
   }
 
-  function vacant($enum) {
-    return $this->statusCheck($enum, 'UNAVAILABLE', true, 'OCCUPIED', true);
-  }
-
   function conditionVacant() {
     return ('Unit.status BETWEEN ' .
       ($this->statusValue('UNAVAILABLE')+1) .
@@ -123,17 +66,10 @@ class Unit extends AppModel {
       ($this->statusValue('OCCUPIED')-1));
   }
 
-  function unavailable($enum) {
-    return $this->statusCheck($enum, null, false, 'UNAVAILABLE', false);
-  }
-
   function conditionUnavailable() {
     return ('Unit.status <= ' . $this->statusValue('UNAVAILABLE'));
   }
 
-  function available($enum) { return $this->vacant($enum); }
-  function conditionAvailable() { return $this->conditionVacant($enum); }
-
 
   /**************************************************************************
    **************************************************************************
@@ -199,16 +135,6 @@ class Unit extends AppModel {
   }
 
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: update
-   *  - Update any cached or calculated fields
-   */
-  function update($id) {
-  }
-
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************

site/models/unit_size.php

@@ -1,64 +1,25 @@
 <?php
 class UnitSize extends AppModel {
 
-  var $belongsTo =
+	var $name = 'UnitSize';
-    array(
+	var $validate = array(
-	  'UnitType',
+		'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 $hasMany =
+	var $belongsTo = array(
-    array(
+		'UnitType',
-	  '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,50 +1,16 @@
 <?php
 class UnitType extends AppModel {
 
-  var $hasMany =
+	var $name = 'UnitType';
-    array(
+	var $validate = array(
-	  'UnitSize',
+		'id' => array('numeric'),
-	  );
+		'code' => array('notempty'),
+		'name' => array('notempty')
+	);
 
-
+	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

@@ -1,39 +0,0 @@
-<?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

@@ -1,24 +0,0 @@
-<?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

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

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

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

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

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

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

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

site/views/accounts/collected.ctp

@@ -15,8 +15,7 @@ echo '<div class="account collected">' . "\n";
 
 // Reset the form
 function resetForm() {
-  // Kick off the grid
+/*   updateEntriesGrid(); */
-  updateEntriesGrid();
 }
 
 function onGridLoadComplete() {
@@ -40,15 +39,12 @@ function updateEntriesGrid() {
 
   $('#collected-total').html('Calculating...');
   $('#collected-entries-jqGrid').clearGridData();
-  $('#collected-entries-jqGrid').setPostDataItem('dynamic_post_replace', serialize(dynamic_post));
+  $('#collected-entries-jqGrid').setPostDataItem('dynamic_post', serialize(dynamic_post));
   $('#collected-entries-jqGrid')
     .setGridParam({ page: 1 })
     .trigger("reloadGrid");
 
-  //$('#debug').html("<PRE>\n"+htmlEncode(dump($('#collected-entries-jqGrid').getGridParam()))+"\n</PRE>")
+  //$('#collected-entries .HeaderButton').click();
-  var gridstate   = $('#collected-entries-jqGrid').getGridParam('gridstate');
-  if (gridstate == 'hidden')
-    $('#collected-entries .HeaderButton').click();
 }
 
 
@@ -165,12 +161,12 @@ echo $this->element('statement_entries', array
 		      'grid_div_id' => 'collected-entries',
 		      'grid_div_class' => 'text-below',
 		      'grid_events' => array('loadComplete' => 'onGridLoadComplete()'),
-		      'grid_setup' => array('hiddengrid' => true),
+		      //'grid_setup' => array('hiddengrid' => true),
+		      //'caption' => '<SPAN id="receipt-charges-caption"></SPAN>',
 		      'caption' => 'Collected ' . Inflector::pluralize($account['name']),
-		      'action' => 'collected',
+		      'filter' => array(//'StatementEntry.type' => 'DISBURSEMENT',
-		      'filter' => array('ChargeEntry.account_id' => $account['id']),
+					'ChargeEntry.account_id' => $account['id']),
-		      'include' => array('Amount'),
+		      'exclude' => array('Account', 'Charge', 'Type'),
-		      'exclude' => array(/*'Type',*/ 'Debit', 'Credit'),
 		      ),
 		     ));
 
@@ -178,8 +174,20 @@ echo $this->element('statement_entries', array
 
 <script type="text/javascript"><!--
   $(document).ready(function(){
-      datepicker('TxFromDate');
+      $("#TxFromDate")
-      datepicker('TxThroughDate');
+	.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' });
+
       resetForm();
   });
 --></script>
@@ -193,3 +201,5 @@ echo '</div>' . "\n";
 echo '</div>' . "\n";
 
 ?>
+
+<a href="#" onClick="$('#debug').html(''); return false;">Clear Debug Output</a>

site/views/accounts/view.ctp

@@ -16,6 +16,7 @@ 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']);
@@ -77,12 +78,12 @@ echo $this->element('ledger_entries', array
 		    (// Grid configuration
 		     'config' => array
 		     ('grid_div_id' => 'ledger-ledger-entry-list',
-		      'caption' => "Current Ledger: #{$current_ledger['sequence']}",
+		      'caption' => ("Current Ledger: " .
-		      'filter'  => array('Ledger.id' => $current_ledger['id']),
+				    "(". $current_ledger['name'] .")"),
+		      '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,
 		      )));
 
 
@@ -101,7 +102,6 @@ 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,7 +45,6 @@ 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" .
 	' ';
@@ -77,30 +76,21 @@ function contactMethodDiv($obj, $type, $legend, $values = null) {
 	   'fields' => array
 	   (
 	    'preference' => array
-	    ('label_attributes' => array('class' => 'required'),
+	    ('opts' => array
-	     'opts' => array
 	     ('options' => $obj->varstore['methodPreferences'],
 	      'selected' => (isset($values) ? $values['ContactsMethod']['preference'] : null),
-	      ),
+	      )),
-	     'after' => "Intended purpose for this method of communication.",
-	     ),
 
 	    'type' => array
-	    ('label_attributes' => array('class' => 'required'),
+	    ('opts' => array
-	     'opts' => array
 	     ('options' => $obj->varstore['methodTypes'],
 	      'selected' => (isset($values) ? $values['ContactsMethod']['type'] : null),
-	      ),
+	      )),
-	     'after' => "How / Where this communication reaches the contact.",
-	     ),
 
 	    'comment' => array
-	    ('label_attributes' => array('class' => 'optional empty'),
+	    ('opts' => array
-	     'opts' => array
 	     ('value' => (isset($values) ? $values['ContactsMethod']['comment'] : null),
-	      ),
+	      )),
-	     'after' => "Optional: Comments on how this form of communication relates to the contact.",
-	     ),
 
 	    ))) . "\n" .
     
@@ -123,23 +113,16 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
   if ($type === 'phone') {
     if ($stype === 'existing') {
       $fields = array
-	('id' => array('label_attributes' => array('class' => 'required empty'),
+	('id' => array('name' => 'Phone/Ext',
-		       'name' => 'Phone/Ext',
 		       'opts' => array('options' => $obj->varstore['contactPhones'])),
 	 );
     }
     elseif ($stype === 'new') {
       $fields = array
-	('type' => array('label_attributes' => array('class' => 'required'),
+	('type' => array('opts' => array('options' => $obj->varstore['phoneTypes'])),
-			 'opts' => array('options' => $obj->varstore['phoneTypes']),
+	 'phone' => true,
-			 'after' => "Physical type of the phone."),
+	 'ext' => array('name' => "Extension"),
-	 'phone' => array('label_attributes' => array('class' => 'required empty'),
+	 'comment' => true,
-			  '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') {
@@ -166,19 +149,12 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
     }
     elseif ($stype === 'new') {
       $fields = array
-	('address' => array('label_attributes' => array('class' => 'required empty'),
+	('address' => true,
-			    'after' => "Required: First line of mailing address."),
+	 'city' => true,
-	 'city' => array('label_attributes' => array('class' => 'required empty'),
+	 'state' => true,
-			 'after' => "Required."),
+	 'postcode' => array('name' => 'Zip Code'),
-	 'state' => array('label_attributes' => array('class' => 'required empty'),
+	 'country' => true,
-			  'after' => "Required."),
+	 'comment' => true,
-	 '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') {
@@ -201,16 +177,13 @@ 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' => array('label_attributes' => array('class' => 'required empty'),
+	('email' => true,
-			    'after' => "Required: E-mail address."),
+	 'comment' => true,
-	 'comment' => array('label_attributes' => array('class' => 'optional empty'),
-			    'after' => "Optional: Comments about this email address."),
 	 );
     }
     elseif ($stype === 'show') {
@@ -231,7 +204,7 @@ function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
     '<div ' . "\n" .
     ' class="'.$type.'-%{id}-div"' . "\n" .
     ' id="'.$type.'-%{id}-'.$stype.'-div"' . "\n" .
-    ((isset($values) || $stype == 'new') ? '' : ' STYLE="display:none;"' . "\n") .
+    (isset($values) ? '' : ' STYLE="display:none;"' . "\n") .
     '>' . "\n" .
 
     $obj->element
@@ -346,27 +319,8 @@ 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>
@@ -391,30 +345,17 @@ echo($this->element
       array('class'  => 'item contact detail',
 	    'caption' => isset($this->data['Contact']) ? 'Edit Contact' : 'New Contact',
 	    'fields' => array
-	    ('last_name' => array('label_attributes' => array('class' => 'recommended empty'),
+	    ('first_name' => true,
-				  'after' => "Recommended."),
+	     'last_name' => true,
-	     'first_name' => array('label_attributes' => array('class' => 'recommended empty'),
+	     'middle_name' => true,
-				   'after' => "Recommended."),
+	     'display_name' => true,
-	     'middle_name' => array('label_attributes' => array('class' => 'optional empty'),
+	     'company_name' => array('name' => 'Company'),
-				    'after' => "Optional."),
+	     'id_federal' => array('name' => 'SSN'),
-	     'company_name' => array('name' => 'Company',
+	     'id_local' => array('name' => 'ID #'),
-				     'label_attributes' => array('class' => 'optional empty'),
+	     'id_local_state' => array('name' => 'ID State'),
-				     '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' => array('label_attributes' => array('class' => 'optional empty'),
+	     'comment' => true,
-				'after' => "Optional: Comments about this contact."),
 	     ))) . "\n");
 
 echo $form->submit('Update') . "\n";

site/views/contacts/view.ctp

@@ -17,17 +17,16 @@ if (isset($contact['Contact']))
   $contact = $contact['Contact'];
 
 $rows = array();
-$rows[] = array('Display Name', $contact['display_name']);
+$rows[] = array('First Name',  $contact['first_name']);
-$rows[] = array('First Name',   $contact['first_name']);
+$rows[] = array('Middle Name', $contact['middle_name']);
-$rows[] = array('Middle Name',  $contact['middle_name']);
+$rows[] = array('Last Name',   $contact['last_name']);
-$rows[] = array('Last Name',    $contact['last_name']);
+$rows[] = array('Company',     $contact['company_name']);
-$rows[] = array('Company',      $contact['company_name']);
+$rows[] = array('SSN',         $contact['id_federal']);
-$rows[] = array('SSN',          $contact['id_federal']);
+$rows[] = array('ID',          ($contact['id_local']
-$rows[] = array('ID',           ($contact['id_local']
+				    . ($contact['id_local']
-				 . ($contact['id_local']
+				       ? " - ".$contact['id_local_state']
-				    ? " - ".$contact['id_local_state']
+				       : "")));
-				    : "")));
+$rows[] = array('Comment',     $contact['comment']);
-$rows[] = array('Comment',      $contact['comment']);
 
 echo $this->element('table',
 		    array('class'   => 'item contact detail',
@@ -136,7 +135,6 @@ 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,12 +42,11 @@ function customerContactDiv($obj, $values = null, $primary = false) {
 	' CLASS="contact-%{id}-source" ' . "\n" .
 	' ID="contact-%{id}-source-'.$stype.'"' . "\n" .
 	' VALUE="'.$stype.'"' . "\n" .
-	($stype == 'new' ? ' CHECKED' . "\n" : '') .
+	//' CHECKED' . "\n" .
 	' />' . "\n" .
 	' <LABEL FOR="contact-%{id}-source-'.$stype.'">'.$sname.'</LABEL>' . "\n" .
 	' ';
     }
-    $div .= "<P>(Phone numbers / Addresses can be added later)";
   }
   $div .= "\n";
 
@@ -76,35 +75,23 @@ 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
-	    ('label_attributes' => array('class' => 'required'),
+	    ('opts' => array
-	     'opts' => array
 	     ('options' => $obj->varstore['contactTypes'],
 	      'selected' => (isset($values) ? $values['ContactsCustomer']['type'] : null),
-	      ),
+	      )),
-	     'after' => "An actual tenant, or just an alternate contact?"
-	     ),
 
 	    'comment' => array
-	    ('label_attributes' => array('class' => 'optional empty'),
+	    ('opts' => array
-	     'opts' => array
 	     ('value' => (isset($values) ? $values['ContactsCustomer']['comment'] : null),
-	      ),
+	      )),
-	     'after' => "Optional: Comments on the relationship between this customer and this contact."
-	     ),
 
 	    ))) . "\n" .
     
@@ -128,37 +115,22 @@ function customerContactTypeDiv($obj, $stype, $values = null) {
   if ($stype === 'existing') {
     $fields = array
       ('id' => array('name' => 'Contact',
-		     'label_attributes' => array('class' => 'required empty'),
+		     'opts' => array('options' => $obj->varstore['contacts'])),
-		     'opts' => array('options' => $obj->varstore['contacts']),
-		     'after' => "Select the existing contact."),
        );
   }
   elseif ($stype === 'new') {
     $fields = array
-      ('last_name' => array('label_attributes' => array('class' => 'recommended empty'),
+      ('first_name' => true,
-			    'after' => "Recommended."),
+       'last_name' => true,
-       'first_name' => array('label_attributes' => array('class' => 'recommended empty'),
+       'middle_name' => true,
-			     'after' => "Recommended."),
+       'display_name' => true,
-       'middle_name' => array('label_attributes' => array('class' => 'optional empty'),
+       'company_name' => array('name' => 'Company'),
-			      'after' => "Optional."),
+       'id_federal' => array('name' => 'SSN'),
-       'company_name' => array('name' => 'Company',
+       'id_local' => array('name' => 'ID #'),
-			       'label_attributes' => array('class' => 'optional empty'),
+       'id_local_state' => array('name' => 'ID State'),
-			       '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' => array('label_attributes' => array('class' => 'optional empty'),
+       'comment' => true,
-			  'after' => "Optional: Comments about this contact."),
        );
   }
   elseif ($stype === 'show') {
@@ -179,14 +151,14 @@ function customerContactTypeDiv($obj, $stype, $values = null) {
     '<div ' . "\n" .
     ' class="contact-%{id}-div"' . "\n" .
     ' id="contact-%{id}-'.$stype.'-div"' . "\n" .
-    ((isset($values) || $stype == 'new') ? '' : ' STYLE="display:none;"' . "\n") .
+    (isset($values) ? '' : ' STYLE="display:none;"' . "\n") .
     '>' . "\n" .
 
     $obj->element
     ($element,
      array('class'  => "item contact {$class}",
 	   'field_prefix' => 'Contact.%{id}')
-     + compact('rows', 'fields', 'row_class', 'column_class')) .
+     + compact('rows', 'fields', 'column_class')) .
 
     ($stype === 'show'
      ? '<input type="hidden" name="data[Contact][%{id}][id]" value="'.$values['id'].'"/>' . "\n"
@@ -249,28 +221,8 @@ 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>
@@ -295,12 +247,8 @@ echo($this->element
       array('class'  => 'item customer detail',
 	    'caption' => isset($this->data['Customer']) ? 'Edit Customer' : 'New Customer',
 	    'fields' => array
-	    ('name' => array('label_attributes' => array('class' => 'optional empty'),
+	    ('name' => true,
-			     'after' => ("Optional: If this field is left blank, the" .
+	     'comment' => true,
-					 " 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";
@@ -320,11 +268,6 @@ 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

@@ -1,176 +0,0 @@
-<?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

@@ -11,9 +11,6 @@
  * Javascript
  */
 
-// Warnings _really_ screw up javascript
-$saved_debug_state = Configure::read('debug');
-Configure::write('debug', '0');
 ?>
 
 <script type="text/javascript"><!--
@@ -26,94 +23,62 @@ Configure::write('debug', '0');
       success:       showResponse,  // post-submit callback 
  
       // other available options: 
+      //url:       url,         // override for form's 'action' attribute 
+      //type:      'get',           // 'get' or 'post', override for form's 'method' attribute 
+      //dataType:  null,        // 'xml', 'script', or 'json' (expected server response type) 
       //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',
+      // $.ajax options can be used here too, for example: 
-					'action' => 'postReceipt', 0)); ?>"
+      //timeout:   3000,
       }; 
 
     // bind form using 'ajaxForm' 
-    if ($('#receipt-form').ajaxForm != null)
+    $('#receipt-form').ajaxForm(options); 
-      $('#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('');
+  // formData is an array; here we use $.param to convert it to a string to display it 
-  for (var i = 0; i < formData.length; ++i) {
+  // but the form plugin does this for you automatically when it submits the data 
-    //$("#debug").append(i + ') ' + dump(formData[i]) + '<BR>');
+  //var_dump(formData);
-    if (formData[i]['name'] == "data[Customer][id]" &&
+  //$('#request-debug').html('<PRE>'+dump(formData)+'</PRE>');
-	!(formData[i]['value'] > 0)) {
+  $('#request-debug').html('Ommitted');
-      //$("#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>');
+  $('#response-debug').html('Loading <BLINK>...</BLINK>');
+  $('#output-debug').html('Loading <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; 
 } 
  
 // post-submit callback 
 function showResponse(responseText, statusText)  { 
+  // for normal html responses, the first argument to the success callback 
+  // is the XMLHttpRequest object's responseText property 
+ 
+  // if the ajaxForm method was passed an Options Object with the dataType 
+  // property set to 'xml' then the first argument to the success callback 
+  // is the XMLHttpRequest object's responseXML property 
+ 
+  // if the ajaxForm method was passed an Options Object with the dataType 
+  // property set to 'json' then the first argument to the success callback 
+  // is the json data object returned by the server 
+
   if (statusText == 'success') {
-    var amount = 0;
-    $("input.payment.amount").each(function(i) {
-	amount += $(this).val();
-    });
-
-    $('#results').html('<H3>Receipt Saved<BR>' +
-		       $("#receipt-customer-name").html() +
-		       ' : ' + fmtCurrency(amount) +
-		       '</H3>');
-
-    if (!$("#repeat").attr("checked")) {
-      window.location.href =
-	"<?php echo $html->url(array('controller' => 'customers',
-		                     'action'     => 'view')); ?>"
-	+ "/" + $("#customer-id").val();
-      return;
-    }
-
     // get a clean slate
-    resetForm();
+    //resetForm();
+    // REVISIT <AP>: 20090806 Add to resetForm()
+    updateCharges($("#customer-id").val());
   }
   else {
-    $('#results').html('<H2>Failed to save receipt!</H2>');
+    alert('not successful??');
-    alert('Failed to save receipt.');
   }
+
+
+  $('#response-debug').html('<PRE>'+dump(statusText)+'</PRE>');
 }
 
 // Reset the form
@@ -121,42 +86,30 @@ function resetForm() {
   $('#payment-entry-id').val(1);
   $('#payments').html('');
 
-  addPaymentSource(false);
+  $("#receipt-customer-id").html("INTERNAL ERROR");
-  updateCharges($("#customer-id").val());
+  $("#receipt-customer-name").html("INTERNAL ERROR");
-}
+  $("#receipt-balance").html("INTERNAL ERROR");
-
-function updateCharges(id) {
-  $('#charge-entries-jqGrid').clearGridData();
-  $("#receipt-balance").html("Calculating...");
-  $("#receipt-charges-caption").html("Please Wait...");
-
-  var filter = new Array();
-  filter['StatementEntry.customer_id'] = id;
-
-  var dynamic_post = new Array();
-  dynamic_post['filter'] = filter;
-
-  $('#charge-entries-jqGrid').setPostDataItem('dynamic_post_replace', serialize(dynamic_post));
-  $('#charge-entries-jqGrid')
-    .setGridParam({ page: 1 })
-    .trigger("reloadGrid");
-
-  var gridstate = $('#charge-entries-jqGrid').getGridParam('gridstate');
-  if (gridstate == 'hidden')
-    $('#charge-entries .HeaderButton').click();
-}
-
-function onGridLoadComplete() {
-  var userdata = $('#charge-entries-jqGrid').getGridParam('userData');
-  $('#receipt-balance').html(fmtCurrency(userdata['balance']));
   $("#receipt-charges-caption").html("Outstanding Charges");
+
+  addPaymentSource(false);
+  datepickerNow('TransactionStamp');
 }
 
 function onRowSelect(grid_id, customer_id) {
   // Set the customer id that will be returned with the form
   $("#customer-id").val(customer_id);
-
+  
-  // Set the customer name, so the user knows who the receipt is for
+  // 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="/pmgr/site/customers/view/' +
+				 $(grid_id).getCell(customer_id, 'Customer-id').replace(/^#/,'') +
+				 '">' +
+				 $(grid_id).getCell(customer_id, 'Customer-id') +
+				 '</A>');
   $("#receipt-customer-name").html($(grid_id).getCell(customer_id, 'Customer-name'));
 
   // Hide the "no customer" message and show the current customer
@@ -221,7 +174,7 @@ function addPaymentSource(flash) {
 	 '<DIV ID="payment-amount-div-%{id}" CLASS="input text required">' +
 	 ' <INPUT TYPE="text" SIZE="20"' +
 	 '  NAME="data[Entry][%{id}][amount]"' +
-	 '  CLASS="payment amount"' +
+	 '  CLASS="payment"' +
 	 '  ID="payment-amount-%{id}" />' +
 	 ' <LABEL CLASS="payment" FOR="payment-amount-%{id}">Amount</LABEL>' +
 	 '</DIV>' +
@@ -267,20 +220,59 @@ function addPaymentSource(flash) {
   }
 
 function switchPaymentType(paymentid_base, paymentid, radioid) {
+  $("."+paymentid_base+"-"+paymentid).slideUp();
   var type_id = $("#"+radioid).val();
-  $("."+paymentid_base+"-"+paymentid+
-    ":not(" +
-    "#"+paymentid_base+"-"+paymentid+"-"+type_id +
-    ")").slideUp();
   $("#"+paymentid_base+"-"+paymentid+"-"+type_id).slideDown();
+  }
+
+
+function updateChargesGrid(idlist) {
+  var dynamic_post = new Array();
+  dynamic_post['idlist'] = idlist;
+
+  $('#charge-entries-jqGrid').setPostDataItem('dynamic_post_replace', serialize(dynamic_post));
+  $('#charge-entries-jqGrid')
+    .setGridParam({ page: 1 })
+    .trigger("reloadGrid");
 }
 
---></script>
+function updateCharges(id) {
+  var url = '<?php echo ($html->url(array("controller" => $this->params["controller"],
+					  "action"     => "unreconciled"))); ?>';
+  url += '/'+id;
+
+  $('#charge-entries-jqGrid').clearGridData();
+  $("#receipt-balance").html("Calculating...");
+  $("#receipt-charges-caption").html("Please Wait...");
+
+  $.ajax({
+    type: "GET",
+	url: url,
+	dataType: "xml",
+	success: function(xml) {
+	var ids = new Array();
+	$('entry',xml).each(function(i){
+	    ids.push($(this).attr('id'));
+	  });
+	$('#receipt-balance').html(fmtCurrency($('entries',xml).attr('balance')));
+	$("#receipt-charges-caption").html("Outstanding Charges");
+	updateChargesGrid(ids);
+        },
+	error: function(XMLHttpRequest, textStatus, errorThrown) {
+/* 	alert('ERROR'); */
+/* 	$('#debug').html('<P>request<BR>'+escape(XMLHttpRequest)); */
+/* 	$('#debug').append('<P>status<BR>'+escape(textStatus)); */
+/* 	$('#debug').append('<P>error<BR>'+escape(errorThrown)); */
+        }
+    });
+}
+
+
+  --></script>
 
 <?php
 ; // align
-// Re-Enable warnings
+  //echo '<DIV ID="dialog">' . "\n";
-Configure::write('debug', $saved_debug_state);
 
 echo $this->element('customers', array
 		    ('config' => array
@@ -296,7 +288,6 @@ echo $this->element('customers', array
 					     array('gridstate' =>
 						   'onGridState("#"+$(this).attr("id"), gridstate)'),
 					     ),
-		      'action' => 'current',
 		      'nolinks' => true,
 		      'limit' => 10,
 		      )));
@@ -304,7 +295,8 @@ 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-name"></SPAN>' .
+      'Customer <SPAN id="receipt-customer-id"></SPAN>' .
+      ': <SPAN id="receipt-customer-name"></SPAN>' .
 
 /*       '<DIV CLASS="supporting">' . */
 /*       '<TABLE>' . */
@@ -322,19 +314,17 @@ echo ('<DIV CLASS="receipt grid-selection-text">' .
 
 
 echo $this->element('statement_entries', array
-		    (// Grid configuration
+		    (// Element configuration
+		     'account_ftype' => 'credit',
+		     'limit' => 8,
+
+		     // Grid configuration
 		     'config' => array
 		     (
 		      'grid_div_id' => 'charge-entries',
 		      'grid_div_class' => 'text-below',
-		      'grid_events' => array('loadComplete' => 'onGridLoadComplete()'),
-		      'grid_setup' => array('hiddengrid' => true),
 		      'caption' => '<SPAN id="receipt-charges-caption"></SPAN>',
-		      'action' => 'unreconciled',
+		      'rows' => $charges,
-		      'exclude' => array('Customer', 'Type', 'Debit', 'Credit'),
-		      'include' => array('Applied', 'Balance'),
-		      'remap' => array('Received' => 'Paid'),
-		      'limit' => 8,
 		      ),
 		     ));
 
@@ -373,10 +363,6 @@ echo $this->element('form_table',
 						   ),
 			   )));
 
-echo "<BR>\n";
-echo $form->input('repeat', array('type'  => 'checkbox',
-				  'id'    => 'repeat',
-				  'label' => 'Enter Multiple Receipts')) . "\n";
 echo $form->submit('Generate Receipt') . "\n";
 ?>
 
@@ -397,25 +383,29 @@ echo $form->submit('Generate Receipt') . "\n";
 
 <?php /* echo '</DIV>' . "\n"; // End of the dialog DIV */ ?>
 
-<div id="results"></div>
+<div><H4>Request</H4><div id="request-debug"></div></div>
-<div id="output-debug" style="display:none"></div>
+<div><H4>Response</H4><div id="response-debug"></div></div>
-
+<div><H4>Output</H4><div id="output-debug"></div></div>
-<?php
-// Warnings _really_ screw up javascript
-Configure::write('debug', '0');
-?>
 
 <script type="text/javascript"><!--
   $(document).ready(function(){
-      datepicker('TransactionStamp');
+      $("#TransactionStamp")
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+                      showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
 
-      $("#customer-id").val(0);
+      resetForm();
-      $("#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="/pmgr/site/customers/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');
@@ -423,15 +413,37 @@ Configure::write('debug', '0');
       onGridState(null, 'visible');
       <?php endif; ?>
 
-      resetForm();
-      datepickerNow('TransactionStamp');
 
-      <?php if ($this->params['dev']): ?>
+
-      $('#output-debug').html('Post Output');
+/*       $("#dialog").dialog({ */
-      $('#output-debug').show();
+/* 	bgiframe: true, */
-      <?php endif; ?>
+/* 	    autoOpen: false, */
+/* 	    height: 500, */
+/* 	    width: 600, */
+/* 	    modal: true, */
+/* 	    buttons: { */
+/* 	    'Post a Payment': function() { */
+/* 	      var bValid = true; */
+/* 	      if (bValid) { */
+/* 		$('#debug').append('<H2>POSTED!</H2>'); */
+/* 		$(this).dialog('close'); */
+/* 	      } */
+/* 	    }, */
+/* 	      Cancel: function() { */
+/* 	      $(this).dialog('close'); */
+/* 	    } */
+/* 	  }, */
+/* 	    close: function() { */
+/* 	  } */
+/* 	}); */
+
+/*       $('#post-payment').click(function() { */
+/* 	  $('#dialog').dialog('open'); */
+/* 	}); */
 
   });
 --></script>
 
 </div>
+
+<a href="#" onClick="$('#debug').html(''); return false;">Clear Debug Output</a>

site/views/customers/view.ctp

@@ -11,9 +11,6 @@ echo '<div class="customer view">' . "\n";
 
 $rows = array();
 $rows[] = array('Name',    $customer['Customer']['name']);
-$rows[] = array('Since',   FormatHelper::date($since, true));
-if (!empty($until))
-  $rows[] = array('Until',   FormatHelper::date($until, true));
 $rows[] = array('Comment', $customer['Customer']['comment']);
 
 echo $this->element('table',
@@ -30,9 +27,7 @@ echo $this->element('table',
 echo '<div class="infobox">' . "\n";
 $rows = array();
 $rows[] = array('Security Deposit:',  FormatHelper::currency($outstandingDeposit));
-//$rows[] = array('Charges:',           FormatHelper::currency($stats['charges']));
+$rows[] = array('Balance:',           FormatHelper::currency($outstandingBalance));
-//$rows[] = array('Payments:',          FormatHelper::currency($stats['disbursements']));
-$rows[] = array('Balance Owed:',      FormatHelper::currency($outstandingBalance));
 echo $this->element('table',
 		    array('class'   => 'summary',
 			  'rows'    => $rows,
@@ -53,55 +48,15 @@ echo '<div CLASS="detail supporting">' . "\n";
 
 
 /**********************************************************************
- * Unpaid Charges
+ * Contacts
  */
 
-echo $this->element('statement_entries', array
+echo $this->element('contacts', array
 		    (// Grid configuration
 		     'config' => array
-		     ('caption' => 'Outstanding Charges',
+		     ('caption' => 'Customer Contacts',
-		      'limit'   => 10,
+		      'filter' => array('Customer.id' => $customer['Customer']['id']),
-		      'action'  => 'unreconciled',
+		      'include' => array('Type', 'Active'),
-		      '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'),
 		      )));
 
 
@@ -113,25 +68,8 @@ echo $this->element('leases', array
 		    (// Grid configuration
 		     'config' => array
 		     ('caption' => 'Lease History',
-		      'limit'   => 5,
+		      'filter' => array('Customer.id' => $customer['Customer']['id']),
-		      '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'),
 		      )));
 
 
@@ -142,11 +80,39 @@ echo $this->element('contacts', array
 echo $this->element('statement_entries', array
 		    (// Grid configuration
 		     'config' => array
-		     ('caption' => 'Customer Statement',
+		     ('caption' => 'Account',
 		      'filter' => array('Customer.id' => $customer['Customer']['id'],
 					'type !=' => 'VOID'),
-		      //'include' => array('Sub-Total'),
 		      'exclude' => array('Customer'),
+		      'sort_column' => 'Effective',
+		      'sort_order'  => 'DESC',
+		      )));
+
+
+/**********************************************************************
+ * Customer Ledger History
+ */
+
+/*
+ * REVISIT <AP>: 20090724
+ *  It's not my intention to really include this, as I believe it
+ *  just will confuse folks.  However, I've added it at the moment
+ *  to help me see the picture of what's happening.  It may prove
+ *  useful with respect to identifying pre-payments, so after using
+ *  it for a while, maybe we can get a feeling for that.  I suspect
+ *  it will be MUCH more useful just to add the pre-pay amount to
+ *  the info box, or provide a list of ledger entries that are JUST
+ *  pre-payments.  We'll see...
+ */
+echo $this->element('ledger_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Ledger Entries',
+		      'filter' => array('Customer.id' => $customer['Customer']['id'],
+					'Account.id !=' => '-AR-'),
+		      'exclude' => array('Customer'),
+		      'sort_column' => 'Date',
+		      'sort_order'  => 'DESC',
 		      )));
 
 

site/views/double_entries/view.ctp

@@ -1,17 +1,50 @@
 <?php /* -*- mode:PHP -*- */
 
-echo '<div class="double-entry view">' . "\n";
+echo '<div class="ledger-entry view">' . "\n";
 
-// The two entries, debit and credit, are actually individual
+// The two entry ids, debit and credit, are actually individual
 // entries in separate accounts (each make up one of the two
-// entries required for "double entry").
+// 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.
 
 
 /**********************************************************************
  **********************************************************************
  **********************************************************************
  **********************************************************************
- * DoubleEntry Detail Main Section
+ * LedgerEntry Detail Main Section
  */
 
 $transaction    = $entry['Transaction'];
@@ -19,61 +52,92 @@ $ledgers        = array('debit'  => $entry['DebitLedger'],
 			'credit' => $entry['CreditLedger']);
 $entries        = array('debit'  => $entry['DebitEntry'],
 			'credit' => $entry['CreditEntry']);
+$customer       = $entry['Customer'];
+$lease          = $entry['Lease'];
 $entry          = $entry['DoubleEntry'];
 
 $rows = array();
+$rows[] = array('ID',               $entry['id']);
 $rows[] = array('Transaction',      $html->link('#'.$transaction['id'],
 						array('controller' => 'transactions',
 						      'action'     => 'view',
 						      $transaction['id'])));
 $rows[] = array('Timestamp',        FormatHelper::datetime($transaction['stamp']));
-$rows[] = array('Comment',          $entry['comment']);
+$rows[] = array('Effective',        FormatHelper::date($entry['effective_date']));
+//$rows[] = array('Through',          FormatHelper::date($entry['through_date']));
+$rows[] = array('Customer',         (isset($customer['name'])
+				     ? $html->link($customer['name'],
+						   array('controller' => 'customers',
+							 'action'     => 'view',
+							 $customer['id']))
+				     : null));
+$rows[] = array('Lease',            (isset($lease['id'])
+				     ? $html->link('#'.$lease['id'],
+						   array('controller' => 'leases',
+							 'action'     => 'view',
+							 $lease['id']))
+				     : null));
+$rows[] = array('Comment',           $entry['comment']);
 
 echo $this->element('table',
-		    array('class'   => 'item double-entry detail',
+		    array('class'   => 'item ledger-entry detail',
-			  'caption' => 'Double Ledger Entry',
+			  'caption' => 'Double Ledger Entry Detail',
 			  'rows'    => $rows,
 			  'column_class' => array('field', 'value')));
 
 
-
 /**********************************************************************
- * Debit/Credit Entries
+ * LedgerEntry Info Box
  */
 
+/* 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();
 
-  // REVISIT <AP>: 20090816
+  $rows[] = array('ID',        $html->link('#' . $entries[$type]['id'],
-  //  Due to low priority, the ledger_entry/double_entry stuff
+					   array('controller' => 'entries',
-  //  is a bit piecemeal at the moment (trying to reuse old
+						 'action'     => 'view',
-  //  code as much as possible).  So, LedgerEntry view is just
+						 $entries[$type]['id'])));
-  //  redirecting here.  Of course, presenting a link for the
+  $rows[] = array('Account',   $html->link($ledger['Account']['name'],
-  //  LedgerEntry then is, well, quite pointless.
+					   array('controller' => 'accounts',
-  $rows[] = array('ID',        '#' . $entries[$type]['id']);
+						 'action'     => 'view',
-/*   $rows[] = array('ID',        $html->link('#' . $entries[$type]['id'], */
+						 $ledger['Account']['id'])));
-/* 					   array('controller' => 'entries', */
+  $rows[] = array('Ledger',    $html->link('#' . $ledger['Account']['id']
-/* 						 'action'     => 'view', */
+					   . '-' . $ledger['sequence'],
-/* 						 $entries[$type]['id']))); */
+					   array('controller' => 'ledgers',
-  $rows[] = array('Account',   ($ledger['link']
+						 'action'     => 'view',
-				? $html->link($ledger['Account']['name'],
+						 $ledger['id'])));
-					      array('controller' => 'accounts',
+  $rows[] = array('Amount',    FormatHelper::currency($entry['amount']));
-						    'action'     => 'view',
+  $rows[] = array('Effect',    $ledger['Account']['ftype'] == $type ? 'INCREASE' : 'DECREASE');
-						    $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) . ' Entry',
+			    'caption' => ucfirst($type) . ' Ledger Entry',
 			    'rows'    => $rows,
 			    'column_class' => array('field', 'value')));
 }

site/views/elements/accounts.ctp

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

site/views/elements/customers.ctp

@@ -2,21 +2,25 @@
 
 // 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['Units']         = array('index' => 'current_lease_count',        'formatter' => 'number');
+$cols['Leases']        = 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('Name'))
+->defaultFields(array('ID', 'Name'))
 ->searchFields(array('Name', 'Last Name', 'First Name'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Relationship', 'Past Leases', 'Comment')));
+	 array_diff(array_keys($cols), array('Comment')));

site/views/elements/double_entries.ctp

@@ -0,0 +1,116 @@
+<?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;
 }
 
-if (empty($column_class))
+
-  $column_class = array();
+$column_class = array();
 if ($include_before)
   $column_class[] = 'before';
 $column_class[] = 'field';
@@ -79,13 +79,7 @@ foreach ($fields AS $field => $config) {
       $cells[] = null;
   }
 
-  if (empty($config['opts']['label']))
+  $name = $config['name'];
-    $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))
@@ -129,7 +123,7 @@ foreach ($fields AS $field => $config) {
 }
 
 echo $this->element('table',
-		    compact('id', 'class', 'caption', 'headers',
+		    compact('class', 'caption', 'headers',
 			    'rows', 'row_class', 'suppress_alternate_rows',
 			    'column_class')
 		    );

site/views/elements/jqGrid.ctp

@@ -19,7 +19,6 @@ 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';
@@ -47,9 +46,12 @@ if (!isset($grid_setup))
   $grid_setup = array();
 
 // Do some prework to bring in the appropriate libraries
-$html->css('ui.jqgrid', null, null, false);
+$imgpath = '/pmgr/site/css/jqGrid/basic/images';
-$javascript->link('jqGrid/grid.locale-en', false);
+$html->css('jqGrid/basic/grid', null, null, false);
-$javascript->link('jqGrid/jquery.jqGrid.min', 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);
 $javascript->link('pmgr_jqGrid', false);
 
 
@@ -61,6 +63,7 @@ $javascript->link('pmgr_jqGrid', false);
 // as part of the data fetch.
 $url = $html->url(array('controller' => $controller,
 			'action'     => 'gridData',
+			'debug'      => 0,
 			));
 
 // Create extra parameters that jqGrid will pass to our
@@ -121,11 +124,6 @@ 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');
@@ -148,14 +146,8 @@ foreach ($jqGridColumns AS $header => &$col) {
       // No special formatting for name
       unset($col['formatter']);
     }
-    elseif (preg_match("/^(long|short)?enum$/",
+    elseif ($col['formatter'] === '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
@@ -172,8 +164,7 @@ foreach ($jqGridColumns AS $header => &$col) {
 
     // Just a rough approximation to ensure columns
     // are wide enough to fully display their header.
-    $min_width = strlen($header) * 7;
+    $min_width = strlen($header) * 10;
-    $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;
   }
@@ -197,12 +188,9 @@ if (isset($sort_order)) {
   $sortorder = 'ASC';
 }
 
-$debug = !empty($this->params['dev']);
+if (1) { // debug
-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) {
@@ -212,21 +200,13 @@ foreach (array_merge(array('loadComplete' => '', 'loadError' => ''),
     $statement = current($statement);
   }
 
-  if ($event == 'loadComplete' && $debug) {
+  if ($event == 'loadComplete') {
     $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;}");
+      array('--special' => "function($params) {url=jQuery('#{$grid_id}').getGridParam('url');url=url.replace(/\/debug.*$/,'?'); 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' && $debug) {
+  elseif ($event == 'loadError') {
     $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;}");
+      array('--special' => "function($params) {url=jQuery('#{$grid_id}').getGridParam('url');url=url.replace(/\/debug.*$/,'?'); 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] = 
@@ -246,14 +226,13 @@ $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,
@@ -266,46 +245,67 @@ $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) . "\n"; ?>
+    <?php echo FormatHelper::phpVarToJavascript($jqGrid_setup); ?>
-  ).navGrid('#<?php echo $grid_id; ?>-pager', { view:false,edit:false,add:false,del:false,search:true,refresh:true});
+  ).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"); */
+/* 	  } */
+/* 	} */
+/*       }); */
+?>
+
 });
+
 --></script>
+
 <?php
   if (count($search_fields) > 0) {
     echo('<div>Search By:<BR>' . "\n");

site/views/elements/leases.ctp

@@ -2,36 +2,23 @@
 
 // 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',           'formatter' => 'shortname',  'align' => 'center');
+$cols['Unit']      = array('index' => 'Unit.name',           'width' => '50',  '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');
+$cols['Rent']      = array('index' => 'Lease.rent',          'formatter' => 'currency', 'hiddenz' => true);
-$cols['Deposit']   = array('index' => 'Lease.deposit',       'formatter' => 'currency');
+$cols['Deposit']   = array('index' => 'Lease.deposit',       'formatter' => 'currency', 'hiddenz' => true);
 $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' => '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('Charge-Thru', 'Paid-Thru', 'Status'));
-  elseif ($this->params['action'] === 'active')
-    $grid->invalidFields(array('Closed'));
-  elseif ($this->params['action'] === 'delinquent')
-    $grid->invalidFields(array('Closed'));
-}
-
 // Render the grid
 $grid
 ->columns($cols)
-->sortField('Lease')
+->sortField('LeaseID')
-->defaultFields(array('Lease'))
+->defaultFields(array('LeaseID', 'Lease'))
 ->searchFields(array('Customer', 'Unit'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Signed', 'Charge-Thru', 'Status', 'Comment')));
+	 array_diff(array_keys($cols), array('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', 'DESC')
+->sortField('Date')
 ->defaultFields(array('Entry', 'Date', 'Amount'))
 ->searchFields(array('Customer', 'Unit'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Transaction', 'Debit', 'Credit',
+	 array_diff(array_keys($cols), array('Debit', 'Credit', 'Balance', 'Sub-Total', 'Comment')));
-					     'Balance', 'Sub-Total', 'Comment')));
 

site/views/elements/ledgers.ctp

@@ -2,8 +2,9 @@
 
 // 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');
@@ -15,8 +16,8 @@ $cols['Balance']     = array('index' => 'balance',             'formatter' => 'c
 // Render the grid
 $grid
 ->columns($cols)
-->sortField('Sequence')
+->sortField('ID', 'ASC')
-->defaultFields(array('Sequence'))
+->defaultFields(array('ID', 'Name', 'Account'))
-->searchFields(array('Comment'))
+->searchFields(array('Account', 'Comment'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Account', 'Open Date', 'Comment')));
+	 array_diff(array_keys($cols), array('Open Date', 'Comment')));

site/views/elements/maps.ctp

@@ -2,6 +2,7 @@
 
 // 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');
@@ -12,7 +13,7 @@ $cols['Comment']    = array('index' => 'Map.comment',    'formatter' => 'comment
 $grid
 ->columns($cols)
 ->sortField('Name')
-->defaultFields(array('Name'))
+->defaultFields(array('ID', 'Name'))
 ->searchFields(array('Name'))
 ->render($this, isset($config) ? $config : null,
 	 array_diff(array_keys($cols), array()));

site/views/elements/sidemenu.ctp

@@ -8,78 +8,17 @@
  * @package       pmgr
  */
 
-// REVISIT <AP>: 20090823
+foreach ($menu AS $item) {
-//  Add way to slide the entire menu off the page
+  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)
 
-// The sidemenu-container is necessary to define the
+	 . '</DIV>' . "\n");
-// 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,22 +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' => 'longenum');
+$cols['Type']           = array('index' => 'StatementEntry.type', 'formatter' => 'enum', 'width'=>120);
-$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');
 $cols['Sub-Total']      = array('index' => 'subtotal-balance',    'formatter' => 'currency', 'sortable' => false);
 
 
@@ -32,30 +29,17 @@ 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', 'DESC')
+->sortField('Date')
 ->defaultFields(array('Entry', 'Date', 'Charge', 'Payment'))
 ->searchFields(array('Customer', 'Unit'))
-->render($this, isset($config) ? $config : null, $include_columns);
+->render($this, isset($config) ? $config : null,
+	 array_diff(array_keys($cols), array('Through', 'Lease',
+					     'Applied', 'Sub-Total',
+					     'Comment')));
 

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(empty(   $row_class[$r]) ? array() :    $row_class[$r],
+      $cell_class = implode(" ", array_merge(isset(   $row_class[$r]) ?    $row_class[$r] : array(),
-					     empty($column_class[$c]) ? array() : $column_class[$c]));
+					     isset($column_class[$c]) ? $column_class[$c] : array()));
       if ($cell_class)
 	$row[$c] = array($col, array('class' => $cell_class));
     }
@@ -64,12 +64,9 @@ if (isset($rows) && is_array($rows) && count($rows)) {
     $class = implode(' ', $class);
 
   // OK, output the table HTML
-  echo('<TABLE' .
+  echo('<TABLE' . (isset($class) ? ' CLASS="'.$class.'"' : '') . '>' . "\n");
-       (empty($id) ? '' : ' ID="'.$id.'"') .
-       (empty($class) ? '' : ' CLASS="'.$class.'"') .
-       '>' . "\n");
 
-  if (!empty($caption))
+  if (isset($caption))
     echo('  <CAPTION>' . $caption . '</CAPTION>' . "\n");
 
   if (isset($headers) && is_array($headers)) {

site/views/elements/tenders.ctp

@@ -2,6 +2,7 @@
 
 // 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');
@@ -17,4 +18,4 @@ $grid
 ->defaultFields(array('Date', 'Name', 'Amount'))
 ->searchFields(array('Name', 'Type'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Comment', 'Sub-Total')));
+	 array_diff(array_keys($cols), array('Sub-Total')));

site/views/elements/transactions.ctp

@@ -1,25 +1,20 @@
 <?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', 'DESC')
+->sortField('Timestamp')
 ->defaultFields(array('ID', 'Timestamp'))
 ->searchFields(array('Type', 'Comment'))
 ->render($this, isset($config) ? $config : null,
-	 array_merge($include, array_diff(array_keys($cols), array('Customer', 'Comment'))));
+	 array_diff(array_keys($cols), array('Comment')));

site/views/elements/unit_sizes.ctp

@@ -1,40 +0,0 @@
-<?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,23 +4,19 @@
 $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', 'Unit'))
+->defaultFields(array('Sort', 'ID', 'Unit'))
 ->searchFields(array('Unit', 'Size', 'Status'))
 ->render($this, isset($config) ? $config : null,
-	 array_diff(array_keys($cols), array('Walk', 'Deposit', 'Comment')));
+	 array_diff(array_keys($cols), array('Walk', 'Comment')));

site/views/empty.ctp

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

site/views/helpers/format.php

@@ -24,21 +24,9 @@ class FormatHelper extends AppHelper {
       return '-';
       //return null;
 
-    // Use of the $number->currency() function results in the clever,
+    $currency = self::$number->currency($amount,
-    // but problematic, use of cents for amounts less than $1.  For
+					isset($dollar_sign) ? $dollar_sign : 'USD',
-    // example, 50 cents is shown as '50c', not '$0.50'.  We want to
+					$spans ? array('before'=>'', 'after'=>'') : array());
-    // keep everything in terms of dollars, especially for the cases
-    // where this result is placed into a form for input.  50 cents
-    // will end up as 50 dollars upon submission :-(
-    $currency = self::$number->format
-      (abs($amount),
-       array('places' => 2,
-	     'before' => $spans ? '' : (isset($dollar_sign) ? $dollar_sign : '$'),
-	     'after'  => $spans ? '' : null,
-	     ));
-
-    if ($amount < 0)
-      $currency = '(' . $currency . ')';
 
     if ($spans)
       return ('<SPAN CLASS="dollar-sign">$</SPAN>' .
@@ -47,36 +35,22 @@ class FormatHelper extends AppHelper {
     return $currency;
   }
 
-  function percent($amount, $precision = 2) {
+  function date($date, $age = false) {
-    if (!isset($amount))
-      return '-';
-
-    return self::$number->toPercentage($amount*100, $precision);
-  }
-
-  function date($date, $age = false, $class = null, $time = false) {
     if (!$date) return null;
 
-    if (empty($class))
+    $date_fmt = 'm/d/Y';
-      $class = '';
+    return (self::$time->format($date_fmt, $date) .
-
+	    ($age
-    if ($time)
+	     ? ' (' . self::age($date, 60*60*24) . ')'
-      $date_html = self::$time->nice($date);
+	     : ''));
-    else
-      $date_html = self::$time->format('m/d/Y', $date);
-
-    $date_html = '<span class="fmt-date '.$class.'">'.$date_html.'</span>';
-
-    if ($age) {
-      $date_html .= ' (' . self::age($date, $class, true, $time ? 0 : 60*60*24) . ')';
-      $date_html = '<span class="fmt-dateage '.$class.'">'.$date_html.'</span>';
-    }
-
-    return $date_html;
   }
 
-  function datetime($datetime, $age = false, $class = null) {
+  function datetime($datetime, $age = false) {
-    return self::date($datetime, $age, $class, true);
+    if (!$datetime) return null;
+    return (self::$time->nice($datetime) .
+	    ($age
+	     ? ' (' . self::age($datetime) . ')'
+	     : ''));
   }
 
   function phone($phone, $ext = null) {
@@ -107,13 +81,10 @@ class FormatHelper extends AppHelper {
     return $comment;
   }
 
-  function age($datetime, $class, $suffix = false, $min_span = 0) {
+  function age($datetime, $min_span = 0) {
     if (!isset($datetime))
       return null;
 
-    if (empty($class))
-      $class = '';
-
     $now = time();
     $seconds = self::$time->fromString($datetime);
     $backwards = ($seconds > $now);
@@ -124,11 +95,9 @@ class FormatHelper extends AppHelper {
 
     //pr(compact('now', 'seconds', 'backwards', 'timefrom', 'timeto', 'span', 'min_span'));
 
-    // If now, just use 'now'
+    // If now, just return so
-    if ($span === 0) {
+    if ($span === 0)
-      $approx = 0;
+      return __('now', true);
-      $unit = 'now';
-    }
 
     // Display seconds if under 45 seconds
     if ($span < 45 && $span >= $min_span) {
@@ -195,36 +164,20 @@ class FormatHelper extends AppHelper {
     //pr(compact('span', 'min_span', 'approx', 'unit'));
 
     if ($approx == 0) {
-      if ($unit == 'now')
+      if ($unit == 'day')
-	$age = 'now';
+	return __('today', true);
-      elseif ($unit == 'day')
+
-	$age = 'today';
+      return __('this ' . $unit, true);
-      else
-	$age = 'this ' . $unit;
     }
-    else {
-      if (isset($relative))
-	$age = $relative;
-      elseif ($approx > $span)
-	$age = 'almost';
-      elseif ($approx < $span)
-	$age = 'over';
-      else
-	$age = '';
 
-      $age .= ' ' . self::_n($approx, $unit);
+    return (__(isset($relative)
-
+	       ? $relative
-      if ($suffix) {
+	       : ($approx == $span
-	if ($backwards)
+		  ? ''
-	  $age .= ' from now';
+		  : ($approx > $span ? 'almost' : 'over')), true)
-	else
+	    . ' '
-	  $age .= ' ago';
+	    . self::_n($approx, $unit)
-      }
+	    . ($backwards ? '' : __(' ago', true)));
-    }
-    
-    $age = '<span class="fmt-age '.$class.'">'.__($age, true).'</span>';
-
-    return $age;
   }
 
 /*****************************
@@ -275,21 +228,14 @@ class FormatHelper extends AppHelper {
 
 
   // Helper function to convert PHP vars to javascript
-  function phpVarToJavascript($var, $name = '', $depth='', $special = false, $pretty = false) {
+  function phpVarToJavascript($var, $name = '', $depth='', $special = false) {
 
     // Establish a prefix to use before printing $var
-    if ($pretty) {
+    $prefix = $depth;
-      $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 . ":" . $pretty_sp;
+      $prefix .= $name . ": ";
 
     if (!isset($var))
       return $prefix . 'null';
@@ -342,22 +288,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 . "[" . $pretty_nl
+      return ($prefix . "[\n"
-	      . implode("," . $pretty_nl,
+	      . implode(",\n",
 			array_map(array('FormatHelper', 'phpVarToJavascript'),
 				  array_values($var),
 				  array(),
 				  array_fill(0, count($var), $depth.'   ')
 				  ))
-	      . ($pretty ? "\n$depth" : '') . "]");
+	      . "\n$depth]");
 
-    return ($prefix . "{" . $pretty_nl
+    return ($prefix . "{\n"
-	    . implode("," . $pretty_nl,
+	    . implode(",\n",
 		      array_map(array('FormatHelper', 'phpVarToJavascript'),
 				array_values($var), array_keys($var),
 				array_fill(0, count($var), $depth.'   ')
 				))
-	    . ($pretty ? "\n$depth" : '') . "}");
+	    . "\n$depth}");
   }
 
 }

site/views/helpers/grid.php

@@ -6,7 +6,6 @@ class GridHelper extends AppHelper {
   var $included, $invalid;
   var $columns;
   var $controller;
-  static $first_grid = true;
 
   function __construct() {
     $this->reset();
@@ -167,14 +166,9 @@ class GridHelper extends AppHelper {
     $included = array_diff(array_merge($this->included, $included),
 			   array_merge($this->invalid, $excluded));
 
-    // Defined the columns, based on the inclusion set,
+    // Extract the columns that correspond to the inclusion set
-    // remapping column names as necessary.
+    $this->jqGrid_options['jqGridColumns']
-    $this->jqGrid_options['jqGridColumns'] = array();
+      = array_intersect_key($this->columns, array_flip($included));
-    foreach (array_intersect_key($this->columns, array_flip($included)) AS $name => $col) {
-      if (!empty($config['remap'][$name]))
-	$name = $config['remap'][$name];
-      $this->jqGrid_options['jqGridColumns'][$name] = $col;
-    }
 
     // Make sure search fields are all part of the inclusion set
     $this->jqGrid_options['search_fields']
@@ -215,22 +209,12 @@ 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
@@ -240,4 +224,4 @@ class GridHelper extends AppHelper {
     return $this;
   }
   
-}
+}

site/views/layouts/default.ctp

@@ -24,80 +24,27 @@
 ?>
 <!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 $javascript->link('jquery-1.3.2.min') . "\n";
+		//echo $html->css('jquery/smoothness/ui.all') . "\n";
-		echo $javascript->link('jquery-ui-1.7.2.custom.min') . "\n";
+		//echo $html->css('jquery/dotluv/ui.all') . "\n";
-		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.js') . "\n";
+		echo $html->css('jquery/start/ui.all') . "\n";
-		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.js') . "\n";
+		echo $javascript->link('jquery/jquery') . "\n";
-		//echo $javascript->link($protocol . 'ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js') . "\n";
+		echo $javascript->link('jquery/jquery-ui') . "\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>
 
@@ -142,7 +89,5 @@
 <?php echo $cakeDebug; ?>
 <?php /* pr($this); */ ?>
 
-<?php echo implode("\n", $this->__scripts) . "\n"; ?>
-
 </body>
 </html>

site/views/leases/invoice.ctp

@@ -4,14 +4,6 @@
 <?php
 ; // Editor alignment
 
-$unit     = $lease['Unit'];
-$customer = $lease['Customer'];
-
-if (isset($lease['Lease']))
-  $lease = $lease['Lease'];
-
-//pr(compact('unit', 'customer', 'lease', 'movein'));
-
 /**********************************************************************
  **********************************************************************
  **********************************************************************
@@ -19,134 +11,105 @@ if (isset($lease['Lease']))
  * Javascript
  */
 
-// Warnings _really_ screw up javascript
-$saved_debug_state = Configure::read('debug');
-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: 
+      //url:       url,         // override for form's 'action' attribute 
+      //type:      'get',           // 'get' or 'post', override for form's 'method' attribute 
+      //dataType:  null,        // 'xml', 'script', or 'json' (expected server response type) 
       //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',
+      // $.ajax options can be used here too, for example: 
-					'action' => 'postInvoice', 0)); ?>"
+      //timeout:   3000,
-      };
+      }; 
 
-    // bind form using 'ajaxForm' 
+      // 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('');
+  // formData is an array; here we use $.param to convert it to a string to display it 
-  for (var i = 0; i < formData.length; ++i) {
+  // but the form plugin does this for you automatically when it submits the data 
-    //$("#debug").append(i + ') ' + dump(formData[i]) + '<BR>');
+  //var_dump(formData);
-    if (formData[i]['name'] == "data[Lease][id]" &&
+  //$('#request-debug').html('<PRE>'+dump(formData)+'</PRE>');
-	!(formData[i]['value'] > 0)) {
+  $('#request-debug').html('Ommitted');
-      //$("#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>');
+  $('#response-debug').html('Loading <BLINK>...</BLINK>');
+  $('#output-debug').html('Loading <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; 
 } 
  
 // post-submit callback 
 function showResponse(responseText, statusText)  { 
+  // for normal html responses, the first argument to the success callback 
+  // is the XMLHttpRequest object's responseText property 
+ 
+  // if the ajaxForm method was passed an Options Object with the dataType 
+  // property set to 'xml' then the first argument to the success callback 
+  // is the XMLHttpRequest object's responseXML property 
+ 
+  // if the ajaxForm method was passed an Options Object with the dataType 
+  // property set to 'json' then the first argument to the success callback 
+  // is the json data object returned by the server 
+
   if (statusText == 'success') {
-    var amount = 0;
-    $("input.invoice.amount").each(function(i) {
-	amount += (+ $(this).val().replace(/\$/,''));
-    });
-
-    $('#results').html('<H3>Invoice Saved<BR>' +
-		       $("#invoice-customer").html() +
-		       ' : ' + fmtCurrency(amount) +
-		       '</H3>');
-
-    if (!$("#repeat").attr("checked")) {
-      window.location.href =
-      <?php if (empty($movein)): ?>
-	"<?php echo $html->url(array('controller' => 'customers',
-		                     'action'     => 'view')); ?>"
-	+ "/" + $("#customer-id").val();
-      <?php else: ?>
-	"<?php echo $html->url(array('controller' => 'customers',
-		                     'action'     => 'receipt')); ?>"
-	+ "/" + $("#customer-id").val();
-      <?php endif; ?>
-      return;
-    }
-
     // get a clean slate
-    resetForm();
+    //resetForm();
   }
   else {
-    $('#results').html('<H2>Failed to save invoice!</H2>');
+    alert('not successful??');
-    alert('Failed to save invoice.');
   }
+
+
+  $('#response-debug').html('<PRE>'+dump(statusText)+'</PRE>');
 }
 
 // Reset the form
-function resetForm(nocharge) {
+function resetForm() {
-  $('#charge-entry-id').val(1);
+  $("#charge-entry-id").val(1);
-  $('#charges').html('');
 
-  if (!nocharge)
+  $("#invoice-lease").html("INTERNAL ERROR");
-    addChargeSource(false);
+  $("#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");
+
+  addChargeSource(false);
+  datepickerNow('TransactionStamp');
 }
 
 
 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'));
 
-  $("#invoice-lease").html($(grid_id).getCell(lease_id, 'Lease-number'));
+  // 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="/pmgr/site/leases/view/' +
+			   $(grid_id).getCell(lease_id, 'Lease-id').replace(/^#/,'') +
+			   '">' +
+			   $(grid_id).getCell(lease_id, 'Lease-number') +
+			   '</A>');
   $("#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'));
@@ -154,7 +117,6 @@ 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();
@@ -180,78 +142,6 @@ 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,
@@ -262,33 +152,26 @@ function addChargeSource(flash) {
 	 <?php
 	 echo FormatHelper::phpVarToJavascript
 	 ($this->element('form_table',
-			 array('id' => 'Entry%{id}Form',
+			 array('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('class' => 'ChargeFormAccount',
+						       array('options' => $chargeAccounts,
-							     'options' => $chargeAccounts,
 							     'value' => $defaultAccount,
 							     ),
-						       'between' => '<A HREF="#" ONCLICK="setNextRent(\'%{id}\'); return false;">Rent</A>',
 						       ),
 				"effective_date" => array('opts' =>
-							  array('class' => 'ChargeFormEffectiveDate',
+							  array('type' => 'text'),
-								'type' => 'text'),
 							  'between' => '<A HREF="#" ONCLICK="datepickerBOM(\'TransactionStamp\',\'Entry%{id}EffectiveDate\'); return false;">BOM</A>',
 							),
 				"through_date" => array('opts' =>
-							array('class' => 'ChargeFormThroughDate',
+							array('type' => 'text'),
-							      'type' => 'text'),
 							'between' => '<A HREF="#" ONCLICK="datepickerEOM(\'Entry%{id}EffectiveDate\',\'Entry%{id}ThroughDate\'); return false;">EOM</A>',
 							),
-				"amount"       => array('opts' => array('class' => 'ChargeFormAmount invoice amount'),
+				"amount"       => true,
-							'between' => '<A HREF="#" ONCLICK="prorate(\'%{id}\'); return false;">Prorate</A>',
+				"comment"      => array('opts' => array('size' => 50)),
-							),
-				"comment"      => array('opts' => array('class' => 'ChargeFormComment', 'size' => 50)),
 				),
 			       ))) . "+\n";
 	 ?>
@@ -296,40 +179,43 @@ function addChargeSource(flash) {
 	 '</FIELDSET>'
 	 );
 
-  datepicker("Entry"+id+"EffectiveDate");
+  $("#Entry"+id+"EffectiveDate")
-  datepicker("Entry"+id+"ThroughDate");
+    .attr('autocomplete', 'off')
+    .datepicker({ constrainInput: true,
+	          numberOfMonths: [1, 1],
+	          showCurrentAtPos: 0,
+                  dateFormat: 'mm/dd/yy' });
 
-  return id;
+  $("#Entry"+id+"ThroughDate")
+    .attr('autocomplete', 'off')
+    .datepicker({ constrainInput: true,
+	          numberOfMonths: [1, 1],
+	          showCurrentAtPos: 0,
+                  dateFormat: 'mm/dd/yy' });
   }
 
 --></script>
 
 <?php
 ; // align
-// Re-Enable warnings
-Configure::write('debug', $saved_debug_state);
 
-if (empty($movein))
+echo $this->element('leases', array
-  echo $this->element('leases', array
+		    ('config' => array
-		      ('config' => array
+		     ('grid_div_id' => 'leases-list',
-		       ('grid_div_id' => 'leases-list',
+		      'grid_div_class' => 'text-below',
-			'grid_div_class' => 'text-below',
+		      'caption' => ('<A HREF="#" ONCLICK="$(\'#leases-list .HeaderButton\').click();'.
-			'caption' => ('<A HREF="#" ONCLICK="$(\'#leases-list .HeaderButton\').click();'.
+				    ' return false;">Select Lease</A>'),
-				      ' return false;">Select Lease</A>'),
+		      'grid_setup' => array('hiddengrid' => isset($lease['Lease']['id'])),
-			'grid_setup' => array('hiddengrid' => isset($lease['id'])),
+		      'grid_events' => array('onSelectRow' =>
-			'grid_events' => array('onSelectRow' =>
+					     array('ids' =>
-					       array('ids' =>
+						   'if (ids != null){onRowSelect("#"+$(this).attr("id"), ids);}'),
-						     'if (ids != null){onRowSelect("#"+$(this).attr("id"), ids);}'),
+					     'onHeaderClick' =>
-					       'onHeaderClick' =>
+					     array('gridstate' =>
-					       array('gridstate' =>
+						   'onGridState("#"+$(this).attr("id"), gridstate)'),
-						     'onGridState("#"+$(this).attr("id"), gridstate)'),
+					     ),
-					       ),
+		      'nolinks' => true,
-			'include' => array('Charge-Thru'),
+		      'limit' => 10,
-			'exclude' => array('Closed', 'Paid-Thru'),
+		      )));
-			'action' => 'active',
-			'nolinks' => true,
-			'limit' => 10,
-			)));
 
 echo ('<DIV CLASS="invoice grid-selection-text">' .
 
@@ -363,11 +249,6 @@ 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"; */
 
@@ -386,13 +267,6 @@ echo $this->element('form_table',
 
 /* echo '</fieldset>' . "\n"; */
 
-if (empty($movein)) {
-  echo "<BR>\n";
-  echo $form->input('repeat', array('type'  => 'checkbox',
-				    'id'    => 'repeat',
-				    'label' => 'Enter Multiple Invoices')) . "\n";
-}
-
 echo $form->submit('Generate Invoice') . "\n";
 ?>
 
@@ -407,117 +281,41 @@ echo $form->submit('Generate Invoice') . "\n";
 
 <?php echo $form->end('Generate Invoice'); ?>
 
-<div id="results"></div>
+<div><H4>Request</H4><div id="request-debug"></div></div>
-<div id="output-debug" style="display:none"></div>
+<div><H4>Response</H4><div id="response-debug"></div></div>
-
+<div><H4>Output</H4><div id="output-debug"></div></div>
-<?php
-// Warnings _really_ screw up javascript
-Configure::write('debug', '0');
-?>
 
 <script type="text/javascript"><!--
-  $.fn.removeCol = function(col){
-    if(!col){ col = 1; }
-    $('tr td:nth-child('+col+'), tr th:nth-child('+col+')', this).remove();
-  };
-
-  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');
+      $("#TransactionStamp")
-
+	.attr('autocomplete', 'off')
-      <?php if (isset($lease['id'])): ?>
+	.datepicker({ constrainInput: true,
-      $("#lease-id").val(<?php echo $lease['id']; ?>);
+	              numberOfMonths: [1, 1],
-      $("#customer-id").val(<?php echo $customer['id']; ?>);
+	              showCurrentAtPos: 0,
-
+                      dateFormat: 'mm/dd/yy' });
-      $("#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)): ?>
 
       resetForm();
-      datepickerNow('TransactionStamp');
 
-      <?php else: ?>
+      <?php if (isset($lease['Lease']['id'])): ?>
-
+      $("#lease-id").val(<?php echo $lease['Lease']['id']; ?>);
-      var id;
+      //$("#invoice-lease").html("<?php echo '#'.$lease['Lease']['number']; ?>");
-      resetForm(true);
+      $("#invoice-lease").html('<A HREF="/pmgr/site/leases/view/' +
-
+			       "<?php echo $lease['Lease']['id']; ?>" +
-      $("#TransactionStamp").attr('disabled', true);
+			       '">#' +
-      $("#TransactionStamp").val("<?php echo date('m/d/Y', $movein['time']); ?>");
+			       "<?php echo $lease['Lease']['number']; ?>" +
-      $('#TransactionStamp').after
+			       '</A>');
-	('<input type="hidden"' +
+      $("#invoice-unit").html("<?php echo $lease['Unit']['name']; ?>");
-	 ' name="data[Transaction][stamp]"' +
+      $("#invoice-customer").html("<?php echo $lease['Customer']['name']; ?>");
-	 ' value="' + $("#TransactionStamp").val() + '">');
+      $("#invoice-rent").html("<?php echo FormatHelper::currency($lease['Lease']['rent']); ?>");
-      $("#TransactionComment").val('Move-In Charges');
+      $("#invoice-late").html('$10.00');
-
+      $("#invoice-deposit").html("<?php echo FormatHelper::currency($lease['Lease']['deposit']); ?>");
-      <?php if ($movein['deposit'] != 0): ?>
-      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']); ?>");
-      addHidden(id, 'EffectiveDate', 'effective_date');
-      $('#Entry'+id+'AccountId').val(<?php echo $securityDepositAccount; ?>);
-      addHidden(id, 'AccountId', 'account_id');
-      $('#Entry'+id+'Amount').val("<?php echo FormatHelper::currency($movein['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);
-      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'])): ?>
       onGridState(null, 'hidden');
       <?php else: ?>
       onGridState(null, 'visible');
       <?php endif; ?>
-
-      <?php if ($this->params['dev']): ?>
-      $('#output-debug').html('Post Output');
-      $('#output-debug').show();
-      <?php endif; ?>
-
   });
 --></script>
 
 </div>
+
+<a href="#" onClick="$('#debug').html(''); return false;">Clear Debug Output</a>

site/views/leases/move.ctp

@@ -26,53 +26,14 @@ $move_type   = preg_replace("/.*_/", "", $this->action);
 // Reset the form
 function resetForm() {
   $("#customer-id").val(0);
-  $("#unit-id").val(0);
-  $("#lease-id").val(0);
   $("#move-customer").html("INTERNAL ERROR");
+  $("#unit-id").val(0);
   $("#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);
+  cell_name = item_type.charAt(0).toUpperCase() + item_type.substr(1) + "-name";
-  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);
@@ -80,28 +41,6 @@ function onRowSelect(grid_id, item_type, item_id) {
   // Get the item name from the grid
   $("#move-"+item_type).html($(grid_id).getCell(item_id, cell_name));
 
-  // If a unit was selected, update the rent and deposit
-  if (item_type == 'unit') {
-    $("#LeaseRent").val($(grid_id).getCell(item_id, 'Unit-rent'));
-    $("#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();
@@ -111,12 +50,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 {
-    $("."+item_type+"-selection-new").hide();
+    //if ($(grid_id).getGridParam("selrow"))
+    //alert("id:" + $("#"+item_type+"-id").val());
     if ($("#"+item_type+"-id").val() > 0) {
       $("."+item_type+"-selection-invalid").hide();
       $("."+item_type+"-selection-valid").show();
@@ -133,42 +72,7 @@ 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',
@@ -186,27 +90,22 @@ else {
 			'nolinks' => true,
 			'limit' => 10,
 			)));
+}
 
-  echo ('<DIV CLASS="move-inout grid-selection-text">' .
+echo ('<DIV CLASS="move-inout grid-selection-text">' .
 
-	'<DIV CLASS="customer-selection-new" style="display:none">' .
+      '<DIV CLASS="customer-selection-valid" style="display:none">' .
-	$html->link('Create a new Customer',
+      'Customer: <SPAN id="move-customer"></SPAN>' .
-		    array('controller' => 'customers',
+      '</DIV>' .
-			  'action'     => 'add',
-			  (empty($unit['id']) ? null : $unit['id'])),
-		    array('id' => 'customer-selection-new-url')) .
-	'</DIV>' .
 
-	'<DIV CLASS="customer-selection-valid" style="display:none">' .
+      '<DIV CLASS="customer-selection-invalid" style="display:none">' .
-	'Customer: <SPAN id="move-customer"></SPAN>' .
+      'Please select customer' .
-	'</DIV>' .
+      '</DIV>' .
 
-	'<DIV CLASS="customer-selection-invalid" style="display:none">' .
+      '</DIV>' . "\n");
-	'Please select customer' .
-	'</DIV>' .
 
-	'</DIV>' . "\n");
 
+if ($move_type !== 'out') {
   echo $this->element('units', array
 		      ('config' => array
 		       ('grid_div_id' => 'units-list',
@@ -221,47 +120,43 @@ else {
 					       array('gridstate' =>
 						     'onGridState("#"+$(this).attr("id"), "unit", gridstate)'),
 					       ),
-			'include' => array('Deposit'),
+			'action' => 'unoccupied',
-			'exclude' => array('Balance'),
-			'action' => 'vacant',
 			'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('id' => 'lease-id',
+		    array('type' => 'hidden',
-			  'type' => 'hidden',
+			  'value' => $lease['id'],
-			  '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',
@@ -274,20 +169,7 @@ echo $this->element('form_table',
 				       'id' => "LeaseMoveDate"),
 				 'between' => '<A HREF="#" ONCLICK="datepickerNow(\'LeaseMoveDate\', false); return false;">Now</A>',
 				 ),
-			   ) +
+			   "comment" =>
-			  ($move_type === 'in' ? array
-			   ("deposit" =>
-			    array('opts' => array
-				  ('value' => (!empty($unit)
-					       ? FormatHelper::currency($unit['deposit'])
-					       : null))),
-			    "rent" =>
-			    array('opts' => array
-				  ('value' => (!empty($unit)
-					       ? FormatHelper::currency($unit['rent'])
-					       : null))),
-			    ) : array()) + array
-			  ("comment" =>
 			   ($move_type !== 'out'
 			    ? array('opts' => array('size' => 50))
 			    : null),
@@ -316,23 +198,15 @@ echo $form->end('Perform Move ' . ucfirst($move_type));
 
 <script type="text/javascript"><!--
   $(document).ready(function(){
-      datepicker('LeaseMoveDate');
+      $("#LeaseMoveDate")
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+	              showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
+
       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']; ?>");
@@ -348,10 +222,6 @@ 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

@@ -1,74 +0,0 @@
-<?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/refund.ctp

@@ -58,7 +58,7 @@ echo $this->element('form_table',
 			   "amount"       => array('prefix' => 'Entry.0',
 						   'opts' =>
 						   array('value' =>
-							 FormatHelper::currency($balance),
+							 FormatHelper::currency($balance, false, ''),
 							 ),
 						   ),
 			   "account_id"   => array('prefix' => 'Entry.0',
@@ -92,7 +92,13 @@ function resetForm() {
 }
 
 $(document).ready(function(){
-    datepicker('TransactionStamp');
+    $("#TransactionStamp")
+      .attr('autocomplete', 'off')
+      .datepicker({ constrainInput: true,
+	            numberOfMonths: [1, 1],
+                    showCurrentAtPos: 0,
+                    dateFormat: 'mm/dd/yy' });
+
     resetForm();
   });
 --></script>

site/views/leases/view.ctp

@@ -18,6 +18,7 @@ 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'],
@@ -38,6 +39,7 @@ $rows[] = array('Notice Received',  FormatHelper::date($lease['notice_received_d
 $rows[] = array('Closed',           FormatHelper::date($lease['close_date'], true));
 $rows[] = array('Deposit',          FormatHelper::currency($lease['deposit']));
 $rows[] = array('Rent',             FormatHelper::currency($lease['rent']));
+$rows[] = array('Paid Through',     FormatHelper::date($lease['paid_through'], true));
 $rows[] = array('Comment',          $lease['comment']);
 
 
@@ -55,10 +57,7 @@ echo $this->element('table',
 echo '<div class="infobox">' . "\n";
 $rows = array();
 $rows[] = array('Security Deposit:',  FormatHelper::currency($outstandingDeposit));
-$rows[] = array('Balance Owed:',      FormatHelper::currency($outstandingBalance));
+$rows[] = array('Balance:',           FormatHelper::currency($outstandingBalance));
-$rows[] = array('Paid Through:',      FormatHelper::date($lease['paid_through_date'], false));
-if ($lease['delinquent'])
-  $rows[] = array('Delinquent:',      FormatHelper::age($lease['paid_through_date'], 'delinquent'));
 echo $this->element('table',
 		    array('class'   => 'summary',
 			  'rows'    => $rows,
@@ -78,21 +77,6 @@ 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
  */
@@ -100,10 +84,12 @@ echo $this->element('statement_entries', array
 echo $this->element('statement_entries', array
 		    (// Grid configuration
 		     'config' => array
-		     ('caption' => 'Lease Statement',
+		     ('caption' => 'Account',
-		      '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',
 		      )));
 
 

site/views/ledger_entries/view.ctp

@@ -14,7 +14,6 @@ $ledger         = $entry['Ledger'];
 $account        = $ledger['Account'];
 $tender         = $entry['Tender'];
 $matching       = $entry['MatchingEntry'];
-$double         = $entry['DoubleEntry'];
 $entry          = $entry['LedgerEntry'];
 
 $rows = array();
@@ -33,7 +32,7 @@ $rows[] = array('Account',          $html->link($account['name'],
 						array('controller' => 'accounts',
 						      'action'     => 'view',
 						      $account['id'])));
-$rows[] = array('Ledger',           $html->link('#' . $ledger['sequence'],
+$rows[] = array('Ledger',           $html->link($ledger['name'],
 						array('controller' => 'ledgers',
 						      'action'     => 'view',
 						      $ledger['id'])));
@@ -44,10 +43,6 @@ $rows[] = array('Cr/Dr',            ($entry['crdr'] .
 							 'action'     => 'view',
 							 $matching['id'])) .
 				     ')'));
-$rows[] = array('Double Entry',     $html->link('#'.$double['id'],
-						array('controller' => 'double_entries',
-						      'action'     => 'view',
-						      $double['id'])));
 $rows[] = array('Comment',           $entry['comment']);
 
 echo $this->element('table',

site/views/ledgers/view.ctp

@@ -16,6 +16,8 @@ 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',
@@ -72,7 +74,6 @@ 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,19 +6,6 @@
  {// 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']   . ',' .
@@ -29,8 +16,8 @@
 	  $html->url(array('controller' => 'units',
 			   'action'     => 'view',
 			   $unit['id'])) .
-	  '" alt="' . $title .
+	  '" alt="' .
-	  '" title="' . $title .
+	  $unit['name'] .
 	  '">' . "\n");
    }
  }// for indentation purposes