springup/cmc-sales
2
0
Fork 0
Code Issues 49 Pull requests Actions Packages Projects Releases Wiki Activity

Fixed enquiry edit problem

Browse source
This commit is contained in:
Karl Cordes 2009-09-25 10:52:59 +10:00
parent bab0ee9970
commit 7f783aaf7e
5 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/core.php
View file

@ -40,7 +40,7 @@
* In production mode, flash messages redirect after a time interval.
* In development mode, you need to click the flash message to continue.
*/
Configure::write('debug', 2);
Configure::write('debug', 3);
/**
* Application wide charset encoding
*/

16
controllers/enquiries_controller.php
View file

@ -350,7 +350,7 @@ class EnquiriesController extends AppController {
$this->Session->setFlash(__('The Enquiry has been saved', true));
$this->redirect(array('action'=>'index'));
} else {
$this->Session->setFlash(__('The Enquiry could not be saved. Please, try again.', true));
$this->Session->setFlash(__('The Enquiry could not be saved. Please try again.', true));
$this->set('dump', $this->data);
}
}
@ -359,16 +359,16 @@ class EnquiriesController extends AppController {
}
$enquiry = $this->Enquiry->read(null, $id);
$users = $this->Enquiry->User->find('list', array('fields' => array('User.id', 'User.username')));
$customer = $this->Enquiry->Customer->findById($enquiry['Enquiry']['customer_id']);
//$customer = $this->Enquiry->Customer->findById($enquiry['Enquiry']['customer_id']);
$contacts = $this->Enquiry->Contact->find('all', array('conditions' => array('Contact.customer_id' => $enquiry['Enquiry']['customer_id'])));
$contacts = Set::Combine($contacts, '{n}.Contact.id', array('{0} {1}', '{n}.Contact.first_name', '{n}.Contact.last_name'));
$state = $this->Enquiry->State->findById($enquiry['Enquiry']['state_id']);
$country = $this->Enquiry->Country->findById($enquiry['Enquiry']['country_id']);
$principle = $this->Enquiry->Principle->findById($enquiry['Enquiry']['principle_id']);
//$state = $this->Enquiry->State->findById($enquiry['Enquiry']['state_id']);
//$country = $this->Enquiry->Country->findById($enquiry['Enquiry']['country_id']);
//$principle = $this->Enquiry->Principle->findById($enquiry['Enquiry']['principle_id']);
$statuses = $this->Enquiry->Status->find('list');
$principles = $this->Enquiry->Principle->find('list', array('conditions' => array('Principle.code' => $principle['Principle']['code'])));
$customerAddresses = $this->Enquiry->BillingAddress->find('all', array('conditions'=>array('BillingAddress.customer_id' => $customer['Customer']['id'])));
$principles = $this->Enquiry->Principle->find('list', array('conditions' => array('Principle.code' => $enquiry['Principle']['code'])));
$customerAddresses = $this->Enquiry->BillingAddress->find('all', array('conditions'=>array('BillingAddress.customer_id' => $enquiry['Customer']['id'])));
$this->set('billing_addresses', $customerAddresses);
$this->set('shipping_addresses', $customerAddresses);
@ -389,7 +389,7 @@ class EnquiriesController extends AppController {
}
$this->set(compact('enquiry', 'users','customer','contacts','state','country','principles','principle','statuses', 'addresses'));
$this->set(compact('enquiry', 'users','contacts','principles','statuses', 'addresses'));
}
function update_status($enquiryid) {

2
models/enquiry.php
View file

@ -21,7 +21,7 @@ class Enquiry extends AppModel {
'rule' => 'numeric',
'required' => true,
'message' => 'Must choose a Contact for this Enquiry',
'on' => 'create'
//'on' => 'create'
),
'customer_id' => array(

21
views/elements/enquiry_table.ctp
View file

@ -10,7 +10,7 @@
<tr>
<th><?php echo $paginator->sort('user_id');?></th>
<th><?php echo $paginator->sort('Date', 'created');?></th>
<th><?php echo $paginator->sort('Date Submitted', 'submitted'); ?></th>
<?php /* <th> echo $paginator->sort('Date Submitted', 'submitted'); </th> */ ?>
<th><?php echo $paginator->sort('principle_id');?></th>
<th><?php echo $paginator->sort('Enquiry Number', 'title');?></th>
<th><?php echo $paginator->sort('customer_id');?></th>
@ -84,20 +84,25 @@ foreach ($enquiries as $enquiry):
echo date('j M Y',$time->toUnix($enquiry['Enquiry']['created'])); ?>
</td>
<td class="enqdate">
<?php
/* Change the date from MySQL DATETIME to a D M Y format */
<?php
/* <td class="enqdate">
Change the date from MySQL DATETIME to a D M Y format
if($enquiry['Enquiry']['submitted']) {
echo date('j M Y',$time->toUnix($enquiry['Enquiry']['submitted']));
}
else {
/* Maybe should make this so only the assigned user can mark it as submitted. */
/* Maybe should make this so only the assigned user can mark it as submitted.
echo $html->link('Not Submitted', array('controller'=>'enquiries', 'action'=>'mark_submitted', $enquiry['Enquiry']['id']));
}
?>
}
</td>
*/
?>

19
views/enquiries/edit.ctp
View file

@ -9,26 +9,29 @@
echo $form->input('id');
echo $form->input('user_id', array('label'=>'Assigned to User'));
echo $form->input('principle_id');
echo $form->input('Customer.name', array('label'=>'Customer','readonly'=>'readonly', 'value'=>$customer['Customer']['name']));
echo $form->input('contact_id');
echo $form->input('State.name', array('label'=>'State','readonly'=>'readonly', 'value'=>$state['State']['name']));
echo $form->input('Country.name', array('label'=>'Country','readonly'=>'readonly', 'value'=>$country['Country']['name']));
echo $form->input('Customer.name', array('label'=>'Customer','readonly'=>'readonly', 'value'=>$enquiry['Customer']['name']));
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', 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']));
echo $form->input('gst', array('label' => 'Is GST Applicable', 'options' => array('1' => 'Yes', '0' => 'No')));
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');
/* Need to fix this up Once Quotes are working*/
/* Need to fix this up Once Quotes are working
if($enquiry['Enquiry']['submitted']) {
echo $form->input('status_id');
}
else {
echo "Quote has not been submitted yet";
}
*/
echo $form->input('submitted');
//echo $form->input('submitted');
echo $form->input('comments', array('id'=>'comments', 'wrap'=>'hard'));
?>
<input type="BUTTON" onClick="datetime('<?php echo "$initials"; ?>');" value="Edit Comments" class="dateButton" id="datebutton"/>