From ecc0222849d1e883a26532ff72ab6de3b6af4ec6 Mon Sep 17 00:00:00 2001
From: Karl Cordes <karlcordes@gmail.com>
Date: Fri, 15 Jul 2011 16:52:57 +1000
Subject: [PATCH] Had to quickly revert work done on the add enquiry feature

---
 views/enquiries/add.ctp | 45 ++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/views/enquiries/add.ctp b/views/enquiries/add.ctp
index a4b1f723..fcd14ad3 100755
--- a/views/enquiries/add.ctp
+++ b/views/enquiries/add.ctp
@@ -1,40 +1,30 @@
-<?php echo $javascript->link('add_enquiry'); ?>
+<?php echo $this->element('tipbox', array('tip'=>
+"You can add a new Contact to an Existing Customer while creating the enquiry. If the Contact you want to assign to the enquiry
+doesn't appear in the drop down list, click 'New Contact'")); ?>
 
-<div class="addEnquiry form">
-<?php echo $form->create('Enquiry', array('action' => 'add'));?>
+<div class="enquiries form">
+<?php echo $form->create('Enquiry', array('action' => 'add/customerid:'.$customer['Customer']['id']));?>
 	<fieldset>
  		<legend><?php __("New Enquiry");?></legend>
-                
-              
-                <div class="customer_id" id="" style="display: none;"></div>
 	<?php
-                
-                $customerInstructions = '<div class="instructions">Start typing then select the Customer from the list</div>';
-		echo $form->input('Customer.name', array('id'=>'customer_autocomplete', 'label'=>'Customer Name', 'after'=>$customerInstructions));
-		echo $form->input('customer_id', array('type'=>'hidden','id'=>'customer_id'));
-                
-                ?>
-                <div id="contacts">
-                    
-                </div> 
-                <?
-                //echo $form->input('contact_user_id', array('type'=>'select', 'id'=>'contacts'));
-            
-                echo $form->input('user_id', array('label' =>'Assign to User'), $users);
-		
+
+		echo $form->input('Customer.name', array('readonly'=>'readonly', 'value'=>$customer['Customer']['name']));
+		echo $form->input('user_id', array('label' =>'Assigned to User'), $users);
+		echo $form->input('contact_user_id', array('type'=>'select', 'options'=>$contacts));
 
 		//echo $ajax->link('New Contact', array('controller' => 'contacts', 'action' => 'add_one',$customer['Customer']['id']), array('update'=>'contact'));
 		//echo $html->image('contact-new.png');
+		echo '<span>The Contact will be emailed informing them of the new Enquiry</span>';
 		echo $form->input('state_id', array('label'=>'State', 'empty' => 'Please Choose A State'));
 		echo $form->input('country_id');
-	
+
 		echo $form->input('gst', array('label' => 'Is GST Applicable', 'options' => array('1' => 'Yes', '0' => 'No')));
 		echo $form->input('principle_id', array('label'=>'Principle', 'empty'=>'Please Choose the Principle'));
 		echo $form->input('status_id');
-		echo $form->input('comments');
-		echo $form->input('customer_id', array('type'=>'hidden'));
-		//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('comments', array('maxlength' => '250000'));
+		echo $form->input('customer_id', array('type'=>'hidden', 'value' => $customer['Customer']['id']));
+		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('send_enquiry_email', array('label' => 'Send the Contact an Enquiry Confirmation Email', 'type' => 'select', 'selected' => 1, 'options' => array(1 => 'Yes', 0 => 'No')));
 		echo $form->end('Add Enquiry');
 		echo '<span>After submitting it will take a moment to email the customer, if you selected the checkbox above, before you are redirected to the new Enquiry.</span>';
@@ -43,3 +33,8 @@
 
 
 </div>
+<div class="actions">
+	<ul>
+		<li><?php echo $html->link(__('New Customer', true), array('controller'=> 'customers', 'action'=>'add')); ?> </li>
+	</ul>
+</div>