Tidied up code base for work on the new Mac. Going to remote ProductCategories since they seem useless and I have forgotten why I made them.

.gitignore

@@ -4,7 +4,7 @@ tmp/cache/persistent/*
 tmp/cache/views/*
 tmp/sessions/*
 tmp/tests/*
+tmp/*
 *.tar.gz
 *.swp
 *.swo
-vapourama/*

config/core.php

@@ -179,7 +179,7 @@
  *
 * File storage engine.
 */
- Cache::config('default', array(
+ /*Cache::config('default', array(
 		'engine' => 'File', //[required]
 		'duration'=> 3600, //[optional]
 		'probability'=> 100, //[optional]
@@ -188,7 +188,7 @@
  		'lock' => false, //[optional]  use file locking
  		'serialize' => true,
 	));
-
+*/
     
  /*
   * 
@@ -198,13 +198,13 @@
  */
  //APC (http://pecl.php.net/package/APC)
  
-  	/* Cache::config('default', array(
+  	 Cache::config('default', array(
  		'engine' => 'Apc', //[required]
  		'duration'=> 3600, //[optional]
  		'probability'=> 100, //[optional]
   		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
- 	)); */
- /*ß
+ 	)); 
+ /*
   *
   *
  // Xcache (http://xcache.lighttpd.net/)

controllers/quote_products_controller.php

@@ -45,9 +45,9 @@ class QuoteProductsController extends AppController {
 
 		
 		$principles = $this->QuoteProduct->Product->Principle->find('list');
-		$currencies = $this->QuoteProduct->Currency->find('list');
+		
 		$quote = $this->QuoteProduct->Quote->read(null, $quoteid);
-		$this->set(compact('principles', 'currencies', 'quote', 'products'));
+		$this->set(compact('principles','quote', 'products'));
                 
 	}
 

tmp/.gitignore

@@ -1 +0,0 @@
-

views/quotes/pdf.ctp

@@ -93,7 +93,7 @@ $tcpdf->AliasNbPages();
 $tcpdf->lastPage();
 
 
-$output_dir = '/var/www/cake/app/webroot/pdf/';
+$output_dir = '/Users/karlcordes/Sites/quotenik/app/webroot/pdf/';
 
 if($quote['Quote']['revision'] > 0) {
     $filename = $enquiry['Enquiry']['title'].'rev'.$quote['Quote']['revision'].'.pdf';