Changed field last_key to key_last

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

build.cmd

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

db/schema.sql

@@ -22,6 +22,9 @@
 --  may have to move this logic into the application :-/
 
 
+-- 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,
@@ -238,7 +241,7 @@ CREATE TABLE `pmgr_contacts_methods` (
 -- ######################################################################
 -- ######################################################################
 -- ##
--- ## GROUPS
+-- ## GROUPS / USERS
 -- ##
 
 
@@ -253,59 +256,15 @@ CREATE TABLE `pmgr_groups` (
   --   code may not be userful
   `code`                 VARCHAR(12) NOT NULL, -- User style "id"
   `name`                 VARCHAR(80) NOT NULL,
+
+  -- Lower ranks are given higher priority
+  `rank`                 SMALLINT UNSIGNED NOT NULL DEFAULT 100,
   `comment`              VARCHAR(255) DEFAULT NULL,
 
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_group_options
-
-DROP TABLE IF EXISTS `pmgr_group_options`;
-CREATE TABLE `pmgr_group_options` (
-  `group_id`             INT(10) UNSIGNED NOT NULL,
-  `name`                 VARCHAR(50)  NOT NULL,
-  `value`                VARCHAR(255) NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (`group_id`, `name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_group_permissions
-
-DROP TABLE IF EXISTS `pmgr_group_permissions`;
-CREATE TABLE `pmgr_group_permissions` (
-  `group_id`             INT(10) UNSIGNED NOT NULL,
-  `name`                 CHAR(30) NOT NULL,
-  `access`               ENUM('ALLOWED',
-                              'DENIED',
-                              'FORCED')
-                           NOT NULL DEFAULT 'ALLOWED',
-  `comment`              VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (`group_id`, `name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ######################################################################
--- ##
--- ## USERS
--- ##
-
 
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
@@ -315,14 +274,10 @@ DROP TABLE IF EXISTS `pmgr_users`;
 CREATE TABLE `pmgr_users` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
   `code`                 VARCHAR(12) NOT NULL, -- User style "id"
-
-  -- Login details.  Passwords are not yet used (and so NULL).
-  `login`                VARCHAR(30)  NOT NULL,
-  `salt`                 CHAR(12)     DEFAULT NULL,
-  `passhash`             VARCHAR(255) DEFAULT NULL,
+  `login`                VARCHAR(30) NOT NULL,
 
   -- Contact information for this user
-  `contact_id`           INT(10) UNSIGNED NOT NULL,
+  `contact_id`           INT(10) UNSIGNED DEFAULT NULL,
 
   -- Specific comments
   `comment`              VARCHAR(255) DEFAULT NULL,
@@ -331,18 +286,208 @@ CREATE TABLE `pmgr_users` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
+
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ##
+-- ## OPTIONS
+-- ##
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_options
+
+DROP TABLE IF EXISTS `pmgr_options`;
+CREATE TABLE `pmgr_options` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `name`                 VARCHAR(50)  NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  UNIQUE KEY `name_key` (`name`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_option_values
+
+DROP TABLE IF EXISTS `pmgr_option_values`;
+CREATE TABLE `pmgr_option_values` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `option_id`            INT(10) UNSIGNED NOT NULL,
+  `value`                VARCHAR(255) NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_default_options
+
+DROP TABLE IF EXISTS `pmgr_default_options`;
+CREATE TABLE `pmgr_default_options` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `option_value_id`      INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_group_options
+
+DROP TABLE IF EXISTS `pmgr_group_options`;
+CREATE TABLE `pmgr_group_options` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `group_id`             INT(10) UNSIGNED NOT NULL,
+  `option_value_id`      INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  KEY `group_key` (`group_id`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
 -- TABLE pmgr_user_options
 
 DROP TABLE IF EXISTS `pmgr_user_options`;
 CREATE TABLE `pmgr_user_options` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
   `user_id`              INT(10) UNSIGNED NOT NULL,
-  `name`                 VARCHAR(50)  NOT NULL,
-  `value`                VARCHAR(255) NOT NULL,
+  `option_value_id`      INT(10) UNSIGNED NOT NULL,
   `comment`              VARCHAR(255) DEFAULT NULL,
+  KEY `user_key` (`user_id`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-  PRIMARY KEY (`user_id`, `name`)
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_site_options
+
+DROP TABLE IF EXISTS `pmgr_site_options`;
+CREATE TABLE `pmgr_site_options` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `site_id`              INT(10) UNSIGNED NOT NULL,
+  `option_value_id`      INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  KEY `site_key` (`site_id`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+
+
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ##
+-- ## PERMISSIONS
+-- ##
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_permissions
+
+DROP TABLE IF EXISTS `pmgr_permissions`;
+CREATE TABLE `pmgr_permissions` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `name`                 VARCHAR(50)  NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  UNIQUE KEY `name_key` (`name`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_permission_values
+
+DROP TABLE IF EXISTS `pmgr_permission_values`;
+CREATE TABLE `pmgr_permission_values` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `permission_id`        INT(10) UNSIGNED NOT NULL,
+  `access`               ENUM('ALLOW',
+                              'DENY')
+                           NOT NULL DEFAULT 'DENY',
+  `level`                SMALLINT UNSIGNED DEFAULT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_default_permissions
+
+DROP TABLE IF EXISTS `pmgr_default_permissions`;
+CREATE TABLE `pmgr_default_permissions` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `permission_value_id`  INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_group_permissions
+
+DROP TABLE IF EXISTS `pmgr_group_permissions`;
+CREATE TABLE `pmgr_group_permissions` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `group_id`             INT(10) UNSIGNED NOT NULL,
+  `permission_value_id`  INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  KEY `group_key` (`group_id`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_user_permissions
+
+DROP TABLE IF EXISTS `pmgr_user_permissions`;
+CREATE TABLE `pmgr_user_permissions` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `user_id`              INT(10) UNSIGNED NOT NULL,
+  `permission_value_id`  INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  KEY `user_key` (`user_id`),
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_site_permissions
+
+DROP TABLE IF EXISTS `pmgr_site_permissions`;
+CREATE TABLE `pmgr_site_permissions` (
+  `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `site_id`              INT(10) UNSIGNED NOT NULL,
+  `permission_value_id`  INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+  KEY `site_key` (`site_id`),
+  PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
@@ -377,46 +522,6 @@ CREATE TABLE `pmgr_sites` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_site_options
-
-DROP TABLE IF EXISTS `pmgr_site_options`;
-CREATE TABLE `pmgr_site_options` (
-  `site_id`              INT(10) UNSIGNED NOT NULL,
-  `name`                 VARCHAR(50)  NOT NULL,
-  `value`                VARCHAR(255) NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (`site_id`, `name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_site_memberships
---
--- Which users are allowed to access which sites,
--- and under which set of group permissions (possibly multiple)
-
--- SELECT U.id, P.name, MAX(P.access)
---  FROM pmgr_users U
---    LEFT JOIN pmgr_site_membership   M ON M.user_id = U.id
---    LEFT JOIN pmgr_groups            G ON G.id = M.group_id
---    LEFT JOIN pmgr_group_permissions P ON P.group_id = G.id
--- GROUP BY U.id, P.name
-
-DROP TABLE IF EXISTS `pmgr_site_memberships`;
-CREATE TABLE `pmgr_site_memberships` (
-  `site_id`              INT(10) UNSIGNED NOT NULL,
-  `user_id`              INT(10) UNSIGNED NOT NULL,
-  `group_id`             INT(10) UNSIGNED NOT NULL,
-  `comment`              VARCHAR(255) DEFAULT NULL,
-
-  PRIMARY KEY (`site_id`, `user_id`, `group_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
 -- TABLE pmgr_site_areas
@@ -434,6 +539,38 @@ CREATE TABLE `pmgr_site_areas` (
 
 
 
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ######################################################################
+-- ##
+-- ## MEMBERSHIPS
+-- ##
+
+
+-- ----------------------------------------------------------------------
+-- ----------------------------------------------------------------------
+-- TABLE pmgr_memberships
+--
+-- Which users are allowed to access which sites,
+-- and under which set of group permissions (possibly multiple)
+
+DROP TABLE IF EXISTS `pmgr_memberships`;
+CREATE TABLE `pmgr_memberships` (
+  `site_id`              INT(10) UNSIGNED NOT NULL,
+  `user_id`              INT(10) UNSIGNED NOT NULL,
+  `group_id`             INT(10) UNSIGNED NOT NULL,
+  `comment`              VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (`site_id`, `user_id`, `group_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
 -- ######################################################################
 -- ######################################################################
 -- ######################################################################
@@ -468,18 +605,15 @@ CREATE TABLE `pmgr_units` (
                               'DIRTY',
                               'VACANT',
                               'OCCUPIED',
-                              'LATE', -- NOT SURE
                               'LOCKED',
                               'LIENED')
                            NOT NULL DEFAULT 'VACANT',
 
-  `current_lease_id`     INT(10) UNSIGNED DEFAULT NULL,
-
   `sort_order`           MEDIUMINT UNSIGNED NOT NULL,
   `walk_order`           MEDIUMINT UNSIGNED NOT NULL,
 
   `deposit`              FLOAT(12,2) DEFAULT NULL,
-  `amount`               FLOAT(12,2) DEFAULT NULL,
+  `rent`                 FLOAT(12,2) DEFAULT NULL,
 
   `comment`              VARCHAR(255) DEFAULT NULL,
 
@@ -519,7 +653,7 @@ CREATE TABLE `pmgr_unit_sizes` (
   `comment`              VARCHAR(255) DEFAULT NULL,
 
   `deposit`              FLOAT(12,2) DEFAULT NULL,
-  `amount`               FLOAT(12,2) DEFAULT NULL,
+  `rent`                 FLOAT(12,2) DEFAULT NULL,
 
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -630,17 +764,9 @@ DROP TABLE IF EXISTS `pmgr_customers`;
 CREATE TABLE `pmgr_customers` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 
-  -- If NULL, rely on the contact info exclusively
-  `name`                 VARCHAR(80) DEFAULT NULL,
-
-  -- A customer gets their own account, although any
-  -- lease specific charge (rent, late fees, etc) will
-  -- be debited against the lease account.  This one
-  -- will be used for non-lease related charges, as
-  -- well as charges that intentionally span more than
-  -- one lease (such as one security deposit to cover
-  -- two or more units).
-  `account_id`           INT(10) UNSIGNED NOT NULL,
+  -- 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).
@@ -649,6 +775,17 @@ CREATE TABLE `pmgr_customers` (
   --   contacts_customers table?
   `primary_contact_id`   INT(10) UNSIGNED NOT NULL,
 
+  -- Number of different leases for this customer.
+  -- It's not good to have redundant information,
+  -- but these fields change infrequently, and make
+  -- certain queries much easier, most notably for
+  -- the grid query, in which linking customer to
+  -- lease results in repeated statement entries
+  -- when a customer has more than one lease.
+  `lease_count`          SMALLINT UNSIGNED NOT NULL DEFAULT 0,
+  `current_lease_count`  SMALLINT UNSIGNED NOT NULL DEFAULT 0,
+  `past_lease_count`     SMALLINT UNSIGNED NOT NULL DEFAULT 0,
+
   `comment`              VARCHAR(255) DEFAULT NULL,
 
   PRIMARY KEY (`id`)
@@ -708,7 +845,6 @@ CREATE TABLE `pmgr_leases` (
   `lease_type_id`        INT(10) UNSIGNED NOT NULL,
   `unit_id`              INT(10) UNSIGNED NOT NULL,
   `customer_id`          INT(10) UNSIGNED NOT NULL,
-  `account_id`           INT(10) UNSIGNED NOT NULL,
   `late_schedule_id`     INT(10) UNSIGNED DEFAULT NULL,
 
   `lease_date`           DATE NOT NULL,
@@ -720,11 +856,14 @@ CREATE TABLE `pmgr_leases` (
   `notice_received_date` DATE DEFAULT NULL,
   `close_date`           DATE DEFAULT NULL,
 
-  `deposit`              FLOAT(12,2) DEFAULT NULL,
-  `amount`               FLOAT(12,2) DEFAULT NULL,
+  `charge_through_date`  DATE DEFAULT NULL,
+  `paid_through_date`    DATE DEFAULT NULL,
 
-  `next_amount`          FLOAT(12,2) DEFAULT NULL,
-  `next_amount_date`     DATE DEFAULT NULL,
+  `deposit`              FLOAT(12,2) DEFAULT NULL,
+  `rent`                 FLOAT(12,2) DEFAULT NULL,
+
+  `next_rent`            FLOAT(12,2) DEFAULT NULL,
+  `next_rent_date`       DATE DEFAULT NULL,
 
   `comment`              VARCHAR(255) DEFAULT NULL,
 
@@ -848,10 +987,14 @@ CREATE TABLE `pmgr_accounts` (
   -- For LIABILITY, EQUITY, and INCOME, the opposite
   -- is true, with reconciliations posted, under
   -- normal circumstances, when a debit occurs.
-  `trackable`            INT UNSIGNED DEFAULT 0,
+  --  `trackable`            TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
+  `deposits`             TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for deposits?
+  `invoices`             TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for invoices?
+  `receipts`             TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for receipts?
+  `refunds`              TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, -- Can be used for refunds?
 			   			   
   -- Security Level
-  `level`                INT UNSIGNED DEFAULT 1,
+  `level`                INT UNSIGNED DEFAULT 10,
 
   `name`                 VARCHAR(80) NOT NULL,
   `external_account`     INT(10) UNSIGNED DEFAULT NULL,
@@ -863,21 +1006,46 @@ CREATE TABLE `pmgr_accounts` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 LOCK TABLES `pmgr_accounts` WRITE;
-INSERT INTO `pmgr_accounts` (`type`, `name`, `trackable`)
+INSERT INTO `pmgr_accounts` (`type`, `name`)
   VALUES
-  ('ASSET', 'A/R', 1),
-  ('ASSET', 'Invoice', 1),
-  ('ASSET', 'Receipt', 1),
-  ('LIABILITY', 'A/P', 1),
-  ('LIABILITY', 'Tax', 0),
-  ('LIABILITY', 'Customer Credit', 1),
-  ('ASSET', 'Bank', 0),
-  ('ASSET', 'Till', 0),
-  ('LIABILITY', 'Security Deposit', 1),
-  ('INCOME', 'Rent', 0),
-  ('INCOME', 'Late Charge', 0),
-  ('EXPENSE', 'Concession', 0),
-  ('EXPENSE', 'Bad Debt', 0);
+  ('ASSET',      'A/R'                ),
+  ('LIABILITY',  'A/P'                ),
+  ('LIABILITY',  'Credit'             );
+INSERT INTO `pmgr_accounts` (`type`, `name`, `receipts`)
+  VALUES
+  ('ASSET',      'Cash',              1),
+  ('ASSET',      'Check',             1),
+  ('ASSET',      'Money Order',       1),
+  ('ASSET',      'ACH',               1),
+  ('EXPENSE',    'Concession',        1);
+INSERT INTO `pmgr_accounts` (`type`, `name`)
+  VALUES
+  ('ASSET',      'NSF'                ),
+  ('EXPENSE',    'Waiver'             ),
+  ('EXPENSE',    'Bad Debt'           );
+INSERT INTO `pmgr_accounts` (`type`, `name`, `invoices`)
+  VALUES
+  ('LIABILITY',  'Tax',               0),
+  ('LIABILITY',  'Security Deposit',  1),
+  ('INCOME',     'Rent',              1),
+  ('INCOME',     'Late Charge',       1),
+  ('INCOME',     'NSF Charge',        1),
+  ('INCOME',     'Cleaning',          1),
+  ('INCOME',     'Damage',            1);
+INSERT INTO `pmgr_accounts` (`type`, `name`)
+  VALUES
+  ('EXPENSE',    'Maintenance'        );
+INSERT INTO `pmgr_accounts` (`type`, `name`, `refunds`)
+  VALUES
+  ('ASSET',      'Petty Cash',        1);
+INSERT INTO `pmgr_accounts` (`type`, `name`, `level`, `deposits`, `refunds`)
+  VALUES
+  ('ASSET',      'Bank',              6, 1, 1);
+INSERT INTO `pmgr_accounts` (`type`, `name`, `level`)
+  VALUES
+  ('ASSET',      'Closing',           6),
+  ('LIABILITY',  'Loan',              1),
+  ('EQUITY',     'Equity',            1);
 UNLOCK TABLES;
 
 
@@ -899,34 +1067,18 @@ UNLOCK TABLES;
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
 -- TABLE pmgr_ledgers
---
--- REVISIT <AP>: 20090605
---   We may not really need a ledgers table.
---   It's not clear to me though, as we very
---   possibly need to close out certain
---   ledgers every so often, and just carry
---   the balance forward (year end, etc).
 
 DROP TABLE IF EXISTS `pmgr_ledgers`;
 CREATE TABLE `pmgr_ledgers` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 
-  -- REVISIT <AP>: 20090605
-  --  If ledgers do need to be closed, then we'll need
-  --  to add several parameters indicating the period
-  --  this particular ledger is valid and so on.
+  `name`                 VARCHAR(90) NOT NULL,
 
   `account_id`           INT(10) UNSIGNED NOT NULL,
   `sequence`             INT(10) UNSIGNED DEFAULT 1,
-  `closed`               INT UNSIGNED DEFAULT 0,
 
-  -- REVISIT <AP>: 20090607
-  --  Probably, a single close should have the ability to close
-  --  many different account ledgers.  For now, just timestamping.
-  --  `close_id`         INT(10) UNSIGNED NOT NULL,
-
-  `open_stamp`           TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `close_stamp`          DATETIME DEFAULT NULL,
+  `prior_ledger_id`      INT(10) UNSIGNED DEFAULT NULL,
+  `close_transaction_id` INT(10) UNSIGNED DEFAULT NULL,
 
   `comment`              VARCHAR(255) DEFAULT NULL,
 
@@ -942,14 +1094,53 @@ DROP TABLE IF EXISTS `pmgr_transactions`;
 CREATE TABLE `pmgr_transactions` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 
-  `stamp`                TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `through_date`         DATE DEFAULT NULL,
-  `due_date`             DATE DEFAULT NULL,
+  -- REVISIT <AP>: 20090804
+  --  I'm not sure about most of these terms.
+  --  Just as long as they're distinct though... I can rename them later
+  `type`                 ENUM('INVOICE', -- Sales Invoice
+                              'RECEIPT', -- Actual receipt of monies
+			      'PURCHASE_INVOICE', -- Committment to pay
+			      'CREDIT_NOTE', -- Inverse of Sales Invoice
+			      'PAYMENT', -- Actual payment
+                              'DEPOSIT',
+                              'AUTO_DEPOSIT', -- Fundamentally same as DEPOSIT
+                              'WITHDRAWAL',
+                              'CLOSE',   -- Essentially an internal (not accounting) transaction
+--                               'CREDIT',
+--                               'REFUND',
+			      'TRANSFER') -- Unsure of TRANSFERs use
+                           NOT NULL,
 
-  -- REVISIT <AP>: 20090604
-  --   How should we track which charges have been paid?
-  -- `related_transaction_id` INT(10) UNSIGNED NOT NULL,
-  -- `related_entry_id` INT(10) UNSIGNED NOT NULL,
+  `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,
+  `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,
 
@@ -957,23 +1148,114 @@ CREATE TABLE `pmgr_transactions` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
--- ----------------------------------------------------------------------
--- ----------------------------------------------------------------------
--- TABLE pmgr_ledger_entries
+-- -- ----------------------------------------------------------------------
+-- -- ----------------------------------------------------------------------
+-- -- TABLE pmgr_ledger_entries
 
 DROP TABLE IF EXISTS `pmgr_ledger_entries`;
 CREATE TABLE `pmgr_ledger_entries` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 
-  `name`                 VARCHAR(80) DEFAULT NULL,
-  `monetary_source_id`   INT(10) UNSIGNED DEFAULT NULL, -- NULL if internal transfer
   `transaction_id`       INT(10) UNSIGNED NOT NULL,
-  `customer_id`          INT(10) UNSIGNED DEFAULT NULL,
-  `lease_id`             INT(10) UNSIGNED DEFAULT NULL,
+
+  -- The account/ledger of the entry
+  `account_id`           INT(10) UNSIGNED NOT NULL,
+  `ledger_id`            INT(10) UNSIGNED NOT NULL,
+  `crdr`                 ENUM('DEBIT',
+                              'CREDIT')
+                           NOT NULL,
+
   `amount`               FLOAT(12,2) NOT NULL,
 
-  `debit_ledger_id`      INT(10) UNSIGNED NOT NULL,
-  `credit_ledger_id`     INT(10) UNSIGNED 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,
+
+  -- REVISIT <AP>: 20090804
+  --  I'm not sure about most of these terms.
+  --  Just as long as they're distinct though... I can rename them later
+  `type`                 ENUM('CHARGE',        -- Invoiced Charge to Customer
+			      'DISBURSEMENT',  -- Disbursement of Receipt Funds
+                              'REVERSAL',      -- Reversal of a charge
+                              'WRITEOFF',      -- Write-off bad debt
+                              'VOUCHER',       -- Agreement to pay
+                              'PAYMENT',       -- Payment of a Voucher
+                              'REFUND',        -- Payment due to refund
+                              'SURPLUS',       -- Surplus Receipt Funds
+                              'WAIVER',        -- Waived Charge
+			      -- REVISIT <AP>: 20090730
+			      --  VOID is used for handling NSF and perhaps charge reversals.
+			      --  It's not clear this is the best way to handle these things.
+			      'VOID')
+                           NOT NULL,
+
+  `transaction_id`       INT(10) UNSIGNED NOT NULL,
+
+  -- Effective date is when the charge/disbursement/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,
+
+  -- The account of the entry
+  -- REVISIT <AP>: 20090720
+  --  We don't want to confuse statement entries with ledger entries,
+  --  yet we're including account here.  It doesn't feel right, but at
+  --  the same time, it will allow us to show _what_ was charged for
+  --  in the statement.  Keeping it for now...
+  `account_id`           INT(10) UNSIGNED DEFAULT NULL,
+
+  -- Allow the disbursement to reconcile against the charge
+  `charge_entry_id`      INT(10) UNSIGNED DEFAULT NULL,
+
+  -- The transaction that reversed this charge, if any
+  `reverse_transaction_id` INT(10) UNSIGNED DEFAULT NULL,
 
   `comment`              VARCHAR(255) DEFAULT NULL,
 
@@ -983,15 +1265,54 @@ CREATE TABLE `pmgr_ledger_entries` (
 
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
--- TABLE pmgr_reconciliations
+-- TABLE pmgr_tender_types
 
-DROP TABLE IF EXISTS `pmgr_reconciliations`;
-CREATE TABLE `pmgr_reconciliations` (
+DROP TABLE IF EXISTS `pmgr_tender_types`;
+CREATE TABLE `pmgr_tender_types` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 
-  `debit_ledger_entry_id`    INT(10) UNSIGNED NOT NULL,
-  `credit_ledger_entry_id`   INT(10) UNSIGNED NOT NULL,
-  `amount`                   FLOAT(12,2) NOT NULL,
+  -- 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,
+
+  -- Should these items be deposited automatically?
+  `auto_deposit`         TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
+
+  -- Names of the 4 data fields (or NULL if not used)
+  -- Not the most robust of solutions, especially since
+  -- it requires (or strongly implicates) that all fields
+  -- 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,
+
+  -- The field from pmgr_tenders that is used for helping
+  -- to name the tender.  For example, a Check tender type
+  -- might specify data1 as the field, so that tenders
+  -- would be named "Check #0000"
+  `naming_field`         VARCHAR(80) DEFAULT 'id',
+
+  -- When we accept legal tender of this form, where does
+  -- it go?  Each type of legal tender can specify an
+  -- account, either distinct or non-distinct from others
+  `account_id`           INT(10) UNSIGNED NOT NULL,
+  
+  -- Which account should these items be deposited in?
+  -- This may or may not actually be used for all types
+  -- but will likely get used for auto deposit items.
+  `deposit_account_id`   INT(10) UNSIGNED DEFAULT NULL,
+
+  `comment`              VARCHAR(255) DEFAULT NULL,
 
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -999,20 +1320,52 @@ CREATE TABLE `pmgr_reconciliations` (
 
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
--- TABLE pmgr_monetary_sources
+-- TABLE pmgr_tenders
 
-DROP TABLE IF EXISTS `pmgr_monetary_sources`;
-CREATE TABLE `pmgr_monetary_sources` (
+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,
-  monetary_type_id       INT(10) UNSIGNED NOT 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; CCV2 Code
+  --   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 ledger entry if this actual deposit transaction
+  `deposit_ledger_entry_id` INT(10) UNSIGNED DEFAULT NULL,
+  -- The deposit transaction that included these monies
+  `deposit_transaction_id` INT(10) UNSIGNED DEFAULT NULL,
+  -- The NSF transaction coming back from the bank.
+  `nsf_transaction_id`     INT(10) UNSIGNED DEFAULT NULL,
 
   `comment`              VARCHAR(255) DEFAULT NULL,
 
@@ -1022,33 +1375,30 @@ CREATE TABLE `pmgr_monetary_sources` (
 
 -- ----------------------------------------------------------------------
 -- ----------------------------------------------------------------------
--- TABLE pmgr_monetary_types
+-- TABLE pmgr_deposits
 
-DROP TABLE IF EXISTS `pmgr_monetary_types`;
-CREATE TABLE `pmgr_monetary_types` (
+DROP TABLE IF EXISTS `pmgr_deposits`;
+CREATE TABLE `pmgr_deposits` (
   `id`                   INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 
-  `name`                 VARCHAR(80) 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.  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,
-  `tillable`             TINYINT(1) NOT NULL DEFAULT 1, -- Does manager collect by hand?
 
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-LOCK TABLES `pmgr_monetary_types` WRITE;
-INSERT INTO `pmgr_monetary_types` (`id`, `name`, `tillable`)
-  VALUES
-  -- (1, 'Transfer', 0),
-  (2, 'Cash', 1),
-  (3, 'Check', 1),
-  (4, 'Money Order', 1),
-  (5, 'ACH', 0),
-  (6, 'Debit Card', 0),
-  (7, 'Credit Card', 0),
-  (8, 'Other Tillable', 1),
-  (9, 'Other Non-Tillable', 0);
-UNLOCK TABLES;
-
 
 
 

site/.htaccess

@@ -1,5 +1,20 @@
 <IfModule mod_rewrite.c>
-    RewriteEngine on
-    RewriteRule    ^$    webroot/    [L]
-    RewriteRule    (.*) webroot/$1    [L]
+  RewriteEngine  on 
+
+   RewriteRule    ^$ webroot/    [L]
+
+   # Need this prevent a 400 error without trailing /
+   RewriteCond  %{REQUEST_FILENAME} !-d
+   RewriteRule    (.*)  webroot/$1 [L]
+
  </IfModule>
+
+# Need to make sure directories can't be listed, since the rewrite
+# rule excludes rewriting when an actual directory is requested
+Options -Indexes
+
+# Provide a mechanism for user authentication
+AuthType Basic
+AuthName "Valley Storage"
+AuthUserFile "/home/perki2/valley_storage.pmgr.htpasswd"
+Require valid-user

site/app_helper.php

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

site/app_model.php

@@ -39,6 +39,277 @@
 class AppModel extends Model {
 
   var $actsAs = array('Containable', 'Linkable');
+  var $useNullForEmpty = true;
+  var $formatDateFields = true;
+
+  // Loaded related models with no association
+  var $knows = array();
+  var $app_knows = array('Option');
+
+  // Default Log Level, if not specified at the function level
+  var $default_log_level = 5;
+
+  // 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;
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: __construct
+   */
+
+  function __construct($id = false, $table = null, $ds = null) {
+    parent::__construct($id, $table, $ds);
+
+    $this->knows = array_merge($this->app_knows, $this->knows);
+    //$this->pr(1, array('knows' => $this->knows));
+    foreach ($this->knows as $alias => $modelName) {
+      if (is_numeric($alias)) {
+	$alias = $modelName;
+      }
+
+      // Don't overwrite any existing alias
+      if (!empty($this->{$alias}) || get_class($this) == $alias)
+	continue;
+
+      $model = array('class' => $modelName, 'alias' => $alias);
+      if (PHP5) {
+	$this->{$alias} = ClassRegistry::init($model);
+      } else {
+	$this->{$alias} =& ClassRegistry::init($model);
+      }
+    }
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: 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 = get_class($this);
+    $this->pr(50, compact('class', 'level'));
+    $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 = get_class($this);
+    if (empty($function))
+      $function = $caller['function'];
+    $this->pr(50, compact('class', 'function', 'level'));
+    $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 = $trace[0];
+    $function = $caller['function'];
+    $class    = $caller['class'];
+    //$class = $this->name;
+
+    // Use class or function specific log level if available
+    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}"];
+
+    // Establish log level minimums
+    $min_log_level = $this->min_log_level;
+    if (is_array($this->min_log_level)) {
+      $min_show_level = $min_log_level['show'];
+      $min_log_level = $min_log_level['log'];
+    }
+
+    // Establish log level maximums
+    $max_log_level = $this->max_log_level;
+    if (is_array($this->max_log_level)) {
+      $max_show_level = $max_log_level['show'];
+      $max_log_level = $max_log_level['log'];
+    }
+
+    // Determine the applicable log and show levels
+    if (is_array($log_level)) {
+      $show_level = $log_level['show'];
+      $log_level = $log_level['log'];
+    }
+
+    // Adjust log level up/down to min/max
+    if (isset($min_log_level))
+      $log_level = max($log_level, $min_log_level);
+    if (isset($max_log_level))
+      $log_level = min($log_level, $max_log_level);
+
+    // Adjust show level up/down to min/max
+    if (isset($min_show_level))
+      $show_level = max($show_level, $min_show_level);
+    if (isset($max_show_level))
+      $show_level = min($show_level, $max_show_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);
+    }
+
+    static $pr_unique_number = 0;
+    $pr_id = 'pr-section-class-' . $class . '-print-' . (++$pr_unique_number);
+    $pr_trace_id  = $pr_id . '-trace';
+    $pr_output_id = $pr_id . '-output';
+
+    $pr_entire_base_class = "pr-section";
+    $pr_entire_class_class = $pr_entire_base_class . '-class-' . $class;
+    $pr_entire_function_class = $pr_entire_class_class . '-function-' . $function;
+    $pr_entire_class = "$pr_entire_base_class $pr_entire_class_class $pr_entire_function_class";
+    $pr_header_class = "pr-caller";
+    $pr_trace_class  = "pr-trace";
+    $pr_output_base_class = 'pr-output';
+    $pr_output_class_class = $pr_output_base_class . '-class-' . $class;
+    $pr_output_function_class = $pr_output_class_class . '-function-' . $function;
+    $pr_output_class = "$pr_output_base_class $pr_output_class_class $pr_output_function_class";
+
+    echo '<DIV class="'.$pr_entire_class.'" id="'.$pr_id.'">'."\n";
+    echo '<DIV class="'.$pr_header_class.'">'."\n";
+    echo '<DIV class="'.$pr_trace_class.'" id="'.$pr_trace_id.'" style="display:none;">'."\n";
+    echo '<HR />' . "\n";
+
+    // Flip trace around so the sequence flows from top to bottom
+    // Then print out the entire stack trace (in hidden div)
+    $trace = array_reverse($trace);
+    for ($i = 0; $i < count($trace); ++$i) {
+      $bline = $trace[$i]['line'];
+      $bfile = $trace[$i]['file'];
+      $bfile = str_replace(ROOT.DS, '', $bfile);
+      $bfile = str_replace(CAKE_CORE_INCLUDE_PATH.DS, '', $bfile);
+
+      if ($i > 0) {
+	$bfunc = $trace[$i-1]['function'];
+	$bclas = $trace[$i-1]['class'];
+      } else {
+	$bfunc = null;
+	$bclas = null;
+      }
+
+      echo("$bfile:$bline (" . ($bclas ? "$bclas::$bfunc" : "entry point") . ")<BR>\n");
+      //echo(($bclas ? "$bclas::$bfunc" : "entry point") . "; $bfile : $bline<BR>\n");
+    }
+    echo '</DIV>' . "\n"; // End pr_trace_class
+    $file = str_replace(ROOT.DS, '', $file);
+    $file = str_replace(CAKE_CORE_INCLUDE_PATH.DS, '', $file);
+
+    echo "<strong>$file:$line ($class::$function)</strong>" . ";\n";
+/*     $log_show_level = isset($show_level) ? $show_level : '?'; */
+/*     echo ' L' . $level . "({$log_level}/{$log_show_level})" . ";\n"; */
+    echo ' L' . $level . ";\n";
+    echo ' <A HREF="#" onclick="$' . "('#{$pr_trace_id}').slideToggle(); return false;" . '">stack</A>'.";\n";
+
+    echo " this ";
+    echo '<A HREF="#" onclick="$' . "('#{$pr_output_id}').slideToggle(); return false;" . '">t</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('#{$pr_id}').hide(); return false;" . '">n</A>'.";\n";
+
+    echo " $class ";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_output_class_class}').slideDown(); return false;" . '">s</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_output_class_class}').slideUp(); return false;" . '">h</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_entire_class_class}').hide(); return false;" . '">n</A>'.";\n";
+
+    echo " $function ";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_output_function_class}').slideDown(); return false;" . '">s</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_output_function_class}').slideUp(); return false;" . '">h</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_entire_function_class}').hide(); return false;" . '">n</A>'.";\n";
+
+    echo " all ";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_output_base_class}').show(); return false;" . '">s</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_output_base_class}').hide(); return false;" . '">h</A>'."/";
+    echo '<A HREF="#" onclick="$' . "('.{$pr_entire_base_class}').hide(); return false;" . '">n</A>'."\n";
+
+    echo '</DIV>' . "\n"; // End pr_header_class
+
+    if (isset($show_level) && $level > $show_level)
+      $display = 'none';
+    else
+      $display = 'block';
+
+    echo '<DIV class="'.$pr_output_class.'" id="'.$pr_output_id.'" style="display:'.$display.';">'."\n";
+    pr($mixed, false, false);
+    echo '</DIV>' . "\n"; // End pr_output_class
+    echo '</DIV>' . "\n"; // End pr_entire_class
+  }
+
+  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]);
+    }
+    //$vars['class'] = get_class_vars(get_class($this));
+
+    $this->pr(1, $vars);
+  }
+
 
   /**
    * Get Enum Values
@@ -47,13 +318,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}'");
@@ -72,11 +345,56 @@ 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
 
 
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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();
+
+    // In case caller expects query to come back
+    return $query;
+  }
+
+    
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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;
+  }
+
 
   /**************************************************************************
    **************************************************************************
@@ -111,6 +429,64 @@ class AppModel extends Model {
   }
 
 
+  function filter_null($array) {
+    return array_diff_key($array, array_filter($array, 'is_null'));
+  }
+
+  function recursive_array_replace($find, $replace, &$data) {
+    if (!isset($data))
+      return;
+
+    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;
+  }
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -119,7 +495,24 @@ class AppModel extends Model {
    */
 
   function dateFormatBeforeSave($dateString) {
-    return date('Y-m-d', strtotime($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));
   }
 
+  function INTERNAL_ERROR($msg, $depth = 0, $force_stop = false) {
+    INTERNAL_ERROR($msg, $force_stop, $depth+1);
+    echo $this->requestAction(array('controller' => 'util',
+				    'action' => 'render_empty'),
+			      array('return', 'bare' => false)
+			      );
+    $this->_stop();
+  }
 }

site/config/bootstrap.php

@@ -31,6 +31,99 @@
  * You can also use this to include or require any files in your application.
  *
  */
+
+function _box($type) {
+  static $box = array('type' => null, 'test' => array());
+  if (!isset($box['type']) && !isset($box['test'][$type])) {
+    $r = Router::requestRoute();
+/*     if (!preg_match("/gridData/", $_SERVER['REQUEST_URI'])) { */
+/*       print("<PRE>Route:\n");print_r($r);print("\n</PRE>\n"); */
+/*     } */
+    $box['test'][$type] = !empty($r[3]["${type}_route"]);
+    if ($box['test'][$type])
+      $box['type'] = $type;
+  }
+  return $box['type'] == $type;
+}
+
+function sandbox() { return _box('sand'); }
+function devbox()  { return _box('dev'); }
+
+function server_request_var($var) {
+  if (preg_match("/^HTTP_ACCEPT|REMOTE_PORT/", $var))
+    return false;
+  return (preg_match("/^HTTP|REQUEST|REMOTE/", $var));
+}
+
+function INTERNAL_ERROR($message, $exit = true, $drop = 0) {
+  $O = new Object();
+  for ($i=0; $i<3; ++$i) {
+    $O->log(str_repeat("\\", 80));
+    $O->log(str_repeat("/", 80));
+  }
+  $O->log("INTERNAL ERROR: $message");
+  echo '<DIV class="internal-error" style="color:#000; background:#c22; padding:0.5em 1.5em 0.5em 1.5em;">' . "\n";
+  echo '<H1 style="color:#000; margin-bottom:0.2em; font-size:2em;">INTERNAL ERROR:</H1>' . "\n";
+  echo '<H2 style="color:#000; margin-top:0; margin-left:1.5em; font-size:1.5em">' . $message . '</H2>' . "\n";
+  echo '<H4 style="color:#000;">This error was not caused by anything that you did wrong.' . "\n";
+  echo '<BR>It is a problem within the application itself and should be reported to the administrator.</H4>' . "\n";
+
+  // Print out the entire stack trace
+  $O->log(str_repeat("-", 30));
+  $O->log("Stack:");
+  echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nStack Trace:\n";
+  echo '<OL style="margin-top:0.5em; margin-left:0.0em";>' . "\n";
+  $trace = array_slice(debug_backtrace(false), $drop);
+  for ($i = 0; $i < count($trace); ++$i) {
+    $bline = $trace[$i]['line'];
+    $bfile = $trace[$i]['file'];
+    $bfile = str_replace(ROOT.DS, '', $bfile);
+    $bfile = str_replace(CAKE_CORE_INCLUDE_PATH.DS, '', $bfile);
+
+    if ($i < count($trace)-1) {
+      $bfunc = $trace[$i+1]['function'];
+      $bclas = $trace[$i+1]['class'];
+    } else {
+      $bfunc = null;
+      $bclas = null;
+    }
+
+    $O->log("   $bfile:$bline (" . ($bclas ? "$bclas::$bfunc" : "entry point") . ")");
+    echo("<LI>$bfile:$bline (" . ($bclas ? "$bclas::$bfunc" : "entry point") . ")</LI>\n");
+  }
+  echo "</OL>\n";
+
+  $O->log(str_repeat("-", 30));
+  $O->log("HTTP Request:");
+  echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nHTTP Request:\n";
+  echo '<UL style="margin-top:0.5em; margin-left:0.0em";>' . "\n";
+  foreach($_REQUEST AS $k => $v) {
+    $O->log(sprintf("   %-20s => %s", $k, $v));
+    echo("<LI>$k =&gt; $v</LI>\n");
+  }
+  echo "</UL>\n";
+
+  $O->log(str_repeat("-", 30));
+  $O->log("Server:");
+  $SRV = array_intersect_key($_SERVER, array_flip(array_filter(array_keys($_SERVER), 'server_request_var')));
+  echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\nServer:\n";
+  echo '<UL style="margin-top:0.5em; margin-left:0.0em";>' . "\n";
+  foreach($SRV AS $k => $v) {
+    if ($k == 'REQUEST_TIME')
+      $v = date('c', $v);
+    $O->log(sprintf("   %-20s => %s", $k, $v));
+    echo("<LI>$k =&gt; $v</LI>\n");
+  }
+  echo "</UL>\n";
+
+  echo '<HR style="margin-top:1.0em; margin-bottom:0.5em;">' . "\n";
+  echo date('c') . "<BR>\n";
+
+  echo '</DIV>';
+  if ($exit)
+    die();
+}
+
 /**
  * The settings below can be used to set additional paths to models, views and controllers.
  * This is related to Ticket #470 (https://trac.cakephp.org/ticket/470)

site/config/core.php

@@ -117,7 +117,7 @@
 /**
  * The name of CakePHP's session cookie.
  */
-	Configure::write('Session.cookie', 'CAKEPHP');
+	Configure::write('Session.cookie', 'PMGR');
 /**
  * Session time out time (in seconds).
  * Actual value depends on 'Security.level' setting.

site/config/database.php

@@ -5,10 +5,17 @@ class DATABASE_CONFIG {
 		'driver' => 'mysql',
 		'persistent' => false,
 		'host' => 'localhost',
-		'login' => 'pmgr',
-		'password' => 'pmgruser',
-		'database' => 'property_manager',
-		'prefix' => 'pmgr_',
+		'login' => 'perki2_pmgruser',
+		'password' => 'pmgrauth',
+		'database' => 'perki2_pmgr',
+		'prefix' => '',
 	);
+
+	function __construct() {
+		if (devbox())
+			$this->default['database'] = 'perki2_pmgr_dev';
+		if (sandbox())
+			$this->default['database'] = 'perki2_pmgr_sand';
+	}
 }
 ?>

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,50 @@
  * @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
  */
+
+$default_path = array('controller' => 'maps', 'action' => 'view', '1');
+
 /**
- * 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('/', $default_path);
+
+/*
+ * Route for sandbox functionality
  */
-	Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
+Router::connect('/sand',
+		array('sand_route' => true) + $default_path);
+Router::connect('/sand/:controller/:action/*',
+		array('sand_route' => true, 'action' => null));
+/* Unfortunately, for some reason we need an extra route to solve
+ * a bug with form generation.  When $this->data is set by the
+ * controller, and a URL is generated by the FormHelper, this
+ * route is required to ensure the form action is correct.  An
+ * example of a broken page is for /customers/edit/XX.  It appears
+ * the page location uses the route above, it's only URL generation
+ * that seems to be broken.
+ */
+Router::connect('/sand/:controller/:action/:id/*',
+		array('sand_route' => true,'action' => null, 'id'=>null));
+
+/*
+ * Route for developement functionality
+ */
+Router::connect('/dev',
+		array('dev_route' => true) + $default_path);
+Router::connect('/dev/:controller/:action/*',
+		array('dev_route' => true, 'action' => null));
+/* Unfortunately, for some reason we need an extra route to solve
+ * a bug with form generation.  When $this->data is set by the
+ * controller, and a URL is generated by the FormHelper, this
+ * route is required to ensure the form action is correct.  An
+ * example of a broken page is for /customers/edit/XX.  It appears
+ * the page location uses the route above, it's only URL generation
+ * that seems to be broken.
+ */
+Router::connect('/dev/:controller/:action/:id/*',
+		array('dev_route' => true,'action' => null, 'id'=>null));
+
 ?>

site/controllers/accounts_controller.php

@@ -2,27 +2,35 @@
 
 class AccountsController extends AppController {
 
-  var $uses = array('Account', 'LedgerEntry');
-
-  var $sidemenu_links =
-    array(array('name' => 'Accounts',        'header' => true),
-	  array('name' => 'All',             'url' => array('controller' => 'accounts', 'action' => 'all')),
-	  array('name' => 'Asset',           'url' => array('controller' => 'accounts', 'action' => 'asset')),
-	  array('name' => 'Liability',       'url' => array('controller' => 'accounts', 'action' => 'liability')),
-	  array('name' => 'Equity',          'url' => array('controller' => 'accounts', 'action' => 'equity')),
-	  array('name' => 'Income',          'url' => array('controller' => 'accounts', 'action' => 'income')),
-	  array('name' => 'Expense',         'url' => array('controller' => 'accounts', 'action' => 'expense')),
-	  );
-
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Asset',
+			   array('controller' => 'accounts', 'action' => 'asset'), null,
+			   'CONTROLLER', $this->admin_area);
+    $this->addSideMenuLink('Liability',
+			   array('controller' => 'accounts', 'action' => 'liability'), null,
+			   'CONTROLLER', $this->admin_area);
+    $this->addSideMenuLink('Equity',
+			   array('controller' => 'accounts', 'action' => 'equity'), null,
+			   'CONTROLLER', $this->admin_area);
+    $this->addSideMenuLink('Income',
+			   array('controller' => 'accounts', 'action' => 'income'), null,
+			   'CONTROLLER', $this->admin_area);
+    $this->addSideMenuLink('Expense',
+			   array('controller' => 'accounts', 'action' => 'expense'), null,
+			   'CONTROLLER', $this->admin_area);
+    $this->addSideMenuLink('All',
+			   array('controller' => 'accounts', 'action' => 'all'), null,
+			   'CONTROLLER', $this->admin_area);
   }
 
 
@@ -34,88 +42,121 @@ class AccountsController extends AppController {
    */
 
   function index()     { $this->all(); }
-  function asset()     { $this->jqGridView('Asset Accounts'); }
-  function liability() { $this->jqGridView('Liability Accounts'); }
-  function equity()    { $this->jqGridView('Equity Accounts'); }
-  function income()    { $this->jqGridView('Income Accounts'); }
-  function expense()   { $this->jqGridView('Expense Accounts'); }
-  function all()       { $this->jqGridView('All Accounts',       'all'); }
+  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: jqGridData
-   *  - With the application controller handling the jqGridData action,
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
    *    these virtual functions ensure that the correct data is passed
    *    to jqGrid.
    */
 
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
+  function gridDataSetup(&$params) {
+    parent::gridDataSetup($params);
     if (!isset($params['action']))
       $params['action'] = 'all';
   }
 
-  function jqGridDataCountTables(&$params, &$model) {
-    return parent::jqGridDataTables($params, $model);
+  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 jqGridDataTables(&$params, &$model) {
+  function gridDataTables(&$params, &$model) {
     return array
       ('link' =>
        array(// Models
 	     'CurrentLedger' => array
 	     (// Models
 	      'LedgerEntry'
-	      /* REVISIT <AP> 20090615:
-	       *  I'll remove this 'conditions' section on a future checkin,
-	       *  after I've proven out the %{MODEL_ALIAS} feature will be
-	       *  sticking around.
-
-	      => array
-	      ('conditions' =>
-	       array('OR' =>
-		     array('LedgerEntry.debit_ledger_id  = CurrentLedger.id',
-			   'LedgerEntry.credit_ledger_id = CurrentLedger.id'),
-		     ),
-	       ),
-
-	       * END REVISIT
-	       */
 	      ),
 	     ),
        );
   }
 
-  function jqGridDataFields(&$params, &$model) {
-    return array
-      ('Account.*',
-       'SUM(IF(LedgerEntry.debit_ledger_id  = CurrentLedger.id,
-               LedgerEntry.amount, NULL)) AS debits',
-       'SUM(IF(LedgerEntry.credit_ledger_id = CurrentLedger.id,
-               LedgerEntry.amount, NULL)) AS credits',
-       "SUM(IF(Account.type IN ('ASSET', 'EXPENSE'),
-	       IF(LedgerEntry.debit_ledger_id = CurrentLedger.id, 1, -1),
-	       IF(LedgerEntry.credit_ledger_id = CurrentLedger.id, 1, -1)
-               ) * IF(LedgerEntry.amount, LedgerEntry.amount, 0)
-           ) AS balance",
-       'COUNT(LedgerEntry.id) AS entries');
+  function gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+    return array_merge($fields,
+		       $this->Account->Ledger->LedgerEntry->debitCreditFields(true));
   }
 
-  function jqGridDataConditions(&$params, &$model) {
-    $conditions = parent::jqGridDataConditions($params, $model);
+  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']));
     }
 
+    $conditions[] = array('Account.level >=' =>
+			  $this->Permission->level('controller.accounts'));
+
     return $conditions;
   }
 
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
     $links['Account'] = array('name');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
+    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'));
+    }
+
+    $this->Account->recursive = -1;
+    $account = $this->Account->read(null, $id);
+    $account = $account['Account'];
+
+    $accounts = $this->Account->collectableAccounts();
+    $payment_accounts = $accounts['all'];
+    $default_accounts = $accounts['default'];
+    $this->set(compact('payment_accounts', 'default_accounts'));
+
+    $title = ($account['name'] . ': Collected Report');
+    $this->set(compact('account', 'title'));
   }
 
 
@@ -127,41 +168,43 @@ class AccountsController extends AppController {
    */
 
   function view($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
-    // Get details about the account and its ledgers (no ledger entries yet)
     $account = $this->Account->find
       ('first',
        array('contain' =>
 	     array(// Models
 		   'CurrentLedger' =>
-		   array('fields' => array('id', 'sequence')),
+		   array('fields' => array('id', 'sequence', 'name')),
 
 		   'Ledger' =>
-		   array('order' => array('Ledger.open_stamp' => 'DESC')),
+		   array('CloseTransaction' => array
+			 ('order' => array('CloseTransaction.stamp' => 'DESC'))),
 		   ),
-	     'conditions' => array(array('Account.id' => $id)),
+	     'conditions' => array(array('Account.id' => $id),
+				   array('Account.level >=' =>
+					 $this->Permission->level('controller.accounts')),
+				   ),
 	     )
        );
 
-    // Get all ledger entries of the CURRENT ledger
-    $entries = $this->Account->findLedgerEntries($id);
-    $account['CurrentLedger']['LedgerEntry'] = $entries['Entries'];
-
-    // Summarize each ledger
-    foreach($account['Ledger'] AS &$ledger)
-      $ledger = array_merge($ledger,
-			    $this->Account->Ledger->stats($ledger['id']));
+    if (empty($account)) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
 
     // Obtain stats across ALL ledgers for the summary infobox
     $stats = $this->Account->stats($id, true);
     $stats = $stats['Ledger'];
 
+    $this->addSideMenuLink('New Ledger',
+			   array('action' => 'newledger', $id), null,
+			   'ACTION', $this->admin_area);
+    $this->addSideMenuLink('Collected',
+			   array('action' => 'collected', $id), null,
+			   'ACTION', $this->admin_area);
+
     // Prepare to render
     $title = 'Account: ' . $account['Account']['name'];
     $this->set(compact('account', 'title', 'stats'));
   }
+
 }

site/controllers/contacts_controller.php

@@ -2,18 +2,6 @@
 
 class ContactsController extends AppController {
 
-  var $sidemenu_links = array();
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
-   */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-  }
-
 
   /**************************************************************************
    **************************************************************************
@@ -23,29 +11,49 @@ class ContactsController extends AppController {
    */
 
   function index()       { $this->all(); }
-  function all()         { $this->jqGridView('All Contacts', 'all'); }
+  function all()         { $this->gridView('All Contacts', 'all'); }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
    *    these virtual functions ensure that the correct data is passed
    *    to jqGrid.
    */
 
-  function jqGridDataOrder(&$params, &$model, $index, $direction) {
-    $order = parent::jqGridDataOrder($params, $model, $index, $direction);
-    if ($index === 'Contact.last_name') {
-      $order[] = 'Contact.first_name ' . $direction;
-    }
-    if ($index === 'Contact.first_name') {
-      $order[] = 'Contact.last_name ' . $direction;
-    }
+  function gridDataFilterTablesConfig(&$params, &$model, $table) {
+    $config = parent::gridDataFilterTablesConfig($params, $model, $table);
+
+    // Special case for Customer; We need the Contact/Customer relationship
+    if ($table == 'Customer')
+      $config = array('fields' => array('ContactsCustomer.type',
+					'ContactsCustomer.active'),
+		      'conditions' => array('ContactsCustomer.active' => true),
+		      );
+
+    return $config;
+  }
+
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+    $order = parent::gridDataOrder($params, $model, $index, $direction);
+
+    // After sorting by whatever the user wants, add these
+    // defaults into the sort mechanism.  If we're already
+    // sorting by one of them, it will only be redundant,
+    // and should cause no harm (possible a longer query?)
+    $order[] = 'Contact.last_name ' . $direction;
+    $order[] = 'Contact.first_name ' . $direction;
+
     return $order;
   }
 
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['Contact'] = array('display_name');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
+  }
+
 
   /**************************************************************************
    **************************************************************************
@@ -72,8 +80,122 @@ class ContactsController extends AppController {
 	'conditions' => array('Contact.id' => $id),
 	));
 
+    // Set up dynamic menu items
+    $this->addSideMenuLink('Edit',
+			   array('action' => 'edit', $id), null,
+			   'ACTION');
+
     // Prepare to render.
-    $title = $contact['Contact']['display_name'];
+    $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']));
+    }
+
+    if ($id) {
+      $this->data = $this->Contact->find
+	('first', array
+	 ('contain' => array
+	  (// Models
+	   'ContactPhone',
+	   'ContactEmail',
+	   'ContactAddress',
+	   'Customer'),
+
+	  'conditions' => array('Contact.id' => $id),
+	  ));
+
+      $title = 'Contact: ' . $this->data['Contact']['display_name'] . " : Edit";
+    }
+    else {
+      $title = "Enter New Contact";
+      $this->data = array('ContactPhone' => array(),
+			  'ContactAddress' => array(),
+			  'ContactEmail' => array());
+    }
+
+    $phone_types = array_flip($this->Contact->ContactPhone->getEnumValues('type'));
+    unset($phone_types[0]);
+    // REVISIT <AP> 20090705
+    //   Use this to have a mixed case enum
+    //     array_map('ucfirst', array_map('strtolower', $phone_types))
+    $phone_types = array_combine($phone_types, $phone_types);
+    $this->set(compact('phone_types'));
+
+    $method_types = array_flip($this->Contact->getEnumValues
+			       ('type',
+				$this->Contact->tablePrefix . 'contacts_methods'));
+    unset($method_types[0]);
+    $method_types = array_combine($method_types, $method_types);
+    $this->set(compact('method_types'));
+
+    $method_preferences = array_flip($this->Contact->getEnumValues
+				     ('preference',
+				      $this->Contact->tablePrefix . 'contacts_methods'));
+    unset($method_preferences[0]);
+    $method_preferences = array_combine($method_preferences, $method_preferences);
+    $this->set(compact('method_preferences'));
+
+    $contact_phones = $this->Contact->ContactPhone->phoneList();
+    $this->set(compact('contact_phones'));
+
+    $contact_addresses = $this->Contact->ContactAddress->addressList();
+    $this->set(compact('contact_addresses'));
+
+    $contact_emails = $this->Contact->ContactEmail->emailList();
+    $this->set(compact('contact_emails'));
+
+    // Prepare to render.
+    //pr($this->data);
+    $this->set(compact('title'));
+    $this->render('edit');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: add
+   *  - Adds a new contact
+   */
+
+  function add($customer_id = null) {
+    $this->edit(null, $customer_id);
+  }
+
 }

site/controllers/customers_controller.php

@@ -1,24 +1,39 @@
 <?php
 
 class CustomersController extends AppController {
-  var $sidemenu_links =
-    array(array('name' => 'Tenants',       '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')),
-          );
 
-  //var $components = array('RequestHandler');
+  var $components = array('RequestHandler');
 
+  // DEBUG FUNCTION ONLY!
+  // Call without id to update ALL customers
+  function force_update($id = null) {
+    $this->Customer->update($id);
+    $this->redirect(array('action'=>'index'));
+  }
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Current',
+			   array('controller' => 'customers', 'action' => 'current'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Past',
+			   array('controller' => 'customers', 'action' => 'past'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('All',
+			   array('controller' => 'customers', 'action' => 'all'), null,
+			   'CONTROLLER');
+
+/*     $this->addSideMenuLink('New Customer', */
+/* 			   array('controller' => 'customers', 'action' => 'add'), null, */
+/* 			   'CONTROLLER', $this->new_area); */
   }
 
 
@@ -26,117 +41,155 @@ class CustomersController extends AppController {
    **************************************************************************
    **************************************************************************
    * action: index / current / past / all
-   *  - Creates a list of tenants
+   *  - Creates a list of customers
    */
 
   function index()   { $this->current(); }
-  function current() { $this->jqGridView('Current Tenants'); }
-  function past()    { $this->jqGridView('Past Tenants'); }
-  function all()     { $this->jqGridView('All Tenants', 'all'); }
+  function current() { $this->gridView('Current Tenants', 'current'); }
+  function past()    { $this->gridView('Past Tenants'); }
+  function all()     { $this->gridView('All Customers'); }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
    *    these virtual functions ensure that the correct data is passed
    *    to jqGrid.
    */
 
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
-    if (!isset($params['action']))
-      $params['action'] = 'all';
-  }
-
-  function jqGridDataTables(&$params, &$model) {
+  function gridDataCountTables(&$params, &$model) {
     return array
       ('link' =>
        array(// Models
 	    'PrimaryContact',
-	    'CurrentLease' => array('fields' => array()),
 	     ),
        );
   }
 
-  function jqGridDataFields(&$params, &$model) {
-    return array('Customer.*',
-		 'COUNT(CurrentLease.id) AS lease_count');
+  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 jqGridDataConditions(&$params, &$model) {
-    $conditions = parent::jqGridDataConditions($params, $model);
+  function gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+    return array_merge($fields,
+		       $this->Customer->StatementEntry->chargeDisbursementFields(true));
+  }
+
+  function gridDataConditions(&$params, &$model) {
+    $conditions = parent::gridDataConditions($params, $model);
 
     if ($params['action'] === 'current') {
-      $conditions[] = 'CurrentLease.id IS NOT NULL';
+      $conditions[] = array('Customer.current_lease_count >' => 0);
     }
     elseif ($params['action'] === 'past') {
-      $conditions[] = 'CurrentLease.id IS NULL';
+      $conditions[] = array('Customer.current_lease_count' => 0);
+      $conditions[] = array('Customer.past_lease_count >' => 0);
     }
 
     return $conditions;
   }
 
-  function jqGridDataOrder(&$params, &$model, $index, $direction) {
-    $order = parent::jqGridDataOrder($params, $model, $index, $direction);
-    if ($index === 'PrimaryContact.last_name') {
-      $order[] = 'PrimaryContact.first_name ' . $direction;
-    }
-    if ($index === 'PrimaryContact.first_name') {
-      $order[] = 'PrimaryContact.last_name ' . $direction;
-    }
+  function gridDataFilterTablesConfig(&$params, &$model, $table) {
+    $config = parent::gridDataFilterTablesConfig($params, $model, $table);
+
+    // Special case for Contact; We need the Contact/Customer relationship
+    if ($table == 'Contact')
+      $config = array('fields' => array('ContactsCustomer.type',
+					'ContactsCustomer.active'),
+		      'conditions' => array('ContactsCustomer.active' => true),
+		      );
+
+    return $config;
+  }
+
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+    $order = parent::gridDataOrder($params, $model, $index, $direction);
+
+    // After sorting by whatever the user wants, add these
+    // defaults into the sort mechanism.  If we're already
+    // sorting by one of them, it will only be redundant,
+    // and should cause no harm (possible a longer query?)
+    $order[] = 'PrimaryContact.last_name ' . $direction;
+    $order[] = 'PrimaryContact.first_name ' . $direction;
+    $order[] = 'Customer.id ' . $direction;
+
     return $order;
   }
 
-  function jqGridDataRecordCount(&$params, &$model, $query) {
-
-    // We don't have a good way to use the query to obtain
-    // our count.  The problem is that we're relying on the
-    // group by for the query, which will destroy the count,
-    // whether we omit the group by or leave it in.
-    // So, build a fresh query for counting.
-
-    $query['conditions'] = parent::jqGridDataConditions($params, $model);
-
-    $count = $model->find('count',
-			  array_merge(array('link' => array_diff_key($query['link'],
-								     array('CurrentLease'=>1))),
-				      array_diff_key($query, array('link'=>1))));
-				      
-    if ($params['action'] === 'all')
-      return $count;
-
-    $query['conditions'][] = 'CurrentLease.id IS NULL';
-    $count_past = $model->find('count', $query);
-
-    // Since we can't easily count 'current' directly, we
-    // can quickly derive it since 'current' customers
-    // are mutually exclusive to 'past' customers.
-    if ($params['action'] == 'current')
-      $count = $count - $count_past;
-    elseif ($params['action'] == 'past') {
-      $count = $count_past;
-    }
-
-    return $count;
-  }
-
-  function jqGridDataRecords(&$params, &$model, $query) {
-    $customers = parent::jqGridDataRecords($params, $model, $query);
-
-    // Get the balance on each customer.
-    foreach ($customers AS &$customer) {
-      $stats = $this->Customer->stats($customer['Customer']['id']);
-      $customer['Customer']['balance'] = $stats['balance'];
-    }
-
-    return $customers;
-  }
-
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
     $links['Customer'] = array('name');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
+    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, $unit_id = null) {
+    $customer = array();
+    $unit = array();
+
+    if (!empty($id)) {
+      $this->Customer->recursive = -1;
+      $customer = current($this->Customer->read(null, $id));
+    }
+    if (!empty($unit_id)) {
+      $this->Customer->Lease->Unit->recursive = -1;
+      $unit = current($this->Customer->Lease->Unit->read(null, $unit_id));
+    }
+    $this->set(compact('customer', 'unit'));
+
+    $title = 'Customer Move-In';
+    $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');
   }
 
 
@@ -153,20 +206,120 @@ class CustomersController extends AppController {
       $this->redirect(array('action'=>'index'));
     }
 
-    $customer = $this->Customer->details($id);
+    // Get details on this customer, its contacts and leases
+    $customer = $this->Customer->find
+      ('first', array
+       ('contain' => array
+	(// Models
+	 'Contact' =>
+	 array('order'  => array('Contact.display_name'),
+	       // Models
+	       'ContactPhone',
+	       'ContactEmail',
+	       'ContactAddress',
+	       ),
+	 'Lease' =>
+	 array('Unit' =>
+	       array('order'  => array('sort_order'),
+		     'fields' => array('id', 'name'),
+		     ),
+	       ),
+	 ),
 
-    $outstanding_balance = $customer['stats']['balance'];
-    $outstanding_deposit = $customer['deposits']['summary']['balance'];
+	'conditions' => array('Customer.id' => $id),
+	));
+    //pr($customer);
 
-    $this->sidemenu_links[] =
-      array('name' => 'Operations',       'header' => true);
-    $this->sidemenu_links[] =
-      array('name' => 'Payment',          'url' => array('action' => 'payment', $id));
-    $this->sidemenu_links[] =
-      array('name' => 'Move-Out',         'url' => array('controller' => 'units', 'action' => 'move-out'));
+    // Determine how long this customer has been with us.
+    $leaseinfo = $this->Customer->find
+      ('first', array
+       ('link' => array('Lease' => array('fields' => array())),
+	'fields' => array('MIN(Lease.movein_date) AS since',
+			  'IF(Customer.current_lease_count = 0, MAX(Lease.moveout_date), NULL) AS until'),
+	'conditions' => array('Customer.id' => $id),
+	'group' => 'Customer.id',
+	));
+    $this->set($leaseinfo[0]);
+
+    // Figure out the outstanding balances for this customer
+    //$this->set('stats', $this->Customer->stats($id));
+    $outstanding_balance = $this->Customer->balance($id);
+    $outstanding_deposit = $this->Customer->securityDepositBalance($id);
+
+    // Figure out if this customer has any non-closed leases
+    $show_moveout = false; $moveout_lease_id = null;
+    $show_payment = false; $payment_lease_id = null;
+    foreach ($customer['Lease'] AS $lease) {
+      if (!isset($lease['close_date'])) {
+	if ($show_payment)
+	  $payment_lease_id = null;
+	else
+	  $payment_lease_id = $lease['id'];
+	$show_payment = true;
+      }
+      if (!isset($lease['moveout_date'])) {
+	if ($show_moveout)
+	  $moveout_lease_id = null;
+	else
+	  $moveout_lease_id = $lease['id'];
+	$show_moveout = true;
+      }
+    }
+
+    // Set up dynamic menu items
+
+    if ($show_payment || $outstanding_balance > 0)
+      $this->addSideMenuLink('New Receipt',
+			     array('action' => 'receipt', $id), null,
+			     'ACTION');
+
+    if ($show_payment) {
+/*       $ids = $this->Customer->leaseIds($id, true); */
+/*       if (count($ids) == 1) */
+/* 	$lease_id = $ids[0]; */
+/*       else */
+/* 	$lease_id = null; */
+
+      $this->addSideMenuLink('New Invoice',
+			     array('controller' => 'leases',
+				   'action' => 'invoice',
+				   $payment_lease_id), null,
+			     'ACTION');
+    }
+
+    $this->addSideMenuLink('Move-In',
+			   array('action' => 'move_in', $id), null,
+			   'ACTION');
+
+    if ($show_moveout) {
+      $this->addSideMenuLink('Move-Out',
+			     array('controller' => 'leases',
+				   'action' => 'move_out',
+				   $moveout_lease_id), null,
+			     'ACTION');
+    }
+
+    if (!$show_moveout && $outstanding_balance > 0)
+      $this->addSideMenuLink('Write-Off',
+			     array('action' => 'bad_debt', $id), null,
+			     'ACTION');
+
+    if ($outstanding_balance < 0)
+      $this->addSideMenuLink('Issue Refund',
+			     array('action' => 'refund', $id), null,
+			     'ACTION');
+
+    $this->addSideMenuLink('Edit',
+			   array('action' => 'edit', $id), null,
+			   'ACTION');
+
+    if ($this->admin())
+      $this->addSideMenuLink('Merge',
+			     array('action' => 'merge', $id), null,
+			     'ACTION');
 
     // Prepare to render.
-    $title = $customer['Customer']['name'];
+    $title = 'Customer: ' . $customer['Customer']['name'];
     $this->set(compact('customer', 'title',
                        'outstanding_balance',
                        'outstanding_deposit'));
@@ -176,75 +329,256 @@ class CustomersController extends AppController {
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * action: payment
-   *  - Sets up the payment entry page for the given customer.
+   * action: edit
+   *  - Edit customer information
    */
 
-  function payment($id = null) {
-/*     if (!$id) { */
-/*       $this->Session->setFlash(__('Invalid Item.', true)); */
-/*       $this->redirect(array('action'=>'index')); */
-/*     } */
+  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']));
 
-/*     if ($this->RequestHandler->isPost()) { */
-/*       pr($this->data); */
-/*       //$this->redirect(array('action'=>'index')); */
-/*       $customer = $this->data; */
-/*     } */
+	$this->redirect(array('action'=>'index'));
+      }
+
+      // 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']));
+      }
+
+      // 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']));
+      }
+
+      // 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.
+      if ($this->data['Customer']['id'])
+	$this->redirect(array('action'=>'view', $this->Customer->id));
+
+      // Since this is a new customer, go to the move in screen.
+      // First set the move-in unit id, if there is one, ...
+      if (empty($this->data['movein']['Unit']['id']))
+	$unit_id = null;
+      else
+	$unit_id = $this->data['movein']['Unit']['id'];
+
+      // ... then redirect
+      $this->redirect(array('action'=>'move_in',
+			    $this->Customer->id,
+			    $unit_id,
+			    ));
+    }
+
+    if ($id) {
+      // REVISIT <AP>: 20090816
+      //  This should never need to be done by a controller.
+      //  However, until things stabilize, this gives the
+      //  user a way to update any cached items on the
+      //  customer, by just clicking Edit then Cancel.
+      $this->Customer->update($id);
+
+      // Get details on this customer, its contacts and leases
+      $customer = $this->Customer->find
+	('first', array
+	 ('contain' => array
+	  (// Models
+	   'Contact' =>
+	   array('order'  => array('Contact.display_name'),
+		 // Models
+		 'ContactPhone',
+		 'ContactEmail',
+		 'ContactAddress',
+		 ),
+	   'Lease' =>
+	   array('Unit' =>
+		 array('order'  => array('sort_order'),
+		       'fields' => array('id', 'name'),
+		       ),
+		 ),
+	   ),
+
+	  'conditions' => array('Customer.id' => $id),
+	  ));
+
+      $this->data = $customer;
+      $title = 'Customer: ' . $this->data['Customer']['name'] . " : Edit";
+    }
+    else {
+      $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($unit_id = null) {
+    $this->set('movein', array('Unit' => array('id' => $unit_id)));
+    $this->edit();
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: merge
+   *  - Merges two customers
+   */
+
+  function merge($id = null) {
+    if ($id) {
+      $this->Customer->recursive = -1;
+      $customer = $this->Customer->read(null, $id);
+      $customer = $customer['Customer'];
+      if (empty($customer))
+	$this->INTERNAL_ERROR("Customer $id does not exist");
+      $this->set('dst_customer', $customer);
+      $this->set('dst_name', $customer['name']);
+      $this->set('dst_id', $id);
+    }
+    else {
+      $this->INTERNAL_ERROR("Merge called with invalid customer");
+    }
+  }
+
+  function mergeFinal() {
+    if (!$this->RequestHandler->isPost()) {
+      echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
+      return;
+    }
+
+    $post = $this->params['form'];
+    $this->Customer->merge($post['dst-id'], $post['src-id'],
+			   unserialize($post['contact-ids']));
+    $this->redirect(array('action'=>'view', $post['dst-id']));
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: receipt
+   *  - Sets up the receipt entry page for the given customer.
+   */
+
+  function receipt($id = null) {
     if (isset($id)) {
       $this->Customer->recursive = -1;
       $customer = $this->Customer->read(null, $id);
       $customer = $customer['Customer'];
-      $unreconciled = $this->Customer->findUnreconciledLedgerEntries($id);
-      $charges = $unreconciled['debit'];
     }
     else {
       $customer = null;
-      $charges = array('balance' => 0, 'entry' => array());
     }
 
-    $title = 'Payment Entry';
-    $this->set(compact('customer', 'charges', 'title'));
+    $TT = new TenderType();
+    $payment_types = $TT->paymentTypes();
+    $default_type = $TT->defaultPaymentType();
+    $this->set(compact('payment_types', 'default_type'));
+
+    $title = ($customer['name'] . ': Receipt Entry');
+    $this->set(compact('customer', 'title'));
   }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * action: unreconciledEntries
-   *  - returns the list of unreconciled entries
+   * action: refund
+   *  - Refunds customer charges
    */
 
-  function unreconciled($id) {
+  function refund($id) {
+    $customer = $this->Customer->find
+      ('first', array
+       ('contain' => false,
+	'conditions' => array(array('Customer.id' => $id),
+			      ),
+	));
+    if (empty($customer)) {
+      $this->redirect(array('action'=>'view', $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");
+    // Determine the customer balance, bailing if the customer owes money
+    $balance = $this->Customer->balance($id);
+    if ($balance >= 0) {
+      $this->redirect(array('action'=>'view', $id));
+    }
 
-    App::import('Helper', 'Xml');
-    $xml = new XmlHelper();
+    // The refund will be for a positive amount
+    $balance *= -1;
 
-    // Find the unreconciled entries, then manipulate the structure
-    // slightly to accomodate the format necessary for XML Helper.
-    $unreconciled = $this->Customer->findUnreconciledLedgerEntries($id);
-    $unreconciled = array('entries' =>
-			  array_intersect_key($unreconciled['debit'],
-					      array('entry'=>1, 'balance'=>1)));
+    // Get the accounts capable of paying the refund
+    $refundAccounts = $this->Customer->StatementEntry->Account->refundAccounts();
+    $defaultAccount = current($refundAccounts);
+    $this->set(compact('refundAccounts', 'defaultAccount'));
 
-    // XML Helper will dump an empty tag if the array is empty
-    if (!count($unreconciled['entries']['entry']))
-      unset($unreconciled['entries']['entry']);
+    // Prepare to render
+    $title = ($customer['Customer']['name'] . ': Refund');
+    $this->set(compact('title', 'customer', 'balance'));
+    $this->render('/transactions/refund');
+  }
 
-    pr($unreconciled);
-    //$reconciled = $cust->reconcileNewLedgerEntry($cust_id, 'credit', $amount);
 
-    $opts = array();
-    //$opts['format'] = 'tags';
-    echo $xml->header();
-    echo $xml->serialize($unreconciled, $opts);
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: bad_debt
+   *  - Sets up the write-off entry page, so that the
+   *    user can write off remaining charges of a customer.
+   */
+
+  function bad_debt($id) {
+    $this->Customer->id = $id;
+    $customer = $this->Customer->find
+      ('first', array
+       ('contain' => false,
+	));
+
+    // Make sure we have a valid customer to write off
+    if (empty($customer))
+      $this->redirect(array('action' => 'index'));
+
+    // Get the customer balance
+    $balance = $this->Customer->balance($id);
+
+    // Prepare to render
+    $title = ($customer['Customer']['name'] . ': Write Off Bad Debt');
+    $this->set(compact('title', 'customer', 'balance'));
+    $this->render('/transactions/bad_debt');
   }
 
 }

site/controllers/double_entries_controller.php

@@ -0,0 +1,59 @@
+<?php
+
+class DoubleEntriesController extends AppController {
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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),
+	     ));
+
+    $entry += $this->DoubleEntry->DebitEntry->Transaction->find
+      ('first',
+       array('contain' => false,
+	     'conditions' => array('id' => $entry['DebitEntry']['transaction_id']),
+	     ));
+
+    $entry += $this->DoubleEntry->DebitEntry->find
+      ('first',
+       array('contain' => array('Ledger' => array('Account')),
+	     'conditions' => array('DebitEntry.id' => $entry['DebitEntry']['id']),
+	     ));
+    $entry['Ledger']['link'] =
+      $entry['Ledger']['Account']['level'] >=
+      $this->Permission->level('controller.accounts');
+    $entry['DebitLedger'] = $entry['Ledger'];
+    unset($entry['Ledger']);
+
+    $entry += $this->DoubleEntry->CreditEntry->find
+      ('first',
+       array('contain' => array('Ledger' => array('Account')),
+	     'conditions' => array('CreditEntry.id' => $entry['CreditEntry']['id']),
+	     ));
+    $entry['Ledger']['link'] =
+      $entry['Ledger']['Account']['level'] >=
+      $this->Permission->level('controller.accounts');
+    $entry['CreditLedger'] = $entry['Ledger'];
+    unset($entry['Ledger']);
+
+    // Prepare to render.
+    $title = "Double Ledger Entry #{$entry['DoubleEntry']['id']}";
+    $this->set(compact('entry', 'title'));
+  }
+
+}

site/controllers/leases_controller.php

@@ -2,22 +2,29 @@
 
 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
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Active',
+			   array('controller' => 'leases', 'action' => 'active'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Closed',
+			   array('controller' => 'leases', 'action' => 'closed'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Delinquent',
+			   array('controller' => 'leases', 'action' => 'delinquent'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('All',
+			   array('controller' => 'leases', 'action' => 'all'), null,
+			   'CONTROLLER');
   }
 
 
@@ -28,63 +35,476 @@ class LeasesController extends AppController {
    *  - Generate a listing of leases
    */
 
-  function index()    { $this->all(); }
-  function active()   { $this->jqGridView('Active Leases'); }
-  function closed()   { $this->jqGridView('Closed Leases'); }
-  function all()      { $this->jqGridView('All Leases', 'all'); }
+  function index()      { $this->active(); }
+  function active()     { $this->gridView('Active Leases', 'active'); }
+  function delinquent() { $this->gridView('Delinquent Leases'); }
+  function closed()     { $this->gridView('Closed Leases'); }
+  function all()        { $this->gridView('All Leases'); }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
    *    these virtual functions ensure that the correct data is passed
    *    to jqGrid.
    */
 
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
+  function gridDataSetup(&$params) {
+    parent::gridDataSetup($params);
     if (!isset($params['action']))
       $params['action'] = 'all';
   }
 
-  function jqGridDataTables(&$params, &$model) {
+  function gridDataCountTables(&$params, &$model) {
     return array
-      ('link' => array('Unit'     => array('fields' => array('Unit.id', 'Unit.name')),
-		       'Customer' => array('fields' => array('Customer.id', 'Customer.name'))));
+      ('link' => array('Unit'     => array('fields' => array('id', 'name')),
+		       'Customer' => array('fields' => array('id', 'name'))));
   }
 
-  function jqGridDataConditions(&$params, &$model) {
-    $conditions = parent::jqGridDataConditions($params, $model);
+  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);
+    $fields[] = ("IF(" . $this->Lease->conditionDelinquent() . "," .
+		 "   'DELINQUENT', 'CURRENT') AS 'status'");
+    return array_merge($fields,
+		       $this->Lease->StatementEntry->chargeDisbursementFields(true));
+  }
+
+  function gridDataConditions(&$params, &$model) {
+    $conditions = parent::gridDataConditions($params, $model);
 
     if ($params['action'] === 'active') {
       $conditions[] = 'Lease.close_date IS NULL';
     }
+    elseif ($params['action'] === 'delinquent') {
+      $conditions[] = $this->Lease->conditionDelinquent();
+    }
     elseif ($params['action'] === 'closed') {
       $conditions[] = 'Lease.close_date IS NOT NULL';
     }
 
+    if (isset($customer_id))
+      $conditions[] = array('Lease.customer_id' => $customer_id);
+
     return $conditions;
   }
 
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
+  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::jqGridRecordLinks($params, $model, $records, $links);
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
-  function jqGridDataRecords(&$params, &$model, $query) {
-    $leases = parent::jqGridDataRecords($params, $model, $query);
 
-    // Get the balance on each lease.
-    foreach ($leases AS &$lease) {
-      $stats = $this->Lease->stats($lease['Lease']['id']);
-      $lease['Lease']['balance'] = $stats['balance'];
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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));
+    foreach (array('deposit', 'rent') AS $currency) {
+      $this->data['Lease'][$currency]
+	= str_replace('$', '', $this->data['Lease'][$currency]);
     }
 
-    return $leases;
+    $lid = $this->Lease->moveIn($this->data['Lease']['customer_id'],
+				$this->data['Lease']['unit_id'],
+				$this->data['Lease']['deposit'],
+				$this->data['Lease']['rent'],
+				$this->data['Lease']['movein_date'],
+				$this->data['Lease']['comment']
+				);
+
+    // Since this is a new lease, go to the invoice
+    // screen so we can start assessing charges.
+    $this->redirect(array('action'=>'invoice', $lid, 'move-in'));
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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
+      $this->Lease->moveOut($this->data['Lease']['id'],
+			    'VACANT',
+			    $this->data['Lease']['moveout_date']
+			    );
+
+      $lease = $this->Lease->find
+	('first', array
+	 ('contain' => array('Customer.id'),
+	  'conditions' => array(array('Lease.id' => $this->data['Lease']['id'])),
+	  ));
+
+      $this->redirect(array('controller' => 'customers',
+			    'action' => 'view',
+			    $lease['Customer']['id']));
+    }
+
+    if (isset($id)) {
+      $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']);
+
+      $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
+		$lease['Unit']['name'] . ': ' .
+		$lease['Customer']['name'] . ': Move-Out');
+    }
+    else {
+      $title = 'Move-Out';
+    }
+
+    $this->set(compact('title'));
+    $this->render('/leases/move');
+  }
+
+
+/*   /\************************************************************************** */
+/*    ************************************************************************** */
+/*    ************************************************************************** */
+/*    * action: promote_credit */
+/*    *  - Moves any lease credit up to the customer level, so that */
+/*    *    it may be used for charges other than those on this lease. */
+/*    *\/ */
+
+/*   function promote_surplus($id) { */
+/*     $this->Lease->promoteSurplus($id); */
+/*     $this->redirect(array('controller' => 'leases', */
+/* 			  'action' => 'view', */
+/* 			  $id)); */
+/*   } */
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: refund
+   *  - Provides lease customer with a refund
+   */
+
+  function refund($id) {
+    $lease = $this->Lease->find
+      ('first', array
+       ('contain' => array
+	(// Models
+	 'Unit' => array('fields' => array('id', 'name')),
+	 'Customer' => array('fields' => array('id', 'name')),
+	 ),
+
+	'conditions' => array(array('Lease.id' => $id),
+			      // Make sure lease is not closed...
+			      array('Lease.close_date' => null),
+			      ),
+	));
+    if (empty($lease)) {
+      $this->redirect(array('action'=>'view', $id));
+    }
+
+    // Determine the lease balance, bailing if the customer owes money
+    $balance = $this->Lease->balance($id);
+    if ($balance >= 0) {
+      $this->redirect(array('action'=>'view', $id));
+    }
+
+    // The refund will be for a positive amount
+    $balance *= -1;
+
+    // Get the accounts capable of paying the refund
+    $refundAccounts = $this->Lease->StatementEntry->Account->refundAccounts();
+    $defaultAccount = current($refundAccounts);
+    $this->set(compact('refundAccounts', 'defaultAccount'));
+
+    // Prepare to render
+    $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
+	      $lease['Unit']['name'] . ': ' .
+	      $lease['Customer']['name'] . ': Refund');
+    $this->set(compact('title', 'lease', 'balance'));
+    $this->render('/transactions/refund');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: bad_debt
+   *  - Sets up the write-off entry page, so that the
+   *    user can write off remaining charges on a lease.
+   */
+
+  function bad_debt($id) {
+    $this->Lease->id = $id;
+    $lease = $this->Lease->find
+      ('first', array
+       ('contain' => array
+	(// Models
+	 'Unit' => array('fields' => array('id', 'name')),
+	 'Customer' => array('fields' => array('id', 'name')),
+	 ),
+	));
+
+    // Make sure we have a valid lease to write off
+    if (empty($lease))
+      $this->redirect(array('action' => 'view', $id));
+
+    // Get the lease balance
+    $balance = $this->Lease->balance($id);
+
+    // Prepare to render
+    $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
+	      $lease['Unit']['name'] . ': ' .
+	      $lease['Customer']['name'] . ': Write Off Bad Debt');
+    $this->set(compact('title', 'lease', 'balance'));
+    $this->render('/transactions/bad_debt');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: close
+   *  - Closes a lease to any further action
+   */
+
+  function close($id) {
+    // REVISIT <AP>: 20090708
+    //  We should probably seek confirmation first...
+    if (!$this->Lease->closeable($id)) {
+      $this->INTERNAL_ERROR("This lease is not ready to close");
+      $this->redirect(array('action'=>'view', $id));
+    }
+
+    $this->Lease->close($id);
+    $this->redirect(array('action'=>'view', $id));
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: open
+   *  - Re-opens a lease for further action
+   */
+
+  function open($id) {
+    // REVISIT <AP>: 20131204
+    //  We should probably seek confirmation first, since this wipes out
+    //  the old close date, with no way to restore that date.
+    $this->Lease->reopen($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->invoiceAccounts();
+    $default_account = $A->rentAccountID();
+    $rent_account    = $A->rentAccountID();
+    $security_deposit_account = $A->securityDepositAccountID();
+    $this->set(compact('charge_accounts', 'default_account',
+		       'rent_account', 'security_deposit_account'));
+
+    // REVISIT <AP> 20090705:
+    //   Of course, the late charge should come from the late_schedule
+    $default_late = 10;
+    $this->set(compact('default_late'));
+
+    if ($type === 'move-in') {
+      // Make sure we have a valid lease that we're moving in
+      if (empty($lease))
+	$this->redirect(array('action' => 'index'));
+
+      $movein = array();
+      $movein['time'] = strtotime($lease['Lease']['movein_date']);
+      $movein['effective_time'] = strtotime($lease['Lease']['movein_date']);
+      $movein_date = getdate($movein['effective_time']);
+      $movein['through_time'] = mktime(0, 0, 0, $movein_date['mon'] + 1, 0, $movein_date['year']);
+      $days_in_month = idate('d', $movein['through_time']);
+      $movein['prorated_days'] = $days_in_month - $movein_date['mday'] + 1;
+      $movein['prorated_rent'] = $lease['Lease']['rent'] * $movein['prorated_days'] / $days_in_month;
+      $movein['prorated'] = $movein['prorated_days'] != $days_in_month;
+      $movein['deposit'] = $lease['Lease']['deposit'];
+      $this->set(compact('movein'));
+    }
+
+
+    $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
+	      $lease['Unit']['name'] . ': ' .
+	      $lease['Customer']['name'] . ': Charge Entry');
+    $this->set(compact('title', 'lease', 'charge'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: assess_rent/late
+   *  - Assesses the new monthly rent/late charge, if need be
+   */
+
+  function assess_rent($date = null) {
+    $this->Lease->assessMonthlyRentAll($date);
+    $this->redirect(array('action'=>'index'));
+  }
+  function assess_late($date = null) {
+    $this->Lease->assessMonthlyLateAll($date);
+    $this->redirect(array('action'=>'index'));
+  }
+  function assess_all($date = null) {
+    $this->Lease->assessMonthlyRentAll($date);
+    $this->Lease->assessMonthlyLateAll($date);
+    $this->redirect(array('action'=>'index'));
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: overview
+   *  - Displays lease up information
+   */
+  function overview($months = 12) {
+
+    $overview = array('months' => array());
+
+    for ($month = 0; $month < $months; ++$month) {
+    //for ($month = 12; $month >= 0; --$month) {
+      $this_month = "(DATE(NOW() - INTERVAL $month MONTH - INTERVAL DAY(NOW())-1 DAY))";
+      $next_month = "($this_month + INTERVAL 1 MONTH)";
+
+      $row = $this->Lease->find
+	('first', array('link' => array(),
+			'fields' => array("MONTHNAME($this_month) AS month",
+					  "YEAR($this_month) AS year"),
+			));
+
+      $mname = $row[0]['month'] .', '. $row[0]['year'];
+      $overview['months'][$mname] = array('name' => $mname);
+
+      foreach(array('start'  => array('before' => $this_month, 'after' => $this_month),
+		    'finish' => array('before' => $next_month, 'after' => $next_month),
+		    'peak'   => array('before' => $next_month, 'after' => $this_month))
+	      AS $type => $parm) {
+	$count = $this->Lease->find
+	  ('count', 
+	   array('link' => array(),
+		 'conditions' => array("movein_date < {$parm['before']}",
+				       "(moveout_date IS NULL OR moveout_date >= {$parm['after']})",
+				       ),
+		 ));
+	$overview['months'][$mname][$type] = $count;
+      }
+
+      foreach(array('movein', 'moveout') AS $mvinout) {
+	$count = $this->Lease->find
+	  ('count', 
+	   array('link' => array(),
+		 'conditions' => array("{$mvinout}_date < $next_month",
+				       "{$mvinout}_date >= $this_month")
+		 ));
+	$overview['months'][$mname][$mvinout] = $count;
+      }
+    }
+
+    // Enable the Reports menu section
+    $this->sideMenuAreaActivate('REPORT');
+
+    // Prepare to render.
+    $this->set('title', 'Lease Up Report');
+    $this->set(compact('overview'));
   }
 
 
@@ -106,23 +526,71 @@ class LeasesController extends AppController {
       ('first',
        array('contain' =>
 	     array(// Models
-		   'LeaseType',
-		   'Unit',
-		   'Customer',
+		   'LeaseType(id,name)',
+		   'Unit(id,name)',
+		   'Customer(id,name)',
 		   ),
+	     'fields' => array('Lease.*', $this->Lease->delinquentField()),
 	     'conditions' => array(array('Lease.id' => $id)),
-	     'limit' => 2
 	     )
        );
+    $lease['Lease'] += $lease[0];
+    unset($lease[0]);
 
-    // Obtain the overall lease balance
-    $this->Lease->statsMerge($lease['Lease'],
-			     array('stats' => $this->Lease->stats($id)));
-    $outstanding_balance = $lease['Lease']['stats']['balance'];
+    // Figure out the outstanding balances for this lease
+    $outstanding_balance = $this->Lease->balance($id);
+    $outstanding_deposit = $this->Lease->securityDepositBalance($id);
 
-    // Determine the lease security deposit
-    $deposits = $this->Lease->findSecurityDeposits($lease['Lease']['id']);
-    $outstanding_deposit = $deposits['summary']['balance'];
+    // Set up dynamic menu items.  Normally, these will only be present
+    // on an open lease, but it's possible for a lease to be closed, and
+    // yet still have an outstanding balance.  This can happen if someone
+    // were to reverse charges, or if a payment should come back NSF.
+    if (!isset($lease['Lease']['close_date']) || $outstanding_balance > 0) {
+      if (!isset($lease['Lease']['moveout_date']))
+	$this->addSideMenuLink('Move-Out',
+			       array('action' => 'move_out', $id), null,
+			       'ACTION');
+
+      if (!isset($lease['Lease']['close_date']))
+	$this->addSideMenuLink('New Invoice',
+			       array('action' => 'invoice', $id), null,
+			       'ACTION');
+
+      $this->addSideMenuLink('New Receipt',
+			     array('controller' => 'customers',
+				   'action' => 'receipt',
+				   $lease['Customer']['id']), null,
+			     'ACTION');
+
+      // REVISIT <AP>:
+      //  Not allowing refund to be issued from the lease, as
+      //  in fact, we should never have a positive lease balance.
+      //  I'll flag this at the moment, since we might get one
+      //  when a charge is reimbursed; a bug that we'll either
+      //  need to fix, or we'll have to revisit this assumption.
+      if ($outstanding_balance < 0)
+	$this->INTERNAL_ERROR("Should not have a customer lease credit.");
+
+/*       if ($outstanding_balance < 0) */
+/* 	$this->addSideMenuLink('Issue Refund', */
+/* 			       array('action' => 'refund', $id), null, */
+/* 			       'ACTION'); */
+
+      if (isset($lease['Lease']['moveout_date']) && $outstanding_balance > 0)
+	$this->addSideMenuLink('Write-Off',
+			       array('action' => 'bad_debt', $id), null,
+			       'ACTION');
+    }
+
+    if ($this->Lease->closeable($id))
+      $this->addSideMenuLink('Close',
+			     array('action' => 'close', $id), null,
+			     'ACTION');
+
+    if ($this->Lease->isClosed($id))
+      $this->addSideMenuLink('Re-Open',
+			     array('action' => 'open', $id), null,
+			     'ACTION');
 
     // Prepare to render
     $title = 'Lease: #' . $lease['Lease']['id'];

site/controllers/ledger_entries_controller.php

@@ -2,235 +2,95 @@
 
 class LedgerEntriesController extends AppController {
 
-  var $sidemenu_links = array();
-
   
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
+   * action: index / current / past / all
+   *  - Creates a list of ledger entries
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-  }
+
+  function index()   { $this->gridView('All Ledger Entries'); }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
    *    these virtual functions ensure that the correct data is passed
    *    to jqGrid.
    */
 
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
-    if (isset($params['custom']['ar_account'])) {
-      $params['custom']['account_id'] = 
-	$this->LedgerEntry->DebitLedger->Account->accountReceivableAccountID();
-    }
-  }
-
-  function jqGridDataTables(&$params, &$model) {
+  function gridDataTables(&$params, &$model) {
     $link =
       array(// Models
-	     'Transaction' =>
-	     array('fields' => array('id', 'stamp'),
-		   ),
+	    'Transaction' =>
+	    array('fields' => array('id', 'stamp'),
+		  ),
 
-	     'MonetarySource' =>
-	     array('fields' => array('id', 'name'),
-		   ),
+	    'Ledger' =>
+	    array('fields' => array('id', 'sequence'),
+		  'Account' => 
+		  array('fields' => array('id', 'name', 'type'),
+			),
+		  ),
 
-	     'Customer' =>
-	     array('fields' => array('id', 'name'),
-		   ),
+	    'Tender' =>
+	    array('fields' => array('id', 'name', 'nsf_transaction_id'),
+		  ),
 
-	     'Lease' =>
-	     array('fields' => array('id', 'number'),
-		   'Unit' => 
-		   array('fields' => array('id', 'name'),
-			 ),
-		   ),
+/* 	    'DebitEntry', */
+/* 	    'CreditEntry', */
 	    );
 
-    if (isset($params['custom']['account_ftype'])) {
-      $ftype = $params['custom']['account_ftype'];
-      $ftype = ucfirst($ftype);
-      //$ftype = $this->LedgerEntry->DebitLedger->Account->fundamentalOpposite($ftype);
-      $link[$ftype . 'Ledger'] =
-	array('fields' => array('id', 'sequence'),
-	      'Account' => array('class' => 'Account',
-				 'fields' => array('id', 'name'),
-				 ),
-	      );
-    }
-    elseif (isset($params['custom']['ledger_id'])) {
-      $ledger_id = $params['custom']['ledger_id'];
-      $link['Ledger'] =
-	array('fields' => array('id', 'sequence'),
-	      'conditions' => ("Ledger.id = IF(LedgerEntry.debit_ledger_id = $ledger_id," .
-			       "               LedgerEntry.credit_ledger_id," .
-			       "               LedgerEntry.debit_ledger_id)"),
-	      'Account' => array(
-				 'fields' => array('id', 'name'),
-				 ),
-	      );
-    }
-    else {
-      $link['DebitLedger'] =
-	array('fields' => array('id', 'sequence'),
-	      'DebitAccount' => array('class' => 'Account',
-				      'fields' => array('id', 'name'),
-				      ),
-	      );
-
-      $link['CreditLedger'] =
-	array('fields' => array('id', 'sequence'),
-	      'CreditAccount' => array('class' => 'Account',
-				       'fields' => array('id', 'name'),
-				       ),
-	      );
-    }
-
-    if (isset($params['custom']['account_id'])) {
-      $account_id = $params['custom']['account_id'];
-      $link['Ledger'] =
-	array('fields' => array('id', 'sequence'),
-	      'conditions' => ("Ledger.id = IF(DebitLedger.account_id = $account_id," .
-			       "               LedgerEntry.credit_ledger_id," .
-			       "               LedgerEntry.debit_ledger_id)"),
-	      'Account' => array(
-				 'fields' => array('id', 'name'),
-				 ),
-	      );
-    }
-
-    if (isset($params['custom']['reconcile_id'])) {
-      $ftype = $params['custom']['account_ftype'];
-      $ftype = $this->LedgerEntry->DebitLedger->Account->fundamentalOpposite($ftype);
-      $ftype = ucfirst($ftype);
-      $link[$ftype.'ReconciliationLedgerEntry'] =
-	array('fields' => array('Reconciliation.amount'));
-    }
-
     return array('link' => $link);
   }
 
-  function jqGridDataFields(&$params, &$model) {
-    $ledger_id = (isset($params['custom']['ledger_id'])
-		  ? $params['custom']['ledger_id']
-		  : null);
-    $account_id = (isset($params['custom']['account_id'])
-		     ? $params['custom']['account_id']
-		     : null);
-    $account_type = (isset($params['custom']['account_type'])
-		     ? $params['custom']['account_type']
-		     : null);
-
-    return $model->ledgerContextFields2($ledger_id, $account_id, $account_type);
+  function gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+    return array_merge($fields,
+		       $this->LedgerEntry->debitCreditFields());
   }
 
-  function jqGridDataConditions(&$params, &$model) {
-    $ledger_id = (isset($params['custom']['ledger_id'])
-		  ? $params['custom']['ledger_id']
-		  : null);
-    $account_type = (isset($params['custom']['account_type'])
-		     ? $params['custom']['account_type']
-		     : null);
+  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;
 
-    $conditions = parent::jqGridDataConditions($params, $model);
+    // Customer needs to be added beneath Transaction
+    if ($table == 'Customer')
+      return 'Transaction';
 
-    if ($params['action'] === 'ledger') {
-      $conditions[] = $model->ledgerContextConditions($ledger_id, $account_type);
-    }
-    if (isset($params['custom']['reconcile_id'])) {
-      $ftype = $params['custom']['account_ftype'];
-      //$ftype = $this->LedgerEntry->DebitLedger->Account->fundamentalOpposite($ftype);
-      $conditions[] = array('Reconciliation.'.$ftype.'_ledger_entry_id' => $params['custom']['reconcile_id']);
-    }
-
-    if (isset($params['custom']['account_id'])) {
-      $conditions[] =
-	array('OR' => 
-	      array(array('CreditAccount.id' => $params['custom']['account_id']),
-		    array('DebitAccount.id' => $params['custom']['account_id'])));
-    }
-
-    if (isset($params['custom']['customer_id'])) {
-      $conditions[] = 
-	array('Customer.id' => $params['custom']['customer_id']);
-
-/*       $Account = new Account(); */
-/*       if (isset($params['custom']['account_ftype']) || */
-/* 	  isset($params['custom']['ledger_id'])) { */
-/* 	$conditions[] =  */
-/* 	  array('OR' => array('Account.id' => $Account->invoiceAccountID(), */
-/* 			      'Account.id' => $Account->receiptAccountID())); */
-/*       } else { */
-/* 	$conditions[] =  */
-/* 	  array('OR' => array('DebitAccount.id' => $Account->invoiceAccountID(), */
-/* 			      //'CreditAccount.id' => $Account->invoiceAccountID(), */
-/* 			      //'DebitAccount.id' => $Account->receiptAccountID(), */
-/* 			      'CreditAccount.id' => $Account->receiptAccountID(), */
-/* 			      )); */
-/*       } */
-    }
-
-    if (isset($params['custom']['lease_id'])) {
-      $conditions[] = 
-	array('Lease.id' => $params['custom']['lease_id']);
-
-/*       $Account = new Account(); */
-/*       if (isset($params['custom']['account_ftype']) || */
-/* 	  isset($params['custom']['ledger_id'])) { */
-/* 	$conditions[] =  */
-/* 	  array('OR' => array('Account.id' => $Account->invoiceAccountID(), */
-/* 			      'Account.id' => $Account->receiptAccountID())); */
-/*       } else { */
-/* 	$conditions[] =  */
-/* 	  array('OR' => array('DebitAccount.id' => $Account->invoiceAccountID(), */
-/* 			      //'CreditAccount.id' => $Account->invoiceAccountID(), */
-/* 			      //'DebitAccount.id' => $Account->receiptAccountID(), */
-/* 			      'CreditAccount.id' => $Account->receiptAccountID(), */
-/* 			      )); */
-/*       } */
-    }
-
-    if (isset($params['custom']['transaction_id'])) {
-      $conditions[] = 
-	array('Transaction.id' => $params['custom']['transaction_id']);
-    }
-
-    return $conditions;
+    return $table;
   }
 
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['Transaction']    = array('id');
-    $links['LedgerEntry']    = array('id');
-    $links['Account']        = array('controller' => 'accounts', 'name');
-    $links['DebitAccount']   = array('controller' => 'accounts', 'name');
-    $links['CreditAccount']  = array('controller' => 'accounts', 'name');
-    $links['MonetarySource'] = array('name');
-    $links['Customer']       = array('name');
-    $links['Lease']          = array('number');
-    $links['Unit']           = array('name');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
+  function 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 jqGridDataGroup(&$params, &$model) {
-    if (isset($params['custom']['notxgroup']))
-      return parent::jqGridDataGroup($params, $model);
-
-    return $model->alias.'.transaction_id';
+  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 jqGridDataOrder(&$params, &$model, $index, $direction) {
+
+  function gridDataOrder(&$params, &$model, $index, $direction) {
 /*     if ($index === 'balance') */
 /*       return ($index .' '. $direction); */
-    $order = parent::jqGridDataOrder($params, $model, $index, $direction);
+    $order = parent::gridDataOrder($params, $model, $index, $direction);
 
     if ($index === 'Transaction.stamp') {
       $order[] = 'LedgerEntry.id ' . $direction;
@@ -239,30 +99,32 @@ class LedgerEntriesController extends AppController {
     return $order;
   }
 
-  function jqGridRecordsPostProcess(&$params, &$model, &$records) {
-    parent::jqGridRecordsPostProcess($params, $model, $records);
-
-    $subtotal = 0;
+  function gridDataPostProcessCalculatedFields(&$params, &$model, &$records) {
+    parent::gridDataPostProcessCalculatedFields($params, $model, $records);
     foreach ($records AS &$record) {
-      $amount = (isset($record['LedgerEntry']['balance'])
-		 ? $record['LedgerEntry']['balance']
-		 : $record['LedgerEntry']['amount']);
-      $record['LedgerEntry']['subtotal'] = ($subtotal += $amount);
-
-      continue;
-      // Experiment to minimize columns by putting the monetary source
-      // as the Account, when available
-      if ($record['MonetarySource']['name'])
-	$record['Account']['name'] = $record['MonetarySource']['name'];
+      // 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 jqGridDataOutputRecordCell(&$params, &$model, &$record, $field, $data) {
-/*     if ($field === 'CreditAccount.name') { */
-/*       $data .= '-OK'; */
-/*     } */
-
-    parent::jqGridDataOutputRecordCell($params, $model, $record, $field, $data);
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['LedgerEntry']    = array('id');
+    $links['Transaction']    = array('id');
+    // REVISIT <AP>: 20090827
+    //  Need to take 'level' into account
+    if ($this->Permission->allow('controller.accounts')) {
+      $links['Ledger']         = array('id');
+      $links['Account']        = array('name');
+    }
+    $links['Tender']         = array('name');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
 
@@ -274,71 +136,69 @@ class LedgerEntriesController extends AppController {
    */
 
   function view($id = null) {
-    if (!$id) {
+    $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'),
+		    ),
+
+	      'DebitDoubleEntry' => array('id'),
+	      'CreditDoubleEntry' => array('id'),
+
+	      'DebitEntry'  => array('fields' => array('id', 'crdr')),
+	      'CreditEntry' => array('fields' => array('id', 'crdr')),
+	      ),
+
+	     'conditions' => array('LedgerEntry.id' => $id),
+	     ));
+
+    if (empty($entry) || empty($entry['Ledger']['Account'])) {
       $this->Session->setFlash(__('Invalid Item.', true));
       $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
     }
 
-    // Get the LedgerEntry and related fields
-    $entry = $this->LedgerEntry->find
-      ('first',
-       array('contain' => array('MonetarySource.id',
-				'MonetarySource.name',
-				'MonetarySource.MonetaryType.id',
-				'Transaction.id',
-				'Transaction.stamp',
-				'DebitLedger.id',
-				'DebitLedger.sequence',
-				'DebitLedger.account_id',
-				'CreditLedger.id',
-				'CreditLedger.sequence',
-				'CreditLedger.account_id',
-				'Customer.id',
-				'Customer.name',
-				'Lease.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");
 
-	     'fields' => array('LedgerEntry.id',
-			       'LedgerEntry.amount',
-			       'LedgerEntry.comment'),
+    if (empty($entry['DebitEntry']))
+      $entry['MatchingEntry'] = $entry['CreditEntry'][0];
+    else
+      $entry['MatchingEntry'] = $entry['DebitEntry'][0];
 
-	     'conditions' => array('LedgerEntry.id' => $id),
-	     ));
-    pr($entry);
+    if (empty($entry['DebitDoubleEntry']['id']))
+      $entry['DoubleEntry'] = $entry['CreditDoubleEntry'];
+    else
+      $entry['DoubleEntry'] = $entry['DebitDoubleEntry'];
 
-    // Because 'DebitLedger' and 'CreditLedger' both relate to 'Account',
-    // CakePHP will not include them in the LedgerEntry->find (or so it
-    // seems).  We'll have to break out each Account separately.
-
-    // Get the Account from DebitLedger
-    $entry['DebitLedger'] += $this->LedgerEntry->DebitLedger->Account->find
-      ('first',
-       array('contain' => true,
-	     'fields' => array('Account.id', 'Account.name', 'Account.type', 'Account.trackable'),
-	     'conditions' => array('Account.id' => $entry['DebitLedger']['account_id']),
-	     ));
-
-    // Get the Account from CreditLedger
-    $entry['CreditLedger'] += $this->LedgerEntry->CreditLedger->Account->find
-      ('first',
-       array('contain' => true,
-	     'fields' => array('Account.id', 'Account.name', 'Account.type', 'Account.trackable'),
-	     'conditions' => array('Account.id' => $entry['CreditLedger']['account_id']),
-	     ));
-
-    // Get the reconciliation balances for this ledger entry
-    $stats = $this->LedgerEntry->stats($id);
-    if ($entry['DebitLedger']['Account']['trackable'])
-      $stats['debit_amount_remaining'] = $entry['LedgerEntry']['amount'] - $stats['debit_amount_reconciled'];
-    if ($entry['CreditLedger']['Account']['trackable'])
-      $stats['credit_amount_remaining'] = $entry['LedgerEntry']['amount'] - $stats['credit_amount_reconciled'];
-    //pr($stats);
-
-    $reconciled = $this->LedgerEntry->findReconciledLedgerEntries($id);
-    //pr($reconciled);
+    // REVISIT <AP>: 20090816
+    //  This page doesn't seem very useful, let's just keep it
+    //  all to the double entry view.
+    $this->redirect(array('controller' => 'double_entries',
+			  'action' => 'view',
+			  $entry['DoubleEntry']['id']));
 
     // Prepare to render.
     $title = "Ledger Entry #{$entry['LedgerEntry']['id']}";
-    $this->set(compact('entry', 'title', 'reconciled', 'stats'));
+    $this->set(compact('entry', 'title'));
   }
+
 }

site/controllers/ledgers_controller.php

@@ -2,22 +2,26 @@
 
 class LedgersController extends AppController {
 
-  var $sidemenu_links =
-    array(array('name' => 'Ledgers',      'header' => true),
-	  array('name' => 'Current',      'url' => array('controller' => 'ledgers', 'action' => 'current')),
-	  array('name' => 'Closed',       'url' => array('controller' => 'ledgers', 'action' => 'closed')),
-	  array('name' => 'All',          'url' => array('controller' => 'ledgers', 'action' => 'all')),
-	  );
-
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Current',
+			   array('controller' => 'ledgers', 'action' => 'current'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Closed',
+			   array('controller' => 'ledgers', 'action' => 'closed'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('All',
+			   array('controller' => 'ledgers', 'action' => 'all'), null,
+			   'CONTROLLER');
   }
 
 
@@ -29,89 +33,86 @@ class LedgersController extends AppController {
    */
 
   function index()     { $this->all(); }
-  function current()   { $this->jqGridView('Current Ledgers'); }
-  function closed()    { $this->jqGridView('Closed Ledgers');  }
-  function all()       { $this->jqGridView('All Ledgers', 'all'); }
+  function current()   { $this->gridView('Current Ledgers'); }
+  function closed()    { $this->gridView('Closed Ledgers');  }
+  function all()       { $this->gridView('All Ledgers', 'all'); }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
    *    these virtual functions ensure that the correct data is passed
    *    to jqGrid.
    */
 
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
+  function gridDataSetup(&$params) {
+    parent::gridDataSetup($params);
     if (!isset($params['action']))
       $params['action'] = 'all';
   }
 
-  function jqGridDataCountTables(&$params, &$model) {
-    return array('contain' => false);
-  }
-
-  function jqGridDataTables(&$params, &$model) {
+  function gridDataCountTables(&$params, &$model) {
     return array
       ('link' =>
        array(// Models
 	     'Account',
-	     'LedgerEntry',
 	     ),
        );
   }
 
-  function jqGridDataFields(&$params, &$model) {
-    return array
-      ('Ledger.*',
-       'CONCAT(Account.id, "-", Ledger.sequence) AS id_sequence',
-       'SUM(IF(LedgerEntry.debit_ledger_id  = Ledger.id,
-               LedgerEntry.amount, NULL)) AS debits',
-       'SUM(IF(LedgerEntry.credit_ledger_id = Ledger.id,
-               LedgerEntry.amount, NULL)) AS credits',
-       "SUM(IF(Account.type IN ('ASSET', 'EXPENSE'),
-               IF(LedgerEntry.debit_ledger_id  = Ledger.id, 1, -1),
-               IF(LedgerEntry.credit_ledger_id = Ledger.id, 1, -1)
-              ) * IF(LedgerEntry.amount, LedgerEntry.amount, 0)
-           ) AS balance",
-       'COUNT(LedgerEntry.id) AS entries');
+  function gridDataTables(&$params, &$model) {
+    $tables = $this->gridDataCountTables($params, $model);
+    $tables['link'][] = 'LedgerEntry';
+    $tables['link'][] = 'CloseTransaction';
+    return $tables;
   }
 
-  function jqGridDataConditions(&$params, &$model) {
-    $conditions = parent::jqGridDataConditions($params, $model);
+  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('NOT' => array('Ledger.closed'));
+      $conditions[] = array('Ledger.close_transaction_id' => null);
     }
     elseif ($params['action'] === 'closed') {
-      $conditions[] = 'Ledger.closed';
+      $conditions[] = array('Ledger.close_transaction_id !=' => null);
     }
 
+    $conditions[] = array('Account.level >=' =>
+			  $this->Permission->level('controller.accounts'));
+
     return $conditions;
   }
 
-  function jqGridDataOrder(&$params, &$model, $index, $direction) {
-    $id_sequence = false;
-    if ($index === 'id_sequence') {
-      $id_sequence = true;
-      $index = 'Ledger.account_id';
-    }
+  function gridDataOrder(&$params, &$model, $index, $direction) {
+    $order = parent::gridDataOrder($params, $model, $index, $direction);
 
-    $order = parent::jqGridDataOrder($params, $model, $index, $direction);
-
-    if ($id_sequence) {
-      $order[] = 'Ledger.sequence ' . $direction;
-    }
+    // After sorting by whatever the user wants, add these
+    // defaults into the sort mechanism.  If we're already
+    // sorting by one of them, it will only be redundant,
+    // and should cause no harm (possible a longer query?)
+    $order[] = 'Account.name ' . $direction;
+    $order[] = 'Ledger.sequence ' . $direction;
 
     return $order;
   }
 
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['Ledger'] = array('id_sequence');
-    $links['Account'] = array('name');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    // REVISIT <AP>: 20090827
+    //  Need to take 'level' into account
+    if ($this->Permission->allow('controller.accounts')) {
+      $links['Ledger'] = array('sequence');
+      $links['Account'] = array('name');
+    }
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
 
@@ -123,22 +124,24 @@ class LedgersController extends AppController {
    */
 
   function view($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
-    // Get details about the ledger itself (no entries yet)
     $ledger = $this->Ledger->find
       ('first',
        array('contain' =>
 	     array(// Models
 		   'Account',
 		   ),
-	     'conditions' => array(array('Ledger.id' => $id)),
+	     'conditions' => array(array('Ledger.id' => $id),
+				   array('Account.level >=' =>
+					 $this->Permission->level('controller.accounts')),
+				   ),
 	     )
        );
 
+    if (empty($ledger)) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
     // Get ledger stats for our summary box
     $stats = $this->Ledger->stats($id);
 

site/controllers/locks_controller.php

@@ -0,0 +1,216 @@
+<?php
+
+class LocksController extends AppController {
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
+   */
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('List',
+    			   array('controller' => 'locks', 'action' => 'all'), null,
+    			   'CONTROLLER');
+    $this->addSideMenuLink('Add',
+    			   array('controller' => 'locks', 'action' => 'add'), null,
+    			   'CONTROLLER');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index / all
+   *  - Generate a listing of locks
+   */
+
+  function index()       { $this->all(); }
+  function all()         { $this->gridView('Locks', 'all'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
+   *    these virtual functions ensure that the correct data is passed
+   *    to jqGrid.
+   */
+
+  /* function gridDataCountTables(&$params, &$model) { */
+  /*   return array('link' => array('Unit')); */
+  /* } */
+
+  function gridDataTables(&$params, &$model) {
+    $tables = parent::gridDataTables($params, $model);
+    $tables['link']['LocksUnit'] = array();
+    return $tables;
+  }
+
+  function gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+    $fields[] = 'COUNT(LocksUnit.id) AS inuse';
+    $fields[] = 'IF(Lock.qty > COUNT(LocksUnit.id), Lock.qty - COUNT(LocksUnit.id), 0) AS avail';
+    return $fields;
+  }
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['Lock'] = 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' => 'locks', 'action'=>'index'));
+    }
+
+    // Get the lock and related fields
+    $this->Lock->id = $id;
+    $lock = $this->Lock->find
+      ('first', array
+       ('contain' => array(),
+	));
+    //$lock['Lock'] = $lock[0] + $lock['lock'];
+    //unset($lock[0]);
+
+    $this->addSideMenuLink('Edit',
+			   array('action' => 'edit', $id), null,
+			   'ACTION');
+
+    $this->addSideMenuLink('Delete',
+			   array('action' => 'delete', $id), null,
+			   'ACTION');
+
+    $this->set(compact('lock'));
+
+    // Prepare to render.
+    $title = "Lock : {$lock['Lock']['name']}";
+    $this->set(compact('title'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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['Lock']['id']))
+	  $this->redirect(array('action'=>'view', $this->data['Lock']['id']));
+
+	$this->redirect(array('action'=>'index'));
+      }
+
+      // Save the lock and all associated data
+      if (!$this->Lock->saveLock($this->data)) {
+	$this->Session->setFlash("LOCK SAVE FAILED", true);
+	pr("LOCK SAVE FAILED");
+      }
+
+      // View the lock by redirect
+      $this->redirect(array('action'=>'view', $this->Lock->id));
+    }
+
+    if ($id) {
+      // Get details on this customer, its contacts and leases
+      $lock = $this->Lock->find
+	('first', array
+	 ('conditions' => array('Lock.id' => $id),
+	  ));
+
+      $this->data = $lock;
+      $title = 'Lock: ' . $this->data['Lock']['name'] . " : Edit";
+    }
+    else {
+      $title = "Enter New Lock Information";
+      $this->data = array();
+    }
+
+    // Prepare to render.
+    //pr($this->data);
+    $this->set(compact('title'));
+    $this->render('edit');
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: add
+   *  - Add a new lock
+   */
+
+  function add() {
+    $this->edit();
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: delete
+   *  - Deletes an old lock
+   */
+  function delete($id) {
+    if (isset($this->data)) {
+      // Check to see if the operation was cancelled.
+      if (isset($this->params['form']['cancel'])) {
+	if (isset($this->data['Lock']['id']))
+	  $this->redirect(array('action'=>'view', $this->data['Lock']['id']));
+
+	$this->redirect(array('action'=>'index'));
+      }
+
+      // Delete the lock and all associated data
+      if (!$this->Lock->destroy($this->data['Lock']['id'])) {
+	$this->Session->setFlash(__('Failed to delete lock.', true));
+	$this->redirect(array('action'=>'view', $this->data['Lock']['id']));
+      }
+
+      // It's gone. Go back to the list of locks
+      $this->redirect(array('controller' => 'locks', 'action'=>'index'));
+    }
+
+    // User must specify an ID.
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('controller' => 'locks', 'action'=>'index'));
+    }
+
+    // Get the lock and related fields
+    $this->Lock->id = $id;
+    $lock = $this->Lock->find
+      ('first', array
+       ('contain' => array('Unit'),
+	));
+
+    // Make sure the lock isn't in use.
+    if (isset($lock['Unit']) && count($lock['Unit']) > 0) {
+      $this->Session->setFlash(__('Lock currently on units. Cannot be deleted!', true));
+      $this->redirect(array('action'=>'view', $id));
+    }
+    
+    // Prepare to render.
+    $this->data = $lock;
+    $title = "Delete Lock : {$lock['Lock']['name']}";
+    $this->set(compact('title'));
+  }
+
+}

site/controllers/maps_controller.php

@@ -15,28 +15,28 @@ class MapsController extends AppController {
    */
 
   function index()    { $this->all(); }
-  function all()      { $this->jqGridView('All Maps', 'all'); }
+  function all()      { $this->gridView('All Maps', 'all'); }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
    *    these virtual functions ensure that the correct data is passed
    *    to jqGrid.
    */
 
-  function jqGridDataTables(&$params, &$model) {
+  function gridDataTables(&$params, &$model) {
     return array
       ('link' => array('SiteArea' => array('fields' => array('SiteArea.id', 'SiteArea.name')),
 		       ),
        );
   }
 
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
     $links['Map'] = array('id');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
   }
 
 
@@ -52,7 +52,9 @@ class MapsController extends AppController {
       $this->Session->setFlash(__('Invalid Item.', true));
       $this->redirect(array('action'=>'index'));
     }
+    $this->sideMenuEnable('SITE', $this->op_area);
     $this->set('info', $this->mapInfo($id, $requested_width));
+    $this->set('title', "Site Map");
   }
 
 
@@ -84,10 +86,34 @@ class MapsController extends AppController {
 		  'units' => array());
 
     // Find all of the map/unit information from this SiteArea
-    $this->Map->recursive = 2;
-    $this->Map->SiteArea->unbindModel(array('hasOne' => array('Map')));
-    $map = $this->Map->read(null, $id);
-    //pr($map);
+    $map = $this->Map->find('first', array('contain' => false,
+					   'conditions' => array('id' => $id)));
+
+    $units = $this->Map->Unit->find
+      ('all',
+       array('link' =>
+	     array('Map' =>
+		   array('fields' => array()),
+
+		   'CurrentLease' =>
+		   array('fields' => array('id', 'paid_through_date',
+					   $this->Map->Unit->CurrentLease->
+					   delinquentField('CurrentLease')),
+			 'Customer'),
+
+		   'UnitSize' =>
+		   array('fields' => array('id', 'depth', 'width',
+					   'MapsUnit.pt_top',
+					   'MapsUnit.pt_left',
+					   'MapsUnit.transpose')),
+		   ),
+	     'fields' => array('id', 'name', 'status'),
+	     'conditions' => array('Map.id' => $id),
+	     ));
+
+/*     pr(compact('map', 'units')); */
+/*     $this->render('/empty'); */
+/*     return; */
 
     /*****
      * The preference would be to leave all things "screen" related
@@ -112,7 +138,7 @@ class MapsController extends AppController {
     $info['depth'] = $bottom * $screen_adjustment_factor;
 
     // Go through each unit in the map, calculating the map location
-    foreach ($map['Unit'] AS $unit) {
+    foreach ($units AS $unit) {
       $lft = $unit['MapsUnit']['pt_left'] + $boundary_adjustment;
       $top = $unit['MapsUnit']['pt_top']  + $boundary_adjustment;
 
@@ -131,10 +157,9 @@ class MapsController extends AppController {
       $width *= $screen_adjustment_factor;
       $depth *= $screen_adjustment_factor;
 
-      //$info['units'][$unit['id']] =
       $info['units'][] =
-	array( 'id'     => $unit['id'],
-	       'name'   => $unit['name'],
+	array( 'id'     => $unit['Unit']['id'],
+	       'name'   => $unit['Unit']['name'],
 	       'left'   => $lft,
 	       'right'  => $lft + $width,
 	       'top'    => $top,
@@ -142,30 +167,18 @@ class MapsController extends AppController {
 	       'width'  => $width,
 	       'depth'  => $depth,
 	       'n-s'    => $unit['MapsUnit']['transpose'] ? 0 : 1,
-	       'status' => $unit['status']
+	       'status' => (($unit['Unit']['status'] === 'OCCUPIED' &&
+			     !empty($unit[0]['delinquent']))
+			    ? 'LATE' : $unit['Unit']['status']),
+	       'data' => $unit,
 	       );
     }
 
-    //pr($info);
+/*     pr($info); */
+/*     $this->render('/empty'); exit(); */
     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(),
-	    );
-  }
 
   /**************************************************************************
    **************************************************************************
@@ -175,9 +188,12 @@ class MapsController extends AppController {
    */
 
   function legend($id = null, $requested_width = 400) {
-    $status = $this->unitStatusList();
-    $cols = 6;
-    $rows = (int)((count($status) + $cols - 1) / $cols);
+    $status = array_keys($this->Map->Unit->activeStatusEnums());
+    $occupied_key = array_search('OCCUPIED', $status);
+    array_splice($status, $occupied_key+1, 0, array('LATE'));
+
+    $rows = 2;
+    $cols = (int)((count($status) + $rows - 1) / $rows);
 
     $info = array('units' => array());
 
@@ -205,7 +221,7 @@ class MapsController extends AppController {
     $item_width *= $screen_adjustment_factor;
     $item_depth *= $screen_adjustment_factor;
 
-    foreach ($status AS $code => $color) {
+    foreach ($status AS $code) {
       $info['units'][] = array('name'   => $code,
 			       'status' => $code,
 			       'width'  => $item_width,
@@ -255,9 +271,9 @@ class MapsController extends AppController {
     $info['palate']['unit']['DIRTY']['bg']        = array('red' => 128, 'green' => 192, 'blue' => 192);
     $info['palate']['unit']['VACANT']['bg']       = array('red' =>   0, 'green' => 255, 'blue' => 128);
     $info['palate']['unit']['OCCUPIED']['bg']     = array('red' =>   0, 'green' => 128, 'blue' => 255);
-    $info['palate']['unit']['LATE']['bg']         = array('red' => 255, 'green' =>  64, 'blue' =>  64);
-    $info['palate']['unit']['LOCKED']['bg']       = array('red' => 255, 'green' => 128, 'blue' => 128);
-    $info['palate']['unit']['LIENED']['bg']       = array('red' => 255, 'green' => 192, 'blue' => 192);
+    $info['palate']['unit']['LATE']['bg']         = array('red' => 255, 'green' => 192, 'blue' => 192);
+    $info['palate']['unit']['LOCKED']['bg']       = array('red' => 255, 'green' =>  64, 'blue' =>  64);
+    $info['palate']['unit']['LIENED']['bg']       = array('red' => 255, 'green' =>   0, 'blue' => 128);
 
     // Determine text color to go with each background
     foreach ($info['palate']['unit'] AS &$code) {

site/controllers/monetary_sources_controller.php

@@ -1,77 +0,0 @@
-<?php
-
-class MonetarySourcesController extends AppController {
-
-  var $sidemenu_links = array();
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
-   */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
-  }
-
-  
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * action: index / all
-   *  - Generate a listing of MonetarySources
-   */
-
-  function index()    { $this->all(); }
-  function all()      { $this->jqGridView('All MonetarySources', 'all'); }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
-   *    these virtual functions ensure that the correct data is passed
-   *    to jqGrid.
-   */
-
-  function jqGridDataTables(&$params, &$model) {
-    return array
-      ('link' => array('MonetaryType' => array('fields' => array('MonetaryType.id', 'MonetaryType.name')),
-		       ),
-       );
-  }
-
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['MonetarySource'] = array('id');
-    return parent::jqGridRecordLinks($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 MonetarySource and related fields
-    $monetary_source = $this->MonetarySource->find
-      ('first', array
-       ('contain' => array
-	('MonetaryType',
-	 ),
-	));
-
-    // Prepare to render.
-    $title = "Monetary Source #{$monetary_source['MonetarySource']['id']}";
-    $this->set(compact('monetary_source', 'title'));
-  }
-}

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/statement_entries_controller.php

@@ -0,0 +1,409 @@
+<?php
+
+class StatementEntriesController extends AppController {
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: index / current / past / all
+   *  - Creates a list of statement entries
+   */
+
+  function index()   { $this->gridView('All Statement Entries'); }
+  function unpaid()  { $this->gridView('Unpaid Charges', 'unreconciled'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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'),
+			),
+		  ),
+
+	    'Account' => 
+	    array('fields' => array('id', 'name', 'type'),
+		  ),
+	    );
+
+    if (!empty($params['post']['custom']['statement_entry_id'])) {
+      $link['ChargeEntry']        = array();
+      // This query actually represents a union...
+      // Unpaid Charge/Surplus:  ChargeID -  NULL;   DisbursementID -  NULL
+      // Paid Charge/Refund:     ChargeID -  NULL;   DisbursementID - !NULL
+      // Disbursement/Reversal:  ChargeID - !NULL;   DisbursementID -  NULL
+      // <EMPTY SET>:            ChargeID - !NULL;   DisbursementID - !NULL
+      //
+      // The query is really slow unless we add the `id` condition to the join.
+      // A cleaner query would be nice, but we must work within the Cake framework.
+      $link['DisbursementEntry']  = array('conditions' =>
+					  '`DisbursementEntry`.`id` = '
+					  . $params['post']['custom']['statement_entry_id']);
+    }
+
+    return array('link' => $link);
+  }
+
+  function gridDataTables(&$params, &$model) {
+    $tables = $this->gridDataCountTables($params, $model);
+
+    if (in_array('applied', $params['post']['fields'])) {
+      $tables['link'] +=
+	array('ChargeEntry'       => array(),
+	      'DisbursementEntry' => array());
+    }
+
+    return $tables;
+  }
+
+  function gridDataFields(&$params, &$model) {
+    $fields = parent::gridDataFields($params, $model);
+
+    if (in_array('applied', $params['post']['fields'])) {
+      $fields[] = ("IF(StatementEntry.type = 'CHARGE'," .
+		   "   SUM(COALESCE(DisbursementEntry.amount,0))," .
+		   "   SUM(COALESCE(ChargeEntry.amount,0)))" .
+		   " AS 'applied'");
+    }
+    if (in_array('unapplied', $params['post']['fields'])) {
+      $fields[] = ("StatementEntry.amount - (" .
+		   "IF(StatementEntry.type = 'CHARGE'," .
+		   "   SUM(COALESCE(DisbursementEntry.amount,0))," .
+		   "   SUM(COALESCE(ChargeEntry.amount,0)))" .
+		   ") AS 'unapplied'");
+    }
+
+    $fields = array_merge($fields,
+			  $this->StatementEntry->chargeDisbursementFields());
+
+    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('StatementEntry.account_id' => $account_id);
+
+    if (isset($customer_id))
+      $conditions[] = array('StatementEntry.customer_id' => $customer_id);
+
+    if (isset($statement_entry_id))
+      $conditions[] = array('OR' =>
+			    array(array('ChargeEntry.id' => $statement_entry_id),
+				  array('DisbursementEntry.id' => $statement_entry_id)));
+
+    return $conditions;
+  }
+
+  function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
+    $links['StatementEntry'] = array('id');
+    $links['Transaction']    = array('id');
+    // REVISIT <AP>: 20090827
+    //  Need to take 'level' into account
+    if ($this->Permission->allow('controller.accounts'))
+      $links['Account']        = array('name');
+    $links['Customer']       = array('name');
+    $links['Lease']          = array('number');
+    $links['Unit']           = array('name');
+    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?)
+    if ($index != 'Transaction.stamp' &&
+	$index != 'StatementEntry.effective_date') {
+      $order[] = 'Transaction.stamp ' . $direction;
+      $order[] = 'StatementEntry.effective_date ' . $direction;
+    }
+    $order[] = 'StatementEntry.id ' . $direction;
+
+    return $order;
+  }
+
+  function gridDataCountExecute(&$params, &$model, $query) {
+    if ($params['action'] === 'unreconciled') {
+      // REVISIT <AP> 20100413:
+      //   This is a lame solution, as it runs the same queries twice
+      //   (and causes code duplication).  However, I'm not in the mood
+      //   to flush out an actual "count" solution at the moment, and I
+      //   also don't want to cache the results in $params (although
+      //   that is probably the most sensible solution).  So, I'll just
+      //   calculate the reconciled set both times and live with the
+      //   performance and maintenance penalty
+      $lquery = array('conditions' => $query['conditions']);
+      $set = $this->StatementEntry->reconciledSet('CHARGE', $lquery, true);
+      return count($set['entries']);
+    }
+
+    return parent::gridDataCountExecute($params, $model, $query);
+  }
+
+  function gridDataRecordsExecute(&$params, &$model, $query) {
+
+    if ($params['action'] === 'unreconciled') {
+      $lquery = array('conditions' => $query['conditions']);
+      $set = $this->StatementEntry->reconciledSet('CHARGE', $lquery, true);
+
+      $entries = array();
+      foreach ($set['entries'] AS $entry)
+    	$entries[] = $entry['StatementEntry']['id'];
+
+      $query['conditions'] = array('StatementEntry.id' => $entries);
+      $params['userdata']['balance'] = $set['summary']['balance'];
+    }
+
+    if ($params['action'] === 'collected') {
+      $tquery = array_diff_key($query, array('fields'=>1,'group'=>1,'limit'=>1,'order'=>1));
+      $tquery['fields'] = array("SUM(COALESCE(StatementEntry.amount,0)) AS 'total'");
+      $total = $model->find('first', $tquery);
+      $params['userdata']['total']   = $total[0]['total'];
+    }
+
+    return parent::gridDataRecordsExecute($params, $model, $query);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: reverse the ledger entry
+   */
+
+  function reverse($id = null) {
+    if ($this->data) {
+      //pr($this->data); die();
+
+      $this->StatementEntry->reverse
+	($this->data['StatementEntry']['id'],
+	 $this->data['Transaction']['stamp'],
+	 $this->data['Transaction']['comment']);
+
+      $this->redirect(array('action'=>'view',
+			    $this->data['StatementEntry']['id']));
+      $this->INTERNAL_ERROR('SHOULD HAVE REDIRECTED');
+    }
+
+    $this->StatementEntry->id = $id;
+    $entry = $this->StatementEntry->find
+      ('first', array
+       ('contain' => array('Customer', 'Transaction', 'Account'),
+	));
+
+    if (empty($entry)) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('controller' => 'customers',
+			    'action'=>'index'));
+    }
+
+    if (!$this->StatementEntry->reversable($id)) {
+      $this->Session->setFlash(__('Item not reversable.', true));
+      $this->redirect(array('action'=>'view', $id));
+    }
+
+    // Prepare to render.
+    $title = ("Charge #{$entry['StatementEntry']['id']}" .
+	      " : {$entry['StatementEntry']['amount']}" .
+	      " : Reverse");
+    $this->set(compact('entry', 'title'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: waive the ledger entry
+   */
+
+  function waive($id) {
+    $this->StatementEntry->waive($id);
+    $this->redirect(array('action'=>'view', $id));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: incexpbymonth
+   *  - Displays income and/or expenses by month
+   */
+
+  function incexpbymonth($accts, $security_deposits, $months) {
+    $datefrom = 'DATE(NOW() - INTERVAL '.($months-1).' MONTH - INTERVAL DAY(NOW())-1 DAY)';
+    $dateto   = 'NOW()';
+    /* $datefrom = '"2009-01-01"'; */
+    /* $dateto   = '"2012-12-31"'; */
+
+    $result = $this->StatementEntry->find
+      ('all',
+       array('link' => array('Account' => array('fields' => 'name')),
+	     'fields' => array_merge(array('MONTHNAME(effective_date) AS month',
+					   'YEAR(effective_date) AS year'),
+				     $this->StatementEntry->chargeDisbursementFields(true)),
+	     'conditions' => array('Account.type' => $accts,
+				   "effective_date >= $datefrom",
+				   "effective_date <= $dateto",
+				   ),
+	     'group' => array('YEAR(effective_date)', 'MONTH(effective_date)', 'Account.id'),
+	     'order' => array('YEAR(effective_date) DESC', 'MONTH(effective_date) DESC', 'Account.type',
+			      'IF(Account.id = '.$this->StatementEntry->Account->rentAccountID().', "---", Account.name)'),
+	     ));
+
+    if ($security_deposits) {
+      $sdresult = $this->StatementEntry->Transaction->LedgerEntry->find
+	('all',
+	 array('link' => array('Transaction' => array('StatementEntry' => array('fields' => 'effective_date'),
+						      'fields' => array()),
+			       'Account' => array('fields' => 'name')),
+	       'fields' => array_merge(array('MONTHNAME(effective_date) AS month',
+					     'YEAR(effective_date) AS year'),
+				       $this->StatementEntry->Transaction->LedgerEntry->debitCreditFields(true)),
+	       'conditions' => array('LedgerEntry.account_id' => $this->StatementEntry->Account->securityDepositAccountID(),
+				     "effective_date >= $datefrom",
+				     "effective_date <= $dateto",
+				     'StatementEntry.id = (SELECT MIN(id) FROM statement_entries WHERE transaction_id = `Transaction`.id)'
+				     ),
+	       'group' => array('YEAR(effective_date)', 'MONTH(effective_date)', 'Account.id'),
+	       'order' => array('YEAR(effective_date) DESC', 'MONTH(effective_date) DESC', 'Account.type', 'Account.name'),
+	       ));
+    } else {
+      $sdresult = array();
+    }
+
+    $overview = array('months' => array(), 'amount' => 0);
+    foreach (array_merge($result, $sdresult) AS $row) {
+      $mname = $row[0]['month'] .', '. $row[0]['year'];
+      if (empty($overview['months'][$mname]))
+	$overview['months'][$mname] = array('name' => $mname,
+					   'subs' => array(),
+					   'amount' => 0);
+      $month = &$overview['months'][$mname];
+      $month['subs'][] = array('name' => $row['Account']['name'],
+			       'amount' => $row[0]['balance']);
+
+      $month['amount'] += $row[0]['balance'];
+      $overview['amount'] += $row[0]['balance'];
+    }
+
+    // Enable the Reports menu section
+    $this->sideMenuAreaActivate('REPORT');
+
+    // Prepare to render.
+    $this->set('months', $months);
+    $this->set(compact('overview'));
+    $this->render('chargesbymonth');
+  }
+
+  function incomebymonth($months = 12, $invoice = false) {
+    $this->set('title', 'Monthly Gross Income');
+    $this->set('reptype', 'Gross Income');
+    $this->incexpbymonth(array('INCOME'), $invoice, $months);
+  }
+
+  function expensebymonth($months = 12) {
+    $this->set('title', 'Gross Monthly Expenses');
+    $this->set('reptype', 'Gross Expenses');
+    $this->incexpbymonth(array('EXPENSE'), false, $months);
+  }
+
+  function netbymonth($months = 12) {
+    $this->set('title', 'Net Monthly Income');
+    $this->set('reptype', 'Net Income');
+    $this->incexpbymonth(array('INCOME', 'EXPENSE'), true, $months);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: view
+   *  - Displays information about a specific entry
+   */
+
+  function view($id = null) {
+    $entry = $this->StatementEntry->find
+      ('first',
+       array('contain' => array
+	     ('Transaction' => array('fields' => array('id', 'type', 'stamp')),
+	      'Account' => array('id', 'name', 'type', 'level'),
+	      'Customer' => array('fields' => array('id', 'name')),
+	      'Lease' => array('fields' => array('id', 'number')),
+	      ),
+
+	     'conditions' => array(array('StatementEntry.id' => $id),
+				   ),
+	     ));
+
+    if (empty($entry)) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('controller' => 'accounts', 'action'=>'index'));
+    }
+
+    $entry['Account']['link'] =
+      $entry['Account']['level'] >=
+      $this->Permission->level('controller.accounts');
+
+    $stats = $this->StatementEntry->stats($id);
+
+    if (in_array(strtoupper($entry['StatementEntry']['type']), $this->StatementEntry->debitTypes()))
+      $stats = $stats['Charge'];
+    else
+      $stats = $stats['Disbursement'];
+
+
+    if (strtoupper($entry['StatementEntry']['type']) === 'CHARGE') {
+
+      // Set up dynamic menu items
+      if ($this->StatementEntry->reversable($id))
+	$this->addSideMenuLink('Reverse',
+			       array('action' => 'reverse', $id), null,
+			       'ACTION');
+
+      if ($stats['balance'] > 0)
+	$this->addSideMenuLink('Waive Balance',
+			       array('action' => 'waive', $id), null,
+			       'ACTION');
+    }
+
+    // Prepare to render.
+    $title = "Statement Entry #{$entry['StatementEntry']['id']}";
+    $this->set(compact('entry', 'title', 'stats'));
+  }
+
+}

site/controllers/tenders_controller.php

@@ -0,0 +1,240 @@
+<?php
+
+class TendersController extends AppController {
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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 ($this->data) {
+      $result = $this->Tender->nsf
+	($this->data['Tender']['id'],
+	 $this->data['Transaction']['stamp'],
+	 $this->data['Transaction']['comment']);
+      $this->redirect(array('controller' => 'tenders',
+			    'action' => 'view',
+			    $this->data['Tender']['id']));
+    }
+
+    if (!$id) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    $this->Tender->id = $id;
+    $tender = $this->Tender->find
+      ('first', array
+       ('contain' => array('Customer', 'LedgerEntry' => array('Transaction')),
+	));
+
+    // Prepare to render.
+    $title = "Tender #{$tender['Tender']['id']} : {$tender['Tender']['name']} : NSF";
+    $this->set(compact('tender', 'title'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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
+    $this->Tender->id = $id;
+    $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.
+	// (or if we're in development mode)
+	&& (!empty($tender['TenderType']['data1_name']) || !empty($this->params['dev']))
+	) {
+      $this->addSideMenuLink('NSF',
+			     array('action' => 'nsf', $id), null,
+			     'ACTION');
+    }
+
+    // Watch out for the special "Closing" entries, which have
+    // tender_type_id set to NULL.  Otherwise, allow editing.
+    if (!empty($tender['TenderType']['id']))
+      $this->addSideMenuLink('Edit',
+			     array('action' => 'edit', $id), null,			     
+			     'ACTION');
+
+    // Prepare to render.
+    $title = "Tender #{$tender['Tender']['id']} : {$tender['Tender']['name']}";
+    $this->set(compact('tender', 'title'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: edit
+   *  - Edit tender information
+   */
+
+  function edit($id = null) {
+    if (isset($this->data)) {
+      // Check to see if the operation was cancelled.
+      if (isset($this->params['form']['cancel'])) {
+	if (empty($this->data['Tender']['id']))
+	  $this->redirect(array('action'=>'index'));
+
+	$this->redirect(array('action'=>'view', $this->data['Tender']['id']));
+      }
+
+      // Make sure we have tender data
+      if (empty($this->data['Tender']) || empty($this->data['Tender']['id']))
+	$this->redirect(array('action'=>'index'));
+
+      // Figure out which tender type was chosen
+      // REVISIT <AP>: 20090810; Not ready to change tender type
+      // $tender_type_id = $this->data['Tender']['tender_type_id'];
+      $tender_type_id = $this->Tender->field('tender_type_id');
+      if (empty($tender_type_id))
+	$this->redirect(array('action'=>'view', $this->data['Tender']['id']));
+
+      // Get data fields from the selected tender type
+      $this->data['Tender'] += $this->data['type'][$tender_type_id];
+      unset($this->data['type']);
+
+      // Save the tender and all associated data
+      $this->Tender->create();
+      $this->Tender->id = $this->data['Tender']['id'];
+      if (!$this->Tender->save($this->data, false)) {
+	$this->Session->setFlash("TENDER SAVE FAILED", true);
+	pr("TENDER SAVE FAILED");
+      }
+
+      $this->redirect(array('action'=>'view', $this->Tender->id));
+    }
+
+    if ($id) {
+      $this->data = $this->Tender->findById($id);
+    } else {
+      $this->redirect(array('action'=>'index'));
+    }
+
+    $tender_types = $this->Tender->TenderType->find
+      ('list', array('order' => array('name')));
+    $this->set(compact('tender_types'));
+
+    $types = $this->Tender->TenderType->find('all', array('contain' => false));
+    $this->set(compact('types'));
+
+    // Prepare to render.
+    $title = ('Tender #' . $this->data['Tender']['id'] .
+	      ' : ' . $this->data['Tender']['name'] .
+	      " : Edit");
+    $this->set(compact('title'));
+  }
+}

site/controllers/transactions_controller.php

@@ -4,20 +4,35 @@ class TransactionsController extends AppController {
 
   var $components = array('RequestHandler');
 
-  var $sidemenu_links =
-    array(array('name' => 'Transactions', 'header' => true),
-	  array('name' => 'All',          'url' => array('controller' => 'transactions', 'action' => 'all')),
-	  );
-
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Invoices',
+			   array('controller' => 'transactions', 'action' => 'invoice'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Receipts',
+			   array('controller' => 'transactions', 'action' => 'receipt'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Deposits',
+			   array('controller' => 'transactions', 'action' => 'deposit'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('All',
+			   array('controller' => 'transactions', 'action' => 'all'), null,
+			   'CONTROLLER');
+
+    // REVISIT <AP>: 20090824
+    //  Right now, we wish to keep things simple.  Don't make these
+    //  links available to non-admin users.
+    if (empty($this->params['admin']))
+      $this->sideMenuEnable('CONTROLLER', $this->std_area, false);
   }
 
 
@@ -29,21 +44,369 @@ class TransactionsController extends AppController {
    */
 
   function index()    { $this->all(); }
-  function all()      { $this->jqGridView('All Transactions', 'all'); }
+  function all()      { $this->gridView('All Transactions', 'all'); }
+  function invoice()  { $this->gridView('Invoices'); }
+  function receipt()  { $this->gridView('Receipts'); }
+  function deposit()  {
+/*     $this->addSideMenuLink('New Deposit', */
+/* 			   array('controller' => 'tenders', 'action' => 'deposit'), null, */
+/* 			   'CONTROLLER', $this->new_area); */
+    $this->gridView('Deposits');
+  }
+
+  function gridView($title, $action = null, $element = null) {
+    if ($title != 'Deposits')
+      $this->set('include', array('Customer'));
+    parent::gridView($title, $action, $element);
+  }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
    *    these virtual functions ensure that the correct data is passed
    *    to jqGrid.
    */
 
-  function jqGridRecordLinks(&$params, &$model, &$records, $links) {
-    $links['Transaction'] = array('id');
-    return parent::jqGridRecordLinks($params, $model, $records, $links);
+  function gridDataCountTables(&$params, &$model) {
+    return array
+      ('link' =>
+       array(// Models
+	     'Account' => array('fields' => array()),
+	     ),
+       );
+  }
+
+  function gridDataTables(&$params, &$model) {
+    $link = $this->gridDataCountTables($params, $model);
+    $link['link']['StatementEntry'] = array('fields' => array());
+    $link['link']['DepositTender'] = array('fields' => array());
+    $link['link']['Customer'] = array('fields' => array('id', 'name'));
+    return $link;
+  }
+
+  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 array_merge($fields,
+		       $this->Transaction->LedgerEntry->debitCreditFields(false, true, 'Transaction'));
+  }
+
+  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', 'action' => ($params['action'] == 'deposit'
+						     ? 'deposit_slip' : 'view'));
+    $links['Customer'] = array('name');
+    return parent::gridDataPostProcessLinks($params, $model, $records, $links);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: postInvoice
+   *  - handles the creation of a charge invoice
+   */
+
+  function postInvoice($redirect = true) {
+    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>");
+    }
+
+    if ($redirect) {
+      if (!empty($this->data['Customer']['id']))
+	$this->redirect(array('controller' => 'customers',
+			      'action'     => 'receipt',
+			      $this->data['Customer']['id']));
+      else
+	$this->redirect(array('controller' => 'leases',
+			      'action'     => 'view',
+			      $this->data['Lease']['id']));
+    }
+
+    $this->layout = null;
+    $this->autoLayout = false;
+    $this->autoRender = false; 
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: postReceipt
+   *  - handles the creation of a receipt
+   */
+
+  function postReceipt($redirect = true) {
+    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>");
+    }
+
+    if ($redirect)
+      $this->redirect(array('controller' => 'customers',
+			    'action'     => 'view',
+			    $this->data['Customer']['id']));
+
+    $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: postWriteOff
+   *  - handles the write off of bad debt
+   */
+
+  function postWriteOff() {
+    if (!$this->RequestHandler->isPost()) {
+      echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
+      return;
+    }
+
+    $data = $this->data;
+    if (empty($data['Customer']['id']))
+      $data['Customer']['id'] = null;
+    if (empty($data['Lease']['id']))
+      $data['Lease']['id'] = null;
+
+    pr(compact('data'));
+
+    if (!$this->Transaction->addWriteOff($data,
+					 $data['Customer']['id'],
+					 $data['Lease']['id'])) {
+      $this->Session->setFlash("WRITE OFF FAILED", true);
+      // REVISIT <AP> 20090706:
+      // Until we can work out the session problems,
+      // just die.
+      die("<H1>WRITE-OFF FAILED</H1>");
+    }
+
+    // Return to viewing the lease/customer
+    if (empty($data['Lease']['id']))
+      $this->redirect(array('controller' => 'customers',
+			    'action' => 'view',
+			    $data['Customer']['id']));
+    else
+      $this->redirect(array('controller' => 'leases',
+			    'action' => 'view',
+			    $data['Lease']['id']));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: postRefund
+   *  - handles issuing a customer refund
+   */
+
+  function postRefund() {
+    if (!$this->RequestHandler->isPost()) {
+      echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
+      return;
+    }
+
+    $data = $this->data;
+    if (empty($data['Customer']['id']))
+      $data['Customer']['id'] = null;
+    if (empty($data['Lease']['id']))
+      $data['Lease']['id'] = null;
+
+    if (!$this->Transaction->addRefund($data,
+				       $data['Customer']['id'],
+				       $data['Lease']['id'])) {
+      $this->Session->setFlash("REFUND FAILED", true);
+      // REVISIT <AP> 20090706:
+      // Until we can work out the session problems,
+      // just die.
+      die("<H1>REFUND FAILED</H1>");
+    }
+
+    // Return to viewing the lease/customer
+    if (empty($data['Lease']['id']))
+      $this->redirect(array('controller' => 'customers',
+			    'action' => 'view',
+			    $data['Customer']['id']));
+    else
+      $this->redirect(array('controller' => 'leases',
+			    'action' => 'view',
+			    $data['Lease']['id']));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: destroy
+   *  - Deletes a transaction and associated entries
+   *  - !!WARNING!!  This should be used with EXTREME caution, as it
+   *    irreversibly destroys the data.  It is not for normal use.
+   */
+
+  function destroy($id) {
+    $this->Transaction->id = $id;
+    $customer_id = $this->Transaction->field('customer_id');
+    $this->Transaction->destroy($id);
+    $this->redirect(array('controller' => 'customers', 'action' => 'view', $customer_id));
   }
 
 
@@ -55,234 +418,103 @@ class TransactionsController extends AppController {
    */
 
   function view($id = null) {
-    if (!$id) {
-      $this->Session->setFlash(__('Invalid Item.', true));
-      $this->redirect(array('action'=>'index'));
-    }
-
     $transaction = $this->Transaction->find
       ('first',
        array('contain' =>
 	     array(// Models
-		   'LedgerEntry' => array('fields' => array('LedgerEntry.id',
-							    'LedgerEntry.amount',
-							    'LedgerEntry.comment'),
-					  //Models
-
-					  'DebitLedger'  => array
-					  ('fields' => array('DebitLedger.id', 'DebitLedger.sequence'),
-					   'Account' => array
-					   ('fields' => array('Account.id', 'Account.name')),
-					   ),
-
-					  'CreditLedger' => array
-					  ('fields' => array('CreditLedger.id', 'CreditLedger.sequence'),
-					   'Account' => array
-					   ('fields' => array('Account.id', 'Account.name')),
-					   ),
-					  ),
+		   'Account(id,name,level)',
+		   'Ledger(id,sequence)',
+		   'NsfTender(id,name)',
 		   ),
-	     'conditions' => array('Transaction.id' => $id),
+	     'conditions' => array(array('Transaction.id' => $id),
+				   ),
 	     ));
 
-    // Figure out the transaction total
-    $total = 0;
-    foreach($transaction['LedgerEntry'] AS $entry)
-      $total += $entry['amount'];
+    if (empty($transaction)) {
+      $this->Session->setFlash(__('Invalid Item.', true));
+      $this->redirect(array('action'=>'index'));
+    }
+
+    $transaction['Account']['link'] =
+      $transaction['Account']['level'] >=
+      $this->Permission->level('controller.accounts');
+
+    if ($transaction['Transaction']['type'] === 'DEPOSIT')
+      $this->addSideMenuLink('View Slip',
+			     array('action' => 'deposit_slip', $id), null,
+			     'ACTION');
+
+    $this->addSideMenuLink('Destroy',
+			   array('action' => 'destroy', $id),
+			   array('confirmMessage' =>
+				 "This may leave the database in an unstable state." .
+				 " Do NOT do this unless you know what you're doing." .
+				 " Proceed anyway?"),
+			   'ACTION', $this->admin_area);
 
     // OK, prepare to render.
     $title = 'Transaction #' . $transaction['Transaction']['id'];
-    $this->set(compact('transaction', 'title', 'total'));
+    $this->set(compact('transaction', 'title'));
   }
 
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * action: postReceipt
-   *  - handles the creation of a payment receipt
+   * action: deposit_slip
+   *  - Special presentation 
+   *    Processes the user input and updates the database
    */
 
-  function postReceipt() {
-    $this->autoRender = false;
+  function deposit_slip($id) {
+    // Find the deposit transaction
+    $this->Transaction->id = $id;
+    $deposit = $this->Transaction->find('first', array('contain' => array('Account')));
 
-    if (!$this->RequestHandler->isPost()) {
-      echo('<H2>THIS IS NOT A POST FOR SOME REASON</H2>');
-      return;
-    }
-    //pr(array('thisdata' => $this->data));
+    // Get a summary of all forms of tender in the deposit
+    $tenders = $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 (isset($this->data['customer_id'])) {
-      $C = new Customer();
-      $C->recursive = -1;
-      $customer = $C->find
-	('first',
-	 array('contain' => array('Account.CurrentLedger.id'),
-	       'fields' => false,
-	       'conditions' => array('Customer.id', $this->data['customer_id']),
-	       ));
-      $ledger_id = $customer['Account']['CurrentLedger']['id'];
-    }
-    else {
-      // Payment by Unit, Lease, etc
-      $ledger_id = 0;
+    // Verify the deposit exists, and that something was actually deposited
+    if (empty($deposit) || empty($tenders)) {
+      $this->Session->setFlash(__('Invalid Deposit.', true));
+      $this->redirect(array('action'=>'deposit'));
     }
 
-    $amount = 0;
-    foreach ($this->data['LedgerEntry'] AS &$entry) {
-      $reconciled = $C->reconcileNewLedgerEntry($this->data['customer_id'],
-						'credit',
-						$entry['amount']);
-      pr(compact('entry', 'reconciled'));
-
-      foreach ($reconciled['debit']['entry'] AS $rec) {
-	$entry['DebitReconciliationLedgerEntry'] =
-	  array('amount' => $rec['applied'],
-		//'debit_ledger_entry_id'
-		'credit_ledger_entry_id' => $rec['id']
-		);
-      }
-
-      $amount += isset($entry['amount']) ? $entry['amount'] : 0;
-      $entry['debit_ledger_id'] = 6; // Cash/Payments
-      $entry['credit_ledger_id'] = $ledger_id;
+    // Add the summary to our deposit slip data container
+    $deposit['types'] = array();
+    foreach ($tenders AS $tender) {
+      $deposit['types'][$tender['TenderType']['id']] =
+	$tender['TenderType'] + $tender[0];
     }
 
+    $deposit_total = 0;
+    foreach ($deposit['types'] AS $type)
+      $deposit_total += $type['total'];
 
-    pr($this->data);
-    $T = new Transaction();
-    $T->create();
-    if ($T->saveAll($this->data,
-		    array(
-			  'validate' => false,
-			  //'fieldList' => array(),
-			  //'callbacks' => true,
-			  ))) {
-      $tid = $T->id;
-      $this->Session->setFlash(__("New Transaction Created ($tid)!", true));
-      //$this->redirect(array('action'=>'view', $mid));
-    }
-    else {
-      $this->autoRender = false;
-      pr(array('checkpoint' => "saveAll failed"));
-    }
-    pr($T->data);
+    if (abs($deposit['Transaction']['amount'] - $deposit_total) >= .001)
+      $this->INTERNAL_ERROR("Deposit items ($deposit_total) do not add up to deposit slip total (".$deposit['Transaction']['amount'].")");
 
-    $C = new Customer();
-    $LE = new LedgerEntry();
-/*     $reconciled = $C->reconcileNewLedgerEntry($this->data['customer_id'], */
-/* 					      'credit', */
-/* 					      $amount); */
-/*     pr(compact('amount', 'unreconciled', 'reconciled')); */
-/*     return; */
-
-    foreach ($this->data['LedgerEntry'] AS &$entry) {
-      $reconciled = $C->reconcileNewLedgerEntry($this->data['customer_id'],
-						'credit',
-						$entry['amount']);
-      pr(compact('entry', 'reconciled'));
-      continue;
-
-      foreach ($reconciled['debit']['entry'] AS $rec) {
-	$data = array('LedgerEntry' =>
-		      array('DebitReconciliationLedgerEntry' =>
-			    array('amount' => $rec['applied'],
-				  //'debit_ledger_entry_id'
-				  'credit_ledger_entry_id' => $rec['id']
-				  ),
-			    ),
-		      );
-	//'DebitReconciliationLedgerEntry' => array(
-	//pr(compact('amount', 'unreconciled', 'reconciled'));
-      }
-    }
-
-  }
-
-  function saveTest() {
-    $data =
-      array(
-/* 	    'Customer' => array */
-/* 	    ('id' => 7, */
-/* 	     ), */
-
-            'LedgerEntry' => array
-	    (
-	     '0' => array(
-			  'amount' => 100,
-			  'debit_ledger_id' => 1,
-			  'credit_ledger_id' => 2,
-			  'MonetarySource' => array('name' => 'testmoney', 'monetary_type_id' => 2),
-			  ),
-	     '1' => array(
-			  'amount' => 101,
-			  'debit_ledger_id' => 1,
-			  'credit_ledger_id' => 2,
-			  'MonetarySource' => array('name' => 'testmoney2', 'monetary_type_id' => 2),
-			  ),
-	     ),
-
-            'Transaction' => array
-	    (
-	     'stamp' => '06/18/2009',
-	     'comment' => 'no comment',
-	     ),
-	    );
-
-    $data =
-/*       array( */
-/*             'LedgerEntry' => array */
-/* 	    ( */
-/* 	     '0' => */
-	     array(
-		   'amount' => 100,
-		   'debit_ledger_id' => 1,
-		   'credit_ledger_id' => 2,
-		   'transaction_id' => 66,
-		   'DebitReconciliationLedgerEntry' =>
-		   array('amount' => 44,
-			 //'debit_ledger_entry_id'
-			 'credit_ledger_entry_id' => 17,
-			 ),
-/* 		   ), */
-/* 	     ), */
-
-	    );
-
-    //$M = new Transaction();
-    $M = new LedgerEntry();
-    $M->create();
-    $retval = $M->saveAll($data,
-		       array(
-			     'validate' => false,
-			     'fieldList' => array(),
-			     'callbacks' => true,
-			     ));
-
-    $mid = $M->id;
-    pr(compact('retval', 'mid'));
-    if ($mid) {
-      $this->Session->setFlash(__("New Transaction Created ($mid)!", true));
-      //$this->redirect(array('action'=>'view', $mid));
-    }
-    else {
-      $this->autoRender = false;
-      pr(array('checkpoint' => "saveAll failed"));
-    }
-
-
-/*     $LE = new LedgerEntry(); */
-/*     $LE->create(); */
-/*     $ret = $LE->save($data, */
-/* 		     array( */
-/* 			   'validate' => false, */
-/* 			   'fieldList' => array(), */
-/* 			   'callbacks' => true, */
-/* 			   )); */
-/*     $leid = $LE->id; */
-/*     pr(array('checkpoint' => "New Ledger Entry", */
-/* 	     compact('leid', 'ret'))); */
-    //pr($LE);
+    $this->addSideMenuLink('View',
+			   array('action' => 'view', $id), null,
+			   'ACTION');
 
+    $title = 'Deposit Slip';
+    $this->set(compact('title', 'deposit'));
+    $this->render('deposit_slip');
+    return;
   }
 
 }

site/controllers/unit_sizes_controller.php

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

site/controllers/units_controller.php

@@ -2,23 +2,35 @@
 
 class UnitsController extends AppController {
 
-  var $sidemenu_links =
-    array(array('name' => 'Units',        'header' => true),
-	  array('name' => 'Occupied',     'url' => array('controller' => 'units', 'action' => 'occupied')),
-	  array('name' => 'Vacant',       'url' => array('controller' => 'units', 'action' => 'vacant')),
-	  array('name' => 'Unavailable',  'url' => array('controller' => 'units', 'action' => 'unavailable')),
-	  array('name' => 'All',          'url' => array('controller' => 'units', 'action' => 'all')),
-	  );
-
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * override: sideMenuLinks
-   *  - Generates controller specific links for the side menu
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
    */
-  function sideMenuLinks() {
-    return array_merge(parent::sideMenuLinks(), $this->sidemenu_links);
+
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Unavailable',
+			   array('controller' => 'units', 'action' => 'unavailable'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Vacant',
+			   array('controller' => 'units', 'action' => 'vacant'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Occupied',
+			   array('controller' => 'units', 'action' => 'occupied'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Overlocked',
+			   array('controller' => 'units', 'action' => 'locked'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Liened',
+			   array('controller' => 'units', 'action' => 'liened'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('All',
+			   array('controller' => 'units', 'action' => 'all'), null,
+			   'CONTROLLER');
   }
 
 
@@ -30,48 +42,67 @@ class UnitsController extends AppController {
    */
 
   function index()       { $this->all(); }
-  function unavailable() { $this->jqGridView('Unavailable Units'); }
-  function vacant()      { $this->jqGridView('Vacant Units'); }
-  function occupied()    { $this->jqGridView('Occupied Units'); }
-  function all()         { $this->jqGridView('All Units', 'all'); }
+  function unavailable() { $this->gridView('Unavailable Units'); }
+  function vacant()      { $this->gridView('Vacant Units'); }
+  function occupied()    { $this->gridView('Occupied Units'); }
+  function locked()      { $this->gridView('Overlocked Units'); }
+  function liened()      { $this->gridView('Liened Units'); }
+  function all()         { $this->gridView('All Units', 'all'); }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * virtuals: jqGridData
-   *  - With the application controller handling the jqGridData action,
+   * virtuals: gridData
+   *  - With the application controller handling the gridData action,
    *    these virtual functions ensure that the correct data is passed
    *    to jqGrid.
    */
 
-  function jqGridDataSetup(&$params) {
-    parent::jqGridDataSetup($params);
+  function gridDataSetup(&$params) {
+    parent::gridDataSetup($params);
     if (!isset($params['action']))
       $params['action'] = 'all';
   }
 
-  function jqGridDataTables(&$params, &$model) {
-    $link = array
-      ('link' =>
-       array(// Models
-	     'UnitSize' => array('fields' => array('name')),
-	     ),
-       );
+  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',
-						),
-			     );
+/*     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());
+    $link['link']['Lock'];
     return $link;
   }
 
-  function jqGridDataConditions(&$params, &$model) {
-    $conditions = parent::jqGridDataConditions($params, $model);
+/*   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);
+
+    $fields[] = 'ROUND(UnitSize.width/12 * UnitSize.depth/12, 0) AS sqft';
+    return array_merge($fields,
+		       $this->Unit->Lease->StatementEntry->chargeDisbursementFields(true));
+  }
+
+  function gridDataConditions(&$params, &$model) {
+    $conditions = parent::gridDataConditions($params, $model);
 
     if ($params['action'] === 'unavailable') {
       $conditions[] = $this->Unit->conditionUnavailable();
@@ -82,15 +113,244 @@ class UnitsController extends AppController {
     elseif ($params['action'] === 'occupied') {
       $conditions[] = $this->Unit->conditionOccupied();
     }
+    elseif ($params['action'] === 'unoccupied') {
+      $conditions[] = array('NOT' => array($this->Unit->conditionOccupied()));
+    }
+    elseif ($params['action'] === 'locked') {
+      $conditions[] = $this->Unit->conditionLocked();
+    }
+    elseif ($params['action'] === 'liened') {
+      $conditions[] = $this->Unit->conditionLiened();
+    }
 
     return $conditions;
   }
 
-  function jqGridDataOrder(&$params, &$model, $index, $direction) {
-    if ($index === 'Unit.name') {
+  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: move_in
+   *  - Sets up the move-in page for the given unit.
+   */
+
+  function move_in($id = null) {
+    $customer = array();
+    $unit = array();
+
+    if (!empty($id)) {
+      $this->Unit->recursive = -1;
+      $unit = current($this->Unit->read(null, $id));
     }
-    return parent::jqGridDataOrder($params, $model, $index, $direction);
+
+    $title = 'Unit Move-In';
+    $this->set(compact('customer', 'unit', 'title'));
+    $this->render('/leases/move');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: move_out
+   *  - prepare or execute a move out on a specific lease
+   */
+
+  function move_out($id) {
+
+    $unit = $this->Unit->find
+      ('first', array
+       ('contain' => array
+	(// Models
+	 'CurrentLease' =>
+	 array(//'conditions' => array('Lease.moveout_date' => null),
+	       // Models
+	       'Customer' =>
+	       array('fields' => array('id', 'name'),
+		     ),
+	       ),
+	 ),
+	'conditions' => array('Unit.id' => $id),
+	));
+    $this->set('customer', $unit['CurrentLease']['Customer']);
+    $this->set('unit',     $unit['Unit']);
+    $this->set('lease',    $unit['CurrentLease']);
+
+    $redirect = array('controller' => 'units',
+		      'action' => 'view',
+		      $id);
+
+    $title = ('Lease #' . $unit['CurrentLease']['number'] . ': ' .
+	      $unit['Unit']['name'] . ': ' .
+	      $unit['CurrentLease']['Customer']['name'] . ': Prepare Move-Out');
+    $this->set(compact('title', 'redirect'));
+    $this->render('/leases/move');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: lock/unlock/lien
+   *  - Transitions the unit into / out of the LOCKED state
+   */
+
+  function status($id, $status) {
+    $this->Unit->updateStatus($id, $status, true);
+    $this->redirect(array('action' => 'view', $id));
+  }
+
+  function lock($id) {
+    if (isset($this->data)) {
+      $id = $this->id = $this->data['Unit']['id'];
+
+      // Check to see if the operation was cancelled.
+      if (isset($this->params['form']['cancel'])) {
+	if (isset($id))
+	  $this->redirect(array('action'=>'view', $id));
+
+	$this->redirect(array('action'=>'index'));
+      }
+
+      // Figure out which locks the user put on
+      $locks = array();
+      if (isset($this->data['Lock']) && is_array($this->data['Lock'])) {
+	foreach ($this->data['Lock'] AS $lock) {
+	  $locks[] = $lock['id'];
+	}
+      }
+
+      // Save the lock and all associated data
+      if (!$this->Unit->lockUnit($id, $locks)) {
+    	$this->Session->setFlash("UNIT LOCK FAILED", true);
+    	pr("UNIT LOCK FAILED");
+      }
+
+      // If it's no longer locked, change status to OCCUPIED
+      // Could still be liened... but that would be odd.
+      if (count($locks) == 0)
+	$this->status($id, 'OCCUPIED');
+
+      // If we're not liened, we must now just be locked
+      if (!$this->Unit->liened(intval($id)))
+	$this->status($id, 'LOCKED');
+
+      // Otherwise, don't change anything.
+      $this->redirect(array('action' => 'view', $id));
+    }
+
+    if (!$id)
+	$this->INTERNAL_ERROR("$id cannot be NULL");
+
+    // Get all locks on this unit
+    $this->data = $this->Unit->find
+      ('first',
+       array('contain' => array('Lock' => array('id')),
+	     'fields' => array('id', 'name'),
+	     'conditions' => array('Unit.id' => $id)
+	     ));
+
+    $locks = $this->Unit->Lock->lockList();
+    /* $locksold = $locks; */
+    /* foreach ($locksold AS $name) { */
+    /*   $locks[$name] = $name; */
+    /* } */
+    $this->set(compact('locks'));
+
+    // Prepare to render.
+    //pr($this->data);
+    $this->set(compact('title'));
+    //    $this->render('lock');
+  }
+
+
+  function unlock($id)  { $this->lock($id); }
+  function lien($id)    { $this->status($id, 'LIENED'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: overview
+   *  - Displays overview information for all units
+   */
+  function overview() {
+    $result = $this->Unit->find
+      ('all',
+       array('link' => array('UnitSize' => array('fields' => array(), 'UnitType' => array('fields' => array('name')))),
+	     'fields' => array('status', 'COUNT(Unit.id) AS cnt', 'SUM(Unit.rent) AS rents'),
+	     //'conditions' => array('
+	     'group' => array('UnitType.id', 'Unit.status'),
+	     'order' => array('UnitType.name', 'Unit.status')
+	     ));
+
+    $overview = array('types' => array(), 'count' => 0, 'rents' => 0);
+    foreach ($result AS $row) {
+      $utname = $row['UnitType']['name'];
+      if (empty($overview['types'][$utname]))
+	$overview['types'][$utname] = array('name' => $utname,
+					    'subs' => array(),
+					    'count' => 0,
+					    'rents' => 0,
+					    'phys_pct' => 0,
+					    'econ_pct' => 0);
+      $type = &$overview['types'][$utname];
+      $type['subs'][] = array('name' => $row['Unit']['status'],
+			      'count' => $row[0]['cnt'],
+			      'rents' => $row[0]['rents'],
+			      'phys_subpct' => 0,
+			      'phys_totpct' => 0,
+			      'econ_subpct' => 0,
+			      'econ_totpct' => 0);
+
+
+      $type['count'] += $row[0]['cnt'];
+      $type['rents'] += $row[0]['rents'];
+
+      $overview['count'] += $row[0]['cnt'];
+      $overview['rents'] += $row[0]['rents'];
+    }
+
+    foreach ($overview['types'] AS &$type) {
+      foreach ($type['subs'] AS &$sub) {
+	$sub['phys_subpct'] = $sub['count'] / $type['count'];
+	$sub['econ_subpct'] = $sub['rents'] / $type['rents'];
+	$sub['phys_totpct'] = $sub['count'] / $overview['count'];
+	$sub['econ_totpct'] = $sub['rents'] / $overview['rents'];
+      }
+      $type['phys_pct'] = $type['count'] / $overview['count'];
+      $type['econ_pct'] = $type['rents'] / $overview['rents'];
+    }
+
+    // Enable the Reports menu section
+    $this->sideMenuAreaActivate('REPORT');
+
+    // Prepare to render.
+    $this->set('title', 'Unit Overview');
+    $this->set(compact('overview'));
   }
 
 
@@ -112,6 +372,7 @@ class UnitsController extends AppController {
        array('contain' =>
 	     array(// Models
 		    'UnitSize',
+		    'Lock',
 		    'Lease' => array('Customer'),
 		    'CurrentLease' => array('Customer')
 		   ),
@@ -133,14 +394,62 @@ class UnitsController extends AppController {
 	$stats['CurrentLease']['balance'];
 
       // Figure out the total security deposit for the current lease.
-      $deposits = $this->Unit->Lease->findSecurityDeposits($unit['CurrentLease']['id']);
-      $outstanding_deposit = $deposits['summary']['balance'];
+      $deposits = $this->Unit->Lease->securityDeposits($unit['CurrentLease']['id']);
+      $outstanding_deposit = $this->Unit->Lease->securityDepositBalance($unit['CurrentLease']['id']);
     }
 
-    $this->sidemenu_links[] =
-      array('name' => 'Operations',       'header' => true);
-    $this->sidemenu_links[] =
-      array('name' => 'Move-Out',         'url' => array('controller' => 'units', 'action' => 'move-out'));
+    // Add a mechanism to lock ANY unit, regardless of status
+    $this->addSideMenuLink($this->Unit->lockCount($id) == 0 ? 'Lock' : 'Relock/Unlock',
+			   array('action' => 'lock', $id), null,
+			   'ACTION');
+
+    // If the unit is locked, but not liened, give option to lien.
+    if ($this->Unit->locked($unit['Unit']['status']) &&
+	!$this->Unit->liened($unit['Unit']['status']))
+      $this->addSideMenuLink('Lien',
+			     array('action' => 'lien', $id), null,
+			     'ACTION');
+
+    // If there is a current lease on this unit, then provide
+    // a link to move the tenant out.  Current lease for a unit
+    // has a bit different definition than a current lease for
+    // a customer, since a lease stays with a customer until it
+    // is finally closed.  A lease, however, only stays with a
+    // unit while occupied (since a unit is not responsible for
+    // any lingering financial obligations, like a customer is).
+    // Of course, if there is no current lease, provide a link
+    // to move a new tenant in (if the unit is available).
+    if (isset($unit['CurrentLease']['id'])) {
+      $this->addSideMenuLink('Move-Out',
+			     array('action' => 'move_out', $id), null,
+			     'ACTION');
+    } elseif ($this->Unit->available($unit['Unit']['status'])) {
+      $this->addSideMenuLink('Move-In',
+			     array('action' => 'move_in', $id), null,
+			     'ACTION');
+    } else {
+      // Unit is unavailable (dirty, damaged, reserved, business-use, etc)
+    }
+
+    // If there is a current lease, allow new charges to
+    // be added, and payments to be made.
+    if (isset($unit['CurrentLease']['id'])) {
+      $this->addSideMenuLink('New Invoice',
+			     array('controller' => 'leases',
+				   'action' => 'invoice',
+				   $unit['CurrentLease']['id']), null,
+			     'ACTION');
+      $this->addSideMenuLink('New Receipt',
+			     array('controller' => 'customers',
+				   'action' => 'receipt',
+				   $unit['CurrentLease']['customer_id']), null,
+			     'ACTION');
+    }
+
+    // Always allow the unit to be edited.
+    $this->addSideMenuLink('Edit',
+			   array('action' => 'edit', $id), null,
+			   'ACTION');
 
     // Prepare to render.
     $title = 'Unit ' . $unit['Unit']['name'];
@@ -148,4 +457,65 @@ class UnitsController extends AppController {
 		       'outstanding_balance',
 		       'outstanding_deposit'));
   }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: edit
+   *  - Edit unit information
+   */
+
+  function edit($id = null) {
+    if (isset($this->data)) {
+      // Check to see if the operation was cancelled.
+      if (isset($this->params['form']['cancel'])) {
+	if (empty($this->data['Unit']['id']))
+	  $this->redirect(array('action'=>'index'));
+
+	$this->redirect(array('action'=>'view', $this->data['Unit']['id']));
+      }
+
+      // Make sure we have unit data
+      if (empty($this->data['Unit']))
+	$this->redirect(array('action'=>'index'));
+
+      // Make sure we have a rental rate
+      if (empty($this->data['Unit']['rent']))
+	$this->redirect(array('action'=>'view', $this->data['Unit']['id']));
+
+      // Save the unit and all associated data
+      $this->Unit->create();
+      $this->Unit->id = $this->data['Unit']['id'];
+      if (!$this->Unit->save($this->data, false)) {
+	$this->Session->setFlash("UNIT SAVE FAILED", true);
+	pr("UNIT SAVE FAILED");
+      }
+
+      $this->redirect(array('action'=>'view', $this->Unit->id));
+    }
+
+    if ($id) {
+      $this->data = $this->Unit->findById($id);
+      $title = 'Unit ' . $this->data['Unit']['name'] . " : Edit";
+    }
+    else {
+      $title = "Enter New Unit";
+      $this->data = array();
+    }
+
+    $statusEnums = $this->Unit->allowedStatusSet($id);
+    $statusEnums = array_combine(array_keys($statusEnums),
+				 array_keys($statusEnums));
+    $this->set(compact('statusEnums'));
+
+    $unit_sizes = $this->Unit->UnitSize->find
+      ('list', array('order' => array('unit_type_id', 'width', 'depth', 'id')));
+    $this->set(compact('unit_sizes'));
+
+    // Prepare to render.
+    $this->set(compact('title'));
+  }
+
+
 }

site/controllers/util_controller.php

@@ -0,0 +1,50 @@
+<?php
+
+class UtilController extends AppController {
+
+  var $uses = array();
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: rebuild_box
+   */
+
+  function rebuild_box($type) {
+    $this->layout = null;
+    $this->autoLayout = false;
+    $this->autoRender = false;
+    Configure::write('debug', '0');
+
+    $usrpass = '--user=perki2_pmgruser --password=pmgrauth';
+    $boxdb = 'perki2_pmgr_' . $type;
+
+    $handle = popen("mysqldump $usrpass --opt perki2_pmgr" .
+		    " | mysql $usrpass --database=$boxdb", 'r');
+    while (($read = fread($handle, 2096))) {
+      // Do nothing
+    }
+    pclose($handle);
+
+    $url = $_SERVER['HTTP_REFERER'];
+    if (empty($url) || $url == 'undefined')
+      $url = "/$type";
+
+    $this->redirect($url);
+  }
+
+  function rebuild_sandbox() { $this->rebuild_box('sand'); }
+  function rebuild_devbox()  { $this->rebuild_box('dev'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: logmsg
+   *  - action to allow posting log message data
+   */
+
+  function logmsg() {
+  }
+  
+}

site/models/account.php

@@ -1,22 +1,22 @@
 <?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',
-			'conditions' => array('NOT' => array('CurrentLedger.closed'))
+			// 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'),
 		),
 	);
 
 	var $hasMany = array(
 		'Ledger',
+		'LedgerEntry',
 	);
 
 
@@ -72,7 +72,7 @@ class Account extends AppModel {
     else
       $fund = $this->fundamentalType($id_or_type);
 
-    if ($fund == 'debit')
+    if (strtolower($fund) == 'debit')
       return 'credit';
 
     return 'debit';
@@ -82,26 +82,194 @@ class Account extends AppModel {
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: accountNameToID
-   *  - Returns the ID of the named account
+   * function: name
+   *  - Returns the name of this account
    */
-  function accountNameToID($name) {
+  function name($id) {
     $this->cacheQueries = true;
     $account = $this->find('first', array
 			   ('recursive' => -1,
-			    'conditions' => compact('name'),
+			    'fields' => array('name'),
+			    'conditions' => array(array('Account.id' => $id)),
 			    ));
     $this->cacheQueries = false;
-    return $account['Account']['id'];
+
+    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 lookup($name, $check = true) {
+    $id = $this->nameToID($name);
+    if (empty($id) && $check)
+      $this->INTERNAL_ERROR("Missing Account '$name'");
+    return $id;
+  }
+
+  function securityDepositAccountID()   { return $this->lookup('Security Deposit'); }
+  function rentAccountID()              { return $this->lookup('Rent'); }
+  function lateChargeAccountID()        { return $this->lookup('Late Charge'); }
+  function nsfAccountID()               { return $this->lookup('NSF'); }
+  function nsfChargeAccountID()         { return $this->lookup('NSF Charge'); }
+  function taxAccountID()               { return $this->lookup('Tax'); }
+  function accountReceivableAccountID() { return $this->lookup('A/R'); }
+  function accountPayableAccountID()    { return $this->lookup('A/P'); }
+  function cashAccountID()              { return $this->lookup('Cash'); }
+  function checkAccountID()             { return $this->lookup('Check'); }
+  function moneyOrderAccountID()        { return $this->lookup('Money Order'); }
+  function achAccountID()               { return $this->lookup('ACH'); }
+  function concessionAccountID()        { return $this->lookup('Concession'); }
+  function waiverAccountID()            { return $this->lookup('Waiver'); }
+  function pettyCashAccountID()         { return $this->lookup('Petty Cash'); }
+  function invoiceAccountID()           { return $this->lookup('Invoice'); }
+  function receiptAccountID()           { return $this->lookup('Receipt'); }
+  function badDebtAccountID()           { return $this->lookup('Bad Debt'); }
+  function customerCreditAccountID()    { return $this->lookup(
+  // REVISIT <AP>: 20090816
+  //  Use of A/R works, and saves an excess of accounts.
+  //  However, a dedicated account is nice, since it can
+  //  quickly be spotted how much is _really_ due, vs
+  //  how much has been pre-paid.  Customer credits in
+  //  A/R is not as clear, although a report is an
+  //  obvious solution.
+								 //'A/R'
+								 'Credit'
+								 ); }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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
+			    ('fields' => array('Account.id', 'Account.name'),
+			     '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 invoiceAccounts()  { return $this->relatedAccounts('invoices'); }
+  function receiptAccounts()  { return $this->relatedAccounts('receipts'); }
+  function depositAccounts()  { return $this->relatedAccounts('deposits'); }
+  function refundAccounts()   { return $this->relatedAccounts('refunds'); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: collectableAccounts
+   *  - Returns an array of accounts suitable to show income collection
+   */
+
+  function collectableAccounts() {
+    $accounts = $this->receiptAccounts();
+
+    foreach(array($this->customerCreditAccountID(),
+		  $this->securityDepositAccountID(),
+		  $this->nsfAccountID(),
+		  $this->waiverAccountID(),
+		  $this->badDebtAccountID(),
+		  //$this->lookup('Closing'),
+		  //$this->lookup('Equity'),
+		  )
+	    AS $account_id) {
+      $accounts[$account_id] = $this->name($account_id);
+    }
+
+    $accounts['all'] = $accounts['default'] = $accounts;
+
+    foreach(array($this->concessionAccountID(),
+		  $this->waiverAccountID(),
+		  $this->badDebtAccountID(),
+		  )
+	    AS $account_id) {
+      unset($accounts['default'][$account_id]);
+    }
+
+    return $accounts;
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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 securityDepositAccountID()   { return $this->accountNameToID('Security Deposit'); }
-  function rentAccountID()              { return $this->accountNameToID('Rent'); }
-  function accountReceivableAccountID() { return $this->accountNameToID('A/R'); }
-  function invoiceAccountID()           { return $this->accountReceivableAccountID(); }
-  function receiptAccountID()           { return $this->accountReceivableAccountID(); }
-  //function invoiceAccountID()           { return $this->accountNameToID('Invoice'); }
-  //function receiptAccountID()           { return $this->accountNameToID('Receipt'); }
 
 
   /**************************************************************************
@@ -145,173 +313,44 @@ class Account extends AppModel {
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: findLedgerEntries
+   * 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 findLedgerEntries($id, $all = false, $cond = null, $link = null) {
-/*     pr(array('function' => 'Account::findLedgerEntries', */
-/* 	     'args' => compact('id', 'all', 'cond', 'link'), */
-/* 	     )); */
-
-    $entries = array();
-    foreach ($this->ledgers($id, $all) AS $ledger_id) {
-      $ledger_entries = $this->Ledger->findLedgerEntries
-	($ledger_id, $this->type($id), $cond, $link);
-      $entries = array_merge($entries, $ledger_entries);
-    }
-
-    $stats = $this->stats($id, $all, $cond);
-    $entries = array('Entries' => $entries,
-		     'summary' => $stats['Ledger']);
-
-/*     pr(array('function' => 'Account::findLedgerEntries', */
-/* 	     'args' => compact('id', 'all', 'cond', 'link'), */
-/* 	     'vars' => compact('stats'), */
-/* 	     'return' => compact('entries'), */
-/* 	     )); */
-
-    return $entries;
+  function ledgerEntries($id, $all = false, $cond = null, $link = null) {
+    $ledgers = $this->ledgers($id, $all);
+    return $this->Ledger->ledgerEntries($ledgers, $cond, $link);
   }
 
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findLedgerEntriesRelatedToAccount
-   *  - Returns an array of ledger entries that belong to the given
-   *    account, and are related to a specific account, either just from
-   *    the current ledger, or from all ledgers.
-   */
-  function findLedgerEntriesRelatedToAccount($id, $rel_ids, $all = false, $cond = null, $link = null) {
-/*     pr(array('function' => 'Account::findLedgerEntriesRelatedToAccount', */
-/* 	     'args' => compact('id', 'rel_ids', 'all', 'cond', 'link'), */
-/* 	     )); */
-
-    if (!isset($cond))
-      $cond = array();
-    if (!is_array($rel_ids))
-      $rel_ids = array($rel_ids);
-
-    $ledger_ids = array();
-    foreach ($rel_ids AS $rel_id)
-      $ledger_ids = array_merge($ledger_ids, $this->ledgers($rel_id));
-
-    array_push($cond, $this->Ledger->LedgerEntry->conditionEntryAsCreditOrDebit($ledger_ids));
-    $entries = $this->findLedgerEntries($id, $all, $cond, $link);
-
-/*     pr(array('function' => 'Account::findLedgerEntriesRelatedToAccount', */
-/* 	     'args' => compact('id', 'relid', 'all', 'cond', 'link'), */
-/* 	     'vars' => compact('ledger_ids'), */
-/* 	     'return' => compact('entries'), */
-/* 	     )); */
-    return $entries;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findUnreconciledLedgerEntries
-   *  - Returns ledger entries that are not yet reconciled
-   *    (such as charges not paid).
-   */
-
-  function findUnreconciledLedgerEntries($id = null, $fundamental_type = null, $cond = null) {
-    if (!isset($cond))
-      $cond = array();
-    $cond[] = array('Account.id' => $id);
-
-    foreach (($fundamental_type
-	      ? array($fundamental_type)
-	      : array('debit', 'credit')) AS $fund) {
-      $ucfund = ucfirst($fund);
-      $unreconciled[$fund]['entry'] = $this->find
-	('all', array
-	 ('link' => array
-	  ('Ledger' => array
-	   ('fields' => array(),
-	    "LedgerEntry" => array
-	    ('class' => "{$ucfund}LedgerEntry",
-	     'fields' => array('id', 'amount'),
-	     "ReconciliationLedgerEntry" => array
-	     ('class' => "{$ucfund}ReconciliationLedgerEntry",
-	      'fields' => array
-	      ("COALESCE(SUM(Reconciliation.amount),0) AS 'reconciled'",
-	       "LedgerEntry.amount - COALESCE(SUM(Reconciliation.amount),0) AS 'balance'",
-	       ),
-	      ),
-	     ),
-	    ),
-	   ),
-	  'group' => ("LedgerEntry.id" .
-		      " HAVING LedgerEntry.amount" .
-		      " <> COALESCE(SUM(Reconciliation.amount),0)"),
-	  'conditions' => $cond,
-	  'fields' => array(),
-	  ));
-      $balance = 0;
-      foreach ($unreconciled[$fund]['entry'] AS &$entry) {
-	$entry = array_merge(array_diff_key($entry["LedgerEntry"], array(0=>true)),
-			     $entry[0]);
-	$balance += $entry['balance'];
-      }
-      $unreconciled[$fund]['balance'] = $balance;
-    }
-
-    return $unreconciled;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: reconcileNewLedgerEntry
-   *  - Returns which ledger entries a new credit/debit would
-   *    reconcile, and how much.
-   *
-   *  - REVISIT <AP> 20090617
-   *    This should be subject to different algorithms, such
-   *    as apply to oldest charges first, newest first, to fees
-   *    before rent, etc.  Until we get there, I'll hardcode
-   *    whatever algorithm is simplest.
-   */
-
-  function reconcileNewLedgerEntry($id, $fundamental_type, $amount, $cond = null) {
-    $ofund = $this->fundamentalOpposite($fundamental_type);
-    $unreconciled = array($ofund => array('entry'=>array(), 'balance'=>0));
-    $applied = 0;
-
-    // if there is no money in the entry, it can reconcile nothing
-    // don't bother wasting time sifting ledger entries.
-    if ($amount > 0) {
-      $unreconciled = $this->findUnreconciledLedgerEntries($id, $ofund, $cond);
-
-      foreach ($unreconciled[$ofund]['entry'] AS $i => &$entry) {
-	// Determine if amount is sufficient to cover the entry
-	if ($amount > $entry['balance'])
-	  $apply = $entry['balance'];
-	elseif ($amount > 0)
-	  $apply = $amount;
-	else {
-	  unset($unreconciled[$ofund]['entry'][$i]);
-	  continue;
-	}
-
-	$entry['applied']     = $apply;
-	$entry['reconciled'] += $apply;
-	$entry['balance']    -= $apply;
-	$applied             += $apply;
-	$amount              -= $apply;
-      }
-    }
-
-    $unreconciled[$ofund]['unapplied']  = $amount;
-    $unreconciled[$ofund]['applied']    = $applied;
-    $unreconciled[$ofund]['balance']   -= $applied;
-    return $unreconciled;
-  }
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
@@ -319,37 +358,17 @@ class Account extends AppModel {
    *  - Returns summary data from the requested account.
    */
 
-  function stats($id = null, $all = false, $cond = null) {
+  function stats($id = null, $all = false, $query = null) {
     if (!$id)
       return null;
 
-    // All old, closed ledgers MUST balance to 0.
-    // However, the user may want the ENTIRE running totals,
-    // (not just the balance), so we may have to query all
-    // ledgers, as dictated by the $all parameter.
-
-    $account = $this->find('first',
-			   array('contain' =>
-				 ($all
-				  ? array('Ledger' => array
-					  ('fields' => array('id')))
-				  : array('CurrentLedger' => array
-					  ('fields' => array('id')))
-				  ),
-				 'conditions' => array
-				 (array('Account.id' => $id))
-				 ));
+    $this->queryInit($query);
+    $query['link'] = array('Account' => $query['link']);
 
     $stats = array();
-    if ($all) {
-      foreach ($account['Ledger'] AS $ledger)
-	$this->statsMerge($stats['Ledger'],
-			  $this->Ledger->stats($ledger['id'], $cond));
-    }
-    else {
-      $stats['Ledger'] =
-	$this->Ledger->stats($account['CurrentLedger']['id'], $cond);
-    }
+    foreach ($this->ledgers($id, $all) AS $ledger)
+      $this->statsMerge($stats['Ledger'],
+			$this->Ledger->stats($ledger, $query));
 
     return $stats;
   }

site/models/behaviors/linkable.php

@@ -85,6 +85,28 @@ class LinkableBehavior extends ModelBehavior {
 
 	protected $_defaults = array('type' => 'LEFT');
 	
+	function pr($lev, $mixed) {
+		if ($lev >= 3)
+			return;
+
+		pr($mixed);
+		return;
+
+		$trace = debug_backtrace(false);
+		//array_shift($trace);
+		$calls = array();
+		foreach ($trace AS $call) {
+			$call = array_intersect_key($call,
+						    array('file'=>1,
+							  'line'=>1,
+							  //'class'=>1,
+							  'function'=>1,
+							  ));
+			$calls[] = implode("; ", $call);
+		}
+		pr(array('debug' => $mixed, 'stack' => $calls));
+	}
+
 	/*
 	 * This is a function for made recursive str_replaces in an array
 	 * NOTE: The palacement of this function is terrible, but I don't
@@ -108,230 +130,357 @@ class LinkableBehavior extends ModelBehavior {
 	}
 
 	public function beforeFind(&$Model, $query) {
-/* 	  pr("Linkable::beforeFind() begin"); pr($query); */
-		if (isset($query[$this->_key])) {
-			$optionsDefaults = $this->_defaults + array('reference' =>
-			                                            array('class' => $Model->alias,
-			                                                  'alias' => $Model->alias),
-			                                            $this->_key => array());
-			$optionsKeys = $this->_options + array($this->_key => true);
-			if (!isset($query['fields']) || $query['fields'] === true) {
-			  //$query['fields'] = array_keys($Model->_schema);
-			  $query['fields'] = $Model->getDataSource()->fields($Model);
-			} elseif (!is_array($query['fields'])) {
-			  $query['fields'] = array($query['fields']);
-			}
-			$query = am(array('joins' => array()), $query, array('recursive' => -1));
-			$iterators[] = $query[$this->_key];
-			$cont = 0;
-			do {
-				$iterator = $iterators[$cont];
-				$defaults = $optionsDefaults;
-				if (isset($iterator['defaults'])) {
-					$defaults = array_merge($defaults, $iterator['defaults']);
-					unset($iterator['defaults']);
-				}
-				$iterations = Set::normalize($iterator);
-/* 				pr(array('checkpoint' => 'Iterations', compact('iterations'))); */
-				foreach ($iterations as $alias => $options) {
-					if (is_null($options)) {
-						$options = array();
-					}
-					$options = am($defaults, compact('alias'), $options);
-					if (empty($options['alias'])) {
-						throw new InvalidArgumentException(sprintf('%s::%s must receive aliased links', get_class($this), __FUNCTION__));
-					}
+		if (!isset($query[$this->_key]))
+			return $query;
 
-					if (empty($options['class']))
-						$options['class'] = $alias;
-
-/* 					pr(array('checkpoint' => 'Begin Model Work', compact('alias', 'options'))); */
-
-					$modelClass     = $options['class'];
-					$modelAlias     = $options['alias'];
-					$referenceClass = $options['reference']['class'];
-					$referenceAlias = $options['reference']['alias'];
-
-					$_Model =& ClassRegistry::init($modelClass);         // the incoming model to be linked in query
-					$Reference =& ClassRegistry::init($referenceClass);  // the already in query model that links to $_Model
-/* 					pr(array('checkpoint' => 'Aliases Established', */
-/* 						 'Model' => ($modelAlias .' : '. $modelClass . */
-/* 							     ' ('. $_Model->alias .' : '. $_Model->name .')'), */
-/* 						 'Reference' => ($referenceAlias .' : '. $referenceClass . */
-/* 								 ' ('. $Reference->alias .' : '. $Reference->name .')'))); */
-
-					$db =& $_Model->getDataSource();
-
-					$associatedThroughReference = 0;
-					$association = null;
-
-					// Figure out how these two models are related, creating
-					// a relationship if one doesn't otherwise already exists.
-				        if (($associations = $Reference->getAssociated()) &&
-					    isset($associations[$_Model->alias])) {
-/* 						pr("Reference defines association to _Model"); */
-						$associatedThroughReference = 1;
-						$type = $associations[$_Model->alias];
-						$association = $Reference->{$type}[$_Model->alias];
-					}
-					elseif (($associations = $_Model->getAssociated()) &&
-					    isset($associations[$Reference->alias])) {
-/* 						pr("_Model defines association to Reference"); */
-						$type = $associations[$Reference->alias];
-						$association = $_Model->{$type}[$Reference->alias];
-					}
-					else {
-						// No relationship... make our best effort to create one.
-/* 						pr("No assocation between _Model and Reference"); */
-						$type = 'belongsTo';
-						$_Model->bind($Reference->alias);
-						// Grab the association now, since we'll unbind in a moment.
-						$association = $_Model->{$type}[$Reference->alias];
-						$_Model->unbindModel(array('belongsTo' => array($Reference->alias)));
-					}
-
-					// Determine which model holds the foreign key
-					if (($type === 'hasMany' || $type === 'hasOne') ^ $associatedThroughReference) {
-						$primaryAlias = $referenceAlias;
-						$foreignAlias = $modelAlias;
-						$primaryModel = $Reference;
-						$foreignModel = $_Model;
-					} else {
-						$primaryAlias = $modelAlias;
-						$foreignAlias = $referenceAlias;
-						$primaryModel = $_Model;
-						$foreignModel = $Reference;
-					}
-
-					if ($associatedThroughReference)
-						$associationAlias = $referenceAlias;
-					else
-						$associationAlias = $modelAlias;
-
-					$this->recursive_array_replace("%{MODEL_ALIAS}",
-								       $associationAlias,
-								       $association['conditions']);
-
-/* 					pr(array('checkpoint' => 'Models Established - Check Associations', */
-/* 						 'primaryModel' => $primaryAlias .' : '. $primaryModel->name, */
-/* 						 'foreignModel' => $foreignAlias .' : '. $foreignModel->name, */
-/* 						 compact('type', 'association'))); */
-
-					if (empty($options['conditions'])) {
-						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;
-
-							// Get the foreign key fields (for the link table) directly from
-							// the defined model associations, if they exists.  This is the
-							// users direct specification, and therefore definitive if present.
-							$modelLink = $Link->escapeField($association['foreignKey'], $linkAlias);
-							$referenceLink = $Link->escapeField($association['associationForeignKey'], $linkAlias);
-
-							// If we haven't figured out the foreign keys, see if there is a
-							// model for the link table, and if it has the appropriate
-							// associations with the two tables we're trying to join.
-							if (empty($modelLink) && isset($Link->belongsTo[$_Model->alias]))
-								$modelLink = $Link->escapeField($Link->belongsTo[$_Model->alias]['foreignKey'], $linkAlias);
-							if (empty($referenceLink) && isset($Link->belongsTo[$Reference->alias]))
-								$referenceLink = $Link->escapeField($Link->belongsTo[$Reference->alias]['foreignKey'], $linkAlias);
-
-							// We're running quite thin here.  None of the models spell
-							// out the appropriate linkages.  We'll have to SWAG it.
-							if (empty($modelLink))
-								$modelLink = $Link->escapeField(Inflector::underscore($_Model->alias) . '_id', $linkAlias);
-							if (empty($referenceLink))
-								$referenceLink = $Link->escapeField(Inflector::underscore($Reference->alias) . '_id', $linkAlias);
-
-							// Get the primary key from the tables we're joining.
-							$referenceKey = $Reference->escapeField(null, $referenceAlias);
-							$modelKey = $_Model->escapeField(null, $modelAlias);
-								
-							// Join the linkage table to our model.  We'll use an inner join,
-							// as the whole purpose of the linkage table is to make this
-							// connection.  As we are embedding this join, the INNER will not
-							// cause any problem with the overall query, should the user not
-							// be concerned with whether or not the join has any results.
-							// They control that with the 'type' parameter which will be at
-							// the top level join.
-							$options['joins'][] = array('type'  => 'INNER',
-							                            'alias' => $modelAlias,
-							                            'conditions' => "{$modelKey} = {$modelLink}",
-							                            'table' => $db->fullTableName($_Model, true));
-
-							// Now for the top level join.  This will be added into the list
-							// of joins down below, outside of the HABTM specific code.
-							$options['class'] = $linkClass;
-							$options['alias'] = $linkAlias;
-							$options['table'] = $Link->getDataSource()->fullTableName($Link);
-							$options['conditions'][] = "{$referenceLink} = {$referenceKey}";
-						}
-						elseif (isset($association['foreignKey']) && $association['foreignKey']) {
-							$foreignKey = $primaryModel->escapeField($association['foreignKey'], $primaryAlias);
-							$primaryKey = $foreignModel->escapeField($foreignModel->primaryKey, $foreignAlias);
-
-							// 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 {
-							// No Foreign Key... nothing we can do.
-							$options['conditions'] = array();
-						}
-
-						// The user may have specified conditions directly in the model
-						// for this join.  Make sure to adhere to those conditions.
-						if (isset($association['conditions']) && is_array($association['conditions']))
-							$options['conditions'] = array_merge($options['conditions'], $association['conditions']);
-						elseif (!empty($association['conditions']))
-							$options['conditions'][] = $association['conditions'];
-
-					}
-					if (empty($options['table'])) {
-						$options['table'] = $db->fullTableName($_Model, true);
-					}
-
-					if (!isset($options['fields']) || !is_array($options['fields']))
-					  $options['fields'] = $db->fields($_Model, $modelAlias);
-					elseif (!empty($options['fields']))
-					  $options['fields'] = $db->fields($_Model, $modelAlias, $options['fields']);
-					    
-					$query['fields'] = array_merge($query['fields'], $options['fields'],
-								       (empty($association['fields']) 
-									? array() : $db->fields($_Model, $modelAlias, $association['fields'])));
-									       
-/* 					pr(array('checkpoint' => 'Model Work Complete', compact('options', 'modelClass', 'modelAlias'))); */
-
-					$options[$this->_key] = am($options[$this->_key], array_diff_key($options, $optionsKeys));
-					$options = array_intersect_key($options, $optionsKeys);
-					if (!empty($options[$this->_key])) {
-						$iterators[] = $options[$this->_key] +
-							array('defaults' =>
-										array_merge($defaults,
-							                  array('reference' =>
-							                        array('class' => $modelClass,
-							                              'alias' => $modelAlias))));
-					}
-					$query['joins'][] = array_intersect_key($options, array('type' => true, 'alias' => true, 'table' => true, 'joins' => true, 'conditions' => true));
-				}
-				++$cont;
-				$notDone = isset($iterators[$cont]);
-			} while ($notDone);
+		if (!isset($query['fields']) || $query['fields'] === true) {
+			$query['fields'] = $Model->getDataSource()->fields($Model);
+		} elseif (!is_array($query['fields'])) {
+			$query['fields'] = array($query['fields']);
 		}
-/* 		pr(array('checkpoint' => 'Linkable::beforeFind() end', */
-/* 		         compact('query'))); */
-		return $query;
+		$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/contact.php

@@ -1,12 +1,11 @@
 <?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(
@@ -15,7 +14,7 @@ class Contact extends AppModel {
 			'joinTable' => 'contacts_methods',
 			'associationForeignKey' => 'method_id',
 			'unique' => true,
-			'conditions' => "method = 'POST'",
+			'conditions' => "method = 'ADDRESS'",
 		),
 		'ContactPhone' => array(
 			'joinTable' => 'contacts_methods',
@@ -31,5 +30,101 @@ class Contact extends AppModel {
 		),
 	);
 
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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']['first_name'] && $data['Contact']['last_name'])
+      $data['Contact']['display_name'] =
+	$data['Contact']['last_name'] . ', ' . $data['Contact']['first_name'];
+
+    foreach (array('last_name', 'first_name', 'company_name') AS $fld) {
+      if (!$data['Contact']['display_name'] && $data['Contact'][$fld])
+      $data['Contact']['display_name'] = $data['Contact'][$fld];
+    }
+
+    // Save the contact data
+    $this->create();
+    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']) || $item['source'] == 'new') {
+	  $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,8 +21,26 @@ class ContactAddress extends AppModel {
 			'foreignKey' => 'method_id',
 			'associationForeignKey' => 'contact_id',
 			'unique' => true,
-			'conditions' => "method = 'POST'",
+			'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')
@@ -18,5 +19,9 @@ class ContactEmail extends AppModel {
 		)
 	);
 
+	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',
@@ -20,5 +26,21 @@ class ContactPhone extends AppModel {
 		)
 	);
 
+	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

@@ -19,21 +19,26 @@ class Customer extends AppModel {
 			'conditions' => 'CurrentLease.close_date IS NULL',
 		),
 		'Lease',
-		'LedgerEntry',
+		'StatementEntry',
+		'ContactsCustomer' => array(
+			// It would be nice to claim a dependency here, which would
+			// simplify deletion of a customer.  However, for this to work
+			// Cake must have a primaryKey as a single field.  This table
+		        // makes use of a complex key, so we're out of luck.
+			/* 'dependent' => true, */
+		),
 
-		// Cheat to get Account set as part of this class
-		'Account',
+		'Transaction',
+		'Tender',
 	);
 
 	var $hasAndBelongsToMany = array(
-		'Contact',
-		'Transaction' => array(
-			'joinTable' => 'ledger_entries',
-			'foreignKey' => 'customer_id',
-			'associationForeignKey' => 'transaction_id',
+		'Contact' => array(
+			'unique' => true,
 		),
 	);
 
+	//var $default_log_level = 20;
 
   /**************************************************************************
    **************************************************************************
@@ -59,128 +64,376 @@ class Customer extends AppModel {
    * function: leaseIds
    *  - Returns the lease IDs for the given customer
    */
-  function leaseIds($id) {
+  function leaseIds($id, $current = false) {
+    $Lease = $current ? 'CurrentLease' : 'Lease';
+
     $this->cacheQueries = true;
     $customer = $this->find('first',
 			    array('contain' =>
-				  array('Lease' => array('fields' => array('id'))),
+				  array($Lease => array('fields' => array('id'))),
 				  'fields' => array(),
 				  'conditions' => array(array('Customer.id' => $id))));
     $this->cacheQueries = false;
 
     $ids = array();
-    foreach ($customer['Lease'] AS $lease)
+    foreach ($customer[$Lease] AS $lease)
       $ids[] = $lease['id'];
 
     return $ids;
   }
 
+
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: findSecurityDeposits
+   * function: securityDeposits
    *  - Returns an array of security deposit entries
    */
-  function findSecurityDeposits($id, $link = null) {
-/*     pr(array('function' => 'Customer::findSecurityDeposits', */
-/* 	     'args' => compact('id', 'link'), */
-/* 	     )); */
+  function securityDeposits($id, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    $this->queryInit($query);
 
-    $entries = $this->Account->findLedgerEntriesRelatedToAccount
-      ($this->Account->invoiceAccountID(),
-       $this->Account->securityDepositAccountID(),
-       true, array('LedgerEntry.customer_id' => $id), $link);
+    $query['conditions'][] = array('StatementEntry.customer_id' => $id);
+    $query['conditions'][] = array('StatementEntry.account_id' =>
+				   $this->StatementEntry->Account->securityDepositAccountID());
 
-/*     pr(array('function' => 'Customer::findSecurityDeposits', */
-/* 	     'args' => compact('id', 'link'), */
-/* 	     'vars' => compact('customer'), */
-/* 	     'return' => compact('entries'), */
-/* 	     )); */
-
-    return $entries;
+    $set = $this->StatementEntry->reconciledSet('CHARGE', $query, false, true);
+    return $this->prReturn($set);
   }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: findUnreconciledLedgerEntries
-   *  - Returns ledger entries that are not yet reconciled
-   *    (such as charges not paid).
+   * function: securityDepositBalance
+   *  - Returns the balance of the customer security deposit(s)
    */
 
-  function findUnreconciledLedgerEntries($id = null, $fundamental_type = null) {
-    $unreconciled = $this->Account->findUnreconciledLedgerEntries
-      ($this->Account->accountReceivableAccountID(),
-       $fundamental_type,
-       array('LedgerEntry.customer_id' => $id));
+  function securityDepositBalance($id, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    $this->queryInit($query);
 
-    return $unreconciled;
+    $sd_account_id =
+      $this->StatementEntry->Account->securityDepositAccountID();
+
+    $squery = $query;
+    $squery['conditions'][] = array('StatementEntry.customer_id' => $id);
+    $squery['conditions'][] = array('StatementEntry.account_id' => $sd_account_id);
+    $stats = $this->StatementEntry->stats(null, $squery);
+    $this->pr(26, compact('squery', 'stats'));
+
+    // OK, we know now how much we charged for a security
+    // deposit, as well as how much we received to pay for it.
+    // Now we need to know if any has been released.
+    // Yes... this sucks.
+    $lquery = $query;
+    $lquery['link'] = array('Transaction' =>
+			    array('fields' => array(),
+				  'Customer' =>
+				  (empty($query['link'])
+				   ? array('fields' => array())
+				   : $query['link'])));
+    $lquery['conditions'][] = array('Transaction.customer_id' => $id);
+    $lquery['conditions'][] = array('LedgerEntry.account_id' => $sd_account_id);
+    $lquery['conditions'][] = array('LedgerEntry.crdr' => 'DEBIT');
+    $lquery['fields'][] = 'SUM(LedgerEntry.amount) AS total';
+    $released = $this->StatementEntry->Transaction->LedgerEntry->find
+      ('first', $lquery);
+    $this->pr(26, compact('lquery', 'released'));
+
+    return $this->prReturn($stats['Charge']['disbursement'] - $released[0]['total']);
   }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: reconcileNewLedgerEntry
-   *  - Returns which ledger entries a new credit/debit would
-   *    reconcile, and how much.
-   *
-   *  - REVISIT <AP> 20090617
-   *    This should be subject to different algorithms, such
-   *    as apply to oldest charges first, newest first, to fees
-   *    before rent, etc.  Until we get there, I'll hardcode
-   *    whatever algorithm is simplest.
+   * function: unreconciledCharges
+   *  - Returns charges have not yet been fully paid
    */
 
-  function reconcileNewLedgerEntry($id, $fundamental_type, $amount) {
-    $reconciled = $this->Account->reconcileNewLedgerEntry
-      ($this->Account->accountReceivableAccountID(),
-       $fundamental_type,
-       $amount,
-       array('LedgerEntry.customer_id' => $id));
+  function unreconciledCharges($id, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    $this->queryInit($query);
 
-    return $reconciled;
+    $query['conditions'][] = array('StatementEntry.customer_id' => $id);
+    $set = $this->StatementEntry->reconciledSet('CHARGE', $query, true);
+    return $this->prReturn($set);
   }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: details
-   *  - Returns detail information for the customer
+   * function: saveCustomer
+   *  - Saves the customer and related data
    */
 
-  function details($id = null) {
-    // Query the DB for need information.
-    $customer = $this->find
-      ('first', array
-       ('contain' => array
-	(// Models
-	 'Contact' =>
-	 array(// Models
-	       'ContactPhone',
-	       'ContactEmail',
-	       'ContactAddress',
-	       ),
-	 'Lease' =>
-	 array('Unit' =>
-	       array('order'  => array('sort_order'),
-		     'fields' => array('id', 'name'),
-		     ),
-	       ),
-	 ),
+  function saveCustomer($id, $data, $primary_contact_entry) {
 
-	'conditions' => array('Customer.id' => $id),
-	));
+    // Go through each contact, and create new ones as needed
+    foreach ($data['Contact'] AS &$contact) {
+      if (isset($contact['id']))
+	continue;
 
-    // Figure out the outstanding balance for this customer
-    $customer['stats'] = $this->stats($id);
+      $I = new Contact();
+      if (!$I->saveContact(null, array('Contact' => $contact)))
+	return false;
+      $contact['id'] = $I->id;
+    }
 
-    // Figure out the total security deposit for the current lease.
-    $customer['deposits'] = $this->findSecurityDeposits($id);
+    // Set the primary contact ID based on caller selection
+    $data['Customer']['primary_contact_id']
+      = $data['Contact'][$primary_contact_entry]['id'];
 
-    return $customer;
+    // 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;
+
+    // Appears that $this->save() "helpfully" choses to add in
+    // any missing data fields, populated with default values.
+    // So, after saving is complete, the fields 'lease_count',
+    // 'past_lease_count', and 'current_lease_count' have all
+    // been reset to zero.  Gee, thanks Cake...
+    $this->update($id);
+
+    // Remove all associated Customer Contacts, as it ensures
+    // any entries deleted by the user actually get deleted
+    // in the system.  We'll recreate the needed ones anyway.
+    // 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: update
+   *  - Update any cached or calculated fields
+   */
+  function update($id) {
+    $this->prEnter(compact('id'));
+
+    if (empty($id)) {
+      $customers = $this->find('all', array('contain' => false, 'fields' => array('id')));
+      foreach ($customers AS $customer) {
+	// This SHOULDN'T happen, but check to be sure
+	// or we'll get infinite recursion.
+	if (empty($customer['Customer']['id']))
+	  continue;
+	$this->update($customer['Customer']['id']);
+      }
+      return;
+    }
+
+    // updateLeaseCount is typically handled directly when needed.
+    // However, this function is used to _ensure_ customer info is
+    // current, so we're obligated to call it anyway.
+    $this->updateLeaseCount($id);
+
+    $current_leases =
+      $this->find('all',
+		  // REVISIT <AP>: 20090816
+		  //  Do we need to update leases other than the current ones?
+		  //  It may be necessary.  For example, a non-current lease
+		  //  can still be hit with an NSF item.  In that case, it
+		  //  could have stale data if we look only to current leases.
+		  //array('link' => array('CurrentLease' => array('type' => 'INNER')),
+		  array('link' => array('Lease' => array('type' => 'INNER')),
+			'conditions' => array('Customer.id' => $id)));
+
+    foreach ($current_leases AS $lease) {
+      if (!empty($lease['CurrentLease']['id']))
+	$this->Lease->update($lease['CurrentLease']['id']);
+      if (!empty($lease['Lease']['id']))
+	$this->Lease->update($lease['Lease']['id']);
+    }
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: merge
+   *  - Merges two customers into one
+   */
+
+  function merge($dst_id, $src_id, $contacts) {
+    $this->prEnter(compact('dst_id', 'src_id', 'contacts'));
+
+    // Get the entire list of destination customer contacts
+    $dst_contacts = array();
+    $result = $this->find('all',
+			  array('link' => array('ContactsCustomer'),
+			  	'fields' => array('ContactsCustomer.contact_id', 'ContactsCustomer.type'),
+				'conditions' => array(array('id' => $dst_id,
+							    'ContactsCustomer.active' => true))));
+    foreach ($result AS $contact) {
+      $dst_contacts[$contact['ContactsCustomer']['contact_id']] = $contact['ContactsCustomer'];
+    }
+    $this->pr(17, compact('dst_contacts'));
+
+    // Get the entire list of source customer contacts
+    $src_contacts = array();
+    $result = $this->find('all',
+			  array('link' => array('ContactsCustomer'),
+			  	'fields' => array('ContactsCustomer.contact_id', 'ContactsCustomer.type'),
+				'conditions' => array(array('id' => $src_id,
+							    'ContactsCustomer.active' => true))));
+    foreach ($result AS $contact) {
+      $src_contacts[$contact['ContactsCustomer']['contact_id']] = $contact['ContactsCustomer'];
+    }
+    $this->pr(17, compact('src_contacts'));
+
+    // Verify the contacts list are all valid source customer contacts
+    foreach ($contacts AS $contact_id) {
+      if (!array_key_exists($contact_id, $src_contacts))
+	return $this->prReturn(false);
+    }
+
+    // Remove any contacts which are already destination customer contacts
+    $new_contacts = array_diff($contacts, array_keys($dst_contacts));
+    $all_contacts = array_merge($new_contacts, array_keys($dst_contacts));
+    $this->pr(17, compact('new_contacts', 'all_contacts'));
+
+    // For now, we'll assume the operation will succeed.
+    $ret = true;
+
+    // Add each desired source customer contact to the destination customer
+    foreach ($new_contacts AS $contact_id) {
+      $CM = new ContactsCustomer();
+      if (!$CM->save(array('customer_id' => $dst_id)
+		     + $src_contacts[$contact_id], false)) {
+	$ret = false;
+      }
+    }
+
+    $this->Lease->updateAll
+      (array('Lease.customer_id' => $dst_id),
+       array('Lease.customer_id' => $src_id)
+       );
+
+    $this->Tender->updateAll
+      (array('Tender.customer_id' => $dst_id),
+       array('Tender.customer_id' => $src_id)
+       );
+
+    $this->StatementEntry->updateAll
+      (array('StatementEntry.customer_id' => $dst_id),
+       array('StatementEntry.customer_id' => $src_id)
+       );
+
+    $this->Transaction->updateAll
+      (array('Transaction.customer_id' => $dst_id),
+       array('Transaction.customer_id' => $src_id)
+       );
+
+    // Make sure our lease counts, etc are correct
+    $this->update($dst_id);
+
+    // Delete the old customer
+    $this->pr(12, compact('src_id'), "Delete Customer");
+    $this->delete($src_id);
+
+    // Delete all the orphaned customers
+    foreach (array_diff(array_keys($src_contacts), $all_contacts) AS $contact_id) {
+      // Delete un-used or duplicate contacts
+      // REVISIT <AP> 20100702:
+      //   Not sure if we really want to do this.
+      //   On the one hand, they're probably really redundant,
+      //   and only clutter up the list of all contacts.  On the
+      //   other hand, it destroys data, not only losing the
+      //   history, but making it difficult to recover if the
+      //   merge is a mistake.  Additionally, we need to do
+      //   extra checking to ensure that the contact is not
+      //   in use by some other customer.
+      //   We need some sort of Contact.deleted field...
+      $this->pr(12, compact('contact_id'), "Delete Contact");
+      $this->Contact->delete($contact_id);
+    }
+
+    // Finally, delete all customer contact relationships
+    $this->ContactsCustomer->deleteAll
+      (array('customer_id' => $src_id), false);
+
+    // Return the result
+    return $this->prReturn($ret);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: updateLeaseCount
+   *  - Updates the internal lease count
+   */
+
+  function updateLeaseCount($id) {
+    $this->id = $id;
+
+    $lease_count =
+      $this->find('count',
+		  array('link' => array('Lease' => array('type' => 'INNER')),
+			'conditions' => array('Customer.id' => $id)));
+    $current_count =
+      $this->find('count',
+		  array('link' => array('CurrentLease' => array('type' => 'INNER')),
+			'conditions' => array('Customer.id' => $id)));
+
+    $this->saveField('lease_count',         $lease_count);
+    $this->saveField('current_lease_count', $current_count);
+    $this->saveField('past_lease_count',    $lease_count - $current_count);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: balance
+   *  - Returns the balance of money owed on the lease
+   */
+
+  function balance($id) {
+    $stats = $this->stats($id);
+    return $stats['balance'];
   }
 
 
@@ -191,16 +444,62 @@ class Customer extends AppModel {
    *  - Returns summary data from the requested customer.
    */
 
-  function stats($id = null) {
+  function stats($id = null, $query = null) {
+    //$this->prFunctionLevel(20);
+    $this->prEnter(compact('id', 'query'));
     if (!$id)
-      return null;
+      return $this->prExit(null);
 
-    $stats = $this->Account->stats($this->Account->accountReceivableAccountID(), true,
-				   array('LedgerEntry.customer_id' => $id));
+    $this->queryInit($query);
 
-    // Pull to the top level and return
-    $stats = $stats['Ledger'];
-    return $stats;
+    // 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->chargeDisbursementFields(true), */
+/* 	'conditions' => array('StatementEntry.customer_id' => $id), */
+/* 	)); */
+
+    $find_stats = $this->StatementEntry->find
+      ('first', array
+       ('contain' => false,
+	'fields' => $this->StatementEntry->chargeDisbursementFields(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/default_option.php

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

site/models/default_permission.php

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

site/models/double_entry.php

@@ -0,0 +1,109 @@
+<?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) {
+    //$this->prFunctionLevel(16);
+    $this->prEnter(compact('entry1', 'entry2', 'entry1_tender'));
+
+    $ret = array();
+    if (!$this->verifyDoubleEntry($entry1, $entry2, $entry1_tender))
+      return $this->prReturn(array('error' => true) + $ret);
+
+    // Handle the case where a double entry involves the same
+    // exact ledger.  This would not serve any useful purpose.
+    // It is not, however, an error.  It is semantically correct
+    // just not really logically correct.  To make this easier,
+    // just ensure ledger_id is set for each entry, even though
+    // it would be handled later by the LedgerEntry model.
+    //array($entry1, $entry2) AS &$entry) {
+    for ($i=1; $i <= 2; ++$i) {
+      if (empty(${'entry'.$i}['ledger_id']))
+	${'entry'.$i}['ledger_id'] =
+	  $this->DebitEntry->Account->currentLedgerID(${'entry'.$i}['account_id']);
+    }
+    if ($entry1['ledger_id'] == $entry2['ledger_id'])
+      return $this->prReturn(array('error' => false));
+
+    // Since this model only relates to DebitEntry and CreditEntry...
+    $LE = new LedgerEntry();
+
+    // Add the first ledger entry to the database
+    $result = $LE->addLedgerEntry($entry1, $entry1_tender);
+    $ret['Entry1'] = $result;
+    if ($result['error'])
+      return $this->prReturn(array('error' => true) + $ret);
+    
+    // Add the second ledger entry to the database
+    $result = $LE->addLedgerEntry($entry2);
+    $ret['Entry2'] = $result;
+    if ($result['error'])
+      return $this->prReturn(array('error' => true) + $ret);
+
+    // 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'];
+
+    $ret['data'] = $double_entry;
+
+    $this->create();
+    if (!$this->save($double_entry))
+      return $this->prReturn(array('error' => true) + $ret);
+
+    $ret['double_entry_id'] = $this->id;
+    return $this->prReturn($ret + array('error' => false));
+  }
+}

site/models/group.php

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

site/models/group_option.php

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

site/models/group_permission.php

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

site/models/lease.php

@@ -1,27 +1,6 @@
 <?php
 class Lease extends AppModel {
 
-	var $name = 'Lease';
-	var $validate = array(
-		'id' => array('numeric'),
-		'number' => array('alphanumeric'),
-		'lease_type_id' => array('numeric'),
-		'unit_id' => array('numeric'),
-		'late_schedule_id' => array('numeric'),
-		'lease_date' => array('date'),
-		'movein_planned_date' => array('date'),
-		'movein_date' => array('date'),
-		'moveout_date' => array('date'),
-		'moveout_planned_date' => array('date'),
-		'notice_given_date' => array('date'),
-		'notice_received_date' => array('date'),
-		'close_date' => array('date'),
-		'deposit' => array('money'),
-		'amount' => array('money'),
-		'next_amount' => array('money'),
-		'next_amount_date' => array('date')
-	);
-
 	var $belongsTo = array(
 		'LeaseType',
 		'Unit',
@@ -30,108 +9,868 @@ class Lease extends AppModel {
 	);
 
 	var $hasMany = array(
-		'LedgerEntry',
-
-		// Cheat to get Account set as part of this class
-		'Account',
+		'StatementEntry',
 	);
 
+	//var $default_log_level = array('log' => 30, 'show' => 30);
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: accountId
-   *  - Returns the accountId of the given lease
-   */
-  function accountId($id) {
-    return $this->Account->invoiceAccountID();
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findAccountEntries
-   *  - Returns an array of ledger entries from the account of the given
-   *    lease.
-   */
-  function findAccountEntries($id, $all = false, $cond = null, $link = null) {
-/*     pr(array('function' => 'Lease::findAccountEntries', */
-/* 	     'args' => compact('id', 'all', 'cond', 'link'), */
-/* 	     )); */
-
-    if (!isset($cond))
-      $cond = array();
-    $cond[] = array('LedgerEntry.lease_id' => $id);
-
-    $entries = $this->Account->findLedgerEntries($this->accountId($id),
-						 $all, $cond, $link);
-
-/*     pr(array('function' => 'Lease::findAccountEntries', */
-/* 	     'args' => compact('id', 'all', 'cond', 'link'), */
-/* 	     'vars' => compact('lease'), */
-/* 	     'return' => compact('entries'), */
-/* 	     )); */
-    return $entries;
-  }
-
-
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: findSecurityDeposits
+   * function: securityDeposits
    *  - Returns an array of security deposit entries
    */
-  function findSecurityDeposits($id, $link = null) {
-/*     pr(array('function' => 'Lease::findSecurityDeposits', */
-/* 	     'args' => compact('id', 'link'), */
-/* 	     )); */
+  function securityDeposits($id, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    $this->queryInit($query);
 
-    $entries = $this->Account->findLedgerEntriesRelatedToAccount
-      ($this->accountId($id),
-       $this->Account->securityDepositAccountID(),
-       true, array('LedgerEntry.lease_id' => $id), $link);
+    $query['conditions'][] = array('StatementEntry.lease_id' => $id);
+    $query['conditions'][] = array('StatementEntry.account_id' =>
+				   $this->StatementEntry->Account->securityDepositAccountID());
 
-/*     pr(array('function' => 'Lease::findSecurityDeposits', */
-/* 	     'args' => compact('id', 'link'), */
-/* 	     'vars' => compact('lease'), */
-/* 	     'return' => compact('entries'), */
-/* 	     )); */
-    return $entries;
+    $set = $this->StatementEntry->reconciledSet('CHARGE', $query, false, true);
+    return $this->prReturn($set);
   }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: findUnreconciledLedgerEntries
-   *  - Returns ledger entries that are not yet reconciled
-   *    (such as charges not paid).
+   * function: securityDepositBalance
+   *  - Returns the balance of the lease security deposit(s)
    */
 
-  function findUnreconciledLedgerEntries($id = null, $fundamental_type = null) {
-    return $this->Account->findUnreconciledLedgerEntries
-      ($this->accountId($id), $fundamental_type, array('LedgerEntry.lease_id' => $id));
+  function securityDepositBalance($id, $query = null) {
+    $this->prEnter(compact('id', 'query'));
+    $this->queryInit($query);
+
+    // REVISIT <AP>: 20090807
+    //  Let's try simplifying the security deposit issue.
+    //  Presume that security deposits are NOT used at all,
+    //  until the customer moves out of the unit.  At that
+    //  time, the ENTIRE deposit is converted to customer
+    //  credit.  Piece of cake.
+    //  For more information, see file revision history,
+    //  including the revision just before this, r503.
+
+    $this->id = $id;
+    $moveout_date = $this->field('moveout_date');
+    if (!empty($moveout_date))
+      return $this->prReturn(0);
+
+    $query['conditions'][] = array('StatementEntry.lease_id' => $id);
+    $query['conditions'][] = array('StatementEntry.account_id' =>
+				   $this->StatementEntry->Account->securityDepositAccountID());
+
+    $stats = $this->StatementEntry->stats(null, $query);
+    return $this->prReturn($stats['Charge']['disbursement']);
   }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: reconcileNewLedgerEntry
-   *  - Returns which ledger entries a new credit/debit would
-   *    reconcile, and how much.
-   *
-   *  - REVISIT <AP> 20090617
-   *    This should be subject to different algorithms, such
-   *    as apply to oldest charges first, newest first, to fees
-   *    before rent, etc.  Until we get there, I'll hardcode
-   *    whatever algorithm is simplest.
+   * function: releaseSecurityDeposits
+   *  - Releases all security deposits associated with this lease.
+   *    That simply makes a disbursement out of them, which can be used
+   *    to pay outstanding customer charges, or simply to become
+   *    a customer surplus (customer credit).
+   */
+  function releaseSecurityDeposits($id, $stamp = null, $query = null) {
+    //$this->prFunctionLevel(30);
+    $this->prEnter(compact('id', 'stamp', 'query'));
+
+    $secdeps = $this->securityDeposits($id, $query);
+    $secdeps = $secdeps['entries'];
+    $this->pr(20, compact('secdeps'));
+
+    // 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']['stamp']   = $stamp;
+    $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
+      // any unpaid (or only partially paid) security deposit should
+      // have the remaining balance reversed.
+      if ($charge['StatementEntry']['balance'] > 0)
+	$this->StatementEntry->reverse($charge['StatementEntry']['id'], true, $stamp);
+
+      $release['Entry'][] =
+	array('amount'      => $charge['StatementEntry']['reconciled'],
+	      'account_id'  => $this->StatementEntry->Account->securityDepositAccountID(),
+	      'comment'     => "Released Security Deposit",
+	      );
+    }
+
+    $customer_id = $secdeps[0]['StatementEntry']['customer_id'];
+    $lease_id    = $secdeps[0]['StatementEntry']['lease_id'];
+
+    // Add receipt of the security deposit funds.  Do NOT
+    // flag them as part of the lease, as all received funds
+    // are only associated with the customer, for future
+    // (or present) disbursement on any lease.
+    $result = $this->StatementEntry->Transaction->addReceipt
+      ($release, $customer_id, null);
+
+    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 reconcileNewLedgerEntry($id, $fundamental_type, $amount) {
-    return $this->Account->reconcileNewLedgerEntry
-      ($this->accountId($id), $fundamental_type, $amount, array('LedgerEntry.lease_id' => $id));
+  function rentLastCharges($id) {
+    $this->prEnter(compact('id'));
+    $rent_account_id = $this->StatementEntry->Account->rentAccountID();
+    $entries = $this->find
+      ('all',
+       array('link' =>
+	     array(// Models
+		   'StatementEntry',
+
+		   'SEx' =>
+		   array('class' => 'StatementEntry',
+			 'fields' => array(),
+			 'conditions' => array
+			 ('SEx.lease_id = StatementEntry.lease_id',
+			  'SEx.type' => 'CHARGE',
+			  'SEx.account_id' => $rent_account_id,
+			  'SEx.reverse_transaction_id IS NULL',
+			  'SEx.effective_date = DATE_ADD(StatementEntry.through_date, INTERVAL 1 day)',
+			  ),
+			 ),
+		   ),
+
+	     //'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('StatementEntry.reverse_transaction_id IS NULL'),
+				   array('SEx.id' => null),
+				   ),
+	     )
+       );
+
+    return $this->prReturn($entries);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: lateCharges
+   *  - Returns a list of late charges from this lease
+   */
+
+  function lateCharges($id) {
+    $this->prEnter(compact('id'));
+    $late_account_id = $this->StatementEntry->Account->lateChargeAccountID();
+    $entries = $this->StatementEntry->find
+      ('all',
+       array('link' =>
+	     array(// Models
+		   'Lease',
+		   ),
+
+	     //'fields' => array('id', 'amount', 'effective_date', 'through_date'),
+	     'conditions' => array(array('Lease.id' => $id),
+				   array('StatementEntry.type' => 'CHARGE'),
+				   array('StatementEntry.account_id' => $late_account_id),
+				   ),
+	     )
+       );
+
+    return $this->prReturn($entries);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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->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),
+		   array('StatementEntry.reverse_transaction_id IS NULL'),
+		   ),
+
+	     '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),
+		   array('StatementEntry.reverse_transaction_id IS NULL'),
+		   ),
+
+	     '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: assessMonthlyRent
+   *  - Charges rent for the month, if not already charged.
+   */
+
+  function assessMonthlyRent($id, $date = null) {
+    $this->prEnter(compact('id', 'date'));
+    $this->id = $id;
+
+    if (empty($date))
+      $date = time();
+
+    if (is_string($date))
+      $date = strtotime($date);
+
+    // REVISIT <AP>: 20090808
+    //  Anniversary Billing not supported
+    $anniversary = 0 && $this->field('anniversary_billing');
+    if (empty($anniversary)) {
+      $date_parts = getdate($date);
+      $date = mktime(0, 0, 0, $date_parts['mon'], 1, $date_parts['year']);
+    }
+
+    // Make sure we're not trying to assess rent on a closed lease
+    $close_date = $this->field('close_date');
+    $this->pr(17, compact('close_date'));
+    if (!empty($close_date))
+      return $this->prReturn(null);
+
+    // Don't assess rent after customer has moved out
+    $moveout_date = $this->field('moveout_date');
+    $this->pr(17, compact('moveout_date'));
+    if (!empty($moveout_date) && strtotime($moveout_date) < $date)
+      return $this->prReturn(null);
+
+    // Determine when the customer has already been charged through
+    // and, of course, don't charge them if they've already been.
+    $charge_through_date = strtotime($this->rentChargeThrough($id));
+    $this->pr(17, compact('date', 'charge_through_date')
+	      + array('date_str' => date('Y-m-d', $date),
+		      'charge_through_date_str' => date('Y-m-d', $charge_through_date)));
+    if (!$charge_through_date)
+      return $this->prReturn(null);
+    if ($charge_through_date >= $date)
+      return $this->prReturn(null);
+
+    // OK, it seems we're going to go ahead and charge the customer
+    // on this lease.  Calculate the new charge through date, which
+    // is 1 day shy of 1 month from $date.  For example, if we're
+    // charging for 8/1/09, charge through will be 8/31/09, and
+    // charging for 8/15/09, charge through will be 9/14/09.
+    $date_parts = getdate($date);
+    $charge_through_date = mktime(0, 0, 0,
+				  $date_parts['mon']+1,
+				  $date_parts['mday']-1,
+				  $date_parts['year']);
+
+    // Build the invoice transaction
+    $invoice = array('Transaction' => array(), 'Entry' => array());
+    // REVISIT <AP>: 20090808
+    //  Keeping Transaction.stamp until the existing facility
+    //  is up to date.  Then we want the stamp to be now()
+    //  (and so can just delete the next line).
+    $invoice['Transaction']['stamp'] = date('Y-m-d', $date);
+    $invoice['Entry'][] =
+      array('effective_date' => date('Y-m-d', $date),
+	    'through_date' => date('Y-m-d', $charge_through_date),
+	    'amount' => $this->field('rent'),
+	    'account_id' => $this->StatementEntry->Account->rentAccountId(),
+	    );
+
+    // Record the invoice and return the result
+    $this->pr(21, compact('invoice'));
+    $result = $this->StatementEntry->Transaction->addInvoice
+      ($invoice, null, $id);
+    return $this->prReturn($result);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: assessMonthlyRentAll
+   *  - Ensures rent has been charged on all open leases
+   */
+
+  function assessMonthlyRentAll($date = null) {
+    $this->prEnter(compact('date'));
+    $leases = $this->find
+      ('all', array('contain' => false,
+		    'conditions' => array('Lease.close_date' => null),
+		    ));
+
+    $ret = array('Lease' => array());
+    foreach ($leases AS $lease) {
+      $result = $this->assessMonthlyRent($lease['Lease']['id'], $date);
+      $ret['Lease'][$lease['Lease']['id']] = $result;
+      if ($result['error'])
+	$ret['error'] = true;
+    }
+    return $this->prReturn($ret + array('error' => false));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: assessMonthlyLate
+   *  - Assess late charges for the month, if not already charged.
+   */
+
+  function assessMonthlyLate($id, $date = null) {
+    $this->prEnter(compact('id', 'date'));
+    $this->id = $id;
+
+    if (empty($date))
+      $date = time();
+
+    if (is_string($date))
+      $date = strtotime($date);
+
+    // REVISIT <AP>: 20090808
+    //  Anniversary Billing not supported
+    $anniversary = 0 && $this->field('anniversary_billing');
+    if (empty($anniversary)) {
+      $date_parts = getdate($date);
+      $date = mktime(0, 0, 0, $date_parts['mon'], 11, $date_parts['year']);
+    }
+
+    // Don't assess a late charge if the late charge date hasn't
+    // even come yet.  This is questionable whether we really
+    // should restrict, since the user could know what they're
+    // doing, and/or the server clock could be off (although that
+    // would certainly have much larger ramifications).  But, the
+    // fact is that this check likely handles the vast majority
+    // of the expected behavior, and presents an issue for very
+    // few users, if any at all.
+    if ($date > time())
+      return $this->prReturn(null);
+
+    // Make sure we're not trying to assess late charges on a closed lease
+    $close_date = $this->field('close_date');
+    $this->pr(17, compact('close_date'));
+    if (!empty($close_date))
+      return $this->prReturn(null);
+
+    // Don't assess late charges after customer has moved out
+    $moveout_date = $this->field('moveout_date');
+    $this->pr(17, compact('moveout_date'));
+    if (!empty($moveout_date) && strtotime($moveout_date) < $date)
+      return $this->prReturn(null);
+
+    // Determine when the customer has been charged through for rent
+    // and don't mark them as late if they haven't even been charged rent
+    $charge_through_date = strtotime($this->rentChargeThrough($id));
+    $this->pr(17, compact('date', 'charge_through_date')
+	      + array('date_str' => date('Y-m-d', $date),
+		      'charge_through_date_str' => date('Y-m-d', $charge_through_date)));
+    if ($charge_through_date <= $date)
+      return $this->prReturn(null);
+
+    // Determine if the customer is actually late.  This is based on
+    // when they've paid through, plus 10 days before they're late.
+    // REVISIT <AP>: 20090813
+    //   Of course, 10 days is a terrible hardcode.  This should be
+    //   driven from the late schedule, saved as part of the lease
+    //   (when finally implemented).
+    $paid_through_date = strtotime($this->rentPaidThrough($id));
+    $this->pr(17, compact('date', 'paid_through_date')
+	      + array('date_str' => date('Y-m-d', $date),
+		      'paid_through_date_str' => date('Y-m-d', $paid_through_date)));
+    $date_parts = getdate($paid_through_date);
+    $paid_through_date = mktime(0, 0, 0, $date_parts['mon'], $date_parts['mday']+10, $date_parts['year']);
+    if ($paid_through_date >= $date)
+      return $this->prReturn(null);
+
+    // Determine if the customer has already been charged a late fee
+    // and, of course, don't charge them if they've already been.
+    $late_charges = $this->lateCharges($id);
+    foreach ($late_charges AS $late) {
+      if (strtotime($late['StatementEntry']['effective_date']) == $date)
+	return $this->prReturn(null);
+    }
+
+    // Build the invoice transaction
+    $invoice = array('Transaction' => array(), 'Entry' => array());
+    // REVISIT <AP>: 20090808
+    //  Keeping Transaction.stamp until the existing facility
+    //  is up to date.  Then we want the stamp to be now()
+    //  (and so can just delete the next line).
+    $invoice['Transaction']['stamp'] = date('Y-m-d', $date);
+    $invoice['Entry'][] =
+      array('effective_date' => date('Y-m-d', $date),
+	    'amount' => 10,
+	    'account_id' => $this->StatementEntry->Account->lateChargeAccountId(),
+	    );
+
+    // Record the invoice and return the result
+    $this->pr(21, compact('invoice'));
+    $result = $this->StatementEntry->Transaction->addInvoice
+      ($invoice, null, $id);
+    return $this->prReturn($result);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: assessMonthlyLateAll
+   *  - Ensures rent has been charged on all open leases
+   */
+
+  function assessMonthlyLateAll($date = null) {
+    $this->prEnter(compact('date'));
+    $leases = $this->find
+      ('all', array('contain' => false,
+		    'conditions' => array('Lease.close_date' => null),
+		    ));
+
+    $ret = array('Lease' => array());
+    foreach ($leases AS $lease) {
+      $result = $this->assessMonthlyLate($lease['Lease']['id'], $date);
+      $ret['Lease'][$lease['Lease']['id']] = $result;
+      if ($result['error'])
+	$ret['error'] = true;
+    }
+    return $this->prReturn($ret + array('error' => false));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * functions: delinquency
+   *  - SQL fragments to determine whether a lease is delinquent
+   */
+
+  function conditionDelinquent($table_name = 'Lease') {
+    if (empty($table_name)) $t = ''; else $t = $table_name . '.';
+    return ("({$t}close_date IS NULL AND" .
+	    " NOW() > DATE_ADD({$t}paid_through_date, INTERVAL 1 DAY))");
+  }
+
+  function delinquentDaysSQL($table_name = 'Lease') {
+    if (empty($table_name)) $t = ''; else $t = $table_name . '.';
+    return ("IF(" . $this->conditionDelinquent($table_name) . "," .
+	    "   DATEDIFF(NOW(), {$t}paid_through_date)-1," .
+	    "   NULL)");
+  }
+
+  function delinquentField($table_name = 'Lease') {
+    return ($this->delinquentDaysSQL($table_name) . " AS 'delinquent'");
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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 current lease count for the customer
+    $this->Customer->updateLeaseCount($customer_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 = true)
+  {
+    $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);
+
+    // Release the security deposit(s)
+    $this->releaseSecurityDeposits($id, $stamp);
+
+    // Close the lease, if so requested
+    if ($close)
+      $this->close($id, $stamp);
+
+    // Update the current lease count for the customer
+    $this->Customer->updateLeaseCount($this->field('customer_id'));
+
+    // 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);
+
+    // Update the current lease count for the customer
+    $this->Customer->updateLeaseCount($this->field('customer_id'));
+
+    return $this->prReturn(true);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: reopen
+   *  - Re-Opens the lease for further action
+   */
+
+  function reopen($id) {
+    $this->prEnter(compact('id'));
+
+    if (!$this->isClosed($id))
+      return $this->prReturn(false);
+
+    // Reset the data
+    $this->create();
+    $this->id = $id;
+
+    // Set the close date
+    $this->data['Lease']['close_date'] = null;
+
+    // Save it!
+    $this->save($this->data, false);
+
+    // Update the current lease count for the customer
+    $this->Customer->updateLeaseCount($this->field('customer_id'));
+
+    return $this->prReturn(true);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: isClosed
+   *  - Checks to see if the lease is closed
+   */
+
+  function isClosed($id) {
+    $this->prEnter(compact('id'));
+
+    $this->recursive = -1;
+    $this->read(null, $id);
+
+    return $this->prReturn(!empty($this->data['Lease']['close_date']));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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);
+
+    // A lease can only be closed if there are no outstanding
+    // security deposits ...
+    if ($this->securityDepositBalance($id) != 0)
+      return $this->prReturn(false);
+
+    // ... and if the account balance is zero.    
+    if ($this->balance($id) != 0)
+      return $this->prReturn(false);
+
+    // Apparently this lease meets all the criteria!
+    return $this->prReturn(true);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: refund
+   *  - Marks any lease balance as payable to the customer.
+   */
+
+  function refund($id, $stamp = null) {
+    $this->prEnter(compact('id'));
+    $balance = $this->balance($id);
+
+    if ($balance >= 0)
+      return $this->prReturn(array('error' => true));
+
+    $balance *= -1;
+
+    // Build a transaction
+    $refund = array('Transaction' => array(), 'Entry' => array());
+    $refund['Transaction']['stamp']   = $stamp;
+    $refund['Transaction']['comment'] = "Lease Refund";
+
+    $refund['Entry'][] =
+      array('amount' => $balance);
+
+    $result = $this->StatementEntry->Transaction->addRefund
+      ($refund, null, $id);
+
+    return $this->prReturn($result);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: update
+   *  - Update any cached or calculated fields
+   */
+  function update($id) {
+    $this->prEnter(compact('id'));
+
+    $this->id = $id;
+    $this->saveField('charge_through_date', $this->rentChargeThrough($id));
+    $this->saveField('paid_through_date', $this->rentPaidThrough($id));
+
+    $moveout = $this->field('moveout_date');
+    if (empty($moveout))
+      $this->Unit->update($this->field('unit_id'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: balance
+   *  - Returns the balance of money owed on the lease
+   */
+
+  function balance($id) {
+    $this->prEnter(compact('id'));
+    $stats = $this->stats($id);
+    return $this->prReturn($stats['balance']);
   }
 
 
@@ -142,16 +881,19 @@ class Lease extends AppModel {
    *  - Returns summary data from the requested lease.
    */
 
-  function stats($id = null) {
+  function stats($id = null, $query = null) {
+    $this->prEnter(compact('id', 'query'));
     if (!$id)
-      return null;
+      return $this->prReturn(null);
 
-    $stats = $this->Account->stats($this->Account->accountReceivableAccountID(), true,
-				   array('LedgerEntry.lease_id' => $id));
-
-    // Pull to the top level and return
-    $stats = $stats['Ledger'];
-    return $stats;
+    $find_stats = $this->StatementEntry->find
+      ('first', array
+       ('contain' => false,
+	'fields' => $this->StatementEntry->chargeDisbursementFields(true),
+	'conditions' => array('StatementEntry.lease_id' => $id),
+	));
+    $find_stats = $find_stats[0];
+    return $this->prReturn($find_stats);
   }
 
 }

site/models/ledger.php

@@ -1,109 +1,133 @@
 <?php
 class Ledger extends AppModel {
 
-  var $name = 'Ledger';
-  var $validate = array(
-    'id' => array('numeric'),
-    'name' => array('notempty'),
-  );
-
   var $belongsTo = array(
     'Account',
+    'PriorLedger' => array('className' => 'Ledger'),
+    'CloseTransaction' => array('className' => 'Transaction'),
   );
 
   var $hasMany = array(
-    'LedgerEntry' => array(
-      'foreignKey' => false,
-
-      // conditions will be used when JOINing tables
-      // (such as find with LinkableBehavior)
-      'conditions' => array('OR' =>
-			    array('LedgerEntry.debit_ledger_id = %{MODEL_ALIAS}.id',
-				  'LedgerEntry.credit_ledger_id = %{MODEL_ALIAS}.id')),
-
-      // finderQuery will be used when tables are put
-      // together across several querys, not with JOIN.
-      // (such as find with ContainableBehavior)
-      'finderQuery' => 'SELECT `LedgerEntry`.*
-                         FROM pmgr_ledger_entries AS `LedgerEntry`
-                         WHERE LedgerEntry.debit_ledger_id = ({$__cakeID__$})
-                            OR LedgerEntry.credit_ledger_id = ({$__cakeID__$})',
-
-      'counterQuery' => ''
-    ),
-    'DebitLedgerEntry' => array(
-      'className' => 'LedgerEntry',
-      'foreignKey' => 'debit_ledger_id',
-      'dependent' => false,
-    ),
-    'CreditLedgerEntry' => array(
-      'className' => 'LedgerEntry',
-      'foreignKey' => 'credit_ledger_id',
-      'dependent' => false,
-    ),
+    'Transaction',
+    'LedgerEntry',
   );
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: findLedgerEntries
-   *  - Returns an array of ledger entries that belong to a given
-   *    ledger. There is extra work done... see the LedgerEntry model.
+   * function: accountID
+   *  - Returns the account ID for the given ledger
    */
-  function findLedgerEntries($id, $account_type = null, $cond = null, $link = null) {
-/*     pr(array('function' => 'Ledger::findLedgerEntries', */
-/* 	     'args' => compact('id', 'account_type', 'cond', 'link'), */
-/* 	     )); */
+  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'];
+  }
 
-    if (!isset($account_type)) {
-      $ledger = $this->find('first', array
-			    ('contain' => array
-			     ('Account' => array
-			      ('fields' => array('type'),
-			       ),
-			      ),
-			     'fields' => array(),
-			     'conditions' => array(array('Ledger.id' => $id)),
-			     ));
-      $account_type = $ledger['Account']['type'];
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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']);
     }
 
-    // If the requested entries are limited by date, we must calculate
-    // a balance forward, or the resulting balance will be thrown off.
-    //
-    // REVISIT <AP>: This obviously is more general than date.
-    //               As such, it will not work (or, only work if the
-    //               condition only manages to exclude the first parts
-    //               of the ledger, nothing in the middle or at the
-    //               end. For now, I'll just create an 'other' entry,
-    //               not necessarily a balance forward.
+    // Perform the close
+    $result = $this->Transaction->addClose(array('Transaction' => array(),
+						 'Ledger' => $entries));
+    $ret['Transaction'] = $result;
+    if ($result['error'])
+      return array('error' => true) + $ret;
 
-    $bf = array();
-    if (0 && isset($cond)) {
-      //$date = '<NOT IMPLEMENTED>';
-      $stats = $this->stats($id, array('NOT' => array($cond)));
-      $bf = array(array(array('debit' => $stats['debits'],
-			      'credit' => $stats['credits'],
-			      'balance' => $stats['balance']),
-
-			'LedgerEntry' => array('id' => null,
-					       //'comment' => "Balance Forward from $date"),
-					       'comment' => "-- SUMMARY OF EXCLUDED ENTRIES --"),
-
-			'Transaction' => array('id' => null,
-					       //'stamp' => $date,
-					       'stamp' => null,
-					       'comment' => null),
-			));
+    return $ret + array('error' => false);
     }
 
-    $entries = $this->LedgerEntry->findInLedgerContext($id, $account_type, $cond, $link);
-/*     pr(array('function' => 'Ledger::findLedgerEntries', */
-/* 	     'args' => compact('id', 'account_type', 'cond', 'link'), */
-/* 	     'vars' => compact('ledger'), */
-/* 	     'return' => compact('entries'), */
-/* 	     )); */
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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;
   }
 
@@ -114,40 +138,41 @@ class Ledger extends AppModel {
    * function: stats
    *  - Returns summary data from the requested ledger.
    */
-  function stats($id, $cond = null) {
-    if (!isset($cond))
-      $cond = array();
-    $cond[] = array('Ledger.id' => $id);
+  function stats($id, $query = null) {
+    if (!$id)
+      return null;
 
-    $stats = $this->find
-      ('first', array
-       ('link' =>
-	array(// Models
-	      'Account' => array('fields' => array()),
-	      //'LedgerEntry' => array('fields' => array()),
-	      'LedgerEntry' =>
-	      array('fields' => array(),
-		    'Transaction' => array('fields' => array('stamp')),
-		    ),
-	      ),
-	'fields' =>
-	array("SUM(IF(LedgerEntry.debit_ledger_id  = Ledger.id,
-                      LedgerEntry.amount, NULL)) AS debits",
-	      "SUM(IF(LedgerEntry.credit_ledger_id = Ledger.id,
-                      LedgerEntry.amount, NULL)) AS credits",
-	      "SUM(IF(Account.type IN ('ASSET', 'EXPENSE'),
-                      IF(LedgerEntry.debit_ledger_id  = Ledger.id, 1, -1),
-                      IF(LedgerEntry.credit_ledger_id = Ledger.id, 1, -1)
-                      ) * IF(LedgerEntry.amount, LedgerEntry.amount, 0)
-                   ) AS balance",
-	      "COUNT(LedgerEntry.id) AS entries"),
-	'conditions' => $cond,
-	'group' => 'Ledger.id',
-	));
+    $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).
-    return $stats[0];
+    $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

@@ -1,208 +1,159 @@
 <?php
 class LedgerEntry extends AppModel {
 
-	var $name = 'LedgerEntry';
-	var $validate = array(
-		'id' => array('numeric'),
-		'transaction_id' => array('numeric'),
-		'amount' => array('money')
+	var $belongsTo = array(
+		'Transaction',
+		'Account',
+		'Ledger',
 	);
 
-	var $belongsTo = array(
-		'MonetarySource',
-		'Transaction',
-		'Customer',
-		'Lease',
+	var $hasOne = array(
+		'Tender' => array(
+			'dependent' => true,
+		),
+		'DebitDoubleEntry' => array(
+			'className' => 'DoubleEntry',
+		        'foreignKey' => 'debit_entry_id',
+			'dependent' => true,
+		),
+		'CreditDoubleEntry' => array(
+			'className' => 'DoubleEntry',
+		        'foreignKey' => 'credit_entry_id',
+			'dependent' => true,
+		),
+		'DoubleEntry' => array(
+		        'foreignKey' => false,
+		),
+	);
 
-		'DebitLedger' => array(
-			'className' => 'Ledger',
-			'foreignKey' => 'debit_ledger_id',
-		),
-		'CreditLedger' => array(
-			'className' => 'Ledger',
-			'foreignKey' => 'credit_ledger_id',
-		),
+	var $hasMany = array(
 	);
 
 	var $hasAndBelongsToMany = array(
-		'DebitReconciliationLedgerEntry' => array(
+		// The Debit half of the double entry matching THIS Credit (if it is one)
+		'DebitEntry' => array(
 			'className' => 'LedgerEntry',
-			'joinTable' => 'reconciliations',
-			'foreignKey' => 'credit_ledger_entry_id',
-			'associationForeignKey' => 'debit_ledger_entry_id',
+			'joinTable' => 'double_entries',
+			'linkalias' => 'DDE',
+			'foreignKey' => 'credit_entry_id',
+			'associationForeignKey' => 'debit_entry_id',
 		),
-		'CreditReconciliationLedgerEntry' => array(
+
+		// The Credit half of the double entry matching THIS Debit (if it is one)
+		'CreditEntry' => array(
 			'className' => 'LedgerEntry',
-			'joinTable' => 'reconciliations',
-			'foreignKey' => 'debit_ledger_entry_id',
-			'associationForeignKey' => 'credit_ledger_entry_id',
+			'joinTable' => 'double_entries',
+			'linkalias' => 'CDE',
+			'foreignKey' => 'debit_entry_id',
+			'associationForeignKey' => 'credit_entry_id',
 		),
 	);
 
-  /**************************************************************************
-   **************************************************************************
-   **************************************************************************
-   * function: conditionEntryAsCreditOrDebit
-   *  - returns the condition necessary to match a set of
-   *    Ledgers to all related LedgerEntries
-   */
-  function conditionEntryAsCreditOrDebit($ledger_ids) {
-    return array('OR' =>
-		 array(array('debit_ledger_id'  => $ledger_ids),
-		       array('credit_ledger_id' => $ledger_ids)));
-  }
-
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: ledgerContext query helpers
-   *  - Returns parameters necessary to generate a query which
-   *    puts ledger entries into the context of a ledger.  Since
-   *    debit/credit depends on the account type, it is required
-   *    as an argument for each function to avoid having to
-   *    query the ledger/account to find it out.
+   * function: 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 ledgerContextFields($ledger_id = null, $account_type = null) {
-    $fields = array('id', 'name', 'comment', 'amount');
 
-    if (isset($ledger_id)) {
-      $fields[] = ("IF(LedgerEntry.debit_ledger_id = $ledger_id," .
-		   "   LedgerEntry.amount, NULL) AS debit");
-      $fields[] = ("IF(LedgerEntry.credit_ledger_id = $ledger_id," .
-		   "   LedgerEntry.amount, NULL) AS credit");
+  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' : ''),
 
-      if (isset($account_type)) {
-	if (in_array($account_type, array('ASSET', 'EXPENSE')))
-	  $ledger_type = 'debit';
-	else
-	  $ledger_type = 'credit';
+       ($sum ? 'SUM(' : '') .
+       "IF({$entry_name}.crdr = 'CREDIT'," .
+       "   {$entry_name}.amount, NULL)" .
+       ($sum ? ')' : '') . ' AS credit' . ($sum ? 's' : ''),
+       );
 
-	$fields[] = ("(IF(LedgerEntry.{$ledger_type}_ledger_id = $ledger_id," .
-		     "    1, -1) * LedgerEntry.amount) AS balance");
-      }
-    }
+    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';
 
-    return $fields;
-  }
-
-  function ledgerContextFields2($ledger_id = null, $account_id = null, $account_type = null) {
-    $fields = array('id', 'name', 'comment', 'amount');
-
-    if (isset($ledger_id)) {
-      $fields[] = ("IF(LedgerEntry.debit_ledger_id = $ledger_id," .
-		   "   SUM(LedgerEntry.amount), NULL) AS debit");
-      $fields[] = ("IF(LedgerEntry.credit_ledger_id = $ledger_id," .
-		   "   SUM(LedgerEntry.amount), NULL) AS credit");
-
-      if (isset($account_id) || isset($account_type)) {
-	$Account = new Account();
-	$account_ftype = $Account->fundamentalType($account_id ? $account_id : $account_type);
-	$fields[] = ("(IF(LedgerEntry.{$account_ftype}_ledger_id = $ledger_id," .
-		     "    1, -1) * SUM(LedgerEntry.amount)) AS balance");
-      }
-    }
-    elseif (isset($account_id)) {
-      $fields[] = ("IF(DebitLedger.account_id = $account_id," .
-		   "   SUM(LedgerEntry.amount), NULL) AS debit");
-      $fields[] = ("IF(CreditLedger.account_id = $account_id," .
-		   "   SUM(LedgerEntry.amount), NULL) AS credit");
-
-      $Account = new Account();
-      $account_ftype = ucfirst($Account->fundamentalType($account_id));
-      $fields[] = ("(IF({$account_ftype}Ledger.account_id = $account_id," .
-		   "    1, -1) * SUM(LedgerEntry.amount)) AS balance");
-    }
+    if ($sum)
+      $fields[] = "COUNT({$entry_name}.id) AS entries";
 
     return $fields;
   }
 
 
-  function ledgerContextConditions($ledger_id, $account_type) {
-    if (isset($ledger_id)) {
-      return array
-	('OR' =>
-	 array(array('LedgerEntry.debit_ledger_id' => $ledger_id),
-	       array('LedgerEntry.credit_ledger_id' => $ledger_id)),
-	 );
-    }
-
-    return array();
-  }      
-
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: findInLedgerContext
-   *  - Returns an array of ledger entries that belong to a given ledger.
-   *    There is extra logic to also figure out whether the ledger_entry
-   *    amount is either a credit, or a debit, depending on how it was
-   *    written into the ledger, as well as whether the amount increases or
-   *    decreases the balance depending on the particular account type of
-   *    the ledger.
+   * function: verifyLedgerEntry
+   *  - Verifies consistenty of new ledger entry data
+   *    (not in a pre-existing ledger entry)
    */
-  function findInLedgerContext($ledger_id, $account_type, $cond = null, $link = null) {
-    if (!isset($link))
-      $link = array('Transaction');
+  function verifyLedgerEntry($entry, $tender = null) {
+/*     pr(array("LedgerEntry::verifyLedgerEntry()" */
+/* 	     => compact('entry', 'tender'))); */
 
-    if (!isset($cond))
-      $cond = array();
+    if (empty($entry['account_id']) ||
+	empty($entry['crdr']) ||
+	empty($entry['amount'])
+	) {
+/*       pr(array("LedgerEntry::verifyLedgerEntry()" */
+/* 	       => "Entry verification failed")); */
+      return false;
+    }
 
-    $fields = $this->ledgerContextFields($ledger_id, $account_type);
-    $cond[] = $this->ledgerContextConditions($ledger_id, $account_type);
-    $order  = array('Transaction.stamp');
+    if (isset($tender) && !$this->Tender->verifyTender($tender)) {
+/*       pr(array("LedgerEntry::verifyLedgerEntry()" */
+/* 	       => "Tender verification failed")); */
+      return false;
+    }
 
-    $entries = $this->find
-      ('all',
-       array('link'       => $link,
-	     'fields'     => $fields,
-	     'conditions' => $cond,
-	     'order'      => $order,
-	     ));
-
-    return $entries;
+    return true;
   }
 
 
   /**************************************************************************
    **************************************************************************
    **************************************************************************
-   * function: findReconciledLedgerEntries
-   *  - Returns ledger entries that are reconciled to the given entry.
-   *    (such as payments towards a charge).
+   * function: addLedgerEntry
+   *  - Inserts new Ledger Entry into the database
    */
+  function addLedgerEntry($entry, $tender = null) {
+    //$this->prFunctionLevel(16);
+    $this->prEnter(compact('entry', 'tender'));
 
-  function findReconciledLedgerEntries($id = null, $fundamental_type = null) {
-    foreach (($fundamental_type
-	      ? array($fundamental_type)
-	      : array('debit', 'credit')) AS $fund) {
-      $ucfund = ucfirst($fund);
-      $reconciled[$fund]['entry'] = $this->find
-	('all', array
-	 ('link' => array
-	  ("ReconciliationLedgerEntry" => array
-	   ('class' => "{$ucfund}ReconciliationLedgerEntry",
-	    'fields' => array
-	    ('id',
-	     "COALESCE(SUM(Reconciliation.amount),0) AS 'reconciled'",
-	     "LedgerEntry.amount - COALESCE(SUM(Reconciliation.amount),0) AS 'balance'",
-	     ),
-	    ),
-	   ),
-	  'group' => ("ReconciliationLedgerEntry.id"),
-	  'conditions' => array('LedgerEntry.id' => $id),
-	  'fields' => array(),
-	  ));
-      //pr($reconciled);
-      $balance = 0;
-      foreach ($reconciled[$fund]['entry'] AS &$entry) {
-	$entry = array_merge($entry["ReconciliationLedgerEntry"], $entry[0]);
-	$balance += $entry['balance'];
-      }
-      $reconciled[$fund]['balance'] = $balance;
+    $ret = array('data' => $entry);
+    if (!$this->verifyLedgerEntry($entry, $tender))
+      return $this->prReturn(array('error' => true) + $ret);
+
+    if (empty($entry['ledger_id']))
+      $entry['ledger_id'] = 
+	$this->Account->currentLedgerID($entry['account_id']);
+
+    $this->create();
+    if (!$this->save($entry))
+      return $this->prReturn(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 $this->prReturn(array('error' => true) + $ret);
     }
 
-    return $reconciled;
+    return $this->prReturn($ret + array('error' => false));
   }
 
 
@@ -212,31 +163,15 @@ class LedgerEntry extends AppModel {
    * function: stats
    *  - Returns summary data from the requested ledger entry
    */
-  function stats($id) {
+  function stats($id = null, $query = null, $set = null) {
+    $this->queryInit($query);
 
-    $query = array
-      (
-       'fields' => array("SUM(Reconciliation.amount) AS 'reconciled'"),
-
-       'conditions' => array(isset($cond) ? $cond : array(),
-			     array('LedgerEntry.id' => $id)),
-
-       'group' => 'LedgerEntry.id',
-       );
-
-    // Get the applied amounts on the debit side
-    $query['link'] =
-      array('DebitReconciliationLedgerEntry' => array('alias' => 'DRLE', 'DRLETransaction' => array('class' => 'Transaction')));
-    $tmpstats = $this->find('first', $query);
-    $stats['debit_amount_reconciled'] = $tmpstats[0]['reconciled'];
-
-    // Get the applied amounts on the credit side
-    $query['link'] =
-      array('CreditReconciliationLedgerEntry' => array('alias' => 'CRLE', 'CRLETransaction' => array('class' => 'Transaction')));
-    $tmpstats = $this->find('first', $query);
-    $stats['credit_amount_reconciled'] = $tmpstats[0]['reconciled'];
-
-    return $stats;
+    // REVISIT <AP>: 20090816
+    //  This function appeared to be dramatically broken,
+    //  a throwback to an earlier time.  I deleted its
+    //  contents and added this error to ensure it does
+    //  not get used.
+    $this->INTERNAL_ERROR('This function should not be used');
   }
 
 }

site/models/lock.php

@@ -0,0 +1,110 @@
+<?php
+class Lock extends AppModel {
+
+	var $name = 'Lock';
+	var $validate = array(
+		'id' => array('numeric'),
+		'name' => array('notempty'),
+		'key' => array('notempty')
+	);
+
+	var $hasMany = array(
+		'LocksUnits'
+	);
+
+	var $hasAndBelongsToMany = array(
+		'Unit'
+	);
+
+	var $default_log_level = array('log' => 30, 'show' => 15);
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: saveLock
+   *  - save data about a new or existing lock
+   */
+
+  function saveLock($data) {
+    $this->prEnter(compact('data'));
+    $id = $data['Lock']['id'];
+
+    if ($id) {
+      $this->id = $id;
+
+      // Save the old key
+      $oldkey = $this->field('key');
+      $this->pr(5, compact('oldkey'));
+
+      if ($this->field('key') != $data['Lock']['key']) {
+	$data['Lock']['key_last'] = $this->field('key');
+	$data['Lock']['key_ts'] = date('Y-m-d G:i:s');
+      }
+
+      /* // Find the number of outstanding locks in use */
+      /* $locks = $this->find('first', */
+      /* 			   array('link' => array('Unit' => array('fields' => array('Unit.id'))), */
+      /* 				 'fields' => 'SUM(Unit.id) AS inuse', */
+      /* 				 'conditions' => array('Lock.id' => $id), */
+      /* 				 )); */
+      /* $this->pr(5, compact('locks')); */
+
+      /* // Can't reduce the locks if there are all in use */
+      /* if ($locks[0]['inuse'] > $data['Lock']['qty']) */
+      /* 	return $this->prReturn(false); */
+    }
+    else {
+      // Brand new lock
+    }
+
+    if (!$data['Lock']['qty'])
+      $data['Lock']['qty'] = 1;
+
+    // Everything looks good... save it!
+    return $this->prReturn($this->save($data, false));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: destroy
+   *  - destroys a lock
+   */
+
+  function destroy($id) {
+    $this->prEnter(compact('id'));
+
+    // Can't delete a lock that's in use... check.
+    $this->id = $id;
+    $lock = $this->find
+      ('first', array
+       ('contain' => array('Unit'),
+	));
+
+    // If it's in use, bail with error
+    $this->pr(1, $lock);
+    if (isset($lock['Unit']) && count($lock['Unit']) > 0)
+      return $this->prReturn(false);
+
+    // Otherwise, attempt to delete the lock from the database
+    return $this->prReturn($this->delete());
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: lockList
+   *  - list of all locks in the system
+   */
+
+  function lockList() {
+    return $this->find('list',
+		       array('order' =>
+			     array('name'),
+			     ));
+  }
+
+}

site/models/locks_unit.php

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

site/models/maps_unit.php

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

site/models/membership.php

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

site/models/monetary_source.php

@@ -1,20 +0,0 @@
-<?php
-class MonetarySource extends AppModel {
-
-	var $name = 'MonetarySource';
-	var $validate = array(
-		'id' => array('numeric'),
-		'name' => array('notempty'),
-		'tillable' => array('boolean')
-	);
-
-	var $belongsTo = array(
-		'MonetaryType',
-	);
-
-	var $hasMany = array(
-		'LedgerEntry',
-	);
-
-}
-?>

site/models/monetary_type.php

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

site/models/option.php

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

site/models/option_value.php

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

site/models/permission.php

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

site/models/permission_value.php

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

site/models/site.php

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

site/models/site_option.php

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

site/models/site_permission.php

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

site/models/statement_entry.php

@@ -0,0 +1,784 @@
+<?php
+class StatementEntry extends AppModel {
+
+	var $belongsTo = array(
+		'Transaction',
+		'Customer',
+		'Lease',
+		'Account',
+
+		// The charge to which this disbursement applies (if it is one)
+		'ChargeEntry' => array(
+			'className' => 'StatementEntry',
+		),
+	);
+
+	var $hasMany = array(
+		// The disbursements that apply to this charge (if it is one)
+		'DisbursementEntry' => array(
+			'className' => 'StatementEntry',
+			'foreignKey' => 'charge_entry_id',
+			'dependent' => true,
+		),
+
+	);
+
+	//var $default_log_level = array('log' => 30, 'show' => 15);
+	var $max_log_level = 19;
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: debit/creditTypes
+   */
+
+  function debitTypes() {
+    return array('CHARGE', 'PAYMENT', 'REFUND');
+  }
+
+  function creditTypes() {
+    return array('DISBURSEMENT', 'WAIVER', 'REVERSAL', 'WRITEOFF', 'SURPLUS');
+  }
+
+  function voidTypes() {
+    return array('VOID');
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: chargeDisbursementFields
+   */
+
+  function chargeDisbursementFields($sum = false, $entry_name = 'StatementEntry') {
+    $debits  = $this->debitTypes();
+    $credits = $this->creditTypes();
+    $voids   = $this->voidTypes();
+
+    foreach ($debits AS &$enum)
+      $enum = "'" . $enum . "'";
+    foreach ($credits AS &$enum)
+      $enum = "'" . $enum . "'";
+    foreach ($voids AS &$enum)
+      $enum = "'" . $enum . "'";
+
+    $debit_set  = implode(", ", $debits);
+    $credit_set = implode(", ", $credits);
+    $void_set   = implode(", ", $voids);
+
+    $fields = array
+      (
+       ($sum ? 'SUM(' : '') .
+       "IF({$entry_name}.type IN ({$debit_set})," .
+       "   {$entry_name}.amount, NULL)" .
+       ($sum ? ')' : '') . ' AS charge' . ($sum ? 's' : ''),
+
+       ($sum ? 'SUM(' : '') .
+       "IF({$entry_name}.type IN({$credit_set})," .
+       "   {$entry_name}.amount, NULL)" .
+       ($sum ? ')' : '') . ' AS disbursement' . ($sum ? 's' : ''),
+
+       ($sum ? 'SUM(' : '') .
+       "IF({$entry_name}.type IN ({$debit_set}), 1," .
+       "   IF({$entry_name}.type IN ({$credit_set}), -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(10);
+    $this->prEnter(compact('entry'));
+
+    if (empty($entry['type']) ||
+	//empty($entry['effective_date']) ||
+	empty($entry['account_id']) ||
+	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('data' => $entry);
+    if (!$this->verifyStatementEntry($entry))
+      return $this->prReturn(array('error' => true, 'verify_data' => $entry) + $ret);
+
+    $this->create();
+    if (!$this->save($entry))
+      return $this->prReturn(array('error' => true, 'save_data' => $entry) + $ret);
+
+    $ret['statement_entry_id'] = $this->id;
+    return $this->prReturn($ret + array('error' => false));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: waive
+   *  - Waives the charge balance
+   *
+   */
+  function waive($id, $stamp = null) {
+    $this->prEnter(compact('id', 'stamp'));
+
+    // Get the basic information about the entry to be waived.
+    $this->recursive = -1;
+    $charge = $this->read(null, $id);
+    $charge = $charge['StatementEntry'];
+
+    if ($charge['type'] !== 'CHARGE')
+      $this->INTERNAL_ERROR("Waiver item is not CHARGE.");
+
+    // Query the stats to get the remaining balance
+    $stats = $this->stats($id);
+
+    // Build a transaction
+    $waiver = array('Transaction' => array(), 'Entry' => array());
+    $waiver['Transaction']['stamp']   = $stamp;
+    $waiver['Transaction']['comment'] = "Charge Waiver";
+
+    // Add the charge waiver
+    $waiver['Entry'][] =
+      array('amount'      => $stats['Charge']['balance'],
+	    'comment'     => null,
+	    );
+
+    // Record the waiver transaction
+    return $this->prReturn($this->Transaction->addWaiver
+			   ($waiver, $id, $charge['customer_id'], $charge['lease_id']));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: reversable
+   *  - Returns true if the charge can be reversed; false otherwise
+   */
+  function reversable($id) {
+    $this->prEnter(compact('id'));
+
+    if (empty($id))
+      return $this->prReturn(false);
+
+    // Verify the item is an actual charge
+    $this->id = $id;
+    $charge_type = $this->field('type');
+    if ($charge_type !== 'CHARGE')
+      return $this->prReturn(false);
+
+    // Determine anything reconciled against the charge
+    $reverse_transaction_id = $this->field('reverse_transaction_id');
+    if (!empty($reverse_transaction_id))
+      return $this->prReturn(false);
+
+    return $this->prReturn(true);
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: reverse
+   *  - Reverses the charges
+   */
+  function reverse($id, $stamp = null, $comment) {
+    $this->prEnter(compact('id', 'stamp'));
+
+    // Verify the item can be reversed
+    if (!$this->reversable($id))
+      $this->INTERNAL_ERROR("Item is not reversable.");
+
+    // Get the basic information about this charge
+    $charge = $this->find('first', array('contain' => true));
+    //$charge = $charge['StatementEntry'];
+
+    // Query the stats to get the remaining balance
+    $stats = $this->stats($id);
+    $charge['paid'] = $stats['Charge']['disbursement'];
+
+    // Record the reversal transaction
+    $result = $this->Transaction->addReversal
+      ($charge, $stamp, $comment ? $comment : 'Charge Reversal');
+
+    if (empty($result['error'])) {
+      // Mark the charge as reversed
+      $this->id = $id;
+      $this->saveField('reverse_transaction_id', $result['transaction_id']);
+    }
+
+    return $this->prReturn($result);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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 (in_array($set, $this->debitTypes()))
+      $query['link']['DisbursementEntry'] = array('fields' => array("SUM(DisbursementEntry.amount) AS reconciled"));
+    elseif (in_array($set, $this->creditTypes()))
+      $query['link']['ChargeEntry'] = array('fields' => array("SUM(ChargeEntry.amount) AS reconciled"));
+    else
+      die("INVALID RECONCILE SET");
+
+    $query['conditions'][] = array('StatementEntry.type' => $set);
+    $query['group'] = 'StatementEntry.id';
+
+    return $query;
+  }
+
+  function reconciledSet($set, $query = null, $unrec = false, $if_rec_include_partial = false) {
+    //$this->prFunctionLevel(array('log' => 16, 'show' => 10));
+    $this->prEnter(compact('set', 'query', 'unrec', 'if_rec_include_partial'));
+    $lquery = $this->reconciledSetQuery($set, $query);
+    $result = $this->find('all', $lquery);
+
+    $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 disbursement; 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 disbursements 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 (in_array($this->data['StatementEntry']['type'], $this->debitTypes())) {
+      $query['link']['DisbursementEntry'] = array();
+      $query['conditions'][] = array('DisbursementEntry.id !=' => null);
+    }
+    if (in_array($this->data['StatementEntry']['type'], $this->creditTypes())) {
+      $query['link']['ChargeEntry'] = array();
+      $query['conditions'][] = array('ChargeEntry.id !=' => null);
+    }
+
+    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: outstandingDebits
+   *  - Determines all debit types that have not yet been resolved.
+   *    The name is a bit dumb, but it means any statement entry type
+   *    that a positive customer balance could be used to offset. In
+   *    other words, entries that are still in need of matching
+   *    disbursements.  Most notably, this means charges but could
+   *    also mean things like refunds as well.
+   */
+
+  function outstandingDebits($query = null, $customer_id = null,
+			     $lease_id = null, $debit_types = null)
+  {
+    $this->prEnter(compact('query', 'lease_id',
+			   'customer_id', 'charge_ids',
+			   'debit_types'));
+    $this->queryInit($query);
+
+    if (empty($debit_types))
+      $debit_types = $this->debitTypes();
+
+    if (!empty($customer_id))
+      $query['conditions'][] = array('StatementEntry.customer_id' => $customer_id);
+
+    if (!empty($lease_id))
+      $query['conditions'][] = array('StatementEntry.lease_id' => $lease_id);
+
+    /* if (isset($charge_ids)) { */
+    /*   // REVISIT <AP> 20100330: */
+    /*   // Not using $query here, as this code was extracted from its */
+    /*   // original location in assignCredits, and so I'm keeping the */
+    /*   // logic consistent.  It does seem, however, that we shouldn't */
+    /*   // be ignoring $query if passed in.  I'm sure this won't be */
+    /*   // looked at until someone _does_ pass $query in (and it break), */
+    /*   // so hopefully at that time, we can understand what needs to */
+    /*   // happen in that case (requirements are not clear at present). */
+    /*   $lquery = array('contain' => false, */
+    /* 		      'conditions' => array('StatementEntry.id' => $charge_ids)); */
+    /* } else { */
+    /*   $lquery = $query; */
+    /*   // If we're working with a specific lease, then limit charges to it */
+    /*   if (!empty($lease_id)) */
+    /* 	$lquery['conditions'][] = array('StatementEntry.lease_id' => $lease_id); */
+    /* } */
+
+    if (empty($query['order']))
+      $query['order'] = 'StatementEntry.effective_date ASC';
+
+    $debits = array();
+    foreach ($debit_types AS $dtype) {
+      $rset = $this->reconciledSet($dtype, $query, true);
+      $entries = $rset['entries'];
+      $debits = array_merge($debits, $entries);
+      $this->pr(18, compact('dtype', 'entries'), "Outstanding Debit Entries");
+    }
+
+    return $this->prReturn($debits);
+  }
+
+  function outstandingCharges($query = null, $customer_id = null, $lease_id = null) {
+    return $this->outstandingDebits($query, $customer_id, $lease_id, array('CHARGE'));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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 disbursements should be applied.
+   *
+   */
+  function assignCredits($query = null, $receipt_id = null,
+			 $charge_ids = null, $disbursement_type = null,
+			 $customer_id = null, $lease_id = null)
+  {
+    //$this->prFunctionLevel(25);
+    $this->prEnter(compact('query', 'receipt_id',
+			   'charge_ids', 'disbursement_type',
+			   'customer_id', 'lease_id'));
+    $this->queryInit($query);
+
+    if (empty($disbursement_type))
+      $disbursement_type = 'DISBURSEMENT';
+
+    $ret = array();
+
+    // First, find all known credits, unless this call is to make
+    // credit adjustments to a specific charge
+    if (empty($receipt_id)) {
+
+      if (!empty($charge_ids))
+	$this->INTERNAL_ERROR("Charge IDs, yet no corresponding receipt");
+
+      $lquery = $query;
+      if (!empty($customer_id))
+	$lquery['conditions'][] = array('StatementEntry.customer_id' => $customer_id);
+
+      $lquery['conditions'][] = array('StatementEntry.type' => 'SURPLUS');
+      // REVISIT <AP>: 20090804
+      //  We need to ensure that we're using surplus credits ONLY from either
+      //  the given lease, or those that do not apply to any specific lease.
+      //  However, by doing this, it forces any lease surplus amounts to
+      //  remain frozen with that lease until either there is a lease charge,
+      //  we refund the money, or we "promote" that surplus to the customer
+      //  level and out of the leases direct control.
+      //  That seems like a pain.  Perhaps we should allow any customer
+      //  surplus to be used on any customer charge.
+      $lquery['conditions'][] =
+	array('OR' =>
+	      array(array('StatementEntry.lease_id' => null),
+		    (!empty($lease_id)
+		     ? array('StatementEntry.lease_id' => $lease_id)
+		     : array()),
+		    ));
+      $lquery['order'][] = 'StatementEntry.effective_date ASC';
+      $credits = $this->find('all', $lquery);
+      $this->pr(18, compact('credits'),
+		"Credits Established");
+    }
+    else {
+      // Establish credit from the (newly added) receipt
+      $lquery =
+	array('link' =>
+	      array('StatementEntry',
+		    'LedgerEntry' =>
+		    array('conditions' =>
+			  array('LedgerEntry.account_id <> Transaction.account_id')
+			  ),
+		    ),
+	      'conditions' => array('Transaction.id' => $receipt_id),
+	      'fields' => array('Transaction.id', 'Transaction.stamp', 'Transaction.amount'),
+	      );
+      $receipt_credit = $this->Transaction->find('first', $lquery);
+      if (!$receipt_credit)
+	$this->INTERNAL_ERROR("Unable to locate receipt.");
+
+      $stats = $this->Transaction->stats($receipt_id);
+      $receipt_credit['balance'] = $stats['undisbursed'];
+
+      $receipt_credit['receipt'] = true;
+      $credits = array($receipt_credit);
+      $this->pr(18, compact('credits'),
+		"Receipt Credit Added");
+    }
+
+    // Now find all unpaid charges, using either the specific set
+    // of charges given, or all outstanding charges based on the
+    // query, customer and/or lease
+    if (!empty($charge_ids)) {
+      $this->INTERNAL_ERROR("PERHAPS IMPLEMENTED - THOUGH NEVER TESTED");
+      $lquery = $query;
+      $lquery['conditions'][] = array('StatementEntry.id' => $charge_ids);
+      $charges = $this->reconciledSet('CHARGE', $query, true);
+    } else {
+      $charges = $this->outstandingDebits($query, $customer_id, $lease_id);
+    }
+
+    // Work through all unpaid charges, applying disbursements as we go
+    foreach ($charges AS $charge) {
+      $this->pr(20, compact('charge'),
+		'Process Charge');
+
+      $charge['balance'] = $charge['StatementEntry']['balance'];
+
+      // Use explicit credits before using the new receipt credit
+      foreach ($credits AS &$credit) {
+	if (empty($charge['balance']))
+	  break;
+	if ($charge['balance'] < 0)
+	  $this->INTERNAL_ERROR("Negative Charge Balance");
+
+	if (!isset($credit['balance']))
+	  $credit['balance'] = $credit['StatementEntry']['amount'];
+
+	if (empty($credit['balance']))
+	  continue;
+	if ($credit['balance'] < 0)
+	  $this->INTERNAL_ERROR("Negative Credit Balance");
+
+	$this->pr(20, compact('charge'),
+		  'Attempt Charge Reconciliation');
+
+	if (empty($credit['receipt']))
+	  $disbursement_account_id = $credit['StatementEntry']['account_id'];
+	else
+	  $disbursement_account_id = $credit['LedgerEntry']['account_id'];
+
+	// REVISIT <AP>: 20090811
+	//  Need to come up with a better strategy for handling
+	//  concessions.  For now, just restricting concessions
+	//  to apply only towards rent will resolve the most
+	//  predominant (or only) needed usage case.
+	if ($disbursement_account_id == $this->Account->concessionAccountID() &&
+	    $charge['StatementEntry']['account_id'] != $this->Account->rentAccountID())
+	  continue;
+
+	// Set the disbursement amount to the maximum amount
+	// possible without exceeding the charge or credit balance
+	$disbursement_amount = round(min($charge['balance'], $credit['balance']), 2);
+	if (!isset($credit['applied']))
+	  $credit['applied'] = 0;
+
+	$credit['applied'] = round($credit['applied'] + $disbursement_amount, 2);
+	$credit['balance'] = round($credit['balance'] - $disbursement_amount, 2);
+
+	$this->pr(20, compact('credit', 'disbursement_amount'),
+		  ($credit['balance'] > 0 ? 'Utilized' : 'Exhausted') .
+		  (empty($credit['receipt']) ? ' Credit' : ' Receipt'));
+
+	if (strtotime($charge['StatementEntry']['effective_date']) >
+	    strtotime($credit['StatementEntry']['effective_date']))
+	  $disbursement_edate = $charge['StatementEntry']['effective_date'];
+	else
+	  $disbursement_edate = $credit['StatementEntry']['effective_date'];
+
+	if (empty($credit['receipt'])) {
+	  // Explicit Credit
+	  $result = $this->Transaction->addTransactionEntries
+	    (array('include_ledger_entry'    => true,
+		   'include_statement_entry' => true),
+	     array('type'        => 'INVOICE',
+		   'id'          => $credit['StatementEntry']['transaction_id'],
+		   'account_id'  => $this->Account->accountReceivableAccountID(),
+		   'crdr'        => 'CREDIT',
+		   'customer_id' => $charge['StatementEntry']['customer_id'],
+		   'lease_id'    => $charge['StatementEntry']['lease_id'],
+		   ),
+	     array
+	     (array('type'            => $disbursement_type,
+		    'effective_date'  => $disbursement_edate,
+		    'account_id'      => $credit['StatementEntry']['account_id'],
+		    'amount'          => $disbursement_amount,
+		    'charge_entry_id' => $charge['StatementEntry']['id'],
+		    ),
+		 ));
+
+	  $ret['Disbursement'][] = $result;
+	  if ($result['error'])
+	    $ret['error'] = true;
+	}
+	else {
+	  // Receipt Credit
+
+	  if (strtotime($charge['StatementEntry']['effective_date']) >
+	      strtotime($credit['Transaction']['stamp']))
+	    $disbursement_edate = $charge['StatementEntry']['effective_date'];
+	  else
+	    $disbursement_edate = $credit['Transaction']['stamp'];
+
+	  // Add a disbursement that uses the available credit to pay the charge
+	  $disbursement =
+	    array('type'            => $disbursement_type,
+		  'effective_date'  => $disbursement_edate,
+		  'amount'          => $disbursement_amount,
+		  'account_id'      => $credit['LedgerEntry']['account_id'],
+		  'transaction_id'  => $credit['Transaction']['id'],
+		  'customer_id'     => $charge['StatementEntry']['customer_id'],
+		  'lease_id'        => $charge['StatementEntry']['lease_id'],
+		  'charge_entry_id' => $charge['StatementEntry']['id'],
+		  'comment'         => null,
+		  );
+
+	  $this->pr(20, compact('disbursement'), 'New Disbursement Entry');
+	  $result = $this->addStatementEntry($disbursement);
+	  $ret['Disbursement'][] = $result;
+	  if ($result['error'])
+	    $ret['error'] = true;
+	}
+
+	// Adjust the charge balance to reflect the new disbursement
+	$charge['balance'] = round($charge['balance'] - $disbursement_amount, 2);
+	$this->pr(20, compact('charge', 'disbursement_amount'),
+		  ($charge['balance'] > 0 ? 'Unfinished' : 'Fully Paid') . ' Charge');
+
+	if ($charge['balance'] < 0)
+	  die("HOW DID WE GET A NEGATIVE CHARGE AMOUNT?");
+      }
+      // Break the $credit reference to avoid future problems
+      unset($credit);
+    }
+
+    $this->pr(18, compact('credits'),
+	      'Disbursements complete');
+
+    // Clean up any explicit credits that have been used
+    foreach ($credits AS $credit) {
+      if (!empty($credit['receipt']))
+	continue;
+
+      if (empty($credit['applied']))
+	continue;
+
+      if ($credit['balance'] > 0) {
+	$this->pr(20, compact('credit'),
+		  'Update Credit Entry');
+
+	$this->id = $credit['StatementEntry']['id'];
+	$this->saveField('amount', $credit['balance']);
+      }
+      else {
+	$this->pr(20, compact('credit'),
+		  'Delete Exhausted Credit Entry');
+
+	$this->delete($credit['StatementEntry']['id'], false);
+      }
+    }
+
+    // Check for any implicit receipt credits, converting
+    // into explicit credits if there is a remaining balance.
+    foreach ($credits AS $credit) {
+      if (empty($credit['receipt']))
+	continue;
+
+      if (empty($credit['balance']))
+	continue;
+
+      // See if there is an existing explicit credit
+      // for this transaction.
+      $explicit_credit = $this->find
+	('first', array('contain' => false,
+			'conditions' =>
+			array(array('transaction_id' => $credit['Transaction']['id']),
+			      array('type' => 'SURPLUS')),
+			));
+
+      if (!empty($explicit_credit)) {
+	// REVISIT <AP>: 20090815
+	//  Testing whether or not this case occurs
+	$this->INTERNAL_ERROR('Existing explicit credit unexpected');
+
+	// Since there IS an existing explicit credit, we must update
+	// its balance instead of creating a new one, since it has
+	// already been incorporated in the overall credit balance.
+	// If we were to create a new one, we would erroneously create
+	// an excess of credit available.
+	$this->pr(18, compact('explicit_credit', 'credit'),
+		  'Update existing explicit credit');
+	$EC = new StatementEntry();
+	$EC->id = $explicit_credit['StatementEntry']['id'];
+	$EC->saveField('amount', $credit['balance']);
+	continue;
+      }
+
+      if (!empty($ret['receipt_balance']))
+	$this->INTERNAL_ERROR('Only one receipt expected in assignCredits');
+
+      // Give caller the information necessary to create an explicit
+      // credit from the passed receipt, which we've not exhausted.
+      $this->pr(18, compact('credit'), 'Convert to explicit credit');
+      $ret['receipt_balance'] = $credit['balance'];
+    }
+
+    return $this->prReturn($ret + array('error' => false));
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: stats
+   *  - Returns summary data from the requested statement entry
+   */
+  function stats($id = null, $query = null) {
+    //$this->prFunctionLevel(array('log' => 16, 'show' => 10));
+    $this->prEnter(compact('id', 'query'));
+
+    $this->queryInit($query);
+    unset($query['group']);
+
+    $stats = array();
+    if (isset($id))
+      $query['conditions'][] = array('StatementEntry.id' => $id);
+
+    $types = array('Charge', 'Disbursement');
+    foreach ($types AS $type_index => $this_name) {
+      $that_name = $types[($type_index + 1) % 2];
+      if ($this_name === 'Charge') {
+	$this_types = $this->debitTypes();
+	$that_types = $this->creditTypes();
+      } else {
+	$this_types = $this->creditTypes();
+	$that_types = $this->debitTypes();
+      }
+
+      $this_query = $query;
+      $this_query['fields'] = array();
+      $this_query['fields'][] = "SUM(StatementEntry.amount) AS total";
+      $this_query['conditions'][] = array('StatementEntry.type' => $this_types);
+      $result = $this->find('first', $this_query);
+      $stats[$this_name] = $result[0];
+
+      $this->pr(17, compact('this_query', 'result'), $this_name.'s');
+
+      // Tally the different types that result in credits towards the charges
+      $stats[$this_name]['reconciled'] = 0;
+      foreach ($that_types AS $that_type) {
+	$lc_that_type = strtolower($that_type);
+	$that_query = $this_query;
+	$that_query['link']["{$that_name}Entry"] = array('fields' => array());
+	$that_query['fields'] = array();
+	if ($this_name == 'Charge')
+	  $that_query['fields'][] = "COALESCE(SUM(${that_name}Entry.amount),0) AS $lc_that_type";
+	else
+	  $that_query['fields'][] = "COALESCE(SUM(StatementEntry.amount), 0) AS $lc_that_type";
+	$that_query['conditions'][] = array("{$that_name}Entry.type" => $that_type);
+	$result = $this->find('first', $that_query);
+	$stats[$this_name] += $result[0];
+
+	$this->pr(17, compact('that_query', 'result'), "{$this_name}s: $that_type");
+	$stats[$this_name]['reconciled'] += $stats[$this_name][$lc_that_type];
+      }
+
+      // Compute balance information for charges
+      $stats[$this_name]['balance'] =
+	$stats[$this_name]['total'] - $stats[$this_name]['reconciled'];
+      if (!isset($stats[$this_name]['balance']))
+	$stats[$this_name]['balance'] = 0;
+    }
+
+    // 'balance' is simply the difference between
+    // the balances of charges and disbursements
+    $stats['balance'] = $stats['Charge']['balance'] - $stats['Disbursement']['balance'];
+    if (!isset($stats['balance']))
+      $stats['balance'] = 0;
+
+    // 'account_balance' is really only relevant to
+    // callers that have requested charge and disbursement
+    // stats with respect to a particular account.
+    // It represents the difference between inflow
+    // and outflow from that account.
+    $stats['account_balance'] = $stats['Charge']['reconciled'] - $stats['Disbursement']['total'];
+    if (!isset($stats['account_balance']))
+      $stats['account_balance'] = 0;
+
+    return $this->prReturn($stats);
+  }
+
+}

site/models/tender.php

@@ -0,0 +1,166 @@
+<?php
+class Tender extends AppModel {
+
+	var $belongsTo = array(
+		'TenderType',
+		'Customer',
+		'LedgerEntry',
+		'DepositTransaction' => array(
+			'className' => 'Transaction',
+		),
+		'DepositLedgerEntry' => array(
+			'className' => 'LedgerEntry',
+		),
+		'NsfTransaction' => array(
+			'className' => 'Transaction',
+			'dependent' => true,
+		),
+	);
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: afterSave
+   *  - Performs any work needed after the save occurs
+   */
+
+  function afterSave($created) {
+    // Come up with a (not necessarily unique) name for the tender.
+    // For checks & money orders, this will be based on the check
+    // number.  For other types of tender, we'll just use the
+    // generic name of the tender type, and the tender ID
+
+    // Determine our tender type, and set the ID of that model
+    $this->TenderType->id = $this->field('tender_type_id');
+
+    // REVISIT <AP>: 20090810
+    //  The only tender expected to have no tender type
+    //  is our special "Closing" tender.
+    if (empty($this->TenderType->id))
+      $newname = 'Closing';
+    else {
+      $newname      = $this->TenderType->field('name');
+      $naming_field = $this->TenderType->field('naming_field');
+      if (!empty($naming_field))
+	$newname .= ' #' . $this->field($naming_field);
+    }
+
+    if ($newname !== $this->field('name'))
+      $this->saveField('name', $newname);
+
+    return parent::afterSave($created);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: beforeDelete
+   *  - Performs any work needed before the delete occurs
+   */
+
+  function beforeDelete($cascade = true) {
+    // REVISIT <AP>: 20090814
+    //  Experimental, and incomplete mechanism to protect
+    //  against trying to delete data that shouldn't be deleted.
+
+    $deposit_id = $this->field('deposit_transaction_id');
+    pr(compact('deposit_id'));
+    // If this tender has already been deposited, it would
+    // be a rats nest to figure out how to delete this tender.
+    if (!empty($deposit_id))
+      return false;
+
+    return parent::beforeDelete($cascade);
+  }
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * 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('data' => $tender);
+    if (!$this->verifyTender($tender))
+      return $this->prReturn(array('error' => true) + $ret);
+
+    $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
+   */
+
+  function nsf($id, $stamp = null, $comment = null) {
+    $this->prEnter(compact('id', 'stamp', 'comment'));
+
+    // Get information about this NSF item.
+    $this->id = $id;
+    $tender = $this->find
+      ('first', array
+       ('contain' =>
+	array('LedgerEntry',
+	      'DepositTransaction',
+	      'DepositLedgerEntry',
+	      '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, $comment);
+    if (empty($result['error'])) {
+      // 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($result);
+  }
+
+
+}
+?>

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/unit.php

@@ -19,44 +19,251 @@ class Unit extends AppModel {
 	var $hasOne = array(
 		'CurrentLease' => array(
 			'className' => 'Lease',
-			'conditions' => 'CurrentLease.close_date IS NULL',
+			'conditions' => 'CurrentLease.moveout_date IS NULL',
 		),
 	);
 
 	var $hasMany = array(
 		'Lease',
+		'LocksUnit'
 	);
 
-	function statusEnums() {
-	  static $status_enums;
-	  if (!isset($status_enums))
-	    $status_enums = $this->getEnumValues('status');
-	  return $status_enums;
-	}
+	var $hasAndBelongsToMany = array(
+		'Lock'
+	);
 
-	function statusValue($enum) {
-	  $enums = $this->statusEnums();
-	  return $enums[$enum];
-	}
+	//var $default_log_level = array('log' => 30, 'show' => 15);
 
-	function occupiedEnumValue() {
-	  return statusValue('OCCUPIED');
-	}
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * helpers: status enumerations
+   */
 
-	function conditionOccupied() {
-	  return ('Unit.status >= ' . $this->statusValue('OCCUPIED'));
-	}
+  function statusEnums() {
+    static $status_enums;
+    if (!isset($status_enums))
+      $status_enums = $this->getEnumValues('status');
+    return $status_enums;
+  }
 
-	function conditionVacant() {
-	  return ('Unit.status BETWEEN ' .
-		  ($this->statusValue('UNAVAILABLE')+1) .
-		  ' AND ' .
-		  ($this->statusValue('OCCUPIED')-1));
-	}
+  function activeStatusEnums() {
+    return array_diff_key($this->statusEnums(), array(''=>1, 'DELETED'=>1));
+  }
+
+  function statusValue($enum) {
+    $enums = $this->statusEnums();
+    return $enums[$enum];
+  }
+
+  function occupiedEnumValue() {
+    return $this->statusValue('OCCUPIED');
+  }
+
+  function statusCheck($id_or_enum,
+		       $min = null, $min_strict = false,
+		       $max = null, $max_strict = false)
+  {
+    $this->prEnter(compact('id_or_enum', 'min', 'min_strict', 'max', 'max_strict'));
+
+    if (is_int($id_or_enum)) {
+      $this->id = $id_or_enum;
+      $id_or_enum = $this->field('status');
+    }
+
+    $enum_val = $this->statusValue($id_or_enum);
+    if (isset($min) && is_string($min))
+      $min = $this->statusValue($min);
+    if (isset($max) && is_string($max))
+      $max = $this->statusValue($max);
+
+    $this->pr(17, compact('enum_val', 'min', 'min_strict', 'max', 'max_strict'));
+
+    if (isset($min) &&
+	($enum_val < $min ||
+	 ($min_strict && $enum_val == $min)))
+      return $this->prReturn(false);
+
+    if (isset($max) &&
+	($enum_val > $max ||
+	 ($max_strict && $enum_val == $max)))
+      return $this->prReturn(false);
+
+    return $this->prReturn(true);
+  }
+
+  function locked($enum) {
+    return $this->statusCheck($enum, 'LOCKED', false, null, false);
+  }
+
+  function conditionLocked() {
+    //return array('Unit.status' => 'LOCKED');
+    return ('Unit.status >= ' . $this->statusValue('LOCKED'));
+  }
+
+  function liened($enum) {
+    return $this->statusCheck($enum, 'LIENED', false, null, false);
+  }
+
+  function conditionLiened() {
+    return ('Unit.status >= ' . $this->statusValue('LIENED'));
+  }
+
+  function occupied($enum) {
+    return $this->statusCheck($enum, 'OCCUPIED', false, null, false);
+  }
+
+  function conditionOccupied() {
+    return ('Unit.status >= ' . $this->statusValue('OCCUPIED'));
+  }
+
+  function vacant($enum) {
+    return $this->statusCheck($enum, 'UNAVAILABLE', true, 'OCCUPIED', true);
+  }
+
+  function conditionVacant() {
+    return ('Unit.status BETWEEN ' .
+      ($this->statusValue('UNAVAILABLE')+1) .
+      ' AND ' .
+      ($this->statusValue('OCCUPIED')-1));
+  }
+
+  function unavailable($enum) {
+    return $this->statusCheck($enum, null, false, 'UNAVAILABLE', false);
+  }
+
+  function conditionUnavailable() {
+    return ('Unit.status <= ' . $this->statusValue('UNAVAILABLE'));
+  }
+
+  function available($enum) { return $this->vacant($enum); }
+  function conditionAvailable() { return $this->conditionVacant($enum); }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: allowedStatusSet
+   *  - Returns the status set allowed for the given unit
+   */
+  function allowedStatusSet($id) {
+    $this->prEnter(compact('id'));
+    $this->id = $id;
+    $old_status = $this->field('status');
+    $old_val = $this->statusValue($old_status);
+    $this->pr(17, compact('old_status', 'old_val'));
+
+    $enums = $this->activeStatusEnums();
+    $this->pr(21, compact('enums'));
+
+    foreach ($enums AS $enum => $val) {
+      if (($old_val < $this->occupiedEnumValue()) != 
+	  ($val     < $this->occupiedEnumValue())) {
+	unset($enums[$enum]);
+      }
+    }
+
+    return $this->prReturn($enums);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: updateStatus
+   *  - Update the given unit to the given status
+   */
+  function updateStatus($id, $status, $check = false) {
+    $this->prEnter(compact('id', 'status', 'check'));
+
+/*     if ($check) { */
+/*       $old_status = $this->field('status'); */
+/*       $this->pr(17, compact('old_status')); */
+/*       if ($this->statusValue($old_status) < $this->occupiedEnumValue() && */
+/* 	  $this->statusValue($status)    >= $this->occupiedEnumValue()) */
+/* 	{ */
+/* 	  die("Can't transition a unit from vacant to occupied"); */
+/* 	  return $this->prReturn(false); */
+/* 	} */
+/*       if ($this->statusValue($old_status) >= $this->occupiedEnumValue() && */
+/* 	  $this->statusValue($status)      < $this->occupiedEnumValue()) */
+/* 	{ */
+/* 	  die("Can't transition a unit from occupied to vacant"); */
+/* 	  return $this->prReturn(false); */
+/* 	} */
+/*     } */
+
+    if ($check) {
+      if (!array_key_exists($status, $this->allowedStatusSet($id)))
+	return $this->prReturn(false);
+    }
+
+    $this->id = $id;
+    $this->saveField('status', $status);
+    return $this->prReturn(true);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: update
+   *  - Update any cached or calculated fields
+   */
+  function update($id) {
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: lockUnit
+   *  - Put lock on unit
+   */
+  function lockUnit($id, $lock_ids) {
+    $this->prEnter(compact('id', 'lock_ids'));
+    $this->id = $id;
+
+    // Remove any exising locks for this unit
+    $this->LocksUnit->deleteAll
+      (array('unit_id' => $id), false);
+
+    // 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 lock, and put them on the unit
+    foreach ($lock_ids AS $lock_id) {
+      $pair['unit_id'] = $id;
+      $pair['lock_id'] = $lock_id;
+
+      // Save the relationship between lock and unit
+      $LU = new LocksUnit();
+      if (!$LU->save($pair, false))
+	$ret = false;
+    }
+
+    return $this->prReturn($ret);
+  }
+
+
+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * function: lockCount
+   *  - Number of locks on a unit
+   */
+  function lockCount($id) {
+    $this->prEnter(compact('id'));
+    return $this->prReturn($this->find
+			   ('count', array
+			    ('fields' => array("COUNT(Lock.id) AS count"),
+			     'link' => array('Lock'),
+			     'conditions' => array('Unit.id' => $id),
+			     )));
+  }
 
-	function conditionUnavailable() {
-	  return ('Unit.status <= ' . $this->statusValue('UNAVAILABLE'));
-	}
 
   /**************************************************************************
    **************************************************************************

site/models/unit_size.php

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

site/models/unit_type.php

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

site/models/user.php

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

site/models/user_option.php

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

site/models/user_permission.php

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

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

@@ -163,7 +163,7 @@ class ToolbarComponent extends Object {
 				trigger_error(sprintf(__('Could not load DebugToolbar panel %s', true), $panel), E_USER_WARNING);
 				continue;
 			}
-			$panelObj =& new $className();
+			$panelObj = new $className();
 			if (is_subclass_of($panelObj, 'DebugPanel') || is_subclass_of($panelObj, 'debugpanel')) {
 				$this->panels[$panel] =& $panelObj;
 			}
@@ -456,7 +456,7 @@ class LogPanel extends DebugPanel {
  * @return array
  */
 	function _parseFile($filename) {
-		$file =& new File($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);

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

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

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/valley_storage.pmgr.htpasswd

@@ -0,0 +1,9 @@
+abijah:Property Manager:a2369e3cc9e231ea6f02ce799a8b9970
+anja:Property Manager:4539d5a6e58dd5895f2f3891d29705b0
+kevin:Property Manager:f01accc9f5e5cdfc028dcf0cca837cf1
+adam:Property Manager:ae6835569bb2fc0a0a4a773580ac8cda
+shirley:Property Manager:e7e9d674c700796c99cdbf3cf105e739
+admin:Property Manager:bab2226685d9b4b66220db8df80f1822
+dev:Property Manager:e5c27b3c025e47239a45daceea2c0a00
+vasst:Property Manager:523abc6c2b8458b463d5a9baa4f58f2e
+answerfirst:Property Manager:6ac128447fab8be985c74ba7539c39b3

site/views/accounts/collected.ctp

@@ -0,0 +1,195 @@
+<?php /* -*- mode:PHP -*- */
+
+echo '<div class="account collected">' . "\n";
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Javascript
+ */
+
+?>
+
+<script type="text/javascript"><!--
+
+// Reset the form
+function resetForm() {
+  // Kick off the grid
+  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_replace', serialize(dynamic_post));
+  $('#collected-entries-jqGrid')
+    .setGridParam({ page: 1 })
+    .trigger("reloadGrid");
+
+  //$('#debug').html("<PRE>\n"+htmlEncode(dump($('#collected-entries-jqGrid').getGridParam()))+"\n</PRE>")
+  var gridstate   = $('#collected-entries-jqGrid').getGridParam('gridstate');
+  if (gridstate == 'hidden')
+    $('#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' => 'Collected ' . Inflector::pluralize($account['name']),
+		      'action' => 'collected',
+		      'filter' => array('ChargeEntry.account_id' => $account['id']),
+		      'include' => array('Amount'),
+		      'exclude' => array(/*'Type',*/ 'Debit', 'Credit'),
+		      ),
+		     ));
+
+?>
+
+<script type="text/javascript"><!--
+  $(document).ready(function(){
+      datepicker('TxFromDate');
+      datepicker('TxThroughDate');
+      resetForm();
+  });
+--></script>
+
+<?php
+
+/* End "detail supporting" div */
+echo '</div>' . "\n";
+
+/* End page div */
+echo '</div>' . "\n";
+
+?>

site/views/accounts/view.ctp

@@ -9,12 +9,18 @@ echo '<div class="account view">' . "\n";
  * Account Detail Main Section
  */
 
-$rows = array(array('ID',                $account['Account']['id']),
-	      array('Name',              $account['Account']['name']),
-	      array('Type',              $account['Account']['type']),
-	      array('External Name',     $account['Account']['external_name']),
-	      array('External Account',  $account['Account']['external_account']),
-	      array('Comment',           $account['Account']['comment']));
+$ledger          = $account['Ledger'];
+$current_ledger  = $account['CurrentLedger'];
+
+if (isset($account['Account']))
+  $account = $account['Account'];
+
+$rows = array();
+$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',
@@ -55,20 +61,50 @@ echo '<div CLASS="detail supporting">' . "\n";
  * Ledgers
  */
 
-echo $this->element('ledgers',
-		    array('caption' => $account['Account']['name'] . " Ledgers",
-			  'ledgers' => $account['Ledger']));
+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('caption' => "Current Ledger: (#{$account['CurrentLedger']['sequence']})",
-			  'ledger_id' => $account['CurrentLedger']['id'],
-			  'account_type' => $account['Account']['type'],
-			  ));
+echo $this->element('ledger_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     ('grid_div_id' => 'ledger-ledger-entry-list',
+		      'caption' => "Current Ledger: #{$current_ledger['sequence']}",
+		      'filter'  => array('Ledger.id' => $current_ledger['id']),
+		      'exclude' => array('Account', 'Amount', 'Cr/Dr', 'Balance',
+					 empty($account['receipts']) ? 'Tender' : null),
+		      'include' => array('Debit', 'Credit', 'Sub-Total'),
+		      'limit' => 50,
+		      )));
+
+
+
+/**********************************************************************
+ * 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['receipts']) ? 'Tender' : null),
+		      'include' => array('Transaction', 'Debit', 'Credit', 'Sub-Total'),
+		      'limit' => 50,
+		      )));
+
+
 
 /* End "detail supporting" div */
 echo '</div>' . "\n";

site/views/contacts/edit.ctp

@@ -0,0 +1,474 @@
+<?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" .
+	($stype == 'new' ? ' CHECKED' . "\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
+	    ('label_attributes' => array('class' => 'required'),
+	     'opts' => array
+	     ('options' => $obj->varstore['methodPreferences'],
+	      'selected' => (isset($values) ? $values['ContactsMethod']['preference'] : null),
+	      ),
+	     'after' => "Intended purpose for this method of communication.",
+	     ),
+
+	    'type' => array
+	    ('label_attributes' => array('class' => 'required'),
+	     'opts' => array
+	     ('options' => $obj->varstore['methodTypes'],
+	      'selected' => (isset($values) ? $values['ContactsMethod']['type'] : null),
+	      ),
+	     'after' => "How / Where this communication reaches the contact.",
+	     ),
+
+	    'comment' => array
+	    ('label_attributes' => array('class' => 'optional empty'),
+	     'opts' => array
+	     ('value' => (isset($values) ? $values['ContactsMethod']['comment'] : null),
+	      ),
+	     'after' => "Optional: Comments on how this form of communication relates to the contact.",
+	     ),
+
+	    ))) . "\n" .
+    
+    // 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('label_attributes' => array('class' => 'required empty'),
+		       'name' => 'Phone/Ext',
+		       'opts' => array('options' => $obj->varstore['contactPhones'])),
+	 );
+    }
+    elseif ($stype === 'new') {
+      $fields = array
+	('type' => array('label_attributes' => array('class' => 'required'),
+			 'opts' => array('autocomplete' => 'off',
+					 'options' => $obj->varstore['phoneTypes']),
+			 'after' => "Physical type of the phone."),
+	 'phone' => array('label_attributes' => array('class' => 'required empty'),
+			  'opts' => array('autocomplete' => 'off'),
+			  'after' => "Required: Phone number."),
+	 'ext' => array('name' => "Extension",
+			'label_attributes' => array('class' => 'optional empty'),
+			'opts' => array('autocomplete' => 'off'),
+			'after' => "Optional: Extension number."),
+	 'comment' => array('label_attributes' => array('class' => 'optional empty'),
+			    'opts' => array('autocomplete' => 'off'),
+			    'after' => "Optional: Comments about this phone number."),
+	 );
+    }
+    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' => array('label_attributes' => array('class' => 'required empty'),
+			    'opts' => array('autocomplete' => 'off'),
+			    'after' => "Required: First line of mailing address."),
+	 'city' => array('label_attributes' => array('class' => 'required empty'),
+			 'opts' => array('autocomplete' => 'off'),
+			 'after' => "Required."),
+	 'state' => array('label_attributes' => array('class' => 'required empty'),
+			  'opts' => array('autocomplete' => 'off'),
+			  'after' => "Required."),
+	 'postcode' => array('name' => 'Zip Code',
+			     'label_attributes' => array('class' => 'required empty'),
+			     'opts' => array('autocomplete' => 'off'),
+			     'after' => "Required."),
+	 'country' => array('label_attributes' => array('class' => 'optional empty'),
+			    'opts' => array('autocomplete' => 'off'),
+			    'after' => "Optional: USA is presumed."),
+	 'comment' => array('label_attributes' => array('class' => 'optional empty'),
+			    'opts' => array('autocomplete' => 'off'),
+			    'after' => "Optional: Comments about this mailing address."),
+	 );
+    }
+    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',
+		       'label_attributes' => array('class' => 'required'),
+		       'opts' => array('options' => $obj->varstore['contactEmails'])),
+	 );
+    }
+    elseif ($stype === 'new') {
+      $fields = array
+	('email' => array('label_attributes' => array('class' => 'required empty'),
+			  'opts' => array('autocomplete' => 'off'),
+			  'after' => "Required: E-mail address."),
+	 'comment' => array('label_attributes' => array('class' => 'optional empty'),
+			    'opts' => array('autocomplete' => 'off'),
+			    'after' => "Optional: Comments about this email address."),
+	 );
+    }
+    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) || $stype == 'new') ? '' : ' 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();
+  }
+
+  function setEmpty(input_elem) {
+    selector = "label[for=" + $(input_elem).attr("id") + "]";
+    if ($(input_elem).val() == '')
+      $(selector).addClass('empty');
+    else
+      $(selector).removeClass('empty');
+  }
+
+  $(document).ready(function(){
+      resetForm();
+
+      // In case refresh is hit with populated fields
+      $(":input").each(function(i,elem){ setEmpty(elem); });
+
+      // keyup doesn't catch cut from menu
+      $(":input").live('keyup', function(){
+	  setEmpty(this);
+	});
+      $(":input").live('mouseup', function(){
+	  setEmpty(this);
+	});
+    });
+
+--></script>
+
+<?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
+	    ('last_name' => array('label_attributes' => array('class' => 'recommended empty'),
+				  'after' => "Recommended."),
+	     'first_name' => array('label_attributes' => array('class' => 'recommended empty'),
+				   'after' => "Recommended."),
+	     'middle_name' => array('label_attributes' => array('class' => 'optional empty'),
+				    'after' => "Optional."),
+	     'company_name' => array('name' => 'Company',
+				     'label_attributes' => array('class' => 'optional empty'),
+				     'after' => "Optional: Company name, if corporate contact."),
+	     'display_name' => array('label_attributes' => array('class' => 'optional empty'),
+				     'after' => "Optional with first/last name; Required otherwise."),
+	     'id_federal' => array('name' => 'SSN',
+				   'label_attributes' => array('class' => 'optional empty'),
+				   'after' => "Optional: Social Security Number."),
+	     'id_local' => array('name' => 'ID #',
+				 'label_attributes' => array('class' => 'recommended empty'),
+				 'after' => "Recommended: Driver's license, for example."),
+	     'id_local_state' => array('name' => 'ID State',
+				       'label_attributes' => array('class' => 'recommended empty'),
+				       'after' => "Recommended: State which issued the ID."),
+	     /* 'id_local_exp' => array('name' => 'ID Expiration', */
+	     /*			        'opts' => array('empty' => true)), */
+	     'comment' => array('label_attributes' => array('class' => 'optional empty'),
+				'after' => "Optional: Comments about this contact."),
+	     ))) . "\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";

site/views/contacts/view.ctp

@@ -9,16 +9,25 @@ echo '<div class="contact view">' . "\n";
  * Contact Detail Main Section
  */
 
-$rows = array(array('First Name',  $contact['Contact']['first_name']),
-	      array('Middle Name', $contact['Contact']['middle_name']),
-	      array('Last Name',   $contact['Contact']['last_name']),
-	      array('Company',     $contact['Contact']['company_name']),
-	      array('SSN',         $contact['Contact']['id_federal']),
-	      array('ID',          ($contact['Contact']['id_local']
-				    . ($contact['Contact']['id_local']
-				       ? " - ".$contact['Contact']['id_local_state']
-				       : ""))),
-	      array('Comment',     $contact['Contact']['comment']));
+$phones     = $contact['ContactPhone'];
+$addresses  = $contact['ContactAddress'];
+$emails     = $contact['ContactEmail'];
+
+if (isset($contact['Contact']))
+  $contact = $contact['Contact'];
+
+$rows = array();
+$rows[] = array('Display Name', $contact['display_name']);
+$rows[] = array('First Name',   $contact['first_name']);
+$rows[] = array('Middle Name',  $contact['middle_name']);
+$rows[] = array('Last Name',    $contact['last_name']);
+$rows[] = array('Company',      $contact['company_name']);
+$rows[] = array('SSN',          $contact['id_federal']);
+$rows[] = array('ID',           ($contact['id_local']
+				 . ($contact['id_local']
+				    ? " - ".$contact['id_local_state']
+				    : "")));
+$rows[] = array('Comment',      $contact['comment']);
 
 echo $this->element('table',
 		    array('class'   => 'item contact detail',
@@ -57,7 +66,7 @@ echo '<div CLASS="detail supporting">' . "\n";
  */
 $headers = array('Phone', 'Preference', 'Comment');
 $rows = array();
-foreach($contact['ContactPhone'] AS $phone) {
+foreach($phones AS $phone) {
   $rows[] = array(FormatHelper::phone($phone['phone']) .
 		  ($phone['ext'] ? " x".$phone['ext'] : ""),
 		  $phone['ContactsMethod']['preference'] . " / " .
@@ -74,32 +83,12 @@ echo $this->element('table',
 			  'column_class' => $headers));
 
 
-/**********************************************************************
- * Emails
- */
-$headers = array('Email', 'Preference', 'Comment');
-$rows = array();
-foreach($contact['ContactEmail'] AS $email) {
-  $rows[] = array($email['email'],
-		  $email['ContactsMethod']['preference'] . " / " .
-		  $email['ContactsMethod']['type'],
-		  $email['comment']);
-}
-
-echo $this->element('table',
-		    array('class'   => 'item email list',
-			  'caption' => 'Email',
-			  'headers' => $headers,
-			  'rows'    => $rows,
-			  'column_class' => $headers));
-
-
 /**********************************************************************
  * Addresses
  */
 $headers = array('Address', 'Preference', 'Comment');
 $rows = array();
-foreach($contact['ContactAddress'] AS $address) {
+foreach($addresses AS $address) {
   $rows[] = array(preg_replace("/\n/", "<BR>\n", $address['address']) . "<BR>\n" .
 		  $address['city'] . ", " .
 		  $address['state'] . " " .
@@ -118,12 +107,37 @@ echo $this->element('table',
 			  'column_class' => $headers));
 
 
+/**********************************************************************
+ * Emails
+ */
+$headers = array('Email', 'Preference', 'Comment');
+$rows = array();
+foreach($emails AS $email) {
+  $rows[] = array($email['email'],
+		  $email['ContactsMethod']['preference'] . " / " .
+		  $email['ContactsMethod']['type'],
+		  $email['comment']);
+}
+
+echo $this->element('table',
+		    array('class'   => 'item email list',
+			  'caption' => 'Email',
+			  'headers' => $headers,
+			  'rows'    => $rows,
+			  'column_class' => $headers));
+
+
 /**********************************************************************
  * Customers
  */
-echo $this->element('customers', array('heading' => '',
-				       'caption' => 'Related Customers',
-				       'customers' => $contact['Customer']));
+
+echo $this->element('customers', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Related Customers',
+		      'filter' => array('Contact.id' => $contact['id']),
+		      'include' => array('Relationship'),
+		      )));
 
 
 /* End "detail supporting" div */

site/views/customers/edit.ctp

@@ -0,0 +1,331 @@
+<?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('contactTypes', 'contacts');
+
+//pr($this->data);
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Javascript
+ */
+
+function customerContactDiv($obj, $values = null, $primary = false) {
+
+  $div = 
+    // BEGIN type-div
+    '<DIV>' . "\n" .
+    // BEGIN type-fieldset
+    '<FIELDSET CLASS="contact subset">' . "\n" .
+    '<LEGEND>Contact #%{id} (%{remove})</LEGEND>' . "\n" .
+
+    // BEGIN source-div
+    '<DIV ID="contact-%{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][%{id}][source]"' . "\n" .
+	' ONCLICK="switchContactSource(%{id}, '."'{$stype}'".')"' . "\n" .
+	' CLASS="contact-%{id}-source" ' . "\n" .
+	' ID="contact-%{id}-source-'.$stype.'"' . "\n" .
+	' VALUE="'.$stype.'"' . "\n" .
+	($stype == 'new' ? ' CHECKED' . "\n" : '') .
+	' />' . "\n" .
+	' <LABEL FOR="contact-%{id}-source-'.$stype.'">'.$sname.'</LABEL>' . "\n" .
+	' ';
+    }
+    $div .= "<P>(Phone numbers / Addresses can be added later)";
+  }
+  $div .= "\n";
+
+  if (isset($values)) {
+    $div .= customerContactTypeDiv($obj, 'show', $values);
+  }
+  else {
+    $div .= customerContactTypeDiv($obj, 'existing');
+    $div .= customerContactTypeDiv($obj, 'new');
+  }
+
+  $div .=
+    // END source-fieldset
+    '</FIELDSET>' . "\n" .
+    // END source-div
+    '</DIV>' . "\n" .
+
+    // BEGIN contact-div
+    '<div id="contact-%{id}-contact-div">' . "\n" .
+
+    $obj->element
+    ('form_table',
+     array('class'  => "item contact entry",
+	   'field_prefix' => 'Contact.%{id}.ContactsCustomer',
+	   'fields' => array
+	   (
+	    'Customer.primary_contact_entry' => array
+	    ('name' => 'Primary Contact',
+	     'label_attributes' => array('class' => null),
+	     'no_prefix' => true,
+	     'opts' => array
+	     ('type' => 'radio',
+	      'options' => array('%{id}' => false),
+	      'value' => ($primary ? '%{id}' : 'bogus-value-to-suppress-hidden-input'),
+	      ),
+	     'after' => ("Check this button if this contact will be the primary" .
+			 " contact for this customer (there can be only one primary" .
+			 " contact"),
+	     ),
+
+
+	    'type' => array
+	    ('label_attributes' => array('class' => 'required'),
+	     'opts' => array
+	     ('options' => $obj->varstore['contactTypes'],
+	      'selected' => (isset($values) ? $values['ContactsCustomer']['type'] : null),
+	      ),
+	     'after' => "An actual tenant, or just an alternate contact?"
+	     ),
+
+	    'comment' => array
+	    ('label_attributes' => array('class' => 'optional empty'),
+	     'opts' => array
+	     ('value' => (isset($values) ? $values['ContactsCustomer']['comment'] : null),
+	      ),
+	     'after' => "Optional: Comments on the relationship between this customer and this contact."
+	     ),
+
+	    ))) . "\n" .
+    
+    // END contact-div
+    '</div>' . "\n" . 
+
+    // END type-fieldset
+    '</FIELDSET>' . "\n" . 
+    // END type-div
+    '</DIV>'
+    ;
+
+  return $div;
+}
+
+function customerContactTypeDiv($obj, $stype, $values = null) {
+
+  $element = 'form_table';
+  $class = $stype;
+
+  if ($stype === 'existing') {
+    $fields = array
+      ('id' => array('name' => 'Contact',
+		     'label_attributes' => array('class' => 'required empty'),
+		     'opts' => array('options' => $obj->varstore['contacts']),
+		     'after' => "Select the existing contact."),
+       );
+  }
+  elseif ($stype === 'new') {
+    $fields = array
+      ('last_name' => array('label_attributes' => array('class' => 'recommended empty'),
+			    'after' => "Recommended."),
+       'first_name' => array('label_attributes' => array('class' => 'recommended empty'),
+			     'after' => "Recommended."),
+       'middle_name' => array('label_attributes' => array('class' => 'optional empty'),
+			      'after' => "Optional."),
+       'company_name' => array('name' => 'Company',
+			       'label_attributes' => array('class' => 'optional empty'),
+			       'after' => "Optional: Company name, if corporate contact."),
+       'display_name' => array('label_attributes' => array('class' => 'optional empty'),
+			       'after' => "Optional with first/last name; Required otherwise."),
+       'id_federal' => array('name' => 'SSN',
+			     'label_attributes' => array('class' => 'optional empty'),
+			     'after' => "Optional: Social Security Number."),
+       'id_local' => array('name' => 'ID #',
+			   'label_attributes' => array('class' => 'recommended empty'),
+			   'after' => "Recommended: Driver's license, for example."),
+       'id_local_state' => array('name' => 'ID State',
+				 'label_attributes' => array('class' => 'recommended empty'),
+				 'after' => "Recommended: State which issued the ID."),
+       /* 'id_local_exp' => array('name' => 'ID Expiration', */
+       /*			        'opts' => array('empty' => true)), */
+       'comment' => array('label_attributes' => array('class' => 'optional empty'),
+			  'after' => "Optional: Comments about this contact."),
+       );
+  }
+  elseif ($stype === 'show') {
+    $element = 'table';
+    $class = 'detail';
+    $column_class = array('field', 'value');
+    $rows = array(array('First Name',  $values['first_name']),
+		  array('Last Name',   $values['last_name']),
+		  array('Company',     $values['company_name']),
+		  array('Comment',     $values['comment']));
+  }
+  else {
+    die("\n\nInvalid stype ($stype)\n\n");
+  }
+
+  return
+    // BEGIN sourcetype-div
+    '<div ' . "\n" .
+    ' class="contact-%{id}-div"' . "\n" .
+    ' id="contact-%{id}-'.$stype.'-div"' . "\n" .
+    ((isset($values) || $stype == 'new') ? '' : ' STYLE="display:none;"' . "\n") .
+    '>' . "\n" .
+
+    $obj->element
+    ($element,
+     array('class'  => "item contact {$class}",
+	   'field_prefix' => 'Contact.%{id}')
+     + compact('rows', 'fields', 'row_class', 'column_class')) .
+
+    ($stype === 'show'
+     ? '<input type="hidden" name="data[Contact][%{id}][id]" value="'.$values['id'].'"/>' . "\n"
+     : '') .
+
+    // END sourcetype-div
+    '</div>' . "\n" .
+    '';
+}
+
+
+?>
+
+<script type="text/javascript"><!--
+
+  function addContact(flash) {
+    addDiv('contact-entry-id', 'contact', 'contacts', flash, <?php
+	   echo FormatHelper::phpVarToJavascript
+	   (customerContactDiv($this),
+	    null,
+	    '           ');
+	   ?>
+	   );
+  }
+
+  // Reset the form
+  function resetForm() {
+    $('#contacts').html('');
+    $('#contact-entry-id').val(1);
+
+    <?php foreach ($this->data['Contact'] AS $contact): ?>
+    addDiv('contact-entry-id', 'contact', 'contacts', false, <?php
+	   echo FormatHelper::phpVarToJavascript
+	   (customerContactDiv($this,
+			       $contact,
+			       $contact['id'] == $this->data['Customer']['primary_contact_id']
+			       ),
+	    null,
+	    '           ');
+	   ?>
+	   );
+    <?php endforeach; ?>
+
+    if ($("#contact-entry-id").val() == 1) {
+      addDiv('contact-entry-id', 'contact', 'contacts', false, <?php
+	     echo FormatHelper::phpVarToJavascript
+	     (customerContactDiv($this, null, true),
+	      null,
+	      '           ');
+	     ?>
+	     );
+    }
+  }
+
+  function switchContactSource(id, source) {
+    $(".contact-"+id+"-div")
+      .slideUp();
+
+    $("#contact-"+id+"-"+source+"-div")
+      .slideDown();
+  }
+
+  function setEmpty(input_elem) {
+    selector = "label[for=" + $(input_elem).attr("id") + "]";
+    //$("#debug").append($(input_elem).attr("id") + ": " + $(input_elem).val() + "<BR>");
+    if ($(input_elem).val() == '')
+      $(selector).addClass('empty');
+    else
+      $(selector).removeClass('empty');
+  }
+
+  $(document).ready(function(){
+      resetForm();
+
+      // In case refresh is hit with populated fields
+      $(":input").each(function(i,elem){ setEmpty(elem); });
+
+      // keyup doesn't catch cut from menu
+      $(":input").live('keyup', function(){
+	  setEmpty(this);
+	});
+      $(":input").live('mouseup', function(){
+	  setEmpty(this);
+	});
+    });
+
+--></script>
+
+<?php
+; // alignment
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Customer Edit
+ */
+
+echo '<div class="customer edit">' . "\n";
+
+echo $form->create('Customer', array('action' => 'edit')) . "\n";
+echo $form->input('id') . "\n";
+
+echo($this->element
+     ('form_table',
+      array('class'  => 'item customer detail',
+	    'caption' => isset($this->data['Customer']) ? 'Edit Customer' : 'New Customer',
+	    'fields' => array
+	    ('name' => array('label_attributes' => array('class' => 'optional empty'),
+			     'after' => ("Optional: If this field is left blank, the" .
+					 " customer name will be set to the name of" .
+					 " the primary contact, below.")),
+	     'comment' => array('label_attributes' => array('class' => 'optional empty'),
+				'after' => 'Optional: Comments about this customer.'),
+	     ))) . "\n");
+
+echo $form->submit(isset($this->data['Customer']) ? 'Update' : 'Add New Customer') . "\n";
+?>
+
+<div CLASS="dynamic-set">
+<fieldset CLASS="contact superset">
+ <legend>Contacts</legend>
+ <input type="hidden" id="contact-entry-id" value="0">
+ <div id="contacts"></div>
+  <fieldset> <legend>
+   <a href="#" onClick="addContact(true); return false;">Add a Contact</a>
+  </legend> </fieldset>
+</fieldset>
+</div>
+
+<?php
+; // Alignment
+
+if (!empty($movein['Unit']['id']))
+  echo $form->input("movein.Unit.id",
+		    array('type' => 'hidden',
+			  'value' => $movein['Unit']['id'])) . "\n";
+
+echo $form->submit(isset($this->data['Customer']) ? 'Update' : 'Add New Customer') . "\n";
+echo $form->submit('Cancel', array('name' => 'cancel')) . "\n";
+echo $form->end() . "\n";
+echo '</div>' . "\n";

site/views/customers/merge.ctp

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

site/views/customers/payment.ctp

@@ -1,503 +0,0 @@
-<?php /* -*- mode:PHP -*- */ ?>
-
-<div class="payment input">
-
-<?php
-; // Editor alignment
-
-
-/**********************************************************************
- **********************************************************************
- **********************************************************************
- **********************************************************************
- * Transaction Detail Main Section
- */
-
-/* $rows = array(array('ID', $transaction['Transaction']['id']), */
-/* 	      array('Timestamp', FormatHelper::datetime($transaction['Transaction']['stamp'])), */
-/* 	      array('Through', FormatHelper::date($transaction['Transaction']['through_date'])), */
-/* 	      array('Due', FormatHelper::date($transaction['Transaction']['due_date'])), */
-/* 	      array('Comment',   $transaction['Transaction']['comment'])); */
-
-/* echo $this->element('table', */
-/* 		    array('class'   => 'item transaction detail', */
-/* 			  'caption' => 'Transaction Detail', */
-/* 			  'rows'    => $rows, */
-/* 			  'column_class' => array('field', 'value'))); */
-
-
-
-/**********************************************************************
- * Transaction Info Box
- */
-
-?>
-
-<!--
-<DIV CLASS="infobox">
-  <DIV CLASS="summary grand total">
-   Total: <?php /*echo FormatHelper::currency($total);*/ ?>
-  </DIV>
-</DIV>
--->
-
-
-<?php
-; // Editor alignment
-
-/**********************************************************************
- **********************************************************************
- **********************************************************************
- **********************************************************************
- * 
- */
-
-$grid_setup = array();
-
-if (isset($customer['id']))
-  $grid_setup['hiddengrid'] = true;
-
-$grid_setup['onSelectRow'] = array
-  ('--special' =>
-   'function(ids) { if (ids != null) { onRowSelect("#"+$(this).attr("id"), ids); } }'
-   );
-
-
-// Customer
-// Outstanding balance
-// Balance on each lease
-// Balance on personal account
-// Multiple fields for payments (cash, check, charge, etc)
-// How to apply (even split, oldest charges first, etc)
-
-
-?>
-
-<script type="text/javascript"><!--
-
-  // prepare the form when the DOM is ready 
-  $(document).ready(function() { 
-    var options = { 
-      target:        '#output-debug',   // target element(s) to be updated with server response 
-      beforeSubmit:  verifyRequest,  // pre-submit callback 
-      success:       showResponse,  // post-submit callback 
- 
-      // other available options: 
-      //url:       url,         // override for form's 'action' attribute 
-      //type:      'get',           // 'get' or 'post', override for form's 'method' attribute 
-      //dataType:  null,        // 'xml', 'script', or 'json' (expected server response type) 
-      //clearForm: true,        // clear all form fields after successful submit 
-      //resetForm: true,        // reset the form after successful submit 
-
-      // $.ajax options can be used here too, for example: 
-      //timeout:   3000,
-      }; 
-
-    // get a clean slate
-    resetPaymentForm();
-
-    // bind form using 'ajaxForm' 
-    $('#payment-form').ajaxForm(options); 
-    }); 
- 
-  // pre-submit callback 
-  function verifyRequest(formData, jqForm, options) { 
-    // formData is an array; here we use $.param to convert it to a string to display it 
-    // but the form plugin does this for you automatically when it submits the data 
-    //var_dump(formData);
-    //$('#request-debug').html('<PRE>'+dump(formData)+'</PRE>');
-    $('#request-debug').html('Ommitted');
-    //return false;
-
-    $('#response-debug').html('Loading <BLINK>...</BLINK>');
-    $('#output-debug').html('Loading <BLINK>...</BLINK>');
- 
-    // here we could return false to prevent the form from being submitted; 
-    // returning anything other than false will allow the form submit to continue 
-    return true; 
-  } 
- 
-  // post-submit callback 
-  function showResponse(responseText, statusText)  { 
-    // for normal html responses, the first argument to the success callback 
-    // is the XMLHttpRequest object's responseText property 
- 
-    // if the ajaxForm method was passed an Options Object with the dataType 
-    // property set to 'xml' then the first argument to the success callback 
-    // is the XMLHttpRequest object's responseXML property 
- 
-    // if the ajaxForm method was passed an Options Object with the dataType 
-    // property set to 'json' then the first argument to the success callback 
-    // is the json data object returned by the server 
-
-    if (statusText == 'success') {
-      // get a clean slate
-      //resetPaymentForm();
-    }
-    else {
-      alert('not successful??');
-    }
-
-
-    $('#response-debug').html('<PRE>'+dump(statusText)+'</PRE>');
-  }
-
-  // Reset payment fields
-  function resetPaymentForm() {
-    // Get a clean slate for our payments
-    $('#payments').html('');
-    $('#payment-id').val(0);
-    addPaymentSource(false);
-  }
-
-  function addPaymentSource(flash) {
-    addDiv('payment-id', 'payment', 'payments', flash,
-	   // HTML section
-	   '<FIELDSET CLASS="payment subset">' +
-	   '<LEGEND>Payment #%{id} (%{remove})</LEGEND>' +
-
-	   '<DIV ID="payment-type-div-%{id}">' +
-	   <?php
-	   /* REVISIT <AP> 20090616:
-	    *  MUST GET THIS FROM THE DATABASE!!
-	    *  HARDCODED VALUES BAD... VERY BAD...
-	    */
-	   $monetary_type_ids = array('Cash'          => 2,
-				      'Check'         => 3,
-				      'Money Order'   => 4,
-				      'ACH'           => 5,
-				      'Credit Card'   => 7,
-				      );
-
-	   $types = array();
-	   foreach(array('Cash', 'Check', 'Money Order', /*'ACH', 'Credit Card'*/) AS $name)
-	     $types[preg_replace("/ /", "", strtolower($name))] = $name;
-
-	   foreach ($types AS $type => $name) {
-	     $div  = '<DIV>';
-	     $div .= '<INPUT TYPE="hidden" NAME="data[LedgerEntry][%{id}][bogus]" VALUE="1">';
-	     $div .= '<INPUT TYPE="radio" NAME="data[LedgerEntry][%{id}][MonetarySource][monetary_type_id]"';
-	     $div .= ' ONCLICK="switchPaymentType(%{id}, \\\''.$type.'\\\')"';
-	     $div .= ' CLASS="payment-type-%{id}" ID="payment-type-'.$type.'-%{id}"';
-	     $div .= ' VALUE="'.$monetary_type_ids[$name].'" ' . ($name == 'Cash' ? 'CHECKED ' : '') . '/>';
-	     $div .= ' <LABEL FOR="payment-type-'.$type.'-%{id}">'.$name.'</LABEL>';
-	     $div .= '</DIV>';
-	     echo "'$div' +\n";
-	   }
-	   ?>
-	   '</DIV>' +
-
-	   '<DIV ID="payment-amount-div-%{id}" CLASS="input text required">' +
-	   ' <LABEL FOR="payment-amount-%{id}">Amount</LABEL>' +
-	   ' <INPUT TYPE="text" SIZE="20"' +
-	   '  NAME="data[LedgerEntry][%{id}][amount]"' +
-	   '  ID="payment-amount-%{id}" />' +
-	   '</DIV>' +
-
-	   <?php
-	   foreach ($types AS $type => $name) {
-	     if ($type == 'cash')
-	       continue;
-
-	     $div  = '<DIV';
-	     $div .= ' ID="payment-'.$type.'-div-%{id}"';
-	     $div .= ' CLASS="payment-type-div-%{id}"';
-	     $div .= ' STYLE="display:none;">';
-	     $div .= '</DIV>';
-	     echo "'$div' +\n";
-	   }
-	   ?>
-
-	   '</FIELDSET>'
-	   );
-
-	   
-  }
-
-function switchPaymentType(paymentid, type) {
-  $(".payment-type-div-"+paymentid).slideUp();
-  $(".payment-type-div-"+paymentid).html('');
-
-  switch(type)
-    {
-    case 'cash':
-      break;
-
-    case 'check':
-      html =
-	'<DIV CLASS="input text required">' +
-	' <LABEL FOR="payment-check-number-'+paymentid+'">Check Number</LABEL>' +
-	// REVISIT <AP>: 20090617: Use comment field for now.
-	' <INPUT TYPE="text" SIZE="6" NAME="data[LedgerEntry]['+paymentid+'][MonetarySource][comment]"' +
-	'  ID="payment-check-number-'+paymentid+'" />' +
-	'</DIV>';
-      break;
-
-    case 'moneyorder':
-      html =
-	'<DIV CLASS="input text required">' +
-	' <LABEL FOR="payment-moneyorder-number-'+paymentid+'">Money Order Number</LABEL>' +
-	// REVISIT <AP>: 20090617: Use comment field for now.
-	' <INPUT TYPE="text" SIZE="6" NAME="data[LedgerEntry]['+paymentid+'][MonetarySource][comment]"' +
-	'  ID="payment-moneyorder-number-'+paymentid+'" />' +
-	'</DIV>';
-      break;
-
-    case 'ach':
-      html =
-	'<DIV CLASS="input text required">' +
-	' <LABEL FOR="payment-ach-routing-'+paymentid+'">Routing Number</LABEL>' +
-	// REVISIT <AP>: 20090617: Use comment field for now.
-	' <INPUT TYPE="text" SIZE="9" NAME="data[LedgerEntry]['+paymentid+'][MonetarySource][comment]"' +
-	'  ID="payment-ach-routing-'+paymentid+'" />' +
-	'</DIV>' +
-
-	'<DIV CLASS="input text required">' +
-	' <LABEL FOR="payment-ach-account-'+paymentid+'">Account Number</LABEL>' +
-	// REVISIT <AP>: 20090617: Use comment field for now.
-	' <INPUT TYPE="text" SIZE="17" NAME="data[LedgerEntry]['+paymentid+'][MonetarySource][comment]"' +
-	'  ID="payment-ach-account-'+paymentid+'" />' +
-	'</DIV>';
-      break;
-
-    case 'creditcard':
-      html =
-	'<DIV CLASS="input text required">' +
-	' <LABEL FOR="payment-creditcard-account-'+paymentid+'">Account Number</LABEL>' +
-	// REVISIT <AP>: 20090617: Use comment field for now.
-	' <INPUT TYPE="text" SIZE="16" NAME="data[LedgerEntry]['+paymentid+'][MonetarySource][comment]' +
-	'  ID="payment-creditcard-account-'+paymentid+'" />' +
-	'</DIV>' +
-
-	'<DIV CLASS="input text required">' +
-	' <LABEL FOR="payment-creditcard-expiration-'+paymentid+'">Expiration Date</LABEL>' +
-	// REVISIT <AP>: 20090617: Use comment field for now.
-	' <INPUT TYPE="text" SIZE="10" NAME="data[LedgerEntry]['+paymentid+'][MonetarySource][comment]' +
-	'  ID="payment-creditcard-expiration-'+paymentid+'" />' +
-	' </DIV>' +
-
-	'<DIV CLASS="input text required">' +
-	' <LABEL FOR="payment-creditcard-cvv2-'+paymentid+'">CVV2 Code</LABEL>' +
-	// REVISIT <AP>: 20090617: Use comment field for now.
-	' <INPUT TYPE="text" SIZE="10" NAME=data[LedgerEntry]['+paymentid+'][MonetarySource][comment]' +
-	'  ID="payment-creditcard-cvv2-'+paymentid+'" />' +
-	'</DIV>';
-      break;
-
-    default:
-      html = '<DIV><H2>INVALID TYPE ('+type+')</H2></DIV>';
-      break;
-    }
-
-  $("#payment-"+type+"-div-"+paymentid).html(html);
-  $("#payment-"+type+"-div-"+paymentid).slideDown();
-  }
-
-
-function updateChargesCaption(customer_name, balance) {
-  $('#charge-entries-jqGrid').setCaption('Outstanding Charges for ' +
-					 customer_name + ': ' +
-					 fmtCurrency(balance));
-}
-
-function updateChargesGrid(idlist, balance) {
-  updateChargesCaption($("#payment_customer").html(), balance);
-
-  $('#charge-entries-jqGrid').setPostDataItem('idlist', serialize(idlist));
-  $('#charge-entries-jqGrid')
-    .setGridParam({ page: 1 })
-    .trigger("reloadGrid");
-}
-
-function updateCharges(id) {
-  var url = '<?php echo ($html->url(array("controller" => $this->params["controller"],
-					  "action"     => "unreconciled"))); ?>';
-  //url += '/'+$("#customer-id").val();
-  url += '/'+id;
-
-  $.ajax({
-    type: "GET",
-	url: url,
-	dataType: "xml",
-	success: function(xml) {
-	var ids = new Array();
-	$('#update-target ol').html('<A HREF="'+url+'">Data URL</A>');
-	$('entry',xml).each(function(i){
-	    ids.push($(this).attr('id'));
-	    $('#update-target').append("Push: len=" + ids.length + '<BR>');
-	  });
-	updateChargesGrid(ids, $('entries',xml).attr('balance'));
-      }
-    });
-}
-
-function onRowSelect(grid_id, cust_id) {
-  // Set the customer id that will be returned with the form
-  $("#customer-id").val(cust_id);
-  
-  // Get the customer name from the grid
-  $("#payment_customer").html($(grid_id).getCell(cust_id, "Customer-name"));
-
-  // Replace that with just the text portion of the hyperlink
-  $("#payment_customer").html($("#payment_customer a").html());
-
-  // Hide the "no customer" message and show the current customer
-  $("#no_customer").hide();
-  $("#current_customer").show();
-
-  updateCharges(cust_id);
-}
-
-  --></script>
-
-<?php
-; // align
-  //echo '<DIV ID="dialog">' . "\n";
-
-echo $this->element('customers',
-		    array('grid_div_id' => 'customers-list',
-			  'caption' => ('<A HREF="#" ONCLICK="$(\'#customers-list .HeaderButton\').click();'.
-					' return false;">Select Customer</A>'),
-			  'grid_setup' => $grid_setup,
-			  ));
-
-echo $this->element('ledger_entries',
-		    array('grid_div_id' => 'charge-entries',
-			  'caption' => 'Outstanding Charges',
-			  'account_ftype' => 'credit',
-			  'ledger_entries' => $charges['entry'],
-			  'limit' => 8,
-			  ));
-
-echo ('<H2>' .
-      '<SPAN id="current_customer" style="display:'.(isset($customer['id'])?"inline":"none").'">' .
-      'Enter new receipt for ' .
-      '<SPAN id="payment_customer">' . (isset($customer['name']) ? $customer['name'] : "") . '</SPAN>' .
-      '</SPAN>' .
-      '<SPAN id="no_customer" style="display:'.(isset($customer['id'])?"none":"inline").'">' .
-      'Please select customer' .
-      '</SPAN>' .
-      '</H2>' . "\n");
-
-echo $form->create(null, array('id' => 'payment-form',
-			       'url' => array('controller' => 'transactions',
-					      'action' => 'postReceipt')));
-
-/***************************************************
- * Post data should look like this:
- *
- * data => Array
- *    (
- *        [Transaction] => Array
- *            (
- *                stamp => <Transaction Time Stamp>
- *                through_date => <Transaction Through Date, if any>
- *                due_date => <Transaction Due Date, if any>
- *                comment => <Transaction Comment>
- *            )
- *
- *        [LedgerEntry] => Array
- *            (
- *                [0] => Array
- *                    (
- *                        name => <NOT TO INCLUDE??>
- *                        amount => <Payment Amount>
- *                        debit_ledger_id => <ID of the debit account's current ledger>
- *                        credit_ledger_id => <ID of the debit account's current ledger>
- *                        comment => <Ledger Entry Comment>
- *
- *                        [MonetarySource] => Array
- *                            (
- *                                name => <Name (may be useless parameter)>
- *                                monetary_type_id => <Monetary Type ID>
- *                                comment => <Monetary Source Comment>
- *                            )
- *
- *                        REVISIT: Reconciliations will be tricker.
- *                    )
- *
- *            )
- *
- *    )
- *
- ***************************************************/
-
-?>
-<input type="hidden" id="customer-id" name="data[customer_id]" value="<?php echo $customer['id']; ?>">
-
-<fieldset CLASS="payment superset">
- <legend>Payments</legend>
- <input type="hidden" id="payment-id" value="0">
- <div id="payments"></div>
-  <fieldset> <legend>
-   <a href="#" onClick="addPaymentSource(true); return false;">Add Another Payment</a>
-  </legend> </fieldset>
-</fieldset>
-
-<?php
-
-echo 'Date: <input id="datepicker" name="data[Transaction][stamp]" type="text" /><BR>' . "\n";
-echo 'Comment: <input id="comment" name="data[Transaction][comment]" type="text" SIZE=80 /><BR>' . "\n";
-echo $form->end('Post Payment');
-
-//echo '</DIV>' . "\n"; // End of the dialog DIV
-?>
-
-<?php
-/* <button id="post-payment" class="ui-button ui-state-default ui-corner-all">Create Payment</button> */
-?>
-
-<div><H4>Request</H4><div id="request-debug"></div></div>
-<div><H4>Response</H4><div id="response-debug"></div></div>
-<div><H4>Output</H4><div id="output-debug"></div></div>
-<?php
-
-?>
-
-  <script type="text/javascript">
-
-  $(document).ready(function(){
-      $("#datepicker").datepicker()
-	.datepicker('setDate', '+0');
-
-      <?php if (isset($customer['id'])) { ?>
-      $("#customer-id").val(<?php echo $customer['id']; ?>);
-      updateChargesCaption("<?php echo $customer['name']; ?>",
-			   <?php echo $charges['balance']; ?>);
-      <?php } ?>
-
-
-/*       $("#dialog").dialog({ */
-/* 	bgiframe: true, */
-/* 	    autoOpen: false, */
-/* 	    height: 500, */
-/* 	    width: 600, */
-/* 	    modal: true, */
-/* 	    buttons: { */
-/* 	    'Post a Payment': function() { */
-/* 	      var bValid = true; */
-/* 	      if (bValid) { */
-/* 		$('#debug').append('<H2>POSTED!</H2>'); */
-/* 		$(this).dialog('close'); */
-/* 	      } */
-/* 	    }, */
-/* 	      Cancel: function() { */
-/* 	      $(this).dialog('close'); */
-/* 	    } */
-/* 	  }, */
-/* 	    close: function() { */
-/* 	  } */
-/* 	}); */
-
-/*       $('#post-payment').click(function() { */
-/* 	  $('#dialog').dialog('open'); */
-/* 	}); */
-
-  });
-
-
-  </script>
-
-</div>
-
-<a href="#" onClick="$('#debug').html(''); return false;">Clear Debug Output</a>

site/views/customers/receipt.ctp

@@ -0,0 +1,440 @@
+<?php /* -*- mode:PHP -*- */ ?>
+
+<div class="receipt input">
+<?php
+; // Editor alignment
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Javascript
+ */
+
+// Warnings _really_ screw up javascript
+$saved_debug_state = Configure::read('debug');
+Configure::write('debug', '0');
+?>
+
+<script type="text/javascript"><!--
+
+  // prepare the form when the DOM is ready 
+  $(document).ready(function() { 
+    var options = { 
+      target:        '#output-debug',   // target element(s) to be updated with server response 
+      beforeSubmit:  verifyRequest,  // pre-submit callback 
+      success:       showResponse,  // post-submit callback 
+ 
+      // other available options: 
+      //clearForm: true,        // clear all form fields after successful submit 
+      //resetForm: true,        // reset the form after successful submit 
+
+      url: "<?php echo $html->url(array('controller' => 'transactions',
+					'action' => 'postReceipt', 0)); ?>"
+      }; 
+
+    // bind form using 'ajaxForm' 
+    if ($('#receipt-form').ajaxForm != null)
+      $('#receipt-form').ajaxForm(options);
+    else
+      $('#repeat, label[for=repeat]').remove();
+    }); 
+ 
+// pre-submit callback 
+function verifyRequest(formData, jqForm, options) {
+  //$("#debug").html('');
+  for (var i = 0; i < formData.length; ++i) {
+    //$("#debug").append(i + ') ' + dump(formData[i]) + '<BR>');
+    if (formData[i]['name'] == "data[Customer][id]" &&
+	!(formData[i]['value'] > 0)) {
+      //$("#debug").append('<P>Missing Customer ID');
+      alert("Please select a customer first.");
+      return false;
+    }
+
+    if (formData[i]['name'] == "data[Transaction][stamp]" &&
+	formData[i]['value'] == '') {
+      //$("#debug").append('<P>Bad Stamp');
+      if (formData[i]['value'] != '')
+	alert(formData[i]['value'] + " is not valid date stamp.  Please correct it.");
+      else
+	alert("Please enter a valid date stamp first.");
+      return false;
+    }
+
+    // Terrible way to accomplish this...
+    for (var j = 0; j < 20; ++j) {
+      if (formData[i]['name'] == "data[Entry]["+j+"][amount]") {
+	var val = formData[i]['value'].replace(/\$/,'');
+	//$("#debug").append('<P>Bad Amount');
+	if (!(val > 0)) {
+	  if (formData[i]['value'] == '')
+	    alert("Please enter an amount first.");
+	  else
+	    alert('"'+formData[i]['value']+'"' + " is not valid amount.  Please correct it.");
+	  return false;
+	}
+      }
+    }
+
+  }
+
+  //$("#debug").append('OK');
+  //return false;
+
+  $('#results').html('Working <BLINK>...</BLINK>');
+  return true; 
+} 
+ 
+// post-submit callback 
+function showResponse(responseText, statusText)  { 
+  if (statusText == 'success') {
+    var amount = 0;
+    $("input.payment.amount").each(function(i) {
+	amount += $(this).val();
+    });
+
+    $('#results').html('<H3>Receipt Saved<BR>' +
+		       $("#receipt-customer-name").html() +
+		       ' : ' + fmtCurrency(amount) +
+		       '</H3>');
+
+    if (!$("#repeat").attr("checked")) {
+      window.location.href =
+	"<?php echo $html->url(array('controller' => 'customers',
+		                     'action'     => 'view')); ?>"
+	+ "/" + $("#customer-id").val();
+      return;
+    }
+
+    // get a clean slate
+    resetForm();
+  }
+  else {
+    $('#results').html('<H2>Failed to save receipt!</H2>');
+    alert('Failed to save receipt.');
+  }
+}
+
+// Reset the form
+function resetForm() {
+  $('#payment-entry-id').val(1);
+  $('#payments').html('');
+
+  addPaymentSource(false);
+  updateCharges($("#customer-id").val());
+}
+
+function updateCharges(id) {
+  $('#charge-entries-jqGrid').clearGridData();
+  $("#receipt-balance").html("Calculating...");
+  $("#receipt-charges-caption").html("Please Wait...");
+
+  var filter = new Array();
+  filter['StatementEntry.customer_id'] = id;
+
+  var dynamic_post = new Array();
+  dynamic_post['filter'] = filter;
+
+  $('#charge-entries-jqGrid').setPostDataItem('dynamic_post_replace', serialize(dynamic_post));
+  $('#charge-entries-jqGrid')
+    .setGridParam({ page: 1 })
+    .trigger("reloadGrid");
+
+  var gridstate = $('#charge-entries-jqGrid').getGridParam('gridstate');
+  if (gridstate == 'hidden')
+    $('#charge-entries .HeaderButton').click();
+}
+
+function onGridLoadComplete() {
+  var userdata = $('#charge-entries-jqGrid').getGridParam('userData');
+  $('#receipt-balance').html(fmtCurrency(userdata['balance']));
+  $("#receipt-charges-caption").html("Outstanding Charges");
+}
+
+function onRowSelect(grid_id, customer_id) {
+  // Set the customer id that will be returned with the form
+  $("#customer-id").val(customer_id);
+
+  // Set the customer name, so the user knows who the receipt is for
+  $("#receipt-customer-name")
+    .html('<A HREF="view/' + customer_id + '">'
+	  + $(grid_id).getCell(customer_id, 'Customer-name')
+	  + '</A>');
+
+  // Hide the "no customer" message and show the current customer
+  $(".customer-selection-invalid").hide();
+  $(".customer-selection-valid").show();
+
+  // Update the charges grid to reflect this customer
+  updateCharges(customer_id);
+
+  // Collapse the grid now that the user has selected
+  $("#customers-list .HeaderButton").click();
+}
+
+function onGridState(grid_id, state) {
+  if (state == 'visible') {
+    $(".customer-selection-invalid").hide();
+    $(".customer-selection-valid").hide();
+  }
+  else {
+    if ($("#customer-id").val() > 0) {
+      $(".customer-selection-valid").show();
+      $(".customer-selection-invalid").hide();
+    } else {
+      $(".customer-selection-valid").hide();
+      $(".customer-selection-invalid").show();
+    }
+  }
+}
+
+function addPaymentSource(flash) {
+  addDiv('payment-entry-id', 'payment', 'payments', flash,
+	 // HTML section
+	 '<FIELDSET CLASS="payment subset">' +
+<?php /* '<LEGEND>Payment #%{id} (%{remove})</LEGEND>' + */ ?>
+	 '<LEGEND>Payment</LEGEND>' +
+
+	 '<DIV ID="payment-div-%{id}">' +
+	 <?php
+	 // Rearrange to be of the form (id => name)
+	 $radioOptions = array();
+	 foreach ($paymentTypes AS $type)
+	   $radioOptions[$type['TenderType']['id']] = $type['TenderType']['name'];
+
+	 echo FormatHelper::phpVarToJavascript
+	 ($form->input('Entry.%{id}.tender_type_id',
+		       array('type' => 'radio',
+			     'separator' => '<BR>',
+			     'onclick' => ('switchPaymentType(' .
+					   '\\\'payment-type-div\\\', ' .
+					   '%{id}, ' .
+					   '$(this).attr("id")' .
+					   ')' .
+					   //' return false;'
+					   ''
+					   ),
+			     'legend' => false,
+			     'value' => $defaultType,
+			     'options' => $radioOptions))) . "+\n";
+	 ?>
+	 '</DIV>' +
+
+	 '<DIV ID="payment-amount-div-%{id}" CLASS="input text required">' +
+	 ' <INPUT TYPE="text" SIZE="20"' +
+	 '  NAME="data[Entry][%{id}][amount]"' +
+	 '  CLASS="payment amount"' +
+	 '  ID="payment-amount-%{id}" />' +
+	 ' <LABEL CLASS="payment" FOR="payment-amount-%{id}">Amount</LABEL>' +
+	 '</DIV>' +
+
+	 <?php
+	 foreach ($paymentTypes AS $type) {
+	   $type = $type['TenderType'];
+	   $div  = '<DIV';
+	   $div .= ' ID="payment-type-div-%{id}-'.$type['id'].'"';
+	   $div .= ' CLASS="payment-type-div-%{id}"';
+	   if ($type['id'] != $defaultType)
+	     $div .= ' STYLE="display:none;"';
+	   $div .= '>';
+
+	   $div .= ' <INPUT TYPE="hidden"';
+	   $div .= '  NAME="data[Entry][%{id}][type]['.$type['id'].'][tender_type_id]"';
+	   $div .= '  VALUE="'.$type['id'].'"';
+	   $div .= '>';
+
+	   for ($i=1; $i<=4; ++$i) {
+	     if (!empty($type["data{$i}_name"])) {
+	       $div .= '<DIV CLASS="input text required">';
+	       $div .= ' <INPUT TYPE="text" SIZE="20"';
+	       $div .= '  NAME="data[Entry][%{id}][type]['.$type['id'].'][data'.$i.']"';
+	       $div .= '  CLASS="payment"';
+	       $div .= '  ID="payment-data'.$i.'-%{id}" />';
+	       $div .= ' <LABEL';
+	       $div .= '  CLASS="payment"';
+	       $div .= '  FOR="payment-data'.$i.'-%{id}">';
+	       $div .= $type["data{$i}_name"];
+	       $div .= ' </LABEL>';
+	       $div .= '</DIV>';
+	     }
+	   }
+
+	   $div .= '</DIV>';
+	   echo "'$div' +\n";
+	 }
+	 ?>
+
+	 '</FIELDSET>'
+	 );
+  }
+
+function switchPaymentType(paymentid_base, paymentid, radioid) {
+  var type_id = $("#"+radioid).val();
+  $("."+paymentid_base+"-"+paymentid+
+    ":not(" +
+    "#"+paymentid_base+"-"+paymentid+"-"+type_id +
+    ")").slideUp();
+  $("#"+paymentid_base+"-"+paymentid+"-"+type_id).slideDown();
+}
+
+--></script>
+
+<?php
+; // align
+// Re-Enable warnings
+Configure::write('debug', $saved_debug_state);
+
+echo $this->element('customers', array
+		    ('config' => array
+		     ('grid_div_id' => 'customers-list',
+		      'grid_div_class' => 'text-below',
+		      'caption' => ('<A HREF="#" ONCLICK="$(\'#customers-list .HeaderButton\').click();'.
+				    ' return false;">Select Customer</A>'),
+		      'grid_setup' => array('hiddengrid' => isset($customer['id'])),
+		      'grid_events' => array('onSelectRow' =>
+					     array('ids' =>
+						   'if (ids != null){onRowSelect("#"+$(this).attr("id"), ids);}'),
+					     'onHeaderClick' =>
+					     array('gridstate' =>
+						   'onGridState("#"+$(this).attr("id"), gridstate)'),
+					     ),
+		      'action' => 'current',
+		      'nolinks' => true,
+		      'limit' => 20,
+		      )));
+
+echo ('<DIV CLASS="receipt grid-selection-text">' .
+
+      '<DIV CLASS="customer-selection-valid" style="display:none">' .
+      'Customer: <SPAN id="receipt-customer-name"></SPAN>' .
+
+/*       '<DIV CLASS="supporting">' . */
+/*       '<TABLE>' . */
+/*       '<TR><TD CLASS="field">Balance:</TD><TD CLASS="value"><SPAN id="receipt-balance"></SPAN></TD></TR>' . */
+/*       '</TABLE>' . */
+/*       '</DIV>' . */
+
+      '</DIV>' . // END customer-selection-valid
+
+      '<DIV CLASS="customer-selection-invalid" style="display:none">' .
+      'Please select customer' .
+      '</DIV>' .
+
+      '</DIV>' . "\n");
+
+
+echo $this->element('statement_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     (
+		      'grid_div_id' => 'charge-entries',
+		      'grid_div_class' => 'text-below',
+		      'grid_events' => array('loadComplete' => 'onGridLoadComplete()'),
+		      'grid_setup' => array('hiddengrid' => true),
+		      'caption' => '<SPAN id="receipt-charges-caption"></SPAN>',
+		      'action' => 'unreconciled',
+		      'exclude' => array('Customer', 'Type', 'Debit', 'Credit'),
+		      'include' => array('Applied', 'Balance'),
+		      'remap' => array('Received' => 'Paid'),
+		      'limit' => 8,
+		      ),
+		     ));
+
+echo('<DIV CLASS="receipt grid-selection-text">' .
+     '<DIV CLASS="customer-selection-valid" style="display:none">' .
+
+     //'<DIV CLASS="supporting">' .
+     '<TABLE ID="supporting-table">' .
+     '<TR><TD CLASS="field">Balance:</TD><TD CLASS="value"><SPAN id="receipt-balance"></SPAN></TD></TR>' .
+     '</TABLE>' .
+     //'</DIV>' .
+
+     '</DIV>' . // END customer-selection-valid
+     '</DIV>' .
+     "\n");
+
+echo $form->create(null, array('id' => 'receipt-form',
+			       'url' => array('controller' => 'transactions',
+					      'action' => 'postReceipt')));
+
+
+echo $form->input("id",
+		  array('id' => 'customer-id',
+			'type' => 'hidden',
+			'value' => 0));
+
+echo $this->element('form_table',
+		    array('class'  => "item receipt transaction entry",
+			  //'with_name_after' => ':',
+			  'field_prefix' => 'Transaction',
+			  'fields' => array
+			  ("stamp"        => array('opts' => array('type' => 'text'),
+						   'between' => '<A HREF="#" ONCLICK="datepickerNow(\'TransactionStamp\'); return false;">Now</A>',
+						   ),
+			   "comment"      => array('opts' => array('size' => 50),
+						   ),
+			   )));
+
+echo "<BR>\n";
+echo $form->input('repeat', array('type'  => 'checkbox',
+				  'id'    => 'repeat',
+				  'label' => 'Enter Multiple Receipts')) . "\n";
+echo $form->submit('Generate Receipt') . "\n";
+?>
+
+<?php /*
+<fieldset CLASS="payment superset">
+ <legend>Payments</legend>
+*/ ?>
+ <input type="hidden" id="payment-entry-id" value="0">
+ <div id="payments"></div>
+<?php /*
+  <fieldset> <legend>
+   <a href="#" onClick="addPaymentSource(true); return false;">Add Another Payment</a>
+  </legend> </fieldset>
+</fieldset>
+*/ ?>
+
+<?php echo $form->end('Generate Receipt'); ?>
+
+<?php /* echo '</DIV>' . "\n"; // End of the dialog DIV */ ?>
+
+<div id="results"></div>
+<div id="output-debug" style="display:none"></div>
+
+<?php
+// Warnings _really_ screw up javascript
+Configure::write('debug', '0');
+?>
+
+<script type="text/javascript"><!--
+  $(document).ready(function(){
+      datepicker('TransactionStamp');
+
+      $("#customer-id").val(0);
+      $("#receipt-customer-name").html("INTERNAL ERROR");
+      $("#receipt-balance").html("INTERNAL ERROR");
+      $("#receipt-charges-caption").html("Outstanding Charges");
+
+      <?php if (isset($customer['id'])): ?>
+      $("#customer-id").val(<?php echo $customer['id']; ?>);
+      $("#receipt-customer-name").html("<?php echo $customer['name']; ?>");
+      $("#receipt-balance").html(fmtCurrency("<?php echo $stats['balance']; ?>"));
+      onGridState(null, 'hidden');
+      <?php else: ?>
+      onGridState(null, 'visible');
+      <?php endif; ?>
+
+      resetForm();
+      datepickerNow('TransactionStamp');
+
+      <?php if ($this->params['dev']): ?>
+      $('#output-debug').html('Post Output');
+      $('#output-debug').show();
+      <?php endif; ?>
+
+  });
+--></script>
+
+</div>

site/views/customers/view.ctp

@@ -9,12 +9,16 @@ echo '<div class="customer view">' . "\n";
  * Customer Detail Main Section
  */
 
-$rows = array(array('Name',    $customer['Customer']['name']),
-	      array('Comment', $customer['Customer']['comment']));
+$rows = array();
+$rows[] = array('Name',    $customer['Customer']['name']);
+$rows[] = array('Since',   FormatHelper::date($since, true));
+if (!empty($until))
+  $rows[] = array('Until',   FormatHelper::date($until, true));
+$rows[] = array('Comment', $customer['Customer']['comment']);
 
 echo $this->element('table',
 		    array('class'   => 'item customer detail',
-			  'caption' => 'Tenant Info',
+			  'caption' => 'Customer Info',
 			  'rows'    => $rows,
 			  'column_class' => array('field', 'value')));
 
@@ -26,7 +30,9 @@ echo $this->element('table',
 echo '<div class="infobox">' . "\n";
 $rows = array();
 $rows[] = array('Security Deposit:',  FormatHelper::currency($outstandingDeposit));
-$rows[] = array('Balance:',           FormatHelper::currency($outstandingBalance));
+//$rows[] = array('Charges:',           FormatHelper::currency($stats['charges']));
+//$rows[] = array('Payments:',          FormatHelper::currency($stats['disbursements']));
+$rows[] = array('Balance Owed:',      FormatHelper::currency($outstandingBalance));
 echo $this->element('table',
 		    array('class'   => 'summary',
 			  'rows'    => $rows,
@@ -47,32 +53,147 @@ echo '<div CLASS="detail supporting">' . "\n";
 
 
 /**********************************************************************
- * Contacts
+ * Unpaid Charges
  */
-echo $this->element('contacts',
-		    array('caption' => 'Customer Contacts',
-			  'contacts' => $customer['Contact']));
 
+echo $this->element('statement_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Outstanding Charges',
+		      'limit'   => 10,
+		      'action'  => 'unreconciled',
+		      'filter'  => array('StatementEntry.customer_id' => $customer['Customer']['id']),
+		      'exclude' => array('Customer'),
+		      )));
+
+
+/**********************************************************************
+ * Customer Credits
+ */
+
+echo $this->element('statement_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Oustanding Credits',
+		      'grid_div_id' => 'surplus',
+		      'limit'   => 10,
+		      'filter' => array('Customer.id' => $customer['Customer']['id'],
+					'StatementEntry.type' => 'SURPLUS'),
+		      'exclude' => array('Entry', 'Effective', 'Customer', 'Unit', 'Account', 'Debit', 'Credit'),
+		      'include' => array('Transaction', 'Amount'),
+		      'remap'   => array('Transaction' => 'Receipt'),
+		      )));
+
+
+/**********************************************************************
+ * Receipt History
+ */
+
+echo $this->element('ledger_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Receipts',
+		      'limit'   => 5,
+		      'filter' => array('Customer.id' => $customer['Customer']['id'],
+					'Transaction.type' => 'RECEIPT',
+					'Tender.id !=' => null,
+					//'Account.id !=' => '-AR-'
+					),
+		      'include' => array('Transaction'),
+		      'exclude' => array('Entry', 'Account', 'Cr/Dr'),
+		      'remap'   => array('Transaction' => 'Receipt'),
+		      )));
+
+
+/**********************************************************************
+ * Invoice History
+ */
+
+/* NOT COMPLETED
+echo $this->element('transactions', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Invoices',
+		      'limit'   => 5,
+		      'filter' => array('Customer.id' => $customer['Customer']['id'],
+					'Transaction.type' => 'INVOICE',
+					),
+		      //'include' => array(),
+		      'exclude' => array('Type'),
+		      'remap'   => array('ID' => 'Invoice',
+					 //'Timestamp' => 'Date',
+					 'Entries' => 'Charges'),
+		      )));
+NOT COMPLETED */
 
 /**********************************************************************
  * Lease History
  */
-echo $this->element('leases',
-		    array('caption' => 'Lease History',
-			  'leases' => $customer['Lease']));
+
+echo $this->element('leases', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Lease History',
+		      'limit'   => 5,
+		      'filter'  => array('Customer.id' => $customer['Customer']['id']),
+		      'exclude' => array('Customer'),
+		      'sort_column' => 'Move-In',
+		      'sort_order'  => 'DESC',
+		      )));
 
 
 /**********************************************************************
- * Customer Account History
+ * Contacts
  */
 
-echo $this->element('ledger_entries',
-		    array('caption' => 'Account',
-			  'customer_id' => $customer['Customer']['id'],
-			  'ar_account' => true,
-			  ));
+echo $this->element('contacts', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Customer Contacts',
+		      'limit'   => 5,
+		      'filter'  => array('Customer.id' => $customer['Customer']['id']),
+		      'include' => array('Relationship'),
+		      )));
 
 
+/**********************************************************************
+ * Customer Statement History
+ */
+
+echo $this->element('statement_entries', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Customer Statement',
+		      'grid_setup' => array('hiddengrid' => true),
+		      'filter' => array('Customer.id' => $customer['Customer']['id'],
+					'type !=' => 'VOID'),
+		      //'include' => array('Sub-Total'),
+		      'exclude' => array('Customer'),
+		      )));
+
+
+/**********************************************************************
+ * Customer Transaction History
+ */
+
+echo $this->element('transactions', array
+		    (// Grid configuration
+		     'config' => array
+		     ('caption' => 'Balance History',
+		      'limit'   => 10000,
+		      'limitOptions' => array('10000'),
+		      'sort_column' => 'Timestamp',
+		      'sort_order' => 'ASC',
+		      'grid_setup' => array('hiddengrid' => true),
+		      'filter' => array('Customer.id' => $customer['Customer']['id']),
+		      'include' => array('Comment', 'PosNeg', 'Balance'),
+		      'exclude' => array('Amount', 'Entries'),
+		      'remap'   => array(//'ID' => 'Invoice',
+					 'PosNeg' => 'Amount',
+					 //'Entries' => 'Charges',
+					 ),
+		      )));
+
 /* End "detail supporting" div */
 echo '</div>' . "\n";
 

site/views/double_entries/view.ctp

@@ -0,0 +1,98 @@
+<?php /* -*- mode:PHP -*- */
+
+echo '<div class="double-entry view">' . "\n";
+
+// The two entries, debit and credit, are actually individual
+// entries in separate accounts (each make up one of the two
+// entries required for "double entry").
+
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * DoubleEntry Detail Main Section
+ */
+
+$transaction    = $entry['Transaction'];
+$ledgers        = array('debit'  => $entry['DebitLedger'],
+			'credit' => $entry['CreditLedger']);
+$entries        = array('debit'  => $entry['DebitEntry'],
+			'credit' => $entry['CreditEntry']);
+$entry          = $entry['DoubleEntry'];
+
+$rows = array();
+$rows[] = array('Transaction',      $html->link('#'.$transaction['id'],
+						array('controller' => 'transactions',
+						      'action'     => 'view',
+						      $transaction['id'])));
+$rows[] = array('Timestamp',        FormatHelper::datetime($transaction['stamp']));
+$rows[] = array('Comment',          $entry['comment']);
+
+echo $this->element('table',
+		    array('class'   => 'item double-entry detail',
+			  'caption' => 'Double Ledger Entry',
+			  'rows'    => $rows,
+			  'column_class' => array('field', 'value')));
+
+
+
+/**********************************************************************
+ * Debit/Credit Entries
+ */
+
+echo ('<DIV CLASS="ledger-double-entry">' . "\n");
+foreach ($ledgers AS $type => $ledger) {
+  $rows = array();
+
+  // REVISIT <AP>: 20090816
+  //  Due to low priority, the ledger_entry/double_entry stuff
+  //  is a bit piecemeal at the moment (trying to reuse old
+  //  code as much as possible).  So, LedgerEntry view is just
+  //  redirecting here.  Of course, presenting a link for the
+  //  LedgerEntry then is, well, quite pointless.
+  $rows[] = array('ID',        '#' . $entries[$type]['id']);
+/*   $rows[] = array('ID',        $html->link('#' . $entries[$type]['id'], */
+/* 					   array('controller' => 'entries', */
+/* 						 'action'     => 'view', */
+/* 						 $entries[$type]['id']))); */
+  $rows[] = array('Account',   ($ledger['link']
+				? $html->link($ledger['Account']['name'],
+					      array('controller' => 'accounts',
+						    'action'     => 'view',
+						    $ledger['Account']['id']))
+				: $ledger['Account']['name']));
+  $rows[] = array('Ledger',    ($ledger['link']
+				? $html->link('#' . $ledger['sequence'],
+					      array('controller' => 'ledgers',
+						    'action'     => 'view',
+						    $ledger['id']))
+				: '#' . $ledger['sequence']));
+  $rows[] = array('Amount',    FormatHelper::currency($entries[$type]['amount']));
+  //$rows[] = array('Effect',    $ledger['Account']['ftype'] == $type ? 'INCREASE' : 'DECREASE');
+
+  echo $this->element('table',
+		      array('class'   => array('item', $type, 'detail'),
+			    'caption' => ucfirst($type) . ' Entry',
+			    'rows'    => $rows,
+			    'column_class' => array('field', 'value')));
+}
+echo ('</DIV>' . "\n");
+
+
+
+/**********************************************************************
+ **********************************************************************
+ **********************************************************************
+ **********************************************************************
+ * Supporting Elements Section
+ */
+
+echo '<div CLASS="detail supporting">' . "\n";
+
+
+/* End "detail supporting" div */
+echo '</div>' . "\n";
+
+/* End page div */
+echo '</div>' . "\n";

site/views/elements/accounts.ctp

@@ -2,28 +2,19 @@
 
 // Define the table columns
 $cols = array();
-$cols['ID']       = array('index' => 'Account.id',       'formatter' => 'id');
-$cols['Name']     = array('index' => 'Account.name',     'formatter' => 'name', 'width' => '250');
-$cols['Type']     = array('index' => 'Account.type',     'width' => '60');
-$cols['Entries']  = array('index' => 'entries',          'width' => '60', 'align' => 'right');
+$cols['Name']     = array('index' => 'Account.name',     'formatter' => 'longname');
+$cols['Type']     = array('index' => 'Account.type',     'formatter' => 'enum');
+$cols['Entries']  = array('index' => 'entries',          'formatter' => 'number');
 $cols['Debits']   = array('index' => 'debits',           'formatter' => 'currency');
 $cols['Credits']  = array('index' => 'credits',          'formatter' => 'currency');
 $cols['Balance']  = array('index' => 'balance',          'formatter' => 'currency');
 $cols['Comment']  = array('index' => 'Account.comment',  'formatter' => 'comment');
 
-$jqGrid_options = array('jqGridColumns' => $cols,
-			'controller' => 'accounts',
-			'caption' => isset($caption) ? $caption : null);
-
-if (isset($accounts)) {
-  $jqGrid_options += array('custom_ids' =>
-			   array_map(create_function('$data',
-						     'return $data["id"];'),
-				     $accounts),
-			   'limit' => 5);
-}
-else {
-  $jqGrid_options += array('search_fields' => array('Name'));
-}
-
-echo $this->element('jqGrid', $jqGrid_options);
+// Render the grid
+$grid
+->columns($cols)
+->sortField('Name')
+->defaultFields(array('Name'))
+->searchFields(array('Name'))
+->render($this, isset($config) ? $config : null,
+	 array_diff(array_keys($cols), array('Comment')));

site/views/elements/contacts.ctp

@@ -2,29 +2,19 @@
 
 // Define the table columns
 $cols = array();
-$cols['ID']          = array('index' => 'Contact.id',           'formatter' => 'id');
-$cols['Last Name']   = array('index' => 'Contact.last_name',    'formatter' => 'name');
-$cols['First Name']  = array('index' => 'Contact.first_name',   'formatter' => 'name');
-$cols['Company']     = array('index' => 'Contact.company_name', 'formatter' => 'longname');
-if (0) { // REVISIT<AP>: Need to figure out how to put this in play
-  $cols['Type']    = array('index' => 'ContactsCustomer.type',   'width' => '75');
-  $cols['Active']  = array('index' => 'ContactsCustomer.active', 'width' => '75');
-}
-$cols['Comment']     = array('index' => 'Contact.comment',      'formatter' => 'comment');
+$cols['Relationship'] = array('index' => 'ContactsCustomer.type',   'formatter' => 'enum');
+$cols['Name']         = array('index' => 'Contact.display_name',    'formatter' => 'longname');
+$cols['Last Name']    = array('index' => 'Contact.last_name',       'formatter' => 'name');
+$cols['First Name']   = array('index' => 'Contact.first_name',      'formatter' => 'name');
+$cols['License']      = array('index' => 'Contact.id_local',        'formatter' => 'name');
+$cols['Company']      = array('index' => 'Contact.company_name',    'formatter' => 'longname');
+$cols['Comment']      = array('index' => 'Contact.comment',         'formatter' => 'comment');
 
-$jqGrid_options = array('jqGridColumns' => $cols,
-			'controller' => 'contacts',
-			'caption' => isset($caption) ? $caption : null);
-
-if (isset($contacts)) {
-  $jqGrid_options += array('custom_ids' =>
-			   array_map(create_function('$data',
-						     'return $data["id"];'),
-				     $contacts),
-			   'limit' => 5);
-}
-else {
-  $jqGrid_options += array('search_fields' => array('Last Name', 'First Name'));
-}
-
-echo $this->element('jqGrid', $jqGrid_options);
+// Render the grid
+$grid
+->columns($cols)
+->sortField('Last Name')
+->defaultFields(array('Last Name', 'First Name'))
+->searchFields(array('Last Name', 'First Name', 'Company'))
+->render($this, isset($config) ? $config : null,
+	 array_diff(array_keys($cols), array('Relationship', 'License', 'Comment')));

site/views/elements/customers.ctp

@@ -2,33 +2,22 @@
 
 // Define the table columns
 $cols = array();
-$cols['ID']          = array('index' => 'Customer.id',                'formatter' => 'id');
-if (0) // REVISIT<AP>: Need to figure out how to put this in play
-  $cols['Relationship']  = array('index' => 'ContactsCustomer.type',  'width' => '75');
-$cols['Name']        = array('index' => 'Customer.name',              'formatter' => 'longname');
-$cols['Last Name']   = array('index' => 'PrimaryContact.last_name',   'formatter' => 'name');
-$cols['First Name']  = array('index' => 'PrimaryContact.first_name',  'formatter' => 'name');
-$cols['Leases']      = array('index' => 'lease_count',                'width' => '60');
-$cols['Balance']     = array('index' => 'balance',                    'formatter' => 'currency', 'sortable' => false);
-$cols['Comment']     = array('index' => 'Customer.comment',           'formatter' => 'comment');
+$cols['Customer']      = array('index' => 'Customer.id',                'formatter' => 'id');
+$cols['Relationship']  = array('index' => 'ContactsCustomer.type',      'formatter' => 'enum');
+$cols['Name']          = array('index' => 'Customer.name',              'formatter' => 'longname');
+$cols['Last Name']     = array('index' => 'PrimaryContact.last_name',   'formatter' => 'name');
+$cols['First Name']    = array('index' => 'PrimaryContact.first_name',  'formatter' => 'name');
+$cols['Units']         = array('index' => 'current_lease_count',        'formatter' => 'number');
+$cols['Past Leases']   = array('index' => 'past_lease_count',           'formatter' => 'number');
+$cols['Leases']        = array('index' => 'lease_count',                'formatter' => 'number');
+$cols['Balance']       = array('index' => 'balance',                    'formatter' => 'currency');
+$cols['Comment']       = array('index' => 'Customer.comment',           'formatter' => 'comment');
 
-$jqGrid_options = array('jqGridColumns' => $cols,
-			'controller' => 'customers');
-
-// User requested options have priority
-$jqGrid_options += compact('grid_div_id', 'grid_id', 'caption', 'grid_setup', 'limit');
-
-if (isset($customers)) {
-  $jqGrid_options += array('custom_ids' =>
-			   array_map(create_function('$data',
-						     'return $data["id"];'),
-				     $customers),
-			   'limit' => 5);
-}
-
-// Not the long term solution here... just for testing
-if (isset($searchfields)) {
-  $jqGrid_options += array('search_fields' => array('Last Name', 'First Name'));
-}
-
-echo $this->element('jqGrid', $jqGrid_options);
+// Render the grid
+$grid
+->columns($cols)
+->sortField('Name')
+->defaultFields(array('Name'))
+->searchFields(array('Name', 'Last Name', 'First Name'))
+->render($this, isset($config) ? $config : null,
+	 array_diff(array_keys($cols), array('Relationship', 'Past Leases', 'Comment')));

site/views/elements/form_table.ctp

@@ -0,0 +1,135 @@
+<?php /* -*- mode:PHP -*- */
+
+/* form_table.ctp */
+/*
+ *
+ * @filesource
+ * @copyright     Copyright 2009, Abijah Perkins
+ * @package       pmgr
+ */
+
+$include_before = false;
+if (isset($before) && $before)
+  $include_before = true;
+foreach ($fields AS $field => $config) {
+  if (isset($config['before']))
+    $include_before = true;
+}
+
+$include_between = false;
+if (isset($between) && $between)
+  $include_between = true;
+foreach ($fields AS $field => $config) {
+  if (isset($config['between']))
+    $include_between = true;
+}
+
+$include_after = false;
+if (isset($after) && $after)
+  $include_after = true;
+foreach ($fields AS $field => $config) {
+  if (isset($config['after']))
+    $include_after = true;
+}
+
+if (empty($column_class))
+  $column_class = array();
+if ($include_before)
+  $column_class[] = 'before';
+$column_class[] = 'field';
+if ($include_between)
+  $column_class[] = 'between';
+$column_class[] = 'value';
+if ($include_after)
+  $column_class[] = 'after';
+
+$rows = array();
+foreach ($fields AS $field => $config) {
+  if (!isset($config))
+    continue;
+
+  if (is_bool($config) && !$config)
+    continue;
+
+  if (is_bool($config) && $config)
+    $config = array();
+
+  if (!isset($config['name']))
+    $config['name'] = implode(' ', array_map('ucfirst', explode('_', $field)));
+  if (!isset($config['opts']))
+    $config['opts'] = null;
+
+  if (isset($config['prefix']) && !isset($config['no_prefix']))
+    $field = $config['prefix'] . '.' . $field;
+  elseif (isset($field_prefix) && !isset($config['no_prefix']))
+    $field = $field_prefix . '.' . $field;
+
+  if (!isset($config['opts']['label']))
+    $config['opts']['label'] = false;
+  if (!isset($config['opts']['div']))
+    $config['opts']['div'] = false;
+
+  $cells = array();
+  if ($include_before) {
+    if (isset($config['before']))
+      $cells[] = $config['before'];
+    elseif (isset($before) && $before)
+      $cells[] = $before;
+    else
+      $cells[] = null;
+  }
+
+  if (empty($config['opts']['label']))
+    $name = $form->label($field, $config['name'],
+			 empty($config['label_attributes'])
+			 ? null : $config['label_attributes']);
+  else
+    $name = $config['name'];
+
+  if (isset($config['with_name_before']))
+    $name = $config['with_name_before'] . $name;
+  elseif (isset($with_name_before))
+    $name = $with_name_before . $name;
+  if (isset($config['with_name_after']))
+    $name = $name . $config['with_name_after'];
+  elseif (isset($with_name_after))
+    $name = $name . $with_name_after;
+  $cells[] = $name;
+
+  if ($include_between) {
+    if (isset($config['between']))
+      $cells[] = $config['between'];
+    elseif (isset($between) && $between)
+      $cells[] = $between;
+    else
+      $cells[] = null;
+  }
+
+  $value = $form->input($field, $config['opts']);
+  if (isset($config['with_value_before']))
+    $value = $config['with_value_before'] . $value;
+  elseif (isset($with_value_before))
+    $value = $with_value_before . $value;
+  if (isset($config['with_value_after']))
+    $value = $value . $config['with_value_after'];
+  elseif (isset($with_value_after))
+    $value = $value . $with_value_after;
+  $cells[] = $value;
+
+  if ($include_after) {
+    if (isset($config['after']))
+      $cells[] = $config['after'];
+    elseif (isset($after) && $after)
+      $cells[] = $after;
+    else
+      $cells[] = null;
+  }
+
+  $rows[] = $cells;
+}
+
+echo $this->element('table',
+		    compact('id', 'class', 'caption', 'headers',
+			    'rows', 'row_class', 'suppress_alternate_rows',
+			    'column_class')
+		    );

site/views/elements/jqGrid.ctp

@@ -8,9 +8,9 @@ if (!isset($limit))
 
 if (!isset($limitOptions)) {
   $limitOptions = array($limit);
-  if ($limit < 10)
+  if ($limit <= 10)
     array_push($limitOptions, 2, 5);
-  if ($limit < 30)
+  if ($limit <= 30)
     array_push($limitOptions, 10, 25);
   if ($limit > 10)
     array_push($limitOptions, 25, 50, 200);
@@ -19,6 +19,7 @@ if (!isset($limitOptions)) {
 }
 sort($limitOptions, SORT_NUMERIC);
 $limitOptions = array_unique($limitOptions, SORT_NUMERIC);
+//$limitOptions[] = 'ALL';  // Would be nice... jqGrid shows 'NaN of NaN'
 
 if (!isset($height))
   $height = 'auto';
@@ -39,16 +40,17 @@ if (!isset($grid_id))
 if (!isset($search_fields))
   $search_fields = array();
 
+if (!isset($grid_events))
+  $grid_events = array();
+
 if (!isset($grid_setup))
   $grid_setup = array();
 
 // Do some prework to bring in the appropriate libraries
-$imgpath = '/pmgr/site/css/jqGrid/basic/images';
-$html->css('jqGrid/basic/grid', null, null, false);
-$html->css('jqGrid/jqModal', null, null, false);
-$javascript->link('jqGrid/jquery.jqGrid.js', false);
-$javascript->link('jqGrid/js/jqModal', false);
-$javascript->link('jqGrid/js/jqDnR', false);
+$html->css('ui.jqgrid', null, null, false);
+$javascript->link('jqGrid/grid.locale-en', false);
+$javascript->link('jqGrid/jquery.jqGrid.min', false);
+$javascript->link('jqGrid/grid.postext', false);
 $javascript->link('pmgr_jqGrid', false);
 
 
@@ -59,62 +61,76 @@ $javascript->link('pmgr_jqGrid', false);
 // we'll just pass the desired fields to the controller
 // as part of the data fetch.
 $url = $html->url(array('controller' => $controller,
-			'action'     => 'jqGridData',
-			'debug'      => 0,
+			'action'     => 'gridData',
 			));
 
 // Create extra parameters that jqGrid will pass to our
 // controller whenever data is requested.
 // 'fields' will allow the controller to return only the
-// requested fields, and in the right order.  Since fields
-// is a complex structure (an array), we'll need to
-// serialize it first for transport over HTTP.
+// requested fields, and in the right order.
 $postData = array();
-$postData['fields'] = serialize(array_map(create_function('$col',
-							  'return $col["index"];'),
-					  array_values($jqGridColumns)));
+$postData['fields'] = array_map(create_function('$col',
+						'return $col["index"];'),
+				array_values($jqGridColumns));
 
 // Determine if we're to be using a custom list, or if
 // the data will simply be action based.
 if (isset($custom_ids)) {
   if (!isset($action))
     $action = 'idlist';
-  $postData['idlist'] = serialize($custom_ids);
-}
-elseif (!isset($action)) {
-  $action = null;
+  $postData['idlist'] = $custom_ids;
 }
 
-if (isset($custom_post_data)) {
-  $postData['custom'] = serialize($custom_post_data);
-}
+if (isset($nolinks))
+  $postData['nolinks'] = true;
 
-// 'action' will ensure that the controller provides the
-// correct subset of data
-$postData['action'] = $action;
+// 'action' will ensure that the controller does the right thing
+// 'filter' allows the app controller to automagic filter
+// 'custom' is for use solely by derived controllers
+$postData['action'] = isset($action) ? $action : null;
+$postData['filter'] = isset($filter) ? $filter : null;
+$postData['custom'] = isset($custom_post_data) ? $custom_post_data : null;
 
 
 // Perform column customizations.
 // This will largely be based off of the 'formatter' parameter,
 // but could be on any pertinent condition.
-foreach ($jqGridColumns AS &$col) {
+foreach ($jqGridColumns AS $header => &$col) {
   $default = array();
 
   // Make sure every column has a name
-  $default['name'] = preg_replace("/\./", '-', $col['index']);
+  $default['name']  = preg_replace("/\./", '-', $col['index']);
+  $default['force'] = isset($col['forcewidth']) ? $col['forcewidth'] : null;
 
   // Perform customization based on formatter
   if (isset($col['formatter'])) {
     if ($col['formatter'] === 'id') {
-      // Switch currency over to our own custom formatting
+      // Use our custom formatting for ids
       $col['formatter'] = array('--special' => 'idFormatter');
       $default['width'] = 50;
       $default['align'] = 'center';
+
+      // For IDs, force the width by default,
+      // unless otherwise instructed NOT to.
+      if (!isset($default['force']))
+	$default['force'] = true;
+    }
+    elseif ($col['formatter'] === 'number') {
+      $default['width'] = 60;
+      $default['align'] = 'right';
+
+      // No special formatting for number
+      unset($col['formatter']);
+    }
+    elseif ($col['formatter'] === 'percentage') {
+      $col['formatter'] = array('--special' => 'percentageFormatter');
+      $default['width'] = 60;
+      $default['align'] = 'right';
     }
     elseif ($col['formatter'] === 'currency') {
-      // Switch currency over to our own custom formatting
+      // Use our custom formatting for currency
       $col['formatter'] = array('--special' => 'currencyFormatter');
-      $default['width'] = 80;
+      $default['width'] = 65;
       $default['align'] = 'right';
     }
     elseif ($col['formatter'] === 'date') {
@@ -122,21 +138,45 @@ foreach ($jqGridColumns AS &$col) {
       $default['width'] = 90;
       $default['align'] = 'center';
     }
-    elseif ($col['formatter'] === 'name' || $col['formatter'] === 'longname') {
+    elseif (preg_match("/^(long|short)?name$/",
+		       $col['formatter'], $matches)) {
       $default['width'] = 100;
-      if ($col['formatter'] === 'longname')
+      if (!empty($matches[1]) && $matches[1] === 'long')
 	$default['width'] *= 1.5;
+      if (!empty($matches[1]) && $matches[1] === 'short')
+	$default['width'] *= 0.7;
 
       // No special formatting for name
       unset($col['formatter']);
     }
+    elseif (preg_match("/^(long|short)?enum$/",
+		       $col['formatter'], $matches)) {
+      $default['width'] = 60;
+      if (!empty($matches[1]) && $matches[1] === 'long')
+	$default['width'] *= 1.5;
+      if (!empty($matches[1]) && $matches[1] === 'short')
+	$default['width'] *= 0.7;
+
+      //$default['align'] = 'right';
+
+      // No special formatting for enum
+      unset($col['formatter']);
+    }
     elseif ($col['formatter'] === 'comment') {
-      $default['width'] = 300;
+      $default['width'] = 150;
       $default['sortable'] = false;
 
       // No special formatting for comment
       unset($col['formatter']);
     }
+    // else just let the formatter pass through untouched
+
+    // Just a rough approximation to ensure columns
+    // are wide enough to fully display their header.
+    $min_width = strlen($header) * 7;
+    $min_width = 0; // REVISIT <AP>: 20090829; if/while jqGrid is fixed width
+    if ((!isset($default['width']) || $default['width'] < $min_width) && !$default['force'])
+      $default['width'] = $min_width;
   }
 
   $col = array_merge($default, $col);
@@ -151,27 +191,73 @@ if (isset($sort_column)) {
 }
 $sortname = $sortname['index'];
 
+// Set the default sort order
+if (isset($sort_order)) {
+  $sortorder = $sort_order;
+} else {
+  $sortorder = 'ASC';
+}
+
+$debug = !empty($this->params['dev']);
+if ($debug)
+  $caption .= '<span class="debug grid-query"> :: <span id="'.$grid_id.'-query"></span></span>';
+
+$caption .= ('<span class="grid-error" id="'.$grid_id.'-error"' .
+	     ' style="display:none"> :: Error (Please Reload)</span>');
+
+foreach (array_merge(array('loadComplete' => '', 'loadError' => ''),
+		     $grid_events) AS $event => $statement) {
+  $params = '';
+  if (is_array($statement)) {
+    $params    = key($statement);
+    $statement = current($statement);
+  }
+
+  if ($event == 'loadComplete' && $debug) {
+    $grid_events[$event] = 
+      array('--special' => "function($params) {url=jQuery('#{$grid_id}').getGridParam('url');url=url+'/debug:1?'; pd=jQuery('#{$grid_id}').getPostData();$.each(pd,function(i){ url+=i+'='+escape(pd[i])+'&'; }); jQuery('#{$grid_id}-query').html('<A HREF=\"'+url+'\">Grid Query</A><BR>'); $statement;}");
+  }
+  elseif ($event == 'loadError' && $debug) {
+    $grid_events[$event] = 
+      array('--special' => "function($params) {url=jQuery('#{$grid_id}').getGridParam('url');url=url+'/debug:1?'; pd=jQuery('#{$grid_id}').getPostData();$.each(pd,function(i){ url+=i+'='+escape(pd[i])+'&'; }); jQuery('#{$grid_id}-query').html('<A HREF=\"'+url+'\">Grid Error Query</A><BR>'); $statement;}");
+  }
+  elseif ($event == 'loadComplete' && !$debug) {
+    $grid_events[$event] = 
+      array('--special' => "function($params) {jQuery('#{$grid_id}-error').hide(); $statement;}");
+  }
+  elseif ($event == 'loadError' && !$debug) {
+    $grid_events[$event] = 
+      array('--special' => "function($params) {jQuery('#{$grid_id}-error').show(); $statement;}");
+  }
+  else {
+    $grid_events[$event] = 
+      array('--special' => "function($params) { $statement; }");
+  }
+}
+
+
 // Configure the grid setup, giving priority to user defined parameters
 $jqGrid_setup = array_merge
   (array('mtype'       => 'GET',
 	 'datatype'    => 'xml',
 	 'url'         => $url,
-	 'postData'    => $postData,
+	 // Since postData is a complex structure (an array), we'll
+	 // need to serialize it first for transport over HTTP.
+	 'postData'    => array('post' => serialize($postData)),
 	 'colNames'    => array_keys($jqGridColumns),
 	 'colModel'    => array('--special' => $jqGridColumns),
 	 'height'      => $height,
+	 'width'       => 700,
 	 'rowNum'      => $limit,
 	 'rowList'     => $limitOptions,
 	 'sortname'    => $sortname,
+	 'sortorder'   => $sortorder,
 	 'caption'     => $caption,
-	 'imgpath'     => $imgpath,
 	 'viewrecords' => true,
+	 'gridview'    => true,
 	 'pager'       => $grid_id.'-pager',
-
-	 'loadComplete'    => array('--special' => "function() {url=jQuery('#{$grid_id}').getGridParam('url');url=url.replace(/\/debug.*$/,'?'); pd=jQuery('#{$grid_id}').getPostData();$.each(pd,function(i){ url+=i+'='+escape(pd[i])+'&'; }); jQuery('#{$grid_id}-query').html('<A HREF=\"'+url+'\">Grid Query</A><BR>');}"),
-	 'loadError'    => array('--special' => "function(xhr,st,err) {url=jQuery('#{$grid_id}').getGridParam('url');url=url.replace(/\/debug.*$/,'?'); pd=jQuery('#{$grid_id}').getPostData();$.each(pd,function(i){ url+=i+'='+escape(pd[i])+'&'; }); jQuery('#{$grid_id}-query').html('<A HREF=\"'+url+'\">Grid Error Query</A><BR>');}"),
-
 	 ),
+   $grid_events,
    $grid_setup
    );
 //pr(compact('grid_setup', 'jqGrid_setup'));
@@ -181,68 +267,46 @@ $jqGrid_setup = array_merge
 // to kick this thing off.
 ?>
 
+<?php if ($first_grid): ?>
+<script type="text/javascript"><!--
+var currencyFormatter = function(cellval, opts, rowObject) {
+  if (!cellval)
+    return "";
+  return fmtCurrency(cellval);
+}
+
+var percentageFormatter = function(cellval, opts, rowObject) {
+  var precision;
+  if (typeof(opts.colModel) != 'undefined' &&
+      typeof(opts.colModel.formatoptions) != 'undefined' &&
+      typeof(opts.colModel.formatoptions.precision) != 'undefined')
+    precision = opts.colModel.formatoptions.precision;
+  else
+    precision = 0;
+  amount = cellval.toString().replace(/\%/g,'');
+  amount = (amount*100).toFixed(precision);
+  return amount+'%';
+}
+
+var idFormatter = function(cellval, opts, rowObject) {
+  if (!cellval)
+    return cellval;
+  return '#'+cellval;
+}
+--></script>
+<?php endif; ?>
+
+
 <DIV ID="<?php echo $grid_div_id; ?>" CLASS="<?php echo $grid_div_class; ?>">
 <table id="<?php echo $grid_id; ?>" class="scroll"></table> 
 <div id="<?php echo $grid_id; ?>-pager" class="scroll" style="text-align:right"></div> 
-<div id="<?php echo $grid_id; ?>-query"></div>
 <script type="text/javascript"><!--
-
 jQuery(document).ready(function(){ 
-  currencyFormatter = function(el, cellval, opts) {
-    if (!cellval)
-      return;
-    $(el).html(fmtCurrency(cellval));
-  }
-
-  idFormatter = function(el, cellval, opts) {
-    if (!cellval)
-      return;
-    $(el).html('#'+cellval);
-  }
-
   jQuery('#<?php echo $grid_id; ?>').jqGrid(
-    <?php echo FormatHelper::phpVarToJavascript($jqGrid_setup); ?>
-  ).navGrid('#<?php echo $grid_id; ?>-pager',
-	    { view:false,
-		edit:false,
-		add:false,
-		del:false,
-		search:true,
-		refresh:true});
-
-<?php
-/*   jQuery('#t_<?php echo $grid_id; ?>').height(25).hide() */
-/*     .filterGrid('#<?php echo $grid_id; ?>', { */
-/*       gridModel:true, */
-/* 	  gridToolbar:true, */
-/* 	  autosearch:true, */
-/* 	  }); */
-
-/*   jQuery('#<?php echo $grid_id; ?>').navGrid('#<?php echo $grid_id; ?>-pager', */
-/* 				   { view:false,   */
-/* 				     edit:false, */
-/* 				       add:false, */
-/* 				       del:false, */
-/* 				       search:false, */
-/* 				       refresh:false}) */
-/*     .navButtonAdd('#<?php echo $grid_id; ?>-pager',{ */
-/*       caption:"Search", */
-/* 	  title:"Toggle Search", */
-/* 	  buttonimg:'<?php echo $imgpath; ?>' + '/find.gif', */
-/* 	  onClickButton:function(){ */
-/* 	  if(jQuery('#t_<?php echo $grid_id; ?>').css("display")=="none") { */
-/* 	    jQuery('#t_<?php echo $grid_id; ?>').css("display",""); */
-/* 	  } else { */
-/* 	    jQuery('#t_<?php echo $grid_id; ?>').css("display","none"); */
-/* 	  } */
-/* 	} */
-/*       }); */
-?>
-
+    <?php echo FormatHelper::phpVarToJavascript($jqGrid_setup) . "\n"; ?>
+  ).navGrid('#<?php echo $grid_id; ?>-pager', { view:false,edit:false,add:false,del:false,search:true,refresh:true});
 });
-
 --></script>
-
 <?php
   if (count($search_fields) > 0) {
     echo('<div>Search By:<BR>' . "\n");

site/views/elements/leases.ctp

@@ -3,27 +3,35 @@
 // Define the table columns
 $cols = array();
 $cols['Lease']     = array('index' => 'Lease.number',        'formatter' => 'id');
-$cols['Unit']      = array('index' => 'Unit.name',           'width' => '50',  'align' => 'center');
+$cols['Unit']      = array('index' => 'Unit.name',           'formatter' => 'shortname',  'align' => 'center');
+$cols['Customer id'] = array('index' => 'Customer.id',       'hidden' => true);
 $cols['Customer']  = array('index' => 'Customer.name',       'formatter' => 'longname');
+$cols['Rent']      = array('index' => 'Lease.rent',          'formatter' => 'currency');
+$cols['Deposit']   = array('index' => 'Lease.deposit',       'formatter' => 'currency');
 $cols['Signed']    = array('index' => 'Lease.lease_date',    'formatter' => 'date');
 $cols['Move-In']   = array('index' => 'Lease.movein_date',   'formatter' => 'date');
 $cols['Move-Out']  = array('index' => 'Lease.moveout_date',  'formatter' => 'date');
-$cols['Balance']   = array('index' => 'Lease.balance',       'formatter' => 'currency', 'sortable'=>false);
+$cols['Closed']    = array('index' => 'Lease.close_date',    'formatter' => 'date');
+$cols['Charge-Thru'] = array('index' => 'Lease.charge_through_date', 'formatter' => 'date');
+$cols['Paid-Thru'] = array('index' => 'Lease.paid_through_date', 'formatter' => 'date');
+$cols['Status']    = array('index' => 'status',              'formatter' => 'longenum');
+$cols['Balance']   = array('index' => 'balance',             'formatter' => 'currency');
 $cols['Comment']   = array('index' => 'Lease.comment',       'formatter' => 'comment');
 
-$jqGrid_options = array('jqGridColumns' => $cols,
-			'controller' => 'leases',
-			'caption' => isset($caption) ? $caption : null);
-
-if (isset($leases)) {
-  $jqGrid_options += array('custom_ids' =>
-			   array_map(create_function('$data',
-						     'return $data["id"];'),
-				     $leases),
-			   'limit' => 5);
-}
-else {
-  $jqGrid_options += array('search_fields' => array('Customer', 'Unit'));
+if (!empty($this->params['action'])) {
+  if ($this->params['action'] === 'closed')
+    $grid->invalidFields(array('Charge-Thru', 'Paid-Thru', 'Status'));
+  elseif ($this->params['action'] === 'active')
+    $grid->invalidFields(array('Closed'));
+  elseif ($this->params['action'] === 'delinquent')
+    $grid->invalidFields(array('Closed'));
 }
 
-echo $this->element('jqGrid', $jqGrid_options);
+// Render the grid
+$grid
+->columns($cols)
+->sortField('Lease')
+->defaultFields(array('Lease'))
+->searchFields(array('Customer', 'Unit'))
+->render($this, isset($config) ? $config : null,
+	 array_diff(array_keys($cols), array('Signed', 'Charge-Thru', 'Status', 'Comment')));

site/views/elements/ledger_entries.ctp

@@ -1,102 +1,30 @@
 <?php /* -*- mode:PHP -*- */
 
-if (isset($account_ftype) || isset($ledger_id) || isset($account_id) || isset($ar_account)) {
-  $single_account = true;
-} else {
-  $single_account = false;
-}
-
-if (isset($ledger_id) || isset($account_id) || isset($ar_account)) {
-  $single_amount = false;
-} else {
-  $single_amount = true;
-}
-
-if (isset($reconcile_id)) {
-  $applied_amount = true;
-} else {
-  $applied_amount = false;
-}
-
-if (isset($account_ftype)) {
-  $subtotal_amount = false;
-} else {
-  $subtotal_amount = true;
-}
-
-
 // Define the table columns
 $cols = array();
-if (0) {
-if (isset($notxgroup))
-  $cols['Entry']          = array('index' => 'LedgerEntry.id',      'formatter' => 'id');
-else
-  $cols['Transaction']    = array('index' => 'Transaction.id',      'formatter' => 'id');
-} else {
-  $notxgroup = false;
-  $cols['Transaction']    = array('index' => 'Transaction.id',      'formatter' => 'id');
-  $cols['Entry']          = array('index' => 'LedgerEntry.id',      'formatter' => 'id');
-}
-
+$cols['Transaction']    = array('index' => 'Transaction.id',      'formatter' => 'id');
+$cols['Entry']          = array('index' => 'LedgerEntry.id',      'formatter' => 'id');
 $cols['Date']           = array('index' => 'Transaction.stamp',   'formatter' => 'date');
 
-if ($single_account) {
-  $cols['Account']      = array('index' => 'Account.name',        'formatter' => 'name');
-}
-else {
-  $cols['Debit Account']  = array('index' => 'DebitAccount.name',   'formatter' => 'name');
-  $cols['Credit Account'] = array('index' => 'CreditAccount.name',  'formatter' => 'name');
-}
-$cols['Customer']       = array('index' => 'Customer.name',       'formatter' => 'longname');
-$cols['Lease']          = array('index' => 'Lease.number',        'formatter' => 'id');
-$cols['Unit']           = array('index' => 'Unit.name',           'formatter' => 'name');
-$cols['Source']         = array('index' => 'MonetarySource.name', 'formatter' => 'name');
+$cols['Account']        = array('index' => 'Account.name',        'formatter' => 'name');
+$cols['Cr/Dr']          = array('index' => 'LedgerEntry.crdr',    'formatter' => 'enum');
+$cols['Tender']         = array('index' => 'Tender.name',         'formatter' => 'longname');
 $cols['Comment']        = array('index' => 'LedgerEntry.comment', 'formatter' => 'comment', 'width'=>150);
 
-if ($single_amount) {
-  $cols['Amount']       = array('index' => 'LedgerEntry.amount',  'formatter' => 'currency');
-}
-else {
-  $cols['Debit']        = array('index' => 'debit',               'formatter' => 'currency');
-  $cols['Credit']       = array('index' => 'credit',              'formatter' => 'currency');
-}
+$cols['Amount']         = array('index' => 'LedgerEntry.amount',  'formatter' => 'currency');
+$cols['Debit']          = array('index' => 'debit',               'formatter' => 'currency');
+$cols['Credit']         = array('index' => 'credit',              'formatter' => 'currency');
+$cols['Balance']        = array('index' => 'balance',             'formatter' => 'currency');
+$cols['Sub-Total']      = array('index' => 'subtotal-balance',    'formatter' => 'currency', 'sortable' => false);
 
-if ($applied_amount) {
-  $cols['Applied']      = array('index' => "Reconciliation.amount", 'formatter' => 'currency');
-}
 
-if ($subtotal_amount) {
-  $cols['Sub-Total']    = array('index' => 'subtotal',  'formatter' => 'currency', 'sortable' => false);
-}
-
-$custom_post_data = compact('ledger_id', 'account_id', 'ar_account',
-			    'account_type', 'account_ftype',
-			    'customer_id', 'lease_id', 'transaction_id', 'notxgroup');
-
-$jqGrid_options = array('jqGridColumns' => $cols,
-			'controller' => 'ledger_entries',
-			);
-
-$jqGrid_options += compact('grid_div_id', 'grid_id', 'caption', 'grid_setup', 'limit');
-
-if (isset($ledger_entries)) {
-  $jqGrid_options += array('custom_ids' =>
-			   array_map(create_function('$data',
-						     'return $data["id"];'),
-				     $ledger_entries),
-			   'limit' => 10);
-}
-else {
-  $jqGrid_options += array('action' => 'ledger',
-			   'limit' => 50);
-}
-
-if (isset($reconcile_id)) {
-  $custom_post_data += compact('reconcile_id');
-  $jqGrid_options += array('limit' => 5);
-}
-
-$jqGrid_options += compact('custom_post_data');
-$jqGrid_options['sort_column'] = 'Date';
-echo $this->element('jqGrid', $jqGrid_options);
+// Render the grid
+$grid
+->columns($cols)
+->sortField('Date', 'DESC')
+->defaultFields(array('Entry', 'Date', 'Amount'))
+->searchFields(array('Customer', 'Unit'))
+->render($this, isset($config) ? $config : null,
+	 array_diff(array_keys($cols), array('Transaction', 'Debit', 'Credit',
+					     'Balance', 'Sub-Total', 'Comment')));
 

site/views/elements/ledgers.ctp

@@ -2,28 +2,21 @@
 
 // Define the table columns
 $cols = array();
-$cols['ID']          = array('index' => 'id_sequence',         'formatter' => 'id');
-$cols['Account']     = array('index' => 'Account.name',        'formatter' => 'name', 'width' => '250');
-$cols['Entries']     = array('index' => 'entries',             'width' => '60', 'align' => 'right');
+$cols['Account']     = array('index' => 'Account.name',        'formatter' => 'longname');
+$cols['Sequence']    = array('index' => 'Ledger.sequence',     'formatter' => 'id');
+$cols['Open Date']   = array('index' => 'PriorCloseTransaction.stamp',    'formatter' => 'date');
+$cols['Close Date']  = array('index' => 'CloseTransaction.stamp',         'formatter' => 'date');
+$cols['Comment']     = array('index' => 'Ledger.comment',      'formatter' => 'comment');
+$cols['Entries']     = array('index' => 'entries',             'formatter' => 'number');
 $cols['Debits']      = array('index' => 'debits',              'formatter' => 'currency');
 $cols['Credits']     = array('index' => 'credits',             'formatter' => 'currency');
 $cols['Balance']     = array('index' => 'balance',             'formatter' => 'currency');
-$cols['Close Date']  = array('index' => 'Ledger.close_stamp',  'formatter' => 'date');
-$cols['Comment']     = array('index' => 'Ledger.comment',      'formatter' => 'comment');
 
-$jqGrid_options = array('jqGridColumns' => $cols,
-			'controller' => 'ledgers',
-			'caption' => isset($caption) ? $caption : null);
-
-if (isset($ledgers)) {
-  $jqGrid_options += array('custom_ids' =>
-			   array_map(create_function('$data',
-						     'return $data["id"];'),
-				     $ledgers),
-			   'limit' => 5);
-}
-else {
-  $jqGrid_options += array('search_fields' => array('Account'));
-}
-
-echo $this->element('jqGrid', $jqGrid_options);
+// Render the grid
+$grid
+->columns($cols)
+->sortField('Sequence')
+->defaultFields(array('Sequence'))
+->searchFields(array('Comment'))
+->render($this, isset($config) ? $config : null,
+	 array_diff(array_keys($cols), array('Account', 'Open Date', 'Comment')));

site/views/elements/locks.ctp

@@ -0,0 +1,20 @@
+<?php /* -*- mode:PHP -*- */
+
+// Define the table columns
+$cols = array();
+$cols['Name']         = array('index' => 'name',             'formatter' => 'name');
+$cols['Comment']      = array('index' => 'comment',          'formatter' => 'comment');
+$cols['Key/Combo']    = array('index' => 'key',              'formatter' => 'number');
+$cols['Previous Key'] = array('index' => 'key_last',         'formatter' => 'number');
+$cols['Quantity']     = array('index' => 'qty',              'formatter' => 'number');
+$cols['In Use']       = array('index' => 'inuse',            'formatter' => 'number');
+$cols['Available']    = array('index' => 'avail',            'formatter' => 'number');
+
+// Render the grid
+$grid
+->columns($cols)
+->sortField('Name')
+->defaultFields(array('Name'))
+->searchFields(array('Name'))
+->render($this, isset($config) ? $config : null,
+	 array_diff(array_keys($cols), array('Previous Key')));

site/views/elements/maps.ctp

@@ -2,23 +2,17 @@
 
 // Define the table columns
 $cols = array();
-$cols['ID']         = array('index' => 'Map.id',         'formatter' => 'id');
 $cols['Name']       = array('index' => 'Map.name',       'formatter' => 'longname');
 $cols['Site Area']  = array('index' => 'SiteArea.name',  'formatter' => 'longname');
-$cols['Width']      = array('index' => 'Map.width',      'width' => '50', 'align' => 'right');
-$cols['Depth']      = array('index' => 'Map.depth',      'width' => '50', 'align' => 'right');
+$cols['Width']      = array('index' => 'Map.width',      'formatter' => 'number');
+$cols['Depth']      = array('index' => 'Map.depth',      'formatter' => 'number');
 $cols['Comment']    = array('index' => 'Map.comment',    'formatter' => 'comment');
 
-$jqGrid_options = array('jqGridColumns' => $cols,
-			'controller' => 'maps',
-			'caption' => isset($caption) ? $caption : null);
-
-if (isset($maps)) {
-  $jqGrid_options += array('custom_ids' =>
-			   array_map(create_function('$data',
-						     'return $data["id"];'),
-				     $maps),
-			   'limit' => 5);
-}
-
-echo $this->element('jqGrid', $jqGrid_options);
+// Render the grid
+$grid
+->columns($cols)
+->sortField('Name')
+->defaultFields(array('Name'))
+->searchFields(array('Name'))
+->render($this, isset($config) ? $config : null,
+	 array_diff(array_keys($cols), array()));

site/views/elements/monetary_sources.ctp

@@ -1,22 +0,0 @@
-<?php /* -*- mode:PHP -*- */
-
-// Define the table columns
-$cols = array();
-$cols['ID']         = array('index' => 'MonetarySource.id',         'formatter' => 'id');
-$cols['Name']       = array('index' => 'MonetarySource.name',       'formatter' => 'longname');
-$cols['Type']       = array('index' => 'MonetaryType.name',         'formatter' => 'name');
-$cols['Comment']    = array('index' => 'MonetarySource.comment',    'formatter' => 'comment');
-
-$jqGrid_options = array('jqGridColumns' => $cols,
-			'controller' => 'monetary_sources',
-			'caption' => isset($caption) ? $caption : null);
-
-if (isset($monetary_sources)) {
-  $jqGrid_options += array('custom_ids' =>
-			   array_map(create_function('$data',
-						     'return $data["id"];'),
-				     $monetary_sources),
-			   'limit' => 5);
-}
-
-echo $this->element('jqGrid', $jqGrid_options);

site/views/elements/sidemenu.ctp

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

site/views/elements/statement_entries.ctp

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

site/views/elements/table.ctp

@@ -52,24 +52,38 @@ if (isset($rows) && is_array($rows) && count($rows)) {
 
   foreach ($rows AS $r => &$row) {
     foreach ($row AS $c => $col) {
-      $cell_class = implode(" ", array_merge(isset(   $row_class[$r]) ?    $row_class[$r] : array(),
-					     isset($column_class[$c]) ? $column_class[$c] : array()));
+      $cell_class = implode(" ", array_merge(empty(   $row_class[$r]) ? array() :    $row_class[$r],
+					     empty($column_class[$c]) ? array() : $column_class[$c]));
       if ($cell_class)
 	$row[$c] = array($col, array('class' => $cell_class));
     }
   }
+
+  // Allow user to specify a list of classes
+  if (isset($class) && is_array($class))
+    $class = implode(' ', $class);
+
   // OK, output the table HTML
-  echo('<TABLE' . (isset($class) ? ' CLASS="'.$class.'"' : '') . '>' . "\n");
-  if (isset($caption))
+  echo('<TABLE' .
+       (empty($id) ? '' : ' ID="'.$id.'"') .
+       (empty($class) ? '' : ' CLASS="'.$class.'"') .
+       '>' . "\n");
+
+  if (!empty($caption))
     echo('  <CAPTION>' . $caption . '</CAPTION>' . "\n");
 
-  if (isset($headers) && is_array($headers))
+  if (isset($headers) && is_array($headers)) {
+    echo('  <THEAD>' . "\n");
     echo $html->tableHeaders($headers) . "\n";
+    echo('  </THEAD>' . "\n");
+  }
 
+  echo('  <TBODY>' . "\n");
   echo $html->tableCells($rows,
 			 $suppress_alternate_rows ? null : array('class' => "oddrow"),
 			 $suppress_alternate_rows ? null : array('class' => "evnrow"),
 			 false, false) . "\n";
+  echo('  </TBODY>' . "\n");
 
   echo('</TABLE>' . "\n");
 }

site/views/elements/tenders.ctp

@@ -0,0 +1,20 @@
+<?php /* -*- mode:PHP -*- */
+
+// Define the table columns
+$cols = array();
+$cols['Date']       = array('index' => 'Transaction.stamp',  'formatter' => 'date');
+$cols['Customer']   = array('index' => 'Customer.name',      'formatter' => 'longname');
+$cols['Item']       = array('index' => 'Tender.name',        'formatter' => 'longname');
+$cols['Type']       = array('index' => 'TenderType.name',    'formatter' => 'shortname');
+$cols['Comment']    = array('index' => 'Tender.comment',     'formatter' => 'comment');
+$cols['Amount']     = array('index' => 'LedgerEntry.amount', 'formatter' => 'currency');
+$cols['Sub-Total']  = array('index' => 'subtotal-LedgerEntry.amount', 'formatter' => 'currency');
+
+// Render the grid
+$grid
+->columns($cols)
+->sortField('Date')
+->defaultFields(array('Date', 'Name', 'Amount'))
+->searchFields(array('Name', 'Type'))
+->render($this, isset($config) ? $config : null,
+	 array_diff(array_keys($cols), array('Comment', 'Sub-Total')));

site/views/elements/transactions.ctp

@@ -1,27 +1,27 @@
 <?php /* -*- mode:PHP -*- */
 
+if (isset($include))
+  $include = is_array($include) ? $include : array($include);
+else
+  $include = array();
+
 // Define the table columns
 $cols = array();
 $cols['ID']        = array('index' => 'Transaction.id',            'formatter' => 'id');
-//$cols['Customer']  = array('index' => 'Customer.name',             'formatter' => 'longname');
-$cols['Timesamp']  = array('index' => 'Transaction.stamp',         'formatter' => 'date');
-$cols['Through']   = array('index' => 'Transaction.through_date',  'formatter' => 'date');
-$cols['Due']       = array('index' => 'Transaction.due_date',      'formatter' => 'date');
-$cols['Comment']   = array('index' => 'Transaction.comment',       'formatter' => 'comment');
+$cols['Type']      = array('index' => 'Transaction.type',          'formatter' => 'enum');
+$cols['Customer']  = array('index' => 'Customer.name',             'formatter' => 'longname');
+$cols['Timestamp'] = array('index' => 'Transaction.stamp',         'formatter' => 'date');
+$cols['Comment']   = array('index' => 'Transaction.comment',       'formatter' => 'comment', 'sortable' => false);
+$cols['Entries']   = array('index' => 'entries',                   'formatter' => 'number');
+$cols['Amount']    = array('index' => 'Transaction.amount',        'formatter' => 'currency');
+$cols['PosNeg']    = array('index' => 'balance',                   'formatter' => 'currency');
+$cols['Balance']   = array('index' => 'subtotal-balance',          'formatter' => 'currency', 'sortable' => false);
 
-$jqGrid_options = array('jqGridColumns' => $cols,
-			'controller' => 'transactions',
-			'caption' => isset($caption) ? $caption : null);
-
-if (isset($transactions)) {
-  $jqGrid_options += array('custom_ids' =>
-			   array_map(create_function('$data',
-						     'return $data["id"];'),
-				     $transactions),
-			   'limit' => 5);
-}
-else {
-  $jqGrid_options += array('search_fields' => array('Due', 'Comment'));
-}
-
-echo $this->element('jqGrid', $jqGrid_options);
+// Render the grid
+$grid
+->columns($cols)
+->sortField('Timestamp', 'DESC')
+->defaultFields(array('ID', 'Timestamp'))
+->searchFields(array('Type', 'Comment'))
+->render($this, isset($config) ? $config : null,
+	 array_merge($include, array_diff(array_keys($cols), array('Customer', 'PosNeg', 'Balance', 'Comment'))));