Edit invoices now has job details

This commit is contained in:
Karl Cordes 2010-07-16 13:56:25 +10:00
parent 64c375c3d4
commit dcce02a029
2 changed files with 8 additions and 4 deletions

View file

@ -81,11 +81,14 @@ class InvoicesController extends AppController {
} }
} }
if (empty($this->data)) { if (empty($this->data)) {
$this->data = $this->Invoice->read(null, $id); $invoice = $this->Invoice->read(null, $id);
$this->data = $invoice;
} }
$enquiries = $this->Invoice->Enquiry->find('list');
$users = $this->Invoice->User->find('list'); $users = $this->Invoice->User->find('list');
$this->set(compact('enquiries','users')); $jobs = $this->Invoice->Job->find('list', array('conditions'=>array('Job.enquiry_id'=>$invoice['Invoice']['enquiry_id'])));
$this->set(compact('users', 'jobs'));
} }
function delete($id = null) { function delete($id = null) {

View file

@ -9,7 +9,8 @@
echo $form->input('title'); echo $form->input('title');
echo $form->input('paid'); echo $form->input('paid');
echo $form->input('payment_received_date'); echo $form->input('payment_received_date');
echo $form->input('enquiry_id'); echo $form->input('enquiry_id', array('type'=>'hidden'));
echo $form->input('job_id');
echo $form->input('user_id'); echo $form->input('user_id');
?> ?>
</fieldset> </fieldset>