dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Vincent Augagneur committed 2013-08-01 16:03:19 +02:00
2 parents c0db0bfca9 b27d030fd2
commit 9c86943e2a
1 file changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarrierWizardController.php
+5 -5
View File
@@ -26,7 +26,7 @@
class AdminCarrierWizardControllerCore extends AdminController class AdminCarrierWizardControllerCore extends AdminController
{ {
protected $wizard_access; protected $wizard_access;
public function __construct() public function __construct()
{ {
@@ -347,7 +347,7 @@ class AdminCarrierWizardControllerCore extends AdminController
), ),
array( array(
'type' => 'text', 'type' => 'text',
'label' => $this->l('Maximium package height:'), 'label' => $this->l('Maximium package height ('.Configuration::get('PS_DIMENSION_UNIT').'):'),
'name' => 'max_height', 'name' => 'max_height',
'required' => false, 'required' => false,
'size' => 10, 'size' => 10,
@@ -355,7 +355,7 @@ class AdminCarrierWizardControllerCore extends AdminController
), ),
array( array(
'type' => 'text', 'type' => 'text',
'label' => $this->l('Maximium package width:'), 'label' => $this->l('Maximium package width ('.Configuration::get('PS_DIMENSION_UNIT').'):'),
'name' => 'max_width', 'name' => 'max_width',
'required' => false, 'required' => false,
'size' => 10, 'size' => 10,
@@ -363,7 +363,7 @@ class AdminCarrierWizardControllerCore extends AdminController
), ),
array( array(
'type' => 'text', 'type' => 'text',
'label' => $this->l('Maximium package depth:'), 'label' => $this->l('Maximium package depth ('.Configuration::get('PS_DIMENSION_UNIT').'):'),
'name' => 'max_depth', 'name' => 'max_depth',
'required' => false, 'required' => false,
'size' => 10, 'size' => 10,
@@ -371,7 +371,7 @@ class AdminCarrierWizardControllerCore extends AdminController
), ),
array( array(
'type' => 'text', 'type' => 'text',
'label' => $this->l('Maximium package weight:'), 'label' => $this->l('Maximium package weight ('.Configuration::get('PS_WEIGHT_UNIT').'):'),
'name' => 'max_weight', 'name' => 'max_weight',
'required' => false, 'required' => false,
'size' => 10, 'size' => 10,