From 616f09abe2755c9038e7f358143f78eca799e493 Mon Sep 17 00:00:00 2001
From: Karl Cordes <karlcordes@infinity.(none)>
Date: Wed, 31 Mar 2010 15:48:55 +1100
Subject: [PATCH] Finally got the damned hackish not-costing Line Items done.

---
 controllers/quotes_controller.php | 4 ++--
 models/line_item.php              | 3 +++
 vendors/xtcpdf.php                | 8 ++++----
 views/quotes/ajaxpdf.ctp          | 6 +++---
 views/quotes/view.ctp             | 2 +-
 webroot/js/addLineItem.js         | 2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/controllers/quotes_controller.php b/controllers/quotes_controller.php
index 3e55e572..66adca60 100755
--- a/controllers/quotes_controller.php
+++ b/controllers/quotes_controller.php
@@ -212,13 +212,13 @@ class QuotesController extends AppController {
             $enquiry = $this->Quote->Enquiry->find('first', array('conditions' => array('Enquiry.id' => $quote['Quote']['enquiry_id'])));
 
 
-            $quoteProducts = $this->Quote->LineItem->find('all', array('recursive' => 0, 'conditions' => array('LineItem.quote_id' => $id),
+            $quoteProducts = $this->Quote->LineItem->find('all', array('recursive' => 1, 'conditions' => array('LineItem.quote_id' => $id),
                     'order' => array('LineItem.item_number ASC'))
             );
 
             $user = $this->Quote->Enquiry->User->find('first', array('conditions' => array('User.id' => $enquiry['Enquiry']['user_id'])));
 
-            $this->set('principlesList', $this->Quote->Enquiry->Principle->find('list'));
+           
 
 
             /**
diff --git a/models/line_item.php b/models/line_item.php
index 70e3a798..b4ac5df0 100644
--- a/models/line_item.php
+++ b/models/line_item.php
@@ -32,6 +32,9 @@ class LineItem extends AppModel {
 								'order' => ''
 			),
 
+                        'Principle' => array('className' => 'Principle',
+                                                            'foreignKey' =>'principle_id')
+
 	);
 	
 	
diff --git a/vendors/xtcpdf.php b/vendors/xtcpdf.php
index c39f31fc..16ba69da 100755
--- a/vendors/xtcpdf.php
+++ b/vendors/xtcpdf.php
@@ -190,7 +190,7 @@ class XTCPDF extends TCPDF {
      * @param <type> $docType
      * @param <type> $commercialDetails
      */
-    function calculateProductPage($principlesList, $currency,$gst, $products ,$docType, $commercialDetails) {
+    function calculateProductPage($currency,$gst, $products ,$docType, $commercialDetails) {
 
         $itemColwidth = 12;
         $qtyColwidth = 10;
@@ -290,7 +290,7 @@ class XTCPDF extends TCPDF {
      * @param String $docType - the model name of the Products we want to put in the table. ie. QuoteProduct, or InvoiceProduct, etc
      * @param Map    $commercialDetails - the details array/map - passed to commercialComments()
      */
-    function productPage($principlesList, $currency,$gst, $products ,$docType, $commercialDetails, $pageProducts) {
+    function productPage($currency,$gst, $products ,$docType, $commercialDetails, $pageProducts) {
 
 
         $this->SetFontSize(10);
@@ -314,7 +314,7 @@ class XTCPDF extends TCPDF {
         $options = 0; //Toggled to 1 when we encounter an Optional product. Stops the totals being printed.
 
         echo "FUCK";
-        print_r($principlesList);
+        print_r($principlesList[0]);
         foreach ($pageProducts as $page) {
 
             $this->AddPage();
@@ -357,7 +357,7 @@ class XTCPDF extends TCPDF {
             foreach($page as $productID) {
                 $product = array_shift($products);
 
-                $fullDesc = "<b>".$principlesList[$product[$docType]['id']]."</b><br>"."<b>".$product[$docType]['title'].'</b><br>'.$product[$docType]['description'];
+                $fullDesc = "<b>".$product['Principle']['name']."</b><br>"."<b>".$product[$docType]['title'].'</b><br>'.$product[$docType]['description'];
 
                 if($product[$docType]['option'] == 1) {
                     $options = 1;
diff --git a/views/quotes/ajaxpdf.ctp b/views/quotes/ajaxpdf.ctp
index 263072be..152c5e34 100644
--- a/views/quotes/ajaxpdf.ctp
+++ b/views/quotes/ajaxpdf.ctp
@@ -27,7 +27,7 @@ $tcpdf->setPrintHeader(false);
 $tcpdf->setPrintFooter(false);
 
 
-$pageProducts = $tcpdf->calculateProductPage($principle_name, $quote['Currency'],
+$pageProducts = $tcpdf->calculateProductPage($quote['Currency'],
     $enquiry['Enquiry']['gst'], $products, 'LineItem', $commercialDetails);
 
 
@@ -89,7 +89,7 @@ foreach ($quote['QuotePage'] as $page) {
 
 
 
-//print_r($products);
+print_r($products);
 
 
 
@@ -100,7 +100,7 @@ foreach ($quote['QuotePage'] as $page) {
 
 
 
-$tcpdf->productPage($principlesList, $quote['Currency'], $enquiry['Enquiry']['gst'], $products, 'LineItem', $commercialDetails,
+$tcpdf->productPage($quote['Currency'], $enquiry['Enquiry']['gst'], $products, 'LineItem', $commercialDetails,
     $pageProducts);
 
 
diff --git a/views/quotes/view.ctp b/views/quotes/view.ctp
index e6fb4964..8ba18846 100755
--- a/views/quotes/view.ctp
+++ b/views/quotes/view.ctp
@@ -172,4 +172,4 @@ foreach ($quote['QuotePage'] as $quotePage):
 
 <div id="mydebug"></div>
 
-<? debug($principles); ?>
\ No newline at end of file
+<? debug($quoteProducts); ?>
\ No newline at end of file
diff --git a/webroot/js/addLineItem.js b/webroot/js/addLineItem.js
index 60a4c7d5..43f8f948 100644
--- a/webroot/js/addLineItem.js
+++ b/webroot/js/addLineItem.js
@@ -64,7 +64,7 @@ $(function() {
     .button()
     .click(function() {
         $.post("/quotes/ajaxpdf",quoteID, function(data) {
-            alert(data);
+           $('#mydebug').html(data);
         });
     });