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:
Gregory Roussac
2013-02-13 11:04:49 +01:00
parent b82461d6b3 00b6e9ff20
commit 1fbfa80e43
13 changed files with 80 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl
+5
View File
@@ -0,0 +1,5 @@
{if $show_toolbar}
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
{/if}
{$modules_list}
cache/class_index.php
Vendored
+2
View File
@@ -89,6 +89,8 @@
'AdminMaintenanceControllerCore' => 'controllers/admin/AdminMaintenanceController.php',
'AdminManufacturersController' => 'override/controllers/admin/AdminManufacturersController.php',
'AdminManufacturersControllerCore' => 'controllers/admin/AdminManufacturersController.php',
'AdminMarketingController' => 'override/controllers/admin/AdminMarketingController.php',
'AdminMarketingControllerCore' => 'controllers/admin/AdminMarketingController.php',
'AdminMetaController' => 'override/controllers/admin/AdminMetaController.php',
'AdminMetaControllerCore' => 'controllers/admin/AdminMetaController.php',
'AdminModulesController' => 'override/controllers/admin/AdminModulesController.php',
config/xml/modules_list.xml
-132
View File
@@ -1,132 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<modules_list>
<modules type="native">
<module name="autoupgrade"/>
<module name="bankwire"/>
<module name="birthdaypresent"/>
<module name="blockadvertising"/>
<module name="blockbestsellers"/>
<module name="blockcart"/>
<module name="blockcategories"/>
<module name="blockcms"/>
<module name="blockcontact"/>
<module name="blockcontactinfos"/>
<module name="blockcurrencies"/>
<module name="blockcustomerprivacy"/>
<module name="blocklanguages"/>
<module name="blocklayered"/>
<module name="blocklink"/>
<module name="blockmanufacturer"/>
<module name="blockmyaccount"/>
<module name="blockmyaccountfooter"/>
<module name="blocknewproducts"/>
<module name="blocknewsletter"/>
<module name="blockpaymentlogo"/>
<module name="blockpermanentlinks"/>
<module name="blockreinsurance"/>
<module name="blockrss"/>
<module name="blocksearch"/>
<module name="blocksharefb"/>
<module name="blocksocial"/>
<module name="blockspecials"/>
<module name="blockstore"/>
<module name="blocksupplier"/>
<module name="blocktags"/>
<module name="blocktopmenu"/>
<module name="blockuserinfo"/>
<module name="blockviewed"/>
<module name="blockwishlist"/>
<module name="cashondelivery"/>
<module name="carriercompare"/>
<module name="cheque"/>
<module name="crossselling"/>
<module name="dateofdelivery"/>
<module name="editorial"/>
<module name="favoriteproducts"/>
<module name="feeder"/>
<module name="followup"/>
<module name="gadsense"/>
<module name="ganalytics"/>
<module name="gcheckout"/>
<module name="graphartichow"/>
<module name="graphgooglechart"/>
<module name="graphvisifire"/>
<module name="graphxmlswfcharts"/>
<module name="gridhtml"/>
<module name="gsitemap"/>
<module name="homefeatured"/>
<module name="homeslider"/>
<module name="importerosc"/>
<module name="livezilla"/>
<module name="loyalty"/>
<module name="mailalerts"/>
<module name="newsletter"/>
<module name="pagesnotfound"/>
<module name="prestafraud"/>
<module name="productcomments"/>
<module name="productscategory"/>
<module name="producttooltip"/>
<module name="referralprogram"/>
<module name="sekeywords"/>
<module name="sendtoafriend"/>
<module name="shopimporter"/>
<module name="statsbestcategories"/>
<module name="statsbestcustomers"/>
<module name="statsbestmanufacturers"/>
<module name="statsbestproducts"/>
<module name="statsbestsuppliers"/>
<module name="statsbestvouchers"/>
<module name="statscarrier"/>
<module name="statscatalog"/>
<module name="statscheckup"/>
<module name="statsdata"/>
<module name="statsequipment"/>
<module name="statsforecast"/>
<module name="statsgeolocation"/>
<module name="statslive"/>
<module name="statsnewsletter"/>
<module name="statsorigin"/>
<module name="statspersonalinfos"/>
<module name="statsproduct"/>
<module name="statsregistrations"/>
<module name="statssales"/>
<module name="statssearch"/>
<module name="statsstock"/>
<module name="statsvisits"/>
<module name="themeinstallator"/>
<module name="tm4b"/>
<module name="trackingfront"/>
<module name="upscarrier"/>
<module name="vatnumber"/>
<module name="watermark"/>
</modules>
<modules type="partner">
<module name="authorizeaim"/>
<module name="avalaratax"/>
<module name="cashticket"/>
<module name="criteo"/>
<module name="dejala"/>
<module name="dibs"/>
<module name="ebay"/>
<module name="envoimoinscher"/>
<module name="ekomi"/>
<module name="fedexcarrier"/>
<module name="fianetfraud"/>
<module name="fianetsceau"/>
<module name="hipay"/>
<module name="iadvize"/>
<module name="moneybookers"/>
<module name="mondialrelay"/>
<module name="ogone"/>
<module name="paysafecard"/>
<module name="paypal"/>
<module name="reverso"/>
<module name="secuvad"/>
<module name="shipwire"/>
<module name="socolissimo"/>
<module name="treepodia"/>
<module name="trustedshops"/>
<module name="twenga"/>
<module name="uspscarrier"/>
</modules>
</modules_list>
controllers/admin/AdminMarketingController.php
+54
View File
@@ -0,0 +1,54 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
class AdminMarketingControllerCore extends AdminController
{
public function initContent()
{
$this->display = 'view';
return parent::initContent();
}
public function initToolbarTitle()
{
$this->toolbar_title = array_unique($this->breadcrumbs);
}
public function initToolbar()
{
return false;
}
public function renderView()
{
$this->tpl_view_vars = array(
'modules_list' => $this->renderModulesList(),
);
return parent::renderView();
}
}
install-dev/data/xml/tab.xml
+3
View File
@@ -147,6 +147,9 @@
<tab id="Catalog_Price_Rules" id_parent="Price_Rules" active="1">
<class_name>AdminSpecificPriceRule</class_name>
</tab>
<tab id="Marketing" id_parent="Price_Rules" active="1">
<class_name>AdminMarketing</class_name>
</tab>
<tab id="Shipping_1" id_parent="Shipping" active="1">
<class_name>AdminShipping</class_name>
</tab>
install-dev/langs/br/data/tab.xml
+1
View File
@@ -47,6 +47,7 @@
<tab id="Outstanding" name="Outstanding"/>
<tab id="Cart_Rules" name="Cart Rules"/>
<tab id="Catalog_Price_Rules" name="Catalog Price Rules"/>
<tab id="Marketing" name="Marketing"/>
<tab id="Shipping_1" name="Shipping"/>
<tab id="Carriers" name="Carriers"/>
<tab id="Price_Ranges" name="Price Ranges"/>
install-dev/langs/de/data/tab.xml
+1
View File
@@ -47,6 +47,7 @@
<tab id="Outstanding" name="Offene Forderungen"/>
<tab id="Cart_Rules" name="Warenkorb Preisregeln"/>
<tab id="Catalog_Price_Rules" name="Katalog Preisregeln"/>
<tab id="Marketing" name="Marketing"/>
<tab id="Shipping_1" name="Versand"/>
<tab id="Carriers" name="Versanddienste"/>
<tab id="Price_Ranges" name="Preisklassen"/>
install-dev/langs/en/data/tab.xml
+1
View File
@@ -47,6 +47,7 @@
<tab id="Outstanding" name="Outstanding"/>
<tab id="Cart_Rules" name="Cart Rules"/>
<tab id="Catalog_Price_Rules" name="Catalog Price Rules"/>
<tab id="Marketing" name="Marketing"/>
<tab id="Shipping_1" name="Shipping"/>
<tab id="Carriers" name="Carriers"/>
<tab id="Price_Ranges" name="Price Ranges"/>
install-dev/langs/es/data/tab.xml
+1
View File
@@ -47,6 +47,7 @@
<tab id="Outstanding" name="No resuelto"/>
<tab id="Cart_Rules" name="Reglas de cesta"/>
<tab id="Catalog_Price_Rules" name="Reglas de precio del cat&#xE1;logo"/>
<tab id="Marketing" name="Marketing"/>
<tab id="Shipping_1" name="Env&#xED;o"/>
<tab id="Carriers" name="Transportistas"/>
<tab id="Price_Ranges" name="Rangos de precio"/>
install-dev/langs/fr/data/tab.xml
+1
View File
@@ -47,6 +47,7 @@
<tab id="Outstanding" name="Encours"/>
<tab id="Cart_Rules" name="R&#xE8;gles paniers"/>
<tab id="Catalog_Price_Rules" name="R&#xE8;gles de prix catalogue"/>
<tab id="Marketing" name="Marketing"/>
<tab id="Shipping_1" name="Transport"/>
<tab id="Carriers" name="Transporteurs"/>
<tab id="Price_Ranges" name="Tranches de prix"/>
install-dev/langs/it/data/tab.xml
+1
View File
@@ -47,6 +47,7 @@
<tab id="Outstanding" name="Insoluti"/>
<tab id="Cart_Rules" name="Regole Carrello"/>
<tab id="Catalog_Price_Rules" name="Regole catalogo prezzi"/>
<tab id="Marketing" name="Marketing"/>
<tab id="Shipping_1" name="Spedizione"/>
<tab id="Carriers" name="Corrieri"/>
<tab id="Price_Ranges" name="Range di prezzi"/>
install-dev/upgrade/sql/1.5.4.0.sql
+3 -1
View File
@@ -29,4 +29,6 @@ CREATE TABLE `PREFIX_tab_module_preference` (
`module` varchar(255) NOT NULL,
PRIMARY KEY (`id_tab_module_preference`),
UNIQUE KEY `employee_module` (`id_employee`, `id_tab`, `module`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
/* PHP:add_new_tab(AdminMarketing, es:Marketing|it:Marketing|en:Marketing|de:Marketing|fr:Marketing, 1); */;
override/controllers/admin/AdminMarketingController.php
+7
View File
@@ -0,0 +1,7 @@
<?php
class AdminMarketingController extends AdminMarketingControllerCore
{
}