Fixed charge display and updates

This commit is contained in:
Deon George
2016-07-25 15:47:18 +10:00
parent 21d204f605
commit 3d3c38b0a0
3 changed files with 30 additions and 23 deletions

View File

@@ -22,7 +22,7 @@ class Controller_Reseller_Charge extends Controller_Charge {
Block::factory()
->type('form-horizontal')
->title('Add/View Charge')
->title_icon('icon-wrench')
->title_icon('fa fa-wrench')
->body($this->add_edit());
}
@@ -59,11 +59,11 @@ class Controller_Reseller_Charge extends Controller_Charge {
Script::factory()
->type('file')
->data('media/theme/bootstrap/vendor/datepicker/js/bootstrap-datepicker.js');
->data('media/theme/bootstrap/js/bootstrap.datepicker.js');
Style::factory()
->type('file')
->data('media/theme/bootstrap/vendor/datepicker/css/datepicker.css');
->data('media/theme/bootstrap/css/bootstrap.datepicker.css');
Script::factory()
->type('stdin')
@@ -72,6 +72,7 @@ $(document).ready(function() {
$("#date_charge_label").datepicker({
autoclose : true,
endDate : new Date(),
todayHighlight: true,
format : "dd-M-yyyy",
todayBtn : true,
}).on("hide",function(ev) {
@@ -126,7 +127,7 @@ $(document).ready(function() {
Block::factory()
->type('form-horizontal')
->title(sprintf('%s: %s',_('View Charges'),$id))
->title_icon('icon-wrench')
->title_icon('fa fa-wrench')
->body($this->add_edit($id,$output));
}
@@ -136,7 +137,7 @@ $(document).ready(function() {
public function action_list() {
Block::factory()
->title('Customer Charges')
->title_icon('icon-th-list')
->title_icon('fa fa-list')
->body(Table::factory()
->page_items(50)
->data(ORM::factory('Charge')->where_authorised($this->ao)->where('void','is',NULL)->order_by('id','DESC')->find_all())