deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Minor fixes to ssl and core

Browse Source
This commit is contained in:
Deon George
2011-12-30 10:54:54 +11:00
parent 4a68621fc7
commit 125407656d
9 changed files with 77 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/product/classes/controller/admin/product.php
View File

@@ -28,7 +28,6 @@ class Controller_Admin_Product extends Controller_TemplateDefault_Admin {
'id'=>array('label'=>'ID','url'=>'product/view/'),
'name()'=>array('label'=>'Details'),
'active'=>array('label'=>'Active'),
'prod_plugin'=>array('label'=>'Plugin'),
'prod_plugin_file'=>array('label'=>'Plugin Name'),
'prod_plugin_data'=>array('label'=>'Plugin Data'),
'price_type'=>array('label'=>'Price Type'),

5
modules/product/classes/model/product.php
View File

@@ -89,7 +89,7 @@ class Model_Product extends ORMOSB {
// Work out the best price for the user
$price = array();
foreach (unserialize($this->price_group) as $bill_freq => $pg) {
if ($pg['show'])
if (isset($pg['show']) AND $pg['show'])
foreach ($groups as $gid) {
if (! empty($pg[$gid])) {
if (empty($price[$bill_freq]['price_base'])
@@ -101,7 +101,8 @@ class Model_Product extends ORMOSB {
}
}
return $price;
// @todo Ugly hack
return $price ? $price : array('0'=>array('price_base'=>0,'price_setup'=>0));
}
/**