First commit this side of the pacific

models/product_option.php

@@ -12,10 +12,6 @@ class ProductOption extends AppModel {
 	 * that are already default == 1 , to be false.
 	 * 
 	 */
-	function beforeSave() {
 	
 	
-		
-	}
-	
 }

models/product_options_category.php

@@ -5,8 +5,8 @@ class ProductOptionsCategory extends AppModel {
 	var $validate = array(
 		'product_id' => array('numeric'),
 		'name' => array('notempty'),
-		'location' => array('numeric'),
-		'exclusive' => array('notempty')
+		'location' => array('numeric' => array('allowEmpty' => true)),
+		'exclusive' => array('boolean')
 	);
 
 	//The Associations below have been created with all possible keys, those that are not needed can be removed

models/quote_product_option.php

@@ -0,0 +1,13 @@
+<?
+class QuoteProductOption extends AppModel {
+
+    var $name = 'QuoteProductOption';
+
+
+    var $belongsTo = array('ProductOptionsCategory', 'QuoteProduct');
+
+
+
+}
+
+?>

views/products/index.ctp

@@ -1,5 +1,5 @@
 <div class="products index">
-<h2><?php __('Products');?></h2>
+<h2><?php __('Product Index');?></h2>
 <p>
 <?php
 echo $paginator->counter(array(

views/quote_products/product_options.ctp

@@ -6,7 +6,7 @@ foreach ($options as $opt) {
     foreach($opt['ProductOption'] as $prodopt) {
 
 
-				/* Make it the default selected if it's the default option
+/* Make it the default selected if it's the default option
  * Logic that enforces only 1 default option to be added to the product_options controller
  */
 
@@ -42,7 +42,7 @@ foreach ($options as $opt) {
     }
 
     unset($drop_options);
-		}
+}
 
 
 
@@ -53,5 +53,5 @@ foreach ($options as $opt) {
 
 //print_r($categories); 
 
-//print_r($options);
+print_r($options);
 ?>

views/quotes/view.ctp

@@ -94,7 +94,7 @@ foreach ($quote['QuotePage'] as $quotePage):
 
             <td><?php echo $quoteProduct['QuoteProduct']['quantity'];?></td>
             <td><?php echo $quoteProduct['QuoteProduct']['title'];?></td>
-            <td><?php echo $quoteProduct['QuoteProduct']['description'];?></td>
+            <td class="leftAlign"><?php echo $quoteProduct['QuoteProduct']['description'];?></td>
             <td><?php echo $quote['Currency']['symbol'].$quoteProduct['QuoteProduct']['unit_price'];?></td>
             <td><?php 
             
@@ -118,7 +118,7 @@ foreach ($quote['QuotePage'] as $quotePage):
             <td></td>
             <td></td>
             <td></td>
-            <td>SUB-TOTAL (Excluding GST)</td>
+            <td class="rightAlign">SUB-TOTAL (Excluding GST)</td>
             <td></td>
             <td><?php echo $quote['Currency']['symbol'].$subTotal; ?></td>
             <td></td>
@@ -128,7 +128,7 @@ foreach ($quote['QuotePage'] as $quotePage):
             <td></td>
             <td></td>
             <td></td>
-            <td>GST (10%)</td>
+            <td class="rightAlign">GST (10%)</td>
             <td></td>
             <td><?php
             if($quote['Enquiry']['gst'] == 1 ) {
@@ -151,7 +151,7 @@ foreach ($quote['QuotePage'] as $quotePage):
             <td></td>
             <td></td>
             <td></td>
-            <td>TOTAL PAYABLE</td>
+            <td class="rightAlign">TOTAL PAYABLE</td>
             <td></td>
             <td><?php
                 $total = $subTotal + $gst;

webroot/css/quotenik.css

@@ -547,6 +547,15 @@ table.productoptions tr.defaultoption {
 
 table.quoteproducts {
     width: 70%;
+    text-align: left;
+}
+
+td.leftAlign {
+    text-align: left;
+}
+
+td.rightAlign {
+    text-align: right;
 }