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

10
modules/checkout/classes/Model/Checkout.php
View File

@@ -9,7 +9,7 @@
* @copyright (c) 2009-2013 Open Source Billing
* @license http://dev.osbill.net/license.html
*/
class Model_Checkout extends ORM_OSB {
class Model_Checkout extends ORM {
protected $_has_many = array(
'payment'=>array(),
'service'=>array('through'=>'account_billing','foreign_key'=>'checkout_id'),
@@ -20,10 +20,6 @@ class Model_Checkout extends ORM_OSB {
/** REQUIRED ABSTRACT METHODS **/
public function name($variable=NULL) {
return $this->name;
}
/** LOCAL METHODS **/
/**
@@ -46,6 +42,10 @@ class Model_Checkout extends ORM_OSB {
return Currency::round($net-$amt);
}
public function name($variable=NULL) {
return $this->name;
}
/**
* Return the object of the checkout plugin
*/

6
modules/checkout/classes/Model/Checkout/Notify.php
View File

@@ -9,7 +9,7 @@
* @copyright (c) 2009-2013 Open Source Billing
* @license http://dev.osbill.net/license.html
*/
class Model_Checkout_Notify extends ORM_OSB implements Invoicable {
class Model_Checkout_Notify extends ORM {
// Relationships
protected $_has_one = array(
'checkout'=>array('far_key'=>'checkout_id','foreign_key'=>'id'),
@@ -25,10 +25,6 @@ class Model_Checkout_Notify extends ORM_OSB implements Invoicable {
'data',
);
public function invoice_item($item_type) {
return sprintf('Payment Fee: %s',$this->checkout->name);
}
public function process() {
return $this->checkout->plugin()->notify($this);
}