From df8740c2440a6534e0fe71b67ddc79f4b88256b3 Mon Sep 17 00:00:00 2001
From: Karl Cordes <karlcordes@gmail.com>
Date: Fri, 11 Mar 2011 12:47:34 +1100
Subject: [PATCH] Fixed enquiry add edit

---
 models/enquiry.php       | 2 +-
 views/enquiries/add.ctp  | 2 +-
 views/enquiries/edit.ctp | 5 +++--
 views/users/add_edit.ctp | 4 ----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/models/enquiry.php b/models/enquiry.php
index 8b02b5ec..82792a46 100755
--- a/models/enquiry.php
+++ b/models/enquiry.php
@@ -17,7 +17,7 @@ class Enquiry extends AppModel {
 			    'on' => 'create'
 	    ),
 
-	    'contact_id' => array(
+	    'contact_user_id' => array(
 			    'rule' => 'numeric',
 			    'required' => true,
 			    'message' => 'Must choose a Contact for this Enquiry',
diff --git a/views/enquiries/add.ctp b/views/enquiries/add.ctp
index 712aee9a..16815835 100755
--- a/views/enquiries/add.ctp
+++ b/views/enquiries/add.ctp
@@ -11,7 +11,7 @@ doesn't appear in the drop down list, click 'New Contact'")); ?>
 		echo $form->input('Customer.name', array('readonly'=>'readonly', 'value'=>$customer['Customer']['name']));
 		echo $form->input('user_id', array('label' =>'Assigned to User'), $users);
 		echo '<div id="contact">';
-		echo $form->input('contact_id', array('div' => false));
+		echo $form->input('contact_user_id', array('div' => false));
 		echo '<br>';
 		//echo $ajax->link('New Contact', array('controller' => 'contacts', 'action' => 'add_one',$customer['Customer']['id']), array('update'=>'contact'));
 		//echo $html->image('contact-new.png');
diff --git a/views/enquiries/edit.ctp b/views/enquiries/edit.ctp
index 41f12b84..70e15a87 100755
--- a/views/enquiries/edit.ctp
+++ b/views/enquiries/edit.ctp
@@ -13,7 +13,8 @@
 		echo $form->input('customer_id', array('type'=>'hidden'));
 		echo $form->input('state_id', array('type'=>'hidden'));
 		echo $form->input('country_id', array('type'=>'hidden'));
-                echo $form->input('contact_id');
+		echo $form->input('contact_user_id', array('type'=>'select', 'options'=>$contacts, 'selected'=>$this->data['Enquiry']['contact_user_id']));
+                //echo $form->input('contact_user_id', array('type'=>'select', 'value'=>$contacts));
 //echo $form->input('contact_id', array('type'=>'hidden'));
 		echo $form->input('State.name', array('label'=>'State','readonly'=>'readonly', 'value'=>$enquiry['State']['name']));
 		echo $form->input('Country.name', array('label'=>'Country','readonly'=>'readonly', 'value'=>$enquiry['Country']['name']));
@@ -21,7 +22,7 @@
 		echo $form->input('billing_address_id', array('div' => 'addressradio', 'legend' => 'Billing Address', 'options' => $billing_addresses_list, 'type' => 'radio'));
 		echo $form->input('shipping_address_id', array('div' => 'addressradio','legend' => 'Shipping Address', 'options' => $shipping_addresses_list, 'type' => 'radio'));
 		echo $form->input('status_id');
-
+		print_r($contacts);
 
 		/* Need to fix this up Once Quotes are working
 		if($enquiry['Enquiry']['submitted']) {
diff --git a/views/users/add_edit.ctp b/views/users/add_edit.ctp
index 3d0c078b..7518dc1f 100755
--- a/views/users/add_edit.ctp
+++ b/views/users/add_edit.ctp
@@ -4,10 +4,6 @@
     <?php echo $form->create('User',array('action'=>'add_user'));?>
     <?php
 
-
-
-    echo "TYPE IS :".$type."<br>";
-    echo "customer_id".$customer_id."<br>";
     echo $form->input('first_name');
     echo $form->input('last_name');
     echo $form->input('email');