Merge pull request #309 from lakshya-webkul/Pscleaner
QloApps Data Cleaner module improvement
This commit is contained in:
@@ -14,3 +14,20 @@
|
||||
____________________________________________________________________________________________________
|
||||
ChangeLog : QloApps Data Cleaner 1.0.0 | COMPATIBLE:: QloApps V1.x.x | Added in QloApps V1.3.2
|
||||
____________________________________________________________________________________________________
|
||||
|
||||
|
||||
-----------------------------
|
||||
# V1.0.1 to V1.0.2
|
||||
-----------------------------
|
||||
|
||||
## Improved/changed features
|
||||
|
||||
[*] CO : upgrade Delete Catalog.
|
||||
[*] CO : upgrade Delete Orders and Customers.
|
||||
[*] CO : upgrade Delete Check and fix.
|
||||
[*] CO : upgrade Delete clean and optimize.
|
||||
____________________________________________________________________________________________________
|
||||
|
||||
ChangeLog : QloApps Data Cleaner 1.0.2 | COMPATIBLE:: QloApps V1.x.x | Added in QloApps V1.6.0
|
||||
____________________________________________________________________________________________________
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ class PSCleaner extends Module
|
||||
{
|
||||
$this->name = 'pscleaner';
|
||||
$this->tab = 'administration';
|
||||
$this->version = '1.0.1';
|
||||
$this->version = '1.0.2';
|
||||
$this->author = 'PrestaShop';
|
||||
$this->need_instance = 0;
|
||||
if (version_compare(_PS_VERSION_, '1.6.0.0 ', '>=')) {
|
||||
@@ -75,60 +75,30 @@ class PSCleaner extends Module
|
||||
if (Tools::isSubmit('submitCheckAndFix')) {
|
||||
$logs = self::checkAndFix();
|
||||
if (count($logs)) {
|
||||
$conf = $this->l('The following queries successfuly fixed broken data:').'<br /><ul>';
|
||||
foreach ($logs as $query => $entries) {
|
||||
$conf .= '<li>'.Tools::htmlentitiesUTF8($query).'<br />'.sprintf($this->l('%d line(s)'), $entries).'</li>';
|
||||
}
|
||||
$conf .= '</ul>';
|
||||
$this->context->smarty->assign('logs', $logs);
|
||||
$conf = $this->context->smarty->fetch(_PS_MODULE_DIR_.$this->name.'/views/templates/admin/functional_integrity_conf.tpl');
|
||||
} else {
|
||||
$conf = $this->l('Nothing that need to be fixed');
|
||||
$conf = $this->l('Nothing that need to be fixed please run database cleaning to clean your database');
|
||||
}
|
||||
$html .= $this->displayConfirmation($conf);
|
||||
} elseif (Tools::isSubmit('submitCleanAndOptimize')) {
|
||||
$logs = self::cleanAndOptimize();
|
||||
if (count($logs)) {
|
||||
$conf = $this->l('The following queries successfuly cleaned your database:').'<br /><ul>';
|
||||
foreach ($logs as $query => $entries) {
|
||||
$conf .= '<li>'.Tools::htmlentitiesUTF8($query).'<br />'.sprintf($this->l('%d line(s)'), $entries).'</li>';
|
||||
}
|
||||
$conf .= '</ul>';
|
||||
$this->context->smarty->assign('logs', $logs);
|
||||
$conf = $this->context->smarty->fetch(_PS_MODULE_DIR_.$this->name.'/views/templates/admin/databases_cleaning_conf.tpl');
|
||||
} else {
|
||||
$conf = $this->l('Nothing that need to be cleaned');
|
||||
}
|
||||
$html .= $this->displayConfirmation($conf);
|
||||
} elseif (Tools::getValue('submitTruncateCatalog') && Tools::getValue('checkTruncateCatalog')) {
|
||||
self::truncate('catalog');
|
||||
$html .= $this->displayConfirmation($this->l('Catalog truncated'));
|
||||
$html .= $this->displayConfirmation($this->l('Catalog truncated successfuly, please run functional Integrity constraints to clean the database.'));
|
||||
} elseif (Tools::getValue('submitTruncateSales') && Tools::getValue('checkTruncateSales')) {
|
||||
self::truncate('sales');
|
||||
$html .= $this->displayConfirmation($this->l('Orders and customers truncated'));
|
||||
$html .= $this->displayConfirmation($this->l('Orders and customers truncated successfuly, please run functional Integrity constraints to clean the database'));
|
||||
}
|
||||
|
||||
$html .= '
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){
|
||||
$("#submitTruncateCatalog").click(function(){
|
||||
if ($(\'#checkTruncateCatalog_on\').attr(\'checked\') != "checked")
|
||||
{
|
||||
alert(\''.addslashes(html_entity_decode($this->l('Please read the disclaimer and click "Yes" above'))).'\');
|
||||
return false;
|
||||
}
|
||||
if (confirm(\''.addslashes(html_entity_decode($this->l('Are you sure that you want to delete all catalog data?'))).'\'))
|
||||
return true;
|
||||
return false;
|
||||
});
|
||||
$("#submitTruncateSales").click(function(){
|
||||
if ($(\'#checkTruncateSales_on\').attr(\'checked\') != "checked")
|
||||
{
|
||||
alert(\''.addslashes(html_entity_decode($this->l('Please read the disclaimer and click "Yes" above'))).'\');
|
||||
return false;
|
||||
}
|
||||
if (confirm(\''.addslashes(html_entity_decode($this->l('Are you sure that you want to delete all sales data?'))).'\'))
|
||||
return true;
|
||||
return false;
|
||||
});
|
||||
});
|
||||
</script>';
|
||||
$html .= $this->context->smarty->fetch(_PS_MODULE_DIR_.$this->name.'/views/templates/admin/pscleaner_script.tpl');
|
||||
|
||||
return $html.$this->renderForm();
|
||||
}
|
||||
@@ -155,8 +125,8 @@ class PSCleaner extends Module
|
||||
|
||||
// Remove inexisting or monolanguage configuration value from configuration_lang
|
||||
$query = 'DELETE FROM `'._DB_PREFIX_.'configuration_lang`
|
||||
WHERE `id_configuration` NOT IN (SELECT `id_configuration` FROM `'._DB_PREFIX_.'configuration`)
|
||||
OR `id_configuration` IN (SELECT `id_configuration` FROM `'._DB_PREFIX_.'configuration` WHERE name IS NULL OR name = "")';
|
||||
WHERE `id_configuration` NOT IN (SELECT `id_configuration` FROM `'._DB_PREFIX_.'configuration`)
|
||||
OR `id_configuration` IN (SELECT `id_configuration` FROM `'._DB_PREFIX_.'configuration` WHERE name IS NULL OR name = "")';
|
||||
if ($db->Execute($query)) {
|
||||
if ($affected_rows = $db->Affected_Rows()) {
|
||||
$logs[$query] = $affected_rows;
|
||||
@@ -332,9 +302,9 @@ class PSCleaner extends Module
|
||||
$logs = array();
|
||||
|
||||
$query = '
|
||||
DELETE FROM `'._DB_PREFIX_.'cart`
|
||||
WHERE id_cart NOT IN (SELECT id_cart FROM `'._DB_PREFIX_.'orders`)
|
||||
AND date_add < "'.pSQL(date('Y-m-d', strtotime('-1 month'))).'"';
|
||||
DELETE FROM `'._DB_PREFIX_.'cart`
|
||||
WHERE id_cart NOT IN (SELECT id_cart FROM `'._DB_PREFIX_.'orders`)
|
||||
AND date_add < "'.pSQL(date('Y-m-d', strtotime('-1 month'))).'"';
|
||||
if (Db::getInstance()->Execute($query)) {
|
||||
if ($affected_rows = Db::getInstance()->Affected_Rows()) {
|
||||
$logs[$query] = $affected_rows;
|
||||
@@ -342,13 +312,13 @@ class PSCleaner extends Module
|
||||
}
|
||||
|
||||
$query = '
|
||||
DELETE FROM `'._DB_PREFIX_.'cart_rule`
|
||||
WHERE (
|
||||
active = 0
|
||||
OR quantity = 0
|
||||
OR date_to < "'.pSQL(date('Y-m-d')).'"
|
||||
)
|
||||
AND date_add < "'.pSQL(date('Y-m-d', strtotime('-1 month'))).'"';
|
||||
DELETE FROM `'._DB_PREFIX_.'cart_rule`
|
||||
WHERE (
|
||||
active = 0
|
||||
OR quantity = 0
|
||||
OR date_to < "'.pSQL(date('Y-m-d')).'"
|
||||
)
|
||||
AND date_add < "'.pSQL(date('Y-m-d', strtotime('-1 month'))).'"';
|
||||
if (Db::getInstance()->Execute($query)) {
|
||||
if ($affected_rows = Db::getInstance()->Affected_Rows()) {
|
||||
$logs[$query] = $affected_rows;
|
||||
@@ -363,6 +333,13 @@ class PSCleaner extends Module
|
||||
}
|
||||
}
|
||||
|
||||
$query = 'DELETE FROM `'._DB_PREFIX_.'htl_order_refund_rules_lang`';
|
||||
if (Db::getInstance()->Execute($query)) {
|
||||
if ($affected_rows = Db::getInstance()->Affected_Rows()) {
|
||||
$logs[$query] = $affected_rows;
|
||||
}
|
||||
}
|
||||
|
||||
$parents = Db::getInstance()->ExecuteS('SELECT DISTINCT id_parent FROM '._DB_PREFIX_.'tab');
|
||||
foreach ($parents as $parent) {
|
||||
$children = Db::getInstance()->ExecuteS('SELECT id_tab FROM '._DB_PREFIX_.'tab WHERE id_parent = '.(int)$parent['id_parent'].' ORDER BY IF(class_name IN ("AdminHome", "AdminDashboard"), 1, 2), position ASC');
|
||||
@@ -486,6 +463,7 @@ class PSCleaner extends Module
|
||||
'title' => $this->l('Functional integrity constraints'),
|
||||
'icon' => 'icon-cogs'
|
||||
),
|
||||
'description' => $this->l('Integrity constraint is used to maintain the quality of information.'),
|
||||
'submit' => array(
|
||||
'title' => $this->l('Check & fix'),
|
||||
'class' => 'btn btn-default pull-right',
|
||||
@@ -499,6 +477,7 @@ class PSCleaner extends Module
|
||||
'title' => $this->l('Database Cleaning'),
|
||||
'icon' => 'icon-cogs'
|
||||
),
|
||||
'description' => $this->l('Cleaning your database will reclaim unused space in your tables, reducing storage space and improving table access efficiency.'),
|
||||
'submit' => array(
|
||||
'title' => $this->l('Clean & Optimize'),
|
||||
'class' => 'btn btn-default pull-right',
|
||||
@@ -681,6 +660,49 @@ class PSCleaner extends Module
|
||||
array('warehouse_carrier', 'id_carrier', 'carrier', 'id_carrier'),
|
||||
array('warehouse_product_location', 'id_product', 'product', 'id_product'),
|
||||
array('warehouse_product_location', 'id_warehouse', 'warehouse', 'id_warehouse'),
|
||||
array('product_comment', 'id_product', 'product', 'id_product'),
|
||||
array('specific_price', 'id_product', 'customer', 'id_customer'),
|
||||
array('specific_price', 'id_group', 'group', 'id_group'),
|
||||
array('htl_features_block_data_lang', 'id_features_block', 'htl_features_block_data', 'id_features_block'),
|
||||
array('cart_rule', 'id_customer', 'customer', 'id_customer'),
|
||||
array('htl_testimonials_block_data_lang', 'id_testimonial_block', 'htl_testimonials_block_data', 'id_testimonial_block'),
|
||||
array('htl_room_type_global_demand', 'id_tax_rules_group', 'tax_rules_group', 'id_tax_rules_group'),
|
||||
array('htl_room_type_global_demand_advance_option', 'id_global_demand', 'htl_room_type_global_demand', 'id_global_demand'),
|
||||
array('htl_room_type_global_demand_advance_option_lang', 'id_option', 'htl_room_type_global_demand_advance_option', 'id_option'),
|
||||
array('htl_room_type_global_demand_lang', 'id_global_demand', 'htl_room_type_global_demand', 'id_global_demand'),
|
||||
array('htl_branch_info_lang', 'id_lang', 'lang', 'id_lang'),
|
||||
array('htl_branch_info_lang', 'id', 'htl_branch_info', 'id'),
|
||||
array('htl_features_lang', 'id_lang', 'lang', 'id_lang'),
|
||||
array('htl_features_lang', 'id', 'htl_features', 'id'),
|
||||
array('htl_room_type_demand', 'id_product', 'product', 'id_product'),
|
||||
array('htl_room_type_demand_price', 'id_product', 'product', 'id_product'),
|
||||
array('htl_room_type_global_demand_advance_option_lang', 'id_lang', 'lang', 'id_lang'),
|
||||
array('htl_room_type_global_demand_advance_option_lang', 'id_option', 'htl_room_type_global_demand_advance_option', 'id_option'),
|
||||
array('htl_room_type_feature_pricing_group', 'id_group', 'group', 'id_group'),
|
||||
array('htl_booking_demands_tax', 'id_tax', 'tax', 'id_tax'),
|
||||
array('htl_booking_detail', 'id_product', 'product', 'id_product'),
|
||||
array('htl_booking_detail', 'id_order', 'orders', 'id_order'),
|
||||
array('htl_booking_demands', 'id_htl_booking', 'htl_booking_detail', 'id_htl_booking'),
|
||||
array('htl_cart_booking_data', 'id_order', 'orders', 'id_order'),
|
||||
array('htl_cart_booking_data', 'id_customer', 'customer', 'id_customer'),
|
||||
array('htl_branch_features', 'id_hotel', 'htl_branch_info', 'id'),
|
||||
array('htl_image', 'id_hotel', 'htl_branch_info', 'id'),
|
||||
array('htl_branch_info', 'id_category', 'category', 'id_category'),
|
||||
array('htl_room_information', 'id_product', 'product', 'id_product'),
|
||||
array('htl_room_information', 'id_hotel', 'htl_branch_info', 'id'),
|
||||
array('htl_room_type', 'id_product', 'product', 'id_product'),
|
||||
array('htl_room_type', 'id_hotel', 'htl_branch_info', 'id'),
|
||||
array('profile_lang', 'id_profile', 'profile', 'id_profile'),
|
||||
array('profile_lang', 'id_lang', 'lang', 'id_lang'),
|
||||
array('htl_access', 'id_profile', 'profile', 'id_profile'),
|
||||
array('htl_access', 'id_hotel', 'htl_branch_info', 'id'),
|
||||
array('htl_room_disable_dates', 'id_room_type', 'htl_room_type', 'id'),
|
||||
array('htl_room_type_feature_pricing_lang', 'id_feature_price', 'htl_room_type_feature_pricing', 'id_feature_price'),
|
||||
array('htl_room_type_feature_pricing_lang', 'id_lang', 'lang', 'id_lang'),
|
||||
array('htl_order_restrict_date', 'id_hotel', 'htl_branch_info', 'id'),
|
||||
array('htl_branch_refund_rules', 'id_hotel', 'htl_branch_info', 'id'),
|
||||
array('htl_order_refund_rules_lang', 'id_refund_rule', 'htl_branch_refund_rules', 'id_refund_rule'),
|
||||
array('htl_advance_payment', 'id_product', 'product', 'id_product'),
|
||||
)
|
||||
);
|
||||
}
|
||||
@@ -780,6 +802,11 @@ class PSCleaner extends Module
|
||||
'htl_room_type_demand_price',
|
||||
'htl_room_type_demand',
|
||||
'htl_room_disable_dates',
|
||||
'htl_interior_image',
|
||||
'htl_room_block_data',
|
||||
'htl_features_block_data',
|
||||
'htl_testimonials_block_data',
|
||||
'htl_room_type_global_demand'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
28
modules/pscleaner/views/templates/admin/databases_cleaning_conf.tpl
Executable file
28
modules/pscleaner/views/templates/admin/databases_cleaning_conf.tpl
Executable file
@@ -0,0 +1,28 @@
|
||||
{*
|
||||
* 2010-2020 Webkul.
|
||||
*
|
||||
* NOTICE OF LICENSE
|
||||
*
|
||||
* All right is reserved,
|
||||
* Please go through this link for complete license : https://store.webkul.com/license.html
|
||||
*
|
||||
* DISCLAIMER
|
||||
*
|
||||
* Do not edit or add to this file if you wish to upgrade this module to newer
|
||||
* versions in the future. If you wish to customize this module for your
|
||||
* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information.
|
||||
*
|
||||
* @author Webkul IN <support@webkul.com>
|
||||
* @copyright 2010-2020 Webkul IN
|
||||
* @license https://store.webkul.com/license.html
|
||||
*}
|
||||
|
||||
<p>{l s='The following queries successfuly cleaned your database:' mod='pscleaner'}<p>
|
||||
<ul>
|
||||
{foreach $logs as $query => $entries}
|
||||
<li>
|
||||
{$query|escape:'htmlall':'UTF-8'} <br />
|
||||
{l s='%d line(s)' sprintf=[$entries] mod='pscleaner'}
|
||||
</li>
|
||||
{/foreach}
|
||||
</ul>
|
||||
30
modules/pscleaner/views/templates/admin/functional_integrity_conf.tpl
Executable file
30
modules/pscleaner/views/templates/admin/functional_integrity_conf.tpl
Executable file
@@ -0,0 +1,30 @@
|
||||
{*
|
||||
* 2010-2020 Webkul.
|
||||
*
|
||||
* NOTICE OF LICENSE
|
||||
*
|
||||
* All right is reserved,
|
||||
* Please go through this link for complete license : https://store.webkul.com/license.html
|
||||
*
|
||||
* DISCLAIMER
|
||||
*
|
||||
* Do not edit or add to this file if you wish to upgrade this module to newer
|
||||
* versions in the future. If you wish to customize this module for your
|
||||
* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information.
|
||||
*
|
||||
* @author Webkul IN <support@webkul.com>
|
||||
* @copyright 2010-2020 Webkul IN
|
||||
* @license https://store.webkul.com/license.html
|
||||
*}
|
||||
{* {$query|escape:'htmlall':'UTF-8'} *}
|
||||
<p>{l s='The following queries successfuly fixed broken data:' mod='pscleaner'}<p>
|
||||
<ul>
|
||||
{foreach $logs as $query => $entries}
|
||||
<li>
|
||||
{$query|escape:'htmlall':'UTF-8'} <br />
|
||||
{l s='%d line(s)' sprintf=[$entries] mod='pscleaner'}
|
||||
</li>
|
||||
{/foreach}
|
||||
</ul>
|
||||
<br/>
|
||||
{l s='please run database cleaning to clean your database' mod='pscleaner'}
|
||||
43
modules/pscleaner/views/templates/admin/pscleaner_script.tpl
Executable file
43
modules/pscleaner/views/templates/admin/pscleaner_script.tpl
Executable file
@@ -0,0 +1,43 @@
|
||||
{*
|
||||
* 2010-2020 Webkul.
|
||||
*
|
||||
* NOTICE OF LICENSE
|
||||
*
|
||||
* All right is reserved,
|
||||
* Please go through this link for complete license : https://store.webkul.com/license.html
|
||||
*
|
||||
* DISCLAIMER
|
||||
*
|
||||
* Do not edit or add to this file if you wish to upgrade this module to newer
|
||||
* versions in the future. If you wish to customize this module for your
|
||||
* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information.
|
||||
*
|
||||
* @author Webkul IN <support@webkul.com>
|
||||
* @copyright 2010-2020 Webkul IN
|
||||
* @license https://store.webkul.com/license.html
|
||||
*}
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){
|
||||
$("#submitTruncateCatalog").click(function(){
|
||||
if ($(\'#checkTruncateCatalog_on\').attr(\'checked\') != "checked")
|
||||
{
|
||||
alert({l s='Please read the disclaimer and click "Yes" above' mod='pscleaner'});
|
||||
return false;
|
||||
}
|
||||
if (confirm({l s='Are you sure that you want to delete all catalog data?' mod='pscleaner'})
|
||||
return true;
|
||||
return false;
|
||||
});
|
||||
$("#submitTruncateSales").click(function(){
|
||||
if ($(\'#checkTruncateSales_on\').attr(\'checked\') != "checked")
|
||||
{
|
||||
alert({l s='Please read the disclaimer and click "Yes" above' mod='pscleaner'});
|
||||
return false;
|
||||
}
|
||||
if (confirm({l s='Are you sure that you want to delete all booking data?' mod='pscleaner'})
|
||||
return true;
|
||||
return false;
|
||||
});
|
||||
});
|
||||
</script>
|
||||
Reference in New Issue
Block a user