Version Notes
Improvements:
- Problem detection mechanism
Bugfix:
- Minor bug fixing
Download this release
Release Info
Developer | IceShop |
Extension | IcecatLive |
Version | 1.7.3 |
Comparing to | |
See all releases |
Code changes from version 1.7.2 to 1.7.3
- app/code/local/Iceshop/Icecatlive/Helper/Db.php +5 -1
- app/code/local/Iceshop/Icecatlive/Helper/System/Systemcheck.php +4 -2
- app/code/local/Iceshop/Icecatlive/Model/Observer.php +55 -32
- app/code/local/Iceshop/Icecatlive/controllers/IcecatliveController.php +24 -12
- app/code/local/Iceshop/Icecatlive/etc/config.xml +18 -1
- app/code/local/Iceshop/Icecatlive/sql/icecatlive_setup/{mysql4-install-1.7.2.php → mysql4-install-1.7.3.php} +0 -0
- package.xml +7 -5
app/code/local/Iceshop/Icecatlive/Helper/Db.php
CHANGED
@@ -200,7 +200,11 @@ END;";
|
|
200 |
if (!empty($key)) {
|
201 |
$sql = "SELECT log_value FROM `" . $this->_prefix . $productsIdTable = Mage::getConfig()->getNode('default/icecatlive/extensions_logs_tables')->table_name . "` WHERE log_key = '".$key."'";
|
202 |
$value = $this->_reader->fetchAll($sql);
|
203 |
-
|
|
|
|
|
|
|
|
|
204 |
}
|
205 |
return false;
|
206 |
}
|
200 |
if (!empty($key)) {
|
201 |
$sql = "SELECT log_value FROM `" . $this->_prefix . $productsIdTable = Mage::getConfig()->getNode('default/icecatlive/extensions_logs_tables')->table_name . "` WHERE log_key = '".$key."'";
|
202 |
$value = $this->_reader->fetchAll($sql);
|
203 |
+
if(isset($value[0]['log_value'])){
|
204 |
+
return $value[0]['log_value'];
|
205 |
+
} else {
|
206 |
+
return false;
|
207 |
+
}
|
208 |
}
|
209 |
return false;
|
210 |
}
|
app/code/local/Iceshop/Icecatlive/Helper/System/Systemcheck.php
CHANGED
@@ -558,10 +558,13 @@ class Iceshop_Icecatlive_Helper_System_Systemcheck extends Mage_Core_Helper_Abst
|
|
558 |
$problems = array();
|
559 |
$count = 0;
|
560 |
//extension problems
|
561 |
-
// $check_module = $this->getModulesCollection(Mage::app()->getRequest()->getModuleName());
|
562 |
$check_module = $this->getModulesCollection('Iceshop_Icecatlive');
|
563 |
$check_module = $check_module->getLastItem()->getData();
|
564 |
|
|
|
|
|
|
|
|
|
565 |
if (!$check_module['path_exists']) {
|
566 |
// $problems['extension']['path_exists'] = $check_module['path_exists'];
|
567 |
$problems['extension']['path_exists'][] = $check_module['path'];
|
@@ -573,7 +576,6 @@ class Iceshop_Icecatlive_Helper_System_Systemcheck extends Mage_Core_Helper_Abst
|
|
573 |
$count++;
|
574 |
}
|
575 |
//extension rewrites problems
|
576 |
-
// $check_rewrites = $this->getRewriteCollection(Mage::app()->getRequest()->getModuleName());
|
577 |
$check_rewrites = $this->getRewriteCollection('Iceshop_Icecatlive');
|
578 |
|
579 |
foreach ($check_rewrites as $rewrite) {
|
558 |
$problems = array();
|
559 |
$count = 0;
|
560 |
//extension problems
|
|
|
561 |
$check_module = $this->getModulesCollection('Iceshop_Icecatlive');
|
562 |
$check_module = $check_module->getLastItem()->getData();
|
563 |
|
564 |
+
if(!is_writable(Mage::getBaseDir('var') . ''.Mage::getConfig()->getNode('default/icecatlive/icecatlive_cache_path')->cache_path)){
|
565 |
+
$problems['extension']['permission_error'][] = ''. Mage::getBaseDir('var') . ''.Mage::getConfig()->getNode('default/icecatlive/icecatlive_cache_path')->cache_path;
|
566 |
+
$count++;
|
567 |
+
}
|
568 |
if (!$check_module['path_exists']) {
|
569 |
// $problems['extension']['path_exists'] = $check_module['path_exists'];
|
570 |
$problems['extension']['path_exists'][] = $check_module['path'];
|
576 |
$count++;
|
577 |
}
|
578 |
//extension rewrites problems
|
|
|
579 |
$check_rewrites = $this->getRewriteCollection('Iceshop_Icecatlive');
|
580 |
|
581 |
foreach ($check_rewrites as $rewrite) {
|
app/code/local/Iceshop/Icecatlive/Model/Observer.php
CHANGED
@@ -43,6 +43,7 @@ class Iceshop_Icecatlive_Model_Observer
|
|
43 |
}
|
44 |
|
45 |
if(!$real_time){
|
|
|
46 |
if(empty($import_info['process_hash'])){
|
47 |
$import_info['process_hash'] = md5($import_info['process_hash_time']);
|
48 |
$DB_loger->insetrtUpdateLogValue('icecatlive_process_hash', $import_info['process_hash']);
|
@@ -52,9 +53,9 @@ class Iceshop_Icecatlive_Model_Observer
|
|
52 |
if($_GET['process_hash'] != $import_info['process_hash'] && $time<300 && $time>30){
|
53 |
$import_info['done'] = 1;
|
54 |
if((300 - $time)<60){
|
55 |
-
$import_info['error'] =
|
56 |
} elseif((300 - $time)>60) {
|
57 |
-
$import_info['error'] =
|
58 |
}
|
59 |
$import_info['count_products'] = 0;
|
60 |
$import_info['current_product'] = 0;
|
@@ -65,14 +66,15 @@ class Iceshop_Icecatlive_Model_Observer
|
|
65 |
$time_last = $import_time_product * ($import_info['count_products'] - $import_info['current_product']);
|
66 |
}
|
67 |
$import_info['done'] = 1;
|
|
|
68 |
if(!empty($time_last)){
|
69 |
if($time_last < 60){
|
70 |
-
$import_info['error'] =
|
71 |
} else {
|
72 |
-
$import_info['error'] =
|
73 |
}
|
74 |
} else {
|
75 |
-
$import_info['error'] =
|
76 |
}
|
77 |
$import_info['count_products'] = 0;
|
78 |
$import_info['current_product'] = 0;
|
@@ -208,7 +210,7 @@ class Iceshop_Icecatlive_Model_Observer
|
|
208 |
$vendorName = $this->getVendorName($entity_id);
|
209 |
|
210 |
$mpn = $_product->getData(Mage::getStoreConfig('icecat_root/icecat/sku_field'));
|
211 |
-
$dataUrl = '
|
212 |
$dataUrlProduct = '';
|
213 |
|
214 |
$icecatliveImportModel = new Iceshop_Icecatlive_Model_Import();
|
@@ -232,6 +234,7 @@ class Iceshop_Icecatlive_Model_Observer
|
|
232 |
}
|
233 |
|
234 |
// if get data by MPN & brand name wrong => trying by Ean code
|
|
|
235 |
if (!$successRespondByMPNVendorFlag) {
|
236 |
if (!empty($ean_code)) {
|
237 |
$resultString = $icecatliveImportModel->_getIceCatData($userName, $userPass, $dataUrl, array(
|
@@ -262,7 +265,10 @@ class Iceshop_Icecatlive_Model_Observer
|
|
262 |
}
|
263 |
}
|
264 |
$this->_prepareCacheDir();
|
265 |
-
|
|
|
|
|
|
|
266 |
$prod_title = (string)$xml_result->Product['Title'];
|
267 |
|
268 |
$this->_saveProductTitle($entity_id, $prod_title);
|
@@ -436,7 +442,7 @@ class Iceshop_Icecatlive_Model_Observer
|
|
436 |
$productsIdTable = $tablePrefix . $productsIdTable;
|
437 |
|
438 |
try{
|
439 |
-
$sql = "
|
440 |
VALUES(" . $prod_id . ")";
|
441 |
$connection->query($sql);
|
442 |
} catch (Exception $e) {
|
@@ -456,30 +462,36 @@ class Iceshop_Icecatlive_Model_Observer
|
|
456 |
}
|
457 |
$query = '';
|
458 |
try{
|
459 |
-
$sql =
|
460 |
-
LEFT JOIN eav_entity_attribute AS eea
|
461 |
ON eea.`attribute_id` = ea.`attribute_id`
|
462 |
-
|
463 |
$query = $connection->fetchRow($sql);
|
464 |
-
$
|
465 |
-
|
466 |
-
|
467 |
-
|
468 |
-
|
469 |
-
|
470 |
-
|
471 |
-
|
472 |
-
|
473 |
-
|
474 |
-
|
|
|
|
|
|
|
|
|
|
|
475 |
|
476 |
-
|
477 |
-
|
478 |
-
|
479 |
|
480 |
-
|
481 |
-
|
482 |
-
|
|
|
483 |
} catch (Exception $e) {
|
484 |
Mage::log("connector issue: {$e->getMessage()}");
|
485 |
}
|
@@ -488,9 +500,18 @@ class Iceshop_Icecatlive_Model_Observer
|
|
488 |
|
489 |
public function _saveXmltoIcecatLiveCache($resultString, $entity_id, $locale){
|
490 |
$current_prodCacheXml = Mage::getBaseDir('var') . $this->_connectorCacheDir . 'iceshop_icecatlive_' . $entity_id . '_' . $locale;
|
491 |
-
|
492 |
-
|
493 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
494 |
}
|
495 |
/**
|
496 |
* parse given XML to SIMPLE XML
|
@@ -540,7 +561,9 @@ class Iceshop_Icecatlive_Model_Observer
|
|
540 |
{
|
541 |
$varDir = Mage::getBaseDir('var') . $this->_connectorCacheDir;
|
542 |
if (!is_dir($varDir)) {
|
|
|
543 |
mkdir($varDir, 0777, true);
|
|
|
544 |
}
|
545 |
}
|
546 |
|
@@ -700,4 +723,4 @@ class Iceshop_Icecatlive_Model_Observer
|
|
700 |
|
701 |
}
|
702 |
|
703 |
-
?>
|
43 |
}
|
44 |
|
45 |
if(!$real_time){
|
46 |
+
$process_running = Mage::getConfig()->getNode('default/icecatlive/icecatlive_process_running')->icecatlive_error_text;
|
47 |
if(empty($import_info['process_hash'])){
|
48 |
$import_info['process_hash'] = md5($import_info['process_hash_time']);
|
49 |
$DB_loger->insetrtUpdateLogValue('icecatlive_process_hash', $import_info['process_hash']);
|
53 |
if($_GET['process_hash'] != $import_info['process_hash'] && $time<300 && $time>30){
|
54 |
$import_info['done'] = 1;
|
55 |
if((300 - $time)<60){
|
56 |
+
$import_info['error'] = $process_running . '<h4>Time wait: '. (300 - $time).' second</h4>';
|
57 |
} elseif((300 - $time)>60) {
|
58 |
+
$import_info['error'] = $process_running . '<h4>Time wait: '. round((300 - $time)/60, 0) .' minute</h4>';
|
59 |
}
|
60 |
$import_info['count_products'] = 0;
|
61 |
$import_info['current_product'] = 0;
|
66 |
$time_last = $import_time_product * ($import_info['count_products'] - $import_info['current_product']);
|
67 |
}
|
68 |
$import_info['done'] = 1;
|
69 |
+
|
70 |
if(!empty($time_last)){
|
71 |
if($time_last < 60){
|
72 |
+
$import_info['error'] = $process_running .'<h4>Time wait: '. $time_last .' second</h4>';
|
73 |
} else {
|
74 |
+
$import_info['error'] = $process_running .'<h4>Time wait: '. round($time_last/60, 0) .' minute</h4>';
|
75 |
}
|
76 |
} else {
|
77 |
+
$import_info['error'] = $process_running;
|
78 |
}
|
79 |
$import_info['count_products'] = 0;
|
80 |
$import_info['current_product'] = 0;
|
210 |
$vendorName = $this->getVendorName($entity_id);
|
211 |
|
212 |
$mpn = $_product->getData(Mage::getStoreConfig('icecat_root/icecat/sku_field'));
|
213 |
+
$dataUrl = ''.Mage::getConfig()->getNode('default/icecatlive/icecatlive_icecat_dataurl')->icecat_dataurl;
|
214 |
$dataUrlProduct = '';
|
215 |
|
216 |
$icecatliveImportModel = new Iceshop_Icecatlive_Model_Import();
|
234 |
}
|
235 |
|
236 |
// if get data by MPN & brand name wrong => trying by Ean code
|
237 |
+
$error = false;
|
238 |
if (!$successRespondByMPNVendorFlag) {
|
239 |
if (!empty($ean_code)) {
|
240 |
$resultString = $icecatliveImportModel->_getIceCatData($userName, $userPass, $dataUrl, array(
|
265 |
}
|
266 |
}
|
267 |
$this->_prepareCacheDir();
|
268 |
+
if(!$this->_saveXmltoIcecatLiveCache($resultString, $entity_id, $locale)){
|
269 |
+
$import_info['error'] = Mage::getConfig()->getNode('default/icecatlive/icecatlive_permission_error')->icecatlive_error_text .
|
270 |
+
Mage::getBaseDir('var') . $this->_connectorCacheDir . 'iceshop_icecatlive_' . $entity_id . '_' . $locale;
|
271 |
+
}
|
272 |
$prod_title = (string)$xml_result->Product['Title'];
|
273 |
|
274 |
$this->_saveProductTitle($entity_id, $prod_title);
|
442 |
$productsIdTable = $tablePrefix . $productsIdTable;
|
443 |
|
444 |
try{
|
445 |
+
$sql = " REPLACE INTO `" . $productsIdTable . "` ( prod_id )
|
446 |
VALUES(" . $prod_id . ")";
|
447 |
$connection->query($sql);
|
448 |
} catch (Exception $e) {
|
462 |
}
|
463 |
$query = '';
|
464 |
try{
|
465 |
+
$sql = "SELECT ea.`attribute_id`, eea.`entity_type_id`, eea.`attribute_set_id` FROM `{$tablePrefix}eav_attribute` AS ea
|
466 |
+
LEFT JOIN `{$tablePrefix}eav_entity_attribute` AS eea
|
467 |
ON eea.`attribute_id` = ea.`attribute_id`
|
468 |
+
WHERE ea.`attribute_code`='icecatlive_status';";
|
469 |
$query = $connection->fetchRow($sql);
|
470 |
+
if(!empty($query)){
|
471 |
+
$attribute_id = $query['attribute_id'];
|
472 |
+
$entity_type_id = $query['entity_type_id'];
|
473 |
+
$attribute_set_id = $query['attribute_set_id'];
|
474 |
+
|
475 |
+
$sql = "SELECT cpev.`store_id` FROM `{$tablePrefix}eav_attribute` AS ea
|
476 |
+
LEFT JOIN `{$tablePrefix}catalog_product_entity_varchar` AS cpev
|
477 |
+
ON ea.`attribute_id` = cpev.`attribute_id`
|
478 |
+
WHERE cpev.`entity_id`=' . $entity_id . ' AND (ea.`attribute_code` = 'sku_type' OR ea.`attribute_code` = 'mpn' OR ea.`attribute_code` = 'ean' )
|
479 |
+
GROUP BY cpev.`entity_id`;";
|
480 |
+
$query = $connection->fetchRow($sql);
|
481 |
+
if(!empty($query['store_id'])){
|
482 |
+
$store_id = $query['store_id'];
|
483 |
+
} else {
|
484 |
+
$store_id = 1;
|
485 |
+
}
|
486 |
|
487 |
+
$sql = "DELETE FROM `{$tablePrefix}catalog_product_entity_varchar` WHERE entity_id=".$entity_id.
|
488 |
+
" AND attribute_id=".$attribute_id." AND store_id=".$store_id.";";
|
489 |
+
$connection->query($sql);
|
490 |
|
491 |
+
$sql = "INSERT INTO `{$tablePrefix}catalog_product_entity_varchar` ( value_id, entity_type_id, attribute_id, store_id, entity_id, value)
|
492 |
+
VALUES(NULL, " . $entity_type_id . ", " .$attribute_id. ", ".$store_id. ", " .$entity_id.", '".$message. "')";
|
493 |
+
$connection->query($sql);
|
494 |
+
}
|
495 |
} catch (Exception $e) {
|
496 |
Mage::log("connector issue: {$e->getMessage()}");
|
497 |
}
|
500 |
|
501 |
public function _saveXmltoIcecatLiveCache($resultString, $entity_id, $locale){
|
502 |
$current_prodCacheXml = Mage::getBaseDir('var') . $this->_connectorCacheDir . 'iceshop_icecatlive_' . $entity_id . '_' . $locale;
|
503 |
+
if(is_writable(Mage::getBaseDir('var') . $this->_connectorCacheDir)){
|
504 |
+
$current_prodCacheHandler = fopen($current_prodCacheXml, "w");
|
505 |
+
fwrite($current_prodCacheHandler, $resultString);
|
506 |
+
fclose ($current_prodCacheHandler);
|
507 |
+
if(file_exists($current_prodCacheXml)){
|
508 |
+
return true;
|
509 |
+
} else {
|
510 |
+
return false;
|
511 |
+
}
|
512 |
+
} else {
|
513 |
+
return false;
|
514 |
+
}
|
515 |
}
|
516 |
/**
|
517 |
* parse given XML to SIMPLE XML
|
561 |
{
|
562 |
$varDir = Mage::getBaseDir('var') . $this->_connectorCacheDir;
|
563 |
if (!is_dir($varDir)) {
|
564 |
+
if (is_writable(Mage::getBaseDir('var') . $this->_connectorDir)){
|
565 |
mkdir($varDir, 0777, true);
|
566 |
+
}
|
567 |
}
|
568 |
}
|
569 |
|
723 |
|
724 |
}
|
725 |
|
726 |
+
?>
|
app/code/local/Iceshop/Icecatlive/controllers/IcecatliveController.php
CHANGED
@@ -30,7 +30,7 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
30 |
?>
|
31 |
<div class="entry-edit" id="icecatlive-digest">
|
32 |
<div class="entry-edit-head collapseable">
|
33 |
-
<a href="#" class="section-toggler-icecatlive
|
34 |
Problems Digest
|
35 |
</a>
|
36 |
</div>
|
@@ -62,6 +62,13 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
62 |
print '<li>' . $problem_value_path . '</li>';
|
63 |
}
|
64 |
print '</ul></td></tr>';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
65 |
} else{
|
66 |
print '<tr><td class="label"><label class="problem-digest">' . $helper->__('Problem') . " " . $i . ':</label>';
|
67 |
print '</td><td class="value"><span class="requirement-passed">"'
|
@@ -107,12 +114,17 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
107 |
$import_info['full_icecat_product'] = $DB_loger->getLogValue('icecatlive_full_icecat_product');
|
108 |
$count_products = $DB_loger->readQuery("SELECT COUNT(*) FROM `" . $DB_loger->_prefix . "catalog_product_entity` LEFT JOIN `" . $DB_loger->_prefix . "iceshop_icecatlive_products_titles` ON entity_id = prod_id WHERE prod_id IS NULL");
|
109 |
$import_info['count_not_updated_products'] = $count_products[0]['COUNT(*)'];
|
110 |
-
|
111 |
-
|
|
|
|
|
|
|
|
|
112 |
?>
|
113 |
<div class="entry-edit">
|
|
|
114 |
<div class="entry-edit-head collapseable">
|
115 |
-
<a href="#" class="
|
116 |
Icecatlive Info
|
117 |
</a>
|
118 |
</div>
|
@@ -378,7 +390,7 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
378 |
|
379 |
<div class="entry-edit">
|
380 |
<div class="entry-edit-head collapseable">
|
381 |
-
<a href="#" class="
|
382 |
</div>
|
383 |
|
384 |
<div class="fieldset icecatlive-hidden">
|
@@ -431,7 +443,7 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
431 |
|
432 |
<div class="entry-edit">
|
433 |
<div class="entry-edit-head collapseable">
|
434 |
-
<a href="#" class="
|
435 |
</div>
|
436 |
|
437 |
<div class="fieldset icecatlive-hidden">
|
@@ -460,7 +472,7 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
460 |
</div>
|
461 |
<div class="entry-edit">
|
462 |
<div class="entry-edit-head collapseable">
|
463 |
-
<a href="#" class="
|
464 |
</div>
|
465 |
|
466 |
<div class="fieldset icecatlive-hidden">
|
@@ -488,7 +500,7 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
488 |
</div>
|
489 |
<div class="entry-edit">
|
490 |
<div class="entry-edit-head collapseable">
|
491 |
-
<a href="#" class="
|
492 |
</div>
|
493 |
|
494 |
<div class="fieldset icecatlive-hidden">
|
@@ -539,7 +551,7 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
539 |
|
540 |
<div class="entry-edit">
|
541 |
<div class="entry-edit-head collapseable">
|
542 |
-
<a href="#" class="
|
543 |
</div>
|
544 |
|
545 |
<div class="fieldset icecatlive-hidden">
|
@@ -561,7 +573,7 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
561 |
|
562 |
<div class="entry-edit">
|
563 |
<div class="entry-edit-head collapseable">
|
564 |
-
<a href="#" class="
|
565 |
</div>
|
566 |
|
567 |
<div class="fieldset icecatlive-hidden">
|
@@ -589,7 +601,7 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
589 |
</div>
|
590 |
<div class="entry-edit">
|
591 |
<div class="entry-edit-head collapseable">
|
592 |
-
<a href="#" class="
|
593 |
</div>
|
594 |
|
595 |
<div class="fieldset icecatlive-hidden">
|
@@ -605,7 +617,7 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
605 |
</div>
|
606 |
<div class="entry-edit">
|
607 |
<div class="entry-edit-head collapseable">
|
608 |
-
<a href="#" class="
|
609 |
</div>
|
610 |
<div class="fieldset icecatlive-hidden">
|
611 |
<div id="gridActionClener" class="hor-scroll">
|
30 |
?>
|
31 |
<div class="entry-edit" id="icecatlive-digest">
|
32 |
<div class="entry-edit-head collapseable">
|
33 |
+
<a href="#" class="section-toggler-icecatlive">
|
34 |
Problems Digest
|
35 |
</a>
|
36 |
</div>
|
62 |
print '<li>' . $problem_value_path . '</li>';
|
63 |
}
|
64 |
print '</ul></td></tr>';
|
65 |
+
} elseif($problem_name == 'permission_error'){
|
66 |
+
print '<tr><td class="label"><label class="problem-digest">' . $helper->__('Problem') . " " . $i . ':</label>';
|
67 |
+
print '</td><td class="value">'.Mage::getConfig()->getNode('default/icecatlive/icecatlive_permission_error')->icecatlive_error_text.'<ul>';
|
68 |
+
foreach($problem_value as $problem_value_key => $problem_value_path) {
|
69 |
+
print '<li>' . $problem_value_path . '</li>';
|
70 |
+
}
|
71 |
+
print '</ul></td></tr>';
|
72 |
} else{
|
73 |
print '<tr><td class="label"><label class="problem-digest">' . $helper->__('Problem') . " " . $i . ':</label>';
|
74 |
print '</td><td class="value"><span class="requirement-passed">"'
|
114 |
$import_info['full_icecat_product'] = $DB_loger->getLogValue('icecatlive_full_icecat_product');
|
115 |
$count_products = $DB_loger->readQuery("SELECT COUNT(*) FROM `" . $DB_loger->_prefix . "catalog_product_entity` LEFT JOIN `" . $DB_loger->_prefix . "iceshop_icecatlive_products_titles` ON entity_id = prod_id WHERE prod_id IS NULL");
|
116 |
$import_info['count_not_updated_products'] = $count_products[0]['COUNT(*)'];
|
117 |
+
if(file_exists(Mage::getBaseDir('var') .'/iceshop/icecatlive/cache/') && is_readable(Mage::getBaseDir('var') .'/iceshop/icecatlive/cache/')){
|
118 |
+
$cache_files = scandir(Mage::getBaseDir('var') .'/iceshop/icecatlive/cache/');
|
119 |
+
$count_cache_files = count($cache_files) - 2;
|
120 |
+
} else {
|
121 |
+
$count_cache_files = 0;
|
122 |
+
}
|
123 |
?>
|
124 |
<div class="entry-edit">
|
125 |
+
|
126 |
<div class="entry-edit-head collapseable">
|
127 |
+
<a href="#" class="section-toggler-icecatlive">
|
128 |
Icecatlive Info
|
129 |
</a>
|
130 |
</div>
|
390 |
|
391 |
<div class="entry-edit">
|
392 |
<div class="entry-edit-head collapseable">
|
393 |
+
<a href="#" class="section-toggler-icecatlive">Magento Info</a>
|
394 |
</div>
|
395 |
|
396 |
<div class="fieldset icecatlive-hidden">
|
443 |
|
444 |
<div class="entry-edit">
|
445 |
<div class="entry-edit-head collapseable">
|
446 |
+
<a href="#" class="section-toggler-icecatlive">Magento Core API Info</a>
|
447 |
</div>
|
448 |
|
449 |
<div class="fieldset icecatlive-hidden">
|
472 |
</div>
|
473 |
<div class="entry-edit">
|
474 |
<div class="entry-edit-head collapseable">
|
475 |
+
<a href="#" class="section-toggler-icecatlive">PHP Info</a>
|
476 |
</div>
|
477 |
|
478 |
<div class="fieldset icecatlive-hidden">
|
500 |
</div>
|
501 |
<div class="entry-edit">
|
502 |
<div class="entry-edit-head collapseable">
|
503 |
+
<a href="#" class="section-toggler-icecatlive">MySQL Info</a>
|
504 |
</div>
|
505 |
|
506 |
<div class="fieldset icecatlive-hidden">
|
551 |
|
552 |
<div class="entry-edit">
|
553 |
<div class="entry-edit-head collapseable">
|
554 |
+
<a href="#" class="section-toggler-icecatlive">MySQL Configuration</a>
|
555 |
</div>
|
556 |
|
557 |
<div class="fieldset icecatlive-hidden">
|
573 |
|
574 |
<div class="entry-edit">
|
575 |
<div class="entry-edit-head collapseable">
|
576 |
+
<a href="#" class="section-toggler-icecatlive">Server Info</a>
|
577 |
</div>
|
578 |
|
579 |
<div class="fieldset icecatlive-hidden">
|
601 |
</div>
|
602 |
<div class="entry-edit">
|
603 |
<div class="entry-edit-head collapseable">
|
604 |
+
<a href="#" class="section-toggler-icecatlive">Webshop IP address</a>
|
605 |
</div>
|
606 |
|
607 |
<div class="fieldset icecatlive-hidden">
|
617 |
</div>
|
618 |
<div class="entry-edit">
|
619 |
<div class="entry-edit-head collapseable">
|
620 |
+
<a href="#" class="section-toggler-icecatlive">Not Import Product List</a>
|
621 |
</div>
|
622 |
<div class="fieldset icecatlive-hidden">
|
623 |
<div id="gridActionClener" class="hor-scroll">
|
app/code/local/Iceshop/Icecatlive/etc/config.xml
CHANGED
@@ -2,14 +2,31 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Iceshop_Icecatlive>
|
5 |
-
<version>1.7.
|
6 |
</Iceshop_Icecatlive>
|
7 |
</modules>
|
8 |
<default>
|
9 |
<icecatlive>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
10 |
<patch>
|
11 |
<template_file_path><![CDATA[frontend/default/default/template/iceshop/icecatlive/groupattributes.phtml]]></template_file_path>
|
12 |
</patch>
|
|
|
13 |
<noimportid_tables>
|
14 |
<table_name>iceshop_icecatlive_noimport_products_id</table_name>
|
15 |
</noimportid_tables>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Iceshop_Icecatlive>
|
5 |
+
<version>1.7.3</version>
|
6 |
</Iceshop_Icecatlive>
|
7 |
</modules>
|
8 |
<default>
|
9 |
<icecatlive>
|
10 |
+
<icecatlive_icecat_dataurl>
|
11 |
+
<icecat_dataurl><![CDATA[https://data.icecat.biz/xml_s3/xml_server3.cgi]]></icecat_dataurl>
|
12 |
+
</icecatlive_icecat_dataurl>
|
13 |
+
|
14 |
+
<icecatlive_cache_path>
|
15 |
+
<cache_path><![CDATA[/iceshop/icecatlive/cache/]]></cache_path>
|
16 |
+
</icecatlive_cache_path>
|
17 |
+
|
18 |
+
<icecatlive_permission_error>
|
19 |
+
<icecatlive_error_text><![CDATA[Permission denied: ]]></icecatlive_error_text>
|
20 |
+
</icecatlive_permission_error>
|
21 |
+
|
22 |
+
<icecatlive_process_running>
|
23 |
+
<icecatlive_error_text><![CDATA[The process is currently running by another session.Please wait till the process is finished.]]></icecatlive_error_text>
|
24 |
+
</icecatlive_process_running>
|
25 |
+
|
26 |
<patch>
|
27 |
<template_file_path><![CDATA[frontend/default/default/template/iceshop/icecatlive/groupattributes.phtml]]></template_file_path>
|
28 |
</patch>
|
29 |
+
|
30 |
<noimportid_tables>
|
31 |
<table_name>iceshop_icecatlive_noimport_products_id</table_name>
|
32 |
</noimportid_tables>
|
app/code/local/Iceshop/Icecatlive/sql/icecatlive_setup/{mysql4-install-1.7.2.php → mysql4-install-1.7.3.php}
RENAMED
File without changes
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>IcecatLive</name>
|
4 |
-
<version>1.7.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v.3</license>
|
7 |
<channel>community</channel>
|
@@ -9,12 +9,14 @@
|
|
9 |
<summary>ICEcat to Magento Open Source Connector</summary>
|
10 |
<description>Edit Extension Package Extensions Magento Connect System Magento Admin</description>
|
11 |
<notes>Improvements:
|
|
|
12 |

|
13 |
-
|
|
|
14 |
<authors><author><name>IceShop</name><user>IceShop</user><email>support@iceshop.nl</email></author></authors>
|
15 |
-
<date>2015-03-
|
16 |
-
<time>
|
17 |
-
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="
|
18 |
<compatible/>
|
19 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
20 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>IcecatLive</name>
|
4 |
+
<version>1.7.3</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v.3</license>
|
7 |
<channel>community</channel>
|
9 |
<summary>ICEcat to Magento Open Source Connector</summary>
|
10 |
<description>Edit Extension Package Extensions Magento Connect System Magento Admin</description>
|
11 |
<notes>Improvements:
|
12 |
+
- Problem detection mechanism
|
13 |

|
14 |
+
Bugfix:
|
15 |
+
- Minor bug fixing</notes>
|
16 |
<authors><author><name>IceShop</name><user>IceShop</user><email>support@iceshop.nl</email></author></authors>
|
17 |
+
<date>2015-03-30</date>
|
18 |
+
<time>11:20:50</time>
|
19 |
+
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="iceshop"><dir name="icecatlive"><file name="ajaxstatusimport.phtml" hash="94ff5a5db0bb6990342810a8e8495848"/><file name="notifications.phtml" hash="90fe6df8ae9655f6f3c6c77685540c08"/></dir></dir></dir><dir name="layout"><file name="icecatlive.xml" hash="d1654d4bcbc4f11b58b728d5c269c704"/></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><dir name="iceshop"><dir name="icecatlive"><file name="groupattributes.xml" hash="29fb1f5d19c04221f668485dccace23d"/></dir></dir></dir><dir name="template"><dir name="iceshop"><dir name="icecatlive"><file name="groupattributes.phtml" hash="4700d3c6330273cf48625666b3e899e4"/></dir></dir></dir></dir></dir></dir></target><target name="magelocal"><dir name="Iceshop"><dir name="Icecatlive"><dir name="Block"><dir name="Adminhtml"><file name="Notifications.php" hash="3a0dfe93ead9f74b1f648d16f75c58f8"/><dir name="Product"><dir name="List"><file name="Grid.php" hash="05fd6fcae7bda3b28a1ea9947460d425"/></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><file name="Button.php" hash="b9112e6539624cc88c215aecf88cef00"/><file name="UpdateButton.php" hash="78bb6e863c1c2f53720c50a0c2ec65e7"/></dir></dir></dir></dir><file name="Attributes.php" hash="394eb7d9f03b79b63fa2dd44842f262a"/><dir name="Product"><dir name="List"><file name="Toolbar.php" hash="03f6259ebb44b41df7d03581bbd9c84a"/></dir></dir><file name="Related.php" hash="1bbac689a628d86ba9704a7b752df286"/><file name="Upsell.php" hash="0dfaba7ae6bc688215a56065101b4544"/></dir><dir name="CatalogSearch"><dir name="Block"><file name="Result.php" hash="199bd394ca894bf82964805270318f09"/></dir></dir><dir name="Helper"><file name="Data.php" hash="b06f19391dba03ecaef4742a42f71902"/><file name="Db.php" hash="aab35d6232538b4e5cb1300ed83701a8"/><file name="Format.php" hash="ac13e6bb5cdc5919bfad215e1fca4a7b"/><file name="Getdata.php" hash="85dd7bf14c9b232ccf078a99241add1c"/><file name="Output.php" hash="5698b83f62043e95c5f33d603ccbc03a"/><dir name="System"><file name="System.php" hash="ea277a89745de7b28993509f8dee2bab"/><file name="Systemcheck.php" hash="f3897a8145deccbfac69ac298760452c"/></dir></dir><dir name="Model"><dir name="Catalog"><file name="Category.php" hash="e4ab9f04ded0059e3f9b7e568586d903"/><file name="Product.php" hash="03794cce61bf0e924ae33593a850d7ea"/><file name="Search.php" hash="8d5c8b59c35a8449c8e4a8e30285d38b"/></dir><file name="Import.php" hash="1110b20db2bb3e851a0435722dce9b4f"/><file name="Observer.php" hash="f08011294135bff5ab5a404d5a103c40"/><file name="Relatedcollection.php" hash="82a0585c3404d94dcb4e3a1606bae546"/><dir name="System"><dir name="Config"><file name="Attributes.php" hash="85b2cacd4ef51fa5bb166c4394fdf6f8"/><file name="Checksystem.php" hash="782d1861c87717a347e9aeafb533cabb"/><file name="Descriptionpriority.php" hash="4facaa955e0799b94bf8c7e5e60f64d5"/><file name="Iceshoplink.php" hash="0342f048a75aa382fae42082618218f4"/><file name="Imagepriority.php" hash="ef7a85c5b4ed0562b75096e569720173"/><file name="Importdata.php" hash="25196649542ccc4df2da39f6cc1ec043"/><file name="LanguageList.xml" hash="52aaea2acd5acd2c0d4f63de4f4621bc"/><file name="Loadingtype.php" hash="35ef5c60a7fb1c81852c6e04d066f79f"/><file name="Locales.php" hash="604a6087f75a4dddbf271ac2145356a8"/><file name="Namepriority.php" hash="05e06b1e0fe303d5efc4d4f24dd1df01"/><file name="Onlynewproducts.php" hash="6e758f07cd5d5f16237b45df3492b9e7"/><file name="Productpriority.php" hash="62b5912d7af4a8c7ff5f92c887c70128"/><file name="Shortdescrpriority.php" hash="946c34829295aa50b79f1e8fa7d48eaa"/><file name="Subscription.php" hash="6c4e8895b28fdcaab6001ac2a8fa995b"/><file name="Viewattributes.php" hash="8f0ac7b0091adb1a15564f2a7b9c6b04"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="ImportdataController.php" hash="c4874ee811ce4d3d446835ddc6cb2f94"/><file name="ImportproductController.php" hash="5693e28bf5ef3804ed82a9c81f820538"/><file name="ImportproductinfoController.php" hash="5f6fc5b5517b22d796e1b5a81cb199c4"/><file name="ImportprogressController.php" hash="a9212979beb0aa57447d7d70f3297a28"/></dir><file name="IcecatliveController.php" hash="05c771cbd2f3bd3f9149de56508cedd1"/><file name="ImageController.php" hash="35e08758e0dfdae450e9aaa342a6b777"/></dir><dir name="etc"><file name="adminhtml.xml" hash="bbfbb08ba646a3f4f3fb38873858930b"/><file name="config.xml" hash="b7c7d7f3d3872d4ca004513679d54f99"/><file name="system.xml" hash="106e4eca7100934fef289c95e2a6e7dc"/></dir><dir name="sql"><dir name="icecatlive_setup"><file name="mysql4-install-1.7.3.php" hash="d4a9c36d50f080209df067f09b6294fb"/><file name="mysql4-upgrade-0.1.0-1.6.0.php" hash="3eabfeabdd60bbea11ef1c53251de5a8"/><file name="mysql4-upgrade-0.1.1-1.6.0.php" hash="3eabfeabdd60bbea11ef1c53251de5a8"/><file name="mysql4-upgrade-1.5.0-1.6.0.php" hash="3eabfeabdd60bbea11ef1c53251de5a8"/><file name="mysql4-upgrade-1.6.0-1.7.0.php" hash="d4a9c36d50f080209df067f09b6294fb"/><file name="mysql4-upgrade-1.7.0-1.7.2" hash="d4a9c36d50f080209df067f09b6294fb"/><file name="uninstall-old-version.php" hash="ad30e3ae29ba1d7fdfe61dc05476a1d3"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Iceshop_Icecatlive.xml" hash="b097c8e9a31651d1ab43ff1db9f30d56"/></dir></target><target name="mage"><dir name="js"><dir name="ICEshop"><dir name="Icecatlive"><file name="jquery-1.9.1.min.js" hash="fee4c9e0129fb2b8830a3c17638c44b0"/><file name="multi-lingual-store-field.js" hash="b99ce2b343cc5dbca86bb9165bcc444d"/><file name="script.js" hash="a66a957b7956f895a5065d8c9c5a12f8"/></dir></dir></dir><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="iceshop"><dir name="icecatlive"><dir name="images"><file name="iceshop_logo_small_16px.png" hash="4ef632b4b89a047789307b301b9dfb6e"/></dir><file name="styles.css" hash="9bfab144d8ddfd445fe3bbaecac9cc53"/></dir></dir></dir></dir></dir></dir></target></contents>
|
20 |
<compatible/>
|
21 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
22 |
</package>
|