diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index f906d878a..696a547f6 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -390,7 +390,7 @@ class AdminCarriersControllerCore extends AdminController array( 'type' => 'text', 'label' => $this->l('Maximium package deep:'), - 'name' => 'max_deep', + 'name' => 'max_depth', 'required' => false, 'size' => 10, 'desc' => $this->l('Maximum deep managed by this carrier. Set "0" or nothing, to ignore this field.') diff --git a/controllers/admin/AdminShippingController.php b/controllers/admin/AdminShippingController.php index a5efaf633..2007bd525 100644 --- a/controllers/admin/AdminShippingController.php +++ b/controllers/admin/AdminShippingController.php @@ -84,8 +84,7 @@ class AdminShippingControllerCore extends AdminController ), 'validation' => 'isBool' ), - ), - 'submit' => array() + ) ), ); } diff --git a/controllers/admin/AdminStatesController.php b/controllers/admin/AdminStatesController.php index 6e2a2ca60..c09d66788 100644 --- a/controllers/admin/AdminStatesController.php +++ b/controllers/admin/AdminStatesController.php @@ -45,10 +45,35 @@ class AdminStatesControllerCore extends AdminController $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); $this->fieldsDisplay = array( - 'id_state' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), - 'name' => array('title' => $this->l('Name'), 'width' => 140, 'filter_key' => 'a!name'), - 'iso_code' => array('title' => $this->l('ISO code'), 'align' => 'center', 'width' => 50), - 'zone' => array('title' => $this->l('Zone'), 'width' => 100, 'filter_key' => 'z!name') + 'id_state' => array( + 'title' => $this->l('ID'), + 'align' => 'center', + 'width' => 25 + ), + 'name' => array( + 'title' => $this->l('Name'), + 'width' => 140, + 'filter_key' => 'a!name' + ), + 'iso_code' => array( + 'title' => $this->l('ISO code'), + 'align' => 'center', + 'width' => 50 + ), + 'zone' => array( + 'title' => $this->l('Zone'), + 'width' => 100, + 'filter_key' => 'z!name' + ), + 'active' => array( + 'title' => $this->l('Enabled'), + 'width' => 70, + 'active' => 'status', + 'filter_key' => 'a!active', + 'align' => 'center', + 'type' => 'bool', + 'orderby' => false + ) ); parent::__construct();