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

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

Browse Source
This commit is contained in:
Vincent Augagneur
2013-10-16 16:09:51 +02:00
parent c684fa13cb 7c096d9769
commit 22df963c72
18 changed files with 23 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
+1 -1
View File
@@ -31,7 +31,7 @@
</div>
{/if}
{$smarty.block.parent}
{if $input.type == 'radio' && $input.name == 'smarty_cache'}
{if in_array($input.type, array('radio', 'switch')) && $input.name == 'smarty_cache'}
<a href="{$current}&token={$token}&empty_smarty_cache=1" class="clear button" href="">{l s='Clear Smarty cache & Autoload cache'}</a>
{/if}
{/block}
classes/Autoload.php
+2 -3
View File
@@ -83,8 +83,7 @@ class Autoload
return;
// regenerate the class index if the requested file doesn't exists
if (!isset($this->index[$classname])
|| ($this->index[$classname] && !is_file($this->root_dir.$this->index[$classname]))
if ((isset($this->index[$classname]) && $this->index[$classname] && !is_file($this->root_dir.$this->index[$classname]))
|| (isset($this->index[$classname.'Core']) && $this->index[$classname.'Core'] && !is_file($this->root_dir.$this->index[$classname.'Core'])))
$this->generateIndex();
@@ -139,7 +138,7 @@ class Autoload
else
{
$filename_tmp = tempnam(dirname($filename), basename($filename.'.'));
if ($filename_tmp !== false AND file_put_contents($filename_tmp, $content, LOCK_EX) !== false)
if ($filename_tmp !== false && file_put_contents($filename_tmp, $content, LOCK_EX) !== false)
{
if (!@rename($filename_tmp, $filename))
unlink($filename_tmp);
install-dev/fixtures/apple/data/access.xml
-102
View File
@@ -9,107 +9,6 @@
<field name="delete"/>
</fields>
<entities>
<access id="access_2_1" id_profile="Administrator" id_tab="Home" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_2" id_profile="Administrator" id_tab="CMS_pages" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_3" id_profile="Administrator" id_tab="CMS_categories" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_4" id_profile="Administrator" id_tab="Combinations_generator" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_5" id_profile="Administrator" id_tab="Search" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_6" id_profile="Administrator" id_tab="Login" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_7" id_profile="Administrator" id_tab="Shops" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_8" id_profile="Administrator" id_tab="Shop_Urls" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_9" id_profile="Administrator" id_tab="Catalog" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_10" id_profile="Administrator" id_tab="Orders" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_11" id_profile="Administrator" id_tab="Customers" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_12" id_profile="Administrator" id_tab="Price_rules" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_13" id_profile="Administrator" id_tab="Shipping" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_14" id_profile="Administrator" id_tab="Localization" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_15" id_profile="Administrator" id_tab="Modules" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_16" id_profile="Administrator" id_tab="Preferences" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_17" id_profile="Administrator" id_tab="Advanced_parameters" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_18" id_profile="Administrator" id_tab="Administration" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_19" id_profile="Administrator" id_tab="Stats" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_20" id_profile="Administrator" id_tab="Stock" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_21" id_profile="Administrator" id_tab="Products" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_22" id_profile="Administrator" id_tab="Categories" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_23" id_profile="Administrator" id_tab="Monitoring" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_24" id_profile="Administrator" id_tab="Attributes_and_Values" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_25" id_profile="Administrator" id_tab="Features" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_26" id_profile="Administrator" id_tab="Manufacturers" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_27" id_profile="Administrator" id_tab="Suppliers" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_28" id_profile="Administrator" id_tab="Image_Mapping" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_29" id_profile="Administrator" id_tab="Tags" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_30" id_profile="Administrator" id_tab="Attachments" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_31" id_profile="Administrator" id_tab="Orders_1" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_32" id_profile="Administrator" id_tab="Invoices" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_33" id_profile="Administrator" id_tab="Merchandise_Returns" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_34" id_profile="Administrator" id_tab="Delivery_Slips" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_35" id_profile="Administrator" id_tab="Credit_Slips" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_36" id_profile="Administrator" id_tab="Statuses" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_37" id_profile="Administrator" id_tab="Order_Messages" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_38" id_profile="Administrator" id_tab="Customers_1" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_39" id_profile="Administrator" id_tab="Addresses" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_40" id_profile="Administrator" id_tab="Groups" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_41" id_profile="Administrator" id_tab="Shopping_Carts" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_42" id_profile="Administrator" id_tab="Customer_Service" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_43" id_profile="Administrator" id_tab="Contacts" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_44" id_profile="Administrator" id_tab="Genders" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_45" id_profile="Administrator" id_tab="Outstanding" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_46" id_profile="Administrator" id_tab="Cart_Rules" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_47" id_profile="Administrator" id_tab="Catalog_price_rules" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_48" id_profile="Administrator" id_tab="Shipping_1" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_49" id_profile="Administrator" id_tab="Carriers" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_50" id_profile="Administrator" id_tab="Price_Ranges" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_51" id_profile="Administrator" id_tab="Weight_Ranges" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_52" id_profile="Administrator" id_tab="Localization_1" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_53" id_profile="Administrator" id_tab="Languages" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_54" id_profile="Administrator" id_tab="Zones" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_55" id_profile="Administrator" id_tab="Countries" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_56" id_profile="Administrator" id_tab="States" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_57" id_profile="Administrator" id_tab="Currencies" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_58" id_profile="Administrator" id_tab="Tax_Rules" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_59" id_profile="Administrator" id_tab="Taxes" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_60" id_profile="Administrator" id_tab="Translations" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_61" id_profile="Administrator" id_tab="Modules_1" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_62" id_profile="Administrator" id_tab="Modules_Themes_Catalog" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_63" id_profile="Administrator" id_tab="Positions" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_64" id_profile="Administrator" id_tab="Payment" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_65" id_profile="Administrator" id_tab="General" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_66" id_profile="Administrator" id_tab="Orders_2" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_67" id_profile="Administrator" id_tab="Products_1" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_68" id_profile="Administrator" id_tab="Customers_2" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_69" id_profile="Administrator" id_tab="Themes" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_70" id_profile="Administrator" id_tab="SEO_URLs" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_71" id_profile="Administrator" id_tab="CMS" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_72" id_profile="Administrator" id_tab="Images" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_73" id_profile="Administrator" id_tab="Contact_stores" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_74" id_profile="Administrator" id_tab="Search_1" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_75" id_profile="Administrator" id_tab="Maintenance" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_76" id_profile="Administrator" id_tab="Geolocation" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_77" id_profile="Administrator" id_tab="Configuration_Information" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_78" id_profile="Administrator" id_tab="Performance" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_79" id_profile="Administrator" id_tab="E-mail" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_80" id_profile="Administrator" id_tab="Multi-shop" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_81" id_profile="Administrator" id_tab="CSV_Import" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_82" id_profile="Administrator" id_tab="DB_Backup" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_83" id_profile="Administrator" id_tab="SQL_Manager" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_84" id_profile="Administrator" id_tab="Logs" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_85" id_profile="Administrator" id_tab="Webservice" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_86" id_profile="Administrator" id_tab="Preferences_1" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_87" id_profile="Administrator" id_tab="Quick_Access" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_88" id_profile="Administrator" id_tab="Employees" view="1" add="0" edit="0" delete="0"/>
<access id="access_2_89" id_profile="Administrator" id_tab="Profiles" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_90" id_profile="Administrator" id_tab="Permissions" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_91" id_profile="Administrator" id_tab="Tabs" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_92" id_profile="Administrator" id_tab="Stats_1" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_93" id_profile="Administrator" id_tab="Search_Engines" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_94" id_profile="Administrator" id_tab="Referrers" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_95" id_profile="Administrator" id_tab="Warehouses" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_96" id_profile="Administrator" id_tab="Stock_Management" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_97" id_profile="Administrator" id_tab="Stock_Movement" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_98" id_profile="Administrator" id_tab="Stock_instant_state" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_99" id_profile="Administrator" id_tab="Stock_cover" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_100" id_profile="Administrator" id_tab="Supply_orders" view="1" add="1" edit="1" delete="1"/>
<access id="access_2_101" id_profile="Administrator" id_tab="Configuration" view="1" add="1" edit="1" delete="1"/>
<access id="access_3_1" id_profile="Logistician" id_tab="Home" view="0" add="0" edit="0" delete="0"/>
<access id="access_3_2" id_profile="Logistician" id_tab="CMS_pages" view="0" add="0" edit="0" delete="0"/>
<access id="access_3_3" id_profile="Logistician" id_tab="CMS_categories" view="0" add="0" edit="0" delete="0"/>
@@ -413,7 +312,6 @@
<access id="access_5_99" id_profile="Salesman" id_tab="Stock_cover" view="0" add="0" edit="0" delete="0"/>
<access id="access_5_100" id_profile="Salesman" id_tab="Supply_orders" view="1" add="0" edit="0" delete="0"/>
<access id="access_5_101" id_profile="Salesman" id_tab="Configuration" view="0" add="0" edit="0" delete="0"/>
<access id="access_2_0" id_profile="Administrator" id_tab="" view="1" add="1" edit="1" delete="1"/>
<access id="access_3_0" id_profile="Logistician" id_tab="" view="1" add="1" edit="1" delete="1"/>
<access id="access_4_0" id_profile="Translator" id_tab="" view="1" add="1" edit="1" delete="1"/>
<access id="access_5_0" id_profile="Salesman" id_tab="" view="1" add="1" edit="1" delete="1"/>
install-dev/fixtures/apple/data/profile.xml
-1
View File
@@ -2,7 +2,6 @@
<entity_profile>
<fields id="name" class="Profile" sql="a.id_profile &gt; 1"/>
<entities>
<profile id="Administrator"/>
<profile id="Logistician"/>
<profile id="Translator"/>
<profile id="Salesman"/>
install-dev/fixtures/apple/langs/bn/data/profile.xml
-3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<entity_profile>
<profile id="Administrator">
<name>Administrator</name>
</profile>
<profile id="Logistician">
<name>Logistician</name>
</profile>
install-dev/fixtures/apple/langs/br/data/profile.xml
-3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<entity_profile>
<profile id="Administrator">
<name>Administrador</name>
</profile>
<profile id="Logistician">
<name>Logistician</name>
</profile>
install-dev/fixtures/apple/langs/de/data/profile.xml
-3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<entity_profile>
<profile id="Administrator">
<name>Administrator</name>
</profile>
<profile id="Logistician">
<name>Logistiker</name>
</profile>
install-dev/fixtures/apple/langs/en/data/profile.xml
-3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<entity_profile>
<profile id="Administrator">
<name>Administrator</name>
</profile>
<profile id="Logistician">
<name>Logistician</name>
</profile>
install-dev/fixtures/apple/langs/es/data/profile.xml
-3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<entity_profile>
<profile id="Administrator">
<name>Administrador</name>
</profile>
<profile id="Logistician">
<name>Logistician</name>
</profile>
install-dev/fixtures/apple/langs/fr/data/profile.xml
-3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<entity_profile>
<profile id="Administrator">
<name>Administrateur</name>
</profile>
<profile id="Logistician">
<name>Logisticien</name>
</profile>
install-dev/fixtures/apple/langs/id/data/profile.xml
-3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<entity_profile>
<profile id="Administrator">
<name>Administrator</name>
</profile>
<profile id="Logistician">
<name>Logistician</name>
</profile>
install-dev/fixtures/apple/langs/it/data/profile.xml
-3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<entity_profile>
<profile id="Administrator">
<name>Administrator</name>
</profile>
<profile id="Logistician">
<name>Logista</name>
</profile>
install-dev/fixtures/apple/langs/nl/data/profile.xml
-3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<entity_profile>
<profile id="Administrator">
<name>Administrator</name>
</profile>
<profile id="Logistician">
<name>Logistician</name>
</profile>
install-dev/fixtures/apple/langs/pl/data/profile.xml
-3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<entity_profile>
<profile id="Administrator">
<name>Administrator</name>
</profile>
<profile id="Logistician">
<name>Logistyk</name>
</profile>
install-dev/fixtures/apple/langs/ru/data/profile.xml
-3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<entity_profile>
<profile id="Administrator">
<name>Administrator</name>
</profile>
<profile id="Logistician">
<name>Logistician</name>
</profile>
install-dev/fixtures/apple/langs/tw/data/profile.xml
-3
View File
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
<entity_profile>
<profile id="Administrator">
<name>Administrator</name>
</profile>
<profile id="Logistician">
<name>Logistician</name>
</profile>
modules/dashproducts/dashproducts.php
+17 -18
View File
@@ -51,26 +51,26 @@ class Dashproducts extends Module
{
return $this->display(__FILE__, 'dashboard_zone_two.tpl');
}
public function hookDashboardData($params)
{
$table_recent_orders = $this->getTableRecentOrders();
$table_best_sellers = $this->getTableBestSellers($params['date_from'], $params['date_to']);
$table_most_viewed = $this->getTableMostViewed($params['date_from'], $params['date_to']);
$table_top_10_most_search = $this->getTableTop10MostSearch($params['date_from'], $params['date_to']);
$table_top_5_search = $this->getTableTop5Search();
//$table_top_5_search = $this->getTableTop5Search();
return array(
'data_table' => array(
'table_recent_orders' => $table_recent_orders,
'table_best_sellers' => $table_best_sellers,
'table_most_viewed' => $table_most_viewed,
'table_top_10_most_search' => $table_top_10_most_search,
'table_top_5_search' => $table_top_5_search
//'table_top_5_search' => $table_top_5_search
)
);
}
public function getTableRecentOrders()
{
$header = array(
@@ -80,7 +80,7 @@ class Dashproducts extends Module
array('title' => $this->l('Date'), 'class' => 'text-center'),
array('title' => $this->l('Action'), 'class' => 'text-center'),
);
$orders = Order::getOrdersWithInformations(10);
$body = array();
@@ -122,10 +122,9 @@ class Dashproducts extends Module
}
return array('header' => $header, 'body' => $body);
}
public function getTableBestSellers($date_from, $date_to)
{
$header = array(
array(
'id' => 'image',
@@ -158,7 +157,7 @@ class Dashproducts extends Module
'class' => 'text-center',
)
);
$products = Db::getInstance()->ExecuteS('
SELECT
product_id,
@@ -174,7 +173,7 @@ class Dashproducts extends Module
GROUP BY product_id
ORDER BY total DESC
LIMIT 10');
$body = array();
foreach ($products as $product)
{
@@ -218,7 +217,7 @@ class Dashproducts extends Module
}
return array('header' => $header, 'body' => $body);
}
public function getTableMostViewed($date_from, $date_to)
{
$header = array(
@@ -301,7 +300,7 @@ class Dashproducts extends Module
return array('header' => $header, 'body' => $body);
}
public function getTableTop10MostSearch($date_from, $date_to)
{
$header = array(
@@ -321,7 +320,7 @@ class Dashproducts extends Module
'class' => 'text-center'
)
);
$terms = $this->getMostSearchTerms($date_from, $date_to);
$body = array();
if (is_array($terms) && count($terms))
@@ -348,7 +347,7 @@ class Dashproducts extends Module
return array('header' => $header, 'body' => $body);
}
public function getTableTop5Search()
{
$header = array(
@@ -375,7 +374,7 @@ class Dashproducts extends Module
return (int)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
}
public function getTotalProductAddedCart($date_from, $date_to, $id_product)
{
$sql = 'SELECT count(`id_product`) as count
@@ -386,7 +385,7 @@ class Dashproducts extends Module
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
}
public function getTotalProductPurchased($date_from, $date_to, $id_product)
{
$sql = 'SELECT count(`product_id`) as count
@@ -399,7 +398,7 @@ class Dashproducts extends Module
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
}
public function getTotalViewed($date_from, $date_to)
{
$gapi = Module::isInstalled('gapi') ? Module::getInstanceByName('gapi') : false;
@@ -428,7 +427,7 @@ class Dashproducts extends Module
AND dr.`time_start` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"
AND dr.`time_end` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"');
}
public function getMostSearchTerms($date_from, $date_to, $limit = 10)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
modules/dashproducts/views/templates/hook/dashboard_zone_two.tpl
+3 -1
View File
@@ -91,7 +91,7 @@
</div>
<div class="tab-pane" id="dash_top_search">
<div class="row">
<div class="col-lg-7">
<div class="col-lg-12">
<h3>{l s="Top 10 most search terms"}</h3>
<table class="table data_table" id="table_top_10_most_search">
<thead>
@@ -100,6 +100,7 @@
</tbody>
</table>
</div>
{*
<div class="col-lg-5">
<h3>{l s="Coming soon"}</h3>
<table class="table data_table" id="table_top_5_search">
@@ -109,6 +110,7 @@
</tbody>
</table>
</div>
*}
</div>
</div>
</div>