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

Fixed country order

Browse source
This commit is contained in:
Karl Cordes 2010-04-07 13:57:30 +10:00
parent 67680e8e2f
commit da25c0b0a0
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
controllers/line_items_controller.php
View file

@ -83,6 +83,9 @@ class LineItemsController extends AppController {
/* Copy all the data from the Product to the new LineItem */
$this->data['LineItem']['description'] = $product['Product']['description'];
$this->data['LineItem']['title'] = $product['Product']['title'];
}

2
models/country.php
View file

@ -3,6 +3,8 @@ class Country extends AppModel {
var $name = 'Country';
var $order = "Country.name ASC";
//The Associations below have been created with all possible keys, those that are not needed can be removed
var $belongsTo = array(
'Currency' => array('className' => 'Currency',

13
vendors/xtcpdf.php vendored
View file

@ -357,7 +357,13 @@ class XTCPDF extends TCPDF {
foreach($page as $productID) {
$product = array_shift($products);
if($product['Principle']['id'] != null) {
$fullDesc = "<b>".$product['Principle']['name']."</b><br>"."<b>".$product[$docType]['title'].'</b><br>'.$product[$docType]['description'];
}
else {
$fullDesc = "<b>".$product[$docType]['title'].'</b><br>'.$product[$docType]['description'];
}
if($product[$docType]['option'] == 1) {
$options = 1;
@ -541,13 +547,6 @@ ENDHTMLCONTENTS;
}
function termsAndConditions() {
}
function totals($currency, $subTotal, $gst, $options) {