From 7f783aaf7edd52e43ac74df56845c80567efe417 Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Fri, 25 Sep 2009 10:52:59 +1000 Subject: [PATCH] Fixed enquiry edit problem --- config/core.php | 2 +- controllers/enquiries_controller.php | 16 ++++++++-------- models/enquiry.php | 2 +- views/elements/enquiry_table.ctp | 21 +++++++++++++-------- views/enquiries/edit.ctp | 19 +++++++++++-------- 5 files changed, 34 insertions(+), 26 deletions(-) diff --git a/config/core.php b/config/core.php index b9fe639a..cef0be65 100755 --- a/config/core.php +++ b/config/core.php @@ -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 */ diff --git a/controllers/enquiries_controller.php b/controllers/enquiries_controller.php index 4e747c00..a24ef106 100755 --- a/controllers/enquiries_controller.php +++ b/controllers/enquiries_controller.php @@ -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) { diff --git a/models/enquiry.php b/models/enquiry.php index 011321a7..8c9b8cc1 100755 --- a/models/enquiry.php +++ b/models/enquiry.php @@ -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( diff --git a/views/elements/enquiry_table.ctp b/views/elements/enquiry_table.ctp index 827a828c..bba480de 100644 --- a/views/elements/enquiry_table.ctp +++ b/views/elements/enquiry_table.ctp @@ -10,7 +10,7 @@ sort('user_id');?> sort('Date', 'created');?> - sort('Date Submitted', 'submitted'); ?> + echo $paginator->sort('Date Submitted', 'submitted'); */ ?> sort('principle_id');?> sort('Enquiry Number', 'title');?> sort('customer_id');?> @@ -84,20 +84,25 @@ foreach ($enquiries as $enquiry): echo date('j M Y',$time->toUnix($enquiry['Enquiry']['created'])); ?> - - + + 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'])); - } -?> - + } + + */ + + +?> diff --git a/views/enquiries/edit.ctp b/views/enquiries/edit.ctp index f6837816..ee49d071 100755 --- a/views/enquiries/edit.ctp +++ b/views/enquiries/edit.ctp @@ -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')); ?> ');" value="Edit Comments" class="dateButton" id="datebutton"/>