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

Indenting changes

Browse source
This commit is contained in:
Karl Cordes 2012-11-17 14:36:36 +11:00
parent 7fcf2eafca
commit 743ce3cec5
2 changed files with 609 additions and 608 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
controllers/documents_controller.php
View file

@ -61,7 +61,7 @@ class DocumentsController extends AppController {
$this->set('docTypeElement', $docTypeElement); $this->set('docTypeElement', $docTypeElement);
// $this->set('principles', $this->Document->LineItem->Product->Principle->find('list')); // $this->set('principles', $this->Document->LineItem->Product->Principle->find('list'));
} }
@ -152,7 +152,7 @@ class DocumentsController extends AppController {
$this->data['Invoice']['customer_id'] = $enquiry['Enquiry']['customer_id']; $this->data['Invoice']['customer_id'] = $enquiry['Enquiry']['customer_id'];
$this->data['Document']['user_id']= $enquiry['Enquiry']['user_id']; $this->data['Document']['user_id']= $enquiry['Enquiry']['user_id'];
//$number_of_revisions = $this->Document->Invoice->findCount('Invoice.enquiry_id ='. $enquiryid); //$number_of_revisions = $this->Document->Invoice->findCount('Invoice.enquiry_id ='. $enquiryid);
$this->data['Document']['revision'] = 0; //No revisions for Invoices. I have decreed it! $this->data['Document']['revision'] = 0; //No revisions for Invoices. I have decreed it!
$this->data['Document']['type'] = 'invoice'; $this->data['Document']['type'] = 'invoice';
@ -227,7 +227,7 @@ class DocumentsController extends AppController {
} }
else if (!empty($document['Quote']['id'])) { else if (!empty($document['Quote']['id'])) {
//First setup the Date and default valid until date. (30 days from today). //First setup the Date and default valid until date. (30 days from today).
$today_date = date("Y-m-d"); $today_date = date("Y-m-d");
$valid_until = date("Y-m-d", strtotime("+30 days")); $valid_until = date("Y-m-d", strtotime("+30 days"));
@ -278,8 +278,8 @@ class DocumentsController extends AppController {
$this->set('newDoc', $newDoc); $this->set('newDoc', $newDoc);
// //
//print_r($newDoc); //print_r($newDoc);
if ($this->Document->saveAll($newDoc)) { if ($this->Document->saveAll($newDoc)) {
$newid = $this->Document->id; $newid = $this->Document->id;
$this->Session->setFlash(__("Revision {$number_of_revisions} created", true)); $this->Session->setFlash(__("Revision {$number_of_revisions} created", true));
@ -418,7 +418,7 @@ class DocumentsController extends AppController {
function pdf($id = null) { function pdf($id = null) {
//Configure::write('debug',0); //Configure::write('debug',0);
if(!$id) { if(!$id) {
$this->Session->setFlash(__('Invalid Document', true)); $this->Session->setFlash(__('Invalid Document', true));
$this->redirect(array('controller'=>'documents', 'action'=>'index')); $this->redirect(array('controller'=>'documents', 'action'=>'index'));
@ -477,8 +477,8 @@ class DocumentsController extends AppController {
$this->set('states', $this->Document->Invoice->Enquiry->State->find('list')); $this->set('states', $this->Document->Invoice->Enquiry->State->find('list'));
//Set filename for the document. //Set filename for the document.
// //
switch($docType) { switch($docType) {
case "quote": case "quote":
$filename = $enquiry['Enquiry']['title']; $filename = $enquiry['Enquiry']['title'];
@ -534,10 +534,10 @@ class DocumentsController extends AppController {
$document['Document']['pdf_created_at'] = date('Y-m-d H:i:s'); $document['Document']['pdf_created_at'] = date('Y-m-d H:i:s');
$document['Document']['pdf_created_by_user_id'] = $this->getCurrentUserID(); $document['Document']['pdf_created_by_user_id'] = $this->getCurrentUserID();
if($this->Document->save($document)) { if($this->Document->save($document)) {
//echo "Set pdf_filename attritbute to: ".$filename; //echo "Set pdf_filename attritbute to: ".$filename;
} }
else { else {
//echo 'Failed to set pdf_filename to: '.$filename; //echo 'Failed to set pdf_filename to: '.$filename;
} }
@ -556,7 +556,7 @@ class DocumentsController extends AppController {
} }
//Called via AJAX to generate Quotation First Pages. //Called via AJAX to generate Quotation First Pages.
function generateFirstPage($id = null) { function generateFirstPage($id = null) {
$this->layout = 'ajax'; $this->layout = 'ajax';
@ -597,9 +597,9 @@ class DocumentsController extends AppController {
$this->Email->to = $enquiry['Contact']['email']; $this->Email->to = $enquiry['Contact']['email'];
//Uncomment this when going live //Uncomment this when going live
// $this->Email->cc = array($enquiry['User']['email']); // $this->Email->cc = array($enquiry['User']['email']);
// $this->Email->bcc = array('carpis@cmctechnologies.com.au'); // $this->Email->bcc = array('carpis@cmctechnologies.com.au');
$this->Email->subject = $enquiry['Enquiry']['title'].' '; $this->Email->subject = $enquiry['Enquiry']['title'].' ';
$this->Email->replyTo = $enquiry['User']['email']; $this->Email->replyTo = $enquiry['User']['email'];

9
views/enquiries/view.ctp
View file

@ -139,12 +139,13 @@
<div class="related"> <div class="related">
<h3><?php if($enquiry['Enquiry']['quote_count'] > 1) { <h3><?php if($enquiry['Enquiry']['quote_count'] > 1) {
echo $enquiry['Enquiry']['quote_count'].' Quotes for this Enquiry'; $word = ' Quotes';
} }
else { else {
echo $enquiry['Enquiry']['quote_count'].' Quote for this Enquiry'; $word = ' Quote';
}
}?> echo $enquiry['Enquiry']['quote_count'].$word;
?>
</h3> </h3>
<? echo $this->element('quote_table', $quotes); <? echo $this->element('quote_table', $quotes);