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

Merge branch 'development' of github.com:202-ecommerce/PrestaShop into development

Browse Source
This commit is contained in:
thoma202
2013-10-02 14:38:44 +02:00
parent eb7655e318 f4c2bacea3
commit 1ccc25f56c
83 changed files with 699 additions and 17498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/controllers/http/system.php
+7
View File
@@ -88,6 +88,13 @@ class InstallControllerHttpSystem extends InstallControllerHttp
'mysql_support' => $this->l('MySQL support is not activated')
)
),
array(
'title' => $this->l('Files'),
'success' => 1,
'checks' => array(
'files' => $this->l('All files are not successfuly uploaded on your server')
)
),
array(
'title' => $this->l('Recursive write permissions on files and folders:'),
'success' => 1,
install-dev/langs/br/data/quick_access.xml
+4 -4
View File
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<entity_quick_access>
<quick_access id="Home" name="Home"/>
<quick_access id="My_Shop" name="My Shop"/>
<quick_access id="New_category" name="New category"/>
<quick_access id="New_product" name="New product"/>
<quick_access id="New_voucher" name="New voucher"/>
<quick_access id="My_Shop" name="Minha Loja"/>
<quick_access id="New_category" name="Nova Categoria"/>
<quick_access id="New_product" name="Novo Produto"/>
<quick_access id="New_voucher" name="Novo Cupom"/>
</entity_quick_access>
install-dev/models/install.php
+2 -2
View File
@@ -374,7 +374,7 @@ class InstallModelInstall extends InstallAbstractModel
if (file_exists(_PS_TMP_IMG_DIR_))
foreach (scandir(_PS_TMP_IMG_DIR_) as $file)
if ($file[0] != '.' && $file != 'index.php')
Tools::deleteDirectory(_PS_TMP_IMG_DIR_.DIRECTORY_SEPARATOR.$file);
Tools::deleteFile(_PS_TMP_IMG_DIR_.$file);
$default_data = array(
'shop_name' => 'My Shop',
@@ -465,6 +465,7 @@ class InstallModelInstall extends InstallAbstractModel
$employee->passwd = md5(_COOKIE_KEY_.$data['admin_password']);
$employee->last_passwd_gen = date('Y-m-d h:i:s', strtotime('-360 minutes'));
$employee->bo_theme = 'default';
$employee->default_tab = 1;
$employee->active = true;
$employee->id_profile = 1;
$employee->id_lang = Configuration::get('PS_LANG_DEFAULT');
@@ -520,7 +521,6 @@ class InstallModelInstall extends InstallAbstractModel
'blockcontact',
'blockcontactinfos',
'blockcurrencies',
'blockcustomerprivacy',
'blocklanguages',
'blockmanufacturer',
'blockmyaccount',
install-dev/upgrade/php/migrate_orders.php
+1 -1
View File
@@ -75,7 +75,7 @@ function migrate_orders()
WHERE name = "PS_GIFT_WRAPPING_TAX"') / 100);
$cpt = 0;
$flush_limit = 1000;
$flush_limit = 500;
while ($order = Db::getInstance()->nextRow($order_res))
{
$sum_total_products = 0;
install-dev/upgrade/php/remove_tab.php
+1 -1
View File
@@ -29,6 +29,6 @@ function remove_tab($tabname)
Db::getInstance()->execute('
DELETE t, l
FROM `'._DB_PREFIX_.'tab` t LEFT JOIN `'._DB_PREFIX_.'tab_lang` l ON (t.id_tab = l.id_tab)
WHERE t.`class_name` = '.pSQL($tabname));
WHERE t.`class_name` = "'.pSQL($tabname).'"');
}
install-dev/upgrade/sql/1.5.6.0.sql
+5 -1
View File
@@ -10,4 +10,8 @@ ALTER TABLE `PREFIX_manufacturer_lang` CHANGE `short_description` `short_descrip
/* PHP:add_module_to_hook(blockmyaccount, actionModuleRegisterHookAfter); */;
/* PHP:add_module_to_hook(blockmyaccountfooter, actionModuleRegisterHookAfter); */;
/* PHP:add_module_to_hook(blockmyaccount, actionModuleUnRegisterHookAfter); */;
/* PHP:add_module_to_hook(blockmyaccountfooter, actionModuleUnRegisterHookAfter); */;
/* PHP:add_module_to_hook(blockmyaccountfooter, actionModuleUnRegisterHookAfter); */;
/* PHP:remove_tab(AdminRangePrice); */;
/* PHP:remove_tab(AdminRangeWeight); */;
UPDATE `PREFIX_employee` SET default_tab = 1 WHERE default_tab = 0;