Captured some thoughts, some experiments on how to tie statement entry to ledger entry. It's not at all clear we want to go down this (or any other) path at the moment. This checkin will probably go nowhere, as I'm going to see if we can make do with the current implementation.

git-svn-id: file:///svn-source/pmgr/branches/statement_ledger_entry_tie_20090802@468 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

@@ -22,9 +22,12 @@
 --  may have to move this logic into the application :-/
 
 
-DROP DATABASE IF EXISTS `property_manager`;
-CREATE DATABASE `property_manager`;
-USE `property_manager`;
+-- REVISIT <AP>: 20090511
+--   By not specifying the database, the script can
+--   make the determination of which one to use.
+-- DROP DATABASE IF EXISTS `property_manager`;
+-- CREATE DATABASE `property_manager`;
+-- USE `property_manager`;
 
 
 -- ######################################################################
@@ -177,7 +180,7 @@ CREATE TABLE `pmgr_contact_phones` (
   `ext`                  VARCHAR(6)   DEFAULT NULL,
   `comment`              VARCHAR(255) DEFAULT NULL,
 
-  KEY `number_key` (`phone`),
+  UNIQUE KEY `number_key` (`phone`, `ext`),
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
@@ -192,7 +195,7 @@ CREATE TABLE `pmgr_contact_emails` (
   `email`                VARCHAR(128) NOT NULL,
   `comment`              VARCHAR(255) DEFAULT NULL,
 
-  KEY `email_key` (`email`),
+  UNIQUE KEY `email_key` (`email`),
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
@@ -204,7 +207,7 @@ CREATE TABLE `pmgr_contact_emails` (
 DROP TABLE IF EXISTS `pmgr_contacts_methods`;
 CREATE TABLE `pmgr_contacts_methods` (
   `contact_id`           INT(10) UNSIGNED NOT NULL,
-  `method`               ENUM('POST',
+  `method`               ENUM('ADDRESS',
                               'PHONE',
                               'EMAIL')
                            NOT NULL,
@@ -448,6 +451,45 @@ CREATE TABLE `pmgr_site_areas` (
 -- ##
 
 
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_units
+
+
+DROP TABLE IF EXISTS `pmgr_units`;
+CREATE TABLE `pmgr_units` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `unit_size_id`         INT(10) UNSIGNED NOT NULL,
+  `code`                 VARCHAR(12) NOT NULL, -- User style "id"
+  `name`                 VARCHAR(80) NOT NULL,
+
+  `status`               ENUM('DELETED',
+                              'DAMAGED',
+                              'COMPANY',
+                              'UNAVAILABLE',
+                              'RESERVED',
+                              '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,
+
+  `deposit`              FLOAT(12,2) DEFAULT NULL,
+  `rent`                 FLOAT(12,2) DEFAULT NULL,
+
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
 -- TABLE pmgr_unit_types
@@ -480,46 +522,7 @@ CREATE TABLE `pmgr_unit_sizes` (
   `comment`              VARCHAR(255) DEFAULT NULL,
 
   `deposit`              FLOAT(12,2) DEFAULT NULL,
-  `amount`               FLOAT(12,2) DEFAULT NULL,
-
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_units
-
-
-DROP TABLE IF EXISTS `pmgr_units`;
-CREATE TABLE `pmgr_units` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `unit_size_id`         INT(10) UNSIGNED NOT NULL,
-  `code`                 VARCHAR(12) NOT NULL, -- User style "id"
-  `name`                 VARCHAR(80) NOT NULL,
-
-  `status`               ENUM('DELETED',
-                              'DAMAGED',
-                              'COMPANY',
-                              'UNAVAILABLE',
-                              'RESERVED',
-                              '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,
-
-  `deposit`              FLOAT(12,2) DEFAULT NULL,
-  `amount`               FLOAT(12,2) DEFAULT NULL,
-
-  `comment`              VARCHAR(255) DEFAULT NULL,
+  `rent`                 FLOAT(12,2) DEFAULT NULL,
 
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -619,25 +622,72 @@ CREATE TABLE `pmgr_actions_late_schedules` (
 -- ######################################################################
 -- ######################################################################
 -- ##
--- ## LEASES
+-- ## CUSTOMERS
 -- ##
 
-
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
--- TABLE pmgr_lease_types
+-- TABLE pmgr_customers
 
-DROP TABLE IF EXISTS `pmgr_lease_types`;
-CREATE TABLE `pmgr_lease_types` (
+DROP TABLE IF EXISTS `pmgr_customers`;
+CREATE TABLE `pmgr_customers` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `code`                 VARCHAR(12) NOT NULL, -- User style "id"
+
+  -- Customer name may be the same as the primary contact
+  -- or it may entirely independent of that person.
   `name`                 VARCHAR(80) NOT NULL,
+
+  -- Primary Contact... every customer must have one
+  -- (and presumably, most customers will _be_ one).
+  -- REVISIT <AP> 20090612:
+  --   Does this contact also get added to the
+  --   contacts_customers table?
+  `primary_contact_id`   INT(10) UNSIGNED NOT NULL,
+
   `comment`              VARCHAR(255) DEFAULT NULL,
 
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_contacts_customers
+
+DROP TABLE IF EXISTS `pmgr_contacts_customers`;
+CREATE TABLE `pmgr_contacts_customers` (
+  `contact_id`           INT(10) UNSIGNED NOT NULL,
+  `customer_id`          INT(10) UNSIGNED NOT NULL,
+
+  -- What type of contact is this for the lease?
+  `type`                 ENUM('TENANT',    -- TENANT
+                              'ALTERNATE') -- ALTERNATE CONTACT ONLY
+                           NOT NULL DEFAULT 'TENANT',
+
+  -- If the tenant is active as part of the lease
+  `active`               TINYINT DEFAULT 1,
+
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`customer_id`, `contact_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ##
+-- ## LEASES
+-- ##
+
+
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
 -- TABLE pmgr_leases
@@ -652,23 +702,23 @@ CREATE TABLE `pmgr_leases` (
 
   `lease_type_id`        INT(10) UNSIGNED NOT NULL,
   `unit_id`              INT(10) UNSIGNED NOT NULL,
-  `primary_contact_id`   INT(10) UNSIGNED DEFAULT NULL, -- NOT NULL,
+  `customer_id`          INT(10) UNSIGNED NOT NULL,
   `late_schedule_id`     INT(10) UNSIGNED DEFAULT NULL,
 
   `lease_date`           DATE NOT NULL,
-  `movein_planed_date`   DATE DEFAULT NULL,
+  `movein_planned_date`  DATE DEFAULT NULL,
   `movein_date`          DATE DEFAULT NULL,
   `moveout_date`         DATE DEFAULT NULL,
-  `moveout_planed_date`  DATE DEFAULT NULL,
+  `moveout_planned_date` DATE DEFAULT NULL,
   `notice_given_date`    DATE DEFAULT NULL,
   `notice_received_date` DATE DEFAULT NULL,
   `close_date`           DATE DEFAULT NULL,
 
   `deposit`              FLOAT(12,2) DEFAULT NULL,
-  `amount`               FLOAT(12,2) DEFAULT NULL,
+  `rent`                 FLOAT(12,2) DEFAULT NULL,
 
-  `next_amount`          FLOAT(12,2) DEFAULT NULL,
-  `next_amount_date`     DATE DEFAULT NULL,
+  `next_rent`            FLOAT(12,2) DEFAULT NULL,
+  `next_rent_date`       DATE DEFAULT NULL,
 
   `comment`              VARCHAR(255) DEFAULT NULL,
 
@@ -678,24 +728,16 @@ CREATE TABLE `pmgr_leases` (
 
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
--- TABLE pmgr_contacts_leases
-
-DROP TABLE IF EXISTS `pmgr_contacts_leases`;
-CREATE TABLE `pmgr_contacts_leases` (
-  `lease_id`             INT(10) UNSIGNED NOT NULL,
-  `contact_id`           INT(10) UNSIGNED NOT NULL,
-
-  -- What type of contact is this for the lease?
-  `type`                 ENUM('TENANT',    -- TENANT
-                              'ALTERNATE') -- ALTERNATE CONTACT ONLY
-                           NOT NULL DEFAULT 'TENANT',
-
-  -- If the tenant is active as part of the lease
-  `active`               TINYINT DEFAULT 1,
+-- TABLE pmgr_lease_types
 
+DROP TABLE IF EXISTS `pmgr_lease_types`;
+CREATE TABLE `pmgr_lease_types` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `code`                 VARCHAR(12) NOT NULL, -- User style "id"
+  `name`                 VARCHAR(80) NOT NULL,
   `comment`              VARCHAR(255) DEFAULT NULL,
 
-  PRIMARY KEY (`lease_id`, `contact_id`)
+  PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
@@ -726,7 +768,7 @@ CREATE TABLE `pmgr_reservations` (
    -- If NULL, `id` will be used
   `number`               VARCHAR(20) DEFAULT NULL,
 
-  `contact_id`           INT(10) UNSIGNED NOT NULL,
+  `customer_id`          INT(10) UNSIGNED NOT NULL,
   `deposit`              FLOAT(12,2) DEFAULT NULL,
 
   `reservation_date`     DATE NOT NULL,
@@ -784,104 +826,84 @@ DROP TABLE IF EXISTS `pmgr_accounts`;
 CREATE TABLE `pmgr_accounts` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 
+  `type`                 ENUM('ASSET',
+                              'LIABILITY',
+                              'EQUITY',
+                              'INCOME',
+                              'EXPENSE')
+                           NOT NULL DEFAULT 'ASSET',
+
+  -- Accounts Receivable / Accounts Payable
+  -- If this is a trackable account, any credit posted
+  -- to an ASSET OR EXPENSE account should have an
+  -- entry posted to the reconciliations table (unless
+  -- it is a "pre-payment" of sorts, in which case the
+  -- reconciliation will have to wait for the debit).
+  -- For LIABILITY, EQUITY, and INCOME, the opposite
+  -- is true, with reconciliations posted, under
+  -- normal circumstances, when a debit occurs.
+  --  `trackable`            TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
+  `deposits`             TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for deposits?
+  `charges`              TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for charges?
+  `payments`             TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for payments?
+  `refunds`              TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for refunds?
+			   			   
+  -- Security Level
+  `level`                INT UNSIGNED DEFAULT 10,
+
   `name`                 VARCHAR(80) NOT NULL,
   `external_account`     INT(10) UNSIGNED DEFAULT NULL,
   `external_name`        VARCHAR(80) DEFAULT NULL,
+
   `comment`              VARCHAR(255) DEFAULT NULL,
 
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-
-
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ##
--- ## CHARGES
--- ##
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_charge_types
-
-DROP TABLE IF EXISTS `pmgr_charge_types`;
-CREATE TABLE `pmgr_charge_types` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-
-  `name`                 VARCHAR(80) NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-  `account_id`           INT(10) UNSIGNED NOT NULL, -- quickbooks tracking
-
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-LOCK TABLES `pmgr_charge_types` WRITE;
-INSERT INTO `pmgr_charge_types` (`id`, `name`, `account_id`)
+LOCK TABLES `pmgr_accounts` WRITE;
+INSERT INTO `pmgr_accounts` (`type`, `name`, `level`)
   VALUES
-  (1, 'Security Deposit', 0),
-  (2, 'Rent', 0),
-  (3, 'Late Charge', 0);
+  ('EQUITY',     'Equity',            1),
+  ('LIABILITY',  'Loan',              1);
+INSERT INTO `pmgr_accounts` (`type`, `name`)
+  VALUES
+  ('ASSET',      'A/R'                ),
+-- REVISIT <AP>: 20090710 : We don't really need NSF, as it
+-- will always run a zero balance.  However, it will help
+-- us identify how serious the NSF situation is.
+  ('ASSET',      'NSF'                ),
+  ('LIABILITY',  'A/P'                );
+INSERT INTO `pmgr_accounts` (`type`, `name`, `payments`, `refunds`)
+  VALUES
+  ('ASSET',      'Cash',              1, 1),
+  ('ASSET',      'Check',             1, 0),
+  ('ASSET',      'Money Order',       1, 0),
+  ('ASSET',      'ACH',               1, 0),
+  ('ASSET',      'Closing',           0, 0), -- REVISIT <AP>: Temporary
+  ('EXPENSE',    'Concession',        1, 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`, `charges`)
+  VALUES
+  ('LIABILITY',  'Tax',               1),
+  ('LIABILITY',  'Security Deposit',  1),
+  ('INCOME',     'Rent',              1),
+  ('INCOME',     'Late Charge',       1),
+  ('INCOME',     'NSF Charge',        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'        );
 UNLOCK TABLES;
 
 
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_charges
-
-DROP TABLE IF EXISTS `pmgr_charges`;
-CREATE TABLE `pmgr_charges` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-
-  `charge_type_id`       INT(10) UNSIGNED NOT NULL,
-  `lease_id`             INT(10) UNSIGNED NOT NULL,
-  `charge_date`          DATE NOT NULL,
-  `charge_to_date`       DATE DEFAULT NULL,
-  `due_date`             DATE DEFAULT NULL,
-  `amount`               FLOAT(12,2) NOT NULL,
-  `tax`                  FLOAT(12,2) NOT NULL,
-  `total`                FLOAT(12,2) NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- -- ----------------------------------------------------------------------
--- -- ----------------------------------------------------------------------
--- -- TABLE pmgr_invoices
-
--- DROP TABLE IF EXISTS `pmgr_invoices`;
--- CREATE TABLE `pmgr_invoices` (
---   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
---   `stamp`                TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
---   `comment`              VARCHAR(255) DEFAULT NULL,
-
---   PRIMARY KEY (`id`)
--- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- -- ----------------------------------------------------------------------
--- -- ----------------------------------------------------------------------
--- -- TABLE pmgr_charges_invoices
-
--- DROP TABLE IF EXISTS `pmgr_charges_invoices`;
--- CREATE TABLE `pmgr_charges_invoices` (
---   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
---   `charge_id`            INT(10) UNSIGNED NOT NULL,
---   `invoice_id`           INT(10) UNSIGNED NOT NULL,
---   `amount`               FLOAT(12,2) NOT NULL,
---   PRIMARY KEY (`id`)
--- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
 
 -- ######################################################################
 -- ######################################################################
@@ -893,50 +915,25 @@ CREATE TABLE `pmgr_charges` (
 -- ######################################################################
 -- ######################################################################
 -- ##
--- ## PAYMENTS
+-- ## LEDGERS
 -- ##
 
 
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
--- TABLE pmgr_payment_types
+-- TABLE pmgr_ledgers
 
-DROP TABLE IF EXISTS `pmgr_payment_types`;
-CREATE TABLE `pmgr_payment_types` (
+DROP TABLE IF EXISTS `pmgr_ledgers`;
+CREATE TABLE `pmgr_ledgers` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 
-  `name`                 VARCHAR(80) NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-  `tillable`             TINYINT(1) NOT NULL DEFAULT 1, -- Does manager collect by hand?
+  `name`                 VARCHAR(90) NOT NULL,
 
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+  `account_id`           INT(10) UNSIGNED NOT NULL,
+  `sequence`             INT(10) UNSIGNED DEFAULT 1,
 
-LOCK TABLES `pmgr_payment_types` WRITE;
-INSERT INTO `pmgr_payment_types` (`id`, `name`, `tillable`)
-  VALUES
-  (1, 'Cash', 1),
-  (2, 'Check', 1),
-  (3, 'Money Order', 1),
-  (4, 'ACH', 0),
-  (5, 'Debit Card', 0),
-  (6, 'Credit Card', 0),
-  (7, 'Other Tillable', 1),
-  (8, 'Other Non-Tillable', 0);
-UNLOCK TABLES;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_payments
-
-DROP TABLE IF EXISTS `pmgr_payments`;
-CREATE TABLE `pmgr_payments` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-
-  `receipt_id`           INT(10) UNSIGNED NOT NULL,
-  `payment_type_id`      INT(10) UNSIGNED NOT NULL,
-  `amount`               FLOAT(12,2) NOT NULL,
+  `prior_ledger_id`      INT(10) UNSIGNED DEFAULT NULL,
+  `close_transaction_id` INT(10) UNSIGNED DEFAULT NULL,
 
   `comment`              VARCHAR(255) DEFAULT NULL,
 
@@ -944,127 +941,59 @@ CREATE TABLE `pmgr_payments` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
-
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ##
--- ## CREDITS
--- ##
-
-
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
--- TABLE pmgr_credit_types
+-- TABLE pmgr_transactions
 
--- DROP TABLE IF EXISTS `pmgr_credit_types`;
--- CREATE TABLE `pmgr_credit_types` (
---   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-
---   `name`                 VARCHAR(80) NOT NULL,
---   `comment`              VARCHAR(255) DEFAULT NULL,
---   `account_id`           INT(10) UNSIGNED NOT NULL, -- quickbooks tracking
-
---   PRIMARY KEY (`id`)
--- ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- LOCK TABLES `pmgr_credit_types` WRITE;
--- INSERT INTO `pmgr_credit_types` (`id`, `name`, `account_id`)
---   VALUES
---   (1, 'Security Deposit', 0),
---   (2, 'Rent', 0),
---   (3, 'Late Credit', 0);
--- UNLOCK TABLES;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_credits
-
-DROP TABLE IF EXISTS `pmgr_credits`;
-CREATE TABLE `pmgr_credits` (
+DROP TABLE IF EXISTS `pmgr_transactions`;
+CREATE TABLE `pmgr_transactions` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 
-  -- `credit_type_id`       INT(10) UNSIGNED NOT NULL,
-  `lease_id`             INT(10) UNSIGNED NOT NULL,
-  `credit_date`          DATE NOT NULL,
-  `credit_to_date`       DATE DEFAULT NULL,
-  `due_date`             DATE DEFAULT NULL,
-  `amount`               FLOAT(12,2) NOT NULL,
-  `tax`                  FLOAT(12,2) NOT NULL,
-  `total`                FLOAT(12,2) NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
+  `type`                 ENUM('INVOICE',
+                              'RECEIPT',
+                              'DEPOSIT',
+                              'CLOSE',
+--                               'CREDIT',
+--                               'REFUND',
+--                               'WAIVER',
+			      'TRANSFER')
+                           NOT NULL,
 
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ##
--- ## RECEIPTS
--- ##
-
--- # Charge
--- #  - Issued against customer lease
--- #  - associated with account (i.e. QuickBooks account / category)
--- # Receipt
--- #  - Collections of payments paid at one time
--- # Payment
--- #  - Credited towards customer (or lease?)
--- #  - may be more than customer owes
--- #  - cash/check/charge/ach/etc
--- # Reconciliation
--- #  - Associates a payment with the charge
--- #  - Indicates amount of credit towards charge
--- #  - Payments may cover several charges
--- #  - Several payments may cover the same charge
-
-
--- Which charges haven not been paid?
--- SELECT C.id AS cid, C.total AS total, COALESCE(SUM(R.amount),0) AS paid
---   FROM      pmgr_charges C 
---   LEFT JOIN pmgr_charges_receipts R ON R.charge_id = C.id
--- GROUP BY C.id
--- HAVING paid < C.total
-
--- SELECT ChL.lid AS lid, U.name, C.display_name,
---        SUM(ChL.total) AS total, SUM(ChL.paid) AS paid,
---        SUM(ChL.total) - SUM(ChL.paid) AS owing
---   FROM (SELECT Ch.lease_id AS lid, Ch.total AS total, COALESCE(SUM(R.amount),0) AS paid
---           FROM      pmgr_charges Ch
---           LEFT JOIN pmgr_charges_receipts R ON R.charge_id = Ch.id          
---           WHERE Ch.due_date < NOW()
---           GROUP BY Ch.id          
---           HAVING paid < Ch.total) ChL
---     LEFT JOIN pmgr_leases L ON L.id = ChL.lid
---     LEFT JOIN pmgr_lease_contacts Lc ON Lc.lease_id = L.id AND Lc.type = 'TENANT'
---     LEFT JOIN pmgr_contacts C ON C.id = Lc.contact_id
---     LEFT JOIN pmgr_units U ON U.id = L.unit_id
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_receipts
-
-DROP TABLE IF EXISTS `pmgr_receipts`;
-CREATE TABLE `pmgr_receipts` (
-  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
   `stamp`                TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 
+  -- All entries of a transaction should be for the same
+  -- customer.  By keeping track of customer here, it ensures
+  -- that we can always track what's happening with the user
+  -- even if there are only ledger entries, and no statement
+  -- entries for some reason (the primary concern being the
+  -- receipt of money, with nothing to pay for).
+  -- customer_id can be NULL, for internal transfers and such.
+  -- In that case, there should be no statement entries for
+  -- this transaction, only ledger entries.
+  -- REVISIT <AP>: 20090723
+  --  It sounds like a transaction that has customer_id as NULL
+  --  is really a fundamentally different type of "transaction".
+  --  Do we need to have a new table for those type of
+  --  entries / activities?
+  `customer_id`          INT(10) UNSIGNED DEFAULT NULL,
+
+  -- The account/ledger of the transaction set
+  -- (e.g. A/R, Bank, etc)
+  `account_id`           INT(10) UNSIGNED DEFAULT NULL,
+  `ledger_id`            INT(10) UNSIGNED DEFAULT NULL,
+
+  -- For convenience.  Actually, INVOICE will always set crdr
+  -- to DEBIT, RECEIPT will use CREDIT, and DEPOSIT will use
+  -- DEBIT
+  `crdr`                 ENUM('DEBIT',
+                              'CREDIT')
+                           DEFAULT NULL,
+
+  -- amount is for convenience.  It can always be calculated from
+  -- the associated double entries (and therefore will need to be
+  -- updated if they should change in any way).
+  `amount`               FLOAT(12,2) DEFAULT NULL,
+
   `comment`              VARCHAR(255) DEFAULT NULL,
 
   PRIMARY KEY (`id`)
@@ -1073,20 +1002,252 @@ CREATE TABLE `pmgr_receipts` (
 
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
--- TABLE pmgr_charges_receipts
+-- TABLE pmgr_ledger_entries
 
-DROP TABLE IF EXISTS `pmgr_charges_receipts`;
-CREATE TABLE `pmgr_charges_receipts` (
+DROP TABLE IF EXISTS `pmgr_ledger_entries`;
+CREATE TABLE `pmgr_ledger_entries` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `charge_id`            INT(10) UNSIGNED NOT NULL,
-  -- REVISIT <AP>: 20090514
-  -- THIS SHOULD BE RECEIPT_ID, NOT PAYMENT_ID, RIGHT??
-  `receipt_id`           INT(10) UNSIGNED NOT NULL,
+
+  `transaction_id`       INT(10) UNSIGNED NOT NULL,
+
+  -- The account/ledger of the entry
+  `account_id`           INT(10) UNSIGNED NOT NULL,
+  `ledger_id`            INT(10) UNSIGNED NOT NULL,
+
+  -- For convenience.  Actually, CHARGE will always set crdr
+  -- to CREDIT and PAYMENT will use DEBIT.
+  `crdr`                 ENUM('DEBIT',
+                              'CREDIT')
+                           NOT NULL,
+
   `amount`               FLOAT(12,2) NOT NULL,
+
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_double_entries
+
+DROP TABLE IF EXISTS `pmgr_double_entries`;
+CREATE TABLE `pmgr_double_entries` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- The two entries that make up a "double entry"
+  `debit_entry_id`       INT(10) UNSIGNED NOT NULL,
+  `credit_entry_id`      INT(10) UNSIGNED NOT NULL,
+
+  -- REVISIT <AP>: 20090720
+  --  The amount from ledger_entries should be moved here to
+  --  eliminate duplication, and crdr should just be deleted.
+  --  However, it can always be changed later, and I thinks
+  --  those fields will come in handy when generating a
+  --  a ledger report.   So, duplication for now.
+
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_statement_entries
+
+DROP TABLE IF EXISTS `pmgr_statement_entries`;
+CREATE TABLE `pmgr_statement_entries` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  `type`                 ENUM('CHARGE',
+                              'PAYMENT',
+                              'SURPLUS',
+			      -- REVISIT <AP>: 20090730
+			      --  VOID is just to test out a theory
+			      --  for handling NSF and charge reversals			      
+                              'WAIVE',
+			      'VOID')
+                           NOT NULL,
+
+  `transaction_id`       INT(10) UNSIGNED NOT NULL,
+
+  -- Effective date is when the charge/payment/transfer actually
+  -- takes effect (since it may not be at the time of the transaction).
+  -- Through date is used if/when a charge covers a certain time period,
+  -- like rent.  A security deposit, for example, would not use the
+  -- through date.
+  `effective_date`       DATE DEFAULT NULL, -- first day
+  `through_date`         DATE DEFAULT NULL, -- last day
+  `due_date`             DATE DEFAULT NULL,
+
+  -- Customer ID is redundant, since it is saved as part of the
+  -- transaction.  Keeping it here anyway, for simplicity.  If it's
+  -- truly redundant, and unnecessary, we can always re
+  `customer_id`          INT(10) UNSIGNED NOT NULL,
+  `lease_id`             INT(10) UNSIGNED DEFAULT NULL,
+
+  `amount`               FLOAT(12,2) NOT NULL,
+
+  -- Account ID is used only for those statement entries that have
+  -- a guaranteed single ledger entry, and thus single account.
+  -- Right now, this is only used for charges.
+  `account_id`           INT(10) UNSIGNED DEFAULT NULL,
+
+  -- Allow the payment to reconcile against the charge
+  `charge_entry_id`      INT(10) UNSIGNED DEFAULT NULL,
+
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_statement_entries_ledger_entries
+-- TABLE pmgr_statement_fractions
+
+DROP TABLE IF EXISTS `pmgr_statement_fractions`;
+CREATE TABLE `pmgr_statement_fractions` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- The two entries that make up a "double entry"
+  `statement_entry_id`   INT(10) UNSIGNED NOT NULL,
+  `ledger_entry_id`      INT(10) UNSIGNED NOT NULL,
+
+  `amount`               FLOAT(12,2) NOT NULL,
+
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_tender_types
+
+DROP TABLE IF EXISTS `pmgr_tender_types`;
+CREATE TABLE `pmgr_tender_types` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- name may (or may not) be used to clarify in reports
+  -- for example, 'Check #1234' as the legal tender name.
+  `name`                 VARCHAR(80) NOT NULL,
+
+  -- Does this form of legal tender actually change hands?
+  -- If so, then it's tillable.  Examples include cash,
+  -- checks, and money orders.  Things that are not tillable
+  -- include credit cards, debit cards, and ACH transfers.
+  `tillable`             TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
+
+  -- 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
+  -- be of the same type (ugh).  A more complete solution
+  -- would be for each type to have its own table of data
+  -- and to have that table specified here.  However, this
+  -- is MUCH simpler, and works for now.
+  `data1_name`           VARCHAR(80) DEFAULT NULL,
+  `data2_name`           VARCHAR(80) DEFAULT NULL,
+  `data3_name`           VARCHAR(80) DEFAULT NULL,
+  `data4_name`           VARCHAR(80) DEFAULT NULL,
+
+  -- 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,
+  
+
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_tenders
+
+DROP TABLE IF EXISTS `pmgr_tenders`;
+CREATE TABLE `pmgr_tenders` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  -- name may (or may not) be used to clarify in reports
+  -- for example, 'Check #1234' as the legal tender name.
+  `name`                 VARCHAR(80) DEFAULT NULL,
+
+  -- The type of this legal tender
+  `tender_type_id`       INT(10) UNSIGNED DEFAULT NULL,
+
+  -- The customer that provided this tender
+  -- REVISIT <AP>: 20090728  Do we allow anonymous payments?
+  `customer_id`          INT(10) UNSIGNED NOT NULL,
+
+  -- REVISIT <AP>: 20090605
+  --   Check Number;
+  --   Routing Number, Account Number;
+  --   Card Number, Expiration Date; CVV2 Code
+  --   etc.
+  --     REVISIT <AP> 20090630
+  --     I _think_ that CVV2 is NEVER supposed to
+  --     be stored ANYWHERE.  Merchants agree to
+  --     use it only to verify the transaction and
+  --     then leave no record of it, so that even
+  --     if their security is compromised, no one
+  --     will know the CVV2 code unless they are
+  --     in physical possession of the card.
+  `data1`                VARCHAR(80) DEFAULT NULL,
+  `data2`                VARCHAR(80) DEFAULT NULL,
+  `data3`                VARCHAR(80) DEFAULT NULL,
+  `data4`                VARCHAR(80) DEFAULT NULL,
+
+
+  -- The ledger entry this legal tender applies to
+  `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 deposit transaction that included these monies
+  `deposit_transaction_id` INT(10) UNSIGNED DEFAULT NULL,
+  -- The NSF transaction coming back from the bank.
+  `nsf_transaction_id`     INT(10) UNSIGNED DEFAULT NULL,
+
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_deposits
+
+DROP TABLE IF EXISTS `pmgr_deposits`;
+CREATE TABLE `pmgr_deposits` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+
+  `transaction_id`       INT(10) UNSIGNED NOT NULL,
+
+  -- The account/ledger of the entry
+  `account_id`           INT(10) UNSIGNED NOT NULL,
+  `ledger_id`            INT(10) UNSIGNED NOT NULL,
+
+  -- For convenience.  Should always be DEBIT (unless we
+  -- decide to credit NSF instead of a negative debit).
+  `crdr`                 ENUM('DEBIT')
+                           NOT NULL DEFAULT 'DEBIT',
+
+  `amount`               FLOAT(12,2) NOT NULL,
+
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+
 
 -- ######################################################################
 -- ######################################################################

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

site/app_controller.php

@@ -35,14 +35,22 @@
  * @subpackage    cake.app
  */
 class AppController extends Controller {
-  var $helpers = array('Html', 'Number', 'Time');
+  var $helpers = array('Html', 'Form', 'Javascript', 'Format', 'Time', 'Grid');
+  var $components = array('DebugKit.Toolbar');
 
   function sideMenuLinks() {
     return array(
 		 array('name' => 'Common',      'header' => true),
 		 array('name' => 'Site Map',    'url' => array('controller' => 'maps',       'action' => 'view', 1)),
-		 array('name' => 'Tenants',     'url' => array('controller' => 'contacts',   'action' => 'index')),
 		 array('name' => 'Units',       'url' => array('controller' => 'units',      'action' => 'index')),
+		 array('name' => 'Leases',      'url' => array('controller' => 'leases',     'action' => 'index')),
+		 array('name' => 'Customers',   'url' => array('controller' => 'customers',  'action' => 'index')),
+		 array('name' => 'Accounts',    'url' => array('controller' => 'accounts',   'action' => 'index')),
+		 array('name' => 'Debug',      'header' => true),
+		 array('name' => 'Contacts',    'url' => array('controller' => 'contacts',   'action' => 'index')),
+		 array('name' => 'Ledgers',     'url' => array('controller' => 'ledgers',    'action' => 'index')),
+		 array('name' => 'New Ledgers', 'url' => array('controller' => 'accounts',    'action' => 'newledger')),
+		 array('name' => 'RESET DATA',  'url' => array('controller' => 'accounts',   'action' => 'reset_data')),
 		 );
   }
 
@@ -50,5 +58,739 @@ class AppController extends Controller {
     $this->set('sidemenu', $this->sideMenuLinks());
   }
 
+  function reset_data() {
+    $this->layout = null;
+    $this->autoLayout = false;
+    $this->autoRender = false;
+    Configure::write('debug', '0');
+    $script = $_SERVER['DOCUMENT_ROOT'] . '/pmgr/build.cmd';
+    echo "<P>" . date('r') . "\n";
+    //echo "<P>Script: $script" . "\n";
+    $db = & $this->Account->getDataSource();
+    $script .= ' "' . $db->config['database'] . '"';
+    $script .= ' "' . $db->config['login']    . '"';
+    $script .= ' "' . $db->config['password'] . '"';
+    $handle = popen($script . ' 2>&1', 'r');
+    //echo "<P>Handle: $handle; " . gettype($handle) . "\n";
+    echo "<P><PRE>\n";
+    while (($read = fread($handle, 2096))) {
+      echo $read;
+    }
+    echo "</PRE>\n";
+    pclose($handle);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * helper: gridView
+   *  - called by derived controllers to create an index listing
+   */
+
+  function gridView($title, $action = null, $element = null) {
+    $this->set('title', $title);
+    // The resulting page will contain a grid, which will
+    // use ajax to obtain the actual data for this action
+    $this->set('action', $action ? $action : $this->params['action']);
+    $this->render('/elements/' . ($element ? $element : $this->params['controller']));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: gridData
+   *  - Fetches the actual data requested by grid as XML
+   */
+
+  function gridData() {
+    // Grab a copy of the parameters that control this request
+    $params = array();
+    if (isset($this->params['url']) && is_array($this->params['url']))
+      $params = $this->params['url'];
+
+    // Do any preliminary setup necessary
+    $this->gridDataSetup($params);
+
+    // Get the top level model for this grid
+    $model = $this->gridDataModel($params);
+
+    // Get the number of records prior to pagination
+    $count = $this->gridDataCount($params, $model);
+
+    // Determine pagination configuration (and save to $params)
+    $pagination = $this->gridDataPagination($params, $model, $count);
+
+    // Retreive the appropriate subset of data
+    $records = $this->gridDataRecords($params, $model, $pagination);
+
+    // Post process the records
+    $this->gridDataPostProcess($params, $model, $records);
+
+    // Output the resulting record set
+    $this->gridDataOutput($params, $model, $records, $pagination);
+
+    // Call out to finalize everything
+    $this->gridDataFinalize($params);
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * virtual: gridData* functions
+   *  - These set up the context for the grid data, and will
+   *    need to be overridden in the derived class for anything
+   *    other than the most basic of grids.
+   */
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * gridData SETUP / CLEANUP
+   */
+
+  function gridDataModel(&$params) {
+    return $this->{$this->modelClass};
+  }
+
+  function gridDataSetup(&$params) {
+    // Assume we're debugging.
+    // The actual grid request will set this to false
+    $debug = true;
+
+    if (isset($this->passedArgs['debug']))
+      $debug = $this->passedArgs['debug'];
+
+    $params['debug'] = $debug;
+
+    if ($debug) {
+      ob_start();
+    }
+    else {
+      $this->layout = null;
+      $this->autoLayout = false;
+      $this->autoRender = false;
+      Configure::write('debug', '0');
+    }
+
+    // Establish some defaults (except for serialized items)
+    $params = array_merge(array('page' => 1,
+				'rows' => 20),
+			  $params);
+
+    // Unserialize our complex structure of post data.
+    // This SHOULD always be set, except when debugging
+    if (isset($params['post']))
+      $params['post'] = unserialize($params['post']);
+
+    // Unserialize our complex structure of dynamic post data
+    if (isset($params['dynamic_post']))
+      $params['dynamic_post'] = unserialize($params['dynamic_post']);
+
+    // Merge the static and dynamic post data
+    if (empty($params['post']) && !empty($params['dynamic_post']))
+      $params['post'] = $params['dynamic_post'];
+    elseif (!empty($params['post']) && !empty($params['dynamic_post']))
+      //$params['post'] = array_merge($params['post'], $params['dynamic_post']);
+      $params['post'] = array_merge_recursive($params['post'], $params['dynamic_post']);
+
+    // This SHOULD always be set, except when debugging
+    if (!isset($params['post']['fields']))
+      $params['post']['fields'] = array($this->{$this->modelClass}->alias
+					.'.'.
+					$this->{$this->modelClass}->primaryKey);
+
+    // Make sure the action parameter at least exists, and
+    // promote it to the top level (since it drives the operation).
+    if (isset($params['post']['action']))
+      $params['action'] = $params['post']['action'];
+    else
+      $params['action'] = null;
+  }
+
+  function gridDataFinalize(&$params) {
+    if ($params['debug']) {
+      $xml = ob_get_contents();
+      ob_end_clean();
+
+      $xml = preg_replace("/&/", "&amp;", $xml);
+      $xml = preg_replace("/</", "&lt;", $xml);
+      $xml = preg_replace("/>/", "&gt;", $xml);
+      echo ("\n<PRE>\n$xml\n</PRE>\n");
+    }
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * gridData COUNTING
+   */
+
+  function gridDataCount(&$params, &$model) {
+    // Establish the tables and conditions for counting
+    $query = array_intersect_key($this->gridDataCountTableSet($params, $model),
+				 array('link'=>1, 'contain'=>1));
+
+    // Conditions for the count
+    $query['conditions'] = $this->gridDataCountConditionSet($params, $model);
+
+    // Grouping (which would not be typical)
+    $query['group'] = $this->gridDataCountGroup($params, $model);
+
+    // DEBUG PURPOSES ONLY!
+    $params['count_query'] = $query;
+
+    // Get the number of records prior to pagination
+    return $this->gridDataCountExecute($params, $model, $query);
+  }
+
+  function gridDataCountExecute(&$params, &$model, $query) {
+    return $model->find('count', $query);
+  }
+
+  function gridDataCountTables(&$params, &$model) {
+    // Same tables for counting as for retreiving
+    return $this->gridDataTables($params, $model);
+  }
+
+  function gridDataCountTableSet(&$params, &$model) {
+    // Preliminary set of tables
+    $query = array_intersect_key($this->gridDataCountTables($params, $model),
+				 array('link'=>1, 'contain'=>1));
+
+    // Perform filtering based on user request: $params['post']['filter']
+    return array_intersect_key($this->gridDataFilterTables($params, $model, $query),
+			       array('link'=>1, 'contain'=>1));
+  }
+
+  function gridDataCountConditions(&$params, &$model) {
+    // Same conditions for counting as for retreiving
+    return $this->gridDataConditions($params, $model);
+  }
+
+  function gridDataCountConditionSet(&$params, &$model) {
+    // Conditions for the count
+    $conditions = $this->gridDataCountConditions($params, $model);
+
+    // Perform filtering based on user request: $params['post']['filter']
+    return $this->gridDataFilterConditions($params, $model, $conditions);
+  }
+
+  function gridDataCountGroup(&$params, &$model) {
+    // Grouping will screw up the count, since it
+    // causes the results to be split into chunks
+    // based on the GROUP BY clause.  We can't have
+    // more than one row of data in the count query,
+    // just a _single_ row with the actual count.
+    return null;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * gridData FILTERING
+   */
+
+  function gridDataFilterTables(&$params, &$model, $query) {
+    if (isset($query['contain']))
+      $link = 'contain';
+    else
+      $link = 'link';
+
+    if (empty($params['post']['filter']))
+      return $query;
+
+    foreach ($params['post']['filter'] AS $filter => $filter_value) {
+      $split = $this->gridDataFilterSplit($params, $model, $filter, $filter_value);
+
+/*       pr(array('AppController::gridDataFilterTable' => */
+/* 	       array('checkpoint' => "Filter split") */
+/* 	       + compact('split'))); */
+
+      $table = $this->gridDataFilterTablesTable($params, $model, $split['table']);
+      if (!$table)
+	continue;
+
+      $config = $this->gridDataFilterTablesConfig($params, $model, $split['table']);
+
+/*       pr(array('AppController::gridDataFilterTable' => */
+/* 	       array('checkpoint' => "Add filter config to query") */
+/* 	       + array('query[link]' => $query[$link]) */
+/* 	       + compact('config'))); */
+
+      // If the table is already part of the query, append to it
+      if ($table == $model->alias) {
+	$query[$link] = 
+	  array_merge_recursive(array_diff_key($config, array('fields'=>1)),
+				$query[$link]);
+      }
+      elseif (isset($query[$link][$table])) {
+	$query[$link][$table] = 
+	  array_merge_recursive($config, $query[$link][$table]);
+      }
+      elseif (in_array($table, $query[$link])) {
+	// REVISIT <AP>: 20090727
+	// This presents a dilema.  $config may specify fields
+	// as array(), whereas the user has already indicated
+	// they desire ALL fields (by the fact that table is
+	// a member of the query['link'] array without anything
+	// specified).  However, $config _could_ specify a
+	// non-standard field in the array, such as using SUM()
+	// or other equation.  In that case, we'd have to add
+	// in all the fields of table to the array.  That
+	// wouldn't be very hard, but I'll ignore it at the
+	// moment and wait until it's needed.
+	$key = array_search($table, $query[$link]);
+	$query[$link][$table] = array('fields' => null) + $config;
+	unset($query[$link][$key]);
+      }
+      else {
+	// Table is NOT already part of the query... set it now
+	$query[$link][$table] = $config;
+      }
+
+/*       pr(array('post-filter-table-config' =>  */
+/* 	       array('query[link]' => $query[$link]))); */
+
+    }
+
+    return $query;
+  }
+
+  function gridDataFilterTablesTable(&$params, &$model, $table) {
+    // By default, don't add anything if the filter
+    // condition occurs on the actual model table
+    if ($table == $model->alias)
+      return null;
+    return $this->gridDataFilterTableName($params, $model, $table);
+  }
+
+  function gridDataFilterTablesConfig(&$params, &$model, $table) {
+    return array('fields' => array());
+  }
+
+  function gridDataFilterConditions(&$params, &$model, $conditions) {
+    if (empty($params['post']['filter']))
+      return $conditions;
+
+    foreach ($params['post']['filter'] AS $filter => $filter_value) {
+      $split = $this->gridDataFilterSplit($params, $model, $filter, $filter_value);
+
+      $table = $this->gridDataFilterConditionsTable($params, $model, $split['table']);
+      $key = $this->gridDataFilterConditionsKey($params, $model, $split['table'], $split['field']);
+      if (!$key)
+	continue;
+
+      $conditions[]
+	= $this->gridDataFilterConditionsStatement($params, $model, $table, $key,
+						   array_intersect_key
+						   ($split,
+						    array('value'=>1,
+							  'value_present'=>1)));
+    }
+
+    return $conditions;
+  }
+
+  function gridDataFilterConditionsTable(&$params, &$model, $table) {
+    return $this->gridDataFilterTableName($params, $model, $table);
+  }
+
+  function gridDataFilterConditionsKey(&$params, &$model, $table, $id) {
+    // REVISIT <AP>: 20090722
+    //  When $id is null, we could instantiate the table,
+    //  and use the _actual_ primary key.  However, I don't
+    //  expect that functionality to be used, and will just
+    //  stick with 'id' for now.
+    return $id ? $id : 'id';
+  }
+
+  function gridDataFilterConditionsStatement(&$params, &$model, $table, $key, $value) {
+    $key = (empty($table)?"":"{$table}.") . $key;
+    if (isset($value['value_present']) && $value['value_present'])
+      return array($key => $value['value']);
+    else
+      return array($key);
+  }
+
+  function gridDataFilterSplit(&$params, &$model, $filter, $value) {
+    $value_present = true;
+    if (!is_string($filter)) {
+      // only a filter condition was set, not filter=>value
+      $filter = $value;
+      $value = null;
+      $value_present = false;
+    }
+
+    $table = $field = null;
+    if (preg_match("/^\w+\.\w+(\s*[!<>=]+)?$/", $filter)) {
+      list($table, $field) = explode(".", $filter);
+    }
+    elseif (preg_match('/^[A-Z][A-Za-z]*$/', $filter)) {
+      $table = $filter;
+      $field = null;
+    }
+    elseif (preg_match('/^\w+(\s*[!<>=]+)?$/', $filter)) {
+      $table = $model->alias;
+      $field = $filter;
+    }
+    else {
+      // $filter must be a function or other complicated condition
+      $table = null;
+      $field = $filter;
+    }
+
+    return compact('table', 'field', 'value', 'value_present');
+  }
+
+  function gridDataFilterTableName(&$params, &$model, $table) {
+    return Inflector::camelize($table);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   * gridData PAGINATION
+   */
+
+  function gridDataPagination(&$params, &$model, $record_count) {
+    // Retrieve, or calculate, all parameters necesssary for
+    // pagination. Verify the passed in parameters are valid.
+
+    $limit = $params['rows'] > 0 ? $params['rows'] : 10;
+    $total = ($record_count < 0) ? 0 : ceil($record_count/$limit);
+    $page  = ($params['page'] <= 1) ? 1 : (($params['page'] > $total) ? $total : $params['page']);
+    $start = $limit * ($page - 1);
+
+    return compact('record_count', 'limit', 'page', 'start', 'total');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   * gridData RETREIVAL
+   */
+
+  function gridDataRecords(&$params, &$model, $pagination) {
+    // Establish the tables for this query
+    $query = array_intersect_key($this->gridDataTableSet($params, $model),
+				 array('link'=>1, 'contain'=>1));
+
+    // Specify the fields for the query
+    $query['fields'] = $this->gridDataFields($params, $model);
+
+    // Conditions of the query
+    $query['conditions'] = $this->gridDataConditionSet($params, $model);
+
+    // Data record grouping
+    $query['group'] = $this->gridDataGroup($params, $model);
+
+    // The subset of data based on pagination
+    $query['limit']  = $this->gridDataLimit($params, $model, $pagination['start'], $pagination['limit']);
+
+    // Ordering based on user request
+    $query['order']  = $this->gridDataOrder($params, $model,
+					      isset($params['sidx']) ? $params['sidx'] : null,
+					      isset($params['sord']) ? $params['sord'] : null);
+
+    // DEBUG PURPOSES ONLY!
+    $params['query'] = $query;
+
+    return $this->gridDataRecordsExecute($params, $model, $query);
+  }
+
+  function gridDataRecordsExecute(&$params, &$model, $query) {
+    return $model->find('all', $query);
+  }
+
+  function gridDataTables(&$params, &$model) {
+    return array('link' => array());
+  }
+
+  function gridDataTableSet(&$params, &$model) {
+    // Preliminary set of tables
+    $query = array_intersect_key($this->gridDataTables($params, $model),
+				 array('link'=>1, 'contain'=>1));
+
+    // Perform filtering based on user request: $params['post']['filter']
+    $query = array_intersect_key($this->gridDataFilterTables($params, $model, $query),
+				 array('link'=>1, 'contain'=>1));
+
+    return $query;
+  }
+
+
+  function gridDataConditions(&$params, &$model) {
+    $searches = array();
+
+    if (isset($params['_search']) && $params['_search'] === 'true') {
+      if (isset($params['searchOper'])) {
+	$searches[] = array('op' => $params['searchOper'],
+			    'field' => $params['searchField'],
+			    'value' => $params['searchString']);
+      }
+      else {
+	// DOH! Crappy mechanism puts toolbar search terms
+	// directly into params as name/value pairs.  No
+	// way to know which elements of params are search
+	// terms, so skipping this at the moment.
+      }
+    }
+    elseif (isset($params['filt']) && $params['filt']) {
+      $searches[] = array('op' => 'bw',
+			  'field' => $params['filtField'],
+			  'value' => $params['filtValue']);
+    }
+
+    $ops = array('eq' => array('op' => null,   'pre' => '',  'post' => ''),
+		 'ne' => array('op' => '<>',   'pre' => '',  'post' => ''),
+		 'lt' => array('op' => '<',    'pre' => '',  'post' => ''),
+		 'le' => array('op' => '<=',   'pre' => '',  'post' => ''),
+		 'gt' => array('op' => '>',    'pre' => '',  'post' => ''),
+		 'ge' => array('op' => '>=',   'pre' => '',  'post' => ''),
+		 'bw' => array('op' => 'LIKE', 'pre' => '',  'post' => '%'),
+		 'ew' => array('op' => 'LIKE', 'pre' => '%', 'post' => ''),
+		 'cn' => array('op' => 'LIKE', 'pre' => '%', 'post' => '%'),
+		 );
+
+    $conditions = array();
+    foreach ($searches AS $search) {
+      $op = $ops[$search['op']];
+      $field = $search['field'] . ($op['op'] ? ' '.$op['op'] : '');
+      $value = $op['pre'] . $search['value']. $op['post'];
+      $conditions[] = array($field => $value);
+    }
+
+    if (isset($params['action']) && $params['action'] === 'idlist') {
+      if (count($params['post']['idlist']))
+	$conditions[] = array($model->alias.'.'.$model->primaryKey => $params['post']['idlist']);
+      else
+	$conditions[] = '0=1';
+    }
+
+    return $conditions;
+  }
+
+  function gridDataConditionSet(&$params, &$model) {
+    // Conditions for record retrieval
+    $conditions = $this->gridDataConditions($params, $model);
+
+    // Perform filtering based on user request: $params['post']['filter']
+    return $this->gridDataFilterConditions($params, $model, $conditions);
+  }
+
+  function gridDataFields(&$params, &$model) {
+    $db = &$model->getDataSource();
+    $fields = $db->fields($model, $model->alias);
+    return $fields;
+  }
+
+  function gridDataGroup(&$params, &$model) {
+    return $model->alias.'.'.$model->primaryKey;
+  }
+
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+    return $index ? array($index .' '. $direction) : null;
+  }
+
+  function gridDataLimit(&$params, &$model, $start, $limit) {
+    return $start . ', ' . $limit;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   * gridData POST PROCESSING
+   */
+
+  function gridDataPostProcess(&$params, &$model, &$records) {
+    // Add grid IDs to each record
+    $this->gridDataPostProcessGridIDs($params, $model, $records);
+
+    // Add the calculated fields (if any), to the model fields
+    $this->gridDataPostProcessCalculatedFields($params, $model, $records);
+
+    // Perform any requested subtotaling of fields
+    $this->gridDataPostProcessSubtotal($params, $model, $records);
+
+    // Add in any needed hyperlinks
+    $this->gridDataPostProcessLinks($params, $model, $records, array());
+
+    // DEBUG PURPOSES ONLY!
+    //$params['records'] = $records;
+  }
+
+  function gridDataPostProcessGridIDs(&$params, &$model, &$records) {
+    $model_alias = $model->alias;
+    $id          = $model->primaryKey;
+
+    foreach ($records AS &$record) {
+      $record['grid_id'] = $record[$model_alias][$id];
+    }
+  }
+
+  function gridDataPostProcessCalculatedFields(&$params, &$model, &$records) {
+    $model_alias = $model->alias;
+
+    foreach ($records AS &$record) {
+      // Add the calculated fields (if any), to the model fields
+      if (isset($record[0])) {
+	$record[$model_alias] += $record[0];
+	unset($record[0]);
+      }
+    }
+  }
+
+  function gridDataPostProcessSubtotal(&$params, &$model, &$records) {
+    $model_alias = $model->alias;
+
+    // REVISIT <AP>: 20090722
+    //  Horrible solution to something that should be done
+    //  in SQL.  But, it works for now, so what the heck...
+
+    $subtotals = array();
+    foreach ($params['post']['fields'] AS $field) {
+      if (preg_match('/subtotal-(.*)$/', $field, $matches))
+	$subtotals[] = array('field' => $matches[1],
+			     'name' => $field,
+			     'amount' => 0);
+    }
+
+    foreach ($records AS &$record) {
+      foreach ($subtotals AS &$subtotal) {
+	$field = $subtotal['field'];
+	if (preg_match("/\./", $field)) {
+	  list($tbl, $col) = explode(".", $field);
+	  $record['subtotal-'.$tbl][$col] =
+	    ($subtotal['amount'] += $record[$tbl][$col]);
+	}
+	else {
+	  $record[$model->alias]['subtotal-'.$field] = 
+	    ($subtotal['amount'] += $record[$model->alias][$field]);
+	}
+      }
+    }
+  }
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    // Don't create any links if ordered not to.
+    if (isset($params['nolinks']))
+      return;
+
+    foreach ($links AS $table => $fields) {
+      $special = array('controller', 'id');
+      $controller = Inflector::pluralize(Inflector::underscore($table));
+      $id = 'id';
+      extract(array_intersect_key($fields, array_flip($special)));
+      foreach ($records AS &$record) {
+	if (!isset($record[$table]))
+	  continue;
+
+	foreach (array_diff_key($fields, array_flip($special)) AS $field) {
+	  if (!isset($record[$table][$id]) || !isset($record[$table][$field]))
+	    continue;
+
+	  // DEBUG PURPOSES ONLY!
+	  //$params['linkrecord'][] = compact('table', 'field', 'id', 'controller', 'record');
+	  $record[$table][$field] =
+	    '<A HREF="' .
+	    Router::url(array('controller' => $controller,
+			      'action' => 'view',
+			      $record[$table][$id])) .
+	    '">' .
+	    $record[$table][$field] .
+	    '</A>';
+	}
+      }
+    }
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   * gridData OUTPUT
+   */
+
+  function gridDataOutput(&$params, &$model, &$records, $pagination) {
+    $this->gridDataOutputHeader($params, $model);
+    $this->gridDataOutputXMLHeader($params, $model);
+    $this->gridDataOutputRootNodeBegin($params, $model);
+    $this->gridDataOutputSummary($params, $model, $pagination);
+    $this->gridDataOutputRecords($params, $model, $records);
+    $this->gridDataOutputRootNodeEnd($params, $model);
+  }
+
+  function gridDataOutputHeader(&$params, &$model) {
+    if (!$params['debug']) {
+      header("Content-type: text/xml;charset=utf-8");
+    }
+  }
+
+  function gridDataOutputXMLHeader(&$params, &$model) {
+    echo "<?xml version='1.0' encoding='utf-8'?>\n";
+  }
+
+  function gridDataOutputRootNodeBegin(&$params, &$model) {
+    echo "<rows>\n";
+  }
+
+  function gridDataOutputRootNodeEnd(&$params, &$model) {
+    echo "</rows>\n";
+  }
+
+  function gridDataOutputSummary(&$params, &$model, $pagination) {
+    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";
+
+    if (isset($params['userdata'])) {
+      foreach ($params['userdata'] AS $field => $value)
+	echo ' <userdata name="'.$field.'">' . "{$value}</userdata>\n";
+    }
+  }
+
+  function gridDataOutputRecords(&$params, &$model, &$records) {
+    $id_field    = 'grid_id';
+    foreach ($records AS $record) {
+      $this->gridDataOutputRecord($params, $model, $record,
+				    $record[$id_field], $params['post']['fields']);
+    }
+  }
+
+  function gridDataOutputRecord(&$params, &$model, &$record, $id, $fields) {
+    echo " <row id='$id'>\n";
+    foreach ($fields AS $field) {
+      $this->gridDataOutputRecordField($params, $model, $record, $field);
+    }
+    echo " </row>\n";
+  }
+
+  function gridDataOutputRecordField(&$params, &$model, &$record, $field) {
+    if (preg_match("/\./", $field)) {
+      list($tbl, $col) = explode(".", $field);
+      //pr(compact('record', 'field', 'tbl', 'col'));
+      $data = $record[$tbl][$col];
+    }
+    else {
+      $data = $record[$model->alias][$field];
+    }
+    $this->gridDataOutputRecordCell($params, $model, $record, $field, $data);
+  }
+
+  function gridDataOutputRecordCell(&$params, &$model, &$record, $field, $data) {
+    // be sure to put text data in CDATA
+    if (preg_match("/^\d*$/", $data))
+      echo "  <cell>$data</cell>\n"; 
+    else
+      echo "  <cell><![CDATA[$data]]></cell>\n"; 
+  }
+
 }
 ?>

site/app_model.php

@@ -38,8 +38,149 @@
  */
 class AppModel extends Model {
 
-  //var $actsAs = array('Containable');
-  var $actsAs = array('Linkable');
+  var $actsAs = array('Containable', 'Linkable');
+  var $useNullForEmpty = true;
+  var $formatDateFields = true;
+
+  // Default Log Level, if not specified at the function level
+  var $default_log_level = 5;
+
+  // Class specific log levels
+  var $class_log_level = array('Model' => 5);
+
+  // Function specific log levels
+  var $function_log_level = array();
+
+  // Force the module to log at LEAST at this level
+  var $min_log_level;
+
+  // Force logging of nothing higher than this level
+  var $max_log_level;
+
+
+  // REVISIT <AP>: 20090730
+  //  Why is this constructor crashing?
+  //  Clearly it's in some sort of infinite
+  //  loop, but it seems the correct way
+  //  to have a constructor call the parent...
+
+/*   function __construct() { */
+/*     parent::__construct(); */
+/*     $this->prClassLevel(5, 'Model'); */
+/*   } */
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: pr
+   *  - Prints out debug information, if the log level allows
+   */
+
+  function prClassLevel($level, $class = null) {
+    $trace = debug_backtrace(false);
+    $caller = array_shift($trace);
+    $caller = array_shift($trace);
+    if (empty($class))
+      $class = $caller['class'];
+    $this->class_log_level[$class] = $level;
+  }
+
+  function prFunctionLevel($level, $function = null, $class = null) {
+    $trace = debug_backtrace(false);
+    $caller = array_shift($trace);
+    $caller = array_shift($trace);
+    if (empty($class))
+      $class = $caller['class'];
+    if (empty($function))
+      $function = $caller['function'];
+    $this->function_log_level["{$class}-{$function}"] = $level;
+  }
+
+  function _pr($level, $mixed, $checkpoint = null) {
+    if (Configure::read() <= 0)
+      return;
+
+    $log_level = $this->default_log_level;
+
+    $trace = debug_backtrace(false);
+
+    // Get rid of pr/prEnter/prReturn
+    $caller = array_shift($trace);
+
+    // The next entry shows where pr was called from, but it
+    // shows _what_ was called, which is pr/prEntry/prReturn.
+    $caller = array_shift($trace);
+    $file = $caller['file'];
+    $line = $caller['line'];
+
+    // So, this caller holds the calling function name
+    $caller = array_shift($trace);
+    $function = $caller['function'];
+    $class    = $caller['class'];
+    //$class = $this->name;
+
+    // Adjust the log level from default, if necessary
+    if (isset($this->class_log_level[$class]))
+      $log_level = $this->class_log_level[$class];
+    if (isset($this->function_log_level["{$class}-{$function}"]))
+      $log_level = $this->function_log_level["{$class}-{$function}"];
+    if (isset($this->min_log_level))
+      $log_level = max($log_level, $this->min_log_level);
+    if (isset($this->max_log_level))
+      $log_level = min($log_level, $this->max_log_level);
+
+    // If the level is insufficient, bail out
+    if ($level > $log_level)
+      return;
+
+    if (!empty($checkpoint)) {
+      $chk = array("checkpoint" => $checkpoint);
+      if (is_array($mixed))
+	$mixed = $chk + $mixed;
+      else
+	$mixed = $chk + array($mixed);
+    }
+
+    echo '<DIV CLASS="pr-caller">';
+    echo '<strong>' . substr(str_replace(ROOT, '', $file), 1) . '</strong>';
+    echo ' (line <strong>' . $line . '</strong>)';
+    echo ' : level-' . $level;
+    echo '</DIV>' . "\n";
+
+    pr(array("{$class}::{$function}()" => $mixed), false, false);
+  }
+
+  function pr($level, $mixed, $checkpoint = null) {
+    $this->_pr($level, $mixed, $checkpoint);
+  }
+
+  function prEnter($args, $level = 15) {
+    $this->_pr($level, $args, 'Function Entry');
+  }
+
+  function prReturn($retval, $level = 16) {
+    $this->_pr($level, $retval, 'Function Return');
+    return $retval;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: queryInit
+   *  - Initializes the query fields
+   */
+  function prDump($all = false) {
+    $vars = get_object_vars($this);
+    foreach (array_keys($vars) AS $name) {
+      if (preg_match("/^[A-Z]/", $name))
+	unset($vars[$name]);
+      if (preg_match("/^_/", $name) && !$all)
+	unset($vars[$name]);
+    }
+    pr($vars);
+  }
+
 
   /**
    * Get Enum Values
@@ -48,13 +189,15 @@ class AppModel extends Model {
    *
    * Gets the enum values for MySQL 4 and 5 to use in selectTag()
    */
-  function getEnumValues($columnName=null, $respectDefault=false)
+  function getEnumValues($columnName=null, $tableName=null)
   {
     if ($columnName==null) { return array(); } //no field specified
 
-    //Get the name of the table
-    $db =& ConnectionManager::getDataSource($this->useDbConfig);
-    $tableName = $db->fullTableName($this, false);
+    if (!isset($tableName)) {
+      //Get the name of the table
+      $db =& ConnectionManager::getDataSource($this->useDbConfig);
+      $tableName = $db->fullTableName($this, false);
+    }
 
     //Get the values for the specified column (database and version specific, needs testing)
     $result = $this->query("SHOW COLUMNS FROM {$tableName} LIKE '{$columnName}'");
@@ -73,37 +216,162 @@ class AppModel extends Model {
 
     //Get the values
     return array_flip(array_merge(array(''), // MySQL sets 0 to be the empty string
-				  explode("','", preg_replace("/(enum)\('(.+?)'\)/","\\2", $types))
+				  explode("','", strtoupper(preg_replace("/(enum)\('(.+?)'\)/","\\2", $types)))
 				  ));
   } //end getEnumValues
 
 
-  // Overriding pagination, since the stupid count mechanism blows.
-  // This is also a crappy solution, especially if the query returns
-  // a really large number of rows.  However, trying to untagle this
-  // without changing a bunch of core code is near impossible.
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: queryInit
+   *  - Initializes the query fields
+   */
+  function queryInit(&$query, $link = true) {
+    if (!isset($query))
+      $query = array();
+    if (!isset($query['conditions']))
+      $query['conditions'] = array();
+    if (!isset($query['group']))
+      $query['group'] = null;
+    if (!isset($query['fields']))
+      $query['fields'] = null;
+    if ($link && !isset($query['link']))
+      $query['link'] = array();
+    if (!$link && !isset($query['contain']))
+      $query['contain'] = array();
 
-  var $paginate_rows_save;
-  function paginate($conditions, $fields, $order, $limit, $page = 1, $recursive = null, $extra = null) {
-/*     pr("paginate"); */
-/*     pr(array_merge(compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive', 'extra'))); */
-    if ($page > 1 && isset($limit))
-      $offset = ($page - 1) * $limit;
-    else
-      $offset = 0;
-    return array_slice($this->paginate_rows_save, $offset, $limit);
+    // In case caller expects query to come back
+    return $query;
   }
-  function paginateCount($conditions = null, $recursive = null, $extra = null) {
-/*     pr("paginateCount"); */
-/*     pr(array_merge(compact('conditions', 'recursive', 'extra'))); */
 
-    if (!isset($recursive))
-      $recursive = $this->recursive;
-    $parameters = array_merge(compact('conditions', 'recursive'), $extra);
-    $results = $this->find('all', $parameters);
+    
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: nameToID
+   *  - Returns the ID of the named item
+   */
+  function nameToID($name) {
+    $this->cacheQueries = true;
+    $item = $this->find('first', array
+			('recursive' => -1,
+			 'conditions' => compact('name'),
+			 ));
+    $this->cacheQueries = false;
+    if ($item) {
+      $item = current($item);
+      return $item['id'];
+    }
+    return null;
+  }
 
-    $this->paginate_rows_save = $results;
-    return count($this->paginate_rows_save);
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: statMerge
+   *  - Merges summary data from $b into $a
+   */
+
+  function statsMerge (&$a, $b) {
+    if (!isset($b))
+      return;
+
+    if (!isset($a)) {
+      $a = $b;
+    }
+    elseif (!is_array($a) && !is_array($b)) {
+      $a += $b;
+    }
+    elseif (is_array($a) && is_array($b)) {
+      foreach (array_intersect_key($a, $b) AS $k => $v)
+	{
+	  if (preg_match("/^sp\./", $k))
+	    $a[$k] .= '; ' . $b[$k];
+	  else
+	    $this->statsMerge($a[$k], $b[$k]);
+	}
+      $a = array_merge($a, array_diff_key($b, $a));
+    }
+    else {
+      die ("Can't yet merge array and non-array stats");
+    }
+  }
+
+
+  function recursive_array_replace($find, $replace, &$data) {
+    if (!isset($data))
+      return;
+
+    if (is_array($data)) {
+      foreach ($data as $key => &$value) {
+	  $this->recursive_array_replace($find, $replace, $value);
+      }
+      return;
+    }
+
+    if (isset($replace))
+      $data = preg_replace($find, $replace, $data);
+    elseif (preg_match($find, $data))
+      $data = null;
+  }
+
+  function beforeSave() {
+/*     pr(array('class' => $this->name, */
+/* 	     'alias' => $this->alias, */
+/* 	     'function' => 'AppModel::beforeSave')); */
+
+    // Replace all empty strings with NULL.
+    // If a particular model doesn't like this, they'll have to
+    // override the behavior, or set useNullForEmpty to false.
+    if ($this->useNullForEmpty)
+      $this->recursive_array_replace("/^\s*$/", null, $this->data);
+
+    if ($this->formatDateFields) {
+      $alias = $this->alias;
+
+      foreach ($this->_schema AS $field => $info) {
+	if ($info['type'] == 'date' || $info['type'] == 'timestamp') {
+	  if (isset($this->data[$alias][$field])) {
+/* 	    pr("Fix Date for '$alias'.'$field'; current value = " . */
+/* 	       "'{$this->data[$alias][$field]}'"); */
+	    if ($this->data[$alias][$field] === 'CURRENT_TIMESTAMP')
+	      // Seems CakePHP is broken for the default timestamp.
+	      // It tries to automagically set the value to CURRENT_TIMESTAMP
+	      // which is wholly rejected by MySQL.  Just put it back to NULL
+	      // and let the SQL engine deal with the defaults... it's not
+	      // Cake's place to do this anyway :-/
+	      $this->data[$alias][$field] = null;
+	    else
+	      $this->data[$alias][$field] =
+		$this->dateFormatBeforeSave($this->data[$alias][$field]);
+	  }
+	}
+      }
+    }
+
+    return true;
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: dateFormatBeforeSave
+   *  - convert dates to database format
+   */
+
+  function dateFormatBeforeSave($dateString) {
+/*     $time = ''; */
+/*     if (preg_match('/(\d+(:\d+))/', $dateString, $match)) */
+/*       $time = ' '.$match[1]; */
+/*     $dateString = preg_replace('/(\d+(:\d+))/', '', $dateString); */
+/*     return date('Y-m-d', strtotime($dateString)) . $time; */
+
+    if (preg_match('/:/', $dateString))
+      return date('Y-m-d H:i:s', strtotime($dateString));
+    else
+      return date('Y-m-d', strtotime($dateString));
   }
 
 }

site/config/inflections.php

@@ -38,7 +38,7 @@
  *
  * $uninflectedPlural = array('.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox');
  */
-	$uninflectedPlural = array();
+	$uninflectedPlural = array('.*cash');
 /**
  * This is a key => value array of plural irregular words.
  * If key matches then the value is returned.

site/config/routes.php

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

site/controllers/accounts_controller.php

@@ -0,0 +1,211 @@
+<?php
+
+class AccountsController extends AppController {
+
+  var $uses = array('Account', 'LedgerEntry');
+
+  var $sidemenu_links =
+    array(array('name' => 'Accounts',        'header' => true),
+	  array('name' => 'All',             'url' => array('controller' => 'accounts', 'action' => 'all')),
+	  array('name' => 'Asset',           'url' => array('controller' => 'accounts', 'action' => 'asset')),
+	  array('name' => 'Liability',       'url' => array('controller' => 'accounts', 'action' => 'liability')),
+	  array('name' => 'Equity',          'url' => array('controller' => 'accounts', 'action' => 'equity')),
+	  array('name' => 'Income',          'url' => array('controller' => 'accounts', 'action' => 'income')),
+	  array('name' => 'Expense',         'url' => array('controller' => 'accounts', 'action' => 'expense')),
+	  array('name' => 'Deposits',        'header' => true),
+	  array('name' => 'Prior Deposits',  'url' => array('controller' => 'transactions', 'action' => 'deposit')),
+	  array('name' => 'New Deposit',     'url' => array('controller' => 'tenders', 'action' => 'deposit')),
+	  );
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: sideMenuLinks
+   *  - Generates controller specific links for the side menu
+   */
+  function sideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index / asset / liability / equity / income / expense / all
+   *  - Generate a chart of accounts
+   */
+
+  function index()     { $this->all(); }
+  function asset()     { $this->gridView('Asset Accounts'); }
+  function liability() { $this->gridView('Liability Accounts'); }
+  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'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
+   *    these virtual functions ensure that the correct data is passed
+   *    to jqGrid.
+   */
+
+  function gridDataSetup(&$params) {
+    parent::gridDataSetup($params);
+    if (!isset($params['action']))
+      $params['action'] = 'all';
+  }
+
+  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
+	     'CurrentLedger' => array
+	     (// Models
+	      'LedgerEntry'
+	      ),
+	     ),
+       );
+  }
+
+  function gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+    return array_merge($fields,
+		       $this->Account->Ledger->LedgerEntry->debitCreditFields(true));
+  }
+
+  function gridDataConditions(&$params, &$model) {
+    $conditions = parent::gridDataConditions($params, $model);
+
+    if (in_array($params['action'], array('asset', 'liability', 'equity', 'income', 'expense'))) {
+      $conditions[] = array('Account.type' => strtoupper($params['action']));
+    }
+
+    return $conditions;
+  }
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['Account'] = array('name');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: newledger
+   *  - Close the current account ledger and create a new one,
+   *    carrying forward any balance if necessary.
+   */
+
+  function newledger($id = null) {
+    $result = $this->Account->closeCurrentLedgers($id);
+
+    if ($result['error']) {
+      pr(compact('result'));
+      die("Unable to create new ledger.");
+      $this->Session->setFlash(__('Unable to create new Ledger.', true));
+    }
+    if ($id)
+      $this->redirect(array('action'=>'view', $id));
+    else
+      $this->redirect(array('action'=>'index'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: collected
+   *  - Displays the items actually collected for the period
+   *    e.g. How much was collected in rent from 4/1/09 - 5/1/09
+   */
+  function collected($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    $payment_accounts = $this->Account->collectableAccounts();
+    //$payment_accounts[$this->Account->nameToID('Closing')] = 'Closing';
+    //$payment_accounts[$this->Account->nameToID('Equity')] = 'Equity';
+    $default_accounts = array_diff_key($this->Account->paymentAccounts(),
+				       array($this->Account->concessionAccountID() => 1));
+    $this->set(compact('payment_accounts', 'default_accounts'));
+
+    $this->Account->recursive = -1;
+    $account = $this->Account->read(null, $id);
+    $account = $account['Account'];
+
+    $title = ($account['name'] . ': Collected Report');
+    $this->set(compact('account', 'title'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific account
+   */
+
+  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    // Get details about the account and its ledgers (no ledger entries yet)
+    $account = $this->Account->find
+      ('first',
+       array('contain' =>
+	     array(// Models
+		   'CurrentLedger' =>
+		   array('fields' => array('id', 'sequence', 'name')),
+
+		   'Ledger' =>
+		   array('CloseTransaction' => array
+			 ('order' => array('CloseTransaction.stamp' => 'DESC'))),
+		   ),
+	     'conditions' => array(array('Account.id' => $id)),
+	     )
+       );
+
+    // Get all ledger entries of the CURRENT ledger
+    $entries = $this->Account->ledgerEntries($id);
+    //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->sidemenu_links[] =
+      array('name' => 'Operations',       'header' => true);
+    $this->sidemenu_links[] =
+      array('name' => 'New Ledger',       'url' => array('action' => 'newledger', $id));
+    $this->sidemenu_links[] =
+      array('name' => 'Collected',        'url' => array('action' => 'collected', $id));
+
+    // Prepare to render
+    $title = 'Account: ' . $account['Account']['name'];
+    $this->set(compact('account', 'title', 'stats'));
+  }
+
+  function tst($id) {
+    //$entries = $this->Account->($id);
+    pr($entries);
+  }
+}

site/controllers/charges_controller.php

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

site/controllers/contacts_controller.php

@@ -1,18 +1,8 @@
 <?php
 
 class ContactsController extends AppController {
-  var $paginate = array('limit' => 100,
-			'group' => 'Contact.id',
-			'order' => array('Contact.last_name' => 'ASC',
-					 'Contact.first_name' => 'ASC'));
 
-  var $sidemenu_links =
-    array(array('name' => 'Tenants',       'header' => true),
-	  array('name' => 'Current',       'url' => array('controller' => 'contacts', 'action' => 'current')),
-	  array('name' => 'Past',          'url' => array('controller' => 'contacts', 'action' => 'past')),
-	  array('name' => 'All Tenants',   'url' => array('controller' => 'contacts', 'action' => 'tenants')),
-	  array('name' => 'All Contacts',  'url' => array('controller' => 'contacts', 'action' => 'all')),
-	  );
+  var $sidemenu_links = array();
 
   /**************************************************************************
    **************************************************************************
@@ -28,110 +18,37 @@ class ContactsController extends AppController {
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * action: index
-   *  - Lists all current tenants
+   * action: index / all
+   *  - Generate a listing of contacts
    */
 
-  function index() {
-    $this->current();
-  }
+  function index()       { $this->all(); }
+  function all()         { $this->gridView('All Contacts', 'all'); }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * action: past
-   *  - Lists all tenants, past and present
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
+   *    these virtual functions ensure that the correct data is passed
+   *    to jqGrid.
    */
 
-  function tenants() {
-    $this->paginate = array_merge
-      ($this->paginate,
-       array('link' =>
-	     array(// Models
-		   'Lease' =>
-		   array('fields' => array(),
-			 'type' => 'INNER',
-			 ),
-		   ),
-	     'conditions' => array('ContactsLease.type !=' => 'ALTERNATE')
-	     ));
-
-    $title = 'All Tenants';
-    $this->set('title', $title); $this->set('heading', $title);
-    $this->set('contacts', $this->paginate());
-    $this->render('index');
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+    $order = parent::gridDataOrder($params, $model, $index, $direction);
+    if ($index === 'Contact.last_name') {
+      $order[] = 'Contact.first_name ' . $direction;
+    }
+    if ($index === 'Contact.first_name') {
+      $order[] = 'Contact.last_name ' . $direction;
+    }
+    return $order;
   }
 
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: current
-   *  - Lists all current tenants
-   */
-
-  function current() {
-    $this->paginate = array_merge
-      ($this->paginate,
-       array('link' =>
-	     array(// Models
-		   'Lease' =>
-		   array('fields' => array(),
-			 'type' => 'INNER',
-			 ),
-		   ),
-	     'conditions' => array('ContactsLease.type !=' => 'ALTERNATE',
-				   'Lease.close_date IS NULL')
-	     ));
-
-    $title = 'Current Tenants';
-    $this->set('title', $title); $this->set('heading', $title);
-    $this->set('contacts', $this->paginate());
-    $this->render('index');
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: past
-   *  - Lists all past tenants
-   */
-
-  function past() {
-    $this->paginate = array_merge
-      ($this->paginate,
-       array('link' =>
-	     array(// Models
-		   'Lease' =>
-		   array('fields' => array(),
-			 'type' => 'INNER',
-			 ),
-		   ),
-	     'conditions' => array('ContactsLease.type !=' => 'ALTERNATE',
-				   'Lease.close_date IS NOT NULL')
-	     ));
-
-    $title = 'Past Tenants';
-    $this->set('title', $title); $this->set('heading', $title);
-    $this->set('contacts', $this->paginate());
-    $this->render('index');
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: all
-   *  - Lists all contacts, including non-tenants
-   */
-
-  function all() {
-    $title = 'All Contacts';
-    $this->set('title', $title); $this->set('heading', $title);
-    $this->set('contacts', $this->paginate());
-    $this->render('index');
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['Contact'] = array('id');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
 
@@ -148,56 +65,140 @@ class ContactsController extends AppController {
       $this->redirect(array('action'=>'index'));
     }
 
-    $this->Contact->Behaviors->attach('Containable');
-    $this->Contact->contain
-      (array(// Models
-	     'ContactPhone',
-	     'ContactEmail',
-	     'ContactAddress',
-	     'Lease' =>
-	     array('order' => 'movein_date',
-		   'conditions' => array('Lease.lease_date IS NOT NULL',
-					 'ContactsLease.type !=' => 'ALTERNATE'),
-		   // Models
-		   'Unit' =>
-		   array('order'  => array('sort_order'),
-			 'fields' => array('id', 'name'),
-			 ),
-		   'Charge' =>
-		   array('order'  => array('charge_date'),
-			 // Models
-			 'ChargeType',
-			 'Receipt',
-			 )
-		   )
-	     )
-       );
-    $contact = $this->Contact->read(null, $id);
+    $contact = $this->Contact->find
+      ('first', array
+       ('contain' => array
+	(// Models
+	 'ContactPhone',
+	 'ContactEmail',
+	 'ContactAddress',
+	 'Customer'),
 
-    $outstanding_deposit = 0;
-    $outstanding_balance = 0;
-    foreach($contact['Lease'] AS $lease) {
-      foreach($lease['Charge'] AS $charge) {
-	$outstanding_balance += $charge['total'];
-	foreach ($charge['Receipt'] AS $receipt) {
-	  $outstanding_balance -= $receipt['ChargesReceipt']['amount'];
-	  // REVISIT <AP> 20090530:
-	  //   Using hardcoded value for security deposit...
-	  //   That can't be good!
-	  if ($charge['charge_type_id'] == 1)
-	    $outstanding_deposit += $receipt['ChargesReceipt']['amount'];
+	'conditions' => array('Contact.id' => $id),
+	));
+
+    // Set up dynamic menu items
+    $this->sidemenu_links[] =
+      array('name' => 'Operations', 'header' => true);
+
+    $this->sidemenu_links[] =
+      array('name' => 'Edit',
+	    'url' => array('action' => 'edit',
+			   $id));
+
+    // Prepare to render.
+    $title = 'Contact: ' . $contact['Contact']['display_name'];
+    $this->set(compact('contact', 'title'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: edit
+   */
+
+  function edit($id = null, $customer_id = null) {
+    if (isset($this->data)) {
+
+      if (isset($this->params['form']['cancel'])) {
+	if (isset($this->data['Contact']['id']))
+	  $this->redirect(array('action'=>'view', $this->data['Contact']['id']));
+/* 	else */
+/* 	  $this->redirect(array('controller' => 'customers', */
+/* 				'action'=>'add', $this->data['Customer']['id'])); */
+	return;
+      }
+
+      // Go through each contact method and strip the bogus ID if new
+      foreach (array_intersect_key($this->data,
+				   array('ContactPhone'=>1,
+					 'ContactAddress'=>1,
+					 'ContactEmail'=>1)) AS $type => $arr) {
+	foreach ($arr AS $idx => $item) {
+	  if (isset($item['source']) && $item['source'] === 'new')
+	    unset($this->data[$type][$idx]['id']);
 	}
       }
+
+      // Save the contact and all associated data
+      $this->Contact->saveContact($this->data['Contact']['id'], $this->data);
+
+      // Now that the work is done, let the user view the updated contact
+      $this->redirect(array('action'=>'view', $this->data['Contact']['id']));
+      //$this->render('/empty');
+      return;
     }
 
-    $this->sidemenu_links[] =
-      array('name' => 'Operations',       'header' => true);
-    $this->sidemenu_links[] =
-      array('name' => 'Move-Out',         'url' => array('controller' => 'units', 'action' => 'move-out'));
+    if ($id) {
+      $this->data = $this->Contact->find
+	('first', array
+	 ('contain' => array
+	  (// Models
+	   'ContactPhone',
+	   'ContactEmail',
+	   'ContactAddress',
+	   'Customer'),
 
-    $title = $contact['Contact']['display_name'];
-    $this->set(compact('contact', 'title',
-		       'outstanding_balance',
-		       'outstanding_deposit'));
+	  'conditions' => array('Contact.id' => $id),
+	  ));
+
+      $title = 'Contact: ' . $this->data['Contact']['display_name'] . " : Edit";
+    }
+    else {
+      $title = "Enter New Contact";
+      $this->data = array('ContactPhone' => array(),
+			  'ContactAddress' => array(),
+			  'ContactEmail' => array());
+    }
+
+    $phone_types = array_flip($this->Contact->ContactPhone->getEnumValues('type'));
+    unset($phone_types[0]);
+    // REVISIT <AP> 20090705
+    //   Use this to have a mixed case enum
+    //     array_map('ucfirst', array_map('strtolower', $phone_types))
+    $phone_types = array_combine($phone_types, $phone_types);
+    $this->set(compact('phone_types'));
+
+    $method_types = array_flip($this->Contact->getEnumValues
+			       ('type',
+				$this->Contact->tablePrefix . 'contacts_methods'));
+    unset($method_types[0]);
+    $method_types = array_combine($method_types, $method_types);
+    $this->set(compact('method_types'));
+
+    $method_preferences = array_flip($this->Contact->getEnumValues
+				     ('preference',
+				      $this->Contact->tablePrefix . 'contacts_methods'));
+    unset($method_preferences[0]);
+    $method_preferences = array_combine($method_preferences, $method_preferences);
+    $this->set(compact('method_preferences'));
+
+    $contact_phones = $this->Contact->ContactPhone->phoneList();
+    $this->set(compact('contact_phones'));
+
+    $contact_addresses = $this->Contact->ContactAddress->addressList();
+    $this->set(compact('contact_addresses'));
+
+    $contact_emails = $this->Contact->ContactEmail->emailList();
+    $this->set(compact('contact_emails'));
+
+    // Prepare to render.
+    //pr($this->data);
+    $this->set(compact('title'));
+    $this->render('edit');
   }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: add
+   *  - Adds a new contact
+   */
+
+  function add($customer_id = null) {
+    $this->edit(null, $customer_id);
+  }
+
 }

site/controllers/customers_controller.php

@@ -0,0 +1,457 @@
+<?php
+
+class CustomersController extends AppController {
+  var $sidemenu_links =
+    array(array('name' => 'Customers',     'header' => true),
+          array('name' => 'Current',       'url' => array('controller' => 'customers', 'action' => 'current')),
+          array('name' => 'Past',          'url' => array('controller' => 'customers', 'action' => 'past')),
+          array('name' => 'All',           'url' => array('controller' => 'customers', 'action' => 'all')),
+          array('name' => 'Add Customer',  'url' => array('controller' => 'customers', 'action' => 'add')),
+          );
+
+  //var $components = array('RequestHandler');
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: sideMenuLinks
+   *  - Generates controller specific links for the side menu
+   */
+  function sideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index / current / past / all
+   *  - Creates a list of customers
+   */
+
+  function index()   { $this->current(); }
+  function current() { $this->gridView('Current Tenants', 'current'); }
+  function past()    { $this->gridView('Past Tenants'); }
+  function all()     { $this->gridView('All Customers'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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(// Models
+	    'PrimaryContact',
+	    'CurrentLease' => array('fields' => array()),
+	     ),
+       );
+  }
+
+  function gridDataTables(&$params, &$model) {
+    $link = $this->gridDataCountTables($params, $model);
+    // StatementEntry is needed to determine customer balance
+    $link['link']['StatementEntry'] = array('fields' => array());
+    return $link;
+  }
+
+  function gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+    $fields[] = ('COUNT(DISTINCT CurrentLease.id) AS lease_count');
+    return array_merge($fields,
+		       $this->Customer->StatementEntry->chargePaymentFields(true));
+  }
+
+  function gridDataConditions(&$params, &$model) {
+    $conditions = parent::gridDataConditions($params, $model);
+
+    if ($params['action'] === 'current') {
+      $conditions[] = 'CurrentLease.id IS NOT NULL';
+    }
+    elseif ($params['action'] === 'past') {
+      $conditions[] = 'CurrentLease.id IS NULL';
+    }
+
+    return $conditions;
+  }
+
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+    $order = array();
+    $order[] = parent::gridDataOrder($params, $model, $index, $direction);
+
+    if ($index !== 'PrimaryContact.last_name')
+      $order[] = parent::gridDataOrder($params, $model,
+					 'PrimaryContact.last_name', $direction);
+    if ($index !== 'PrimaryContact.first_name')
+      $order[] = parent::gridDataOrder($params, $model,
+					 'PrimaryContact.first_name', $direction);
+    if ($index !== 'Customer.id')
+      $order[] = parent::gridDataOrder($params, $model,
+					 'Customer.id', $direction);
+
+    return $order;
+  }
+
+  function gridDataCount(&$params, &$model) {
+
+    if ($params['action'] != 'current')
+      return parent::gridDataCount($params, $model);
+
+    // OK, for current customers, we have an issue.
+    // We don't have a good way to use the query to obtain
+    // our count.  The problem is that we're relying on the
+    // group by for the query, but that simply won't work
+    // for the count.  However, it's not difficult to simply
+    // derive it since 'current' customers are mutually
+    // exclusive to 'past' customers.
+
+    $tmp_params = $params;
+    $tmp_params['action'] = 'all';
+    $all_count = parent::gridDataCount($tmp_params, $model);
+    $tmp_params['action'] = 'past';
+    $past_count = parent::gridDataCount($tmp_params, $model);
+
+    // The current customer count is simply calculated
+    // as all customers that are not past customers.
+    return $all_count - $past_count;
+  }
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['Customer'] = array('name');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: move_in
+   *  - Sets up the move-in page for the given customer.
+   */
+
+  function move_in($id = null) {
+    $customer = array();
+    $unit = array();
+
+    if (isset($id)) {
+      $this->Customer->recursive = -1;
+      $customer = current($this->Customer->read(null, $id));
+    }
+    $this->set(compact('customer', 'unit'));
+
+    $title = 'Customer Move-In';
+    $this->set(compact('title'));
+    $this->render('/leases/move');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: move_out
+   *  - prepare to move a customer out of one of their units
+   */
+
+  function move_out($id) {
+
+    $customer = $this->Customer->find
+      ('first', array
+       ('contain' => array
+	(// Models
+	 'Lease' =>
+	 array('conditions' => array('Lease.moveout_date' => null),
+	       // Models
+	       'Unit' =>
+	       array('order'  => array('sort_order'),
+		     'fields' => array('id', 'name'),
+		     ),
+	       ),
+	 ),
+
+	'conditions' => array('Customer.id' => $id),
+	));
+    $this->set('customer', $lease['Customer']);
+    $this->set('unit',     array());
+
+    $redirect = array('controller' => 'customers',
+		      'action' => 'view',
+		      $id);
+
+    $title = $customer['Customer']['name'] . ': Prepare Move-Out';
+    $this->set(compact('title', 'customer', 'redirect'));
+    $this->render('/leases/move');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific customer
+   */
+
+  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+/*     //$result = $this->Customer->securityDeposits($id); */
+/*     $result = $this->Customer->excessPayments($id); */
+/*     //$result = $this->Customer->unreconciledCharges($id); */
+/*     echo('<HR>'); */
+/*     pr($result); */
+/*     $this->autoRender = false; */
+/*     return; */
+
+    $customer = $this->Customer->details($id);
+    //pr($customer);
+    $outstanding_balance = $customer['stats']['balance'];
+    $outstanding_deposit = $this->Customer->securityDepositBalance($id);
+
+    // Figure out if this customer has any non-closed leases
+    $show_moveout = false;
+    $show_payment = false;
+    foreach ($customer['Lease'] AS $lease) {
+      if (!isset($lease['close_date']))
+	$show_payment = true;
+      if (!isset($lease['moveout_date']))
+	$show_moveout = true;
+    }
+
+    // Set up dynamic menu items
+    $this->sidemenu_links[] =
+      array('name' => 'Operations', 'header' => true);
+
+    $this->sidemenu_links[] =
+      array('name' => 'Edit',
+	    'url' => array('action' => 'edit',
+			   $id));
+
+    $this->sidemenu_links[] =
+      array('name' => 'Move-In',
+	    'url' => array('action' => 'move_in',
+			   $id));
+
+/*     if ($show_moveout) { */
+/*       $this->sidemenu_links[] = */
+/* 	array('name' => 'Move-Out', */
+/* 	      'url' => array('action' => 'move_out', */
+/* 			     $id)); */
+/*     } */
+
+    if ($show_payment) {
+      $this->sidemenu_links[] =
+	array('name' => 'Payment',
+	      'url' => array('action' => 'receipt',
+			     $id));
+    }
+
+    // Prepare to render.
+    $title = 'Customer: ' . $customer['Customer']['name'];
+    $this->set(compact('customer', 'title',
+                       'outstanding_balance',
+                       'outstanding_deposit'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: edit
+   *  - Edit customer information
+   */
+
+  function edit($id = null) {
+    if (isset($this->data)) {
+      // Check to see if the operation was cancelled.
+      if (isset($this->params['form']['cancel'])) {
+	if (isset($this->data['Customer']['id']))
+	  $this->redirect(array('action'=>'view', $this->data['Customer']['id']));
+	else
+	  $this->redirect(array('action'=>'index'));
+	return;
+      }
+
+      // Make sure we have at least one contact
+      if (!isset($this->data['Contact']) || count($this->data['Contact']) == 0) {
+	$this->Session->setFlash("MUST SPECIFY AT LEAST ONE CONTACT", true);
+	$this->redirect(array('action'=>'view', $this->data['Customer']['id']));
+	return;
+      }
+
+      // Make sure there is a primary contact
+      if (!isset($this->data['Customer']['primary_contact_entry'])) {
+	$this->Session->setFlash("MUST SPECIFY A PRIMARY CONTACT", true);
+	$this->redirect(array('action'=>'view', $this->data['Customer']['id']));
+	return;
+      }
+
+      // Go through each customer and strip the bogus ID if new
+      foreach ($this->data['Contact'] AS &$contact) {
+	if (isset($contact['source']) && $contact['source'] === 'new')
+	  unset($contact['id']);
+      }
+
+      // Save the customer and all associated data
+      if (!$this->Customer->saveCustomer($this->data['Customer']['id'],
+					 $this->data,
+					 $this->data['Customer']['primary_contact_entry'])) {
+	$this->Session->setFlash("CUSTOMER SAVE FAILED", true);
+	pr("CUSTOMER SAVE FAILED");
+      }
+
+      // If existing customer, then view it.  Otherwise, since
+      // this is a new customer, go to the move in screen.
+      if ($this->data['Customer']['id'])
+	$this->redirect(array('action'=>'view', $this->Customer->id));
+      else
+	$this->redirect(array('action'=>'move_in', $this->Customer->id));
+
+      // For debugging, only if the redirects above have been
+      // commented out, otherwise this section isn't reached.
+      $this->render('/empty');
+      return;
+    }
+
+    if ($id) {
+      $this->data = $this->Customer->details($id);
+      $title = 'Customer: ' . $this->data['Customer']['name'] . " : Edit";
+    }
+    else {
+      $title = "Enter New Customer";
+      $this->data = array('Contact' => array(), 'PrimaryContact' => null);
+    }
+
+    $contact_types = array_flip($this->Customer->ContactsCustomer->getEnumValues('type'));
+    unset($contact_types[0]);
+    $contact_types = array_combine($contact_types, $contact_types);
+    $this->set(compact('contact_types'));
+
+    $contacts = $this->Customer->Contact->contactList();
+    $this->set(compact('contacts'));
+
+    // Prepare to render.
+    //pr($this->data);
+    $this->set(compact('title'));
+    $this->render('edit');
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: add
+   *  - Add a new customer
+   */
+
+  function add() {
+    $this->edit();
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: receipt
+   *  - Sets up the receipt entry page for the given customer.
+   */
+
+  function receipt($id = null) {
+    if (isset($id)) {
+      $this->Customer->recursive = -1;
+      $customer = $this->Customer->read(null, $id);
+      $customer = $customer['Customer'];
+      $unreconciled = $this->Customer->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();
+    $payment_types = $TT->paymentTypes();
+    $default_type = $TT->defaultPaymentType();
+    $this->set(compact('payment_types', 'default_type'));
+
+    $title = ($customer['name'] . ': Payment Entry');
+    $this->set(compact('customer', 'charges', 'stats', 'title'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: refund
+   *  - Refunds customer charges
+   */
+
+  function refund() {
+    $entries = $this->Customer->StatementEntry->find
+      ('all', array
+       ('contain' => false,
+	'conditions' => array('StatementEntry.id' =>
+			      //array(199,200,201)
+			      61
+			      ),
+	));
+    pr(compact('entries'));
+
+    $this->Customer->StatementEntry->reverse($entries);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: unreconciled
+   *  - returns the list of unreconciled entries
+   */
+
+  function unreconciled($id) {
+
+    //$this->layout = 'ajax';
+    $this->layout = null;
+    $this->autoLayout = false;
+    $this->autoRender = false;
+    //Configure::write('debug', '0');
+    //header("Content-type: text/xml;charset=utf-8");
+
+    App::import('Helper', 'Xml');
+    $xml = new XmlHelper();
+
+    // Find the unreconciled entries, then manipulate the structure
+    // slightly to accomodate the format necessary for XML Helper.
+    $unreconciled = $this->Customer->unreconciledCharges($id);
+    $unreconciled = array('entries' =>
+			  array_intersect_key($unreconciled['debit'],
+					      array('entry'=>1, 'balance'=>1)));
+
+    // XML Helper will dump an empty tag if the array is empty
+    if (!count($unreconciled['entries']['entry']))
+      unset($unreconciled['entries']['entry']);
+
+    //pr($unreconciled);
+    //$reconciled = $cust->reconcileNewStatementEntry($cust_id, 'credit', $amount);
+
+    $opts = array();
+    //$opts['format'] = 'tags';
+    echo $xml->header();
+    echo $xml->serialize($unreconciled, $opts);
+  }
+
+}

site/controllers/double_entries_controller.php

@@ -0,0 +1,44 @@
+<?php
+
+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);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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 Entry and related fields
+    $entry = $this->DoubleEntry->find
+      ('first',
+       array('contain' => array('DebitEntry', 'CreditEntry'),
+	     'conditions' => array('DoubleEntry.id' => $id),
+	     ));
+
+    // Prepare to render.
+    $title = "Double Ledger Entry #{$entry['DoubleEntry']['id']}";
+    $this->set(compact('entry', 'title'));
+  }
+
+}

site/controllers/leases_controller.php

@@ -0,0 +1,563 @@
+<?php
+
+class LeasesController extends AppController {
+
+  var $sidemenu_links =
+    array(array('name' => 'Leases',   'header' => true),
+	  array('name' => 'Active',   'url' => array('controller' => 'leases', 'action' => 'active')),
+	  array('name' => 'Closed',   'url' => array('controller' => 'leases', 'action' => 'closed')),
+	  array('name' => 'All',      'url' => array('controller' => 'leases', 'action' => 'all')),
+	  );
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: sideMenuLinks
+   *  - Generates controller specific links for the side menu
+   */
+  function sideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index / active / closed / all
+   *  - Generate a listing of leases
+   */
+
+  function index()    { $this->all(); }
+  function active()   { $this->gridView('Active Leases'); }
+  function closed()   { $this->gridView('Closed Leases'); }
+  function all()      { $this->gridView('All Leases', 'all'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
+   *    these virtual functions ensure that the correct data is passed
+   *    to jqGrid.
+   */
+
+  function gridDataSetup(&$params) {
+    parent::gridDataSetup($params);
+    if (!isset($params['action']))
+      $params['action'] = 'all';
+  }
+
+  function gridDataCountTables(&$params, &$model) {
+    return array
+      ('link' => array('Unit'     => array('fields' => array('id', 'name')),
+		       'Customer' => array('fields' => array('id', 'name'))));
+  }
+
+  function gridDataTables(&$params, &$model) {
+    $link = $this->gridDataCountTables($params, $model);
+    $link['link']['StatementEntry'] = array('fields' => array());
+    return $link;
+  }
+
+  function gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+    return array_merge($fields,
+		       $this->Lease->StatementEntry->chargePaymentFields(true));
+  }
+
+  function gridDataConditions(&$params, &$model) {
+    $conditions = parent::gridDataConditions($params, $model);
+
+    if ($params['action'] === 'active') {
+      $conditions[] = 'Lease.close_date IS NULL';
+    }
+    elseif ($params['action'] === 'closed') {
+      $conditions[] = 'Lease.close_date IS NOT NULL';
+    }
+
+    if (isset($customer_id))
+      $conditions[] = array('Lease.customer_id' => $customer_id);
+
+    return $conditions;
+  }
+
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+    // Do not sort by number, which is type varchar and
+    // sorts on an ascii basis.  Sort by ID instead.
+    if ($index === 'Lease.number')
+      $index = 'Lease.id';
+
+    // Instead of sorting by name, sort by defined order
+    if ($index === 'Unit.name')
+      $index = 'Unit.sort_order';
+
+    $order = array();
+    $order[] = parent::gridDataOrder($params, $model, $index, $direction);
+
+    // If sorting by anything other than id/number
+    // add sorting by id as a secondary condition.
+    if ($index !== 'Lease.id' && $index !== 'Lease.number')
+      $order[] = parent::gridDataOrder($params, $model,
+					 'Lease.id', $direction);
+
+    return $order;
+  }
+
+/*   function gridDataPostProcess(&$params, &$model, &$records) { */
+/*     foreach ($records AS &$record) { */
+/*       $record['Lease']['through_date'] */
+/* 	= $this->Lease->rentChargeThrough($record['Lease']['id']); */
+/*     } */
+
+/*     parent::gridDataPostProcess($params, $model, $records); */
+/*   } */
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['Lease'] = array('number');
+    $links['Unit'] = array('name');
+    $links['Customer'] = array('name');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: move_in
+   *  - execute a move in on a new lease
+   */
+
+  function move_in() {
+    if (!$this->data)
+      die("Should have some data");
+
+    // Handle the move in based on the data given
+    //pr(array('Move-in data', $this->data));
+
+    $lid = $this->Lease->moveIn($this->data['Lease']['customer_id'],
+				$this->data['Lease']['unit_id'],
+				null, null,
+				$this->data['Lease']['movein_date'],
+				$this->data['Lease']['comment']
+				);
+
+    // Since this is a new lease, go to the invoice
+    // screen so we can start assessing charges.
+    $this->redirect(array('action'=>'invoice', $lid));
+
+    // For debugging, only if the redirect above have been
+    // commented out, otherwise this section isn't reached.
+    $this->render('/empty');
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: move_out
+   *  - prepare or execute a move out on a specific lease
+   */
+
+  function move_out($id = null) {
+    if ($this->data) {
+      // Handle the move out based on the data given
+      //pr($this->data);
+
+      $this->Lease->moveOut($this->data['Lease']['id'],
+			    'VACANT',
+			    $this->data['Lease']['moveout_date'],
+			    //true // Close this lease, if able
+			    false
+			    );
+
+      $this->redirect($this->data['redirect']);
+      $this->autoRender = false;
+      return;
+    }
+
+    if (!isset($id))
+      die("Oh Nooooo!!");
+
+    $lease = $this->Lease->find
+      ('first', array
+       ('contain' => array
+	(// Models
+	 'Unit' =>
+	 array('order'  => array('sort_order'),
+	       'fields' => array('id', 'name'),
+	       ),
+
+	 'Customer' =>
+	 array('fields' => array('id', 'name'),
+	       ),
+	 ),
+
+	'conditions' => array(array('Lease.id' => $id),
+			      array('Lease.close_date' => null),
+			      ),
+	));
+    $this->set('customer', $lease['Customer']);
+    $this->set('unit',     $lease['Unit']);
+    $this->set('lease',    $lease['Lease']);
+
+    $redirect = array('controller' => 'leases',
+		      'action' => 'view',
+		      $id);
+
+    $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
+	      $lease['Unit']['name'] . ': ' .
+	      $lease['Customer']['name'] . ': Prepare Move-Out');
+    $this->set(compact('title', 'redirect'));
+    $this->render('/leases/move');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: apply_deposit
+   *  - Applies the security deposit to charges.  This is much
+   *    like a receipt, but it's separated to keep it simple and
+   *    to prevent feature overload on the receipt page.
+   */
+
+  function apply_deposit($id = null) {
+    // Create some models for convenience
+    $A = new Account();
+
+    if ($this->data) {
+      // Handle the move out based on the data given
+      pr($this->data);
+      $this->Lease->releaseSecurityDeposits($this->data['Lease']['id']);
+      die();
+
+      // Assume this will succeed
+      $ret = true;
+
+      // Go through the entered payments
+      $receipt_transaction = array_intersect_key($this->data,
+						 array('Transaction'=>1,
+						       'transaction_id'=>1));
+    foreach ($data['StatementEntry'] AS $entry) {
+      // Create the receipt entry, and reconcile the credit side
+      // of the double-entry (which should be A/R) as a payment.
+      $ids = $this->StatementEntry->Ledger->Account->postLedgerEntry
+	($receipt_transaction,
+	 array_intersect_key($entry, array('MonetarySource'=>1))
+	 + array_intersect_key($entry, array('account_id'=>1)),
+	 array('debit_ledger_id' => $A->currentLedgerID($entry['account_id']),
+	       'credit_ledger_id' => $A->currentLedgerID($A->receiptAccountID()),
+	       'customer_id' => $customer_id,
+	       'lease_id' => $lease_id)
+	 + $entry,
+	 'receipt');
+
+      if ($ids['error'])
+	$ret = false;
+
+    $db = &$model->getDataSource();
+    $fields = $db->fields($model, $model->alias);
+    $fields[] = ("SUM(IF(Account.id IS NULL, 0," .
+		 "       IF(LedgerEntry.debit_ledger_id = Account.id," .
+		 "          1, -1))" .
+		 "    * IF(LedgerEntry.amount IS NULL, 0, LedgerEntry.amount))" .
+		 " AS 'balance'");
+    return $fields;
+      $receipt_transaction = array_intersect_key($ids,
+						 array('transaction_id'=>1,
+						       'split_transaction_id'=>1));
+    }
+
+      $this->Lease->moveOut($this->data['Lease']['id'],
+			    'VACANT',
+			    $this->data['Lease']['moveout_date'],
+			    //true // Close this lease, if able
+			    false
+			    );
+
+      $this->redirect(array('controller' => 'leases',
+			    'action' => 'view',
+			    $this->data['Lease']['id']));
+      $this->autoRender = false;
+      return;
+    }
+
+    $A = new Account();
+
+    $lease = $this->Lease->find
+      ('first', array
+       ('contain' => array
+	(// Models
+	 'Unit' =>
+	 array('order'  => array('sort_order'),
+	       'fields' => array('id', 'name'),
+	       ),
+
+	 'Customer' =>
+	 array('fields' => array('id', 'name'),
+	       ),
+	 ),
+
+	'conditions' => array(array('Lease.id' => $id),
+			      array('Lease.close_date' => null),
+			      ),
+	));
+
+
+    // Get the lease balance, part of lease stats
+    $this->Lease->statsMerge($lease['Lease'],
+			     array('stats' => $this->Lease->stats($id)));
+
+    // Determine the lease security deposit
+    $deposit_balance = $this->Lease->securityDeposits($lease['Lease']['id']);
+    $this->set(compact('deposit_balance'));
+    $this->set('customer', $lease['Customer']);
+    $this->set('unit',     $lease['Unit']);
+    $this->set('lease',    $lease['Lease']);
+    $this->set('account',  array('id' => $A->securityDepositAccountID()));
+
+/*     $redirect = array('controller' => 'leases', */
+/* 		      'action' => 'view', */
+/* 		      $id); */
+
+    $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
+	      $lease['Unit']['name'] . ': ' .
+	      $lease['Customer']['name'] . ': Utilize Security Deposit');
+    $this->set(compact('title', 'redirect'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: bad_debt
+   *  - Writes off remaining charges on a lease.
+   *    REVISIT <AP>: 20090710
+   *     Should this be a customer function?  What customer
+   *     would have only one lease that results in bad debt.
+   */
+
+  function bad_debt($id) {
+    $A = new Account();
+
+    $lease = $this->Lease->find
+      ('first', array
+       ('contain' => array
+	(// Models
+	 'Unit' =>
+	 array('order'  => array('sort_order'),
+	       'fields' => array('id', 'name'),
+	       ),
+
+	 'Customer' =>
+	 array('fields' => array('id', 'name'),
+	       ),
+	 ),
+
+	'conditions' => array(array('Lease.id' => $id),
+			      array('Lease.close_date' => null),
+			      ),
+	));
+
+
+    // Get the lease balance, part of lease stats
+    $this->Lease->statsMerge($lease['Lease'],
+			     array('stats' => $this->Lease->stats($id)));
+
+    // Determine the lease security deposit
+    $deposit_balance = $this->Lease->securityDepositBalance($lease['Lease']['id']);
+    if ($deposit_balance > 0)
+      die("Still have un-utilized security deposit");
+
+    $this->set('customer', $lease['Customer']);
+    $this->set('unit',     $lease['Unit']);
+    $this->set('lease',    $lease['Lease']);
+    $this->set('account',  array('id' => $A->badDebtAccountID()));
+
+/*     $redirect = array('controller' => 'leases', */
+/* 		      'action' => 'view', */
+/* 		      $id); */
+
+    $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
+	      $lease['Unit']['name'] . ': ' .
+	      $lease['Customer']['name'] . ': Write Off Bad Debt');
+    $this->set(compact('title', 'redirect'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: refund
+   *  - Provides user with a refund
+   *    REVISIT <AP>: 20090710
+   *     Should this be a customer function?
+   */
+
+  function refund($id) {
+/*     // Obtain the overall lease balance */
+/*     $stats = $this->Lease->stats($id); */
+/*     $outstanding_balance = $stats['balance']; */
+
+/*     // Determine the lease security deposit */
+/*     $deposits = $this->Lease->securityDeposits($id); */
+/*     $outstanding_deposit = $deposits['summary']['balance']; */
+
+
+/*     $this->set(compact('lease', 'title', */
+/* 		       'outstanding_deposit', */
+/* 		       'outstanding_balance')); */
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: close
+   *  - Closes a lease to any further action
+   */
+
+  function close($id) {
+    // REVISIT <AP>: 20090708
+    //  We should probably seek confirmation first...
+    $this->Lease->close($id);
+    $this->redirect(array('action'=>'view', $id));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: invoice
+   *  - Sets up the invoice entry page for the given customer.
+   */
+
+  function invoice($id = null, $type = null) {
+
+    $lease = $this->Lease->find
+      ('first', array
+       ('contain' => array
+	(// Models
+	 'Unit' =>
+	 array('order'  => array('sort_order'),
+	       'fields' => array('id', 'name'),
+	       ),
+
+	 'Customer' =>
+	 array('fields' => array('id', 'name'),
+	       ),
+	 ),
+
+	'conditions' => array(array('Lease.id' => $id),
+			      array('Lease.close_date' => null),
+			      ),
+	));
+
+    $A = new Account();
+    $charge_accounts = $A->chargeAccounts();
+    $default_account = $A->rentAccountID();
+    $this->set(compact('charge_accounts', 'default_account'));
+
+    // REVISIT <AP> 20090705:
+    //   Of course, the late charge should come from the late_schedule
+    $default_rent = $lease['Lease']['rent'];
+    $default_late = 10;
+    $this->set(compact('default_rent', 'default_late'));
+
+    $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
+	      $lease['Unit']['name'] . ': ' .
+	      $lease['Customer']['name'] . ': Charge Entry');
+    $this->set(compact('title', 'lease', 'charge'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific lease
+   */
+
+  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    // Get details about the lease and its ledgers (no ledger entries yet)
+    $lease = $this->Lease->find
+      ('first',
+       array('contain' =>
+	     array(// Models
+		   'LeaseType',
+		   'Unit',
+		   'Customer',
+		   ),
+	     'conditions' => array(array('Lease.id' => $id)),
+	     )
+       );
+
+    $lease['Lease']['paid_through'] = $this->Lease->rentPaidThrough($id);
+
+
+    $this->set('charge_gaps', $this->Lease->rentChargeGaps($id));
+    $this->set('charge_through', $this->Lease->rentChargeThrough($id));
+
+    // Obtain the overall lease balance
+    $this->Lease->statsMerge($lease['Lease'],
+			     array('stats' => $this->Lease->stats($id)));
+    $outstanding_balance = $lease['Lease']['stats']['balance'];
+
+    // Determine the lease security deposit
+    $outstanding_deposit = $this->Lease->securityDepositBalance($lease['Lease']['id']);
+
+    // Set up dynamic menu items
+    if (!isset($lease['Lease']['close_date'])) {
+      $this->sidemenu_links[] =
+	array('name' => 'Operations', 'header' => true);
+
+      if (!isset($lease['Lease']['moveout_date']))
+	$this->sidemenu_links[] =
+	  array('name' => 'Move-Out', 'url' => array('action' => 'move_out',
+						     $id));
+
+      $this->sidemenu_links[] =
+	array('name' => 'Charges', 'url' => array('action' => 'invoice',
+						  $id));
+
+      $this->sidemenu_links[] =
+	array('name' => 'Payments', 'url' => array('controller' => 'customers',
+						   'action' => 'receipt',
+						   $lease['Customer']['id']));
+
+      if (isset($lease['Lease']['moveout_date']) && $outstanding_deposit > 0 && $outstanding_balance > 0)
+	$this->sidemenu_links[] =
+	  array('name' => 'Apply Deposit', 'url' => array('action' => 'apply_deposit',
+							  $id));
+
+      if (isset($lease['Lease']['moveout_date']) &&
+	  $outstanding_balance <= 0 &&
+	  ($outstanding_deposit - $outstanding_balance) > 0)
+	$this->sidemenu_links[] =
+	  array('name' => 'Issue Refund', 'url' => array('action' => 'refund',
+							 $id));
+
+      if (isset($lease['Lease']['moveout_date']) && $outstanding_deposit == 0 && $outstanding_balance > 0)
+	$this->sidemenu_links[] =
+	  array('name' => 'Write-Off', 'url' => array('action' => 'bad_debt',
+						      $id));
+
+      if ($this->Lease->closeable($id))
+	$this->sidemenu_links[] =
+	  array('name' => 'Close', 'url' => array('action' => 'close',
+						  $id));
+    }
+
+    // Prepare to render
+    $title = 'Lease: #' . $lease['Lease']['id'];
+    $this->set(compact('lease', 'title',
+		       'outstanding_deposit',
+		       'outstanding_balance'));
+  }
+}

site/controllers/ledger_entries_controller.php

@@ -0,0 +1,189 @@
+<?php
+
+class LedgerEntriesController extends AppController {
+
+  var $sidemenu_links = array();
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: sideMenuLinks
+   *  - Generates controller specific links for the side menu
+   */
+  function sideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
+   *    these virtual functions ensure that the correct data is passed
+   *    to jqGrid.
+   */
+
+  function gridDataTables(&$params, &$model) {
+    $link =
+      array(// Models
+	    'Transaction' =>
+	    array('fields' => array('id', 'stamp'),
+		  ),
+
+	    'Ledger' =>
+	    array('fields' => array('id', 'sequence'),
+		  'Account' => 
+		  array('fields' => array('id', 'name', 'type'),
+			),
+		  ),
+
+	    'Tender' =>
+	    array('fields' => array('id', 'name', 'nsf_transaction_id'),
+		  ),
+
+/* 	    'DebitEntry', */
+/* 	    'CreditEntry', */
+	    );
+
+    return array('link' => $link);
+  }
+
+  function gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+    return array_merge($fields,
+		       $this->LedgerEntry->debitCreditFields());
+  }
+
+  function gridDataFilterTablesTable(&$params, &$model, $table) {
+    $table = $this->gridDataFilterTableName($params, $model, $table);
+    // Account is already part of our standard table set.
+    // Ensure we don't add it in again as part of filtering.
+    if ($table == 'Account')
+      return null;
+
+    // Customer needs to be added beneath Transaction
+    if ($table == 'Customer')
+      return 'Transaction';
+
+    return $table;
+  }
+
+  function gridDataFilterTablesConfig(&$params, &$model, $table) {
+    $config = parent::gridDataFilterTablesConfig($params, $model, $table);
+
+    // Customer is special in that its linked in by Transaction
+    // Therefore, the actual table used for the join is 'Transaction',
+    // not 'Customer', and so we need to specify Customer here.
+    if ($table == 'Customer')
+      $config = array('Customer' => $config);
+
+    return $config;
+  }
+
+  function gridDataFilterConditionsStatement(&$params, &$model, $table, $key, $value) {
+    //pr(compact('table', 'key', 'value'));
+    if ($table == 'Account' && $value['value_present'] && $value['value'] === '-AR-')
+      $value = $this->LedgerEntry->Ledger->Account->accountReceivableAccountID();
+    return parent::gridDataFilterConditionsStatement($params, $model, $table, $key, $value);
+  }
+
+
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+/*     if ($index === 'balance') */
+/*       return ($index .' '. $direction); */
+    $order = parent::gridDataOrder($params, $model, $index, $direction);
+
+    if ($index === 'Transaction.stamp') {
+      $order[] = 'LedgerEntry.id ' . $direction;
+    }
+
+    return $order;
+  }
+
+  function gridDataPostProcessCalculatedFields(&$params, &$model, &$records) {
+    parent::gridDataPostProcessCalculatedFields($params, $model, $records);
+    foreach ($records AS &$record) {
+      // REVISIT <AP>: 20090730
+      //  We really need the grid to handle this.  We probably need to
+      //  either create a hidden column with the nsf id, or pass back
+      //  a list of nsf items as user data.  We can then add an onload
+      //  function to sweep through the nsf items and format them.
+      //  For now... this works.
+      if (!empty($record['Tender']['nsf_transaction_id']))
+	$record['Tender']['name'] =
+	  '<SPAN class="nsf-tender">' . $record['Tender']['name'] . '</SPAN>';
+    }
+  }
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['LedgerEntry']    = array('id');
+    $links['Transaction']    = array('id');
+    $links['Ledger']         = array('id');
+    $links['Account']        = array('controller' => 'accounts', 'name');
+    $links['Tender']         = 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 Entry and related fields
+    $entry = $this->LedgerEntry->find
+      ('first',
+       array('contain' => array
+	     (
+	      'Transaction' =>
+	      array('fields' => array('id', 'stamp'),
+		    ),
+
+	      'Ledger' =>
+	      array('fields' => array('id', 'sequence', 'name'),
+		    'Account' => 
+		    array('fields' => array('id', 'name', 'type'),
+			),
+		  ),
+
+	      'Tender' =>
+	      array('fields' => array('id', 'name'),
+		    ),
+
+	      'DebitEntry'  => array('fields' => array('id', 'crdr')),
+	      'CreditEntry' => array('fields' => array('id', 'crdr')),
+	      ),
+
+	     'conditions' => array('LedgerEntry.id' => $id),
+	     ));
+
+    if (!empty($entry['DebitEntry']) && !empty($entry['CreditEntry']))
+      die("LedgerEntry has both a matching DebitEntry and CreditEntry");
+    if (empty($entry['DebitEntry']) && empty($entry['CreditEntry']))
+      die("LedgerEntry has neither a matching DebitEntry nor a CreditEntry");
+    if (empty($entry['DebitEntry']) && count($entry['CreditEntry']) != 1)
+      die("LedgerEntry has more than one CreditEntry");
+    if (empty($entry['CreditEntry']) && count($entry['DebitEntry']) != 1)
+      die("LedgerEntry has more than one DebitEntry");
+
+    if (empty($entry['DebitEntry']))
+      $entry['MatchingEntry'] = $entry['CreditEntry'][0];
+    else
+      $entry['MatchingEntry'] = $entry['DebitEntry'][0];
+
+    // Prepare to render.
+    $title = "Ledger Entry #{$entry['LedgerEntry']['id']}";
+    $this->set(compact('entry', 'title'));
+  }
+
+}

site/controllers/ledgers_controller.php

@@ -0,0 +1,145 @@
+<?php
+
+class LedgersController extends AppController {
+
+  var $sidemenu_links =
+    array(array('name' => 'Ledgers',      'header' => true),
+	  array('name' => 'Current',      'url' => array('controller' => 'ledgers', 'action' => 'current')),
+	  array('name' => 'Closed',       'url' => array('controller' => 'ledgers', 'action' => 'closed')),
+	  array('name' => 'All',          'url' => array('controller' => 'ledgers', 'action' => 'all')),
+	  );
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: sideMenuLinks
+   *  - Generates controller specific links for the side menu
+   */
+  function sideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index / current / closed / all
+   *  - Generate a list of ledgers
+   */
+
+  function index()     { $this->all(); }
+  function current()   { $this->gridView('Current Ledgers'); }
+  function closed()    { $this->gridView('Closed Ledgers');  }
+  function all()       { $this->gridView('All Ledgers', 'all'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
+   *    these virtual functions ensure that the correct data is passed
+   *    to jqGrid.
+   */
+
+  function gridDataSetup(&$params) {
+    parent::gridDataSetup($params);
+    if (!isset($params['action']))
+      $params['action'] = 'all';
+  }
+
+  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 gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+    $fields[] = 'CONCAT(Account.id, "-", Ledger.sequence) AS id_sequence';
+    return array_merge($fields,
+		       $this->Ledger->LedgerEntry->debitCreditFields(true));
+  }
+
+  function gridDataConditions(&$params, &$model) {
+    $conditions = parent::gridDataConditions($params, $model);
+
+    if ($params['action'] === 'current') {
+      $conditions[] = array('Ledger.close_transaction_id' => null);
+    }
+    elseif ($params['action'] === 'closed') {
+      $conditions[] = array('Ledger.close_transaction_id !=' => null);
+    }
+
+    return $conditions;
+  }
+
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+    $id_sequence = false;
+    if ($index === 'id_sequence') {
+      $id_sequence = true;
+      $index = 'Ledger.account_id';
+    }
+
+    $order = parent::gridDataOrder($params, $model, $index, $direction);
+
+    if ($id_sequence) {
+      $order[] = 'Ledger.sequence ' . $direction;
+    }
+
+    return $order;
+  }
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['Ledger'] = array('id_sequence');
+    $links['Account'] = array('name');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific ledger
+   */
+
+  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    // Get details about the ledger itself (no entries yet)
+    $ledger = $this->Ledger->find
+      ('first',
+       array('contain' =>
+	     array(// Models
+		   'Account',
+		   ),
+	     'conditions' => array(array('Ledger.id' => $id)),
+	     )
+       );
+
+    // Get ledger stats for our summary box
+    $stats = $this->Ledger->stats($id);
+
+    // OK, set our view variables and render!
+    $title = 'Ledger: #' . $ledger['Account']['id'] .'-'. $ledger['Ledger']['sequence'];
+    $this->set(compact('ledger', 'title', 'stats'));
+  }
+}

site/controllers/maps_controller.php

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

site/controllers/pages_controller.php

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

site/controllers/payments_controller.php

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

site/controllers/receipts_controller.php

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

site/controllers/statement_entries_controller.php

@@ -0,0 +1,279 @@
+<?php
+
+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);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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) {
+    $link =
+      array(// Models
+	    'Transaction' =>
+	    array('fields' => array('id', 'stamp'),
+		  ),
+
+	    'Customer' =>
+	    array('fields' => array('id', 'name'),
+		  ),
+
+	    'Lease' =>
+	    array('fields' => array('id', 'number'),
+		  'Unit' => 
+		  array('fields' => array('id', 'name'),
+			),
+		  ),
+	    );
+
+    if (isset($params['post']['custom']['statement_entry_id'])) {
+      $link['PaymentEntry'] = array();
+      $link['ChargeEntry']  = array();
+    }
+
+    if (isset($params['post']['custom']['account_id'])) {
+      $link['LedgerEntry'] = array('fields' => array('id'));
+      $link['LedgerEntry']['Account'] = array('fields' => array('id', 'name', 'type'));
+    }
+
+/*     if (count(array_intersect($params['fields'], array('applied'))) == 1) { */
+/*       $link['PaymentEntry'] = array(); */
+/*       $link['ChargeEntry']  = array(); */
+/*     } */
+
+    return array('link' => $link);
+  }
+
+  function gridDataTables(&$params, &$model) {
+    $tables = $this->gridDataCountTables($params, $model);
+    $tables['link']['LedgerEntry'] = array('fields' => array('id'));
+    $tables['link']['LedgerEntry']['Account'] = array('fields' => array('id', 'name', 'type'));
+    return $tables;
+  }
+
+  function gridDataFields(&$params, &$model) {
+    //foreach(
+    $fields = parent::gridDataFields($params, $model);
+
+    $fields[] = "COUNT(LedgerEntry.id) AS ledger_entry_count";
+
+    if (in_array('applied', $params['post']['fields'])) {
+      $fields[] = ("IF(StatementEntry.type = 'CHARGE'," .
+		   "   SUM(COALESCE(PaymentEntry.amount,0))," .
+		   "   SUM(COALESCE(ChargeEntry.amount,0)))" .
+		   " AS 'applied'");
+      $fields[] = ("StatementEntry.amount - (" .
+		   "IF(StatementEntry.type = 'CHARGE'," .
+		   "   SUM(COALESCE(PaymentEntry.amount,0))," .
+		   "   SUM(COALESCE(ChargeEntry.amount,0)))" .
+		   ") AS 'balance'");
+    }
+
+    $fields = array_merge($fields,
+			  $this->StatementEntry->chargePaymentFields());
+
+    return $fields;
+  }
+
+  function gridDataConditions(&$params, &$model) {
+    $conditions = parent::gridDataConditions($params, $model);
+    extract($params['post']['custom']);
+
+    if (!empty($from_date))
+      $conditions[]
+	= array('Transaction.stamp >=' =>
+		$this->StatementEntry->Transaction->dateFormatBeforeSave($from_date));
+
+    if (!empty($through_date))
+      $conditions[]
+	= array('Transaction.stamp <=' =>
+		$this->StatementEntry->Transaction->dateFormatBeforeSave($through_date . ' 23:59:59'));
+
+    if (isset($account_id))
+      $conditions[] = array('LedgerEntry.account_id' => $account_id);
+
+    if (isset($statement_entry_id)) {
+      $conditions[] = array('OR' =>
+			    array(array('ChargeEntry.id' => $statement_entry_id),
+				  array('PaymentEntry.id' => $statement_entry_id)));
+    }
+
+    return $conditions;
+  }
+
+  function gridDataPostProcessCalculatedFields(&$params, &$model, &$records) {
+    parent::gridDataPostProcessCalculatedFields($params, $model, $records);
+    foreach ($records AS &$record) {
+      if ($record['StatementEntry']['ledger_entry_count'] > 1)
+	$record['Account']['name'] = 'Multiple';
+    }
+  }
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['StatementEntry'] = array('id');
+    $links['Transaction']    = array('id');
+    $links['Account']        = array('name');
+    $links['Customer']       = array('name');
+    $links['Lease']          = array('number');
+    $links['Unit']           = array('name');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
+  }
+
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+    $order = parent::gridDataOrder($params, $model, $index, $direction);
+
+    // After sorting by whatever the user wants, add these
+    // defaults into the sort mechanism.  If we're already
+    // sorting by one of them, it will only be redundant,
+    // and should cause no harm (possible a longer query?)
+    $order[] = 'Transaction.stamp ' . $direction;
+    $order[] = 'StatementEntry.effective_date ' . $direction;
+    $order[] = 'StatementEntry.id ' . $direction;
+
+    return $order;
+  }
+
+  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(StatementFraction.amount,0))," .
+				"   SUM(COALESCE(ChargeEntry.amount,0)))" .
+				" AS 'applied'",
+
+				"StatementEntry.amount - (" .
+				"IF(StatementEntry.type = 'CHARGE'," .
+				"   SUM(COALESCE(PaymentEntry.amount,0))," .
+				"   SUM(COALESCE(ChargeEntry.amount,0)))" .
+				") AS 'balance'",
+				);
+
+      //pr(compact('tquery'));
+      $total = $model->find('first', $tquery);
+      $params['userdata']['total']   = $total[0]['applied'];
+      $params['userdata']['balance'] = $total[0]['balance'];
+    }
+    else {
+      $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);
+      $params['userdata']['total']   = $total[0]['total'];
+    }
+
+    return parent::gridDataRecordsExecute($params, $model, $query);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: reverse the ledger entry
+   */
+
+  function reverse($id) {
+    $this->StatementEntry->reverse($id);
+    $this->redirect(array('action'=>'view', $id));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific entry
+   */
+
+  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
+    }
+
+    // Get the StatementEntry and related fields
+    $this->StatementEntry->prClassLevel(30, 'Model');
+    $entry = $this->StatementEntry->find
+      ('first',
+       array('contain' => array
+	     ('Transaction' => array('fields' => array('id', 'stamp')),
+	      'Customer' => array('fields' => array('id', 'name')),
+	      'Lease' => array('fields' => array('id')),
+	      'LedgerEntry' => array('fields' => array('id'),
+				     'Account' => array('id', 'name', 'type')),
+	      ),
+
+	     'conditions' => array('StatementEntry.id' => $id),
+	     ));
+    pr($entry);
+    //die();
+
+    $reconciled = $this->StatementEntry->reconciledEntries($id);
+
+
+/*     // REVISIT <AP>: 20090711 */
+/*     //  It's not clear whether we should be able to reverse charges that have */
+/*     //  already been paid/cleared/reconciled.  Certainly, that will be the */
+/*     //  case when someone has pre-paid and then moves out early.  However, this */
+/*     //  will work well for items accidentally charged but not yet paid for. */
+/*     if ((!$entry['DebitLedger']['Account']['trackable'] || */
+/* 	 $stats['debit']['amount_reconciled'] == 0) && */
+/* 	(!$entry['CreditLedger']['Account']['trackable'] || */
+/* 	 $stats['credit']['amount_reconciled'] == 0) */
+
+/* 	&& 0 */
+
+/* 	) */
+/*       { */
+/* 	// Set up dynamic menu items */
+/* 	$this->sidemenu_links[] = */
+/* 	  array('name' => 'Operations', 'header' => true); */
+
+/* 	$this->sidemenu_links[] = */
+/* 	  array('name' => 'Undo', */
+/* 		'url' => array('action' => 'reverse', */
+/* 			       $id)); */
+/*       } */
+
+/*     if ($this->StatementEntry->Ledger->Account->type */
+/* 	($entry['CreditLedger']['Account']['id']) == 'INCOME') */
+/*       { */
+/* 	// Set up dynamic menu items */
+/* 	$this->sidemenu_links[] = */
+/* 	  array('name' => 'Operations', 'header' => true); */
+
+/* 	$this->sidemenu_links[] = */
+/* 	  array('name' => 'Reverse', */
+/* 		'url' => array('action' => 'reverse', */
+/* 			       $id)); */
+/*       } */
+
+    $stats = $this->StatementEntry->stats($id);
+
+    if (strtoupper($entry['StatementEntry']['type']) === 'CHARGE')
+      $stats = $stats['Charge'];
+    else
+      $stats = $stats['Payment'];
+
+    // Prepare to render.
+    $title = "Statement Entry #{$entry['StatementEntry']['id']}";
+    $this->set(compact('entry', 'title', 'reconciled', 'stats'));
+  }
+
+}

site/controllers/tenders_controller.php

@@ -0,0 +1,167 @@
+<?php
+
+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);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index / all
+   *  - Generate a listing of Tenders
+   */
+
+  function index()    { $this->all(); }
+  function all()      { $this->gridView('All Legal Tender', 'all'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
+   *    these virtual functions ensure that the correct data is passed
+   *    to jqGrid.
+   */
+
+  function gridDataTables(&$params, &$model) {
+    return array
+      ('link' =>
+       array('TenderType',
+	     'Customer',
+	     'LedgerEntry' =>
+	     array('Transaction',
+		   ),
+	     ),
+       );
+  }
+
+  function gridDataRecordsExecute(&$params, &$model, $query) {
+    $tquery = array_diff_key($query, array('fields'=>1,'group'=>1,'limit'=>1,'order'=>1));
+    $tquery['fields'] = array("SUM(COALESCE(LedgerEntry.amount,0)) AS 'total'");
+    $total = $model->find('first', $tquery);
+    $params['userdata']['total'] = $total[0]['total'];
+
+    return parent::gridDataRecordsExecute($params, $model, $query);
+  }
+
+  function gridDataPostProcessCalculatedFields(&$params, &$model, &$records) {
+    parent::gridDataPostProcessCalculatedFields($params, $model, $records);
+    foreach ($records AS &$record) {
+      // REVISIT <AP>: 20090730
+      //  We really need the grid to handle this.  We probably need to
+      //  either create a hidden column with the nsf id, or pass back
+      //  a list of nsf items as user data.  We can then add an onload
+      //  function to sweep through the nsf items and format them.
+      //  For now... this works.
+      if (!empty($record['Tender']['nsf_transaction_id']))
+	$record['Tender']['name'] =
+	  '<SPAN class="nsf-tender">' . $record['Tender']['name'] . '</SPAN>';
+    }
+  }
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['Tender']      = array('name', 'id');
+    $links['Customer']    = array('name');
+    $links['TenderType']  = array('name');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: deposit
+   *  - Prepares the books for a bank deposit
+   */
+
+  function deposit() {
+    // Prepare a close page...
+    $deposit_types = $this->Tender->TenderType->depositTypes(
+							     // Testing... limit to only one type
+							     //array('limit' => 1)
+							     );
+    $deposit_accounts = $this->Tender->TenderType->Account->depositAccounts();
+
+    foreach ($deposit_types AS $type_id => &$type)
+      $type = array('id' => $type_id,
+		    'name' => $type,
+		    'stats' => $this->Tender->TenderType->stats($type_id));
+
+    //pr(compact('deposit_types', 'deposit_accounts'));
+
+    $title = 'Prepare Deposit';
+    $this->set(compact('title', 'deposit_types', 'deposit_accounts'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: nsf
+   *  - Marks a tender as having insufficient funds.
+   */
+
+  function nsf($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    $this->Tender->nsf($id);
+    $this->redirect(array('action'=>'view', $id));
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific entry
+   */
+
+  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
+    }
+
+    // Get the Tender and related fields
+    $tender = $this->Tender->find
+      ('first', array
+       ('contain' => array('TenderType', 'Customer', 'LedgerEntry' => array('Transaction')),
+	));
+
+
+    if (!empty($tender['Tender']['deposit_transaction_id'])
+	&& empty($tender['Tender']['nsf_transaction_id'])
+	// Hard to tell what types of items can come back as NSF.
+	// For now, assume iff it is a named item, it can be NSF.
+	&& !empty($tender['TenderType']['data1_name'])
+	) {
+      // Set up dynamic menu items
+      $this->sidemenu_links[] =
+	array('name' => 'Operations', 'header' => true);
+
+      $this->sidemenu_links[] =
+	array('name' => 'NSF',
+	      'url' => array('action' => 'nsf',
+			     $id));
+    }
+
+    // Prepare to render.
+    $title = "Tender #{$tender['Tender']['id']}";
+    $this->set(compact('tender', 'title'));
+  }
+}

site/controllers/transactions_controller.php

@@ -0,0 +1,372 @@
+<?php
+
+class TransactionsController extends AppController {
+
+  var $components = array('RequestHandler');
+
+  var $sidemenu_links =
+    array(array('name' => 'Transactions', 'header' => true),
+	  array('name' => 'All',          'url' => array('controller' => 'transactions', 'action' => 'all')),
+	  array('name' => 'Invoices',     'url' => array('controller' => 'transactions', 'action' => 'invoice')),
+	  array('name' => 'Receipts',     'url' => array('controller' => 'transactions', 'action' => 'receipt')),
+	  array('name' => 'Deposits',     'url' => array('controller' => 'transactions', 'action' => 'deposit')),
+	  );
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: sideMenuLinks
+   *  - Generates controller specific links for the side menu
+   */
+  function sideMenuLinks() {
+    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+  }
+
+  
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index / all
+   *  - Generate a listing of transactions
+   */
+
+  function index()    { $this->all(); }
+  function all()      { $this->gridView('All Transactions', 'all'); }
+  function invoice()  { $this->gridView('Invoices'); }
+  function receipt()  { $this->gridView('Receipts'); }
+  function deposit()  { $this->gridView('Deposits'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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 parent::gridDataTables($params, $model);
+  }
+
+  function gridDataTables(&$params, &$model) {
+    $link = $this->gridDataCountTables($params, $model);
+    $link['link']['StatementEntry'] = array('fields' => array());
+    $link['link']['DepositTender'] = array('fields' => array());
+    return $link;
+  }
+
+  function gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+    //$fields[] = 'COUNT(StatementEntry.id) AS entries';
+    $fields[] = ("IF(Transaction.type = 'DEPOSIT'," .
+		 "   COUNT(DepositTender.id)," .
+		 "   COUNT(StatementEntry.id)) AS entries");
+    return $fields;
+  }
+
+  function gridDataConditions(&$params, &$model) {
+    $conditions = parent::gridDataConditions($params, $model);
+
+    if (in_array($params['action'], array('invoice', 'receipt', 'deposit')))
+      $conditions[] = array('Transaction.type' => strtoupper($params['action']));
+
+    return $conditions;
+  }
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['Transaction'] = array('id');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: postInvoice
+   *  - handles the creation of a charge invoice
+   */
+
+  function postInvoice() {
+    if (!$this->RequestHandler->isPost()) {
+      echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
+      return;
+    }
+
+    if (!$this->Transaction->addInvoice($this->data, null,
+					$this->data['Lease']['id'])) {
+      $this->Session->setFlash("INVOICE FAILED", true);
+      // REVISIT <AP> 20090706:
+      // Until we can work out the session problems,
+      // just die.
+      die("<H1>INVOICE FAILED</H1>");
+    }
+
+    $this->layout = null;
+    $this->autoLayout = false;
+    $this->autoRender = false; 
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: postReceipt
+   *  - handles the creation of a payment receipt
+   */
+
+  function postReceipt() {
+    if (!$this->RequestHandler->isPost()) {
+      echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
+      return;
+    }
+
+    foreach($this->data['Entry'] AS &$entry) {
+      $entry['Tender'] = $entry['type'][$entry['tender_type_id']];
+      unset($entry['type']);
+      unset($entry['tender_type_id']);
+    }
+
+    if (!$this->Transaction->addReceipt($this->data,
+					$this->data['Customer']['id'],
+					(isset($this->data['Lease']['id'])
+					 ? $this->data['Lease']['id']
+					 : null ))) {
+      $this->Session->setFlash("RECEIPT FAILED", true);
+      // REVISIT <AP> 20090706:
+      // Until we can work out the session problems,
+      // just die.
+      die("<H1>RECEIPT FAILED</H1>");
+    }
+
+    $this->layout = null;
+    $this->autoLayout = false;
+    $this->autoRender = false; 
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: postDeposit
+   *  - handles the creation of a deposit transaction
+   */
+
+  function postDeposit() {
+    if (!$this->RequestHandler->isPost()) {
+      echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
+      return;
+    }
+
+    //pr($this->data);
+
+    // Go through each type of tender presented to the user
+    // Determine which are to be deposited, and which are to
+    // have their corresponding account ledgers closed.
+    $deposit_tender_ids = array();
+    $deposit_type_ids = array();
+    $close_type_ids = array();
+    foreach ($this->data['TenderType'] AS $type_id => $type) {
+      $type['items'] = unserialize($type['items']);
+      if (empty($type['selection']) ||
+	  $type['selection'] === 'none' ||
+	  ($type['selection'] === 'subset' && count($type['items']) == 0))
+	continue;
+
+      // The deposit includes either the whole type, or just certain tenders
+      if ($type['selection'] === 'all')
+	$deposit_type_ids[] = $type_id;
+      else
+	$deposit_tender_ids = array_merge($deposit_tender_ids, $type['items']);
+
+      // Should we close the ledger for this tender type?
+      // First, the user would have to request that we do so,
+      // but additionally, we shouldn't close a ledger unless
+      // all the tenders are included in this deposit.  That
+      // doesn't guarantee that the ledger has a zero balance,
+      // but it does carry the balance forward, and a total
+      // deposit would imply a fresh start, so go for it.
+      if (!empty($type['close']) && $type['selection'] === 'all')
+	$close_type_ids[] = $type_id;
+    }
+
+    // Make sure we actually have something to deposit
+    if (empty($deposit_type_ids) && empty($deposit_tender_ids)) {
+      $this->Session->setFlash(__('Nothing to Deposit', true));
+      $this->redirect(array('controller' => 'tenders', 'action'=>'deposit'));
+    }
+
+    // Build up a set of conditions based on user selection
+    $deposit_conditions = array();
+    if (!empty($deposit_type_ids))
+      $deposit_conditions[] = array('TenderType.id' => $deposit_type_ids);
+    if (!empty($deposit_tender_ids))
+      $deposit_conditions[] = array('DepositTender.id' => $deposit_tender_ids);
+
+    // Add in confirmation that items have not already been deposited
+    $deposit_conditions =
+      array(array('DepositTender.deposit_transaction_id' => null),
+	    array('OR' => $deposit_conditions));
+
+    // Lookup the items to be deposited
+    $tenders = $this->Transaction->DepositTender->find
+      ('all',
+       array('contain' => array('TenderType', 'LedgerEntry'),
+	     'conditions' => $deposit_conditions,
+	     ));
+
+    // Build the deposit transaction
+    $deposit = array('Transaction' => array(), 'Entry' => array());
+    foreach ($tenders AS $tender) {
+      $deposit['Entry'][] =
+	array('tender_id'  => $tender['DepositTender']['id'],
+	      'account_id' => $tender['LedgerEntry']['account_id'],
+	      'amount'     => $tender['LedgerEntry']['amount'],
+	      );
+    }
+
+    //pr(compact('deposit_type_ids', 'deposit_tender_ids', 'close_type_ids', 'deposit_conditions', 'deposit'));
+
+    // OK, perform the deposit and associated accounting
+    $result = $this->Transaction->addDeposit
+      ($deposit, $this->data['Deposit']['Account']['id']);
+    //pr(compact('deposit', 'result'));
+
+    // Close any ledgers necessary
+    if (!empty($close_type_ids)) {
+      // Find the accounts associated with the types to close ...
+      $accounts = $this->Transaction->DepositTender->find
+	('all',
+	 array('contain' => array('TenderType.account_id'),
+	       'conditions' => array(array('TenderType.id' => $close_type_ids)),
+	       ));
+
+      // ... and close them
+      $this->Transaction->Account->closeCurrentLedgers
+	(array_map(create_function('$item', 'return $item["TenderType"]["account_id"];'), $accounts));
+    }
+    
+    // Look out for errors
+    if ($result['error']) {
+      $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',
+			  $result['transaction_id']));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific transaction
+   */
+
+  function view($id = null) {
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    $transaction = $this->Transaction->find
+      ('first',
+       array('contain' =>
+	     array(// Models
+		   'Account' =>
+		   array('fields' => array('Account.id',
+					   'Account.name'),
+			 ),
+
+		   'Ledger' =>
+		   array('fields' => array('Ledger.id',
+					   'Ledger.name'),
+			 ),
+		   ),
+	     'conditions' => array('Transaction.id' => $id),
+	     ));
+
+    if ($transaction['Transaction']['type'] === 'DEPOSIT') {
+      $this->sidemenu_links[] =
+	array('name' => 'Operations',    'header' => true);
+      $this->sidemenu_links[] =
+	array('name' => 'View Slip',  'url' => array('action' => 'deposit_slip', $id));
+    }
+
+    // OK, prepare to render.
+    $title = 'Transaction #' . $transaction['Transaction']['id'];
+    $this->set(compact('transaction', 'title'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: deposit_slip
+   *  - Special presentation 
+   *    Processes the user input and updates the database
+   */
+
+  function deposit_slip($id) {
+    // Build a container for the deposit slip data
+    $deposit = array('types' => array());
+
+    $this->id = $id;
+    $deposit +=
+      $this->Transaction->find('first', array('contain' => false));
+
+    // Get a summary of all forms of tender in the deposit
+    $result = $this->Transaction->find
+      ('all',
+       array('link' => array('DepositTender' =>
+			     array('fields' => array(),
+				   'TenderType',
+				   'LedgerEntry' =>
+				   array('fields' => array()))),
+	     'fields' => array(//'TenderType.id', 'TenderType.name',
+			       "COUNT(DepositTender.id) AS 'count'",
+			       "SUM(LedgerEntry.amount) AS 'total'"),
+	     //'conditions' => array(array('DepositTender.deposit_transaction_id' => $id)),
+	     'conditions' => array(array('Transaction.id' => $id)),
+	     'group' => 'TenderType.id',
+	     ));
+
+    if (empty($result)) {
+      die();
+      $this->Session->setFlash(__('Invalid Deposit.', true));
+      $this->redirect(array('action'=>'deposit'));
+    }
+
+    // Add the summary to our deposit slip data container
+    foreach ($result AS $type) {
+      $deposit['types'][$type['TenderType']['id']] =
+	$type['TenderType'] + $type[0];
+    }
+
+    // For each form of tender in the deposit, get the deposit items
+/*     foreach ($deposit['types'] AS $type_id => &$type) { */
+/*       $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)), */
+/* 	       )); */
+/*     } */
+
+    $this->sidemenu_links[] =
+      array('name' => 'Operations',    'header' => true);
+    $this->sidemenu_links[] =
+      array('name' => 'View Transaction',  'url' => array('action' => 'view', $id));
+
+    $title = 'Deposit Slip';
+    $this->set(compact('title', 'deposit'));
+    $this->render('deposit_slip');
+    return;
+  }
+
+}

site/controllers/units_controller.php

@@ -1,9 +1,6 @@
 <?php
 
 class UnitsController extends AppController {
-  var $paginate = array('limit' => 100,
-			'group' => 'Unit.id',
-			'order' => array('Unit.sort_order' => 'ASC'));
 
   var $sidemenu_links =
     array(array('name' => 'Units',        'header' => true),
@@ -28,114 +25,167 @@ class UnitsController extends AppController {
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * action: index
-   *  - Lists all units
+   * action: index / unavailable / vacant / occupied / all
+   *  - Generate a listing of units
    */
 
-  function index() {
-    $this->all();
+  function index()       { $this->all(); }
+  function unavailable() { $this->gridView('Unavailable Units'); }
+  function vacant()      { $this->gridView('Vacant Units'); }
+  function occupied()    { $this->gridView('Occupied Units'); }
+  function all()         { $this->gridView('All Units', 'all'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
+   *    these virtual functions ensure that the correct data is passed
+   *    to jqGrid.
+   */
+
+  function gridDataSetup(&$params) {
+    parent::gridDataSetup($params);
+    if (!isset($params['action']))
+      $params['action'] = 'all';
+  }
+
+  function gridDataCountTables(&$params, &$model) {
+    return array
+      ('link' => array('UnitSize'     => array('fields' => array('id', 'name')),
+		       'CurrentLease' => array('fields' => array('id'))));
+
+/*     if ($params['action'] === 'occupied') */
+/*       $link['Lease'] = array('fields' => array(), */
+/* 			     // Models */
+/* 			     'Contact' => array('fields' => array('display_name'), */
+/* 						//'type' => 'LEFT', */
+/* 						), */
+/* 			     ); */
+
+  }
+
+  function gridDataTables(&$params, &$model) {
+    $link = $this->gridDataCountTables($params, $model);
+    $link['link']['CurrentLease']['StatementEntry'] = array('fields' => array());
+    return $link;
+  }
+
+/*   function gridDataTables(&$params, &$model) { */
+/*     return array */
+/*       ('link' => array('Unit'     => array('fields' => array('Unit.id', 'Unit.name')), */
+/* 		       'Customer' => array('fields' => array('Customer.id', 'Customer.name')))); */
+/*   } */
+
+  function gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+
+    return array_merge($fields,
+		       $this->Unit->Lease->StatementEntry->chargePaymentFields(true));
+  }
+
+  function gridDataConditions(&$params, &$model) {
+    $conditions = parent::gridDataConditions($params, $model);
+
+    if ($params['action'] === 'unavailable') {
+      $conditions[] = $this->Unit->conditionUnavailable();
+    }
+    elseif ($params['action'] === 'vacant') {
+      $conditions[] = $this->Unit->conditionVacant();
+    }
+    elseif ($params['action'] === 'occupied') {
+      $conditions[] = $this->Unit->conditionOccupied();
+    }
+    elseif ($params['action'] === 'unoccupied') {
+      $conditions[] = array('NOT' => array($this->Unit->conditionOccupied()));
+    }
+
+    return $conditions;
+  }
+
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+    // Instead of sorting by name, sort by defined order
+    if ($index === 'Unit.name')
+      $index = 'Unit.sort_order';
+
+    $order = array();
+    $order[] = parent::gridDataOrder($params, $model, $index, $direction);
+
+    // If sorting by anything other than name (defined order)
+    // add the sort-order as a secondary condition
+    if ($index !== 'Unit.name')
+      $order[] = parent::gridDataOrder($params, $model,
+					 'Unit.sort_order', $direction);
+
+    return $order;
+  }
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['Unit'] = array('name');
+    $links['UnitSize'] = array('name');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * action: unavailable
-   *  - Lists unavailable units
+   * action: move_in
+   *  - Sets up the move-in page for the given unit.
    */
 
-  function unavailable() {
-    $this->paginate = array_merge
-      ($this->paginate,
-       array('link' =>
-	     array(// Models
-		   'UnitSize' => array('fields' => array('name')),
-		   ),
-	     'conditions' => $this->Unit->conditionUnavailable()
-	     ));
+  function move_in($id = null) {
+    $customer = array();
+    $unit = array();
 
-    $title = 'Unavailable Units';
-    $this->set('title', $title); $this->set('heading', $title);
-    $this->set('units', $this->paginate());
-    $this->render('index');
+    if (isset($id)) {
+      $this->Unit->recursive = -1;
+      $unit = current($this->Unit->read(null, $id));
+    }
+
+    $title = 'Unit Move-In';
+    $this->set(compact('customer', 'unit', 'title'));
+    $this->render('/leases/move');
   }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * action: vacant
-   *  - Lists vacant units
+   * action: move_out
+   *  - prepare or execute a move out on a specific lease
    */
 
-  function vacant() {
-    $this->paginate = array_merge
-      ($this->paginate,
-       array('link' =>
-	     array(// Models
-		   'UnitSize' => array('fields' => array('name')),
-		   ),
-	     'conditions' => $this->Unit->conditionVacant()
-	     ));
+  function move_out($id) {
 
-    $title = 'Vacant Units';
-    $this->set('title', $title); $this->set('heading', $title);
-    $this->set('units', $this->paginate());
-    $this->render('index');
-  }
+    $unit = $this->Unit->find
+      ('first', array
+       ('contain' => array
+	(// Models
+	 'CurrentLease' =>
+	 array(//'conditions' => array('Lease.moveout_date' => null),
+	       // Models
+	       'Customer' =>
+	       array('fields' => array('id', 'name'),
+		     ),
+	       ),
+	 ),
+	'conditions' => array('Unit.id' => $id),
+	));
+    $this->set('customer', $unit['CurrentLease']['Customer']);
+    $this->set('unit',     $unit['Unit']);
+    $this->set('lease',    $unit['CurrentLease']);
 
+    $redirect = array('controller' => 'units',
+		      'action' => 'view',
+		      $id);
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: occupied
-   *  - Lists occupied units
-   */
-
-  function occupied() {
-    $this->paginate = array_merge
-      ($this->paginate,
-       array('link' =>
-	     array(// Models
-		   'UnitSize' => array('fields' => array('name')),
-		   'Lease' =>    array('fields' => array(),
-
-				       // Models
-				       'Contact' => array('fields' => array('display_name'),
-							  //'type' => 'LEFT',
-							  ),
-				       ),
-		   ),
-	     'conditions' => $this->Unit->conditionOccupied()
-	     ));
-
-    $title = 'Occupied Units';
-    $this->set('title', $title); $this->set('heading', $title);
-    $this->set('units', $this->paginate());
-    $this->render('index');
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: all
-   *  - Lists all units
-   */
-
-  function all() {
-    $this->paginate = array_merge
-      ($this->paginate,
-       array('link' =>
-	     array(// Models
-		   'UnitSize' => array('fields' => array('name')),
-		   ),
-	     ));
-
-    $title = 'All Units';
-    $this->set('title', $title); $this->set('heading', $title);
-    $this->set('units', $this->paginate());
-    $this->render('index');
+    $title = ('Lease #' . $unit['CurrentLease']['number'] . ': ' .
+	      $unit['Unit']['name'] . ': ' .
+	      $unit['CurrentLease']['Customer']['name'] . ': Prepare Move-Out');
+    $this->set(compact('title', 'redirect'));
+    $this->render('/leases/move');
   }
 
 
@@ -152,58 +202,60 @@ class UnitsController extends AppController {
       $this->redirect(array('action'=>''));
     }
 
-    $this->Unit->Behaviors->attach('Containable');
-    $this->Unit->contain
-      (array(// Models
-	     'UnitSize',
-	     'Lease' =>
-	     array('order' => 'movein_date',
-		   'conditions' => array('Lease.lease_date IS NOT NULL',
-					 ),
-		   // Models
-		   'Contact' =>
-		   array(//'order'  => array('sort_order'),
-			 'fields' => array('id', 'display_name'),
-			 ),
-		   'Charge' =>
-		   array('order'  => array('charge_date'),
-			 // Models
-			 'ChargeType',
-			 'Receipt' => array(// Models
-					    'Payment'
-					    ),
-			 )
-		   )
-	     )
-       );
-    $unit = $this->Unit->read(null, $id);
-    //pr($unit);
+    $unit = $this->Unit->find
+      ('first',
+       array('contain' =>
+	     array(// Models
+		    'UnitSize',
+		    'Lease' => array('Customer'),
+		    'CurrentLease' => array('Customer')
+		   ),
+	     'conditions' => array('Unit.id' => $id),
+	     ));
 
-    $outstanding_deposit = 0;
-    $outstanding_balance = 0;
-    foreach($unit['Lease'] AS $lease) {
-      foreach($lease['Charge'] AS $charge) {
-	$outstanding_balance += $charge['total'];
-	foreach ($charge['Receipt'] AS $receipt) {
-	  $outstanding_balance -= $receipt['ChargesReceipt']['amount'];
-
-/* 	  foreach($receipt['Payment'] AS $payment) */
-/* 	    $outstanding_balance -= $payment['amount']; */
-
-	  // REVISIT <AP> 20090530:
-	  //   Using hardcoded value for security deposit...
-	  //   That can't be good!
-	  if ($charge['charge_type_id'] == 1)
-	    $outstanding_deposit += $receipt['ChargesReceipt']['amount'];
-	}
-      }
+    // Get the balance on each lease.
+    foreach ($unit['Lease'] AS &$lease) {
+      $stats = $this->Unit->Lease->stats($lease['id']);
+      $lease['balance'] = $stats['balance'];
     }
 
-    $this->sidemenu_links[] =
-      array('name' => 'Operations',       'header' => true);
-    $this->sidemenu_links[] =
-      array('name' => 'Move-Out',         'url' => array('controller' => 'units', 'action' => 'move-out'));
+    $outstanding_balance = 0;
+    $outstanding_deposit = 0;
+    if (isset($unit['CurrentLease']['id'])) {
+      // Figure out the outstanding balance of the current lease.
+      $stats = $this->Unit->stats($id);
+      $outstanding_balance =
+	$stats['CurrentLease']['balance'];
 
+      // Figure out the total security deposit for the current lease.
+      $deposits = $this->Unit->Lease->securityDeposits($unit['CurrentLease']['id']);
+      $outstanding_deposit = $this->Unit->Lease->securityDepositBalance($unit['CurrentLease']['id']);
+    }
+
+    // Set up dynamic menu items
+    $this->sidemenu_links[] =
+      array('name' => 'Operations', 'header' => true);
+
+    if (isset($unit['CurrentLease']['id']) &&
+	!isset($unit['CurrentLease']['moveout_date'])) {
+      $this->sidemenu_links[] =
+	array('name' => 'Move-Out', 'url' => array('action' => 'move_out',
+						   $id));
+    } else {
+      $this->sidemenu_links[] =
+	array('name' => 'Move-In', 'url' => array('action' => 'move_in',
+						   $id));
+    }
+
+    if (isset($unit['CurrentLease']['id']) &&
+	!isset($unit['CurrentLease']['close_date'])) {
+      $this->sidemenu_links[] =
+	array('name' => 'Payment', 'url' => array('controller' => 'customers',
+						  'action' => 'receipt',
+						  $unit['CurrentLease']['customer_id']));
+    }
+
+    // Prepare to render.
     $title = 'Unit ' . $unit['Unit']['name'];
     $this->set(compact('unit', 'title',
 		       'outstanding_balance',

site/models/account.php

@@ -1,29 +1,348 @@
 <?php
 class Account extends AppModel {
 
-	var $name = 'Account';
-	var $validate = array(
-		'id' => array('numeric'),
-		'name' => array('notempty'),
-		'external_name' => array('notempty')
+	var $hasOne = array(
+		'CurrentLedger' => array(
+			'className' => 'Ledger',
+			// REVISIT <AP> 20090702:
+			//   I would prefer this statement, which has no
+			//   engine specific code.  However, it doesn't
+			//   work with the Linkable behavior.  I need to
+			//   look into that, just not right now.
+			//'conditions' => array(array('CurrentLedger.close_transaction_id' => null)),
+			'conditions' => array('CurrentLedger.close_transaction_id IS NULL'),
+		),
 	);
 
-	//The Associations below have been created with all possible keys, those that are not needed can be removed
 	var $hasMany = array(
-		'ChargeType' => array(
-			'className' => 'ChargeType',
-			'foreignKey' => 'account_id',
-			'dependent' => false,
-			'conditions' => '',
-			'fields' => '',
-			'order' => '',
-			'limit' => '',
-			'offset' => '',
-			'exclusive' => '',
-			'finderQuery' => '',
-			'counterQuery' => ''
-		)
+		'Ledger',
+		'LedgerEntry',
 	);
 
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: type
+   *  - Returns the type of this account
+   */
+  function type($id) {
+    $this->cacheQueries = true;
+    $account = $this->find('first', array
+			   ('recursive' => -1,
+			    'fields' => array('type'),
+			    'conditions' => array(array('Account.id' => $id)),
+			    ));
+    $this->cacheQueries = false;
+
+    return $account['Account']['type'];
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: fundamentalType
+   *  - Returns the fundmental type of the account, credit or debit
+   */
+  function fundamentalType($id_or_type) {
+    if (is_numeric($id_or_type))
+      $type = $this->type($id_or_type);
+    else
+      $type = $id_or_type;
+
+    // Asset and Expense accounts are debit accounts
+    if (in_array(strtoupper($type), array('ASSET', 'EXPENSE')))
+      return 'debit';
+
+    // Otherwise, it's a credit account
+    return 'credit';
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: fundamentalOpposite
+   *  - Returns the opposite fundmental type of the account, credit or debit
+   */
+  function fundamentalOpposite($id_or_type) {
+    if (in_array(strtolower($id_or_type), array('credit', 'debit')))
+      $fund = $id_or_type;
+    else
+      $fund = $this->fundamentalType($id_or_type);
+
+    if (strtolower($fund) == 'debit')
+      return 'credit';
+
+    return 'debit';
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: name
+   *  - Returns the name of this account
+   */
+  function name($id) {
+    $this->cacheQueries = true;
+    $account = $this->find('first', array
+			   ('recursive' => -1,
+			    'fields' => array('name'),
+			    'conditions' => array(array('Account.id' => $id)),
+			    ));
+    $this->cacheQueries = false;
+
+    return $account['Account']['name'];
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: debitCreditFields
+   *  - Returns the fields necessary to determine whether the queried
+   *    entries are a debit, or a credit, and also the effect each have
+   *    on the overall balance of the account.
+   */
+
+  function debitCreditFields($sum = false, $balance = true,
+			     $entry_name = 'LedgerEntry', $account_name = 'Account') {
+    return $this->LedgerEntry->debitCreditFields
+      ($sum, $balance, $entry_name, $account_name);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: Account IDs
+   *  - Returns the ID of the desired account
+   */
+
+  function securityDepositAccountID()   { return $this->nameToID('Security Deposit'); }
+  function rentAccountID()              { return $this->nameToID('Rent'); }
+  function lateChargeAccountID()        { return $this->nameToID('Late Charge'); }
+  function nsfAccountID()               { return $this->nameToID('NSF'); }
+  function nsfChargeAccountID()         { return $this->nameToID('NSF Charge'); }
+  function taxAccountID()               { return $this->nameToID('Tax'); }
+  function accountReceivableAccountID() { return $this->nameToID('A/R'); }
+  function cashAccountID()              { return $this->nameToID('Cash'); }
+  function checkAccountID()             { return $this->nameToID('Check'); }
+  function moneyOrderAccountID()        { return $this->nameToID('Money Order'); }
+  function concessionAccountID()        { return $this->nameToID('Concession'); }
+  function pettyCashAccountID()         { return $this->nameToID('Petty Cash'); }
+  function invoiceAccountID()           { return $this->nameToID('Invoice'); }
+  function receiptAccountID()           { return $this->nameToID('Receipt'); }
+  function badDebtAccountID()           { return $this->nameToID('Bad Debt'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: fundamentalAccounts
+   *  - Returns an array of accounts by their fundamental type
+   */
+
+  function fundamentalAccounts($ftype) {
+    $this->cacheQueries = true;
+    $account = $this->find('all', array
+			   ('contain' => array('CurrentLedger'),
+			    'fields' => array('Account.id', 'Account.type', 'Account.name', 'CurrentLedger.id'),
+			    'conditions' => array('Account.type' => strtoupper($ftype))
+			    ));
+    $this->cacheQueries = false;
+
+    return $account;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: relatedAccounts
+   *  - Returns an array of accounts related by similar attributes
+   */
+
+  function relatedAccounts($attribute, $extra = null) {
+    $this->cacheQueries = true;
+    $accounts = $this->find('all', array
+			    ('contain' => array('CurrentLedger'),
+			     'fields' => array('Account.id', 'Account.type', 'Account.name', 'CurrentLedger.id'),
+			     'conditions' => array('Account.'.$attribute => true),
+			     'order' => array('Account.name'),
+			     ) + (isset($extra) ? $extra : array())
+			    );
+    $this->cacheQueries = false;
+
+    // Rearrange to be of the form (id => name)
+    $rel_accounts = array();
+    foreach ($accounts AS $acct) {
+      $rel_accounts[$acct['Account']['id']] = $acct['Account']['name'];
+    }
+
+    return $rel_accounts;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: xxxAccounts
+   *  - Returns an array of accounts suitable for activity xxx
+   */
+
+  function chargeAccounts() {
+    return $this->relatedAccounts('charges', array('order' => 'name'));
+  }
+
+  function paymentAccounts() {
+    return $this->relatedAccounts('payments', array('order' => 'name'));
+  }
+
+  function depositAccounts() {
+    return $this->relatedAccounts('deposits', array('order' => 'name'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: collectableAccounts
+   *  - Returns an array of accounts suitable to show income collection
+   */
+
+  function collectableAccounts() {
+    $accounts = $this->paymentAccounts();
+
+    foreach(array($this->nsfAccountID(),
+		  $this->securityDepositAccountID())
+	    AS $account_id) {
+      $accounts[$account_id] = $this->name($account_id);
+    }
+
+    return $accounts;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: currentLedgerID
+   *  - Returns the current ledger ID of the account
+   */
+  function currentLedgerID($id) {
+    $this->cacheQueries = true;
+    $item = $this->find('first', array
+			('contain' => 'CurrentLedger',
+			 'conditions' => array('Account.id' => $id),
+			 ));
+    $this->cacheQueries = false;
+    return $item['CurrentLedger']['id'];
+  }
+
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: ledgers
+   *  - Returns an array of ledger ids from the given account
+   */
+  function ledgers($id, $all = false) {
+    if ($all) {
+      $contain = array('Ledger' => array('fields' => array('Ledger.id')));
+    } else {
+      $contain = array('CurrentLedger' => array('fields' => array('CurrentLedger.id')));
+    }
+
+    $this->cacheQueries = true;
+    $account = $this->find('first', array
+			   ('contain' => $contain,
+			    'fields' => array(),
+			    'conditions' => array(array('Account.id' => $id)),
+			    ));
+    $this->cacheQueries = false;
+
+    if ($all) {
+      $ledger_ids = array();
+      foreach ($account['Ledger'] AS $ledger)
+	array_push($ledger_ids, $ledger['id']);
+    }
+    else {
+      $ledger_ids = array($account['CurrentLedger']['id']);
+    }
+
+/*     pr(array('function' => 'Account::ledgers', */
+/* 	     'args' => compact('id', 'all'), */
+/* 	     'return' => $ledger_ids)); */
+
+    return $ledger_ids;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: closeCurrentLedger
+   *  - Closes the current account ledger, and opens a new one
+   *    with the old balance carried forward.
+   */
+  function closeCurrentLedgers($ids = null) {
+
+    $this->cacheQueries = true;
+    $account = $this->find('all', array
+			   ('contain' => array('CurrentLedger.id'),
+			    'fields' => array(),
+			    'conditions' => (empty($ids)
+					     ? array()
+					     : array(array('Account.id' => $ids)))
+			    ));
+    $this->cacheQueries = false;
+    //pr(compact('id', 'account'));
+
+    $ledger_ids = array();
+    foreach ($account AS $acct)
+      $ledger_ids[] = $acct['CurrentLedger']['id'];
+
+    return $this->Ledger->closeLedgers($ledger_ids);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: ledgerEntries
+   *  - Returns an array of ledger entries that belong to the given
+   *    account, either just from the current ledger, or from all ledgers.
+   */
+  function ledgerEntries($id, $all = false, $cond = null, $link = null) {
+    $ledgers = $this->ledgers($id, $all);
+    return $this->Ledger->ledgerEntries($ledgers, $cond, $link);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: stats
+   *  - Returns summary data from the requested account.
+   */
+
+  function stats($id = null, $all = false, $query = null) {
+    if (!$id)
+      return null;
+
+    $this->queryInit($query);
+    $query['link'] = array('Account' => $query['link']);
+
+    foreach ($this->ledgers($id, $all) AS $ledger)
+      $this->statsMerge($stats['Ledger'],
+			$this->Ledger->stats($ledger, $query));
+
+    return $stats;
+  }
+
 }
 ?>

site/models/behaviors/linkable.php

@@ -28,6 +28,50 @@
  *  
  * @version 1.0; 
  */
+
+
+/**********************************************************************
+ * NOTE TO <AP> 20090615:
+ * This structure should be linkable (it was my test case).
+
+    $entry = $this->LedgerEntry->find
+      ('first',
+       array('link' => array('DebitLedger' =>
+			     array(
+				   'fields' => array('id'),
+				   'alias' => 'MyDebitLedger',
+				   'Account' =>
+				   array(
+					 'fields' => array('id'),
+					 'alias' => 'MyDebitAccount'),
+				   ),
+			     
+			     'MyCreditLedger' =>
+			     array(
+				   'fields' => array('id'),
+				   'class' => 'CreditLedger',
+				   'MyCreditAccount' =>
+				   array(
+					 'fields' => array('id'),
+					 'class' => 'Account'),
+				   ),
+
+			     'MyOtherLedger' =>
+			     array(
+				   'fields' => array('id'),
+				   'class' => 'Ledger',
+				   'alias' => 'AliasToMyOtherLedger',
+				   'Account' =>
+				   array(
+					 'fields' => array('id'),
+					 'alias' => 'AliasToMyOtherAccount'),
+				   ),
+			     ),
+
+	     'conditions' => array('LedgerEntry.id' => $id),
+	     ));
+**********************************************************************/
+
  
 class LinkableBehavior extends ModelBehavior {
 	
@@ -36,158 +80,407 @@ class LinkableBehavior extends ModelBehavior {
 	protected $_options = array(
 		'type' => true, 'table' => true, 'alias' => true, 'joins' => true,
 		'conditions' => true, 'fields' => true, 'reference' => true,
-		'class' => true, 'defaults' => true
+		'class' => true, 'defaults' => true, 'linkalias' => true,
 	);
 
 	protected $_defaults = array('type' => 'LEFT');
 	
-	public function beforeFind(&$Model, $query) {
-/* 	  pr("Linkable::beforeFind() begin"); pr($query); */
-		if (isset($query[$this->_key])) {
-			$optionsDefaults = $this->_defaults + array('reference' => $Model->alias, $this->_key => array());
-			$optionsKeys = $this->_options + array($this->_key => true);
-			if (!isset($query['fields']) || $query['fields'] === true) {
-			  //$query['fields'] = array_keys($Model->_schema);
-			  $query['fields'] = $Model->getDataSource()->fields($Model);
-			} elseif (!is_array($query['fields'])) {
-			  $query['fields'] = array($query['fields']);
-			}
-			$query = am(array('joins' => array()), $query, array('recursive' => -1));
-			$iterators[] = $query[$this->_key];
-			$cont = 0;
-			do {
-				$iterator = $iterators[$cont];
-				$defaults = $optionsDefaults;
-				if (isset($iterator['defaults'])) {
-					$defaults = array_merge($defaults, $iterator['defaults']);
-					unset($iterator['defaults']);
-				}
-				$iterations = Set::normalize($iterator);
-				foreach ($iterations as $alias => $options) {
-					if (is_null($options)) {
-						$options = array();
-					}
-					$options = am($defaults, compact('alias'), $options);
-					if (empty($options['alias'])) {
-						throw new InvalidArgumentException(sprintf('%s::%s must receive aliased links', get_class($this), __FUNCTION__));
-					}
+	function pr($lev, $mixed) {
+		if ($lev >= 3)
+			return;
 
-					if (empty($options['table']) && empty($options['class'])) {
-						$options['class'] = $options['alias'];
-					} elseif (!empty($options['table']) && empty($options['class'])) {
-						$options['class'] = Inflector::classify($options['table']);
-					}
-					$_Model =& ClassRegistry::init($options['class']);			// the incoming model to be linked in query
-					$Reference =& ClassRegistry::init($options['reference']); 	// the already in query model that links to $_Model
-/* 					pr("_Model: $options[class] : $_Model->name ($_Model->alias)"); */
-/* 					pr("Reference: $options[reference] : $Reference->name ($Reference->alias)"); */
-					$db =& $_Model->getDataSource();
-					$associations = $_Model->getAssociated();
-					if (isset($associations[$Reference->alias])) {
-						$type = $associations[$Reference->alias];
-						$association = $_Model->{$type}[$Reference->alias];
-					} else {
-						$_Model->bind($Reference->alias);
-						$type = 'belongsTo';
-						$association = $_Model->{$type}[$Reference->alias];
-						$_Model->unbindModel(array('belongsTo' => array($Reference->alias)));
-					}
+		pr($mixed);
+		return;
 
-					if (empty($options['conditions'])) {
-						if ($type === 'belongsTo') {
-							$modelKey = $_Model->escapeField($association['foreignKey']);
-							$referenceKey = $Reference->escapeField($Reference->primaryKey);
-							$options['conditions'] = "{$referenceKey} = {$modelKey}";
-						} elseif ($type === 'hasAndBelongsToMany') {
-							if (isset($association['with']))
-								$Link =& $_Model->{$association['with']};
-							else
-								$Link =& $_Model->{Inflector::classify($association['joinTable'])};
-
-							$linkAlias = $Link->alias;
-							//$linkAlias = $Link->alias . $options['alias'];
-
-							// Get the foreign key fields (for the link table) directly from
-							// the defined model associations, if they exists.  This is the
-							// users direct specification, and therefore definitive if present.
-							$modelLink = $Link->escapeField($association['foreignKey'], $linkAlias);
-							$referenceLink = $Link->escapeField($association['associationForeignKey'], $linkAlias);
-
-							// If we haven't figured out the foreign keys, see if there is a
-							// model for the link table, and if it has the appropriate
-							// associations with the two tables we're trying to join.
-							if (empty($modelLink) && isset($Link->belongsTo[$_Model->alias]))
-								$modelLink = $Link->escapeField($Link->belongsTo[$_Model->alias]['foreignKey'], $linkAlias);
-							if (empty($referenceLink) && isset($Link->belongsTo[$Reference->alias]))
-								$referenceLink = $Link->escapeField($Link->belongsTo[$Reference->alias]['foreignKey'], $linkAlias);
-
-							// We're running quite thin here.  None of the models spell
-							// out the appropriate linkages.  We'll have to SWAG it.
-							if (empty($modelLink))
-								$modelLink = $Link->escapeField(Inflector::underscore($_Model->alias) . '_id', $linkAlias);
-							if (empty($referenceLink))
-								$referenceLink = $Link->escapeField(Inflector::underscore($Reference->alias) . '_id', $linkAlias);
-
-							// Get the primary key from the tables we're joining.
-							$referenceKey = $Reference->escapeField();
-							$modelKey = $_Model->escapeField();
-								
-							// Join the linkage table to our model.  We'll use an inner join,
-							// as the whole purpose of the linkage table is to make this
-							// connection.  As we are embedding this join, the INNER will not
-							// cause any problem with the overall query, should the user not
-							// be concerned with whether or not the join has any results.
-							// They control that with the 'type' parameter which will be at
-							// the top level join.
-							$options['joins'][] = array('type' =>  'INNER',
-																 'alias' => $options['alias'],
-																 'conditions' => "{$modelKey} = {$modelLink}",
-																 'table' => $db->fullTableName($_Model, true));
-
-							// The user may have specified conditions directly in the model
-							// for this join.  Make sure to adhere to those conditions.
-							if (isset($association['conditions']) && is_array($association['conditions']))
-								$options['conditions'] = $association['conditions'];
-							elseif (!empty($association['conditions']))
-								$options['conditions'] = array($association['conditions']);
-
-							// Now for the top level join.  This will be added into the list
-							// of joins down below, outside of the HABTM specific code.
-							$options['alias'] = $linkAlias;
-							$options['table'] = $Link->getDataSource()->fullTableName($Link);
-							$options['conditions'][] = "{$referenceLink} = {$referenceKey}";
-						} else {
-							$referenceKey = $Reference->escapeField($association['foreignKey']);
-							$modelKey = $_Model->escapeField($_Model->primaryKey);
-							$options['conditions'] = "{$modelKey} = {$referenceKey}";	
-						}
-					}
-					if (empty($options['table'])) {
-						$options['table'] = $db->fullTableName($_Model, true);
-					}
-
-					if (!isset($options['fields']) || !is_array($options['fields']))
-					  $options['fields'] = $db->fields($_Model);
-					elseif (!empty($options['fields']))
-					  $options['fields'] = $db->fields($_Model, null, $options['fields']);
-					    
-					$query['fields'] = array_merge($query['fields'], $options['fields'],
-								       (empty($association['fields']) 
-									? array() : $db->fields($_Model, null, $association['fields'])));
-									       
-
-					$options[$this->_key] = am($options[$this->_key], array_diff_key($options, $optionsKeys));
-					$options = array_intersect_key($options, $optionsKeys);
-					if (!empty($options[$this->_key])) {
-						$iterators[] = $options[$this->_key] + array('defaults' => array_merge($defaults, array('reference' => $options['class'])));
-					}
-					$query['joins'][] = array_intersect_key($options, array('type' => true, 'alias' => true, 'table' => true, 'joins' => true, 'conditions' => true));
-				}
-				++$cont;
-				$notDone = isset($iterators[$cont]);
-			} while ($notDone);
+		$trace = debug_backtrace(false);
+		//array_shift($trace);
+		$calls = array();
+		foreach ($trace AS $call) {
+			$call = array_intersect_key($call,
+						    array('file'=>1,
+							  'line'=>1,
+							  //'class'=>1,
+							  'function'=>1,
+							  ));
+			$calls[] = implode("; ", $call);
 		}
-/* 		pr("Linkable::beforeFind() end"); pr($query); */
-		return $query;
+		pr(array('debug' => $mixed, 'stack' => $calls));
+	}
+
+	/*
+	 * This is a function for made recursive str_replaces in an array
+	 * NOTE: The palacement of this function is terrible, but I don't
+	 *       know if I really want to go down this path or not.
+	 */
+	function recursive_array_replace($find, $replace, &$data) {
+		if (!isset($data))
+			return;
+
+		if (is_array($data)) {
+			foreach ($data as $key => $value) {
+				if (is_array($value)) {
+					$this->recursive_array_replace($find, $replace, $data[$key]);
+				} else {
+					$data[$key] = str_replace($find, $replace, $value);
+				}
+			}
+		} else {
+			$data = str_replace($find, $replace, $data);
+		}
+	}
+
+	public function beforeFind(&$Model, $query) {
+		if (!isset($query[$this->_key]))
+			return $query;
+
+		if (!isset($query['fields']) || $query['fields'] === true) {
+			$query['fields'] = $Model->getDataSource()->fields($Model);
+		} elseif (!is_array($query['fields'])) {
+			$query['fields'] = array($query['fields']);
+		}
+		$query = am(array('joins' => array()), $query, array('recursive' => -1));
+
+		$reference = array('class' => $Model->alias,
+				   'alias' => $Model->alias,
+				   );
+
+		$result = array_diff_key($query, array($this->_key => 1));
+		$this->buildQuery($Model, $Model->alias, $Model->alias, $Model->findQueryType,
+				  $query[$this->_key], $result);
+		return $result;
+	}
+
+	function buildQuery(&$Reference, $referenceClass, $referenceAlias, $query_type, $links, &$result) {
+		if (empty($links))
+			return;
+
+		$this->pr(10,
+			  array('begin' => 'Linkable::buildQuery',
+				'args' => compact('referenceClass', 'referenceAlias', 'query_type', 'links'),
+				));
+
+		//$defaults = $this->_defaults;// + array($this->_key => array());
+		//$optionsKeys = $this->_options + array($this->_key => true);
+
+		$links = Set::normalize($links);
+		$this->pr(24,
+			  array('checkpoint' => 'Normalized links',
+				compact('links'),
+				));
+		foreach ($links as $alias => $options) {
+			if (is_null($options)) {
+				$options = array();
+			}
+			//$options = array_intersect_key($options, $optionsKeys);
+			//$options = am($this->_defaults, compact('alias'), $options);
+
+			$options += compact('alias');
+			$options += $this->_defaults;
+
+			if (empty($options['alias'])) {
+				throw new InvalidArgumentException(sprintf('%s::%s must receive aliased links', get_class($this), __FUNCTION__));
+			}
+
+			if (empty($options['class']))
+				$options['class'] = $alias;
+
+			if (!isset($options['conditions']))
+				$options['conditions'] = null;
+			elseif (!is_array($options['conditions']))
+				$options['conditions'] = array($options['conditions']);
+
+			$this->pr(20,
+				  array('checkpoint' => 'Begin Model Work',
+					compact('referenceAlias', 'alias', 'options'),
+					));
+
+			$modelClass     = $options['class'];
+			$modelAlias     = $options['alias'];
+			$Model =& ClassRegistry::init($modelClass);         // the incoming model to be linked in query
+
+			$this->pr(12,
+				  array('checkpoint' => 'Model Established',
+					'Reference' => ($referenceAlias .' : '. $referenceClass .
+							' ('. $Reference->alias .' : '. $Reference->name .')'),
+					'Model' => ($modelAlias .' : '. $modelClass .
+						    ' ('. $Model->alias .' : '. $Model->name .')'),
+					));
+
+			$db =& $Model->getDataSource();
+
+			$associatedThroughReference = 0;
+			$association = null;
+
+			// Figure out how these two models are related, creating
+			// a relationship if one doesn't otherwise already exists.
+			if (($associations = $Reference->getAssociated()) &&
+			    isset($associations[$Model->alias])) {
+				$this->pr(12, array('checkpoint' => "Reference ($referenceClass) defines association to Model ($modelClass)"));
+				$associatedThroughReference = 1;
+				$type = $associations[$Model->alias];
+				$association = $Reference->{$type}[$Model->alias];
+			}
+			elseif (($associations = $Model->getAssociated()) &&
+				isset($associations[$Reference->alias])) {
+				$this->pr(12, array('checkpoint' => "Model ($modelClass) defines association to Reference ($referenceClass)"));
+				$type = $associations[$Reference->alias];
+				$association = $Model->{$type}[$Reference->alias];
+			}
+			else {
+				// No relationship... make our best effort to create one.
+				$this->pr(12, array('checkpoint' => "No assocation between Reference ($referenceClass) and Model ($modelClass)"));
+				$type = 'belongsTo';
+				$Model->bind($Reference->alias);
+				// Grab the association now, since we'll unbind in a moment.
+				$association = $Model->{$type}[$Reference->alias];
+				$Model->unbindModel(array('belongsTo' => array($Reference->alias)));
+			}
+
+			// Determine which model holds the foreign key
+			if (($type === 'hasMany' || $type === 'hasOne') ^ $associatedThroughReference) {
+				$primaryAlias = $referenceAlias;
+				$foreignAlias = $modelAlias;
+				$primaryModel = $Reference;
+				$foreignModel = $Model;
+			} else {
+				$primaryAlias = $modelAlias;
+				$foreignAlias = $referenceAlias;
+				$primaryModel = $Model;
+				$foreignModel = $Reference;
+			}
+
+			if ($associatedThroughReference)
+				$associationAlias = $referenceAlias;
+			else
+				$associationAlias = $modelAlias;
+
+			$this->pr(30,
+				  array('checkpoint' => 'Options/Association pre-merge',
+					compact('association', 'options'),
+					));
+
+			// A couple exceptions before performing a union of
+			// options and association.  Namely, most fields result
+			// in either/or, but a couple should include BOTH the
+			// options AND the association settings.
+			foreach (array('fields', 'conditions') AS $fld) {
+				$this->pr(31,
+					  array('checkpoint' => 'Options/Associations field original',
+						compact('fld') +
+						array("options[$fld]" =>
+						      array('value' => array_key_exists($fld, $options) ? (isset($options[$fld]) ? $options[$fld] : '-null-') : '-unset-',
+							    'type' => array_key_exists($fld, $options) ? (isset($options[$fld]) ? gettype($options[$fld]) : '-null-') : '-unset-'),
+						      "association[$fld]" =>
+						      array('value' => array_key_exists($fld, $association) ? (isset($association[$fld]) ? $association[$fld] : '-null-') : '-unset-',
+							    'type' => array_key_exists($fld, $association) ? (isset($association[$fld]) ? gettype($association[$fld]) : '-null-') : '-unset-'),
+						      )));
+
+				if (!isset($options[$fld]) ||
+				    (empty($options[$fld]) && !is_array($options[$fld])))
+					unset($options[$fld]);
+				elseif (!empty($options[$fld]) && !is_array($options[$fld]))
+					$options[$fld] = array($options[$fld]);
+
+				if (!isset($association[$fld]) ||
+				    (empty($association[$fld]) && !is_array($association[$fld])))
+					unset($association[$fld]);
+				elseif (!empty($association[$fld]) && !is_array($association[$fld]))
+					$association[$fld] = array($association[$fld]);
+
+			
+				$this->pr(31,
+					  array('checkpoint' => 'Options/Associations field normalize',
+						compact('fld') +
+						array("options[$fld]" =>
+						      array('value' => array_key_exists($fld, $options) ? (isset($options[$fld]) ? $options[$fld] : '-null-') : '-unset-',
+							    'type' => array_key_exists($fld, $options) ? (isset($options[$fld]) ? gettype($options[$fld]) : '-null-') : '-unset-'),
+						      "association[$fld]" =>
+						      array('value' => array_key_exists($fld, $association) ? (isset($association[$fld]) ? $association[$fld] : '-null-') : '-unset-',
+							    'type' => array_key_exists($fld, $association) ? (isset($association[$fld]) ? gettype($association[$fld]) : '-null-') : '-unset-'),
+						      )));
+
+				if (isset($options[$fld]) && isset($association[$fld]))
+					$options[$fld] = array_merge($options[$fld],
+								     $association[$fld]);
+
+				$this->pr(31,
+					  array('checkpoint' => 'Options/Associations field merge complete',
+						compact('fld') +
+						array("options[$fld]" =>
+						      array('value' => array_key_exists($fld, $options) ? (isset($options[$fld]) ? $options[$fld] : '-null-') : '-unset-',
+							    'type' => array_key_exists($fld, $options) ? (isset($options[$fld]) ? gettype($options[$fld]) : '-null-') : '-unset-'),
+						      "association[$fld]" =>
+						      array('value' => array_key_exists($fld, $association) ? (isset($association[$fld]) ? $association[$fld] : '-null-') : '-unset-',
+							    'type' => array_key_exists($fld, $association) ? (isset($association[$fld]) ? gettype($association[$fld]) : '-null-') : '-unset-'),
+						      )));
+			}
+
+			$this->pr(30,
+				  array('checkpoint' => 'Options/Association post-merge',
+					compact('association', 'options'),
+					));
+
+			// For any option that's not already set, use
+			// whatever is specified by the assocation.
+			$options += array_intersect_key($association, $this->_options);
+
+			// Replace all instances of the MODEL_ALIAS variable
+			// tag with the correct model alias.
+			$this->recursive_array_replace("%{MODEL_ALIAS}",
+						       $associationAlias,
+						       $options['conditions']);
+
+			$this->pr(15,
+				  array('checkpoint' => 'Models Established - Check Associations',
+					'primaryModel' => $primaryAlias .' : '. $primaryModel->name,
+					'foreignModel' => $foreignAlias .' : '. $foreignModel->name,
+					compact('type', 'association', 'options'),
+					));
+
+			if ($type === 'hasAndBelongsToMany') {
+				if (isset($association['with']))
+					$linkClass = $association['with'];
+				else
+					$linkClass = Inflector::classify($association['joinTable']);
+
+				$Link =& $Model->{$linkClass};
+
+				if (isset($options['linkalias']))
+					$linkAlias = $options['linkalias'];
+				else
+					$linkAlias = $Link->alias;
+
+				// foreignKey and associationForeignKey can refer to either
+				// the model or the reference, depending on which class
+				// actually defines the association.  Make sure to we're
+				// using the foreign keys to point to the right class.
+				if ($associatedThroughReference) {
+					$modelAFK = 'associationForeignKey';
+					$referenceAFK = 'foreignKey';
+				} else {
+					$modelAFK = 'foreignKey';
+					$referenceAFK = 'associationForeignKey';
+				}
+
+				$this->pr(17,
+					  array('checkpoint' => 'Linking HABTM',
+						compact('linkClass', 'linkAlias',
+							'modelAFK', 'referenceAFK'),
+						));
+
+				// Get the foreign key fields (for the link table) directly from
+				// the defined model associations, if they exists.  This is the
+				// users direct specification, and therefore definitive if present.
+				$modelLink = $Link->escapeField($association[$modelAFK], $linkAlias);
+				$referenceLink = $Link->escapeField($association[$referenceAFK], $linkAlias);
+
+					// If we haven't figured out the foreign keys, see if there is a
+					// model for the link table, and if it has the appropriate
+					// associations with the two tables we're trying to join.
+					if (empty($modelLink) && isset($Link->belongsTo[$Model->alias]))
+						$modelLink = $Link->escapeField($Link->belongsTo[$Model->alias]['foreignKey'], $linkAlias);
+					if (empty($referenceLink) && isset($Link->belongsTo[$Reference->alias]))
+						$referenceLink = $Link->escapeField($Link->belongsTo[$Reference->alias]['foreignKey'], $linkAlias);
+
+					// We're running quite thin here.  None of the models spell
+					// out the appropriate linkages.  We'll have to SWAG it.
+					if (empty($modelLink))
+						$modelLink = $Link->escapeField(Inflector::underscore($Model->alias) . '_id', $linkAlias);
+					if (empty($referenceLink))
+						$referenceLink = $Link->escapeField(Inflector::underscore($Reference->alias) . '_id', $linkAlias);
+
+					// Get the primary key from the tables we're joining.
+					$referenceKey = $Reference->escapeField(null, $referenceAlias);
+					$modelKey = $Model->escapeField(null, $modelAlias);
+								
+					$this->pr(21,
+						  array('checkpoint' => 'HABTM links/keys',
+							array(compact('modelLink', 'modelKey'),
+							      compact('referenceLink', 'referenceKey')),
+							));
+
+					// Join the linkage table to our model.  We'll use an inner join,
+					// as the whole purpose of the linkage table is to make this
+					// connection.  As we are embedding this join, the INNER will not
+					// cause any problem with the overall query, should the user not
+					// be concerned with whether or not the join has any results.
+					// They control that with the 'type' parameter which will be at
+					// the top level join.
+					$options['joins'][] = array('type'  => 'INNER',
+								    'alias' => $modelAlias,
+								    'conditions' => "{$modelKey} = {$modelLink}",
+								    'table' => $db->fullTableName($Model, true));
+
+					// Now for the top level join.  This will be added into the list
+					// of joins down below, outside of the HABTM specific code.
+					$options['class'] = $linkClass;
+					$options['alias'] = $linkAlias;
+					$options['table'] = $Link->getDataSource()->fullTableName($Link);
+					$options['conditions'][] = "{$referenceLink} = {$referenceKey}";
+				}
+				elseif (isset($association['foreignKey']) && $association['foreignKey']) {
+					$foreignKey = $primaryModel->escapeField($association['foreignKey'], $primaryAlias);
+					$primaryKey = $foreignModel->escapeField($foreignModel->primaryKey, $foreignAlias);
+
+					$this->pr(17,
+						  array('checkpoint' => 'Linking due to foreignKey',
+							compact('foreignKey', 'primaryKey'),
+							));
+
+					// Only differentiating to help show the logical flow.
+					// Either way works and this test can be tossed out
+					if (($type === 'hasMany' || $type === 'hasOne') ^ $associatedThroughReference)
+						$options['conditions'][] = "{$primaryKey} = {$foreignKey}";
+					else
+						$options['conditions'][] = "{$foreignKey} = {$primaryKey}";
+				}
+				else {
+					$this->pr(17,
+						  array('checkpoint' => 'Linking with no logic (expecting user defined)',
+							));
+
+					// No Foreign Key... nothing we can do.
+				}
+
+				$this->pr(19,
+					  array('checkpoint' => 'Conditions',
+						array('options[conditions]' => $options['conditions'],
+						      ),
+						));
+
+				if (empty($options['table'])) {
+					$options['table'] = $db->fullTableName($Model, true);
+				}
+
+				if (!isset($options['fields']) || !is_array($options['fields']))
+					$options['fields'] = $db->fields($Model, $modelAlias);
+				elseif (!empty($options['fields']))
+					$options['fields'] = $db->fields($Model, $modelAlias, $options['fields']);
+
+				// When performing a count query, fields are useless.
+				// For everything else, we need to add them into the set.
+				if ($query_type !== 'count')
+					$result['fields']  = array_merge($result['fields'], $options['fields']);
+									       
+				$result['joins'][] = array_intersect_key($options,
+									 array('type' => true,
+									       'alias' => true,
+									       'table' => true,
+									       'joins' => true,
+									       'conditions' => true));
+
+				$sublinks = array_diff_key($options, $this->_options);
+				$this->buildQuery($Model, $modelClass, $modelAlias, $query_type, $sublinks, $result);
+
+				$this->pr(19,
+					  array('checkpoint' => 'Model Join Complete',
+						compact('referenceAlias', 'modelAlias', 'options', 'result'),
+						));
+			}
+
+		$this->pr(20,
+			  array('return' => 'Linkable::buildQuery',
+				compact('referenceAlias'),
+				));
 	}
 }

site/models/charge.php

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

site/models/charge_type.php

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

site/models/contact.php

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

site/models/contact_address.php

@@ -7,6 +7,13 @@ class ContactAddress extends AppModel {
 		'postcode' => array('postal')
 	);
 
+	var $hasMany = array(
+		'ContactsMethod' => array(
+			'foreignKey' => 'method_id',
+			'conditions' => "method = 'ADDRESS'",
+		)
+	);
+
 	var $hasAndBelongsToMany = array(
 		'Contact' => array(
 			'className' => 'Contact',
@@ -14,15 +21,26 @@ class ContactAddress extends AppModel {
 			'foreignKey' => 'method_id',
 			'associationForeignKey' => 'contact_id',
 			'unique' => true,
-			'conditions' => "method = 'POST'",
-			'fields' => '',
-			'order' => '',
-			'limit' => '',
-			'offset' => '',
-			'finderQuery' => '',
-			'deleteQuery' => '',
-			'insertQuery' => ''
+			'conditions' => "method = 'ADDRESS'",
 		)
 	);
+
+	function addressList() {
+		$results = $this->find('all',
+				       array('contain' => false,
+					     'fields' => array('id', 'address', 'city', 'state', 'postcode'),
+					     'order' => array('state', 'city', 'postcode', 'address')));
+
+		$list = array();
+		foreach ($results as $key => $val) {
+			$list[$val['ContactAddress']['id']]
+				= preg_replace("/\n/", ", ", $val['ContactAddress']['address'])
+				. ', ' . $val['ContactAddress']['city']
+				. ', ' . $val['ContactAddress']['state']
+				. ' ' . $val['ContactAddress']['postcode']
+				;
+		}
+		return $list;
+	}
 }
 ?>

site/models/contact_email.php

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

site/models/contact_phone.php

@@ -1,7 +1,6 @@
 <?php
 class ContactPhone extends AppModel {
 
-	var $name = 'ContactPhone';
 	var $validate = array(
 		'id' => array('numeric'),
 		//'type' => array('inlist'),
@@ -9,6 +8,13 @@ class ContactPhone extends AppModel {
 		'ext' => array('numeric')
 	);
 
+	var $hasMany = array(
+		'ContactsMethod' => array(
+			'foreignKey' => 'method_id',
+			'conditions' => "method = 'PHONE'",
+		)
+	);
+
 	var $hasAndBelongsToMany = array(
 		'Contact' => array(
 			'className' => 'Contact',
@@ -17,15 +23,24 @@ class ContactPhone extends AppModel {
 			'associationForeignKey' => 'contact_id',
 			'unique' => true,
 			'conditions' => "method = 'PHONE'",
-			'fields' => '',
-			'order' => '',
-			'limit' => '',
-			'offset' => '',
-			'finderQuery' => '',
-			'deleteQuery' => '',
-			'insertQuery' => ''
 		)
 	);
 
+	function phoneList() {
+		$results = $this->find('all',
+				       array('contain' => false,
+					     'fields' => array('id', 'phone', 'ext'),
+					     'order' => array('phone', 'ext')));
+
+		App::Import('Helper', 'Format');
+		$list = array();
+		foreach ($results as $key => $val) {
+			$list[$val['ContactPhone']['id']]
+				= FormatHelper::phone($val['ContactPhone']['phone'],
+						      $val['ContactPhone']['ext']);
+		}
+		return $list;
+	}
+
 }
 ?>

site/models/contacts_customer.php

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

site/models/contacts_method.php

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

site/models/customer.php

@@ -0,0 +1,363 @@
+<?php
+class Customer extends AppModel {
+
+	var $name = 'Customer';
+	var $validate = array(
+		'id' => array('numeric'),
+		'name' => array('notempty'),
+	);
+
+	var $belongsTo = array(
+		'PrimaryContact' => array(
+			'className' => 'Contact',
+		),
+	);
+
+	var $hasMany = array(
+		'CurrentLease' => array(
+			'className' => 'Lease',
+			'conditions' => 'CurrentLease.close_date IS NULL',
+		),
+		'Lease',
+		'StatementEntry',
+		'ContactsCustomer',
+
+		'Transaction',
+	);
+
+	var $hasAndBelongsToMany = array(
+		'Contact',
+	);
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: accountId
+   *  - Returns the account ID for the given customer
+   */
+  function accountId($id) {
+    $this->cacheQueries = true;
+    $customer = $this->find('first',
+			    array('contain' => false,
+				  'fields' => array('account_id'),
+				  'conditions' => array(array('Customer.id' => $id))));
+    $this->cacheQueries = false;
+
+    return $customer['Customer']['account_id'];
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: leaseIds
+   *  - Returns the lease IDs for the given customer
+   */
+  function leaseIds($id) {
+    $this->cacheQueries = true;
+    $customer = $this->find('first',
+			    array('contain' =>
+				  array('Lease' => array('fields' => array('id'))),
+				  'fields' => array(),
+				  'conditions' => array(array('Customer.id' => $id))));
+    $this->cacheQueries = false;
+
+    $ids = array();
+    foreach ($customer['Lease'] AS $lease)
+      $ids[] = $lease['id'];
+
+    return $ids;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: securityDeposits
+   *  - Returns an array of security deposit entries
+   */
+  function securityDeposits($id, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    $this->queryInit($query);
+
+    if (!isset($query['link']['Customer']))
+      $query['link']['Customer'] = array();
+    if (!isset($query['link']['Customer']['fields']))
+      $query['link']['Customer']['fields'] = array();
+
+    $query['conditions'][] = array('Customer.id' => $id);
+    $query['conditions'][] = array('StatementEntry.account_id' =>
+				   $this->StatementEntry->LedgerEntry->Account->securityDepositAccountID());
+
+    $set = $this->StatementEntry->reconciledSet('CHARGE', $query, false, true);
+    return $this->prReturn($set);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: securityDepositBalance
+   *  - Returns the balance of the customer security deposit(s)
+   */
+
+  function securityDepositBalance($id, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    $this->queryInit($query);
+
+    if (!isset($query['link']['Lease']))
+      $query['link']['Lease'] = array();
+    if (!isset($query['link']['Lease']['fields']))
+      $query['link']['Lease']['fields'] = array();
+
+    $query['conditions'][] = array('Lease.id' => $id);
+    $query['conditions'][] = array('StatementEntry.account_id' =>
+				   $this->StatementEntry->LedgerEntry->Account->securityDepositAccountID());
+
+    $stats = $this->StatementEntry->stats(null, $query);
+    $balance = $stats['Charge']['reconciled'] - $stats['Payment']['reconciled'];
+    return $this->prReturn($balance);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: unreconciledCharges
+   *  - Returns charges have not yet been fully paid
+   */
+
+  function unreconciledCharges($id, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    $this->queryInit($query);
+
+    if (!isset($query['link']['Customer']))
+      $query['link']['Customer'] = array();
+    if (!isset($query['link']['Customer']['fields']))
+      $query['link']['Customer']['fields'] = array();
+/*     if (!isset($query['link']['StatementEntry'])) */
+/*       $query['link']['StatementEntry'] = array(); */
+/*     if (!isset($query['link']['StatementEntry']['Customer'])) */
+/*       $query['link']['StatementEntry']['Customer'] = array(); */
+/*     if (!isset($query['link']['StatementEntry']['Customer']['fields'])) */
+/*       $query['link']['StatementEntry']['Customer']['fields'] = array(); */
+
+    $query['conditions'][] = array('Customer.id' => $id);
+
+    $set = $this->StatementEntry->reconciledSet('CHARGE', $query, true);
+    return $this->prReturn($set);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: excessPayments
+   *  - Returns payments which have not yet been fully utilized
+   */
+
+  function excessPayments($id, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    $this->queryInit($query);
+
+    if (!isset($query['link']['StatementEntry']))
+      $query['link']['StatementEntry'] = array();
+/*     if (!isset($query['link']['StatementEntry']['Customer'])) */
+/*       $query['link']['StatementEntry']['Customer'] = array(); */
+/*     if (!isset($query['link']['StatementEntry']['Customer']['fields'])) */
+/*       $query['link']['StatementEntry']['Customer']['fields'] = array(); */
+
+    $query['conditions'][] = array('Customer.id' => $id);
+
+    $set = $this->StatementEntry->reconciledSet('PAYMENT', $query, true);
+    return $this->prReturn($set);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: details
+   *  - Returns detail information for the customer
+   */
+
+  function details($id = null) {
+    $this->prEnter(compact('id'));
+
+    // Query the DB for need information.
+    $customer = $this->find
+      ('first', array
+       ('contain' => array
+	(// Models
+	 'Contact' =>
+	 array('order'  => array('Contact.display_name'),
+	       // Models
+	       'ContactPhone',
+	       'ContactEmail',
+	       'ContactAddress',
+	       ),
+	 'Lease' =>
+	 array('Unit' =>
+	       array('order'  => array('sort_order'),
+		     'fields' => array('id', 'name'),
+		     ),
+	       ),
+	 ),
+
+	'conditions' => array('Customer.id' => $id),
+	));
+
+    // Figure out the outstanding balance for this customer
+    $customer['stats'] = $this->stats($id);
+
+    // Figure out the total security deposit for the current lease.
+    $customer['deposits'] = $this->securityDeposits($id);
+
+    return $this->prReturn($customer);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: saveCustomer
+   *  - Saves the customer and related data
+   */
+
+  function saveCustomer($id, $data, $primary_contact_entry) {
+
+    // Go through each contact, and create new ones as needed
+    foreach ($data['Contact'] AS &$contact) {
+      if (isset($contact['id']))
+	continue;
+
+      $I = new Contact();
+      $I->create();
+      if (!$I->save($contact, false)) {
+	return false;
+      }
+      $contact['id'] = $I->id;
+    }
+
+    // Set the primary contact ID based on caller selection
+    $data['Customer']['primary_contact_id']
+      = $data['Contact'][$primary_contact_entry]['id'];
+
+    // Provide a default customer name if not specified
+    if (!$data['Customer']['name']) {
+      $this->Contact->recursive = -1;
+      $pcontact = $this->Contact->read(null, $data['Customer']['primary_contact_id']);
+      $data['Customer']['name'] = $pcontact['Contact']['display_name'];
+    }
+
+    // Save the customer data
+    $this->create();
+    if ($id)
+      $this->id = $id;
+    if (!$this->save($data, false)) {
+      return false;
+    }
+    $id = $this->id;
+
+    // Remove all associated Customer Contacts, as it ensures
+    // any entries deleted by the user actually get deleted
+    // in the system.  We'll recreate the needed ones anyway.
+    // REVISIT <AP>: 20090706
+    //  Appears that $this->save() is already doing the
+    //  delete.  I would have thought this would only happen
+    //  on a saveAll??
+/*     $this->ContactsCustomer->deleteAll */
+/*       (array('customer_id' => $id), false); */
+
+    // At this point, since we've saved data to customer,
+    // we'll proceed forward as much as possible, even
+    // if we encounter an error.  For now, we'll assume
+    // the operation will succeed.
+    $ret = true;
+
+    // Go through each entry of this customer method
+    foreach ($data['Contact'] AS &$contact) {
+      // Update the ContactsCustomer to reflect the appropriate IDs
+      $contact['ContactsCustomer']['customer_id'] = $id;
+      $contact['ContactsCustomer']['contact_id'] = $contact['id'];
+
+      // Save the relationship between customer and contact
+      $CM = new ContactsCustomer();
+      if (!$CM->save($contact['ContactsCustomer'], false)) {
+	$ret = false;
+      }
+    }
+
+    // Return the result
+    return $ret;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: stats
+   *  - Returns summary data from the requested customer.
+   */
+
+  function stats($id = null, $query = null) {
+    //$this->prFunctionLevel(20);
+    $this->prEnter(compact('id', 'query'));
+    if (!$id)
+      return $this->prExit(null);
+
+    $this->queryInit($query);
+
+    // REVISIT <AP>: 20090725
+    //   We'll need to go directly to the statement entries if
+    //   transactions are not always associated with the customer.
+    //   This could happen if either we remove the customer_id
+    //   field from Transaction, or we allow multiple customers
+    //   to be part of the same transaction (essentially making
+    //   the Transaction.customer_id meaningless).
+
+/*     $stats = $this->StatementEntry->find */
+/*       ('first', array */
+/*        ('contain' => false, */
+/* 	'fields' => $this->StatementEntry->chargePaymentFields(true), */
+/* 	'conditions' => array('StatementEntry.customer_id' => $id), */
+/* 	)); */
+
+    $find_stats = $this->StatementEntry->find
+      ('first', array
+       ('contain' => false,
+	'fields' => $this->StatementEntry->chargePaymentFields(true),
+	'conditions' => array('StatementEntry.customer_id' => $id),
+	));
+    $find_stats = $find_stats[0];
+    $this->pr(17, compact('find_stats'));
+
+    $tquery = $query;
+    $tquery['conditions'][] = array('StatementEntry.customer_id' => $id);
+    $statement_stats = $this->StatementEntry->stats(null, $tquery);
+    $statement_stats['balance'] = $statement_stats['Charge']['balance'];
+    $this->pr(17, compact('statement_stats'));
+
+    $tquery = $query;
+    //$tquery['conditions'][] = array('StatementEntry.customer_id' => $id);
+    $tquery['conditions'][] = array('Transaction.customer_id' => $id);
+    $transaction_stats = $this->Transaction->stats(null, $tquery);
+    $transaction_stats += $transaction_stats['StatementEntry'];
+    $this->pr(17, compact('transaction_stats'));
+
+    $tquery = $query;
+    //$tquery['conditions'][] = array('StatementEntry.customer_id' => $id);
+    $tquery['conditions'][] = array('Transaction.customer_id' => $id);
+    $ar_transaction_stats = $this->Transaction->stats(null, $tquery,
+						     $this->Transaction->Account->accountReceivableAccountID());
+    $ar_transaction_stats += $ar_transaction_stats['LedgerEntry'];
+    $this->pr(17, compact('ar_transaction_stats'));
+
+    //$stats = $ar_transaction_stats;
+    $stats = $find_stats;
+    return $this->prReturn($stats);
+  }
+
+}
+?>

site/models/double_entry.php

@@ -0,0 +1,96 @@
+<?php
+class DoubleEntry extends AppModel {
+
+	var $belongsTo = array(
+		'DebitEntry' => array(
+			'className' => 'LedgerEntry',
+		),
+		'CreditEntry' => array(
+			'className' => 'LedgerEntry',
+		),
+	);
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: verifyDoubleEntry
+   *  - Verifies consistenty of new double entry data
+   *    (not in a pre-existing double entry)
+   */
+  function verifyDoubleEntry($entry1, $entry2, $entry1_tender = null) {
+/*     pr(array("DoubleEntry::verifyDoubleEntry()" */
+/* 	     => compact('entry1', 'entry2', 'entry1_tender'))); */
+
+    $LE = new LedgerEntry();
+    if (!$LE->verifyLedgerEntry($entry1, $entry1_tender)) {
+/*       pr(array("DoubleEntry::verifyDoubleEntry()" */
+/* 	       => "Entry1 verification failed")); */
+      return false;
+    }
+    if (!$LE->verifyLedgerEntry($entry2)) {
+/*       pr(array("DoubleEntry::verifyDoubleEntry()" */
+/* 	       => "Entry2 verification failed")); */
+      return false;
+    }
+
+    if (!(($entry1['crdr'] === 'DEBIT' && $entry2['crdr'] === 'CREDIT') ||
+	  ($entry1['crdr'] === 'CREDIT' && $entry2['crdr'] === 'DEBIT')) ||
+	($entry1['amount'] != $entry2['amount'])) {
+/*       pr(array("DoubleEntry::verifyDoubleEntry()" */
+/* 	       => "Double Entry verification failed")); */
+      return false;
+    }
+
+    return true;
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addDoubleEntry
+   *  - Inserts new Double Entry into the database
+   */
+
+  function addDoubleEntry($entry1, $entry2, $entry1_tender = null) {
+/*     pr(array('DoubleEntry::addDoubleEntry' => */
+/* 	     compact('entry1', 'entry2', 'entry1_tender'))); */
+
+    $ret = array();
+    if (!$this->verifyDoubleEntry($entry1, $entry2, $entry1_tender))
+      return array('error' => true) + $ret;
+
+    // Since this model only relates to DebitEntry and CreditEntry...
+    $LE = new LedgerEntry();
+
+    // Add the first ledger entry to the database
+    $result = $LE->addLedgerEntry($entry1, $entry1_tender);
+    $ret['Entry1'] = $result;
+    if ($result['error'])
+      return array('error' => true) + $ret;
+    
+    // Add the second ledger entry to the database
+    $result = $LE->addLedgerEntry($entry2);
+    $ret['Entry2'] = $result;
+    if ($result['error'])
+      return array('error' => true) + $ret;
+
+    // Now link them as a double entry
+    $double_entry = array();
+    $double_entry['debit_entry_id'] = 
+      ($entry1['crdr'] === 'DEBIT') ? $ret['Entry1']['ledger_entry_id'] : $ret['Entry2']['ledger_entry_id'];
+    $double_entry['credit_entry_id'] = 
+      ($entry1['crdr'] === 'CREDIT') ? $ret['Entry1']['ledger_entry_id'] : $ret['Entry2']['ledger_entry_id'];
+
+/*     pr(array('DoubleEntry::addDoubleEntry' => */
+/* 	     array('checkpoint' => 'Pre-Save') */
+/* 	     + compact('double_entry'))); */
+
+    $this->create();
+    if (!$this->save($double_entry))
+      return array('error' => true) + $ret;
+
+    $ret['double_entry_id'] = $this->id;
+    return $ret + array('error' => false);
+  }
+}

site/models/lease.php

@@ -1,85 +1,527 @@
 <?php
 class Lease extends AppModel {
 
-	var $name = 'Lease';
-	var $validate = array(
-		'id' => array('numeric'),
-		'number' => array('alphanumeric'),
-		'lease_type_id' => array('numeric'),
-		'unit_id' => array('numeric'),
-		'late_schedule_id' => array('numeric'),
-		'lease_date' => array('date'),
-		'movein_planed_date' => array('date'),
-		'movein_date' => array('date'),
-		'moveout_date' => array('date'),
-		'moveout_planed_date' => array('date'),
-		'notice_given_date' => array('date'),
-		'notice_received_date' => array('date'),
-		'close_date' => array('date'),
-		'deposit' => array('money'),
-		'amount' => array('money'),
-		'next_amount' => array('money'),
-		'next_amount_date' => array('date')
-	);
-
-	//The Associations below have been created with all possible keys, those that are not needed can be removed
 	var $belongsTo = array(
-		'LeaseType' => array(
-			'className' => 'LeaseType',
-			'foreignKey' => 'lease_type_id',
-			'conditions' => '',
-			'fields' => '',
-			'order' => ''
-		),
-		'Unit' => array(
-			'className' => 'Unit',
-			'foreignKey' => 'unit_id',
-			'conditions' => '',
-			'fields' => '',
-			'order' => ''
-		),
-		'LateSchedule' => array(
-			'className' => 'LateSchedule',
-			'foreignKey' => 'late_schedule_id',
-			'conditions' => '',
-			'fields' => '',
-			'order' => ''
-		)
+		'LeaseType',
+		'Unit',
+		'Customer',
+		'LateSchedule',
 	);
 
 	var $hasMany = array(
-		'Charge' => array(
-			'className' => 'Charge',
-			'foreignKey' => 'lease_id',
-			'dependent' => false,
-			'conditions' => '',
-			'fields' => '',
-			'order' => '',
-			'limit' => '',
-			'offset' => '',
-			'exclusive' => '',
-			'finderQuery' => '',
-			'counterQuery' => ''
-		)
+		'StatementEntry',
 	);
 
-	var $hasAndBelongsToMany = array(
-		'Contact' => array(
-			'className' => 'Contact',
-			'joinTable' => 'contacts_leases',
-			'foreignKey' => 'lease_id',
-			'associationForeignKey' => 'contact_id',
-			'unique' => true,
-			'conditions' => '',
-			'fields' => '',
-			'order' => '',
-			'limit' => '',
-			'offset' => '',
-			'finderQuery' => '',
-			'deleteQuery' => '',
-			'insertQuery' => ''
-		)
-	);
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: securityDeposits
+   *  - Returns an array of security deposit entries
+   */
+  function securityDeposits($id, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    $this->queryInit($query);
+
+    if (!isset($query['link']['Lease']))
+      $query['link']['Lease'] = array();
+    if (!isset($query['link']['Lease']['fields']))
+      $query['link']['Lease']['fields'] = array();
+
+    $query['conditions'][] = array('Lease.id' => $id);
+    $query['conditions'][] = array('StatementEntry.account_id' =>
+				   $this->StatementEntry->LedgerEntry->Account->securityDepositAccountID());
+
+    $set = $this->StatementEntry->reconciledSet('CHARGE', $query, false, true);
+
+/*     $set['summary'] = array('total' => $set['summary']['Charge']['total'], */
+/* 			    'balance' => $set['summary']['Charge']['reconciled'], */
+/* 			    ); */
+
+    return $this->prReturn($set);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: securityDepositBalance
+   *  - Returns the balance of the lease security deposit(s)
+   */
+
+  function securityDepositBalance($id, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    $this->queryInit($query);
+
+    if (!isset($query['link']['Lease']))
+      $query['link']['Lease'] = array();
+    if (!isset($query['link']['Lease']['fields']))
+      $query['link']['Lease']['fields'] = array();
+
+    $query['conditions'][] = array('Lease.id' => $id);
+    $query['conditions'][] = array('StatementEntry.account_id' =>
+				   $this->StatementEntry->LedgerEntry->Account->securityDepositAccountID());
+
+    $stats = $this->StatementEntry->stats(null, $query);
+    $balance = $stats['Charge']['reconciled'] - $stats['Payment']['reconciled'];
+    return $this->prReturn($balance);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: releaseSecurityDeposits
+   *  - Releases all security deposits associated with this lease.
+   *    That simply makes a payment out of them, which can be used
+   *    to pay outstanding customer charges, or simply to become
+   *    a customer surplus (customer credit).
+   */
+  function releaseSecurityDeposits($id, $query = null) {
+    $this->prFunctionLevel(30);
+    $this->prEnter(compact('id', 'query'));
+
+    $secdeps = $this->securityDeposits($id, $query);
+    $secdeps = $secdeps['entries'];
+    $this->pr(20, compact('secdeps'));
+
+    $this->securityDepositBalance($id, $query);
+    die();
+    
+    // If there are no paid security deposits, then
+    // we can consider all security deposits released.
+    if (count($secdeps) == 0)
+      return $this->prReturn(true);
+
+    // Build a transaction
+    $release = array('Transaction' => array(), 'Entry' => array());
+    $release['Transaction']['comment'] = "Security Deposit Release";
+    foreach ($secdeps AS $charge) {
+      if ($charge['StatementEntry']['type'] !== 'CHARGE')
+	die("INTERNAL ERROR: SECURITY DEPOSIT IS NOT CHARGE");
+
+      // Since security deposits are being released, this also means
+      // we're reducing any oustanding amount on a security deposit
+      // since we no longer expect it to be owed.
+      // REVISIT <AP>: 20090730
+      //  This is kludgy, and I really don't like it.  However, this
+      //  is not presently something that even happens at the moment,
+      //  so this solution will have to work until we come up with
+      //  something more robust, like flagging those charges as defunct.
+      if ($charge['StatementEntry']['balance'] > 0) {
+	$this->StatementEntry->id = $charge['StatementEntry']['id'];
+	$this->StatementEntry->saveField('amount', $charge['StatementEntry']['reconciled']);
+      }
+
+      $release['Entry'][] =
+	array('amount'      => $charge['StatementEntry']['reconciled'],
+	      'account_id'  => $this->StatementEntry->LedgerEntry->Account->securityDepositAccountID(),
+	      'comment'     => "Released Security Deposit",
+	      );
+    }
+
+    $customer_id = $secdeps[0]['StatementEntry']['customer_id'];
+    $lease_id = $secdeps[0]['StatementEntry']['lease_id'];
+
+    $result = $this->StatementEntry->Transaction->addReceipt
+      ($release, $customer_id, $lease_id);
+
+    return $this->prReturn($result);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: rentLastCharges
+   *  - Returns a list of rent charges from this lease that
+   *    do not have sequential followup charges.  Under normal
+   *    circumstances, there would only be one entry, which is
+   *    the most recent rent charge.  However, it's possible
+   *    that there are several, indicating a problem with lease.
+   */
+
+  function rentLastCharges($id) {
+    $this->prEnter(compact('id'));
+    $rent_account_id = $this->StatementEntry->LedgerEntry->Account->rentAccountID();
+    $entries = $this->find
+      ('all',
+       array('link' =>
+	     array(// Models
+		   'StatementEntry',
+
+		   'SEx' =>
+		   array('class' => 'StatementEntry',
+			 'fields' => array(),
+			 'conditions' => array
+			 ('SEx.effective_date = DATE_ADD(StatementEntry.through_date, INTERVAL 1 day)',
+			  'SEx.lease_id = StatementEntry.lease_id',
+			  ),
+			 ),
+		   ),
+
+	     //'fields' => array('id', 'amount', 'effective_date', 'through_date'),
+	     'fields' => array(),
+	     'conditions' => array(array('Lease.id' => $id),
+				   array('StatementEntry.type' => 'CHARGE'),
+				   array('StatementEntry.account_id' => $rent_account_id),
+				   array('SEx.id' => null),
+				   ),
+	     )
+       );
+
+    return $this->prReturn($entries);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: rentChargeGaps
+   *  - Checks for gaps in rent charges
+   */
+
+  function rentChargeGaps($id) {
+    $this->prEnter(compact('id'));
+    $entries = $this->rentLastCharges($id);
+    if ($entries && count($entries) > 1)
+      return $this->prReturn(true);
+    return $this->prReturn(false);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: rentChargeThrough
+   *  - Determines the date that rent has been charged through
+   *    Returns one of:
+   *      null:   There are gaps in the charges
+   *      false:  There are not yet any charges
+   *      date:   The date rent has been charged through
+   */
+
+  function rentChargeThrough($id) {
+    $this->prEnter(compact('id'));
+    $entries = $this->rentLastCharges($id);
+    if (!$entries)
+      return $this->prReturn(false);
+    if (count($entries) != 1)
+      return $this->prReturn(null);
+    return $this->prReturn($entries[0]['StatementEntry']['through_date']);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: rentPaidThrough
+   *  - Determines the date of the first unpaid rent
+   */
+
+  function rentPaidThrough($id) {
+    $this->prEnter(compact('id'));
+    $rent_account_id = $this->StatementEntry->LedgerEntry->Account->rentAccountID();
+
+    // First, see if we can find any unpaid entries.  Of course,
+    // the first unpaid entry gives us a very direct indication
+    // of when the customer is paid up through, which is 1 day
+    // prior to the effective date of that first unpaid charge.
+    $rent = $this->StatementEntry->reconciledSet
+      ('CHARGE',
+       array('fields' =>
+	     array('StatementEntry.*',
+		   'DATE_SUB(StatementEntry.effective_date, INTERVAL 1 DAY) AS paid_through',
+		   ),
+
+	     'conditions' =>
+	     array(array('StatementEntry.lease_id' => $id),
+		   array('StatementEntry.account_id' => $rent_account_id)),
+
+	     'order' => array('StatementEntry.effective_date'),
+	     ),
+       true);
+    $this->pr(20, $rent, "Unpaid rent");
+
+    if ($rent['entries'])
+      return $this->prReturn($rent['entries'][0]['StatementEntry']['paid_through']);
+
+
+    // If we don't have any unpaid charges (great!), then the
+    // customer is paid up through the last day of the last
+    // charge.  So, search for paid charges, which already
+    // have the paid through date saved as part of the entry.
+    $rent = $this->StatementEntry->reconciledSet
+      ('CHARGE',
+       array('conditions' =>
+	     array(array('StatementEntry.lease_id' => $id),
+		   array('StatementEntry.account_id' => $rent_account_id)),
+
+	     'order' => array('StatementEntry.through_date DESC'),
+	     ),
+       false);
+    $this->pr(20, $rent, "Paid rent");
+
+    if ($rent['entries'])
+      return $this->prReturn($rent['entries'][0]['StatementEntry']['through_date']);
+
+
+    // After all that, having found that there are no unpaid
+    // charges, and in fact, no paid charges either, we cannot
+    // possibly say when the customer is paid through.
+    return $this->prReturn(null);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: moveIn
+   *  - Moves the specified customer into the specified lease
+   */
+
+  function moveIn($customer_id, $unit_id,
+		  $deposit = null, $rent = null,
+		  $stamp = null, $comment = null)
+  {
+    $this->prEnter(compact('customer_id', 'unit_id',
+			   'deposit', 'rent', 'stamp', 'comment'));
+
+    $lt = $this->LeaseType->find('first',
+				 array('conditions' =>
+				       array('code' => 'SL')));
+
+    // Use NOW if not given a movein date
+    if (!isset($stamp))
+      $stamp = date('Y-m-d G:i:s');
+
+    if (!$comment)
+      $comment = null;
+
+    if (!isset($deposit) || !isset($rent)) {
+      $rates = $this->Unit->find
+	('first',
+	 array('contain' =>
+	       array('UnitSize' =>
+		     array('deposit', 'rent'),
+		     ),
+	       'fields' => array('deposit', 'rent'),
+	       'conditions' => array('Unit.id' => $unit_id),
+	       ));
+
+      $deposit =
+	(isset($deposit)
+	 ? $deposit
+	 : (isset($rates['Unit']['deposit'])
+	    ? $rates['Unit']['deposit']
+	    : (isset($rates['UnitSize']['deposit'])
+	       ? $rates['UnitSize']['deposit']
+	       : 0)));
+
+      $rent =
+	(isset($rent)
+	 ? $rent
+	 : (isset($rates['Unit']['rent'])
+	    ? $rates['Unit']['rent']
+	    : (isset($rates['UnitSize']['rent'])
+	       ? $rates['UnitSize']['rent']
+	       : 0)));
+    }
+      
+
+    // Save this new lease.
+    $this->create();
+    if (!$this->save(array('lease_type_id' => $lt['LeaseType']['id'],
+			   'unit_id' => $unit_id,
+			   'customer_id' => $customer_id,
+			   'lease_date' => $stamp,
+			   'movein_date' => $stamp,
+			   'deposit' => $deposit,
+			   'rent' => $rent,
+			   'comment' => $comment), false)) {
+      return $this->prReturn(null);
+    }
+
+    // Set the lease number to be the same as the lease ID
+    $this->id;
+    $this->saveField('number', $this->id);
+		      
+    // Update the unit status
+    $this->Unit->updateStatus($unit_id, 'OCCUPIED');
+
+    // REVISIT <AP>: 20090702
+    //   We need to assess the security deposit charge,
+    //   and probably rent as well.  Rent, however, will
+    //   require user parameters to indicate whether it
+    //   was waived, pro-rated, etc.
+
+    // Return the new lease ID
+    return $this->prReturn($this->id);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: moveOut
+   *  - Moves the customer out of the specified lease
+   */
+
+  function moveOut($id, $status = 'VACANT',
+		   $stamp = null, $close = false)
+  {
+    $this->prEnter(compact('id', 'status', 'stamp', 'close'));
+
+    // Use NOW if not given a moveout date
+    if (!isset($stamp))
+      $stamp = date('Y-m-d G:i:s');
+
+    // Reset the data
+    $this->create();
+    $this->id = $id;
+
+    // Set the customer move-out date
+    $this->data['Lease']['moveout_date'] = $stamp;
+
+    // Save it!
+    $this->save($this->data, false);
+
+    // Close the lease, if so requested
+    if ($close)
+      $this->close($id, $stamp);
+
+    // Finally, update the unit status
+    $this->recursive = -1;
+    $this->read();
+    $this->Unit->updateStatus($this->data['Lease']['unit_id'], $status);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: close
+   *  - Closes the lease to further action
+   */
+
+  function close($id, $stamp = null) {
+    $this->prEnter(compact('id', 'stamp'));
+
+    if (!$this->closeable($id))
+      return $this->prReturn(false);
+
+    // Reset the data
+    $this->create();
+    $this->id = $id;
+
+    // Use NOW if not given a moveout date
+    if (!isset($stamp))
+      $stamp = date('Y-m-d G:i:s');
+
+    // Set the close date
+    $this->data['Lease']['close_date'] = $stamp;
+
+    // Save it!
+    $this->save($this->data, false);
+    return $this->prReturn(true);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: closeable
+   *  - Indicates whether or not the lease can be closed
+   */
+
+  function closeable($id) {
+    $this->prEnter(compact('id'));
+
+    $this->recursive = -1;
+    $this->read(null, $id);
+
+    // We can't close a lease that's still in use
+    if (!isset($this->data['Lease']['moveout_date']))
+      return $this->prReturn(false);
+
+    // We can't close a lease that's already closed
+    if (isset($this->data['Lease']['close_date']))
+      return $this->prReturn(false);
+
+    $deposit_balance = $this->securityDepositBalance($id);
+    $stats = $this->stats($id);
+
+    // A lease can only be closed if there are no outstanding
+    // security deposits, and if the account balance is zero.
+    if ($deposit_balance != 0)
+      return $this->prReturn(false);
+
+    // Apparently this lease meets all the criteria!
+    return $this->prReturn(true);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addCharge
+   *  - Adds an additional charge to the lease
+   */
+
+  function addCharge($id, $charge) {
+    
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: stats
+   *  - Returns summary data from the requested lease.
+   */
+
+  function stats($id = null, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    if (!$id)
+      return $this->prReturn(null);
+
+    $this->queryInit($query);
+
+    //$query['link'] = array('Lease' => $query['link']);
+/*     if (!isset($query['link']['StatementEntry'])) */
+/*       $query['link']['StatementEntry'] = array(); */
+/*     if (!isset($query['link']['StatementEntry']['ChargeEntry'])) */
+/*       $query['link']['StatementEntry']['ChargeEntry'] = array(); */
+
+/*     $query['link']['StatementEntry']['fields'] = array(); */
+/*     $query['link']['ChargeEntry']['fields'] = array(); */
+/*     $query['link']['ChargeEntry']['Account']['fields'] = array(); */
+/*     $query['link']['ChargeEntry']['StatementEntry']['fields'] = array(); */
+/*     $query['link']['ChargeEntry']['StatementEntry']['Invoice']['fields'] = array(); */
+
+    if (!isset($query['fields']))
+      $query['fields'] = array();
+
+    $query['fields'] = array_merge($query['fields'],
+				   $this->StatementEntry->chargePaymentFields(true));
+
+    $query['conditions'][] = array('StatementEntry.lease_id' => $id);
+
+    $query['group'] = null;
+
+    $stats = $this->StatementEntry->find('first', $query);
+    //$this->pr(20, compact('query', 'stats'));
+
+    // The fields are all tucked into the [0] index,
+    // and the rest of the array is useless (empty).
+    $stats = $stats[0];
+
+    // Make sure we have a non-null balance
+    if (!isset($stats['balance']))
+      $stats['balance'] = 0;
+
+    return $this->prReturn($stats);
+  }
 
 }
 ?>

site/models/lease_type.php

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

site/models/ledger.php

@@ -0,0 +1,179 @@
+<?php
+class Ledger extends AppModel {
+
+  var $belongsTo = array(
+    'Account',
+    'PriorLedger' => array('className' => 'Ledger'),
+    'CloseTransaction' => array('className' => 'Transaction'),
+  );
+
+  var $hasMany = array(
+    'Transaction',
+    'LedgerEntry',
+  );
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: accountID
+   *  - Returns the account ID for the given ledger
+   */
+  function accountID($id) {
+    $this->cacheQueries = true;
+    $item = $this->find('first', array
+			('link' => array('Account'),
+			 'conditions' => array('Ledger.id' => $id),
+			 ));
+    $this->cacheQueries = false;
+    //pr(compact('id', 'item'));
+    return $item['Account']['id'];
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: currentLedgerID
+   *  - Returns the current ledger ID of the account for the given ledger.
+   */
+  function currentLedgerID($id) {
+    return $this->Account->currentLedgerID($this->accountID($id));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: closeLedger
+   *  - Closes the current ledger, and returns a fresh one
+   */
+  function closeLedgers($ids) {
+    $ret = array('new_ledger_ids' => array());
+
+    $entries = array();
+    foreach ($ids AS $id) {
+      // Query stats to get the balance forward
+      $stats = $this->stats($id);
+
+      // Populate fields from the current ledger
+      $this->recursive = -1;
+      $this->id = $id;
+      $this->read();
+
+      // Build a new ledger to replace the current one
+      $this->data['Ledger']['id'] = null;
+      $this->data['Ledger']['close_transaction_id'] = null;
+      $this->data['Ledger']['prior_ledger_id'] = $id;
+      $this->data['Ledger']['comment'] = null;
+      ++$this->data['Ledger']['sequence'];
+      $this->data['Ledger']['name'] =
+	($this->data['Ledger']['account_id'] .
+	 '-' .
+	 $this->data['Ledger']['sequence']);
+
+      // Save the new ledger
+      $this->id = null;
+      if (!$this->save($this->data, false))
+	return array('error' => true, 'new_ledger_data' => $this->data) + $ret;
+      $ret['new_ledger_ids'][] = $this->id;
+
+      $entries[] = array('old_ledger_id' => $id,
+			 'new_ledger_id' => $this->id,
+			 'amount' => $stats['balance']);
+    }
+
+    // Perform the close
+    $result = $this->Transaction->addClose(array('Transaction' => array(),
+						 'Ledger' => $entries));
+    $ret['Transaction'] = $result;
+    if ($result['error'])
+      return array('error' => true) + $ret;
+
+    return $ret + array('error' => false);
+    }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: debitCreditFields
+   *  - Returns the fields necessary to determine whether the queried
+   *    entries are a debit, or a credit, and also the effect each have
+   *    on the overall balance of the ledger.
+   */
+  function debitCreditFields($sum = false, $balance = true,
+			     $entry_name = 'LedgerEntry', $account_name = 'Account') {
+    return $this->LedgerEntry->debitCreditFields
+      ($sum, $balance, $entry_name, $account_name);
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: ledgerEntries
+   *  - Returns an array of ledger entries that belong to a given
+   *    ledger. There is extra work done to establish debit/credit
+   */
+  function ledgerEntries($ids, $query = null) {
+    if (empty($ids))
+      return null;
+
+    $entries = $this->LedgerEntry->find
+      ('all', array
+       ('link' => array('Ledger' => array('Account')),
+	'fields' => array_merge(array("LedgerEntry.*"),
+				$this->LedgerEntry->debitCreditFields()),
+	'conditions' => array('LedgerEntry.ledger_id' => $ids),
+	));
+
+    //pr(compact('entries'));
+    return $entries;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: stats
+   *  - Returns summary data from the requested ledger.
+   */
+  function stats($id, $query = null) {
+    if (!$id)
+      return null;
+
+    $this->queryInit($query);
+
+    if (!isset($query['link']['Account']))
+      $query['link']['Account'] = array();
+    if (!isset($query['link']['Account']['fields']))
+      $query['link']['Account']['fields'] = array();
+    if (!isset($query['fields']))
+      $query['fields'] = array();
+
+    $query['fields'] = array_merge($query['fields'],
+				   $this->debitCreditFields(true));
+
+    $query['conditions'][] = array('LedgerEntry.ledger_id' => $id);
+    $query['group'][] = 'LedgerEntry.ledger_id';
+
+    $stats = $this->LedgerEntry->find('first', $query);
+
+    // The fields are all tucked into the [0] index,
+    // and the rest of the array is useless (empty).
+    $stats = $stats[0];
+
+    // Make sure we have a member for debit/credit
+    foreach(array('debits', 'credits') AS $crdr)
+      if (!isset($stats[$crdr]))
+	$stats[$crdr] = null;
+
+    // Make sure we have a non-null balance
+    if (!isset($stats['balance']))
+      $stats['balance'] = 0;
+
+    return $stats;
+  }
+
+}
+?>

site/models/ledger_entry.php

@@ -0,0 +1,215 @@
+<?php
+class LedgerEntry extends AppModel {
+
+	var $belongsTo = array(
+		'Transaction',
+		'Account',
+		'Ledger',
+	);
+
+	var $hasOne = array(
+		'Tender',
+		'DoubleEntry',
+	);
+
+	var $hasMany = array(
+	);
+
+	var $hasAndBelongsToMany = array(
+		// The Debit half of the double entry matching THIS Credit (if it is one)
+		'DebitEntry' => array(
+			'className' => 'LedgerEntry',
+			'joinTable' => 'double_entries',
+			'linkalias' => 'DDE',
+			'foreignKey' => 'credit_entry_id',
+			'associationForeignKey' => 'debit_entry_id',
+		),
+
+		// The Credit half of the double entry matching THIS Debit (if it is one)
+		'CreditEntry' => array(
+			'className' => 'LedgerEntry',
+			'joinTable' => 'double_entries',
+			'linkalias' => 'CDE',
+			'foreignKey' => 'debit_entry_id',
+			'associationForeignKey' => 'credit_entry_id',
+		),
+
+		// 
+		'StatementEntry' => array(
+			'joinTable' => 'statement_fractions',
+			'fields' => 'StatementFraction.amount',
+		),
+	);
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: debitCreditFields
+   *  - Returns the fields necessary to determine whether the queried
+   *    entries are a debit, or a credit, and also the effect each have
+   *    on the overall balance of the account/ledger.
+   */
+
+  function debitCreditFields($sum = false, $balance = true,
+			     $entry_name = 'LedgerEntry', $account_name = 'Account') {
+    $fields = array
+      (
+       ($sum ? 'SUM(' : '') .
+       "IF({$entry_name}.crdr = 'DEBIT'," .
+       "   {$entry_name}.amount, NULL)" .
+       ($sum ? ')' : '') . ' AS debit' . ($sum ? 's' : ''),
+
+       ($sum ? 'SUM(' : '') .
+       "IF({$entry_name}.crdr = 'CREDIT'," .
+       "   {$entry_name}.amount, NULL)" .
+       ($sum ? ')' : '') . ' AS credit' . ($sum ? 's' : ''),
+       );
+
+    if ($balance)
+      $fields[] = 
+	($sum ? 'SUM(' : '') .
+	"IF(${account_name}.type IN ('ASSET', 'EXPENSE')," .
+	"   IF({$entry_name}.crdr = 'DEBIT',  1, -1)," .
+	"   IF({$entry_name}.crdr = 'CREDIT', 1, -1))" .
+	" * IF({$entry_name}.amount, {$entry_name}.amount, 0)" .
+	($sum ? ')' : '') . ' AS balance';
+
+    if ($sum)
+      $fields[] = "COUNT({$entry_name}.id) AS entries";
+
+    return $fields;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: verifyLedgerEntry
+   *  - Verifies consistenty of new ledger entry data
+   *    (not in a pre-existing ledger entry)
+   */
+  function verifyLedgerEntry($entry, $tender = null) {
+/*     pr(array("LedgerEntry::verifyLedgerEntry()" */
+/* 	     => compact('entry', 'tender'))); */
+
+    if (empty($entry['account_id']) ||
+	empty($entry['crdr']) ||
+	empty($entry['amount'])
+	) {
+/*       pr(array("LedgerEntry::verifyLedgerEntry()" */
+/* 	       => "Entry verification failed")); */
+      return false;
+    }
+
+    if (isset($tender) && !$this->Tender->verifyTender($tender)) {
+/*       pr(array("LedgerEntry::verifyLedgerEntry()" */
+/* 	       => "Tender verification failed")); */
+      return false;
+    }
+
+    return true;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addLedgerEntry
+   *  - Inserts new Ledger Entry into the database
+   */
+  function addLedgerEntry($entry, $tender = null) {
+/*     pr(array('LedgerEntry::addLedgerEntry' => */
+/* 	     compact('entry', 'tender'))); */
+
+    $ret = array();
+    if (!$this->verifyLedgerEntry($entry, $tender))
+      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 array('error' => true) + $ret;
+
+    $ret['ledger_entry_id'] = $this->id;
+
+    if (isset($tender)) {
+      $tender['account_id'] = $entry['account_id'];
+      $tender['ledger_entry_id'] = $ret['ledger_entry_id'];
+      $result = $this->Tender->addTender($tender);
+      $ret['Tender'] = $result;
+      if ($result['error'])
+	return array('error' => true) + $ret;
+    }
+
+    return $ret + array('error' => false);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: stats
+   *  - Returns summary data from the requested ledger entry
+   */
+  function stats($id = null, $query = null, $set = null) {
+    $this->queryInit($query);
+    unset($query['group']);
+
+    if (!isset($query['link']['DoubleEntry']))
+      $query['link']['DoubleEntry'] = array();
+/*     if (!isset($query['link']['DoubleEntry']['fields'])) */
+/*       $query['link']['DoubleEntry']['fields'] = array(); */
+
+    if (isset($id))
+      $query['conditions'][] = array('Entry.id' => $id);
+
+    if (isset($set))
+      $set = strtoupper($set);
+
+    //pr(array('stats()', compact('id', 'query', 'set')));
+
+    $rtypes = array('charge', 'payment',
+		    // 'debit', 'credit',
+		    );
+
+    $stats = array();
+    foreach($rtypes AS $rtype) {
+      $Rtype = ucfirst($rtype);
+
+      if (($rtype == 'charge'  && (!isset($set) || $set == 'PAYMENT')) ||
+	  ($rtype == 'payment' && (!isset($set) || $set == 'CHARGE'))
+/* 	  ($rtype == 'debit'   && (!isset($set) || $set == 'CREDIT'))  || */
+/* 	  ($rtype == 'credit'  && (!isset($set) || $set == 'DEBIT')) */
+	  ) {
+
+	$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/map.php

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

site/models/payment.php

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

site/models/payment_type.php

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

site/models/receipt.php

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

site/models/site.php

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

site/models/site_area.php

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

site/models/statement_entry.php

@@ -0,0 +1,605 @@
+<?php
+class StatementEntry extends AppModel {
+
+	var $belongsTo = array(
+		'Transaction',
+		'Customer',
+		'Lease',
+
+		// The charge to which this payment applies (if it is one)
+		'ChargeEntry' => array(
+			'className' => 'StatementEntry',
+		),
+	);
+
+	var $hasMany = array(
+		// The payments that apply to this charge (if it is one)
+		'PaymentEntry' => array(
+			'className' => 'StatementEntry',
+			'foreignKey' => 'charge_entry_id',
+		),
+
+		'StatementFraction',
+	);
+
+	var $hasAndBelongsToMany = array(
+		'LedgerEntry' => array(
+			'joinTable' => 'statement_fractions',
+			//'fields' => 'StatementFraction.amount',
+		),
+	);
+
+	//var $default_log_level = 30;
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: chargePaymentFields
+   */
+
+
+  function chargePaymentFields($sum = false, $entry_name = 'StatementEntry') {
+    $fields = array
+      (
+       ($sum ? 'SUM(' : '') .
+       "IF({$entry_name}.type = 'CHARGE'," .
+       "   {$entry_name}.amount, NULL)" .
+       ($sum ? ')' : '') . ' AS charge' . ($sum ? 's' : ''),
+
+       ($sum ? 'SUM(' : '') .
+       "IF({$entry_name}.type = 'PAYMENT' OR {$entry_name}.type = 'SURPLUS'," .
+       "   {$entry_name}.amount, NULL)" .
+       ($sum ? ')' : '') . ' AS payment' . ($sum ? 's' : ''),
+
+       ($sum ? 'SUM(' : '') .
+       "IF({$entry_name}.type = 'CHARGE', 1," .
+       "   IF({$entry_name}.type = 'PAYMENT' OR {$entry_name}.type = 'SURPLUS', -1, 0))" .
+       " * IF({$entry_name}.amount, {$entry_name}.amount, 0)" .
+       ($sum ? ')' : '') . ' AS balance',
+       );
+
+    if ($sum)
+      $fields[] = "COUNT({$entry_name}.id) AS entries";
+
+    return $fields;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: verifyStatementEntry
+   *  - Verifies consistenty of new statement entry data
+   *    (not in a pre-existing statement entry)
+   */
+  function verifyStatementEntry($entry) {
+    $this->prFunctionLevel(30);
+    $this->prEnter(compact('entry'));
+
+    if (empty($entry['type']) ||
+	//empty($entry['effective_date']) ||
+	empty($entry['amount'])
+	) {
+      return $this->prReturn(false);
+    }
+
+    return $this->prReturn(true);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addStatementEntry
+   *  - Inserts new Statement Entry into the database
+   */
+  function addStatementEntry($entry) {
+    $this->prEnter(compact('entry'));
+
+    $ret = array();
+    if (!$this->verifyStatementEntry($entry))
+      return array('error' => true, 'verify_data' => $entry) + $ret;
+
+    $this->pr(20, array('checkpoint' => 'Pre-Save')
+	      + compact('entry'));
+
+    $this->create();
+    if (!$this->save($entry))
+      return array('error' => true, 'save_data' => $entry) + $ret;
+
+    foreach ($entry['Fraction'] AS $fraction) {
+      $fraction['statement_entry_id'] = $this->id;
+      $this->StatementFraction->id = null;
+      $this->StatementFraction->save($fraction);
+    }
+
+    $ret['statement_entry_id'] = $this->id;
+    return $this->prReturn($ret + array('error' => false));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: reverse
+   *  - Reverses the charges
+   *
+   * SAMPLE MOVE IN w/ PRE PAYMENT
+   * DEPOSIT   RENT      A/R    RECEIPT   CHECK    PETTY    BANK
+   * -------  -------  -------  -------  -------  -------  -------
+   *    |25      |      25|        |        |        |        |    
+   *    |        |20    20|        |        |        |        |    
+   *    |        |20    20|        |        |        |        |    
+   *    |        |20    20|        |        |        |        |    
+   *    |        |        |25    25|        |        |        |     
+   *    |        |        |20    20|        |        |        |     
+   *    |        |        |20    20|        |        |        |     
+   *    |        |        |20    20|        |        |        |     
+   *    |        |        |        |85    85|        |        |     
+   *    |        |        |        |        |85      |      85|     
+
+   * MOVE OUT and REFUND FINAL MONTH
+   * DEPOSIT   RENT      C/P    RECEIPT   CHECK    PETTY    BANK
+   * -------  -------  -------  -------  -------  -------  -------
+   *  25|        |        |25      |        |        |        |    t20   e20a
+   *    |      20|        |20      |        |        |        |    t20   e20b
+
+   * -ONE REFUND CHECK-
+   *    |        |      25|        |25      |        |        |    t30   e30a
+   *    |        |      20|        |20      |        |        |    t30   e30b
+   *    |        |        |      45|        |        |        |45  t40   e40
+   * -OR MULTIPLE-
+   *    |        |      15|        |15      |        |        |    t50a  e50a
+   *    |        |        |      15|        |        |15      |    t60a  e60a
+   *    |        |      30|        |30      |        |        |    t50b  e50b
+   *    |        |        |      30|        |        |        |30  t60b  e60b
+   *    |        |        |        |        |        |        |     
+
+
+OPTION 1
+   *    |-25     |     -25|        |        |        |        |     
+   *    |        |-20  -20|        |        |        |        |     
+   *    |        |        |-25  -25|        |        |        |     
+   *    |        |        |-20  -20|        |        |        |     
+
+OPTION 2
+   *    |-25     |        |     -25|        |        |        |     
+   *    |        |-20     |     -20|        |        |        |     
+   *    |        |        |        |-15     |     -15|        |    
+   *    |        |        |        |-30     |        |     -30|    
+   *    |        |        |        |        |        |        |     
+   *
+   */
+  function reverse($ledger_entries, $stamp = null) {
+    $this->prEnter(compact('ledger_entries', 'stamp'));
+
+    // If the user only wants to reverse one ID, we'll allow it
+    if (!is_array($ledger_entries))
+      $ledger_entries = $this->find
+	('all', array
+	 ('contain' => false,
+	  'conditions' => array('Entry.id' => $ledger_entries)));
+
+    $A = new Account();
+
+    $ar_account_id = $A->accountReceivableAccountID();
+    $receipt_account_id = $A->receiptAccountID();
+
+    $transaction_id = null;
+    foreach ($ledger_entries AS $entry) {
+      $entry = $entry['Entry'];
+      $amount = -1*$entry['amount'];
+
+      if (isset($entry['credit_account_id']))
+	$refund_account_id = $entry['credit_account_id'];
+      elseif (isset($entry['CreditLedger']['Account']['id']))
+	$refund_account_id = $entry['CreditLedger']['Account']['id'];
+      elseif (isset($entry['credit_ledger_id']))
+	$refund_account_id = $this->Ledger->accountID($entry['credit_ledger_id']);
+      else
+	return $this->prReturn(null);
+
+      // post new refund in the income account
+      $ids = $A->postEntry
+	(array('transaction_id' => $transaction_id),
+	 null,
+	 array('debit_ledger_id' => $A->currentLedgerID($ar_account_id),
+	       'credit_ledger_id' => $A->currentLedgerID($refund_account_id),
+	       'effective_date' => $entry['effective_date'],
+	       'through_date' => $entry['through_date'],
+	       'amount' => $amount,
+	       'lease_id' => $entry['lease_id'],
+	       'customer_id' => $entry['customer_id'],
+	       'comment' => "Refund; Entry #{$entry['id']}",
+	       ),
+	 array('debit'  => array
+	       (array('Entry' =>
+		      array('id' => $entry['id'],
+			    'amount' => $amount))),
+	       )
+	 );
+
+      if ($ids['error'])
+	return $this->prReturn(null);
+      $transaction_id = $ids['transaction_id'];
+
+      $this->pr(15, compact('ids', 'amount', 'refund_account_id', 'ar_account_id'),
+		'Posted Refund Ledger Entry');
+    }
+
+    return $this->prReturn(true);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: reconciledSet
+   *  - Returns the set of entries satisfying the given conditions,
+   *    along with any entries that they reconcile
+   */
+  function reconciledSetQuery($set, $query) {
+    $this->queryInit($query);
+
+    if ($set == 'CHARGE' || $set == 'PAYMENT')
+      $query['conditions'][] = array('StatementEntry.type' => $set);
+    else
+      die("INVALID RECONCILE SET");
+
+    if ($set == 'CHARGE')
+      $query['link']['PaymentEntry'] = array('fields' => array("SUM(PaymentEntry.amount) AS reconciled"));
+    if ($set == 'PAYMENT')
+      $query['link']['ChargeEntry'] = array('fields' => array("SUM(ChargeEntry.amount) AS reconciled"));
+
+    $query['group'] = 'StatementEntry.id';
+
+    // REVISIT: TESTING
+    //$query['link']['PaymentEntry'] = array('fields' => array("(`PaymentEntry.amount`+0) AS reconciled"));
+    //$query['group'] = null;
+    // END REVISIT
+
+    return $query;
+  }
+
+  function reconciledSet($set, $query = null, $unrec = false, $if_rec_include_partial = false) {
+    //$this->prFunctionLevel(16);
+    $this->prEnter(compact('set', 'query', 'unrec', 'if_rec_include_partial'));
+    $lquery = $this->reconciledSetQuery($set, $query);
+    $result = $this->find('all', $lquery);
+
+    $this->pr(20, compact('lquery', 'result'));
+
+    $resultset = array();
+    foreach ($result AS $i => $entry) {
+      $this->pr(25, compact('entry'));
+      if (!empty($entry[0]))
+	$entry['StatementEntry'] = $entry[0] + $entry['StatementEntry'];
+      unset($entry[0]);
+
+      $entry['StatementEntry']['balance'] =
+	$entry['StatementEntry']['amount'] - $entry['StatementEntry']['reconciled'];
+
+      // Since HAVING isn't a builtin feature of CakePHP,
+      // we'll have to post-process to get the desired entries
+
+      if ($entry['StatementEntry']['balance'] == 0)
+	$reconciled = true;
+      elseif ($entry['StatementEntry']['reconciled'] == 0)
+	$reconciled = false;
+      else // Partial payment; depends on unrec
+	$reconciled = (!$unrec && $if_rec_include_partial);
+
+      // Add to the set, if it's been requested
+      if ($reconciled == !$unrec)
+	$resultset[] = $entry;
+    }
+
+    return $this->prReturn(array('entries' => $resultset,
+			       'summary' => $this->stats(null, $query)));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: reconciledEntries
+   *  - Returns a list of entries that reconcile against the given entry.
+   *    (such as payments towards a charge).
+   */
+  function reconciledEntriesQuery($id, $query = null) {
+    $this->queryInit($query, false);
+
+    $this->id = $id;
+    $this->recursive = -1;
+    $this->read();
+
+    $query['conditions'][] = array('StatementEntry.id' => $id);
+
+    if ($this->data['StatementEntry']['type'] == 'CHARGE')
+      $query['link']['PaymentEntry'] = array();
+    if ($this->data['StatementEntry']['type'] == 'PAYMENT')
+      $query['link']['ChargeEntry'] = array();
+
+    return $query;
+  }
+
+  function reconciledEntries($id, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    $lquery = $this->reconciledEntriesQuery($id, $query);
+
+    $result = $this->find('all', $lquery);
+    foreach (array_keys($result) AS $i)
+      unset($result[$i]['StatementEntry']);
+
+    return $this->prReturn(array('entries' => $result));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: assignCredits
+   *  - Assigns all credits to existing charges
+   *
+   * REVISIT <AP>: 20090726
+   *  This algorithm shouldn't be hardcoded.  We need to allow
+   *  the user to specify how payments should be applied.
+   *
+   */
+  function assignCredits($query = null, $receipt_id = null) {
+    $this->prFunctionLevel(25);
+    $this->prEnter( compact('query', 'receipt_id'));
+    $this->queryInit($query);
+
+    $ret = array();
+
+    // First, find all known credits
+    $lquery = $query;
+    $lquery['conditions'][] = array('StatementEntry.type' => 'SURPLUS');
+    $lquery['order'][] = 'StatementEntry.effective_date ASC';
+    $credits = $this->find('all', $lquery);
+    $this->pr(18, compact('credits'),
+	      "Credits Established");
+
+    // Next, establish credit from the newly added receipt
+    $receipt_credit = null;
+    if (!empty($receipt_id)) {
+      $lquery = array
+	('contain' => array
+	 ('LedgerEntry' =>
+	  array('conditions' =>
+		//array(LedgerEntry.'crdr'=>'DEBIT'),
+		array('LedgerEntry.account_id !=' =>
+		      $this->LedgerEntry->Account->accountReceivableAccountID()),
+		),
+	  ),
+	 );
+
+      $this->Transaction->id = $receipt_id;
+      $receipt_credit = $this->Transaction->find('first', $lquery);
+      if (!$receipt_credit)
+	die("INTERNAL ERROR: UNABLE TO LOCATE RECEIPT");
+
+      $receipt_credit['balance'] = $receipt_credit['Transaction']['amount'];
+
+      $this->pr(18, compact('receipt_credit'),
+		"Receipt Credit Added");
+    }
+
+    // Now find all unpaid charges
+    $lquery = $query;
+    $lquery['order'] = 'StatementEntry.effective_date ASC';
+    $charges = $this->reconciledSet('CHARGE', $lquery, true);
+    $this->pr(18, compact('charges'),
+	      "Outstanding Charges Determined");
+
+    // Initialize our list of used credits
+    $used_credits = array();
+
+    // Work through all unpaid charges, applying payments as we go
+    foreach ($charges['entries'] 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 (count($credits) == 0 && empty($receipt_credit['balance'])) {
+	$this->pr(15, 'No more available credits');
+	break;
+      }
+
+      $charge['balance'] = $charge['StatementEntry']['balance'];
+      while ($charge['balance'] > 0 &&
+	     (count($credits) || !empty($receipt_credit['balance']))) {
+
+	$this->pr(20, compact('charge'),
+		  'Attempt Charge Reconciliation');
+
+	// Use explicit credits before using implicit credits
+	// (Not sure it matters though).
+	if (count($credits)) {
+	  // Peel off the first credit available
+	  $credit =& $credits[0];
+	  $payment_date = $credit['StatementEntry']['effective_date'];
+	  $payment_transaction_id = $credit['StatementEntry']['transaction_id'];
+	  $payment_account_id = $credit['StatementEntry']['account_id'];
+
+	  if (!isset($credit['balance']))
+	    $credit['balance'] = $credit['StatementEntry']['amount'];
+	}
+	elseif (!empty($receipt_credit['balance'])) {
+	  // Use our only receipt credit
+	  $credit =& $receipt_credit;
+	  $payment_date = $credit['Transaction']['stamp'];
+	  $payment_transaction_id = $credit['Transaction']['id'];
+	  $payment_account_id = $credit['LedgerEntry']['account_id'];
+	}
+	else {
+	  die("HOW DID WE GET HERE WITH NO SURPLUS?");
+	}
+
+	// Set the payment amount to the maximum amount
+	// possible without exceeding the charge or credit balance
+	$payment_amount = min($charge['balance'], $credit['balance']);
+	if (!isset($credit['applied']))
+	  $credit['applied'] = 0;
+
+	$credit['applied'] += $payment_amount;
+	$credit['balance'] -= $payment_amount;
+
+	$this->pr(20, compact('credit'),
+		  ($credit['balance'] > 0 ? 'Utilized' : 'Exhausted') .
+		  (count($credits) ? ' Credit' : ' Receipt'));
+
+	if ($credit['balance'] < 0)
+	  die("HOW DID WE END UP WITH NEGATIVE SURPLUS BALANCE?");
+
+	// If we've exhausted the credit, get it out of the
+	// available credit pool (but keep track of it for later).
+	if ($credit['balance'] <= 0 && count($credits))
+	  $used_credits[] = array_shift($credits);
+
+	// Add a payment that uses the available credit to pay the charge
+	$payment = array('type' => 'PAYMENT',
+			 'account_id' => $payment_account_id,
+			 'amount'     => $payment_amount,
+			 'effective_date' => $payment_date,
+			 'transaction_id' => $payment_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('payment'),
+		  'New Payment Entry');
+
+	$result = $this->addStatementEntry($payment);
+	$ret['Payment'][] = $result;
+	if ($result['error'])
+	  $ret['error'] = true;
+
+	// Adjust the charge balance to reflect the new payment
+	$charge['balance'] -= $payment_amount;
+	if ($charge['balance'] < 0)
+	  die("HOW DID WE GET A NEGATIVE CHARGE AMOUNT?");
+
+	if ($charge['balance'] <= 0)
+	  $this->pr(20, 'Fully Paid Charge');
+      }
+
+    }
+
+    // Partially used credits must be added to the used list
+    if (isset($credits[0]['applied']))
+      $used_credits[] = array_shift($credits);
+      
+    $this->pr(18, compact('credits', 'used_credits', 'receipt_credit'),
+	      'Payments added');
+
+    // Clean up any explicit credits that have been used
+    foreach ($used_credits AS $credit) {
+      if ($credit['balance'] > 0) {
+	$this->pr(20, compact('credit'),
+		  'Update Credit Entry');
+
+ 	$this->id = $credit['StatementEntry']['id'];
+	$this->saveField('amount', $credit['balance']);
+      }
+      else {
+	$this->pr(20, compact('credit'),
+		  'Delete Exhausted Credit Entry');
+
+	$this->del($credit['StatementEntry']['id'], false);
+      }
+    }
+
+    // Convert non-exhausted receipt credit to an explicit one
+    if (!empty($receipt_credit['balance'])) {
+      $credit =& $receipt_credit;
+
+      $this->pr(18, compact('credit'),
+		'Create Explicit Credit');
+
+      $result = $this->addStatementEntry
+	(array('type'           => 'SURPLUS',
+	       'account_id'     => $credit['LedgerEntry']['account_id'],
+	       'amount'         => $credit['balance'],
+	       'effective_date' => $credit['Transaction']['stamp'],
+	       'transaction_id' => $credit['Transaction']['id'],
+	       'customer_id'    => $credit['Customer']['id'],
+	       ));
+      $ret['Credit'] = $result;
+      if ($result['error'])
+	$ret['error'] = true;
+    }
+
+    return $this->prReturn($ret + array('error' => false));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: stats
+   *  - Returns summary data from the requested statement entry
+   */
+  function stats($id = null, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+
+    $this->queryInit($query);
+    unset($query['group']);
+
+    $stats = array();
+    if (isset($id))
+      $query['conditions'][] = array('StatementEntry.id' => $id);
+
+    $rquery = $query;
+    unset($rquery['link']['ChargeEntry']);
+    $rquery['link']['PaymentEntry'] = array('fields' => array());
+
+    $rquery['fields'] = array();
+    $rquery['fields'][] = "StatementEntry.amount";
+    $rquery['fields'][] = "SUM(PaymentEntry.amount) AS reconciled";
+
+    $rquery['conditions'][] = array('StatementEntry.type' => 'CHARGE');
+    $rquery['group'] = 'StatementEntry.id';
+
+    $result = $this->find('all', $rquery);
+    $stats['Charge'] = array('total' => 0, 'reconciled' => 0);
+    foreach($result AS $charge) {
+      $stats['Charge']['total'] += $charge['StatementEntry']['amount'];
+      $stats['Charge']['reconciled'] += $charge[0]['reconciled'];
+    }
+    $stats['Charge']['balance'] = 
+      $stats['Charge']['total'] - $stats['Charge']['reconciled'];
+    
+    $this->pr(17, compact('query', 'result'),
+	      'Charges');
+
+    $rquery = $query;
+    unset($rquery['link']['PaymentEntry']);
+    $rquery['link']['ChargeEntry'] = array('fields' => array());
+
+    $rquery['fields'] = array();
+    $rquery['fields'][] = "SUM(StatementEntry.amount) AS total";
+    $rquery['fields'][] = "SUM(IF(ChargeEntry.id IS NULL, 0, StatementEntry.amount)) AS reconciled";
+    $rquery['fields'][] = "SUM(IF(ChargeEntry.id IS NULL, StatementEntry.amount, 0)) AS balance";
+
+    $rquery['conditions'][] = array('StatementEntry.type' => 'PAYMENT');
+    $result = $this->find('first', $rquery);
+    if (!isset($result[0]['balance']))
+      $result[0]['balance'] = 0;
+    $stats['Payment'] = $result[0];
+
+    $this->pr(17, compact('rquery', 'result'),
+	      'Payments');
+
+    return $this->prReturn($stats);
+  }
+
+}

site/models/statement_fraction.php

@@ -0,0 +1,9 @@
+<?php
+class StatementFraction extends AppModel {
+
+	var $belongsTo = array(
+		'StatementEntry',
+		'LedgerEntry',
+	);
+
+}

site/models/tender.php

@@ -0,0 +1,145 @@
+<?php
+class Tender extends AppModel {
+
+	var $belongsTo = array(
+		'TenderType',
+		'Customer',
+		'LedgerEntry',
+		'DepositTransaction' => array(
+			'className' => 'Transaction',
+		),
+		'NsfTransaction' => array(
+			'className' => 'Transaction',
+		),
+	);
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: verifyTender
+   *  - Verifies consistenty of new tender data
+   *    (not in a pre-existing tender)
+   */
+  function verifyTender($tender) {
+    $this->prFunctionLevel(10);
+    $this->prEnter(compact('tender'));
+
+    if (empty($tender['tender_type_id'])) {
+      return $this->prReturn(false);
+    }
+
+    return $this->prReturn(true);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addTender
+   *  - Inserts new Tender into the database
+   */
+
+  function addTender($tender) {
+    $this->prEnter(compact('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);
+
+    $ret['tender_id'] = $this->id;
+    return $this->prReturn($ret + array('error' => false));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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 Payment SE of Tx:
+   *     - Add new StatementEntry (S1n); T1; PAYMENT; -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) {
+    $this->prFunctionLevel(30);
+    $this->prEnter(compact('id'));
+
+    // Get information about this NSF item.
+    $this->id = $id;
+    $tender = $this->find
+      ('first', array
+       ('contain' =>
+	array('LedgerEntry',
+	      'DepositTransaction',
+	      'NsfTransaction'),
+	));
+    $this->pr(20, compact('tender'));
+
+    if (!empty($tender['NsfTransaction']['id']))
+      die("Item has already been set as NSF");
+
+    if (empty($tender['DepositTransaction']['id']))
+      die("Item has not been deposited yet");
+
+    $tender['Transaction'] = $tender['DepositTransaction'];
+    unset($tender['DepositTransaction']);
+    unset($tender['NsfTransaction']);
+
+    $T = new Transaction();
+    $result = $T->addNsf($tender, $stamp);
+    if ($result['error'])
+      return $this->prReturn(false);
+
+    // 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/tender_type.php

@@ -0,0 +1,115 @@
+<?php
+class TenderType extends AppModel {
+
+	var $belongsTo = array(
+		'Account',
+	);
+
+	var $hasMany = array(
+		'Tender',
+	);
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: accountID
+   *  - Returns the intended account ID for receipt of the given tender
+   */
+
+  function accountID($id) {
+    $this->cacheQueries = true;
+    $item = $this->find('first', array
+			('contain' => false,
+			 'conditions' => array('TenderType.id' => $id),
+			 ));
+    $this->cacheQueries = false;
+    return $item['TenderType']['account_id'];
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: paymentTypes
+   *  - Returns an array of types that can be used for payments
+   */
+
+  function paymentTypes($query = null) {
+    $this->queryInit($query);
+    $query['order'][] = 'name';
+
+    $this->cacheQueries = true;
+    $types = $this->find('all', $query);
+    $this->cacheQueries = false;
+
+    return $types;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: paymentTypes
+   *  - Returns an array of types that can be deposited
+   */
+
+  function depositTypes($query = null) {
+    $this->queryInit($query);
+    $query['order'][] = 'name';
+    $query['conditions'][] = array('tillable' => true);
+
+    $this->cacheQueries = true;
+    $types = $this->find('all', $query);
+    $this->cacheQueries = false;
+
+    // Rearrange to be of the form (id => name)
+    $result = array();
+    foreach ($types AS $type)
+      $result[$type['TenderType']['id']] = $type['TenderType']['name'];
+
+    return $result;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: defaultPaymentType
+   *  - Returns the ID of the default payment type
+   */
+
+  function defaultPaymentType() {
+    return $this->nameToID('Check');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: stats
+   *  - Returns the stats for the given tender type
+   */
+
+  function stats($id = null, $query = null) {
+    if (!$id)
+      return null;
+
+    $this->queryInit($query);
+
+    if (!isset($query['link']['Tender']))
+      $query['link']['Tender'] = array('fields' => array());
+    if (!isset($query['link']['Tender']['LedgerEntry']))
+      $query['link']['Tender']['LedgerEntry'] = array('fields' => array());
+
+    $query['fields'][] = "SUM(COALESCE(LedgerEntry.amount,0)) AS 'total'";
+    $query['fields'][] = "SUM(IF(deposit_transaction_id IS NULL, COALESCE(LedgerEntry.amount,0), 0)) AS 'undeposited'";
+    $query['fields'][] = "SUM(IF(deposit_transaction_id IS NULL, 0, COALESCE(LedgerEntry.amount,0))) AS 'deposited'";
+    $query['fields'][] = "SUM(IF(nsf_transaction_id IS NULL, 0, COALESCE(LedgerEntry.amount,0))) AS 'nsf'";
+
+    $this->id = $id;
+    $stats = $this->find('first', $query);
+    return $stats[0];
+  }
+
+}

site/models/transaction.php

@@ -0,0 +1,726 @@
+<?php
+class Transaction extends AppModel {
+
+	var $belongsTo = array(
+		'Account',
+		'Ledger',
+	);
+
+	var $hasMany = array(
+		'LedgerEntry',
+		'StatementEntry',
+		'DepositTender' => array(
+			'className' => 'Tender',
+			'foreignKey' => 'deposit_transaction_id',
+		),
+
+		'Charge' => array(
+			'className' => 'StatementEntry',
+			'conditions' => array('Charge.type' => 'CHARGE')
+		),
+
+		'Payment' => array(
+			'className' => 'StatementEntry',
+			'conditions' => array('Payment.type' => 'PAYMENT')
+		),
+
+		'Debit' => array(
+			'className' => 'LedgerEntry',
+			'conditions' => array('Debit.crdr' => 'DEBIT')
+		),
+
+		'Credit' => array(
+			'className' => 'LedgerEntry',
+			'conditions' => array('Credit.crdr' => 'CREDIT')
+		),
+
+	);
+
+
+	var $default_log_level = 30;
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addInvoice
+   *  - Adds a new invoice invoice
+   */
+
+  function addInvoice($data, $customer_id, $lease_id = null) {
+    $this->prEnter(compact('data', 'customer_id', 'lease_id'));
+
+    // Establish the transaction as an invoice
+    $invoice =& $data['Transaction'];
+    $invoice['type'] = 'INVOICE';
+    $invoice['crdr'] = 'DEBIT';
+    $invoice['account_id']  = $this->Account->accountReceivableAccountID();
+    $invoice['customer_id'] = $customer_id;
+    $invoice['lease_id']    = $lease_id;
+
+    // Go through the statement entries and flag as charges
+    foreach ($data['Entry'] AS &$entry) {
+      $entry['type'] = 'CHARGE';
+      $entry['crdr'] = 'CREDIT';
+    }
+
+    $ids = $this->addTransaction($data['Transaction'], $data['Entry']);
+    if (isset($ids['transaction_id']))
+      $ids['invoice_id'] = $ids['transaction_id'];
+
+    return $ids;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addReceipt
+   *  - Adds a new receipt
+   */
+
+  function addReceipt($data, $customer_id, $lease_id = null) {
+    $this->prEnter(compact('data', 'customer_id', 'lease_id'));
+
+    // Establish the transaction as a receipt
+    $receipt =& $data['Transaction'];
+    $receipt['type'] = 'RECEIPT';
+    $receipt['crdr'] = 'CREDIT';
+    $receipt['account_id']  = $this->Account->accountReceivableAccountID();
+    $receipt['customer_id'] = $customer_id;
+    $receipt['lease_id']    = $lease_id;
+
+    // Go through the statement entries and flag as payments
+    foreach ($data['Entry'] AS &$entry) {
+      $entry['crdr'] = 'DEBIT';
+      if (empty($entry['account_id']) && isset($entry['Tender']['tender_type_id'])) {
+	$entry['account_id'] = $this->LedgerEntry->Tender->TenderType->
+	  accountID($entry['Tender']['tender_type_id']);
+      }
+    }
+
+    $ids = $this->addTransaction($data['Transaction'], $data['Entry']);
+    if (isset($ids['transaction_id']))
+      $ids['receipt_id'] = $ids['transaction_id'];
+
+    return $ids;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addWaiver
+   *  - Adds a new waiver
+   */
+
+  function addWaiver($data, $customer_id, $lease_id = null) {
+    $this->prEnter(compact('data', 'customer_id', 'lease_id'));
+    // REVISIT <AP>: 20090802
+    //  Completely un-implemented.  Just copied from addReceipt
+    //  and search-replace receipt with waiver.
+    return array('error' => true);
+
+    // Establish the transaction as a waiver
+    $waiver =& $data['Transaction'];
+    $waiver['type'] = 'RECEIPT';
+    $waiver['crdr'] = 'CREDIT';
+    $waiver['account_id']  = $this->Account->accountReceivableAccountID();
+    $waiver['customer_id'] = $customer_id;
+    $waiver['lease_id']    = $lease_id;
+
+    // Go through the statement entries and flag as payments
+    foreach ($data['Entry'] AS &$entry) {
+      $entry['type'] = 'WAIVE';
+      $entry['crdr'] = 'DEBIT';
+      if (empty($entry['account_id']) && isset($entry['Tender']['tender_type_id'])) {
+	$entry['account_id'] = $this->LedgerEntry->Tender->TenderType->
+	  accountID($entry['Tender']['tender_type_id']);
+      }
+    }
+
+    $ids = $this->addTransaction($data['Transaction'], $data['Entry']);
+    if (isset($ids['transaction_id']))
+      $ids['waiver_id'] = $ids['transaction_id'];
+
+    return $ids;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addDeposit
+   *  - Adds a new bank deposit
+   */
+
+  function addDeposit($data, $account_id) {
+    $this->prEnter(compact('data', 'account_id'));
+
+    // Establish the transaction as a deposit
+    $deposit =& $data['Transaction'];
+    $deposit['type'] = 'DEPOSIT';
+    $deposit['crdr'] = 'DEBIT';
+    $deposit['account_id']  = $account_id;
+    $deposit['customer_id'] = null;
+    $deposit['lease_id']    = null;
+
+    // Save the list of IDs, so that we can mark their
+    // deposit transaction after it has been created.
+    $tender_ids = array_map(create_function('$item', 'return $item["tender_id"];'),
+			    $data['Entry']);
+
+    // Go through the statement entries and re-group by account id
+    $group = array();
+    foreach ($data['Entry'] AS &$entry) {
+      if (!isset($group[$entry['account_id']]))
+	$group[$entry['account_id']] =
+	  array('account_id' => $entry['account_id'],
+		'crdr' => 'CREDIT',
+		'amount' => 0);
+      $group[$entry['account_id']]['amount'] += $entry['amount']; 
+    }
+    $data['Entry'] = $group;
+
+    $ids = $this->addTransaction($data['Transaction'], $data['Entry']);
+    if (isset($ids['transaction_id']))
+      $ids['deposit_id'] = $ids['transaction_id'];
+
+    if (!empty($ids['deposit_id'])) {
+      $this->LedgerEntry->Tender->updateAll
+	(array('Tender.deposit_transaction_id' => $ids['deposit_id']),
+	 array('Tender.id' => $tender_ids)
+	 );
+    }
+
+    return $ids;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addClose
+   *  - Adds a new transaction for closing ledgers
+   */
+
+  function addClose($data) {
+    $this->prEnter(compact('data'));
+
+    // Establish the transaction as a close
+    $close =& $data['Transaction'];
+    $close['type'] = 'CLOSE';
+    $close['account_id']  = null;
+    $close['customer_id'] = null;
+    $close['lease_id']    = null;
+
+    $ledger_ids = array();
+    $data['Entry'] = array();
+    foreach ($data['Ledger'] AS $ledger) {
+      $ledger_id      = $ledger['old_ledger_id'];
+      $new_ledger_id  = $ledger['new_ledger_id'];
+      $amount         = $ledger['amount'];
+      $account_id     = $this->Account->Ledger->accountID($ledger_id);
+      $crdr           = strtoupper($this->Account->fundamentalOpposite($account_id));
+      $comment        = "Ledger Carry Forward (c/f)";
+
+      // Save the ledger ID for later, to mark it as closed 
+      $ledger_ids[] = $ledger_id;
+
+      // No need to generate ledger entries if there is no balance
+      if (empty($ledger['amount']) || $ledger['amount'] == 0)
+	continue;
+
+      // Add an entry to carry the ledger balance forward
+      $data['Entry'][] = compact('account_id', 'ledger_id', 'new_ledger_id',
+				 'crdr', 'amount', 'comment');
+    }
+    unset($data['Ledger']);
+
+    // Add the transaction and carry forward balances
+    $ids = $this->addTransaction($data['Transaction'], $data['Entry']);
+    if (isset($ids['transaction_id']))
+      $ids['close_id'] = $ids['transaction_id'];
+
+    // Mark the older ledgers as closed
+    if (!empty($ids['close_id'])) {
+      $this->LedgerEntry->Ledger->updateAll
+	(array('Ledger.close_transaction_id' => $ids['close_id']),
+	 array('Ledger.id' => $ledger_ids)
+	 );
+    }
+
+    return $ids;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: verifyTransaction
+   *  - Verifies consistenty of new transaction data
+   *    (not in a pre-existing transaction)
+   */
+  function verifyTransaction($transaction, $entries) {
+    //$this->prFunctionLevel(10);
+    $this->prEnter(compact('transaction', 'entries'));
+
+    // Verify required Transaction data is present
+    if (empty($transaction['type']) ||
+	($transaction['type'] != 'CLOSE'
+	 && (empty($transaction['account_id']) ||
+	     empty($transaction['crdr']))) ||
+	(in_array($transaction['type'], array('INVOICE', 'RECEIPT'))
+	 && empty($transaction['customer_id']))
+	) {
+      return $this->prReturn(false);
+    }
+
+    // Verify all entries
+    foreach ($entries AS $entry) {
+      // Ensure these items are null'ed out so we don't
+      // accidentally pick up stale data.
+      $le1 = $le1_tender = $le2 = $se = null;
+      extract($entry);
+      if (!empty($le1) && !empty($le2) &&
+	  !$this->LedgerEntry->DoubleEntry->verifyDoubleEntry($le1, $le2, $le1_tender)) {
+	return $this->prReturn(false);
+      }
+      if (!empty($se) &&
+	  !$this->StatementEntry->verifyStatementEntry($se)) {
+	return $this->prReturn(false);
+      }
+    }
+
+    return $this->prReturn(true);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addTransaction
+   *  - Adds a new transaction, and the appropriate ledger and statement
+   *    entries, as layed out in the $data['Entry'] array.  The array is
+   *    overloaded, since it is used to create both ledger _and_ statement
+   *    entries.
+   *
+   * $data
+   *   - Transaction
+   *     - [MANDATORY]
+   *       - type (INVOICE, RECEIPT)
+   *       - account_id
+   *       - crdr
+   *     - [OPTIONAL]
+   *       - stamp
+   *         (default: NOW)
+   *       - comment
+   *     - [AUTOMATICALLY SET] (if set, these items will be overwritten)
+   *       - id
+   *       - amount
+   *       - customer_id
+   *       - ledger_id
+   *
+   *   - Entry (array)
+   *     - [MANDATORY]
+   *       - type (CHARGE, PAYMENT)
+   *       - account_id
+   *       - crdr
+   *       - amount
+   *     - [OPTIONAL]
+   *       - effective_date
+   *       - through_date
+   *       - due_date
+   *       - comment (used for statement or ledger entry, based on context)
+   *       - ledger_entry_comment
+   *       - statement_entry_comment
+   *       - Tender
+   *         - [MANDATORY]
+   *           - tender_type_id
+   *         - [OPTIONAL]
+   *           - name
+   *             (default: Entry Account Name & data1)
+   *           - data1, data2, data3, data4
+   *           - comment
+   *         - [AUTOMATICALLY SET] (if set, these items will be overwritten)
+   *           - id
+   *           - ledger_entry_id
+   *           - deposit_transaction_id
+   *           - nsf_transaction_id
+   *     - [AUTOMATICALLY SET] (if set, these items will be overwritten)
+   *       - id
+   *       - transaction_id
+   *       - ledger_id
+   *
+   */
+
+  function addTransaction($transaction, $entries, $subtype = null) {
+    $this->prEnter(compact('transaction', 'entries', 'subtype'));
+
+    // Verify that we have a transaction and entries
+    if (empty($transaction) ||
+	($transaction['type'] !== 'CLOSE' && empty($entries)))
+      return $this->prReturn(array('error' => true));
+
+    // set ledger ID as the current ledger of the specified account
+    if (empty($transaction['ledger_id']))
+      $transaction['ledger_id'] =  
+	$this->Account->currentLedgerID($transaction['account_id']);
+
+    // Automatically figure out the customer if we have the lease
+    if (!empty($transaction['lease_id']) && empty($transaction['customer_id'])) {
+      $L = new Lease();
+      $L->recursive = -1;
+      $lease = $L->read(null, $transaction['lease_id']);
+      $transaction['customer_id'] = $lease['Lease']['customer_id'];
+    }
+
+    // Break each entry out of the combined statement/ledger entry
+    // and into individual entries appropriate for saving.  While
+    // we're at it, calculate the transaction total as well.
+    $transaction['amount'] = 0;
+    foreach ($entries AS &$entry) {
+      // Ensure these items are null'ed out so we don't
+      // accidentally pick up stale data.
+      $le1 = $le1_tender = $le2 = $se = null;
+
+      // Add entry amount into the transaction total
+      $transaction['amount'] += $entry['amount'];
+
+      // Set up our comments, possibly using the default 'comment' field
+      if (empty($entry['ledger_entry_comment'])) {
+	if ($transaction['type'] != 'INVOICE' && !empty($entry['comment']))
+	  $entry['ledger_entry_comment'] = $entry['comment'];
+	else
+	  $entry['ledger_entry_comment'] = null;
+      }
+      if (empty($entry['statement_entry_comment'])) {
+	if ($transaction['type'] == 'INVOICE' && !empty($entry['comment']))
+	  $entry['statement_entry_comment'] = $entry['comment'];
+	else
+	  $entry['statement_entry_comment'] = null;
+      }
+
+      // Create one half of the Double Ledger Entry (and the Tender)
+      $le1 =
+	array_intersect_key($entry,
+			    array_flip(array('ledger_id', 'account_id', 'crdr', 'amount')));
+      $le1['comment'] = $entry['ledger_entry_comment'];
+      $le1_tender = isset($entry['Tender']) ? $entry['Tender'] : null;
+
+      // Create the second half of the Double Ledger Entry
+      if ($transaction['type'] == 'CLOSE') {
+	$le2 =
+	  array_intersect_key($entry,
+			      array_flip(array('account_id', 'amount')));
+	$le2['ledger_id'] = $entry['new_ledger_id'];
+	$le2['crdr'] = strtoupper($this->Account->fundamentalOpposite($le1['crdr']));
+	$le2['comment'] = "Ledger Balance Forward (b/f)";
+      }
+      else {
+	$le2 =
+	  array_intersect_key($entry,
+			      array_flip(array('amount'))) +
+	  array_intersect_key($transaction,
+			      array_flip(array('ledger_id', 'account_id', 'crdr')));
+      }
+
+      // Create the statement entry
+      $se =
+	array_intersect_key($entry,
+			    array_flip(array('type', 'amount',
+					     'effective_date', 'through_date', 'due_date',
+					     'customer_id', 'lease_id',
+					     'charge_entry_id'))) +
+	array_intersect_key($transaction,
+			    array_flip(array('customer_id', 'lease_id')));
+      $se['comment'] = $entry['statement_entry_comment'];
+
+      // (PAYMENTS will have statement entries created below, when
+      //  assigning credits, and DEPOSITS don't have statement entries)
+      if ($transaction['type'] != 'INVOICE' && $subtype !== 'NSF')
+	$se = null;
+
+      // NSF transactions don't use LedgerEntries
+      // REVISIT <AP>: 20090731
+      //  Doesn't seem right...  probably doing this because of the
+      //  single A/R entry we add below for NSF
+      if ($subtype === 'NSF')
+	$le1 = $le1_tender = $le2 = null;
+
+      // Replace combined entry with our new individual entries
+      $entry = compact('le1', 'le1_tender', 'le2', 'se');
+    }
+
+    if ($subtype === 'NSF') {
+      // REVISIT <AP>: 20090731
+      //  Should we be doing this, or just doing individual ledger entries
+      //  that were created above before we nulled them out
+      array_unshift($entries,
+		    array('le1' => array('account_id' => $transaction['account_id'],
+					 'crdr' => 'DEBIT',
+					 'amount' => $transaction['amount']),
+			  'le2' => array('account_id' => $this->Account->accountReceivableAccountID(),
+					 'crdr' => 'CREDIT',
+					 'amount' => $transaction['amount'])
+			  ));
+    }
+
+    $this->pr(20, compact('transaction', 'entries'));
+
+    // Move forward, verifying and saving everything.
+    $ret = array();
+    if (!$this->verifyTransaction($transaction, $entries))
+      return $this->prReturn(array('error' => true) + $ret);
+
+    // Save transaction to the database
+    $this->create();
+    if (!$this->save($transaction))
+      return $this->prReturn(array('error' => true) + $ret);
+
+    // Set up our return ids array
+    $ret['transaction_id'] = $this->id;
+    $ret['entries'] = array();
+    $ret['error'] = false;
+
+    // Go through the entries
+    foreach ($entries AS $e_index => &$entry) {
+      // Ensure these items are null'ed out so we don't
+      // accidentally pick up stale data.
+      $le1 = $le1_tender = $le2 = $se = null;
+      extract($entry);
+
+      if (!empty($le1) && !empty($le2)) {
+	$le1['transaction_id'] = $le2['transaction_id'] = $ret['transaction_id'];
+	if (isset($le1_tender))
+	  $le1_tender['customer_id'] = $transaction['customer_id'];
+	$result = $this->LedgerEntry->DoubleEntry->addDoubleEntry($le1, $le2, $le1_tender);
+	$ret['entries'][$e_index]['DoubleEntry'] = $result;
+	if ($result['error']) {
+	  $ret['error'] = true;
+	  continue;
+	}
+      }
+
+      if (!empty($se)) {
+	//pr($ret['entries'][$e_index]['DoubleEntry']); die;
+	$le_id = $ret['entries'][0]['DoubleEntry']['Entry1']['ledger_entry_id'];
+	$se['transaction_id'] = $ret['transaction_id'];
+	$se['Fraction'] = array(array('ledger_entry_id' => $le_id,
+				      'amount' => $se['amount']));
+	$result = $this->StatementEntry->addStatementEntry($se);
+	$ret['entries'][$e_index]['StatementEntry'] = $result;
+	if ($result['error']) {
+	  $ret['error'] = true;
+	  continue;
+	}
+      }
+    }
+
+    if (($transaction['type'] == 'INVOICE' ||
+	 $transaction['type'] == 'RECEIPT') &&
+	$subtype !== 'NSF' && !$ret['error']) {
+      $result = $this->StatementEntry->assignCredits
+	(array('link' => array('Customer'),
+	       'conditions' => array('Customer.id' => $transaction['customer_id'])),
+	 ($transaction['type'] == 'RECEIPT'
+	  ? $ret['transaction_id']
+	  : null));
+
+      $ret['assigned'] = $result;
+      if ($result['error'])
+	$ret['error'] = true;
+    }
+
+    return $this->prReturn($ret);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: addNsf
+   *  - Adds NSF transaction
+   */
+
+  function addNsf($tender, $stamp) {
+    $this->prEnter(compact('tender', 'stamp'));
+
+    $ret = array();
+
+    // Enter the NSF
+    // This is the transaction pulling money from the bank account
+    // and recording it in the NSF account.  It has nothing to do
+    // with the customer statement (charges, payments, credits, etc).
+    $bounce_result = $this->addDeposit
+      (array('Transaction' => array(),
+	     'Entry' => array(array('tender_id'  => null,
+				    'account_id' => $this->Account->nsfAccountID(),
+				    'amount'     => -1 * $tender['LedgerEntry']['amount'],
+				    ))),
+       $tender['Transaction']['account_id']);
+
+    $this->pr(20, compact('bounce_result'));
+    $ret['bounce'] = $bounce_result;
+    if ($bounce_result['error'])
+      return $this->prReturn(array('error' => true) + $ret);
+
+    // Since we may have saved the nsf transaction with a null
+    // timestamp, query it back out of the database to find out
+    // what timestamp was _really_ specified, for later use.
+    $bounce = $this->find
+      ('first', array('contain' => false, 'id' => $bounce_result['transaction_id']));
+    $this->pr(20, compact('bounce'));
+    $stamp = $bounce['Transaction']['stamp'];
+
+    // OK, now move into customer realm, finding all statement
+    // entries that were affected by the bad payment (tender).
+    $nsf_ledger_entry = $this->LedgerEntry->find
+      ('first', array
+       ('contain' => array('Transaction' =>
+			   array(//'fields' => array(),
+				 'StatementEntry' =>
+				 array(//'fields' => array(),
+				       ),
+				 ),
+			   ),
+	'conditions' => array('LedgerEntry.id' => $tender['LedgerEntry']['id']),
+	));
+
+    $this->pr(20, compact('nsf_ledger_entry'));
+    if (!$nsf_ledger_entry)
+      return $this->prReturn(array('error' => true) + $ret);
+
+    // Build a transaction to adjust all of the statement entries
+    $rollback = array('Transaction' => array(), 'Entry' => array());
+
+    $rollback['Transaction']['stamp']       = $stamp;
+    $rollback['Transaction']['type']        = 'RECEIPT';
+    $rollback['Transaction']['crdr']        = 'DEBIT'; // Unused... keeps verifyTx happy
+    $rollback['Transaction']['account_id']  = $this->Account->nsfAccountID();
+    $rollback['Transaction']['customer_id'] = $tender['Tender']['customer_id'];
+    $rollback['Transaction']['amount']      = -1 * $tender['LedgerEntry']['amount'];
+
+    foreach ($nsf_ledger_entry['Transaction']['StatementEntry'] AS $payment) {
+      if ($payment['type'] === 'SURPLUS') {
+	$payment['type'] = 'VOID';
+	$this->StatementEntry->id = $payment['id'];
+	$this->StatementEntry->saveField('type', $payment['type']);
+      }
+      else {
+	$rollback['Entry'][] =
+	  array('type'             => $payment['type'],
+		'amount'           => -1 * $payment['amount'],
+		'account_id'       => $this->Account->nsfAccountID(),
+		'customer_id'      => $payment['customer_id'],
+		'lease_id'         => $payment['lease_id'],
+		'charge_entry_id'  => $payment['charge_entry_id'],
+		'effective_date'   => $stamp,
+		);
+      }
+    }
+
+    // Record the transaction, which will un-pay previously paid
+    // charges, void any credits, and other similar work.
+    $rollback_result = $this->addTransaction($rollback['Transaction'], $rollback['Entry'], 'NSF');
+    $this->pr(20, compact('rollback', 'rollback_result'));
+    $ret['rollback'] = $rollback_result;
+    if ($rollback_result['error'])
+      return $this->prReturn(array('error' => true) + $ret);
+
+    //  Add NSF Charge
+    $charge_result = $this->addInvoice
+      (array('Transaction' => compact('stamp'),
+
+	     'Entry' =>
+	     array
+	     (array('account_id' => $this->Account->nsfChargeAccountID(),
+		    'effective_date' => $stamp,
+		    // REVISIT <AP>: 20090730
+		    //  BAD, BAD, BAD... who would actually
+		    //  hardcode a value like this???? ;-)
+		    'amount' => 35,
+		    'comment' => "NSF: " . $tender['Tender']['name'],
+		    ),
+	      ),
+	     ),
+       $tender['Tender']['customer_id']);
+
+    $this->pr(20, compact('charge_result'));
+    $ret['charge'] = $charge_result;
+    if ($charge_result['error'])
+      return $this->prReturn(array('error' => true) + $ret);
+
+    $ret['nsf_transaction_id']  = $ret['bounce']['transaction_id'];
+    $ret['nsf_ledger_entry_id'] = $ret['rollback']['entries'][0]['DoubleEntry']['Entry1']['ledger_entry_id'];
+    return $this->prReturn($ret + array('error' => false));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: stats
+   *  - Returns summary data from the requested transaction
+   */
+  function stats($id = null, $query = null, $balance_account_id = null) {
+    $this->prEnter(compact('id', 'query'));
+
+    $this->queryInit($query);
+    unset($query['group']);
+
+    if (isset($id)) {
+      $query['conditions'][] = array('Transaction.id' => $id);
+      $query['group'] = 'Transaction.id';
+    }
+    else
+      // CakePHP seems to automagically add in our ID as a part
+      // of the query conditions, but only on a 'first' query,
+      // not an 'all'.  I suppose this is helpful :-/
+      unset($this->id);
+
+    if (empty($query['fields']))
+      $query['fields'] = array();
+
+    $stats = array();
+    foreach ($this->hasMany AS $table => $association) {
+      // Only calculate stats for *Entry types
+      if (!preg_match("/Entry$/", $table) &&
+	  !preg_match("/Entry$/", $association['className']))
+	continue;
+
+      $squery = $query;
+      $squery['link'][$table] = array('fields' => array());
+
+      if ($table == 'LedgerEntry') {
+	if (isset($balance_account_id)) {
+	  $squery['link']['LedgerEntry']['Account'] = array('fields' => array());
+	  $squery['conditions'][] = array("Account.id" => $balance_account_id);
+	}
+
+	$squery['fields'] = array_merge($squery['fields'],
+					$this->LedgerEntry->debitCreditFields(true, $balance_account_id != null));
+      }
+      elseif ($table == 'StatementEntry') {
+	$squery['fields'] = array_merge($squery['fields'],
+					$this->StatementEntry->chargePaymentFields(true));
+      }
+      else {
+	$squery['fields'][] = "SUM({$table}.amount) AS total";
+	$squery['fields'][] = "COUNT({$table}.id) AS entries";
+      }
+      $stats[$table] = $this->find('first', $squery);
+      // REVISIT <AP>: 20090724
+      //   [0][0] is for when we do an 'all' query.  This can
+      //   be removed at some point, but I'm keeping it while
+      //   toggling between 'all' and 'first' (testing).
+      if (isset($stats[$table][0][0]))
+	$stats[$table] += $stats[$table][0][0];
+      else
+	$stats[$table] += $stats[$table][0];
+      unset($stats[$table][0]);
+    }
+
+    return $this->prReturn($stats);
+  }
+}
+?>

site/models/unit.php

@@ -13,67 +13,107 @@ class Unit extends AppModel {
 	);
 
 	var $belongsTo = array(
-		'UnitSize' => array(
-			'className' => 'UnitSize',
-			'foreignKey' => 'unit_size_id',
-			'conditions' => '',
-			'fields' => '',
-			'order' => ''
+		'UnitSize',
+	);
+
+	var $hasOne = array(
+		'CurrentLease' => array(
+			'className' => 'Lease',
+			'conditions' => 'CurrentLease.moveout_date IS NULL',
 		),
-/* 		'Map' => array( */
-/* 			'className' => 'MapsUnit', */
-/* 			'foreignKey' => 'unit_id', */
-/* 			'conditions' => '', */
-/* 			'fields' => '', */
-/* 			'order' => '' */
-/* 		) */
 	);
 
 	var $hasMany = array(
-		'Lease' => array(
-			'className' => 'Lease',
-			'foreignKey' => 'unit_id',
-			'dependent' => false,
-			'conditions' => '',
-			'fields' => '',
-			'order' => '',
-			'limit' => '',
-			'offset' => '',
-			'exclusive' => '',
-			'finderQuery' => '',
-			'counterQuery' => ''
-		)
+		'Lease',
 	);
 
-	function statusEnums() {
-	  static $status_enums;
-	  if (!isset($status_enums))
-	    $status_enums = $this->getEnumValues('status');
-	  return $status_enums;
-	}
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * helpers: status enumerations
+   */
 
-	function statusValue($enum) {
-	  $enums = $this->statusEnums();
-	  return $enums[$enum];
-	}
+  function statusEnums() {
+    static $status_enums;
+    if (!isset($status_enums))
+      $status_enums = $this->getEnumValues('status');
+    return $status_enums;
+  }
 
-	function occupiedEnumValue() {
-	  return statusValue('OCCUPIED');
-	}
+  function activeStatusEnums() {
+    return array_diff_key($this->statusEnums(), array(''=>1, 'DELETED'=>1));
+  }
 
-	function conditionOccupied() {
-	  return ('Unit.status >= ' . $this->statusValue('OCCUPIED'));
-	}
+  function statusValue($enum) {
+    $enums = $this->statusEnums();
+    return $enums[$enum];
+  }
 
-	function conditionVacant() {
-	  return ('Unit.status BETWEEN ' .
-		  ($this->statusValue('UNAVAILABLE')+1) .
-		  ' AND ' .
-		  ($this->statusValue('OCCUPIED')-1));
-	}
+  function occupiedEnumValue() {
+    return statusValue('OCCUPIED');
+  }
 
-	function conditionUnavailable() {
-	  return ('Unit.status <= ' . $this->statusValue('UNAVAILABLE'));
-	}
+  function conditionOccupied() {
+    return ('Unit.status >= ' . $this->statusValue('OCCUPIED'));
+  }
+
+  function conditionVacant() {
+    return ('Unit.status BETWEEN ' .
+      ($this->statusValue('UNAVAILABLE')+1) .
+      ' AND ' .
+      ($this->statusValue('OCCUPIED')-1));
+  }
+
+  function conditionUnavailable() {
+    return ('Unit.status <= ' . $this->statusValue('UNAVAILABLE'));
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: updateStatus
+   *  - Update the given unit to the given status
+   */
+  function updateStatus($id, $status) {
+    $this->id = $id;
+    //pr(compact('id', 'status'));
+    $this->saveField('status', $status);
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: stats
+   *  - Returns summary data from the requested customer.
+   */
+
+  function stats($id = null) {
+    if (!$id)
+      return null;
+
+    // Get the basic information necessary
+    $unit = $this->find('first',
+			array('contain' => array
+			      ('Lease' => array
+			       ('fields' => array('Lease.id')),
+
+			       'CurrentLease' => array
+			       ('fields' => array('CurrentLease.id'))),
+
+			      'conditions' => array
+			      (array('Unit.id' => $id)),
+			      ));
+
+    // Get the stats for the current lease
+    $stats['CurrentLease'] = $this->Lease->stats($unit['CurrentLease']['id']);
+
+    // Sum the stats for all leases together
+    foreach ($unit['Lease'] AS $lease) {
+      $this->statsMerge($stats['Lease'], $this->Lease->stats($lease['id']));
+    }
+
+    // Return the collection
+    return $stats;
+  }
 
 }

site/models/unit_size.php

@@ -14,29 +14,11 @@ class UnitSize extends AppModel {
 	);
 
 	var $belongsTo = array(
-		'UnitType' => array(
-			'className' => 'UnitType',
-			'foreignKey' => 'unit_type_id',
-			'conditions' => '',
-			'fields' => '',
-			'order' => ''
-		)
+		'UnitType',
 	);
 
 	var $hasMany = array(
-		'Unit' => array(
-			'className' => 'Unit',
-			'foreignKey' => 'unit_size_id',
-			'dependent' => false,
-			'conditions' => '',
-			'fields' => '',
-			'order' => '',
-			'limit' => '',
-			'offset' => '',
-			'exclusive' => '',
-			'finderQuery' => '',
-			'counterQuery' => ''
-		)
+		'Unit',
 	);
 
 }

site/models/unit_type.php

@@ -9,19 +9,7 @@ class UnitType extends AppModel {
 	);
 
 	var $hasMany = array(
-		'UnitSize' => array(
-			'className' => 'UnitSize',
-			'foreignKey' => 'unit_type_id',
-			'dependent' => false,
-			'conditions' => '',
-			'fields' => '',
-			'order' => '',
-			'limit' => '',
-			'offset' => '',
-			'exclusive' => '',
-			'finderQuery' => '',
-			'counterQuery' => ''
-		)
+		'UnitSize',
 	);
 
 }

site/plugins/debug_kit/README

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

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

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

site/plugins/debug_kit/debug_kit_app_controller.php

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

site/plugins/debug_kit/debug_kit_app_model.php

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

site/plugins/debug_kit/vendors/debug_kit_debugger.php

@@ -0,0 +1,226 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * DebugKit Debugger class. Extends and enhances core
+ * debugger. Adds benchmarking and timing functionality.
+ * 
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.4487
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+App::import('Core', 'Debugger');
+App::import('Vendor', 'DebugKit.FireCake');
+/**
+ * Debug Kit Temporary Debugger Class
+ *
+ * Provides the future features that are planned. Yet not implemented in the 1.2 code base
+ *
+ * This file will not be needed in future version of CakePHP.
+ * @todo merge these changes with core Debugger
+ */
+class DebugKitDebugger extends Debugger {
+
+/**
+ * Start an benchmarking timer.
+ * 
+ * @param string $name The name of the timer to start.
+ * @param string $message A message for your timer
+ * @return bool true
+ * @static
+ **/
+	function startTimer($name = 'default', $message = '') {
+		$now = getMicrotime();
+		$_this = DebugKitDebugger::getInstance();
+		$_this->__benchmarks[$name] = array(
+			'start' => $now,
+			'message' => $message,
+		);
+		return true;
+	}
+
+/**
+ * Stop a benchmarking timer.
+ *
+ * $name should be the same as the $name used in startTimer().
+ *
+ * @param string $name The name of the timer to end.
+ * @access public
+ * @return boolean true if timer was ended, false if timer was not started.
+ * @static
+ */
+	function stopTimer($name = 'default') {
+		$now = getMicrotime();
+		$_this = DebugKitDebugger::getInstance();
+		if (!isset($_this->__benchmarks[$name])) {
+			return false;
+		}
+		$_this->__benchmarks[$name]['end'] = $now;
+		return true;
+	}
+
+/**
+ * Get all timers that have been started and stopped.
+ * Calculates elapsed time for each timer.
+ *
+ * @return array
+ **/
+	function getTimers() {
+		$_this =& DebugKitDebugger::getInstance();
+		$times = array();
+		foreach ($_this->__benchmarks as $name => $timer) {
+			$times[$name]['time'] = DebugKitDebugger::elapsedTime($name);
+			$times[$name]['message'] = $timer['message'];
+		}
+		return $times;
+	}
+
+/**
+ * Clear all existing timers
+ *
+ * @return bool true
+ **/
+	function clearTimers() {
+		$_this =& DebugKitDebugger::getInstance();
+		$_this->__benchmarks = array();
+		return true;
+	}
+
+/**
+ * Get the difference in time between the timer start and timer end.
+ *
+ * @param $name string the name of the timer you want elapsed time for.
+ * @param $precision int the number of decimal places to return, defaults to 5.
+ * @return float number of seconds elapsed for timer name, 0 on missing key
+ * @static
+ **/
+	function elapsedTime($name = 'default', $precision = 5) {
+		$_this =& DebugKitDebugger::getInstance();
+		if (!isset($_this->__benchmarks[$name]['start']) || !isset($_this->__benchmarks[$name]['end'])) {
+			return 0;
+		}
+		return round($_this->__benchmarks[$name]['end'] - $_this->__benchmarks[$name]['start'], $precision);
+	}
+
+/**
+ * Get the total execution time until this point
+ *
+ * @access public
+ * @return float elapsed time in seconds since script start.
+ * @static
+ */
+	function requestTime() {
+		$start = DebugKitDebugger::requestStartTime();
+		$now = getMicroTime();
+		return ($now - $start);
+	}
+/**
+ * get the time the current request started.
+ *
+ * @access public
+ * @return float time of request start
+ * @static
+ */	
+	function requestStartTime() {
+		if (defined('TIME_START')) {
+			$startTime = TIME_START;
+		} else if (isset($_GLOBALS['TIME_START'])) {
+			$startTime = $_GLOBALS['TIME_START'];
+		} else {
+			$startTime = env('REQUEST_TIME');
+		}
+		return $startTime;
+	}
+
+/**
+ * get current memory usage
+ *
+ * @return integer number of bytes ram currently in use. 0 if memory_get_usage() is not available.
+ * @static
+ **/
+	function getMemoryUse() {
+		if (!function_exists('memory_get_usage')) {
+			return 0;
+		}
+		return memory_get_usage();
+	}
+
+/**
+ * Get peak memory use
+ *
+ * @return integer peak memory use (in bytes).  Returns 0 if memory_get_peak_usage() is not available
+ * @static
+ **/
+	function getPeakMemoryUse() {
+		if (!function_exists('memory_get_peak_usage')) {
+			return 0;
+		}
+		return memory_get_peak_usage();
+	}
+
+/**
+ * Handles object conversion to debug string.
+ *
+ * @param string $var Object to convert
+ * @access protected
+ */
+	function _output($level, $error, $code, $helpCode, $description, $file, $line, $kontext) {
+		$files = $this->trace(array('start' => 2, 'format' => 'points'));
+		$listing = $this->excerpt($files[0]['file'], $files[0]['line'] - 1, 1);
+		$trace = $this->trace(array('start' => 2, 'depth' => '20'));
+		$context = array();
+
+		foreach ((array)$kontext as $var => $value) {
+			$context[] = "\${$var}\t=\t" . $this->exportVar($value, 1);
+		}
+		if ($this->_outputFormat == 'fb') {
+			$this->_fireError($error, $code, $description, $file, $line, $trace, $context);
+		} else {
+			echo parent::_output($level, $error, $code, $helpCode, $description, $file, $line, $kontext);
+		}
+	}
+/**
+ * Create a FirePHP error message
+ *
+ * @param string $error Name of error
+ * @param string $code  Code of error
+ * @param string $description Description of error
+ * @param string $file File error occured in
+ * @param string $line Line error occured on
+ * @param string $trace Stack trace at time of error
+ * @param string $context context of error
+ * @return void
+ * @access protected
+ */
+	function _fireError($error, $code, $description, $file, $line, $trace, $context) {
+		$name = $error . ' - ' . $description;
+		$message = "$error $code $description on line: $line in file: $file";
+		FireCake::group($name);
+		FireCake::error($message, $name);
+		FireCake::log($context, 'Context');
+		FireCake::log($trace, 'Trace');
+		FireCake::groupEnd();
+	}
+}
+
+
+Debugger::invoke(DebugKitDebugger::getInstance());
+Debugger::getInstance('DebugKitDebugger');
+?>

site/plugins/debug_kit/vendors/fire_cake.php

@@ -0,0 +1,539 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * FirePHP Class for CakePHP
+ *
+ * Provides most of the functionality offered by FirePHPCore
+ * Interoperates with FirePHP extension for firefox
+ *
+ * For more information see: http://www.firephp.org/
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright       Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link            http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package         debug_kit.
+ * @subpackage      debug_kit.vendors
+ * @since           
+ * @version         $Revision$
+ * @modifiedby      $LastChangedBy$
+ * @lastmodified    $Date$
+ * @license         http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+App::import('Core', 'Debugger');
+
+class FireCake extends Object {
+/**
+ * Options for FireCake.
+ *
+ * @see _defaultOptions and setOptions();
+ * @var string
+ */
+	var	$options = array();
+/**
+ * Default Options used in CakeFirePhp
+ *
+ * @var string
+ * @access protected
+ */
+	var $_defaultOptions = array(
+		'maxObjectDepth' => 10,
+	    'maxArrayDepth' => 20,
+	    'useNativeJsonEncode' => true,
+	    'includeLineNumbers' => true,
+	);
+/**
+ * Message Levels for messages sent via FirePHP
+ *
+ * @var array
+ */	
+	var $_levels = array(
+		'log' => 'LOG',
+		'info' => 'INFO',
+		'warn' => 'WARN',
+		'error' => 'ERROR',
+		'dump' => 'DUMP',
+		'trace' => 'TRACE',
+		'exception' => 'EXCEPTION',
+		'table' => 'TABLE',
+		'groupStart' => 'GROUP_START',
+		'groupEnd' => 'GROUP_END',
+	);
+	
+	var $_version = '0.2.1';
+/**
+ * internal messageIndex counter
+ *
+ * @var int
+ * @access protected
+ */
+	var $_messageIndex = 1;
+/**
+ * stack of objects encoded by stringEncode()
+ *
+ * @var array
+ **/
+	var $_encodedObjects = array();	
+/**
+ * methodIndex to include in tracebacks when using includeLineNumbers
+ *
+ * @var array
+ **/
+	var $_methodIndex = array('info', 'log', 'warn', 'error', 'table', 'trace');
+/**
+ * FireCake output status
+ *
+ * @var bool
+ **/
+	var $_enabled = true;
+/**
+ * get Instance of the singleton
+ *
+ * @param string $class Class instance to store in the singleton. Used with subclasses and Tests.
+ * @access public
+ * @static
+ * @return void
+ */
+	function &getInstance($class = null) {
+		static $instance = array();
+		if (!empty($class)) {
+			if (!$instance || strtolower($class) != strtolower(get_class($instance[0]))) {
+				$instance[0] = new $class();
+				$instance[0]->setOptions();
+			}
+		}
+		if (!isset($instance[0]) || !$instance[0]) {
+			$instance[0] = new FireCake();
+			$instance[0]->setOptions();
+		}
+		return $instance[0];
+	}
+/**
+ * setOptions
+ *
+ * @param array $options Array of options to set.
+ * @access public
+ * @static
+ * @return void
+ */
+	function setOptions($options = array()) {
+		$_this = FireCake::getInstance();
+		if (empty($_this->options)) {
+			$_this->options = array_merge($_this->_defaultOptions, $options);
+		} else {
+			$_this->options = array_merge($_this->options, $options);
+		}
+	}
+/**
+ * Return boolean based on presence of FirePHP extension
+ *
+ * @access public
+ * @return boolean
+ **/
+	function detectClientExtension() {
+		$ua = FireCake::getUserAgent();
+		if (!preg_match('/\sFirePHP\/([\.|\d]*)\s?/si', $ua, $match) || !version_compare($match[1], '0.0.6', '>=')) {
+			return false;
+		}
+		return true;
+	}
+/**
+ * Get the Current UserAgent
+ *
+ * @access public
+ * @static
+ * @return string UserAgent string of active client connection
+ **/
+	function getUserAgent() {
+		return env('HTTP_USER_AGENT');
+	}
+/**
+ * Disable FireCake output 
+ * All subsequent output calls will not be run.
+ *
+ * @return void
+ **/
+	function disable() {
+		$_this = FireCake::getInstance();
+		$_this->_enabled = false;
+	}
+/**
+ * Enable FireCake output
+ *
+ * @return void
+ **/
+	function enable() {
+		$_this = FireCake::getInstance();
+		$_this->_enabled = true;
+	}
+/**
+ * Convenience wrapper for LOG messages 
+ *
+ * @param string $message Message to log 
+ * @param string $label Label for message (optional)
+ * @access public
+ * @static
+ * @return void
+ */	
+	function log($message, $label = null) {
+		FireCake::fb($message, $label, 'log');
+	}
+/**
+ * Convenience wrapper for WARN messages 
+ *
+ * @param string $message Message to log 
+ * @param string $label Label for message (optional)
+ * @access public
+ * @static
+ * @return void
+ */	
+	function warn($message, $label = null) {
+		FireCake::fb($message, $label, 'warn');
+	}
+/**
+ * Convenience wrapper for INFO messages 
+ *
+ * @param string $message Message to log 
+ * @param string $label Label for message (optional)
+ * @access public
+ * @static
+ * @return void
+ */	
+	function info($message, $label = null) {
+		FireCake::fb($message, $label, 'info');
+	}
+/**
+ * Convenience wrapper for ERROR messages 
+ *
+ * @param string $message Message to log 
+ * @param string $label Label for message (optional)
+ * @access public
+ * @static
+ * @return void
+ */	
+	function error($message, $label = null) {
+		FireCake::fb($message, $label, 'error');
+	}
+/**
+ * Convenience wrapper for TABLE messages 
+ *
+ * @param string $message Message to log 
+ * @param string $label Label for message (optional)
+ * @access public
+ * @static
+ * @return void
+ */	
+	function table($label, $message) {
+		FireCake::fb($message, $label, 'table');
+	}
+/**
+ * Convenience wrapper for DUMP messages 
+ *
+ * @param string $message Message to log 
+ * @param string $label Unique label for message
+ * @access public
+ * @static
+ * @return void
+ */	
+	function dump($label, $message) {
+		FireCake::fb($message, $label, 'dump');
+	}
+/**
+ * Convenience wrapper for TRACE messages 
+ *
+ * @param string $label Label for message (optional)
+ * @access public
+ * @return void
+ */	
+	function trace($label)  {
+		FireCake::fb($label, 'trace');
+	}
+/**
+ * Convenience wrapper for GROUP messages 
+ * Messages following the group call will be nested in a group block
+ *
+ * @param string $label Label for group (optional)
+ * @access public
+ * @return void
+ */	
+	function group($label)  {
+		FireCake::fb(null, $label, 'groupStart');
+	}
+/**
+ * Convenience wrapper for GROUPEND messages 
+ * Closes a group block
+ *
+ * @param string $label Label for group (optional)
+ * @access public
+ * @return void
+ */	
+	function groupEnd()  {
+		FireCake::fb(null, null, 'groupEnd');
+	}
+/**
+ * fb - Send messages with FireCake to FirePHP
+ *
+ * Much like FirePHP's fb() this method can be called with various parameter counts
+ * fb($message) - Just send a message defaults to LOG type
+ * fb($message, $type) - Send a message with a specific type
+ * fb($message, $label, $type) - Send a message with a custom label and type.
+ * 
+ * @param mixed $message Message to output. For other parameters see usage above.
+ * @static
+ * @return void
+ **/
+	function fb($message) {
+		$_this = FireCake::getInstance();
+
+		if (headers_sent($filename, $linenum)) {
+			trigger_error(sprintf(__('Headers already sent in %s on line %s. Cannot send log data to FirePHP.', true), $filename, $linenum), E_USER_WARNING);
+			return false;
+		}
+		if (!$_this->_enabled || !$_this->detectClientExtension()) {
+			return false;
+		}
+	
+		$args = func_get_args();
+		$type = $label = null;
+		switch (count($args)) {
+			case 1:
+				$type = $_this->_levels['log'];
+				break;
+			case 2:
+				$type = $args[1];
+				break;
+			case 3:
+				$type = $args[2];
+				$label = $args[1];
+				break;
+			default:
+				trigger_error(__('Incorrect parameter count for FireCake::fb()', true), E_USER_WARNING);
+				return false;
+		}
+		if (isset($_this->_levels[$type])) {
+			$type = $_this->_levels[$type];
+		} else {
+			$type = $_this->_levels['log'];
+		}
+
+		$meta = array();
+		$skipFinalObjectEncode = false;		
+		if ($type == $_this->_levels['trace']) {
+			$trace = debug_backtrace();
+			if (!$trace) {
+				return false;
+			}
+			$message = $_this->_parseTrace($trace, $args[0]);
+			$skipFinalObjectEncode = true;
+		}
+
+		if ($_this->options['includeLineNumbers']) {
+			if (!isset($meta['file']) || !isset($meta['line'])) {
+				$trace = debug_backtrace();
+				for ($i = 0, $len = count($trace); $i < $len ; $i++) {
+					$keySet = (isset($trace[$i]['class']) && isset($trace[$i]['function']));
+					$selfCall = ($keySet && $trace[$i]['class'] == 'FireCake' && in_array($trace[$i]['function'], $_this->_methodIndex));
+					if ($selfCall) {
+						$meta['File'] = isset($trace[$i]['file']) ? Debugger::trimPath($trace[$i]['file']) : '';
+						$meta['Line'] = isset($trace[$i]['line']) ? $trace[$i]['line'] : '';
+						break;
+					}
+				}
+			}
+		}
+
+		$structureIndex = 1;
+		if ($type == $_this->_levels['dump']) {
+			$structureIndex = 2;
+			$_this->_sendHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
+		} else {
+			$_this->_sendHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
+		}
+
+		$_this->_sendHeader('X-Wf-Protocol-1', 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
+		$_this->_sendHeader('X-Wf-1-Plugin-1', 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'. $_this->_version);
+
+		if ($type == $_this->_levels['dump']) {
+			$dump = $_this->jsonEncode($message);
+			$msg = '{"' . $label .'":' . $dump .'}';
+		} else {
+			$meta['Type'] = $type;
+			if ($label !== null) {
+				$meta['Label'] = $label;
+			}
+			$msg = '[' . $_this->jsonEncode($meta) . ',' . $_this->jsonEncode($message, $skipFinalObjectEncode).']';
+		}
+
+		$lines = explode("\n", chunk_split($msg, 5000, "\n"));
+		foreach ($lines as $i => $line) {
+			if (empty($line)) {
+				continue;
+			}
+			$header = 'X-Wf-1-' . $structureIndex . '-1-' . $_this->_messageIndex;
+			if (count($lines) > 2) {
+				$first = ($i == 0) ? strlen($msg) : '';
+				$end = ($i < count($lines) - 2) ? '\\' : '';
+				$message = $first . '|' . $line . '|' . $end;
+				$_this->_sendHeader($header, $message);
+			} else {
+				$_this->_sendHeader($header, strlen($line) . '|' . $line . '|');
+			}
+			$_this->_messageIndex++;
+			if ($_this->_messageIndex > 99999) {
+				trigger_error(__('Maximum number (99,999) of messages reached!', true), E_USER_WARNING);
+			}
+		}
+		$_this->_sendHeader('X-Wf-1-Index', $_this->_messageIndex - 1);
+		return true;
+	}
+/**
+ * Parse a debug backtrace
+ *
+ * @param array $trace Debug backtrace output
+ * @access protected
+ * @return array
+ **/
+	function _parseTrace($trace, $messageName) {
+		$message = array();
+		for ($i = 0, $len = count($trace); $i < $len ; $i++) {
+			$keySet = (isset($trace[$i]['class']) && isset($trace[$i]['function']));
+			$selfCall = ($keySet && $trace[$i]['class'] == 'FireCake');
+			if (!$selfCall) {
+				$message = array(
+					'Class' => isset($trace[$i]['class']) ? $trace[$i]['class'] : '',
+					'Type' => isset($trace[$i]['type']) ? $trace[$i]['type'] : '',
+					'Function' => isset($trace[$i]['function']) ? $trace[$i]['function'] : '',
+					'Message' => $messageName,
+					'File' => isset($trace[$i]['file']) ? Debugger::trimPath($trace[$i]['file']) : '',
+					'Line' => isset($trace[$i]['line']) ? $trace[$i]['line'] : '',
+					'Args' => isset($trace[$i]['args']) ? $this->stringEncode($trace[$i]['args']) : '',
+					'Trace' => $this->_escapeTrace(array_splice($trace, $i + 1))
+				);
+				break;
+			}
+		}
+		return $message;
+	}
+/**
+ * Fix a trace for use in output
+ *
+ * @param mixed $trace Trace to fix
+ * @access protected
+ * @static
+ * @return string
+ **/
+	function _escapeTrace($trace) {
+		for ($i = 0, $len = count($trace); $i < $len; $i++) {
+			if (isset($trace[$i]['file'])) {
+				$trace[$i]['file'] = Debugger::trimPath($trace[$i]['file']);
+			}
+			if (isset($trace[$i]['args'])) {
+				$trace[$i]['args'] = $this->stringEncode($trace[$i]['args']);
+			}
+		}
+		return $trace;
+	}
+/**
+ * Encode non string objects to string.
+ * Filter out recursion, so no errors are raised by json_encode or $javascript->object()
+ * 
+ * @param mixed $object Object or variable to encode to string.
+ * @param int $objectDepth Current Depth in object chains.
+ * @param int $arrayDepth Current Depth in array chains.
+ * @static
+ * @return void
+ **/
+	function stringEncode($object, $objectDepth = 1, $arrayDepth = 1) {
+		$_this = FireCake::getInstance();
+		$return = array();
+		if (is_resource($object)) {
+			return '** ' . (string)$object . '**';
+		}
+		if (is_object($object)) {
+			if ($objectDepth == $_this->options['maxObjectDepth']) {
+				return '** Max Object Depth (' . $_this->options['maxObjectDepth'] . ') **';
+			}
+			foreach ($_this->_encodedObjects as $encoded) {
+				if ($encoded === $object) {
+					return '** Recursion (' . get_class($object) . ') **';
+				}
+			}
+			$_this->_encodedObjects[] =  $object;
+
+			$return['__className'] = $class = get_class($object);
+			$properties = (array) $object;
+			foreach ($properties as $name => $property) {
+				$return[$name] = FireCake::stringEncode($property, 1, $objectDepth + 1);
+			}
+			array_pop($_this->_encodedObjects);
+		}
+		if (is_array($object)) {
+			if ($arrayDepth == $_this->options['maxArrayDepth']) {
+				return '** Max Array Depth ('. $_this->options['maxArrayDepth'] . ') **';
+			}
+			foreach ($object as $key => $value) {
+				$return[$key] = FireCake::stringEncode($value, 1, $arrayDepth + 1);
+			}
+		}
+		if (is_string($object) || is_numeric($object) || is_bool($object) || is_null($object)) {
+			return $object;
+		}
+		return $return;
+	}
+/**
+ * Encode an object into JSON
+ *
+ * @param mixed $object Object or array to json encode
+ * @param boolean $doIt
+ * @access public
+ * @static
+ * @return string
+ **/
+	function jsonEncode($object, $skipEncode = false) {
+		$_this = FireCake::getInstance();
+		if (!$skipEncode) {
+			$object = FireCake::stringEncode($object);
+		}
+		
+		if (function_exists('json_encode') && $_this->options['useNativeJsonEncode']) {
+			return json_encode($object);
+		} else {
+			return FireCake::_jsonEncode($object);
+		}
+	}
+/**
+ * jsonEncode Helper method for PHP4 compatibility
+ *
+ * @param mixed $object Something to encode
+ * @access protected
+ * @static
+ * @return string
+ **/
+	function _jsonEncode($object) {
+		if (!class_exists('JavascriptHelper')) {
+			App::import('Helper', 'Javascript');
+		}
+		$javascript = new JavascriptHelper();
+		$javascript->useNative = false;
+		return $javascript->object($object);
+	}
+/**
+ * Send Headers - write headers.
+ *
+ * @access protected
+ * @return void
+ **/
+	function _sendHeader($name, $value) {
+		header($name . ': ' . $value);
+	}
+}
+?>

site/plugins/debug_kit/vendors/js/jquery_debug_toolbar.js

@@ -0,0 +1,84 @@
+/* SVN FILE: $Id$ */
+/**
+ * Debug Toolbar Javascript.  jQuery 1.2.x compatible.
+ *
+ * Long description here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.4487
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+(function($) {
+$(document).ready(function(){
+	DebugKit.Toolbar();
+	DebugKit.NeatArray();
+});
+
+var DebugKit = {};
+/**
+ * Create all behaviors for neat array elements
+ *
+ */
+DebugKit.NeatArray = function() {
+	$('.neat-array').find('li:has(ul)').toggle(
+		function() {
+			$(this).toggleClass('expanded').removeClass('collapsed').find('ul:first').show();
+		},
+		function() {
+			$(this).toggleClass('expanded').addClass('collapsed').find('ul:first').hide();
+		}
+	).addClass('expandable').addClass('collapsed').find('ul').hide();
+}
+/**
+ * Add behavior for toolbar buttons
+ *
+ */
+DebugKit.Toolbar = function() {
+	var tabCollection = $('#debug-kit-toolbar li > div');
+	 
+	$('#debug-kit-toolbar .panel-tab > a').click(
+		function(e){
+			e.preventDefault();
+			var targetPanel = $(this.hash + '-tab');
+			if (targetPanel.hasClass('active')) {
+				tabCollection.hide().removeClass('active');
+			} else {
+				tabCollection
+					.hide().removeClass('active')
+					.filter(this.hash + '-tab').show().addClass('active');
+			}
+			$('#debug-kit-toolbar .panel-tab > a').removeClass('active');
+			$(this).addClass('active');
+		}
+	);
+	
+	//enable hiding of toolbar.
+	var panelButtons = $('#debug-kit-toolbar .panel-tab:not(.panel-tab.icon)');
+	$('#debug-kit-toolbar #hide-toolbar').toggle(
+		function() {
+			panelButtons.hide();
+		},
+		function() {
+			panelButtons.show();
+		}
+	);
+}
+})(jQuery);

site/plugins/debug_kit/vendors/js/js_debug_toolbar.js

@@ -0,0 +1,212 @@
+/* SVN FILE: $Id$ */
+/**
+ * Debug Toolbar Javascript.
+ *
+ * Long description here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.4487
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+var DebugKit = function(id) {
+	var undefined,
+		elements = {},
+		panels = {},
+		hidden = false;
+
+	this.initialize = function(id) {
+		elements.toolbar = document.getElementById(id || 'debug-kit-toolbar');
+
+		if (elements.toolbar === undefined) {
+			throw new Exception('Toolbar not found, make sure you loaded it.');
+		}
+
+		for (var i in elements.toolbar.childNodes) {
+			var element = elements.toolbar.childNodes[i];
+			if (element.nodeName && element.id === 'panel-tabs') {
+				elements.panel = element;
+				break;
+			}
+		}
+
+		for (var i in elements.panel.childNodes) {
+			var element = elements.panel.childNodes[i];
+			if (element.className && element.className.match(/panel-tab/)) {
+				this.addPanel(element);
+			}
+		}
+
+		var lists = document.getElementsByTagName('ul'), index = 0;
+		while (lists[index] !== undefined) {
+			var element = lists[index];
+			if (element.className && element.className.match(/neat-array/)) {
+				neatArray(element);
+			}
+			++index;
+		}
+	}
+/**
+ * Add a panel to the toolbar
+ */
+	this.addPanel = function(tab, callback) {
+		if (!tab.nodeName || tab.nodeName.toUpperCase() !== 'LI') {
+			throw new Exception('Toolbar not found, make sure you loaded it.');
+		}
+		var panel = {
+			id : false,
+			element : tab,
+			callback : callback,
+			button : undefined,
+			content : undefined,
+			active : false
+		};
+		for (var i in tab.childNodes) {
+			var element = tab.childNodes[i],
+				tag = element.nodeName? element.nodeName.toUpperCase(): false;
+			if (tag === 'A') {
+				panel.id = element.hash.replace(/^#/, '');
+				panel.button = element;
+			} else if (tag === 'DIV') {
+				panel.content = element;
+			}
+		}
+		if (!panel.id) {
+			throw new Exception('invalid element');
+		}
+
+		if (panel.button.id && panel.button.id === 'hide-toolbar') {
+			panel.callback = this.toggleToolbar;
+		}
+
+		if (panel.callback !== undefined) {
+			panel.button.onclick = function() { return panel.callback(); };
+		} else {
+			panel.button.onclick = function() { return window.DebugKit.togglePanel(panel.id); };
+		}
+
+		panels[panel.id] = panel;
+		return panel.id;
+	};
+/**
+ * Hide/show the toolbar (minimize cake)
+ */	
+	this.toggleToolbar = function() {
+		for (var i in panels) {
+			var panel = panels[i],
+				display = hidden? 'block': 'none';
+			if (panel.content !== undefined) {
+				panel.element.style.display = display;
+			}
+		}
+		hidden = !hidden;
+		return true;
+	};
+/**
+ * Toggle a panel
+ */
+	this.togglePanel = function(id) {
+		if (panels[id] && panels[id].active) {
+			this.deactivatePanel(true);
+		} else {
+			this.deactivatePanel(true);
+			this.activatePanel(id);
+		}
+	}
+/**
+ * Make a panel active.
+ */
+	this.activatePanel = function(id, unique) {
+		if (panels[id] !== undefined && !panels[id].active) {
+			var panel = panels[id];
+			this.deactivatePanel(true);
+			if (panel.content !== undefined) {
+				panel.content.style.display = 'block';
+			}
+			panel.button.className = panel.button.className.replace(/^(.*)$/, '$1 active');
+			panel.active = true;
+			return true;
+		}
+		return false;
+	};
+/**
+ * Deactivate a panel.  use true to hide all panels.
+ */
+	this.deactivatePanel = function(id) {
+		if (id === true) {
+			for (var i in panels) {
+				this.deactivatePanel(i);
+			}
+			return true;
+		}
+		if (panels[id] !== undefined && panels[id].active) {
+			var panel = panels[id];
+			if (panel.content !== undefined) {
+				panel.content.style.display = 'none';
+			}
+			panel.button.className = panel.button.className.replace(/ ?(active) ?/, '');
+			panel.active = false;
+			return true;
+		}
+		return false;
+	};
+/**
+ * Add neat array functionality.
+ */
+	function neatArray(list) {
+		if (!list.className.match(/depth-0/)) {
+			var item = list.parentNode;
+			list.style.display = 'none';
+			item.className = (item.className || '').replace(/^(.*)$/, '$1 expandable collapsed');
+			item.onclick = function(event) {
+				//var element = (event === undefined)? this: event.target;
+				var element = this,
+					event = event || window.event,
+					act = Boolean(item === element),
+					hide = Boolean(list.style.display === 'block');
+				if (act && hide) {
+					list.style.display = 'none';
+					item.className = item.className.replace(/expanded|$/, 'collapsed');
+				} else if (act) {
+					list.style.display = 'block';
+					item.className = item.className.replace('collapsed', 'expanded');
+				}
+				
+				if (event.cancelBubble !== undefined) {
+					event.cancelBubble = true;
+				}
+				return false;
+			}
+		}
+	}
+
+	this.initialize(id);
+}
+
+DebugKit.install = function() {
+	var initializer = window.onload || function() {};
+	window.onload = function() {
+		initializer();
+		// makes DebugKit a singletone instance
+		window.DebugKit = new DebugKit();
+	}
+}
+
+DebugKit.install();

site/plugins/debug_kit/vendors/js/mootools_debug_toolbar.js

@@ -0,0 +1,95 @@
+/* SVN FILE: $Id$ */
+/**
+ * Debug Toolbar Javascript.  Mootools 1.2 compatible.
+ *
+ * Requires Class, Event, Element, and Selectors 
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.4487
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+window.addEvent('domready', function() {
+	new DebugKit();
+});
+var DebugKit = new Class({
+	initialize : function() {
+		this.neatArray();
+		this.toolbar();
+	},
+/**
+ * Create all behaviors for neat array elements
+ */
+	neatArray : function() {
+		$$('#debug-kit-toolbar .neat-array li').each(function(listItem) {
+			var subUl = listItem.getElement('ul');
+			if (subUl) {
+				listItem.addClass('expandable').addClass('collapsed');
+				subUl.setStyle('display', 'none').set('state', 'closed');
+				listItem.addEvent('click', function(event) {
+					event.stop();
+					this.toggleClass('expanded').toggleClass('collapsed');
+					if (subUl.get('state') == 'closed') {
+						subUl.setStyle('display', 'block').set('state', 'open');
+					} else {
+						subUl.setStyle('display', 'none').set('state', 'closed');
+					}
+				}) 
+			}
+		});
+	},
+
+	/**
+	 * Add behavior for toolbar buttons
+	 */
+	toolbar : function() {
+		var tabCollection = $$('#debug-kit-toolbar li > div');
+
+		$$('#debug-kit-toolbar .panel-tab > a').addEvent('click', function(event) {
+			event.stop();
+			var buttonId = this.hash.substring(1, this.hash.length) + '-tab';
+			var targetPanel = $(buttonId);
+			if (!targetPanel) return;
+			$$('#debug-kit-toolbar .panel-tab > a').removeClass('active');
+			if (targetPanel.hasClass('active')) {
+				tabCollection.removeClass('active').setStyle('display', 'none');
+			} else {
+				tabCollection.setStyle('display', 'none').removeClass('active');
+				targetPanel.addClass('active').setStyle('display', 'block');
+				this.addClass('active');
+			}
+		});
+
+		//enable hiding of toolbar.
+		var panelButtons = $$('#debug-kit-toolbar .panel-tab:not(.panel-tab.icon)');
+		var toolbarHide = $('hide-toolbar').set('state', 'open');
+		toolbarHide.addEvent('click', function(event) {
+			event.stop();
+			var state = this.get('state');
+			if (state == 'open') {
+				panelButtons.setStyle('display', 'none');
+				this.set('state', 'closed')
+			} else {
+				panelButtons.setStyle('display');
+				this.set('state', 'open');
+			}
+		});
+	}
+});

site/plugins/debug_kit/vendors/js/prototype_debug_toolbar.js

@@ -0,0 +1,95 @@
+/* SVN FILE: $Id$ */
+/**
+ * Debug Toolbar Javascript.  Prototype 1.6.x compatible.
+ *
+ * Long description here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.4487
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+document.observe('dom:loaded', function() {
+	new DebugKit();
+});
+
+var DebugKit = Class.create({
+  
+  initialize: function(){
+    this.toolbar();
+    this.neatArray();
+  },
+  
+  toolbar: function(){
+  	var tabCollection = $('debug-kit-toolbar').select('li > div');
+	 
+  	$('debug-kit-toolbar').select('.panel-tab > a').invoke('observe', 'click', function(e){
+  			e.stop();
+  			var targetPanel = $(e.element().hash.replace(/#/, '') + '-tab');
+  			if (targetPanel.hasClassName('active')) {
+  				tabCollection.each(function(ele){
+				    ele.hide().removeClassName('active');
+  				});
+  			} else {
+  				tabCollection.each(function(ele){
+  				  ele.hide().removeClassName('active');
+  				  if (targetPanel.id == ele.id) {
+				      ele.setStyle({display: 'block'}).addClassName('active');
+				    }
+  				});
+  			}
+  			$('debug-kit-toolbar').select('.panel-tab > a').invoke('removeClassName', 'active');
+  			e.element().addClassName('active');
+  	});
+	
+  	// enable hiding of toolbar.
+  	var panelButtons = $('debug-kit-toolbar').select('.panel-tab');
+  	$('hide-toolbar').observe('click', function(eve){
+  	  eve.stop();
+  	  panelButtons.each(function(panel){
+  	    if (!panel.hasClassName('icon')) {
+  	      panel.toggle();
+  	    };
+  	  });
+  	});
+  },
+  
+/**
+ * Create all behaviors for neat array elements
+ */
+  neatArray: function() {
+    $('debug-kit-toolbar').select('.neat-array li').each(function(ele){
+      var sub = ele.select('ul');
+      if (sub.length > 0) {
+        ele.addClassName('collapsed').addClassName('expandable');
+        sub.invoke('hide');
+        ele.observe('click', function(eve){
+          if (eve.element() == ele || eve.element().up() == ele) {
+            if (sub.length > 0) {
+              ele.toggleClassName('expanded').toggleClassName('collapsed');
+              sub[0].toggle();
+            } 
+          }
+        });
+      };
+    });
+  }
+  
+});

site/plugins/debug_kit/vendors/js/yui_debug_toolbar.js

@@ -0,0 +1,126 @@
+/* SVN FILE: $Id$ */
+/**
+ * Debug Toolbar Javascript.  YUI 2.6 compatible.
+ *
+ * Long description here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.4487
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+
+YAHOO.namespace('CakePHP.DebugKit');
+
+YAHOO.CakePHP.DebugKit = function() {
+
+	var Event    = YAHOO.util.Event;
+	var Dom      = YAHOO.util.Dom;
+	var Selector = YAHOO.util.Selector;
+	
+	
+	var toggle = function(el) {
+ 		Dom.setStyle(el, 'display', ((Dom.getStyle(el, 'display') == 'none') ? '' : 'none'));
+	};
+
+	var toggleClass = function(element, className) {
+		(Dom.hasClass(element, className)) ? Dom.removeClass(element, className) : Dom.addClass(element, className);
+	};
+	
+	
+	
+	var toolbar = function() {
+		var tabCollection = Selector.query('#debug-kit-toolbar li > div');
+		
+		Dom.batch(Selector.query('#debug-kit-toolbar .panel-tab > a'), function(el) {
+			Event.on(el, 'click', function(ev) {
+				Event.preventDefault(ev);
+				targetPanel =Dom.get(el.hash.replace(/#/, '') + '-tab');
+
+				if (Dom.hasClass(targetPanel, 'active')) {
+					Dom.batch(tabCollection, function(ele) {
+						toggle(ele);
+						Dom.removeClass(ele, 'active');
+						Dom.setStyle(ele, 'display', '');
+					});
+				} else {
+					Dom.batch(tabCollection, function(ele) {
+						toggle(ele);
+						Dom.removeClass(ele, 'active');
+						
+						if (targetPanel && targetPanel.id == ele.id) {
+							Dom.setStyle(ele, 'display', 'block');
+							Dom.addClass(ele, 'active');
+						}
+					});
+				}
+				
+				Dom.removeClass(Selector.query('#debug-kit-toolbar .panel-tab > a'), 'active');
+				Dom.addClass(el, 'active');
+			});
+		});
+		
+	};
+	
+
+	
+	var neatArray = function() {
+		nodes   = Selector.query('#debug-kit-toolbar .panel-content > ul.neat-array li > ul');
+		
+		if (nodes.length > 0) {
+			Dom.batch(nodes, function(el) {
+				
+				var parent = el.parentNode;
+				
+				Dom.addClass(parent, 'collapsed');
+				Dom.addClass(parent, 'expandable');
+				toggle(nodes);
+				
+				Event.on(parent, 'click', function(ev) {
+					sub = Selector.query('ul', parent);
+					toggleClass(parent, 'expanded');
+					toggleClass(parent, 'collapsed');
+					toggle(sub);
+				});
+			});
+		}	
+	};
+	
+	var panelButtons = function() {
+		Event.on('hide-toolbar', 'click', function(ev) {
+			Event.preventDefault(ev);
+
+			Dom.getElementsByClassName('panel-tab', 'li', 'debug-kit-toolbar', function (el) {
+				if (!Dom.hasClass(el, 'icon')) {
+					toggle(el);
+				}
+			});			
+		});
+	};
+		
+	return {
+		initialize: function() {
+			neatArray();
+			toolbar();
+			panelButtons();
+		}
+	};
+}(); // Execute annonymous closure & return results
+
+YAHOO.util.Event.onDOMReady(YAHOO.CakePHP.DebugKit.initialize);

site/plugins/debug_kit/vendors/shells/benchmark.php

@@ -0,0 +1,79 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Benchmark Shell.
+ *
+ * Provides basic benchmarking of application requests 
+ * functionally similar to Apache AB
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.debug_kit.vendors.shells
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+class BenchmarkShell extends Shell {
+	function main() {
+		$url = $this->args[0];
+		$this->out(sprintf('-> Testing %s', $url));
+
+		$n = 100;
+		$t = $i = 0;
+		if (isset($this->params['n'])) {
+			$n = $this->params['n'];
+		}
+		if (isset($this->params['t'])) {
+			$t = $this->params['t'];
+		}
+		$start = microtime(true);
+		while (true) {
+			if ($t && $t <= floor(microtime(true) - $start)) {
+				break;
+			}
+			if ($n <= $i) {
+				break;
+			}
+			file_get_contents($url);
+			$i++;
+		}
+		$duration = microtime(true) - $start;
+		$this->out('Total Requests made: ' . $i);
+		$this->out('Total Time elapsed: ' . $duration . '(s)');
+		$this->out(round($n / $duration, 2).' req/sec');
+	}
+	
+	function help() {
+		$out = <<<EOL
+	DebugKit Benchmark Shell
+	
+	Test a fully qualified url to get avg requests per second.
+	By default it does 100 requests to the provided url.
+	
+	Use:
+		cake benchmark [params] [url]
+	
+	Params
+		-n The maximum number of iterations to do.
+		
+		-t The maximum time to take. If a single request takes more
+			than this time. Only one request will be made.
+EOL;
+		$this->out($out);
+	}
+}
+
+?>

site/plugins/debug_kit/views/debug.php

@@ -0,0 +1,154 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Debug View
+ *
+ * Custom Debug View class, helps with development.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright		Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link			http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package			cake
+ * @subpackage		cake.cake.libs.
+ * @since			CakePHP v 1.2.0.4487
+ * @version			$Revision$
+ * @modifiedby		$LastChangedBy$
+ * @lastmodified	$Date$
+ * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+App::import('Vendor', 'DebugKit.DebugKitDebugger');
+App::import('Component', 'DebugKit.Toolbar');
+/**
+ * DebugView used by DebugKit
+ *
+ * @package debug_kit.views
+ * @todo Remove workarounds.
+ */
+class DebugView extends DoppelGangerView {
+/**
+ * The old extension of the current template.
+ *
+ * @var string
+ */
+	var $_oldExtension = null;
+/**
+ * Overload _render to capture filenames and time actual rendering of each view file
+ *
+ * @param string $___viewFn Filename of the view
+ * @param array $___dataForView Data to include in rendered view
+ * @return string Rendered output
+ * @access protected
+ */
+	function _render($___viewFn, $___dataForView, $loadHelpers = true, $cached = false) {
+/* 		pr(array('function' => 'DebugView::_render', */
+/* 			 'args' => compact('__viewFn', '__dataForView', 'loadHelpers'), */
+/* 			 'this-output-len' => strlen($this->output), */
+/* 			 )); */
+		if (isset($this->_oldExtension) && strstr($___viewFn, '.debug_view')) {
+			$___viewFn = substr($___viewFn, 0, -10) . $this->_oldExtension;
+		}
+		if (!isset($___dataForView['disableTimer'])) {
+			DebugKitDebugger::startTimer('render_' . basename($___viewFn), sprintf(__('Rendering %s', true), Debugger::trimPath($___viewFn)));
+		}
+
+		$out = parent::_render($___viewFn, $___dataForView, $loadHelpers, $cached);
+
+		if (!isset($___dataForView['disableTimer'])) {
+			DebugKitDebugger::stopTimer('render_' . basename($___viewFn));
+		}
+/* 		pr(array('function' => 'DebugView::_render', */
+/* 			 'out-len' => strlen($out), */
+/* 			 'this-output-len' => strlen($this->output), */
+/* 			 'return' => $out ? 'not-empty' : 'empty')); */
+		return $out;
+	}
+	
+/**
+ * Renders view for given action and layout. If $file is given, that is used
+ * for a view filename (e.g. customFunkyView.ctp).
+ * Adds timers, for all subsequent rendering, and injects the debugKit toolbar.
+ *
+ * @param string $action Name of action to render for
+ * @param string $layout Layout to use
+ * @param string $file Custom filename for view
+ * @return string Rendered Element
+ */	
+	function render($action = null, $layout = null, $file = null) {
+/* 		pr(array('function' => 'DebugView::render', */
+/* 			 'args' => compact('action', 'layout', 'file'), */
+/* 			 'this-output-len' => strlen($this->output), */
+/* 			 )); */
+		DebugKitDebugger::startTimer('viewRender', __('Rendering View', true));
+		$out = parent::render($action, $layout, $file);
+/* 		pr(array('function' => 'DebugView::render', */
+/* 			 'checkpoint' => 'parent::render', */
+/* 			 'out' => $out ? 'not-empty' : 'empty')); */
+		DebugKitDebugger::stopTimer('viewRender');
+		DebugKitDebugger::stopTimer('controllerRender');
+		
+		if (isset($this->loaded['toolbar'])) {
+/* 			pr(array('function' => 'DebugView::render', */
+/* 				 'checkpoint' => 'toolbarLoaded')); */
+			$this->loaded['toolbar']->postRender();
+		}
+		//Temporary work around to hide the SQL dump at page bottom
+		Configure::write('debug', 0);
+/* 		pr(array('function' => 'DebugView::render', */
+/* 			 'out-len' => strlen($out), */
+/* 			 'this-output-len' => strlen($this->output), */
+/* 			 'return' => $this->output ? 'not-empty' : 'empty')); */
+		return $this->output;
+	}
+
+/**
+ * Workaround _render() limitation in core. Which forces View::_render() for .ctp and .thtml templates
+ * Creates temporary extension to trick View::render() & View::renderLayout()
+ *
+ * @param string $name Action name.
+ * @return string
+ **/
+	function _getViewFileName($name = null) {
+		$filename = parent::_getViewFileName($name);
+		return $this->_replaceExtension($filename);
+	}
+	
+/**
+ * Workaround _render() limitation in core. Which forces View::_render() for .ctp and .thtml templates
+ * Creates temporary extension to trick View::render() & View::renderLayout()
+ *
+ * @param string $name Layout Name
+ * @return string
+ **/
+	function _getLayoutFileName($name = null) {
+		$filename = parent::_getLayoutFileName($name);
+		return $this->_replaceExtension($filename);
+	}
+	
+/**
+ * replace the Extension on a filename and set the temporary workaround extension.
+ *
+ * @param string $filename Filename to replace extension for.
+ * @return string
+ **/
+	function _replaceExtension($filename) {
+		if (substr($filename, -3) == 'ctp') {
+			$this->_oldExtension = 'ctp';
+			$filename = substr($filename, 0, strlen($filename) -3) . 'debug_view';
+		} elseif (substr($filename, -5) == 'thtml') {
+			$this->_oldExtension = 'thtml';
+			$filename = substr($filename, 0, strlen($filename) -5) . 'debug_view';
+		}
+		return $filename;
+	}
+}
+?>

site/plugins/debug_kit/views/elements/debug_toolbar.ctp

@@ -0,0 +1,52 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Debug Toolbar Element
+ *
+ * Renders all of the other panel elements.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.debug_kit.views.elements
+ * @since         
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+?>
+<div id="debug-kit-toolbar">
+	<?php if (empty($debugToolbarPanels)) :?>
+		<p class="warning"><?php __('There are no active panels. You must enable a panel to see its output.'); ?></p>
+	<?php else: ?>
+		<ul id="panel-tabs">
+			<li class="panel-tab icon">
+				<a href="#hide" id="hide-toolbar">
+					<?php echo $html->image('/debug_kit/img/cake.icon.png', array('alt' => 'cakePHP')); ?>
+				</a>
+			</li>
+			<?php foreach ($debugToolbarPanels as $panelName => $panelInfo): ?>
+				<li class="panel-tab">
+					<a href="#<?php echo Inflector::underscore($panelName); ?>">
+						<?php echo Inflector::humanize(Inflector::underscore($panelName)); ?>
+					</a>
+					<div class="panel-content" id="<?php echo Inflector::underscore($panelName); ?>-tab">
+						<?php echo $this->element($panelInfo['elementName'], $panelInfo); ?>
+					</div>
+				</li>
+			<?php endforeach ?>
+		</ul>
+	<?php endif; ?>
+</div>

site/plugins/debug_kit/views/elements/log_panel.ctp

@@ -0,0 +1,48 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Log Panel Element
+ *
+ * 
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.debug_kit.views.elements
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+?>
+<h2><?php __('Logs') ?></h2>
+<div class="code-table">
+<?php foreach ($content as $logName => $logs): ?>
+	<h3><?php echo $logName ?></h3>
+	<?php 
+		$len = count($logs);
+		if ($len > 0):
+			$headers = array(__('Time', true), __('Message', true));
+			$rows = array();
+			for ($i = 0; $i < $len; $i += 2):
+				$rows[] = array(
+					$logs[$i], $logs[$i + 1]
+				);
+			endfor;
+			echo $toolbar->table($rows, $headers, array('title' => $logName));
+		else: ?>
+		<p class="info"><?php __('There were no log entries made this request'); ?></p>
+	<?php endif; ?>
+<?php endforeach; ?>
+</div>

site/plugins/debug_kit/views/elements/memory_panel.ctp

@@ -0,0 +1,43 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Session Panel Element
+ *
+ * 
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.debug_kit.views.elements
+ * @since         
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+?>
+<h2><?php __('Memory'); ?></h2>
+<div class="current-mem-use">
+	<?php echo $toolbar->message(
+		__('Current Memory Use',true),
+		$number->toReadableSize(DebugKitDebugger::getMemoryUse())
+	);?>
+</div>
+<div class="peak-mem-use">
+<?php
+	echo $toolbar->message(
+		__('Peak Memory Use', true),
+		$number->toReadableSize(DebugKitDebugger::getPeakMemoryUse())
+	);
+?></div>

site/plugins/debug_kit/views/elements/request_panel.ctp

@@ -0,0 +1,45 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Request Panel Element
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.debug_kit.views.elements
+ * @since         
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+?>
+<h2> <?php __('Request'); ?></h2>
+<h4>Cake Params</h4>
+<?php echo $toolbar->makeNeatArray($content['params']); ?>
+
+<h4>$_GET</h4>
+<?php echo $toolbar->makeNeatArray($content['get']); ?>
+
+<h4>Cookie</h4>
+<?php if (isset($content['cookie'])): ?>
+	<?php echo $toolbar->makeNeatArray($content['cookie']); ?>
+<?php else: ?>
+	<p class="warning">To view Cookies, add CookieComponent to Controller
+<?php endif; ?>
+
+<h4><?php __('Current Route') ?></h4>
+<?php echo $toolbar->makeNeatArray($content['currentRoute']); ?>

site/plugins/debug_kit/views/elements/session_panel.ctp

@@ -0,0 +1,31 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Session Panel Element
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.debug_kit.views.elements
+ * @since         
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+?>
+<h2><?php __('Session'); ?></h2>
+<?php echo $toolbar->makeNeatArray($content); ?>

site/plugins/debug_kit/views/elements/sql_log_panel.ctp

@@ -0,0 +1,40 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Session Panel Element
+ *
+ * 
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.debug_kit.views.elements
+ * @since         
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+?>
+<h2><?php __('Sql Logs')?></h2>
+<?php if (!empty($content)) : ?>
+	<?php foreach ($content as $dbName => $queryLog) : ?>
+	<div class="sql-log-panel-query-log">
+		<h4><?php echo $dbName ?></h4>
+		<?php echo $queryLog; ?>
+	</div>
+	<?php endforeach; ?>
+<?php else: ?>
+	<p class="warning"><?php __('No active database connections'); ?>
+<?php endif; ?>

site/plugins/debug_kit/views/elements/timer_panel.ctp

@@ -0,0 +1,44 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Timer Panel Element
+ *
+ * 
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.debug_kit.views.elements
+ * @since         
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+$timers = DebugKitDebugger::getTimers();
+?>
+<h2><?php __('Timers'); ?></h2>
+<p class="request-time">
+	<?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'],
+		$number->precision($timeInfo['time'], 6)
+	);
+	$headers = array(__('Message', true), __('time in seconds', true));
+endforeach;
+echo $toolbar->table($rows, $headers, array('title' => 'Timers')); ?>

site/plugins/debug_kit/views/elements/variables_panel.ctp

@@ -0,0 +1,35 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * View Variables Panel Element
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.debug_kit.views.elements
+ * @since         
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+?>
+<h2> <?php __('View Variables'); ?></h2>
+<?php 
+	$vars = $this->viewVars; 
+	unset($vars['debugToolbarPanels'], $vars['debugToolbarJavascript']);
+?>
+<?php echo $toolbar->makeNeatArray($vars); ?>

site/plugins/debug_kit/views/helpers/fire_php_toolbar.php

@@ -0,0 +1,79 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * FirePHP Toolbar Helper
+ *
+ * Injects the toolbar elements into non-HTML layouts via FireCake.
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.helpers
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+App::import('helper', 'DebugKit.Toolbar');
+App::import('Vendor', 'DebugKit.FireCake');
+
+class FirePhpToolbarHelper extends ToolbarHelper {
+/**
+ * send method
+ *
+ * @return void
+ * @access protected
+ */
+	function _send() {
+		$view =& ClassRegistry::getObject('view');
+		$view->element('debug_toolbar', array('plugin' => 'debug_kit', 'disableTimer' => true));
+		Configure::write('debug', 1);
+	}
+/**
+ * makeNeatArray.
+ *
+ * wraps FireCake::dump() allowing panel elements to continue functioning
+ *
+ * @param string $values 
+ * @return void
+ */	
+	function makeNeatArray($values) {
+		FireCake::info($values);
+	}
+/**
+ * Create a simple message
+ *
+ * @param string $label Label of message
+ * @param string $message Message content
+ * @return void
+ */
+	function message($label, $message) {
+		FireCake::log($message, $label);
+	}
+/**
+ * Generate a table with FireCake
+ *
+ * @param array $rows Rows to print
+ * @param array $headers Headers for table
+ * @param array $options Additional options and params
+ * @return void
+ */
+	function table($rows, $headers, $options = array()) {
+		$title = $headers[0];
+		if (isset($options['title'])) {
+			$title = $options['title'];
+		}
+		array_unshift($rows, $headers);
+		FireCake::table($title, $rows);
+	}
+}
+?>

site/plugins/debug_kit/views/helpers/html_toolbar.php

@@ -0,0 +1,150 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Html Toolbar Helper
+ *
+ * Injects the toolbar elements into HTML layouts.
+ * Contains helper methods for
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.helpers
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+App::import('helper', 'DebugKit.Toolbar');
+
+class HtmlToolbarHelper extends ToolbarHelper {
+/**
+ * helpers property
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array('Html', 'Javascript');
+/**
+ * settings property
+ *
+ * @var array
+ * @access public
+ */
+	var $settings = array('format' => 'html');
+/**
+ * Recursively goes through an array and makes neat HTML out of it.
+ *
+ * @param mixed $values Array to make pretty.
+ * @param int $openDepth Depth to add open class
+ * @param int $currentDepth current depth.
+ * @return string
+ **/
+	function makeNeatArray($values, $openDepth = 0, $currentDepth = 0) {
+		$className ="neat-array depth-$currentDepth";
+		if ($openDepth > $currentDepth) {
+			$className .= ' expanded';
+		}
+		$nextDepth = $currentDepth + 1;
+		$out = "<ul class=\"$className\">";
+		if (!is_array($values)) {
+			if (is_bool($values)) {
+				$values = array($values);
+			}
+			if (is_null($values)) {
+				$values = array(null);
+			}
+		}
+		foreach ($values as $key => $value) {
+			$out .= '<li><strong>' . $key . '</strong>';
+			if ($value === null) {
+				$value = '(null)';
+			}
+			if ($value === false) {
+				$value = '(false)';
+			}
+			if ($value === true) {
+				$value = '(true)';
+			}
+			if (empty($value) && $value != 0) {
+				$value = '(empty)';
+			}
+
+			if (is_object($value)) {
+				$value = Set::reverse($value, true);
+			}
+
+			if (is_array($value) && !empty($value)) {
+				$out .= $this->makeNeatArray($value, $openDepth, $nextDepth);
+			} else {
+				$out .= $value;
+			}
+			$out .= '</li>';
+		}
+		$out .= '</ul>';
+		return $out;
+	}
+/**
+ * Create an HTML message
+ *
+ * @param string $label label content
+ * @param string $message message content
+ * @return string
+ */
+	function message($label, $message) {
+		return sprintf('<p><strong>%s</strong> %s</p>', $label, $message);
+	}
+/**
+ * Create a table.
+ *
+ * @param array $rows Rows to make.
+ * @param array $headers Optional header row.
+ * @return string
+ */
+	function table($rows, $headers = array()) {
+		$out = '<table class="debug-table">';
+		if (!empty($headers)) {
+			$out .= $this->Html->tableHeaders($headers);
+		}
+		$out .= $this->Html->tableCells($rows, array('class' => 'odd'), array('class' => 'even'));
+		$out .= '</table>';
+		return $out;
+	}
+/**
+ * send method
+ *
+ * @return void
+ * @access protected
+ */
+	function _send() {
+		if (Configure::read('debug') == 0) {
+			return;
+		}
+		$view =& ClassRegistry::getObject('view');
+		$head = $this->Html->css('/debug_kit/css/debug_toolbar');
+		if (isset($view->viewVars['debugToolbarJavascript'])) {
+			foreach ($view->viewVars['debugToolbarJavascript'] as $script) {
+				if ($script) {
+					$head .= $this->Javascript->link($script);
+				}
+			}
+		}
+		if (preg_match('#</head>#', $view->output)) {
+			$view->output = preg_replace('#</head>#', $head . "\n</head>", $view->output, 1);
+		}
+		$toolbar = $view->element('debug_toolbar', array('plugin' => 'debug_kit', 'disableTimer' => true));
+		if (preg_match('#</body>#', $view->output)) {
+			$view->output = preg_replace('#</body>#', $toolbar . "\n</body>", $view->output, 1);
+		}
+	}
+}
+?>

site/plugins/debug_kit/views/helpers/toolbar.php

@@ -0,0 +1,90 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Abstract Toolbar helper.  Provides Base methods for content
+ * specific debug toolbar helpers.  Acts as a facade for other toolbars helpers as well.
+ *
+ * helps with development.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.helpers
+ * @since         v 1.0
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+App::import('Vendor', 'DebugKit.DebugKitDebugger');
+
+class ToolbarHelper extends AppHelper {
+/**
+ * settings property to be overloaded.  Subclasses should specify a format
+ *
+ * @var array
+ * @access public
+ */
+	var $settings = array();
+/**
+ * Construct the helper and make the backend helper.
+ *
+ * @param string $options 
+ * @access public
+ * @return void
+ */
+	function __construct($options = array()) {
+		$this->_myName = strtolower(get_class($this));
+		if ($this->_myName !== 'toolbarhelper') {
+			return;
+		}
+		if (!isset($options['output'])) {
+			$options['output'] = 'DebugKit.HtmlToolbar';
+		}
+		App::import('Helper', $options['output']);
+		$className = $options['output'];
+		if (strpos($options['output'], '.') !== false) {
+			list($plugin, $className) = explode('.', $options['output']);
+		}
+		$this->_backEndClassName =  $className;
+		$this->helpers = array($options['output']);
+	}
+
+/**
+ * call__
+ *
+ * Allows method calls on backend helper
+ *
+ * @param string $method 
+ * @param mixed $params 
+ * @access public
+ * @return void
+ */	
+	function call__($method, $params) {
+		if (method_exists($this->{$this->_backEndClassName}, $method)) {
+			return $this->{$this->_backEndClassName}->dispatchMethod($method, $params);
+		}
+	}
+
+/**
+ * postRender method
+ *
+ * Custom Callback defined in DebugView to allow helpers to modify
+ * View output after all rendering is complete.
+ *
+ * @return void
+ * @access public
+ */
+	function postRender() {
+		$this->_send();
+	}
+}

site/tmp/cache/models/cake_model_default_pmgr_list

@@ -1,2 +0,0 @@
-1243395559
-a:36:{i:0;s:12:"pmgr_actions";i:1;s:27:"pmgr_actions_late_schedules";i:2;s:17:"pmgr_charge_types";i:3;s:19:"pmgr_config_options";i:4;s:18:"pmgr_config_system";i:5;s:20:"pmgr_config_versions";i:6;s:22:"pmgr_contact_addresses";i:7;s:19:"pmgr_contact_emails";i:8;s:20:"pmgr_contact_methods";i:9;s:19:"pmgr_contact_phones";i:10;s:13:"pmgr_contacts";i:11;s:18:"pmgr_group_options";i:12;s:22:"pmgr_group_permissions";i:13;s:11:"pmgr_groups";i:14;s:19:"pmgr_late_schedules";i:15;s:19:"pmgr_lease_contacts";i:16;s:16:"pmgr_lease_types";i:17;s:11:"pmgr_leases";i:18;s:14:"pmgr_map_units";i:19;s:9:"pmgr_maps";i:20;s:10:"pmgr_notes";i:21;s:18:"pmgr_payment_types";i:22;s:15:"pmgr_site_areas";i:23;s:21:"pmgr_site_memberships";i:24;s:17:"pmgr_site_options";i:25;s:10:"pmgr_sites";i:26;s:24:"pmgr_transaction_charges";i:27;s:25:"pmgr_transaction_payments";i:28;s:25:"pmgr_transaction_receipts";i:29;s:32:"pmgr_transaction_reconciliations";i:30;s:15:"pmgr_unit_sizes";i:31;s:15:"pmgr_unit_types";i:32;s:10:"pmgr_units";i:33;s:17:"pmgr_user_options";i:34;s:10:"pmgr_users";i:35;s:5:"posts";}

site/views/accounts/collected.ctp

@@ -0,0 +1,205 @@
+<?php /* -*- mode:PHP -*- */
+
+echo '<div class="account collected">' . "\n";
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Javascript
+ */
+
+?>
+
+<script type="text/javascript"><!--
+
+// Reset the form
+function resetForm() {
+/*   updateEntriesGrid(); */
+}
+
+function onGridLoadComplete() {
+  var userdata = $('#collected-entries-jqGrid').getGridParam('userData');
+  $('#collected-total').html(fmtCurrency(userdata['total']));
+}
+
+function updateEntriesGrid() {
+  var account_ids = new Array();
+  $("INPUT[type='checkbox']:checked").each(function(i) {
+      account_ids.push($(this).val());
+    });
+
+  var cust = new Array();
+  cust['from_date']    = $('#TxFromDate').val();
+  cust['through_date'] = $('#TxThroughDate').val();
+  cust['account_id'] = account_ids;
+
+  var dynamic_post = new Array();
+  dynamic_post['custom'] = cust;
+
+  $('#collected-total').html('Calculating...');
+  $('#collected-entries-jqGrid').clearGridData();
+  $('#collected-entries-jqGrid').setPostDataItem('dynamic_post', serialize(dynamic_post));
+  $('#collected-entries-jqGrid')
+    .setGridParam({ page: 1 })
+    .trigger("reloadGrid");
+
+  //$('#collected-entries .HeaderButton').click();
+}
+
+
+--></script>
+
+<?php
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Summary Info Box
+ */
+
+echo '<div class="infobox">' . "\n";
+
+$rows = array();
+$rows[] = array('Total:', '<SPAN id="collected-total"></SPAN>');
+echo $this->element('table',
+		    array('class'   => 'summary',
+			  'rows'    => $rows,
+			  'column_class' => array('field', 'value'),
+			  'suppress_alternate_rows' => true,
+			  ));
+echo '</div>' . "\n";
+
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * User Configuration
+ */
+
+echo $form->create(null, array('id' => 'collected-form',
+			       'onsubmit' => 'return false',
+			       'url' => null));
+
+echo $form->input("id",
+		  array('id' => 'account-id',
+			'type' => 'hidden',
+			'value' => 0));
+
+/* echo '<fieldset class="account collected entry">'; */
+/* echo ' <legend>Payment Account</legend>'; */
+/* echo $form->input('Tx.account_id', */
+/* 		  array(//'label' => 'Payment<BR>Account', */
+/* 			'label' => false, */
+/* 			'type' => 'select', */
+/* 			'multiple' => 'checkbox', */
+/* 			'options' => $paymentAccounts, */
+/* 			'selected' => array_keys($defaultAccounts), */
+/* 			) */
+/* 		  ); */
+/* echo '</fieldset>'; */
+
+echo $this->element('form_table',
+		    array('class'  => "item account collected entry",
+			  //'with_name_after' => ':',
+			  'field_prefix' => 'Tx.',
+			  'fields' => array
+			  ("account_id"  => array('name' => 'Payment<BR>Account',
+						  'opts' =>
+						  array('type' => 'select',
+							'multiple' => 'checkbox',
+							'options' => $paymentAccounts,
+							'selected' => array_keys($defaultAccounts),
+							),
+						  ),
+			   ),
+			  ));
+
+echo $this->element('form_table',
+		    array('class'  => "item account collected entry",
+			  //'with_name_after' => ':',
+			  'field_prefix' => 'Tx.',
+			  'fields' => array
+			  ("from_date" => array('opts' =>
+						array('type' => 'text'),
+						'between' => '<A HREF="#" ONCLICK="datepickerBOM(null,\'TxFromDate\'); return false;">BOM</A>',
+						),
+			   "through_date" => array('opts' =>
+						   array('type' => 'text'),
+						   'between' => '<A HREF="#" ONCLICK="datepickerEOM(\'TxFromDate\',\'TxThroughDate\'); return false;">EOM</A>',
+						   ),
+			   ),
+			  ));
+
+echo $form->button('Update',
+		   array('onclick' => 'updateEntriesGrid(); return false',
+			 ));
+
+echo $form->end();
+
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Supporting Elements Section
+ */
+
+echo '<div CLASS="detail supporting">' . "\n";
+
+
+/**********************************************************************
+ * Entries
+ */
+
+echo $this->element('statement_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     (
+		      'grid_div_id' => 'collected-entries',
+		      'grid_div_class' => 'text-below',
+		      'grid_events' => array('loadComplete' => 'onGridLoadComplete()'),
+		      //'grid_setup' => array('hiddengrid' => true),
+		      //'caption' => '<SPAN id="receipt-charges-caption"></SPAN>',
+		      'caption' => 'Collected ' . Inflector::pluralize($account['name']),
+		      'filter' => array('StatementEntry.type' => 'PAYMENT',
+					'ChargeEntry.account_id' => $account['id']),
+		      'exclude' => array('Account', 'Charge'),
+		      ),
+		     ));
+
+?>
+
+<script type="text/javascript"><!--
+  $(document).ready(function(){
+      $("#TxFromDate")
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+                      showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
+
+      $("#TxThroughDate")
+	.attr('autocomplete', 'off')
+	.datepicker({ constrainInput: true,
+	              numberOfMonths: [1, 1],
+                      showCurrentAtPos: 0,
+                      dateFormat: 'mm/dd/yy' });
+
+      resetForm();
+  });
+--></script>
+
+<?php
+
+/* End "detail supporting" div */
+echo '</div>' . "\n";
+
+/* End page div */
+echo '</div>' . "\n";
+
+?>
+
+<a href="#" onClick="$('#debug').html(''); return false;">Clear Debug Output</a>

site/views/accounts/view.ctp

@@ -0,0 +1,113 @@
+<?php /* -*- mode:PHP -*- */
+
+echo '<div class="account view">' . "\n";
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Account Detail Main Section
+ */
+
+$ledger          = $account['Ledger'];
+$current_ledger  = $account['CurrentLedger'];
+
+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']);
+$rows[] = array('External Account',  $account['external_account']);
+$rows[] = array('Comment',           $account['comment']);
+
+echo $this->element('table',
+		    array('class'   => 'item account detail',
+			  'caption' => 'Account Detail',
+			  'rows'    => $rows,
+			  'column_class' => array('field', 'value')));
+
+
+/**********************************************************************
+ * Account Info Box
+ */
+
+echo '<div class="infobox">' . "\n";
+$rows = array();
+$rows[] = array('Debits:',           FormatHelper::currency($stats['debits']));
+$rows[] = array('Credits:',          FormatHelper::currency($stats['credits']));
+$rows[] = array('Account Balance:',  FormatHelper::currency($stats['balance']));
+echo $this->element('table',
+		    array('class'   => 'summary',
+			  'rows'    => $rows,
+			  'column_class' => array('field', 'value'),
+			  'suppress_alternate_rows' => true,
+			  ));
+echo '</div>' . "\n";
+
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Supporting Elements Section
+ */
+
+echo '<div CLASS="detail supporting">' . "\n";
+
+
+/**********************************************************************
+ * Ledgers
+ */
+
+echo $this->element('ledgers', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => $account['name'] . " Ledgers",
+		      'filter' => array('Account.id' => $account['id']),
+		      )));
+
+
+/**********************************************************************
+ * Current Ledger
+ */
+
+echo $this->element('ledger_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     ('grid_div_id' => 'ledger-ledger-entry-list',
+		      'caption' => ("Current Ledger: " .
+				    "(". $current_ledger['name'] .")"),
+		      'filter' => array('Ledger.id' => $current_ledger['id']),
+		      'exclude' => array('Account', 'Amount', 'Cr/Dr', 'Balance',
+					 empty($account['payments']) ? 'Tender' : null),
+		      'include' => array('Debit', 'Credit', 'Sub-Total'),
+		      )));
+
+
+
+/**********************************************************************
+ * Entire Account
+ */
+
+echo $this->element('ledger_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     ('grid_div_id' => 'account-ledger-entry-list',
+		      'grid_setup' => array('hiddengrid' => true),
+		      'caption' => "Entire Ledger",
+		      'filter' => array('Account.id' => $account['id']),
+		      'exclude' => array('Account', 'Amount', 'Cr/Dr', 'Balance',
+					 empty($account['payments']) ? 'Tender' : null),
+		      'include' => array('Debit', 'Credit', 'Sub-Total'),
+		      )));
+
+
+
+/* End "detail supporting" div */
+echo '</div>' . "\n";
+
+/* End page div */
+echo '</div>' . "\n";

site/views/charges/index.ctp

@@ -1,3 +0,0 @@
-<div class="charges index">
-<?php echo $this->element('charges', array('heading' => '<h2>'.$heading.'</h2>')) ?>
-</div>

site/views/charges/view.ctp

@@ -1,87 +0,0 @@
-<?php /* -*- mode:PHP -*- */ ?>
-
-<div class="charges view">
-
-<?php
-
-function currency($number) {
-   if ($number < 0)
-     return "($ " . number_format(-1*$number, 2) . ")";
-   else
-     return "$ " . number_format($number, 2);
-}
-
-function datefmt($date) {
-  $date_fmt = 'm/d/Y';
-  return ($date
-	  ? date_format(date_create($date), $date_fmt)
-	  : null);
-}
-
-/**********************************************************************
- * Charge Info
- */
-
-$rows = array(array('ID', $charge['Charge']['id']),
-	      array('Date', datefmt($charge['Charge']['charge_date'])),
-	      array('Through', datefmt($charge['Charge']['charge_to_date'])),
-	      array('Due', datefmt($charge['Charge']['due_date'])),
-	      array('Type', $charge['ChargeType']['name']),
-	      array('Lease', '#'.$charge['Lease']['number']),
-	      array('Amount', currency($charge['Charge']['amount'])),
-	      array('Tax', currency($charge['Charge']['tax'])),
-	      array('Total', currency($charge['Charge']['total'])),
-	      array('Comment',   $charge['Charge']['comment']));
-
-echo $this->element('table',
-		    array('class'   => 'item charge detail',
-			  'caption' => 'Charge Info',
-			  'rows'    => $rows,
-			  'column_class' => array('field', 'value')));
-
-
-?>
-<DIV CLASS="infobox charge">
-  <DIV CLASS="summary grand payment">
-    Amount Received: <?php echo currency($paymentAmount); ?>
-  </DIV>
-  <DIV CLASS="summary grand balance">
-    Amount Owing: <?php echo currency($balanceAmount); ?>
-  </DIV>
-</DIV>
-<?php
-
-
-
-/**********************************************************************
- * Receipts
- */
-
-$headers = array('ID', 'Timestamp', 'Comment', 'Applied', 'Balance');
-$rows = array();
-$running_total = $charge['Charge']['total'];
-foreach($charge['Receipt'] AS $receipt) {
-    $amount = $receipt['ChargesReceipt']['amount'];
-    $running_total -= $amount;
-    $rows[] = array($html->link('#'.$receipt['id'],
-				array('controller' => 'receipts',
-				      'action'     => 'view',
-				      $receipt['id'])),
-		    datefmt($receipt['stamp']),
-		    $receipt['comment'],
-		    currency($receipt['ChargesReceipt']['amount']),
-		    currency($running_total)
-		    );
-}
-
-echo $this->element('table',
-		    array('class'   => 'item receipt list',
-			  'caption' => 'Receipts towards Charge',
-			  'headers' => $headers,
-			  'rows'    => $rows,
-			  'column_class' => $headers));
-
-
-?>
-
-</div>

site/views/contacts/edit.ctp

@@ -0,0 +1,403 @@
+<?php /* -*- mode:PHP -*- */
+
+/**********************************************************************
+ * Because we make use of functions here,
+ * we need to put our top level variables somewhere
+ * we can access them.
+ */
+$this->varstore = compact('methodTypes', 'methodPreferences',
+			  'contactPhones', 'phoneTypes',
+			  'contactAddresses',
+			  'contactEmails');
+
+//pr($this->data);
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Javascript
+ */
+
+function contactMethodDiv($obj, $type, $legend, $values = null) {
+
+  $div = 
+    // BEGIN type-div
+    '<DIV>' . "\n" .
+    // BEGIN type-fieldset
+    '<FIELDSET CLASS="'.$type.' subset">' . "\n" .
+    '<LEGEND>'.$legend.' #%{id} (%{remove})</LEGEND>' . "\n" .
+
+    // BEGIN source-div
+    '<DIV ID="'.$type.'-%{id}-source-div">' . "\n" .
+    // BEGIN source-fieldset
+    '<FIELDSET>' . "\n" .
+    //'<LEGEND>Source</LEGEND>' . "\n" .
+    ''
+    ;
+
+  if (!isset($values)) {
+    foreach (array('Existing', 'New') AS $sname) {
+      $stype = strtolower($sname);
+      $div .=
+	'<INPUT TYPE="radio" ' . "\n" .
+	' NAME="data[Contact'.ucfirst($type).'][%{id}][source]"' . "\n" .
+	' ONCLICK="switchMethodSource(%{id}, '."'{$type}', '{$stype}'".')"' . "\n" .
+	' CLASS="'.$type.'-method-%{id}-source" ' . "\n" .
+	' ID="'.$type.'-method-%{id}-source-'.$stype.'"' . "\n" .
+	' VALUE="'.$stype.'"' . "\n" .
+	' />' . "\n" .
+	' <LABEL FOR="'.$type.'-method-%{id}-source-'.$stype.'">'.$sname.'</LABEL>' . "\n" .
+	' ';
+    }
+  }
+  $div .= "\n";
+
+  if (isset($values)) {
+    $div .= contactMethodTypeDiv($obj, $type, 'show', $values);
+  }
+  else {
+    $div .= contactMethodTypeDiv($obj, $type, 'existing');
+    $div .= contactMethodTypeDiv($obj, $type, 'new');
+  }
+
+  $div .=
+    // END source-fieldset
+    '</FIELDSET>' . "\n" .
+    // END source-div
+    '</DIV>' . "\n" .
+
+    // BEGIN method-div
+    '<div id="'.$type.'-%{id}-method-div"' . "\n" .
+
+    $obj->element
+    ('form_table',
+     array('class'  => "item contact-{$type} entry",
+	   'field_prefix' => 'Contact'.ucfirst($type).'.%{id}.ContactsMethod',
+	   'fields' => array
+	   (
+	    'preference' => array
+	    ('opts' => array
+	     ('options' => $obj->varstore['methodPreferences'],
+	      'selected' => (isset($values) ? $values['ContactsMethod']['preference'] : null),
+	      )),
+
+	    'type' => array
+	    ('opts' => array
+	     ('options' => $obj->varstore['methodTypes'],
+	      'selected' => (isset($values) ? $values['ContactsMethod']['type'] : null),
+	      )),
+
+	    'comment' => array
+	    ('opts' => array
+	     ('value' => (isset($values) ? $values['ContactsMethod']['comment'] : null),
+	      )),
+
+	    ))) . "\n" .
+    
+    // END method-div
+    '</div>' . "\n" . 
+
+    // END type-fieldset
+    '</FIELDSET>' . "\n" . 
+    // END type-div
+    '</DIV>'
+    ;
+
+  return $div;
+}
+
+function contactMethodTypeDiv($obj, $type, $stype, $values = null) {
+
+  $element = 'form_table';
+
+  if ($type === 'phone') {
+    if ($stype === 'existing') {
+      $fields = array
+	('id' => array('name' => 'Phone/Ext',
+		       'opts' => array('options' => $obj->varstore['contactPhones'])),
+	 );
+    }
+    elseif ($stype === 'new') {
+      $fields = array
+	('type' => array('opts' => array('options' => $obj->varstore['phoneTypes'])),
+	 'phone' => true,
+	 'ext' => array('name' => "Extension"),
+	 'comment' => true,
+	 );
+    }
+    elseif ($stype === 'show') {
+      $element = 'table';
+      $column_class = array('field', 'value');
+      $rows = array
+	(array('Type', $values['type']),
+	 array('Phone', $values['phone']),
+	 array('Extension', $values['ext']),
+	 array('Comment', $values['comment']),
+	 );
+    }
+    else {
+      die("\n\nInvalid stype ($stype)\n\n");
+    }
+
+  }
+  elseif ($type === 'address') {
+    if ($stype === 'existing') {
+      $fields = array
+	('id' => array('name' => 'Address',
+		       'opts' => array('options' => $obj->varstore['contactAddresses'])),
+	 );
+    }
+    elseif ($stype === 'new') {
+      $fields = array
+	('address' => true,
+	 'city' => true,
+	 'state' => true,
+	 'postcode' => array('name' => 'Zip Code'),
+	 'country' => true,
+	 'comment' => true,
+	 );
+    }
+    elseif ($stype === 'show') {
+      $element = 'table';
+      $column_class = array('field', 'value');
+      $rows = array
+	(array('Address', preg_replace("/\n/", "<BR>", $values['address'])),
+	 array('City', $values['city']),
+	 array('State', $values['state']),
+	 array('Zip Code', $values['postcode']),
+	 array('Country', $values['country']),
+	 array('Comment', $values['comment']),
+	 );
+    }
+    else {
+      die("\n\nInvalid stype ($stype)\n\n");
+    }
+  }
+  elseif ($type === 'email') {
+    if ($stype === 'existing') {
+      $fields = array
+	('id' => array('name' => 'Email',
+		       'opts' => array('options' => $obj->varstore['contactEmails'])),
+	 );
+    }
+    elseif ($stype === 'new') {
+      $fields = array
+	('email' => true,
+	 'comment' => true,
+	 );
+    }
+    elseif ($stype === 'show') {
+      $element = 'table';
+      $column_class = array('field', 'value');
+      $rows = array
+	(array('Email', $values['email']),
+	 array('Comment', $values['comment']),
+	 );
+    }
+  }
+  else {
+    die("\n\nInvalid type ($type)\n\n");
+  }
+
+  return
+    // BEGIN sourcetype-div
+    '<div ' . "\n" .
+    ' class="'.$type.'-%{id}-div"' . "\n" .
+    ' id="'.$type.'-%{id}-'.$stype.'-div"' . "\n" .
+    (isset($values) ? '' : ' STYLE="display:none;"' . "\n") .
+    '>' . "\n" .
+
+    $obj->element
+    ($element,
+     array('class'  => "item contact-{$type} {$stype}",
+	   'field_prefix' => 'Contact'.ucfirst($type).'.%{id}')
+     + compact('rows', 'fields', 'column_class')) .
+
+    ($stype === 'show'
+     ? '<input type="hidden" name="data[Contact'.ucfirst($type).'][%{id}][id]" value="'.$values['id'].'"/>' . "\n"
+     : '') .
+
+    // END sourcetype-div
+    '</div>' . "\n" .
+    '';
+}
+
+
+//pr($this->data);
+?>
+
+<script type="text/javascript"><!--
+
+  function addPhone(flash) {
+    addDiv('phone-entry-id', 'phone', 'phones', flash, <?php
+	   echo FormatHelper::phpVarToJavascript(contactMethodDiv($this,
+								  'phone',
+								  'Phone Number'),
+						 null,
+						 '           ');
+	   ?>
+	   );
+  }
+
+  function addAddress(flash) {
+    addDiv('address-entry-id', 'address', 'addresses', flash, <?php
+	   echo FormatHelper::phpVarToJavascript(contactMethodDiv($this,
+								  'address',
+								  'Address'),
+						 null,
+						 '           ');
+	   ?>
+	   );
+  }
+
+  function addEmail(flash) {
+    addDiv('email-entry-id', 'email', 'emails', flash, <?php
+	   echo FormatHelper::phpVarToJavascript(contactMethodDiv($this,
+								  'email',
+								  'Email Address'),
+						 null,
+						 '           ');
+	   ?>
+	   );
+  }
+
+  // Reset the form
+  function resetForm() {
+    $('#phones').html('');
+    $('#addresses').html('');
+    $('#emails').html('');
+    $('#phone-entry-id').val(1);
+    $('#address-entry-id').val(1);
+    $('#email-entry-id').val(1);
+
+    <?php foreach ($this->data['ContactPhone'] AS $phone): ?>
+    addDiv('phone-entry-id', 'phone', 'phones', false, <?php
+	   echo FormatHelper::phpVarToJavascript(contactMethodDiv($this,
+								  'phone',
+								  'Phone Number',
+								  $phone
+								  ),
+						 null,
+						 '           ');
+	   ?>
+	   );
+    <?php endforeach; ?>
+
+    <?php foreach ($this->data['ContactAddress'] AS $address): ?>
+    addDiv('address-entry-id', 'address', 'addresses', false, <?php
+	   echo FormatHelper::phpVarToJavascript(contactMethodDiv($this,
+								  'address',
+								  'Address',
+								  $address
+								  ),
+						 null,
+						 '           ');
+	   ?>
+	   );
+    <?php endforeach; ?>
+
+    <?php foreach ($this->data['ContactEmail'] AS $email): ?>
+    addDiv('email-entry-id', 'email', 'emails', false, <?php
+	   echo FormatHelper::phpVarToJavascript(contactMethodDiv($this,
+								  'email',
+								  'Email Address',
+								  $email
+								  ),
+						 null,
+						 '           ');
+	   ?>
+	   );
+    <?php endforeach; ?>
+
+  }
+
+  function switchMethodSource(id, type, source) {
+    $("."+type+"-"+id+"-div")
+      .slideUp();
+
+    $("#"+type+"-"+id+"-"+source+"-div")
+      .slideDown();
+  }
+
+  $(document).ready(function(){
+      resetForm();
+    });
+
+--></script>
+
+<?php
+; // alignment
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Contact Edit
+ */
+
+echo '<div class="contact edit">' . "\n";
+
+echo $form->create('Contact', array('action' => 'edit')) . "\n";
+echo $form->input('id') . "\n";
+
+echo($this->element
+     ('form_table',
+      array('class'  => 'item contact detail',
+	    'caption' => isset($this->data['Contact']) ? 'Edit Contact' : 'New Contact',
+	    'fields' => array
+	    ('first_name' => true,
+	     'last_name' => true,
+	     'middle_name' => true,
+	     'display_name' => true,
+	     'company_name' => array('name' => 'Company'),
+	     'id_federal' => array('name' => 'SSN'),
+	     'id_local' => array('name' => 'ID #'),
+	     'id_local_state' => array('name' => 'ID State'),
+	     /* 'id_local_exp' => array('name' => 'ID Expiration', */
+	     /*			        'opts' => array('empty' => true)), */
+	     'comment' => true,
+	     ))) . "\n");
+
+echo $form->submit('Update') . "\n";
+?>
+
+<div CLASS="dynamic-set">
+<fieldset CLASS="phone superset">
+ <legend>Phone Numbers</legend>
+ <input type="hidden" id="phone-entry-id" value="0">
+ <div id="phones"></div>
+  <fieldset> <legend>
+   <a href="#" onClick="addPhone(true); return false;">Add a Phone Number</a>
+  </legend> </fieldset>
+</fieldset>
+</div>
+
+<div CLASS="dynamic-set">
+<fieldset CLASS="address superset">
+ <legend>Mailing Addresses</legend>
+ <input type="hidden" id="address-entry-id" value="0">
+ <div id="addresses"></div>
+  <fieldset> <legend>
+   <a href="#" onClick="addAddress(true); return false;">Add a Mailing Address</a>
+  </legend> </fieldset>
+</fieldset>
+</div>
+
+<div CLASS="dynamic-set">
+<fieldset CLASS="email superset">
+ <legend>Email Addresses</legend>
+ <input type="hidden" id="email-entry-id" value="0">
+ <div id="emails"></div>
+  <fieldset> <legend>
+   <a href="#" onClick="addEmail(true); return false;">Add an Email Address</a>
+  </legend> </fieldset>
+</fieldset>
+</div>
+
+<?php
+; // Alignment
+
+echo $form->submit('Update') . "\n";
+echo $form->submit('Cancel', array('name' => 'cancel')) . "\n";
+echo $form->end() . "\n";
+echo '</div>' . "\n";