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

Fixed enquiry status update from customer view

Browse source
This commit is contained in:
Karl Cordes 2012-11-10 11:50:52 +11:00
parent 41cc778112
commit 7fcf2eafca
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
controllers/customers_controller.php
View file

@ -37,14 +37,12 @@ class CustomersController extends AppController {
$this->set('invoices', $this->Customer->Invoice->find('all', array('conditions'=>array('Invoice.customer_id'=>$id), 'order'=> 'Invoice.id DESC'))); $this->set('invoices', $this->Customer->Invoice->find('all', array('conditions'=>array('Invoice.customer_id'=>$id), 'order'=> 'Invoice.id DESC')));
$this->set('jobs', $this->Customer->Job->find('all', array('conditions'=>array('Job.customer_id'=>$id), 'order'=> 'Job.id DESC'))); $this->set('jobs', $this->Customer->Job->find('all', array('conditions'=>array('Job.customer_id'=>$id), 'order'=> 'Job.id DESC')));
$status_list = $this->Customer->Enquiry->Status->getJSON();
$this->set('status_list', $status_list);
$classNames = $this->Customer->Enquiry->Status->getClassNamesJSON();
$this->set('class_names', $classNames);
$statuses = $this->Customer->Enquiry->Status->find('all', array('recursive'=>0));
$status_list = array();
foreach ($statuses as $status) {
$statusid = $status['Status']['id'];
$status_list[$statusid] = $status['Status']['name'];
}
$this->set('status_list', $status_list);
$this->set('parent_industry_list', $this->Customer->Industry->find('list', array('conditions' => array('parent_id' => null)))); $this->set('parent_industry_list', $this->Customer->Industry->find('list', array('conditions' => array('parent_id' => null))));

2
controllers/enquiries_controller.php
View file

@ -22,8 +22,8 @@ class EnquiriesController extends AppController {
function index() { function index() {
$this->Enquiry->recursive = 0; $this->Enquiry->recursive = 0;
$this->set('enquiries', $this->paginate()); $this->set('enquiries', $this->paginate());
$status_list = $this->Enquiry->Status->getJSON();
$status_list = $this->Enquiry->Status->getJSON();
$this->set('status_list', $status_list); $this->set('status_list', $status_list);
$classNames = $this->Enquiry->Status->getClassNamesJSON(); $classNames = $this->Enquiry->Status->getClassNamesJSON();
$this->set('class_names', $classNames); $this->set('class_names', $classNames);

2
models/status.php
View file

@ -33,4 +33,4 @@ class Status extends AppModel {
} }
?> ?>

4
views/elements/enquiry_table.ctp
View file

@ -1,7 +1,7 @@
<?php echo $javascript->link('jquery.jeditable.mini'); <?php echo $javascript->link('jquery.jeditable.mini');
echo $javascript->link('enquiry_table'); ?> echo $javascript->link('enquiry_table'); ?>
<?php echo $paginator->options(array('url' => $this->passedArgs)); ?> <?php echo $paginator->options(array('url' => $this->passedArgs)); ?>
<?php <?php
@ -187,4 +187,4 @@ echo $paginator->counter(array(
<div id="statusClassNames" style="display: none;"><?=$class_names;?></div> <div id="statusClassNames" style="display: none;"><?=$class_names;?></div>
<? <?
//debug($enquiries);?> //debug($enquiries);?>

2
webroot/js/enquiry_table.js
View file

@ -1,7 +1,9 @@
$(function() { $(function() {
console.log("WOOT");
var statusNamesJSON = $("#statusJSONlist").html(); var statusNamesJSON = $("#statusJSONlist").html();
console.log(statusNamesJSON);
var statusNames = $.parseJSON(statusNamesJSON); var statusNames = $.parseJSON(statusNamesJSON);