From e0b28dd57b2466901a698d3ee7a9b1f9d2cdd0f4 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Fri, 29 Nov 2013 17:10:11 +0100 Subject: [PATCH] // AdminOutstanding is now bootstraped --- .../admin/AdminOutstandingController.php | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/controllers/admin/AdminOutstandingController.php b/controllers/admin/AdminOutstandingController.php index 357b8249f..7e00853ab 100644 --- a/controllers/admin/AdminOutstandingController.php +++ b/controllers/admin/AdminOutstandingController.php @@ -28,6 +28,7 @@ class AdminOutstandingControllerCore extends AdminController { public function __construct() { + $this->bootstrap = true; $this->table = 'order_invoice'; $this->className = 'OrderInvoice'; $this->addRowAction('view'); @@ -51,13 +52,10 @@ class AdminOutstandingControllerCore extends AdminController $this->fields_list = array( 'number' => array( - 'title' => $this->l('Invoice Number'), - 'align' => 'center', - 'width' => 20 + 'title' => $this->l('Invoice') ), 'date_add' => array( 'title' => $this->l('Date'), - 'width' => 150, 'type' => 'date', 'align' => 'right', 'filter_key' => 'a!date_add' @@ -69,13 +67,11 @@ class AdminOutstandingControllerCore extends AdminController ), 'company' => array( 'title' => $this->l('Company'), - 'align' => 'center', - 'width' => 20 + 'align' => 'center' ), 'risk' => array( 'title' => $this->l('Risk'), 'align' => 'center', - 'width' => 100, 'orderby' => false, 'type' => 'select', 'color' => 'color', @@ -86,7 +82,6 @@ class AdminOutstandingControllerCore extends AdminController 'outstanding_allow_amount' => array( 'title' => $this->l('Outstanding Allow'), 'align' => 'center', - 'width' => 50, 'prefix' => '', 'suffix' => '', 'type' => 'price' @@ -94,14 +89,12 @@ class AdminOutstandingControllerCore extends AdminController 'outstanding' => array( 'title' => $this->l('Current Outstanding'), 'align' => 'center', - 'width' => 50, 'callback' => 'printOutstandingCalculation', 'orderby' => false, 'search' => false ), 'id_invoice' => array( - 'title' => $this->l('PDF'), - 'width' => 35, + 'title' => $this->l('Invoice'), 'align' => 'center', 'callback' => 'printPDFIcons', 'orderby' => false, @@ -148,7 +141,7 @@ class AdminOutstandingControllerCore extends AdminController if (!Validate::isLoadedObject($order_invoice)) throw new PrestaShopException('object Customer can\'t be loaded'); - return ''.$customer->getOutstanding().''; + return ''.Tools::displayPrice($customer->getOutstanding(), Context::getContext()->currency).''; } /**