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

2
modules/adsl/classes/Controller/Admin/Adsl.php
View File

@@ -101,7 +101,7 @@ class Controller_Admin_Adsl extends Controller_Adsl {
->data($apo->products())
->columns(array(
'id'=>'ID',
'title()'=>'Name',
'name(Site::language())'=>'Name',
'status'=>'Active',
))
->prepend(array(

2
modules/adsl/classes/Model/ADSL/Supplier.php
View File

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

2
modules/adsl/classes/Model/ADSL/Supplier/Plan.php
View File

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

2
modules/adsl/classes/Model/Service/Plugin/Adsl/Traffic.php
View File

@@ -9,7 +9,7 @@
* @copyright (c) 2009-2013 Open Source Billing
* @license http://dev.osbill.net/license.html
*/
class Model_Service_Plugin_Adsl_Traffic extends ORM_OSB {
class Model_Service_Plugin_Adsl_Traffic extends ORM {
protected $_table_name = 'service__adsl_traffic';
protected $_primary_key = 'service';
protected $_disable_wild_select = TRUE;

6
modules/adsl/views/product/category/list/adslcompare-large.php
View File

@@ -1,5 +1,5 @@
<div id="page-title">
<h1><?php echo $o->title(); ?></h1>
<h1><?php echo $o->name(Site::language()); ?></h1>
<?php echo $o->description(); ?>
</div> <!-- /page-title -->
@@ -10,12 +10,12 @@
<th class="plan-title">Plan Name</th>
<?php foreach ($o->products() as $po) : ?>
<td class="plan-title"><?php echo $po->title(); ?> <small>(<?php echo $po->id; ?>)</small></td>
<td class="plan-title"><?php echo $po->name(Site::language()); ?> <small>(<?php echo $po->id; ?>)</small></td>
<?php endforeach ?>
</tr>
<tr class="plan-header">
<th class="plan-price" >Price</th>
<th class="plan-title" >Price</th>
<?php foreach ($o->products() as $po) : ?>
<?php $go = $po->price_best($o->recur_schedule,TRUE); ?>

6
modules/adsl/views/product/category/list/adslcompare.php
View File

@@ -1,5 +1,5 @@
<div id="page-title">
<h1><?php echo $o->title(); ?></h1>
<h1><?php echo $o->name(Site::language()); ?></h1>
<?php echo $o->description(); ?>
</div> <!-- /page-title -->
@@ -23,9 +23,7 @@
<div class="plan-header">
<div class="plan-title">
<?php echo $po->title(); ?> <small>(<?php echo $po->id; ?>)</small>
</div> <!-- /plan-title -->
<div class="plan-title"><?php echo $po->name(Site::language()); ?> <small>(<?php echo $po->id; ?>)</small></div>
<div class="plan-price">
<span class="note">$</span><?php echo substr($price,0,strpos($price,'.')); ?><span class="cents"> .<?php echo substr($price,-2,strpos($price,'.')); ?></span><span class="term"><?php echo StaticList_RecurSchedule::get($o->recur_schedule); ?></span>