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

[+] BO Images / Marketing / Spe. Prices Rules

Browse Source
This commit is contained in:
Kevin Granger committed 2013-08-01 14:42:43 +02:00
1 parent e4878ba393
commit 5defc39def
5 files changed
+78 -64
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/admin/AdminImagesController.php
+11 -12
View File
@@ -32,6 +32,7 @@ class AdminImagesControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->table = 'image_type';
$this->className = 'ImageType';
$this->lang = false;
@@ -40,16 +41,16 @@ class AdminImagesControllerCore extends AdminController
$this->addRowAction('delete');
$this->fields_list = array(
'id_image_type' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'id_image_type' => array('title' => $this->l('ID'), 'align' => 'center'),
'name' => array('title' => $this->l('Name'), 'width' => 'auto'),
'width' => array('title' => $this->l('Width'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5),
'height' => array('title' => $this->l('Height'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5),
'products' => array('title' => $this->l('Products'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'categories' => array('title' => $this->l('Categories'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'manufacturers' => array('title' => $this->l('Manufacturers'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'suppliers' => array('title' => $this->l('Suppliers'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'scenes' => array('title' => $this->l('Scenes'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'stores' => array('title' => $this->l('Stores'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false)
'width' => array('title' => $this->l('Width'), 'align' => 'right', 'suffix' => ' px'),
'height' => array('title' => $this->l('Height'), 'align' => 'right', 'suffix' => ' px'),
'products' => array('title' => $this->l('Products'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'categories' => array('title' => $this->l('Categories'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'manufacturers' => array('title' => $this->l('Manufacturers'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'suppliers' => array('title' => $this->l('Suppliers'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'scenes' => array('title' => $this->l('Scenes'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'stores' => array('title' => $this->l('Stores'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false)
);
// No need to display the old image system if the install has been made later than 2013-03-26
@@ -147,7 +148,7 @@ class AdminImagesControllerCore extends AdminController
'visibility' => Shop::CONTEXT_ALL
)
),
'submit' => array('title' => $this->l('Save '), 'class' => 'button'),
'submit' => array('title' => $this->l('Save '), 'class' => 'btn btn-primary'),
),
);
@@ -180,7 +181,6 @@ class AdminImagesControllerCore extends AdminController
'label' => $this->l('Width'),
'name' => 'width',
'required' => true,
'size' => 4,
'maxlength' => 5,
'desc' => $this->l('Maximum image width in pixels')
),
@@ -189,7 +189,6 @@ class AdminImagesControllerCore extends AdminController
'label' => $this->l('Height'),
'name' => 'height',
'required' => true,
'size' => 4,
'maxlength' => 5,
'desc' => $this->l('Maximum image height in pixels')
),
controllers/admin/AdminMarketingController.php
+6 -1
View File
@@ -27,6 +27,12 @@
class AdminMarketingControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
parent::__construct();
}
public function initContent()
{
$this->display = 'view';
@@ -51,4 +57,3 @@ class AdminMarketingControllerCore extends AdminController
return parent::renderView();
}
}
controllers/admin/AdminSpecificPriceRuleController.php
+5 -10
View File
@@ -30,6 +30,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->table = 'specific_price_rule';
$this->className = 'SpecificPriceRule';
$this->lang = false;
@@ -55,8 +56,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
$this->fields_list = array(
'id_specific_price_rule' => array(
'title' => $this->l('ID'),
'align' => 'center',
'width' => 25
'align' => 'center'
),
'name' => array(
'title' => $this->l('Name'),
@@ -142,7 +142,6 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('Name'),
'name' => 'name',
'size' => 33,
'maxlength' => 32,
'required' => true,
'hint' => $this->l('Forbidden characters').' <>;=#{}'
@@ -193,7 +192,6 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('From quantity'),
'name' => 'from_quantity',
'size' => 6,
'maxlength' => 10,
'required' => true,
),
@@ -201,7 +199,6 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('Price (tax excl.)'),
'name' => 'price',
'size' => 6,
'disabled' => ($this->object->price == -1 ? 1 : 0),
'maxlength' => 10,
'suffix' => $this->context->currency->getSign('right'),
@@ -226,14 +223,12 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
array(
'type' => 'date',
'label' => $this->l('From'),
'name' => 'from',
'size' => 12,
'name' => 'from'
),
array(
'type' => 'date',
'label' => $this->l('To'),
'name' => 'to',
'size' => 12,
'name' => 'to'
),
array(
'type' => 'select',
@@ -254,7 +249,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
),
'submit' => array(
'title' => $this->l('Save'),
'class' => 'button'
'class' => 'btn btn-primary'
),
);
if (($value = $this->getFieldValue($this->object, 'price')) != -1)