Version Notes
Bugfix:
- Fix some problem with logging.
- Fix acl issue
- Fix problem digest displaying
- Fix cron functionality
Download this release
Release Info
| Developer | IceShop |
| Extension | IcecatLive |
| Version | 1.7.11 |
| Comparing to | |
| See all releases | |
Code changes from version 1.7.10 to 1.7.11
- app/code/community/Iceshop/Icecatlive/Helper/Log.php +14 -10
- app/code/community/Iceshop/Icecatlive/Helper/System/Systemcheck.php +23 -1
- app/code/community/Iceshop/Icecatlive/Model/Observer.php +120 -23
- app/code/community/Iceshop/Icecatlive/Model/System/Config/Explanations.php +11 -0
- app/code/community/Iceshop/Icecatlive/controllers/Adminhtml/ImportdataController.php +5 -0
- app/code/community/Iceshop/Icecatlive/controllers/Adminhtml/ImportproductController.php +5 -0
- app/code/community/Iceshop/Icecatlive/controllers/Adminhtml/ImportproductinfoController.php +5 -0
- app/code/community/Iceshop/Icecatlive/controllers/Adminhtml/ImportprogressController.php +5 -0
- app/code/community/Iceshop/Icecatlive/controllers/IcecatliveController.php +149 -1
- app/code/community/Iceshop/Icecatlive/controllers/ImageController.php +5 -0
- app/code/community/Iceshop/Icecatlive/etc/config.xml +1 -1
- app/code/community/Iceshop/Icecatlive/etc/system.xml +21 -2
- app/code/community/Iceshop/Icecatlive/temp_log.txt +10 -0
- js/ICEshop/Icecatlive/script.js +10 -0
- package.xml +11 -9
app/code/community/Iceshop/Icecatlive/Helper/Log.php
CHANGED
|
@@ -14,7 +14,7 @@ class Iceshop_Icecatlive_Helper_Log extends Mage_Core_Helper_Abstract
|
|
| 14 |
|
| 15 |
public function __construct()
|
| 16 |
{
|
| 17 |
-
$this->_logFileName = Mage::
|
| 18 |
}
|
| 19 |
|
| 20 |
public function openLogFile()
|
|
@@ -30,9 +30,11 @@ class Iceshop_Icecatlive_Helper_Log extends Mage_Core_Helper_Abstract
|
|
| 30 |
$lines = explode("\n", $fileContent);
|
| 31 |
|
| 32 |
foreach ($lines as $line) {
|
| 33 |
-
|
| 34 |
-
|
| 35 |
-
|
|
|
|
|
|
|
| 36 |
}
|
| 37 |
}
|
| 38 |
}
|
|
@@ -53,12 +55,14 @@ class Iceshop_Icecatlive_Helper_Log extends Mage_Core_Helper_Abstract
|
|
| 53 |
return true;
|
| 54 |
} else {
|
| 55 |
foreach ($lines as $line) {
|
| 56 |
-
|
| 57 |
-
|
| 58 |
-
$
|
| 59 |
-
|
| 60 |
-
|
| 61 |
-
|
|
|
|
|
|
|
| 62 |
}
|
| 63 |
}
|
| 64 |
}
|
| 14 |
|
| 15 |
public function __construct()
|
| 16 |
{
|
| 17 |
+
$this->_logFileName = Mage::getBaseDir('log'). DS. 'temp_log.txt';
|
| 18 |
}
|
| 19 |
|
| 20 |
public function openLogFile()
|
| 30 |
$lines = explode("\n", $fileContent);
|
| 31 |
|
| 32 |
foreach ($lines as $line) {
|
| 33 |
+
if($line != ''){
|
| 34 |
+
list($log_key, $log_value) = explode(' ', $line);
|
| 35 |
+
if ($log_key == $key . ':') {
|
| 36 |
+
return $log_value;
|
| 37 |
+
}
|
| 38 |
}
|
| 39 |
}
|
| 40 |
}
|
| 55 |
return true;
|
| 56 |
} else {
|
| 57 |
foreach ($lines as $line) {
|
| 58 |
+
if($line != ''){
|
| 59 |
+
list($log_key) = explode(' ', $line);
|
| 60 |
+
if ($log_key == $key . ':') {
|
| 61 |
+
$newContent = str_replace($line, $log_key. ' '. $value, $fileContent);
|
| 62 |
+
file_put_contents($this->_logFileName, $newContent);
|
| 63 |
+
|
| 64 |
+
return true;
|
| 65 |
+
}
|
| 66 |
}
|
| 67 |
}
|
| 68 |
}
|
app/code/community/Iceshop/Icecatlive/Helper/System/Systemcheck.php
CHANGED
|
@@ -195,7 +195,7 @@ class Iceshop_Icecatlive_Helper_System_Systemcheck extends Mage_Core_Helper_Abst
|
|
| 195 |
'label' => 'Memory Limit',
|
| 196 |
'recommended_value' => '>= 128M',
|
| 197 |
'current_value' => $php['memory_limit'],
|
| 198 |
-
'result' => ($
|
| 199 |
'advice' => array(
|
| 200 |
'label' => $this->__('Maximum amount of memory in bytes that a script is allowed to allocate.'),
|
| 201 |
'link' => 'http://ua2.php.net/manual/en/ini.core.php#ini.memory-limit'
|
|
@@ -744,4 +744,26 @@ class Iceshop_Icecatlive_Helper_System_Systemcheck extends Mage_Core_Helper_Abst
|
|
| 744 |
return false;
|
| 745 |
}
|
| 746 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 747 |
}
|
| 195 |
'label' => 'Memory Limit',
|
| 196 |
'recommended_value' => '>= 128M',
|
| 197 |
'current_value' => $php['memory_limit'],
|
| 198 |
+
'result' => ($this->checkMemoryLimit($php['memory_limit'], (int)128)),
|
| 199 |
'advice' => array(
|
| 200 |
'label' => $this->__('Maximum amount of memory in bytes that a script is allowed to allocate.'),
|
| 201 |
'link' => 'http://ua2.php.net/manual/en/ini.core.php#ini.memory-limit'
|
| 744 |
return false;
|
| 745 |
}
|
| 746 |
}
|
| 747 |
+
|
| 748 |
+
/**
|
| 749 |
+
* Calculate and compare needed value of memory limit
|
| 750 |
+
* @param string $memoryLimit
|
| 751 |
+
* @param integer $compare
|
| 752 |
+
* @return boolean
|
| 753 |
+
*/
|
| 754 |
+
protected function checkMemoryLimit($memoryLimit, $compare){
|
| 755 |
+
$ml = false;
|
| 756 |
+
if(strripos($memoryLimit, 'G')){
|
| 757 |
+
$ml = ((int)$memoryLimit)*1024;
|
| 758 |
+
} else {
|
| 759 |
+
$ml = (int)$memoryLimit;
|
| 760 |
+
}
|
| 761 |
+
if($ml){
|
| 762 |
+
if($ml>=$compare)
|
| 763 |
+
return true;
|
| 764 |
+
else
|
| 765 |
+
return false;
|
| 766 |
+
}
|
| 767 |
+
return false;
|
| 768 |
+
}
|
| 769 |
}
|
app/code/community/Iceshop/Icecatlive/Model/Observer.php
CHANGED
|
@@ -16,6 +16,9 @@ class Iceshop_Icecatlive_Model_Observer
|
|
| 16 |
public $_connectorCacheDir = '/iceshop/icecatlive/cache/';
|
| 17 |
protected $_productFile;
|
| 18 |
protected $_supplierFile;
|
|
|
|
|
|
|
|
|
|
| 19 |
|
| 20 |
protected function _construct()
|
| 21 |
{
|
|
@@ -45,7 +48,7 @@ class Iceshop_Icecatlive_Model_Observer
|
|
| 45 |
$DB_loger->insetrtUpdateLogValue('icecatlive_process_hash_time', $import_info['process_hash_time']);
|
| 46 |
}
|
| 47 |
|
| 48 |
-
if(!$real_time){
|
| 49 |
$process_running = Mage::getConfig()->getNode('default/icecatlive/icecatlive_process_running')->icecatlive_error_text;
|
| 50 |
if(empty($import_info['process_hash'])){
|
| 51 |
$import_info['process_hash'] = md5($import_info['process_hash_time']);
|
|
@@ -298,7 +301,10 @@ class Iceshop_Icecatlive_Model_Observer
|
|
| 298 |
|
| 299 |
}else{
|
| 300 |
$this->deleteIdProductTitles($entity_id);
|
| 301 |
-
if($import_id){
|
|
|
|
|
|
|
|
|
|
| 302 |
return false;
|
| 303 |
}
|
| 304 |
// insert not import product id in table
|
|
@@ -612,55 +618,67 @@ class Iceshop_Icecatlive_Model_Observer
|
|
| 612 |
* @param int $update param set update or import data
|
| 613 |
* @param bool $full_import_stat flag for set full_import
|
| 614 |
*/
|
| 615 |
-
public function load($update = 0, $full_import_stat = false, $error_import = 0, $crone_start=1)
|
| 616 |
{
|
| 617 |
-
if($crone_start){
|
| 618 |
-
|
| 619 |
-
|
| 620 |
}
|
| 621 |
$DB_loger = Mage::helper('icecatlive/db');
|
| 622 |
-
|
|
|
|
|
|
|
|
|
|
| 623 |
$DB_loger = Mage::helper('icecatlive/db');
|
| 624 |
-
if(!$full_import_stat){
|
| 625 |
$_GET['full_import'] = 1;
|
| 626 |
} else {
|
| 627 |
$_GET['full_import'] = '';
|
| 628 |
}
|
| 629 |
$_GET['error_import'] = $error_import;
|
| 630 |
$_GET['update'] = 0;
|
| 631 |
-
|
| 632 |
-
|
| 633 |
-
|
|
|
|
|
|
|
| 634 |
}
|
| 635 |
$DB_loger->insetrtUpdateLogValue('icecatlive_enddate_imported_product', date('Y-m-d H:i:s'));
|
| 636 |
} catch (Exception $e) {
|
| 637 |
$DB_loger->insetrtUpdateLogValue('import_icecat_server_error_message', $e->getMessage());
|
| 638 |
-
$this->
|
|
|
|
|
|
|
|
|
|
| 639 |
}
|
| 640 |
}
|
| 641 |
|
| 642 |
/**
|
| 643 |
* Method run updata in crontab jobs
|
| 644 |
*/
|
| 645 |
-
public function loadUpdate($error_import = 0, $crone_start=1)
|
| 646 |
{
|
| 647 |
-
|
| 648 |
-
|
| 649 |
-
|
| 650 |
-
|
| 651 |
-
|
| 652 |
-
|
|
|
|
|
|
|
|
|
|
| 653 |
$_GET['update'] = 1;
|
| 654 |
$_GET['error_import'] = $error_import;
|
| 655 |
-
|
| 656 |
-
|
| 657 |
-
|
|
|
|
| 658 |
}
|
| 659 |
$DB_loger->deleteLogKey('import_icecat_server_error_message_update');
|
| 660 |
$DB_loger->insetrtUpdateLogValue('icecatlive_enddate_update_product', date('Y-m-d H:i:s'));
|
| 661 |
} catch (Exception $e) {
|
| 662 |
$DB_loger->insetrtUpdateLogValue('import_icecat_server_error_message_update', $e->getMessage());
|
| 663 |
-
$this->loadUpdate(1,0);
|
| 664 |
}
|
| 665 |
}
|
| 666 |
|
|
@@ -766,6 +784,85 @@ class Iceshop_Icecatlive_Model_Observer
|
|
| 766 |
return '';
|
| 767 |
}
|
| 768 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 769 |
}
|
| 770 |
|
| 771 |
?>
|
| 16 |
public $_connectorCacheDir = '/iceshop/icecatlive/cache/';
|
| 17 |
protected $_productFile;
|
| 18 |
protected $_supplierFile;
|
| 19 |
+
protected $_heap = array();
|
| 20 |
+
protected $_current_id = null;
|
| 21 |
+
protected $_cron_full_icecat_counter = 0;
|
| 22 |
|
| 23 |
protected function _construct()
|
| 24 |
{
|
| 48 |
$DB_loger->insetrtUpdateLogValue('icecatlive_process_hash_time', $import_info['process_hash_time']);
|
| 49 |
}
|
| 50 |
|
| 51 |
+
if(!$real_time && $crone == 0){
|
| 52 |
$process_running = Mage::getConfig()->getNode('default/icecatlive/icecatlive_process_running')->icecatlive_error_text;
|
| 53 |
if(empty($import_info['process_hash'])){
|
| 54 |
$import_info['process_hash'] = md5($import_info['process_hash_time']);
|
| 301 |
|
| 302 |
}else{
|
| 303 |
$this->deleteIdProductTitles($entity_id);
|
| 304 |
+
if ($import_id) {
|
| 305 |
+
if (preg_match('/^Warning: You are not allowed to have Full ICEcat access$/', $icecatliveImportModel->getErrorMessage())) {
|
| 306 |
+
$this->_cron_full_icecat_counter++;
|
| 307 |
+
}
|
| 308 |
return false;
|
| 309 |
}
|
| 310 |
// insert not import product id in table
|
| 618 |
* @param int $update param set update or import data
|
| 619 |
* @param bool $full_import_stat flag for set full_import
|
| 620 |
*/
|
| 621 |
+
public function load($update = 0, $full_import_stat = false, $error_import = 0, $crone_start = 1)
|
| 622 |
{
|
| 623 |
+
if ($crone_start) {
|
| 624 |
+
$date_crone_start = date('Y-m-d H:i:s');
|
| 625 |
+
$this->setCroneStatus('running', $date_crone_start, 'icecatlive_load_data');
|
| 626 |
}
|
| 627 |
$DB_loger = Mage::helper('icecatlive/db');
|
| 628 |
+
$DB_loger->insetrtUpdateLogValue('icecatlive_startdate_imported_product', date('Y-m-d H:i:s'));
|
| 629 |
+
$DB_loger->deleteLogKey('icecatlive_error_imported_product');
|
| 630 |
+
$DB_loger->deleteLogKey('icecatlive_success_imported_product');
|
| 631 |
+
try {
|
| 632 |
$DB_loger = Mage::helper('icecatlive/db');
|
| 633 |
+
if (!$full_import_stat) {
|
| 634 |
$_GET['full_import'] = 1;
|
| 635 |
} else {
|
| 636 |
$_GET['full_import'] = '';
|
| 637 |
}
|
| 638 |
$_GET['error_import'] = $error_import;
|
| 639 |
$_GET['update'] = 0;
|
| 640 |
+
|
| 641 |
+
$this->getEntityData();
|
| 642 |
+
|
| 643 |
+
if (!empty($this->_heap)) {
|
| 644 |
+
$this->runFetchData();
|
| 645 |
}
|
| 646 |
$DB_loger->insetrtUpdateLogValue('icecatlive_enddate_imported_product', date('Y-m-d H:i:s'));
|
| 647 |
} catch (Exception $e) {
|
| 648 |
$DB_loger->insetrtUpdateLogValue('import_icecat_server_error_message', $e->getMessage());
|
| 649 |
+
if ($this->_current_id !== null) {
|
| 650 |
+
unset($this->_heap[$this->_current_id]);
|
| 651 |
+
$this->load(0, true, 1, 0);
|
| 652 |
+
}
|
| 653 |
}
|
| 654 |
}
|
| 655 |
|
| 656 |
/**
|
| 657 |
* Method run updata in crontab jobs
|
| 658 |
*/
|
| 659 |
+
public function loadUpdate($error_import = 0, $crone_start = 1)
|
| 660 |
{
|
| 661 |
+
if ($crone_start) {
|
| 662 |
+
$date_crone_start = date('Y-m-d H:i:s');
|
| 663 |
+
$this->setCroneStatus('running', $date_crone_start, 'icecatlive_load_updata');
|
| 664 |
+
}
|
| 665 |
+
$DB_loger = Mage::helper('icecatlive/db');
|
| 666 |
+
$DB_loger->insetrtUpdateLogValue('icecatlive_startdate_update_product', date('Y-m-d H:i:s'));
|
| 667 |
+
$DB_loger->deleteLogKey('icecatlive_error_imported_product');
|
| 668 |
+
$DB_loger->deleteLogKey('icecatlive_success_imported_product');
|
| 669 |
+
try {
|
| 670 |
$_GET['update'] = 1;
|
| 671 |
$_GET['error_import'] = $error_import;
|
| 672 |
+
|
| 673 |
+
$this->getEntityData();
|
| 674 |
+
if (!empty($this->_heap)) {
|
| 675 |
+
$this->runFetchData();
|
| 676 |
}
|
| 677 |
$DB_loger->deleteLogKey('import_icecat_server_error_message_update');
|
| 678 |
$DB_loger->insetrtUpdateLogValue('icecatlive_enddate_update_product', date('Y-m-d H:i:s'));
|
| 679 |
} catch (Exception $e) {
|
| 680 |
$DB_loger->insetrtUpdateLogValue('import_icecat_server_error_message_update', $e->getMessage());
|
| 681 |
+
$this->loadUpdate(1, 0);
|
| 682 |
}
|
| 683 |
}
|
| 684 |
|
| 784 |
return '';
|
| 785 |
}
|
| 786 |
|
| 787 |
+
/**
|
| 788 |
+
* Runs function of fetch data
|
| 789 |
+
* @throws Exception
|
| 790 |
+
*/
|
| 791 |
+
public function runFetchData()
|
| 792 |
+
{
|
| 793 |
+
$DB_loger = Mage::helper('icecatlive/db');
|
| 794 |
+
$success = 0;
|
| 795 |
+
$failed = 0;
|
| 796 |
+
if (!empty($this->_heap)) {
|
| 797 |
+
foreach ($this->_heap as $ids) {
|
| 798 |
+
$this->_current_id = $ids;
|
| 799 |
+
try {
|
| 800 |
+
$result = $this->loadProductInfoIntoCache($ids, 1);
|
| 801 |
+
if ($result == false) {
|
| 802 |
+
$failed++;
|
| 803 |
+
$DB_loger->insetrtUpdateLogValue('icecatlive_error_imported_product', $failed);
|
| 804 |
+
} else {
|
| 805 |
+
$success++;
|
| 806 |
+
$DB_loger->insetrtUpdateLogValue('icecatlive_success_imported_product', $success);
|
| 807 |
+
}
|
| 808 |
+
$DB_loger->insetrtUpdateLogValue('icecatlive_full_icecat_product', $this->_cron_full_icecat_counter);
|
| 809 |
+
unset($this->_heap[$ids]);
|
| 810 |
+
} catch (Exception $e) {
|
| 811 |
+
$failed++;
|
| 812 |
+
$DB_loger->insetrtUpdateLogValue('icecatlive_error_imported_product', $failed);
|
| 813 |
+
unset($this->_heap[$ids]);
|
| 814 |
+
}
|
| 815 |
+
}
|
| 816 |
+
}
|
| 817 |
+
}
|
| 818 |
+
|
| 819 |
+
/**
|
| 820 |
+
* Fill $this->_heap property with products id`s to last it processed
|
| 821 |
+
*/
|
| 822 |
+
public function getEntityData()
|
| 823 |
+
{
|
| 824 |
+
$db_res = Mage::getSingleton('core/resource')->getConnection('core_write');
|
| 825 |
+
$product_onlynewproducts = Mage::getStoreConfig('icecat_root/icecat/product_onlynewproducts');
|
| 826 |
+
$tablePrefix = '';
|
| 827 |
+
$tPrefix = (array)Mage::getConfig()->getTablePrefix();
|
| 828 |
+
if (!empty($tPrefix)) {
|
| 829 |
+
$tablePrefix = $tPrefix[0];
|
| 830 |
+
}
|
| 831 |
+
$heap = array();
|
| 832 |
+
if (empty($this->_heap)) {
|
| 833 |
+
if ($_GET['update'] != 1) {
|
| 834 |
+
if (!$product_onlynewproducts) {
|
| 835 |
+
$query = "SELECT `entity_id` FROM `" . $tablePrefix . "catalog_product_entity`";
|
| 836 |
+
} else {
|
| 837 |
+
$query = "SELECT `entity_id` FROM `" . $tablePrefix . "catalog_product_entity` AS cpe
|
| 838 |
+
LEFT JOIN `" . $tablePrefix . "iceshop_icecatlive_noimport_products_id` AS iinpi
|
| 839 |
+
ON cpe.`entity_id` = iinpi.`prod_id`
|
| 840 |
+
WHERE iinpi.`prod_id` IS NULL";
|
| 841 |
+
}
|
| 842 |
+
$heap = $db_res->fetchAll($query);
|
| 843 |
+
} else {
|
| 844 |
+
if (!$product_onlynewproducts) {
|
| 845 |
+
$query = "SELECT `entity_id` FROM `" . $tablePrefix . "catalog_product_entity` LEFT JOIN `" . $tablePrefix . "iceshop_icecatlive_products_titles` ON entity_id = prod_id WHERE prod_id IS NULL";
|
| 846 |
+
} else {
|
| 847 |
+
$query = "SELECT `entity_id` FROM `" . $tablePrefix . "catalog_product_entity` AS cpe
|
| 848 |
+
LEFT JOIN `" . $tablePrefix . "iceshop_icecatlive_products_titles` AS iipt
|
| 849 |
+
ON cpe.`entity_id` = iipt.`prod_id`
|
| 850 |
+
LEFT JOIN `" . $tablePrefix . "iceshop_icecatlive_noimport_products_id` AS iinpi
|
| 851 |
+
ON iinpi.`prod_id` = cpe.`entity_id`
|
| 852 |
+
WHERE iipt.`prod_id` IS NULL AND iinpi.`prod_id` IS NULL1";
|
| 853 |
+
}
|
| 854 |
+
$heap = $db_res->fetchAll($query);
|
| 855 |
+
}
|
| 856 |
+
if (!empty($heap)) {
|
| 857 |
+
foreach ($heap as $key => $value) {
|
| 858 |
+
if (isset($value['entity_id'])) {
|
| 859 |
+
$this->_heap[$value['entity_id']] = $value['entity_id'];
|
| 860 |
+
}
|
| 861 |
+
}
|
| 862 |
+
}
|
| 863 |
+
}
|
| 864 |
+
}
|
| 865 |
+
|
| 866 |
}
|
| 867 |
|
| 868 |
?>
|
app/code/community/Iceshop/Icecatlive/Model/System/Config/Explanations.php
ADDED
|
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
class Iceshop_Icecatlive_Model_System_Config_Explanations
|
| 4 |
+
{
|
| 5 |
+
public function toOptionArray()
|
| 6 |
+
{
|
| 7 |
+
return array(
|
| 8 |
+
0 => base64_encode(Mage::getSingleton('adminhtml/url')->getUrl("adminhtml/icecatlive/explanations/"))
|
| 9 |
+
);
|
| 10 |
+
}
|
| 11 |
+
}
|
app/code/community/Iceshop/Icecatlive/controllers/Adminhtml/ImportdataController.php
CHANGED
|
@@ -13,4 +13,9 @@ class Iceshop_Icecatlive_Adminhtml_ImportdataController extends Mage_Adminhtml_C
|
|
| 13 |
sleep(6);
|
| 14 |
Mage::app()->getResponse()->setBody($result);
|
| 15 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 16 |
}
|
| 13 |
sleep(6);
|
| 14 |
Mage::app()->getResponse()->setBody($result);
|
| 15 |
}
|
| 16 |
+
|
| 17 |
+
protected function _isAllowed()
|
| 18 |
+
{
|
| 19 |
+
return Mage::getSingleton('admin/session')->isAllowed('system/config/icecat_root');
|
| 20 |
+
}
|
| 21 |
}
|
app/code/community/Iceshop/Icecatlive/controllers/Adminhtml/ImportproductController.php
CHANGED
|
@@ -9,4 +9,9 @@ class Iceshop_Icecatlive_Adminhtml_ImportproductController extends Mage_Adminhtm
|
|
| 9 |
$this->getLayout()->createBlock('icecatlive/adminhtml_product_list_grid')->toHtml()
|
| 10 |
);
|
| 11 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 12 |
}
|
| 9 |
$this->getLayout()->createBlock('icecatlive/adminhtml_product_list_grid')->toHtml()
|
| 10 |
);
|
| 11 |
}
|
| 12 |
+
|
| 13 |
+
protected function _isAllowed()
|
| 14 |
+
{
|
| 15 |
+
return Mage::getSingleton('admin/session')->isAllowed('system/config/icecat_root');
|
| 16 |
+
}
|
| 17 |
}
|
app/code/community/Iceshop/Icecatlive/controllers/Adminhtml/ImportproductinfoController.php
CHANGED
|
@@ -13,4 +13,9 @@ class Iceshop_Icecatlive_Adminhtml_ImportproductinfoController extends Mage_Admi
|
|
| 13 |
|
| 14 |
Mage::app()->getResponse()->setBody($result);
|
| 15 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 16 |
}
|
| 13 |
|
| 14 |
Mage::app()->getResponse()->setBody($result);
|
| 15 |
}
|
| 16 |
+
|
| 17 |
+
protected function _isAllowed()
|
| 18 |
+
{
|
| 19 |
+
return Mage::getSingleton('admin/session')->isAllowed('system/config/icecat_root');
|
| 20 |
+
}
|
| 21 |
}
|
app/code/community/Iceshop/Icecatlive/controllers/Adminhtml/ImportprogressController.php
CHANGED
|
@@ -16,4 +16,9 @@ class Iceshop_Icecatlive_Adminhtml_ImportprogressController extends Mage_Adminht
|
|
| 16 |
Mage::app()->getResponse()->setHeader('Content-type', 'application/json');
|
| 17 |
Mage::app()->getResponse()->setBody($importlogJson);
|
| 18 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 19 |
}
|
| 16 |
Mage::app()->getResponse()->setHeader('Content-type', 'application/json');
|
| 17 |
Mage::app()->getResponse()->setBody($importlogJson);
|
| 18 |
}
|
| 19 |
+
|
| 20 |
+
protected function _isAllowed()
|
| 21 |
+
{
|
| 22 |
+
return Mage::getSingleton('admin/session')->isAllowed('system/config/icecat_root');
|
| 23 |
+
}
|
| 24 |
}
|
app/code/community/Iceshop/Icecatlive/controllers/IcecatliveController.php
CHANGED
|
@@ -27,6 +27,7 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
| 27 |
//Problems Digest
|
| 28 |
$problems_digest = $checker->getExtensionProblemsDigest();
|
| 29 |
$problems = $problems_digest->getProblems();
|
|
|
|
| 30 |
?>
|
| 31 |
<div class="entry-edit" id="icecatlive-digest">
|
| 32 |
<div class="entry-edit-head collapseable">
|
|
@@ -142,7 +143,7 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
| 142 |
</div>
|
| 143 |
</div>
|
| 144 |
<?php
|
| 145 |
-
|
| 146 |
//Check module
|
| 147 |
$DB_loger = Mage::helper('icecatlive/db');
|
| 148 |
$import_info['startdate_imported_product'] = $DB_loger->getLogValue('icecatlive_startdate_imported_product');
|
|
@@ -1037,4 +1038,151 @@ class Iceshop_Icecatlive_IcecatliveController extends Mage_Adminhtml_Controller_
|
|
| 1037 |
|
| 1038 |
$this->_redirectUrl(Mage::helper("adminhtml")->getUrl("*/system_config/edit", array('section' => 'icecatlive_information')));
|
| 1039 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1040 |
}
|
| 27 |
//Problems Digest
|
| 28 |
$problems_digest = $checker->getExtensionProblemsDigest();
|
| 29 |
$problems = $problems_digest->getProblems();
|
| 30 |
+
if ($problems_digest->getCount() > 0) :
|
| 31 |
?>
|
| 32 |
<div class="entry-edit" id="icecatlive-digest">
|
| 33 |
<div class="entry-edit-head collapseable">
|
| 143 |
</div>
|
| 144 |
</div>
|
| 145 |
<?php
|
| 146 |
+
endif;
|
| 147 |
//Check module
|
| 148 |
$DB_loger = Mage::helper('icecatlive/db');
|
| 149 |
$import_info['startdate_imported_product'] = $DB_loger->getLogValue('icecatlive_startdate_imported_product');
|
| 1038 |
|
| 1039 |
$this->_redirectUrl(Mage::helper("adminhtml")->getUrl("*/system_config/edit", array('section' => 'icecatlive_information')));
|
| 1040 |
}
|
| 1041 |
+
|
| 1042 |
+
protected function _isAllowed()
|
| 1043 |
+
{
|
| 1044 |
+
return Mage::getSingleton('admin/session')->isAllowed('system/config/icecatlive_information');
|
| 1045 |
+
}
|
| 1046 |
+
|
| 1047 |
+
/**
|
| 1048 |
+
* Show explanation for setting
|
| 1049 |
+
* @return string;
|
| 1050 |
+
*/
|
| 1051 |
+
public function explanationsAction()
|
| 1052 |
+
{
|
| 1053 |
+
$content = '<table class="explanation_table">
|
| 1054 |
+
<tbody>
|
| 1055 |
+
<tr>
|
| 1056 |
+
<th><strong>Setting\'s name</strong></th>
|
| 1057 |
+
<th><strong>Description</strong></th>
|
| 1058 |
+
<th>Default value</th>
|
| 1059 |
+
<th>Note</th>
|
| 1060 |
+
</tr>
|
| 1061 |
+
<tr>
|
| 1062 |
+
<td colspan="3"><strong>Icecat Live Settings</strong></td>
|
| 1063 |
+
<td> </td>
|
| 1064 |
+
</tr>
|
| 1065 |
+
<tr>
|
| 1066 |
+
<td>Icecat User name</td>
|
| 1067 |
+
<td>Login used in your <a href="http://icecat.biz/" class="external-link"
|
| 1068 |
+
rel="nofollow">icecat.biz</a> account
|
| 1069 |
+
</td>
|
| 1070 |
+
<td style="text-align: center;" >-</td>
|
| 1071 |
+
<td> </td>
|
| 1072 |
+
</tr>
|
| 1073 |
+
<tr>
|
| 1074 |
+
<td>Icecat Password</td>
|
| 1075 |
+
<td>Password used in your <a href="http://icecat.biz/" class="external-link"
|
| 1076 |
+
rel="nofollow">icecat.biz</a> account
|
| 1077 |
+
</td>
|
| 1078 |
+
<td style="text-align: center;" >-</td>
|
| 1079 |
+
<td> </td>
|
| 1080 |
+
</tr>
|
| 1081 |
+
<tr>
|
| 1082 |
+
<td>Subscription level</td>
|
| 1083 |
+
<td>Subscription type of your <a href="http://icecat.biz/" class="external-link"
|
| 1084 |
+
rel="nofollow">icecat.biz</a> account
|
| 1085 |
+
</td>
|
| 1086 |
+
<td style="text-align: center;" >OpenIcecat XML</td>
|
| 1087 |
+
<td> </td>
|
| 1088 |
+
</tr>
|
| 1089 |
+
<tr>
|
| 1090 |
+
<td colspan="1" >Language</td>
|
| 1091 |
+
<td colspan="1" ><p>Define a language of Front-end displaying data</p></td>
|
| 1092 |
+
<td style="text-align: center;" colspan="1" >Use Store Locale</td>
|
| 1093 |
+
<td colspan="1" > </td>
|
| 1094 |
+
</tr>
|
| 1095 |
+
<tr>
|
| 1096 |
+
<td colspan="1" >MPN</td>
|
| 1097 |
+
<td colspan="1" ><p><span style="color: rgb(47,47,47);">The attribute to use for mapping</span></p></td>
|
| 1098 |
+
<td style="text-align: center;" colspan="1" >mpn</td>
|
| 1099 |
+
<td colspan="1" > </td>
|
| 1100 |
+
</tr>
|
| 1101 |
+
<tr>
|
| 1102 |
+
<td colspan="1" >Brand</td>
|
| 1103 |
+
<td colspan="1" ><span style="color: rgb(47,47,47);">The attribute to use for mapping</span>
|
| 1104 |
+
</td>
|
| 1105 |
+
<td style="text-align: center;" colspan="1" ><span style="color: rgb(0,0,0);">brand</span>
|
| 1106 |
+
</td>
|
| 1107 |
+
<td colspan="1" > </td>
|
| 1108 |
+
</tr>
|
| 1109 |
+
<tr>
|
| 1110 |
+
<td colspan="1" >GTIN</td>
|
| 1111 |
+
<td colspan="1" ><span style="color: rgb(47,47,47);">The attribute to use for mapping</span>
|
| 1112 |
+
</td>
|
| 1113 |
+
<td style="text-align: center;" colspan="1" >gtin</td>
|
| 1114 |
+
<td colspan="1" > </td>
|
| 1115 |
+
</tr>
|
| 1116 |
+
<tr>
|
| 1117 |
+
<td colspan="1" >Use Product Image from</td>
|
| 1118 |
+
<td colspan="1" >Use images from your Magento database or load from IceCat</td>
|
| 1119 |
+
<td style="text-align: center;" colspan="1" >From Icecat</td>
|
| 1120 |
+
<td colspan="1" > </td>
|
| 1121 |
+
</tr>
|
| 1122 |
+
<tr>
|
| 1123 |
+
<td colspan="1" >Show/Hide products not presented at icecat</td>
|
| 1124 |
+
<td colspan="1" ><p>Define the type of displaying for products</p></td>
|
| 1125 |
+
<td style="text-align: center;" colspan="1" >Show all products</td>
|
| 1126 |
+
<td colspan="1" > </td>
|
| 1127 |
+
</tr>
|
| 1128 |
+
<tr>
|
| 1129 |
+
<td colspan="1" >Use Short description from</td>
|
| 1130 |
+
<td colspan="1" ><p>Define the place of getting a short description</p></td>
|
| 1131 |
+
<td style="text-align: center;" colspan="1" >From Icecat</td>
|
| 1132 |
+
<td colspan="1" > </td>
|
| 1133 |
+
</tr>
|
| 1134 |
+
<tr>
|
| 1135 |
+
<td colspan="1" >Use Description from</td>
|
| 1136 |
+
<td colspan="1" ><p>Define the place of getting a description</p></td>
|
| 1137 |
+
<td style="text-align: center;" colspan="1" >From Icecat</td>
|
| 1138 |
+
<td colspan="1" > </td>
|
| 1139 |
+
</tr>
|
| 1140 |
+
<tr>
|
| 1141 |
+
<td colspan="1" >Use Product Name from</td>
|
| 1142 |
+
<td colspan="1" ><p>Define the place of getting a product name</p></td>
|
| 1143 |
+
<td style="text-align: center;" colspan="1" >From Icecat</td>
|
| 1144 |
+
<td colspan="1" > </td>
|
| 1145 |
+
</tr>
|
| 1146 |
+
<tr>
|
| 1147 |
+
<td colspan="1" >Not view attribute in product</td>
|
| 1148 |
+
<td colspan="1" ><p>List of attributes where you can select ones you don\'t want to be
|
| 1149 |
+
displayed</p></td>
|
| 1150 |
+
<td style="text-align: center;" colspan="1" >-</td>
|
| 1151 |
+
<td colspan="1" > </td>
|
| 1152 |
+
</tr>
|
| 1153 |
+
<tr>
|
| 1154 |
+
<td colspan="1" >Loading type:</td>
|
| 1155 |
+
<td colspan="1" ><p>Define the way of loading information on Front-end</p></td>
|
| 1156 |
+
<td style="text-align: center;" colspan="1" >From cache</td>
|
| 1157 |
+
<td colspan="1" > </td>
|
| 1158 |
+
</tr>
|
| 1159 |
+
<tr>
|
| 1160 |
+
<td>Import ONLY new products:</td>
|
| 1161 |
+
<td>Define a necessity of importing new products</td>
|
| 1162 |
+
<td style="text-align: center;" >No</td>
|
| 1163 |
+
<td> </td>
|
| 1164 |
+
</tr>
|
| 1165 |
+
<tr>
|
| 1166 |
+
<td>Full import data</td>
|
| 1167 |
+
<td> This is the button that activate a full import</td>
|
| 1168 |
+
<td style="text-align: center;" >-</td>
|
| 1169 |
+
<td> </td>
|
| 1170 |
+
</tr>
|
| 1171 |
+
<tr>
|
| 1172 |
+
<td colspan="1" >Update information on new products</td>
|
| 1173 |
+
<td colspan="1" > This is the button that activate updating process for new products
|
| 1174 |
+
</td>
|
| 1175 |
+
<td style="text-align: center;" colspan="1" >-</td>
|
| 1176 |
+
<td colspan="1" > </td>
|
| 1177 |
+
</tr>
|
| 1178 |
+
</tbody>
|
| 1179 |
+
</table>
|
| 1180 |
+
<style>
|
| 1181 |
+
.explanation_table, .explanation_table th, .explanation_table td {
|
| 1182 |
+
border: solid 1px black;
|
| 1183 |
+
}
|
| 1184 |
+
</style>
|
| 1185 |
+
';
|
| 1186 |
+
echo $content;
|
| 1187 |
+
}
|
| 1188 |
}
|
app/code/community/Iceshop/Icecatlive/controllers/ImageController.php
CHANGED
|
@@ -13,6 +13,11 @@ class Iceshop_Icecatlive_ImageController extends Mage_Adminhtml_Controller_Actio
|
|
| 13 |
{
|
| 14 |
$result = Mage::getModel('icecatlive/observer')->load();
|
| 15 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 16 |
}
|
| 17 |
|
| 18 |
?>
|
| 13 |
{
|
| 14 |
$result = Mage::getModel('icecatlive/observer')->load();
|
| 15 |
}
|
| 16 |
+
|
| 17 |
+
protected function _isAllowed()
|
| 18 |
+
{
|
| 19 |
+
return Mage::getSingleton('admin/session')->isAllowed('system/config/icecat_root');
|
| 20 |
+
}
|
| 21 |
}
|
| 22 |
|
| 23 |
?>
|
app/code/community/Iceshop/Icecatlive/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Iceshop_Icecatlive>
|
| 5 |
-
<version>1.7.
|
| 6 |
</Iceshop_Icecatlive>
|
| 7 |
</modules>
|
| 8 |
<default>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Iceshop_Icecatlive>
|
| 5 |
+
<version>1.7.11</version>
|
| 6 |
</Iceshop_Icecatlive>
|
| 7 |
</modules>
|
| 8 |
<default>
|
app/code/community/Iceshop/Icecatlive/etc/system.xml
CHANGED
|
@@ -25,6 +25,15 @@
|
|
| 25 |
<show_in_website>1</show_in_website>
|
| 26 |
<show_in_store>1</show_in_store>
|
| 27 |
<fields>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 28 |
<login translate="label">
|
| 29 |
<label>Icecat User name</label>
|
| 30 |
<frontend_type>text</frontend_type>
|
|
@@ -69,7 +78,7 @@
|
|
| 69 |
<show_in_store>1</show_in_store>
|
| 70 |
</sku_field>
|
| 71 |
<manufacturer translate="label">
|
| 72 |
-
<label>
|
| 73 |
<frontend_type>select</frontend_type>
|
| 74 |
<source_model>icecatlive/system_config_attributes</source_model>
|
| 75 |
<sort_order>50</sort_order>
|
|
@@ -78,7 +87,7 @@
|
|
| 78 |
<show_in_store>1</show_in_store>
|
| 79 |
</manufacturer>
|
| 80 |
<ean_code translate="label">
|
| 81 |
-
<label>
|
| 82 |
<frontend_type>select</frontend_type>
|
| 83 |
<source_model>icecatlive/system_config_attributes</source_model>
|
| 84 |
<sort_order>60</sort_order>
|
|
@@ -176,6 +185,16 @@
|
|
| 176 |
<show_in_website>1</show_in_website>
|
| 177 |
<show_in_store>1</show_in_store>
|
| 178 |
</update_data>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 179 |
</fields>
|
| 180 |
</icecat>
|
| 181 |
</groups>
|
| 25 |
<show_in_website>1</show_in_website>
|
| 26 |
<show_in_store>1</show_in_store>
|
| 27 |
<fields>
|
| 28 |
+
<explanation translate="label">
|
| 29 |
+
<label><![CDATA[<a id="icecatlive_explanation" target="_blank">Explanation</a>]]></label>
|
| 30 |
+
<comment><![CDATA[]]></comment>
|
| 31 |
+
<frontend_type>label</frontend_type>
|
| 32 |
+
<sort_order>9</sort_order>
|
| 33 |
+
<show_in_default>1</show_in_default>
|
| 34 |
+
<show_in_website>1</show_in_website>
|
| 35 |
+
<show_in_store>1</show_in_store>
|
| 36 |
+
</explanation>
|
| 37 |
<login translate="label">
|
| 38 |
<label>Icecat User name</label>
|
| 39 |
<frontend_type>text</frontend_type>
|
| 78 |
<show_in_store>1</show_in_store>
|
| 79 |
</sku_field>
|
| 80 |
<manufacturer translate="label">
|
| 81 |
+
<label>Brand</label>
|
| 82 |
<frontend_type>select</frontend_type>
|
| 83 |
<source_model>icecatlive/system_config_attributes</source_model>
|
| 84 |
<sort_order>50</sort_order>
|
| 87 |
<show_in_store>1</show_in_store>
|
| 88 |
</manufacturer>
|
| 89 |
<ean_code translate="label">
|
| 90 |
+
<label>GTIN</label>
|
| 91 |
<frontend_type>select</frontend_type>
|
| 92 |
<source_model>icecatlive/system_config_attributes</source_model>
|
| 93 |
<sort_order>60</sort_order>
|
| 185 |
<show_in_website>1</show_in_website>
|
| 186 |
<show_in_store>1</show_in_store>
|
| 187 |
</update_data>
|
| 188 |
+
<icecatlive_explanation_hidden translate="label comment">
|
| 189 |
+
<label></label>
|
| 190 |
+
<comment></comment>
|
| 191 |
+
<frontend_type>select</frontend_type>
|
| 192 |
+
<source_model>icecatlive/system_config_explanations</source_model>
|
| 193 |
+
<sort_order>90</sort_order>
|
| 194 |
+
<show_in_default>1</show_in_default>
|
| 195 |
+
<show_in_website>1</show_in_website>
|
| 196 |
+
<show_in_store>1</show_in_store>
|
| 197 |
+
</icecatlive_explanation_hidden>
|
| 198 |
</fields>
|
| 199 |
</icecat>
|
| 200 |
</groups>
|
app/code/community/Iceshop/Icecatlive/temp_log.txt
ADDED
|
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
icecatlive_process_hash_time: 1459327602.2986
|
| 2 |
+
icecatlive_startdate_imported_product: 2016-03-30 08:46:42
|
| 3 |
+
icecatlive_current_product_temp: 1
|
| 4 |
+
icecatlive_count_products_temp: 8
|
| 5 |
+
icecatlive_error_imported_product_temp: 1
|
| 6 |
+
icecatlive_error_imported_product: 1
|
| 7 |
+
icecatlive_success_imported_product:
|
| 8 |
+
icecatlive_full_icecat_product:
|
| 9 |
+
icecatlive_lastinsert_product_id: 316
|
| 10 |
+
icecatlive_enddate_imported_product: 2016-03-30 08:46:46
|
js/ICEshop/Icecatlive/script.js
CHANGED
|
@@ -29,6 +29,16 @@ jQuery(document).ready(function (jQuery) {
|
|
| 29 |
}).buildForm();
|
| 30 |
}
|
| 31 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 32 |
refreshIcecatliveSystemCheck();
|
| 33 |
|
| 34 |
buildIceshopInfo();
|
| 29 |
}).buildForm();
|
| 30 |
}
|
| 31 |
|
| 32 |
+
var request_url_explanations = jQuery('#icecat_root_icecat_icecatlive_explanation_hidden');
|
| 33 |
+
if(request_url_explanations.length>0){
|
| 34 |
+
var url_explanations = Base64.decode(request_url_explanations.find('option')[0].innerHTML);
|
| 35 |
+
var iceimport_explanation_length = jQuery(('#icecatlive_explanation')).length;
|
| 36 |
+
if(iceimport_explanation_length>0){
|
| 37 |
+
jQuery(('#icecatlive_explanation')).attr('href',url_explanations)
|
| 38 |
+
}
|
| 39 |
+
jQuery('#icecat_root_icecat_icecatlive_explanation_hidden').parents('tr').remove();
|
| 40 |
+
}
|
| 41 |
+
|
| 42 |
refreshIcecatliveSystemCheck();
|
| 43 |
|
| 44 |
buildIceshopInfo();
|
package.xml
CHANGED
|
@@ -1,20 +1,22 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
-
<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>
|
| 8 |
<extends/>
|
| 9 |
<summary>ICEcat to Magento Open Source Connector</summary>
|
| 10 |
-
<description>
|
| 11 |
<notes>Bugfix:
|
| 12 |
-
-
|
| 13 |
-
- Fix
|
|
|
|
|
|
|
| 14 |
<authors><author><name>IceShop</name><user>IceShop</user><email>support@iceshop.nl</email></author></authors>
|
| 15 |
-
<date>2016-01
|
| 16 |
-
<time>
|
| 17 |
-
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="icecatlive.xml" hash="d1654d4bcbc4f11b58b728d5c269c704"/></dir><dir name="template"><dir name="iceshop"><dir name="icecatlive"><file name="ajaxstatusimport.phtml" hash="6ee20aeea068459804688f6dcd60b14a"/><file name="notifications.phtml" hash="d52487d11efb1b849d7a21c700b29c0c"/></dir></dir></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="461ccd2fb4dc1a607e5e49687bb155fb"/></dir></dir></dir><dir name="template"><dir name="iceshop"><dir name="icecatlive"><file name="groupattributes.phtml" hash="2dfcc171fe017278ac114e04d7efc2d4"/></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Iceshop"><dir name="Icecatlive"><dir name="Block"><dir name="Adminhtml"><file name="Notifications.php" hash="96ee5a5a1cf91930070340f996ac7a05"/><dir name="Product"><dir name="List"><file name="Grid.php" hash="d3995cdc59adc76fe914bf5703330f8d"/></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="8ec0a0866e9f6201f0221ee0a01cf9e3"/><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="69acf758a4756c11c047b1079352c7fd"/><file name="Db.php" hash="8c13ac4d380a81bbb17e9b59873d502e"/><file name="Format.php" hash="ac13e6bb5cdc5919bfad215e1fca4a7b"/><file name="Getdata.php" hash="85dd7bf14c9b232ccf078a99241add1c"/><file name="Log.php" hash="
|
| 18 |
<compatible/>
|
| 19 |
-
<dependencies><required><php><min>5.2.0</min><max>
|
| 20 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
+
<name>ICEshop_IcecatLive</name>
|
| 4 |
+
<version>1.7.11</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v.3</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>ICEcat to Magento Open Source Connector</summary>
|
| 10 |
+
<description>ICEcat to Magento Open Source Connector</description>
|
| 11 |
<notes>Bugfix:
|
| 12 |
+
- Fix some problem with logging.
|
| 13 |
+
- Fix acl issue
|
| 14 |
+
- Fix problem digest displaying
|
| 15 |
+
- Fix cron functionality </notes>
|
| 16 |
<authors><author><name>IceShop</name><user>IceShop</user><email>support@iceshop.nl</email></author></authors>
|
| 17 |
+
<date>2016-04-01</date>
|
| 18 |
+
<time>08:47:04</time>
|
| 19 |
+
<contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="icecatlive.xml" hash="d1654d4bcbc4f11b58b728d5c269c704"/></dir><dir name="template"><dir name="iceshop"><dir name="icecatlive"><file name="ajaxstatusimport.phtml" hash="6ee20aeea068459804688f6dcd60b14a"/><file name="notifications.phtml" hash="d52487d11efb1b849d7a21c700b29c0c"/></dir></dir></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="461ccd2fb4dc1a607e5e49687bb155fb"/></dir></dir></dir><dir name="template"><dir name="iceshop"><dir name="icecatlive"><file name="groupattributes.phtml" hash="2dfcc171fe017278ac114e04d7efc2d4"/></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Iceshop"><dir name="Icecatlive"><dir name="Block"><dir name="Adminhtml"><file name="Notifications.php" hash="96ee5a5a1cf91930070340f996ac7a05"/><dir name="Product"><dir name="List"><file name="Grid.php" hash="d3995cdc59adc76fe914bf5703330f8d"/></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="8ec0a0866e9f6201f0221ee0a01cf9e3"/><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="69acf758a4756c11c047b1079352c7fd"/><file name="Db.php" hash="8c13ac4d380a81bbb17e9b59873d502e"/><file name="Format.php" hash="ac13e6bb5cdc5919bfad215e1fca4a7b"/><file name="Getdata.php" hash="85dd7bf14c9b232ccf078a99241add1c"/><file name="Log.php" hash="38189525ceeb940a5fe41b88d5c66013"/><file name="Output.php" hash="5698b83f62043e95c5f33d603ccbc03a"/><dir name="System"><file name="System.php" hash="cadc05533af5d11e8cff4423c92dd2cb"/><file name="Systemcheck.php" hash="dd516d0218600d8bfbfb70f54a43e338"/></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="d6eb2ba7bfb07c6000b84fb0b850b5f7"/><file name="Observer.php" hash="d85357e01ba385e651b91e45d2631707"/><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="Explanations.php" hash="e0449dd8466199eab1285117f1c99df9"/><file name="Iceshoplink.php" hash="bb4d7dc4f3756da8f5c0eb149eeb0f6b"/><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="903dfd409fa7bff401556128c2d60de4"/><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="92f163e1ec4224727104b68f71751f7d"/><file name="ImportproductController.php" hash="b50827ff7e3ee31c5181994c66b4b4a7"/><file name="ImportproductinfoController.php" hash="cf204551852727f93ff3481caa2bb9b8"/><file name="ImportprogressController.php" hash="6ac6fe3229946f4eb68d3f6638900d11"/></dir><file name="IcecatliveController.php" hash="7a1c68548e334025eb8b82e682957d39"/><file name="ImageController.php" hash="5c360227994816793de42a766d12f70f"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0c5b93621bc6abb059d8404ddf885a43"/><file name="config.xml" hash="680a7d323f58173d37c27e39f8a98beb"/><file name="system.xml" hash="4b8a343322a2a94e6814760fe6ff9a96"/></dir><dir name="sql"><dir name="icecatlive_setup"><file name="mysql4-install-1.7.7.php" hash="413c86249cc122868321be5724d2972c"/><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="mysql4-upgrade-1.7.4-1.7.5.php" hash="ea96aabef28765bc61b9dc429a10fcb1"/><file name="mysql4-upgrade-1.7.5-1.7.6.php" hash="413c86249cc122868321be5724d2972c"/><file name="mysql4-upgrade-1.7.6-1.7.7.php" hash="413c86249cc122868321be5724d2972c"/><file name="uninstall-old-version.php" hash="972d9c6dd3ac44ff4c309b7f23c62b83"/></dir></dir><file name="temp_log.txt" hash="787983e7093096b74691ff4579908839"/></dir></dir></target><target name="mage"><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><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="1acae953fdc5efc197be8da5889e3e6b"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Iceshop_Icecatlive.xml" hash="b91b60f0e20d399809be9ed0647cae93"/></dir></target></contents>
|
| 20 |
<compatible/>
|
| 21 |
+
<dependencies><required><php><min>5.2.0</min><max>7.0.2</max></php></required></dependencies>
|
| 22 |
</package>
|
