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

Removed redundant functions, some Standardisation work

Browse Source
This commit is contained in:
Deon George
2016-08-15 21:23:18 +10:00
parent 24bb4a701b
commit 07de13f678
82 changed files with 367 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/export/classes/Export/Plugin/Quicken.php
View File

@@ -100,10 +100,10 @@ class Export_Plugin_Quicken extends Export_Plugin {
$items[$c]['INVITEM'] = $edo->map_data['item'];
} else {
throw HTTP_Exception::factory(501,'Missing product map data for :product (:id)',array(':product'=>$iio->module()->title(),':id'=>$iio->module_ref));
throw HTTP_Exception::factory(501,'Missing product map data for :product (:id)',array(':product'=>$iio->product->name(Site::language()),':id'=>$iio->module_ref));
}
$items[$c]['MEMO'] = sprintf('%s (%s)',$iio->module()->title(),$iio->period());
$items[$c]['MEMO'] = $iio->name();
// Non product item
} else {

2
modules/export/classes/Model/Export.php
View File

@@ -9,7 +9,7 @@
* @copyright (c) 2009-2013 Open Source Billing
* @license http://dev.osbill.net/license.html
*/
class Model_Export extends ORM_OSB {
class Model_Export extends ORM {
// Relationships
protected $_has_many = array(
'export_module' => array('far_key'=>'id','xforeign_key'=>'x'),

5
modules/export/classes/Model/Export/DataMap.php
View File

@@ -9,7 +9,7 @@
* @copyright (c) 2009-2013 Open Source Billing
* @license http://dev.osbill.net/license.html
*/
class Model_Export_DataMap extends ORM_OSB {
class Model_Export_DataMap extends ORM {
// Relationships
protected $_belongs_to = array(
'export_module' => array(),
@@ -20,12 +20,11 @@ class Model_Export_DataMap extends ORM_OSB {
'map_data',
);
public function list_itemsnoexport(Model $o,$emoid,$desc='title()') {
public function list_itemsnoexport(Model $o,$emoid,$desc='name(Site::language())') {
$result = array();
$o->select(array($this->table_name().'.id','edm'))
->join($this->table_name(),'LEFT OUTER')
->on($this->table_name().'.site_id','=',$o->table_name().'.site_id') // @todo This should be automatic
->on($this->table_name().'.item_id','=',$o->table_name().'.id')
->on('export_module_id','=',$emoid)
->where($o->table_name().'.status','=',TRUE)

2
modules/export/classes/Model/Export/Item.php
View File

@@ -9,7 +9,7 @@
* @copyright (c) 2009-2013 Open Source Billing
* @license http://dev.osbill.net/license.html
*/
class Model_Export_Item extends ORM_OSB {
class Model_Export_Item extends ORM {
// Relationships
protected $_belongs_to = array(
'export_module' => array(),

2
modules/export/classes/Model/Export/Module.php
View File

@@ -9,7 +9,7 @@
* @copyright (c) 2009-2013 Open Source Billing
* @license http://dev.osbill.net/license.html
*/
class Model_Export_Module extends ORM_OSB {
class Model_Export_Module extends ORM {
protected $_created_column = FALSE;
protected $_updated_column = FALSE;