| Speed | -display('speed'); ?> | -|
| - | ||
| - | Peak | -Off Peak | -
| Included Download Traffic | - -base_down_peak/1000; ?> GB | -base_down_offpeak/1000; ?> GB | -
| Extra Download Traffic | -display('extra_down_peak'); ?>/GB | -display('extra_down_offpeak'); ?>/GB | -
| TAX INVOICE | -invnum(); ?> | +id(); ?> | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Issue Date | @@ -61,7 +61,7 @@|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| service->id,$item->service->svcnum()); ?> | +service->id,$item->service->id()); ?> | product->product_translate->find()->name; ?> (product_id; ?>) | items_service_total($item->service_id));?> | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| id,$invoice->invnum()); ?> | +id,$invoice->id()); ?> | display('total_amt'); ?> | display('credit_amt'); ?> | display('billed_amt'); ?> | diff --git a/modules/module/classes/controller/admin/module.php b/modules/module/classes/controller/admin/module.php index 4e83d7d8..8c69c7c7 100644 --- a/modules/module/classes/controller/admin/module.php +++ b/modules/module/classes/controller/admin/module.php @@ -45,6 +45,7 @@ class Controller_Admin_Module extends Controller_Module { * Edit a Module Configuration * * @param int $mid Module ID + * @todo Highlight those methods that have security, but the class does not have auth_required set to YES or the method isnt defined in secure_actions */ public function action_edit($mid) { $mo = ORM::factory('module',$mid); diff --git a/modules/module/classes/controller/module.php b/modules/module/classes/controller/module.php index 844222a3..18a4e5c3 100644 --- a/modules/module/classes/controller/module.php +++ b/modules/module/classes/controller/module.php @@ -15,7 +15,7 @@ class Controller_Module extends Controller_TemplateDefault { 'edit'=>TRUE, 'list'=>TRUE, 'menu'=>TRUE, - ); + ); public function action_menu() { // Redirect us to the admin menu, no user facilities here! diff --git a/modules/product/classes/model/product.php b/modules/product/classes/model/product.php index 0d9765ce..e8abb1d5 100644 --- a/modules/product/classes/model/product.php +++ b/modules/product/classes/model/product.php @@ -21,12 +21,71 @@ class Model_Product extends ORMOSB { 'sku'=>'asc', ); - protected $_formats = array( + protected $_display_format = array( 'price_type'=>array('StaticList_PriceType::display'=>array()), ); + /** + * The feature summary should be implemented in child objects. + * It is displayed on the product overview page, as a summary of the products features. + */ + protected function _feature_summary() { + throw new Kohana_Exception(':method not defined in child class :class',array(':method'=>__METHOD__,':class'=>get_class($this))); + } + + /** + * The summary should be implemented in child objects. + */ + protected function _summary() { + return _('No Description'); + } + + /** + * Return the object of the product plugin + */ + private function plugin() { + if (! $this->prod_plugin_file) + return NULL; + + if (! is_numeric($this->prod_plugin_data)) + throw new Kohana_Exception('Missing plugin_id for :product (:type)',array(':product'=>$this->id,':type'=>$this->prod_plugin_file)); + + $spn = sprintf('%s_%s',get_class($this),$this->prod_plugin_file); + return new $spn($this->prod_plugin_data); + } + + /** + * Get the product name, after translating + */ + public function name() { + return $this->product_translate->find()->display('name'); + } + + /** + * This will render the product feature summary information + */ + public function feature_summary() { + if (is_null($plugin = $this->plugin())) + return HTML::nbsp(''); + else + return $plugin->_feature_summary(); + } + + /** + * Get the summary description + * + * Generally this is used on the invoice summary page + */ + public function summary() { + if (is_null($plugin = $this->plugin())) + return _('Other'); + else + return $plugin->_summary(); + } + /** * Return the products for a given category + * @todo This shouldnt be here. */ public function category($cat) { $results = array(); diff --git a/modules/product/classes/model/product/adsl.php b/modules/product/classes/model/product/adsl.php new file mode 100644 index 00000000..2d8ea318 --- /dev/null +++ b/modules/product/classes/model/product/adsl.php @@ -0,0 +1,58 @@ +array( + array('Tax::add',array(':value')), + array('Currency::display',array(':value')), + ), + 'extra_down_offpeak'=>array( + array('Tax::add',array(':value')), + array('Currency::display',array(':value')), + ), + ); + + protected function _feature_summary() { + return View::factory('product/adsl/feature_summary') + ->set('po',$this); + } + + protected function _summary() { + return sprintf('%s: %s %s','ADSL Services',$this->speed,$this->allowance(TRUE)); + } + + /** + * Show the ADSL allowance as a peak/offpeak metric + */ + public function allowance($string=TRUE) { + $output = ADSL::allowance(array( + 'base_down_peak'=>$this->base_down_peak, + 'base_down_offpeak'=>$this->base_down_offpeak, + 'base_up_peak'=>$this->base_up_peak, + 'base_up_offpeak'=>$this->base_up_offpeak, + 'extra_down_peak'=>$this->extra_down_peak, + 'extra_down_offpeak'=>$this->extra_down_offpeak, + 'extra_up_peak'=>$this->extra_up_peak, + 'extra_up_offpeak'=>$this->extra_up_offpeak, + )); + + return $string ? implode('/',$output) : $output; + } +} +?> diff --git a/modules/product/views/product/adsl/feature_summary.php b/modules/product/views/product/adsl/feature_summary.php new file mode 100644 index 00000000..14b55700 --- /dev/null +++ b/modules/product/views/product/adsl/feature_summary.php @@ -0,0 +1,28 @@ + +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Speed | +display('speed'); ?> | +|
| + | ||
| + | Peak | + base_down_offpeak OR $po->extra_down_offpeak) { ?> +Off Peak | + +
| Included Download Traffic | + +base_down_peak/1000; ?> GB | +base_down_offpeak ? ($po->base_down_offpeak/1000).'GB' : HTML::nbsp(''); ?> | +
| Extra Download Traffic | +display('extra_down_peak'); ?>/GB | +extra_down_offpeak ? $po->display('extra_down_offpeak').'/GB' : HTML::nbsp(''); ?> | +
| Plugin Details | +||||||||||||
+
|
+
+
|
+
| Service Details | +|||||||||||||||||||||
| + | |||||||||||||||||||||
+
|
+
+
|
+ ||||||||||||||||||||
+
|
+ |||||||||||||||||||||
| graph_traffic(isset($_POST['month']) ? $_POST['month'] : ''); ?> | + | ||||||||||||||||||||
| Service Name | -product->product_translate->find()->name; ?> | -||
| Service Active | -display('active'); ?> | +Service Active | +display('active'); ?> |
| Billing Period | -display('recur_schedule');?> | +display('recur_schedule');?> | |
| Cost | -display('price'); ?> | +display('price'); ?> | |
| Date Next Invoice | -date_next_invoice); ?> | +display('date_next_invoice'); ?> | |
| Current Invoices Due | -account->invoices_due_total()); ?> | +account->invoices_due_total()); ?> |
| Invoices for this service | +|||||
| + | |||||
| Number | +Invoice Date | +Due Date | +Total | +Balance | +|
| id,HTML::image('media/img/gnome-pdf.png',array('alt'=>_('Download'),'width'=>20))); ?> | +id,$io->id()); ?> | +display('date_orig'); ?> | +display('due_date'); ?> | +total(TRUE); ?> | +due(TRUE); ?> | +
| View Daily Traffic for Month | -service_adsl->get_traffic_months(),(isset($_POST['month']) ? $_POST['month'] : '')); echo Form::submit('submit',_('Show')); echo Form::close(); ?> | -||||||
| - | |||||||
| - |
-
|
- ||||||
| - |