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

// BO fix + work on helpers + compass/codekit config

Browse Source
This commit is contained in:
Kevin Granger
2013-07-22 16:43:16 +02:00
parent 288c0d3ca8
commit 9d16eb1d1b
18 changed files with 3446 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminAttachmentsController.php
+2 -2
View File
@@ -26,6 +26,7 @@
class AdminAttachmentsControllerCore extends AdminController
{
public $bootstrap = true ;
protected $product_attachements = array();
@@ -41,8 +42,7 @@ class AdminAttachmentsControllerCore extends AdminController
$this->fields_list = array(
'id_attachment' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
'align' => 'center'
),
'name' => array(
'title' => $this->l('Name')
controllers/admin/AdminAttributesGroupsController.php
-4
View File
@@ -42,23 +42,19 @@ class AdminAttributesGroupsControllerCore extends AdminController
$this->fields_list = array(
'id_attribute_group' => array(
'title' => $this->l('ID'),
'width' => 25,
'align' => 'center'
),
'name' => array(
'title' => $this->l('Name'),
'width' => 'auto',
'filter_key' => 'b!name',
'align' => 'left'
),
'count_values' => array(
'title' => $this->l('Values count'),
'width' => 120,
'align' => 'center',
),
'position' => array(
'title' => $this->l('Position'),
'width' => 40,
'filter_key' => 'a!position',
'position' => 'position',
'align' => 'center'
controllers/admin/AdminFeaturesController.php
+3 -4
View File
@@ -25,6 +25,8 @@
*/
class AdminFeaturesControllerCore extends AdminController
{
public $bootstrap = true ;
protected $position_identifier = 'id_feature';
public function __construct()
@@ -35,8 +37,7 @@ class AdminFeaturesControllerCore extends AdminController
$this->fields_list = array(
'id_feature' => array(
'title' => $this->l('ID'),
'width' => 25
'title' => $this->l('ID')
),
'name' => array(
'title' => $this->l('Name'),
@@ -45,13 +46,11 @@ class AdminFeaturesControllerCore extends AdminController
),
'value' => array(
'title' => $this->l('Values'),
'width' => 255,
'orderby' => false,
'search' => false
),
'position' => array(
'title' => $this->l('Position'),
'width' => 40,
'filter_key' => 'a!position',
'align' => 'center',
'position' => 'position'
controllers/admin/AdminManufacturersController.php
+1 -5
View File
@@ -26,6 +26,7 @@
class AdminManufacturersControllerCore extends AdminController
{
public $bootstrap = true ;
/** @var array countries list */
protected $countries_array = array();
@@ -49,14 +50,12 @@ class AdminManufacturersControllerCore extends AdminController
$this->fields_list = array(
'id_manufacturer' => array(
'title' => $this->l('ID'),
'width' => 25
),
'logo' => array(
'title' => $this->l('Logo'),
'image' => 'm',
'orderby' => false,
'search' => false,
'width' => 150,
'align' => 'center',
),
'name' => array(
@@ -65,19 +64,16 @@ class AdminManufacturersControllerCore extends AdminController
),
'addresses' => array(
'title' => $this->l('Addresses'),
'width' => 20,
'align' => 'center',
'havingFilter' => true
),
'products' => array(
'title' => $this->l('Products:'),
'havingFilter' => true,
'width' => 20,
'align' => 'center',
),
'active' => array(
'title' => $this->l('Enabled'),
'width' => 70,
'active' => 'status',
'type' => 'bool',
'align' => 'center',
controllers/admin/AdminProductsController.php
-9
View File
@@ -202,13 +202,11 @@ class AdminProductsControllerCore extends AdminController
$this->fields_list['id_product'] = array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 40
);
$this->fields_list['image'] = array(
'title' => $this->l('Photo'),
'align' => 'center',
'image' => 'p',
'width' => 70,
'orderby' => false,
'filter' => false,
'search' => false
@@ -220,13 +218,11 @@ class AdminProductsControllerCore extends AdminController
$this->fields_list['reference'] = array(
'title' => $this->l('Reference'),
'align' => 'left',
'width' => 80
);
if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP)
$this->fields_list['shopname'] = array(
'title' => $this->l('Default shop:'),
'width' => 230,
'filter_key' => 'shop!name',
);
else
@@ -237,14 +233,12 @@ class AdminProductsControllerCore extends AdminController
);
$this->fields_list['price'] = array(
'title' => $this->l('Base price'),
'width' => 90,
'type' => 'price',
'align' => 'right',
'filter_key' => 'a!price'
);
$this->fields_list['price_final'] = array(
'title' => $this->l('Final price'),
'width' => 90,
'type' => 'price',
'align' => 'right',
'havingFilter' => true,
@@ -252,7 +246,6 @@ class AdminProductsControllerCore extends AdminController
);
$this->fields_list['sav_quantity'] = array(
'title' => $this->l('Quantity'),
'width' => 90,
'align' => 'right',
'filter_key' => 'sav!quantity',
'orderby' => true,
@@ -260,7 +253,6 @@ class AdminProductsControllerCore extends AdminController
);
$this->fields_list['active'] = array(
'title' => $this->l('Status'),
'width' => 70,
'active' => 'status',
'filter_key' => $alias.'!active',
'align' => 'center',
@@ -271,7 +263,6 @@ class AdminProductsControllerCore extends AdminController
if ((int)$this->id_current_category)
$this->fields_list['position'] = array(
'title' => $this->l('Position'),
'width' => 70,
'filter_key' => 'cp!position',
'align' => 'center',
'position' => 'position'
controllers/admin/AdminScenesController.php
+2 -2
View File
@@ -26,6 +26,8 @@
class AdminScenesControllerCore extends AdminController
{
public $bootstrap = true ;
public function __construct()
{
$this->table = 'scene';
@@ -44,7 +46,6 @@ class AdminScenesControllerCore extends AdminController
'id_scene' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
),
'name' => array(
'title' => $this->l('Image Maps'),
@@ -52,7 +53,6 @@ class AdminScenesControllerCore extends AdminController
),
'active' => array(
'title' => $this->l('Activated'),
'width' => 70,
'align' => 'center',
'active' => 'status',
'type' => 'bool',
controllers/admin/AdminSuppliersController.php
+2
View File
@@ -26,6 +26,8 @@
class AdminSuppliersControllerCore extends AdminController
{
public $bootstrap = true ;
public function __construct()
{
$this->table = 'supplier';
controllers/admin/AdminTagsController.php
+2 -2
View File
@@ -26,6 +26,8 @@
class AdminTagsControllerCore extends AdminController
{
public $bootstrap = true ;
public function __construct()
{
$this->table = 'tag';
@@ -35,7 +37,6 @@ class AdminTagsControllerCore extends AdminController
'id_tag' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25,
),
'lang' => array(
'title' => $this->l('Language'),
@@ -43,7 +44,6 @@ class AdminTagsControllerCore extends AdminController
),
'name' => array(
'title' => $this->l('Name'),
'width' => 200,
'filter_key' => 'a!name'
),
'products' => array(
controllers/admin/AdminTrackingController.php
+11 -10
View File
@@ -26,6 +26,7 @@
class AdminTrackingControllerCore extends AdminController
{
public $bootstrap = true ;
protected $_helper_list;
public function postprocess()
@@ -92,10 +93,10 @@ class AdminTrackingControllerCore extends AdminController
$this->addRowActionSkipList('edit', array(Category::getTopCategory()->id));
$this->fields_list = (array(
'id_category' => array('title' => $this->l('ID'), 'width' => 50),
'id_category' => array('title' => $this->l('ID')),
'name' => array('title' => $this->l('Name'), 'filter_key' => 'b!name'),
'description' => array('title' => $this->l('Description')),
'active' => array('title' => $this->l('Status'), 'type' => 'bool', 'active' => 'status', 'width' => 50)
'active' => array('title' => $this->l('Status'), 'type' => 'bool', 'active' => 'status')
));
$this->clearFilters();
@@ -132,10 +133,10 @@ class AdminTrackingControllerCore extends AdminController
$this->addRowAction('delete');
$this->fields_list = array(
'id_product' => array('title' => $this->l('ID'), 'width' => 50),
'reference' => array('title' => $this->l('Reference'), 'width' => 150),
'id_product' => array('title' => $this->l('ID')),
'reference' => array('title' => $this->l('Reference')),
'name' => array('title' => $this->l('Name'), 'filter_key' => 'b!name'),
'active' => array('title' => $this->l('Status'), 'type' => 'bool', 'active' => 'status', 'width' => 50)
'active' => array('title' => $this->l('Status'), 'type' => 'bool', 'active' => 'status')
);
$this->clearFilters();
@@ -176,10 +177,10 @@ class AdminTrackingControllerCore extends AdminController
$this->addRowAction('delete');
$this->fields_list = array(
'id_product' => array('title' => $this->l('ID'), 'width' => 50),
'reference' => array('title' => $this->l('Reference'), 'width' => 150),
'id_product' => array('title' => $this->l('ID')),
'reference' => array('title' => $this->l('Reference')),
'name' => array('title' => $this->l('Name')),
'active' => array('title' => $this->l('Status'), 'type' => 'bool', 'active' => 'status', 'width' => 50)
'active' => array('title' => $this->l('Status'), 'type' => 'bool', 'active' => 'status')
);
$this->clearFilters();
@@ -219,8 +220,8 @@ class AdminTrackingControllerCore extends AdminController
$this->addRowAction('delete');
$this->fields_list = array(
'id_product' => array('title' => $this->l('ID'), 'width' => 50),
'reference' => array('title' => $this->l('Reference'), 'width' => 150),
'id_product' => array('title' => $this->l('ID')),
'reference' => array('title' => $this->l('Reference')),
'name' => array('title' => $this->l('Name'), 'filter_key' => 'b!name')
);