Charge/Invoice assessment is working fairly well. Still need to accept multiple charges on a single invoice, have client side validation, and post through ajax to allow posting repeated invoices.

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

controllers/leases_controller.php

@@ -174,15 +174,6 @@ class LeasesController extends AppController {
    */
 
   function assess($id = null, $type = null) {
-    if ($this->data) {
-      // Assess the charges based on the given data
-      pr($this->data);
-
-      $this->Lease->addCharge($this->data['Lease']['id'], $this->data['Charge']);
-      //$this->redirect($this->data['redirect']);
-      $this->render('/empty');
-      return;
-    }
 
     $lease = $this->Lease->find
       ('first', array
@@ -206,11 +197,16 @@ class LeasesController extends AppController {
     $charge['type'] = $type;
     if ($type == 'rent')
       $charge['amount'] = $lease['Lease']['rent'];
-    else
+    elseif  ($type == 'rent')
       // REVISIT <AP> 20090705:
       //   Of course, the late charge should come from the late_schedule
       $charge['amount'] = 10.00;
 
+    $redirect = array('controller' => 'leases',
+		      'action' => 'view',
+		      $id);
+    $this->set(compact('redirect'));
+
     $title = ('Lease #' . $lease['Lease']['number'] . ': ' .
 	      $lease['Unit']['name'] . ': ' .
 	      $lease['Customer']['name'] . ': Assess Charges');

controllers/transactions_controller.php

@@ -109,8 +109,6 @@ class TransactionsController extends AppController {
       return;
     }
 
-    pr($this->data);
-
 /*     $this->layout = null; */
 /*     $this->autoLayout = false; */
 /*     $this->autoRender = false; */
@@ -123,7 +121,6 @@ class TransactionsController extends AppController {
     if(empty($this->data['Transaction']['stamp'])) {
       die("Time/Date not valid");
     }
-    pr($this->data['Transaction']);
 
     // Create some models for convenience
     $A = new Account();
@@ -139,13 +136,9 @@ class TransactionsController extends AppController {
     if (!$invoice_transaction->save($this->data['Transaction'],
 				    array('validate' => false,
 					  ))) {
-      pr(array('checkpoint' => "invoice transaction save failed"));
-      return;
       die("Unknown Database Failure");
     }
-    pr("New Transaction Created ({$invoice_transaction->id})!");
     $invoice_transaction->read();
-    pr($invoice_transaction->data);
 
     // Create a transaction for the A/R
     $ar_transaction = new Transaction();
@@ -153,18 +146,13 @@ class TransactionsController extends AppController {
     if (!$ar_transaction->save($this->data['Transaction'],
 				  array('validate' => false,
 					))) {
-      pr(array('checkpoint' => "A/R transaction save failed"));
       die("Unknown Database Failure");
     }
-    pr("New Transaction Created ({$ar_transaction->id})!");
     $ar_transaction->read();
-    pr($ar_transaction->data);
 
     // Go through the entered charges
     $grand_total = 0;
     foreach ($this->data['LedgerEntry'] AS &$entry) {
-      pr(compact('entry'));
-
       // Invoice Transaction
       //     debit: Invoice       credit: Charge
       $entry['transaction_id'] = $invoice_transaction->id;
@@ -200,12 +188,9 @@ class TransactionsController extends AppController {
       $invoice_entry = new LedgerEntry();
       $invoice_entry->create();
       if (!$invoice_entry->save($entry, false)) {
-	pr(array('checkpoint' => "invoice entry saveAll failed"));
 	die("Unknown Database Failure");
       }
-      pr("New Invoice LedgerEntry Created ({$invoice_entry->id})!");
       $invoice_entry->read();
-      pr($invoice_entry->data);
 
       $grand_total += $entry['amount'];
     }
@@ -225,12 +210,8 @@ class TransactionsController extends AppController {
     $ar_entry = new LedgerEntry();
     $ar_entry->create();
     if (!$ar_entry->save($ar_entry_data, false)) {
-      pr(array('checkpoint' => "ar entry save failed"));
       die("Unknown Database Failure");
     }
-    pr("New A/R LedgerEntry Created ({$ar_entry->id})!");
-    $ar_entry->read();
-    pr($ar_entry->data);
 
     // Reconcile the Invoice account.  Our two entries look like:
     //     debit: Invoice       credit: Charge
@@ -243,13 +224,13 @@ class TransactionsController extends AppController {
     if (!$R->save(array('debit_ledger_entry_id' => $invoice_entry->id,
 			'credit_ledger_entry_id' => $ar_entry->id,
 			'amount' => $grand_total), false)) {
-      pr(array('checkpoint' => "invoice reconcile save failed"));
       die("Unknown Database Failure");
     }
-    pr("New Invoice Reconciliation Created ({$R->id})!");
-    $R->read();
-    pr($R->data);
 
+    // Comment this out to debug
+    $this->redirect($this->data['redirect']);
+
+    pr($this->data['redirect']);
     $this->render('/empty');
   }