Added ability to move an existing customer into a vacant unit. Changed out all of the 'amount' fields with 'rent', since it's much more self-explanatory. We still need the ability to add customers and contacts. I'll consider doing this by using the insert row ability of jqGrid.

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

views/elements/customers.ctp

@@ -12,11 +12,12 @@ $cols['Leases']      = array('index' => 'lease_count',                'width' =>
 $cols['Balance']     = array('index' => 'balance',                    'formatter' => 'currency', 'sortable' => false);
 $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');
+$custom_post_data  = compact('nothing');
+$jqGrid_options    = array('jqGridColumns' => $cols,
+			   'controller' => 'customers');
+$jqGrid_options   += compact('action', 'caption',
+			     'grid_div_id', 'grid_id', 'grid_setup',
+			     'nolinks', 'limit');
 
 if (isset($customers)) {
   $jqGrid_options += array('custom_ids' =>

views/elements/jqGrid.ctp

@@ -93,6 +93,9 @@ if (isset($custom_post_data)) {
 // correct subset of data
 $postData['action'] = $action;
 
+if (isset($nolinks)) {
+  $postData['nolinks'] = true;
+}
 
 // Perform column customizations.
 // This will largely be based off of the 'formatter' parameter,

views/elements/units.ctp

@@ -2,15 +2,22 @@
 
 // Define the table columns
 $cols = array();
+$cols['Sort']     = array('index' => 'Unit.sort_order', 'hidden' => true);
+//$cols['Sort']     = array('index' => 'Unit.sort_order');
+//$cols['Walk']     = array('index' => 'Unit.walk_order');
 $cols['ID']       = array('index' => 'Unit.id',       'formatter' => 'id');
 $cols['Unit']     = array('index' => 'Unit.name',     'width' => '50');
 $cols['Size']     = array('index' => 'UnitSize.name', 'width' => '75');
 $cols['Status']   = array('index' => 'Unit.status',   'width' => '75');
 $cols['Comment']  = array('index' => 'Unit.comment',  'formatter' => 'comment');
 
-$jqGrid_options = array('jqGridColumns' => $cols,
-			'controller' => 'units',
-			'caption' => isset($caption) ? $caption : null);
+
+$custom_post_data  = compact('nothing');
+$jqGrid_options    = array('jqGridColumns' => $cols,
+			   'controller' => 'units');
+$jqGrid_options   += compact('action', 'caption',
+			     'grid_div_id', 'grid_id', 'grid_setup',
+			     'nolinks', 'limit');
 
 if (isset($units)) {
   $jqGrid_options += array('custom_ids' =>
@@ -19,9 +26,12 @@ if (isset($units)) {
 				     $units),
 			   'limit' => 5);
 }
-else {
+
+if (isset($searchfields)) {
   $jqGrid_options += array('search_fields' => array('Unit', 'Size', 'Status'));
 }
 
+$jqGrid_options += compact('custom_post_data');
+$jqGrid_options['sort_column'] = 'Sort';
 echo $this->element('jqGrid', $jqGrid_options);