First commit this side of the pacific
This commit is contained in:
parent
5a5561a8a1
commit
26452cd1a0
|
|
@ -12,10 +12,6 @@ class ProductOption extends AppModel {
|
||||||
* that are already default == 1 , to be false.
|
* that are already default == 1 , to be false.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
function beforeSave() {
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@ class ProductOptionsCategory extends AppModel {
|
||||||
var $validate = array(
|
var $validate = array(
|
||||||
'product_id' => array('numeric'),
|
'product_id' => array('numeric'),
|
||||||
'name' => array('notempty'),
|
'name' => array('notempty'),
|
||||||
'location' => array('numeric'),
|
'location' => array('numeric' => array('allowEmpty' => true)),
|
||||||
'exclusive' => array('notempty')
|
'exclusive' => array('boolean')
|
||||||
);
|
);
|
||||||
|
|
||||||
//The Associations below have been created with all possible keys, those that are not needed can be removed
|
//The Associations below have been created with all possible keys, those that are not needed can be removed
|
||||||
|
|
|
||||||
13
models/quote_product_option.php
Normal file
13
models/quote_product_option.php
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
<?
|
||||||
|
class QuoteProductOption extends AppModel {
|
||||||
|
|
||||||
|
var $name = 'QuoteProductOption';
|
||||||
|
|
||||||
|
|
||||||
|
var $belongsTo = array('ProductOptionsCategory', 'QuoteProduct');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<div class="products index">
|
<div class="products index">
|
||||||
<h2><?php __('Products');?></h2>
|
<h2><?php __('Product Index');?></h2>
|
||||||
<p>
|
<p>
|
||||||
<?php
|
<?php
|
||||||
echo $paginator->counter(array(
|
echo $paginator->counter(array(
|
||||||
|
|
|
||||||
|
|
@ -53,5 +53,5 @@ foreach ($options as $opt) {
|
||||||
|
|
||||||
//print_r($categories);
|
//print_r($categories);
|
||||||
|
|
||||||
//print_r($options);
|
print_r($options);
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -94,7 +94,7 @@ foreach ($quote['QuotePage'] as $quotePage):
|
||||||
|
|
||||||
<td><?php echo $quoteProduct['QuoteProduct']['quantity'];?></td>
|
<td><?php echo $quoteProduct['QuoteProduct']['quantity'];?></td>
|
||||||
<td><?php echo $quoteProduct['QuoteProduct']['title'];?></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 echo $quote['Currency']['symbol'].$quoteProduct['QuoteProduct']['unit_price'];?></td>
|
||||||
<td><?php
|
<td><?php
|
||||||
|
|
||||||
|
|
@ -118,7 +118,7 @@ foreach ($quote['QuotePage'] as $quotePage):
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td>SUB-TOTAL (Excluding GST)</td>
|
<td class="rightAlign">SUB-TOTAL (Excluding GST)</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td><?php echo $quote['Currency']['symbol'].$subTotal; ?></td>
|
<td><?php echo $quote['Currency']['symbol'].$subTotal; ?></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
|
|
@ -128,7 +128,7 @@ foreach ($quote['QuotePage'] as $quotePage):
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td>GST (10%)</td>
|
<td class="rightAlign">GST (10%)</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td><?php
|
<td><?php
|
||||||
if($quote['Enquiry']['gst'] == 1 ) {
|
if($quote['Enquiry']['gst'] == 1 ) {
|
||||||
|
|
@ -151,7 +151,7 @@ foreach ($quote['QuotePage'] as $quotePage):
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td>TOTAL PAYABLE</td>
|
<td class="rightAlign">TOTAL PAYABLE</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td><?php
|
<td><?php
|
||||||
$total = $subTotal + $gst;
|
$total = $subTotal + $gst;
|
||||||
|
|
|
||||||
|
|
@ -547,6 +547,15 @@ table.productoptions tr.defaultoption {
|
||||||
|
|
||||||
table.quoteproducts {
|
table.quoteproducts {
|
||||||
width: 70%;
|
width: 70%;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.leftAlign {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.rightAlign {
|
||||||
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue