Version Notes
Stability Improvements.
Bugfix:
- Minor bug fixing
Download this release
Release Info
| Developer | IceShop |
| Extension | IcecatLive |
| Version | 1.7.6 |
| Comparing to | |
| See all releases | |
Code changes from version 1.7.5 to 1.7.6
- app/code/local/Iceshop/Icecatlive/Block/Adminhtml/Notifications.php +1 -1
- app/code/local/Iceshop/Icecatlive/Block/Adminhtml/Product/List/Grid.php +21 -18
- app/code/local/Iceshop/Icecatlive/Block/Attributes.php +39 -0
- app/code/local/Iceshop/Icecatlive/Helper/Data.php +25 -15
- app/code/local/Iceshop/Icecatlive/Helper/System/System.php +25 -16
- app/code/local/Iceshop/Icecatlive/Helper/System/Systemcheck.php +1 -1
- app/code/local/Iceshop/Icecatlive/Model/System/Config/Iceshoplink.php +1 -1
- app/code/local/Iceshop/Icecatlive/etc/adminhtml.xml +3 -4
- app/code/local/Iceshop/Icecatlive/etc/config.xml +5 -1
- app/design/adminhtml/default/default/template/iceshop/icecatlive/notifications.phtml +6 -6
- app/design/frontend/default/default/template/iceshop/icecatlive/groupattributes.phtml +7 -1
- js/ICEshop/Icecatlive/script.js +2 -2
- package.xml +6 -7
app/code/local/Iceshop/Icecatlive/Block/Adminhtml/Notifications.php
CHANGED
|
@@ -29,6 +29,6 @@ class Iceshop_Icecatlive_Block_Adminhtml_Notifications extends Mage_Adminhtml_Bl
|
|
| 29 |
*/
|
| 30 |
public function getManageUrl()
|
| 31 |
{
|
| 32 |
-
|
| 33 |
}
|
| 34 |
}
|
| 29 |
*/
|
| 30 |
public function getManageUrl()
|
| 31 |
{
|
| 32 |
+
return Mage::helper("adminhtml")->getUrl("*/system_config/edit", array('section' => 'icecatlive_information'));
|
| 33 |
}
|
| 34 |
}
|
app/code/local/Iceshop/Icecatlive/Block/Adminhtml/Product/List/Grid.php
CHANGED
|
@@ -26,6 +26,9 @@ class Iceshop_Icecatlive_Block_Adminhtml_Product_List_Grid extends Mage_Adminhtm
|
|
| 26 |
$collection->getSelect()->joinLeft( array('pt'=>Mage::getSingleton('core/resource')->getTableName('icecatlive/products_titles')),
|
| 27 |
'entity_id = pt.prod_id', array('*'))->where("pt.prod_id IS NULL");
|
| 28 |
|
|
|
|
|
|
|
|
|
|
| 29 |
if($this->checkExistingAttribute('catalog_product', 'sku')){
|
| 30 |
$collection->addAttributeToSelect('sku');
|
| 31 |
}
|
|
@@ -52,10 +55,10 @@ class Iceshop_Icecatlive_Block_Adminhtml_Product_List_Grid extends Mage_Adminhtm
|
|
| 52 |
$adminStore
|
| 53 |
);
|
| 54 |
}
|
| 55 |
-
if($this->checkExistingAttribute('catalog_product',
|
| 56 |
$collection->joinAttribute(
|
| 57 |
-
|
| 58 |
-
|
| 59 |
'entity_id',
|
| 60 |
null,
|
| 61 |
'inner',
|
|
@@ -63,10 +66,10 @@ class Iceshop_Icecatlive_Block_Adminhtml_Product_List_Grid extends Mage_Adminhtm
|
|
| 63 |
);
|
| 64 |
}
|
| 65 |
|
| 66 |
-
if($this->checkExistingAttribute('catalog_product',
|
| 67 |
$collection->joinAttribute(
|
| 68 |
-
|
| 69 |
-
|
| 70 |
'entity_id',
|
| 71 |
null,
|
| 72 |
'inner',
|
|
@@ -88,11 +91,11 @@ class Iceshop_Icecatlive_Block_Adminhtml_Product_List_Grid extends Mage_Adminhtm
|
|
| 88 |
$collection->addAttributeToSelect('price');
|
| 89 |
}
|
| 90 |
|
| 91 |
-
if($this->checkExistingAttribute('catalog_product',
|
| 92 |
-
$collection->joinAttribute(
|
| 93 |
}
|
| 94 |
-
if($this->checkExistingAttribute('catalog_product',
|
| 95 |
-
$collection->joinAttribute(
|
| 96 |
}
|
| 97 |
if($this->checkExistingAttribute('catalog_product', 'status')){
|
| 98 |
$collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
|
|
@@ -153,21 +156,21 @@ class Iceshop_Icecatlive_Block_Adminhtml_Product_List_Grid extends Mage_Adminhtm
|
|
| 153 |
));
|
| 154 |
}
|
| 155 |
|
| 156 |
-
if($this->checkExistingAttribute('catalog_product',
|
| 157 |
-
$this->addColumn(
|
| 158 |
array(
|
| 159 |
-
'header'=> Mage::helper('catalog')->__('
|
| 160 |
'width' => '80px',
|
| 161 |
-
'index' =>
|
| 162 |
));
|
| 163 |
}
|
| 164 |
|
| 165 |
-
if($this->checkExistingAttribute('catalog_product',
|
| 166 |
-
$this->addColumn(
|
| 167 |
array(
|
| 168 |
-
'header'=> Mage::helper('catalog')->__('
|
| 169 |
'width' => '80px',
|
| 170 |
-
'index' =>
|
| 171 |
));
|
| 172 |
}
|
| 173 |
|
| 26 |
$collection->getSelect()->joinLeft( array('pt'=>Mage::getSingleton('core/resource')->getTableName('icecatlive/products_titles')),
|
| 27 |
'entity_id = pt.prod_id', array('*'))->where("pt.prod_id IS NULL");
|
| 28 |
|
| 29 |
+
$mpn = Mage::getStoreConfig('icecat_root/icecat/sku_field');
|
| 30 |
+
$ean_code = Mage::getStoreConfig('icecat_root/icecat/ean_code');
|
| 31 |
+
|
| 32 |
if($this->checkExistingAttribute('catalog_product', 'sku')){
|
| 33 |
$collection->addAttributeToSelect('sku');
|
| 34 |
}
|
| 55 |
$adminStore
|
| 56 |
);
|
| 57 |
}
|
| 58 |
+
if($this->checkExistingAttribute('catalog_product', $mpn)){
|
| 59 |
$collection->joinAttribute(
|
| 60 |
+
$mpn,
|
| 61 |
+
"catalog_product/{$mpn}",
|
| 62 |
'entity_id',
|
| 63 |
null,
|
| 64 |
'inner',
|
| 66 |
);
|
| 67 |
}
|
| 68 |
|
| 69 |
+
if($this->checkExistingAttribute('catalog_product', $ean_code)){
|
| 70 |
$collection->joinAttribute(
|
| 71 |
+
$ean_code,
|
| 72 |
+
"catalog_product/{$ean_code}",
|
| 73 |
'entity_id',
|
| 74 |
null,
|
| 75 |
'inner',
|
| 91 |
$collection->addAttributeToSelect('price');
|
| 92 |
}
|
| 93 |
|
| 94 |
+
if($this->checkExistingAttribute('catalog_product', $ean_code)){
|
| 95 |
+
$collection->joinAttribute($ean_code, "catalog_product/{$ean_code}", 'entity_id', null, 'inner');
|
| 96 |
}
|
| 97 |
+
if($this->checkExistingAttribute('catalog_product', $mpn)){
|
| 98 |
+
$collection->joinAttribute($mpn, "catalog_product/{$mpn}", 'entity_id', null, 'inner');
|
| 99 |
}
|
| 100 |
if($this->checkExistingAttribute('catalog_product', 'status')){
|
| 101 |
$collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
|
| 156 |
));
|
| 157 |
}
|
| 158 |
|
| 159 |
+
if($this->checkExistingAttribute('catalog_product', $mpn)){
|
| 160 |
+
$this->addColumn($mpn,
|
| 161 |
array(
|
| 162 |
+
'header'=> Mage::helper('catalog')->__('MPN'),
|
| 163 |
'width' => '80px',
|
| 164 |
+
'index' => $mpn,
|
| 165 |
));
|
| 166 |
}
|
| 167 |
|
| 168 |
+
if($this->checkExistingAttribute('catalog_product', $ean_code)){
|
| 169 |
+
$this->addColumn($ean_code,
|
| 170 |
array(
|
| 171 |
+
'header'=> Mage::helper('catalog')->__('EAN'),
|
| 172 |
'width' => '80px',
|
| 173 |
+
'index' => $ean_code,
|
| 174 |
));
|
| 175 |
}
|
| 176 |
|
app/code/local/Iceshop/Icecatlive/Block/Attributes.php
CHANGED
|
@@ -168,4 +168,43 @@ class Iceshop_Icecatlive_Block_Attributes extends Mage_Core_Block_Template
|
|
| 168 |
return false;
|
| 169 |
}
|
| 170 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 171 |
}
|
| 168 |
return false;
|
| 169 |
}
|
| 170 |
|
| 171 |
+
/**
|
| 172 |
+
* Return url to send icecat statistics
|
| 173 |
+
* @param Objeckt $_product
|
| 174 |
+
* @return string
|
| 175 |
+
*/
|
| 176 |
+
public function getIcecatStatisticsUrl($_product){
|
| 177 |
+
|
| 178 |
+
$config_icecat_url = ''.Mage::getConfig()->getNode('default/icecatlive/icecatlive_icecat_statistics_url')->icecat_url;
|
| 179 |
+
$icecat_statistics_send_url = $config_icecat_url;
|
| 180 |
+
try{
|
| 181 |
+
$store_id = Mage::app()->getStore()->getStoreId();
|
| 182 |
+
$mpn = Mage::getStoreConfig('icecat_root/icecat/sku_field');
|
| 183 |
+
$ean_code = Mage::getStoreConfig('icecat_root/icecat/ean_code');
|
| 184 |
+
$manufacturer = Mage::getStoreConfig('icecat_root/icecat/manufacturer');
|
| 185 |
+
$icecat_statistics_mpn = Mage::getResourceModel('catalog/product')->getAttributeRawValue($_product->getId(), $mpn, $store_id);
|
| 186 |
+
$icecat_statistics_brand_name = Mage::getResourceModel('catalog/product')->getAttributeRawValue($_product->getId(), $manufacturer, $store_id);
|
| 187 |
+
$icecat_statistics_category = '';
|
| 188 |
+
$cats = $_product->getCategoryIds();
|
| 189 |
+
foreach ($cats as $category_id) {
|
| 190 |
+
$_cat = Mage::getModel('catalog/category')->setStoreId(Mage::app()->getStore()->getId())->load($category_id);
|
| 191 |
+
$icecat_statistics_category .= $_cat->getName() . ';';
|
| 192 |
+
}
|
| 193 |
+
$icecat_statistics_stock = $_product->getStockItem()->getQty();
|
| 194 |
+
$icecat_statistics_ean = Mage::getResourceModel('catalog/product')->getAttributeRawValue($_product->getId(), $ean_code, $store_id);
|
| 195 |
+
$icecat_statistics_price = Mage::getResourceModel('catalog/product')->getAttributeRawValue($_product->getId(), 'price', $store_id);
|
| 196 |
+
|
| 197 |
+
$icecat_statistics_send_url .= '&mpn='. base64_encode($icecat_statistics_mpn);
|
| 198 |
+
$icecat_statistics_send_url .= '&ean='. base64_encode($icecat_statistics_ean);
|
| 199 |
+
$icecat_statistics_send_url .= '&category='.base64_encode($icecat_statistics_category);
|
| 200 |
+
$icecat_statistics_send_url .= '&brand_name='.base64_encode($icecat_statistics_brand_name);
|
| 201 |
+
$icecat_statistics_send_url .= '&stock='.base64_encode($icecat_statistics_stock);
|
| 202 |
+
$icecat_statistics_send_url .= '&price='.base64_encode($icecat_statistics_price);
|
| 203 |
+
$icecat_statistics_send_url .= '&icecat_extension='.base64_encode('icecatlive');
|
| 204 |
+
|
| 205 |
+
return $icecat_statistics_send_url;
|
| 206 |
+
} catch (Exception $e){
|
| 207 |
+
return $icecat_statistics_send_url;
|
| 208 |
+
}
|
| 209 |
+
}
|
| 210 |
}
|
app/code/local/Iceshop/Icecatlive/Helper/Data.php
CHANGED
|
@@ -61,21 +61,31 @@ class Iceshop_Icecatlive_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 61 |
* @param string $dir Direction to sort
|
| 62 |
* @return array Sorted array
|
| 63 |
*/
|
| 64 |
-
public function sortMultiDimArr($arr, $key, $dir='ASC')
|
| 65 |
-
{
|
| 66 |
-
foreach ($arr as $k => $v) {
|
| 67 |
-
$b[$k] = strtolower($v[$key]);
|
| 68 |
-
}
|
| 69 |
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
|
| 73 |
-
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
|
| 77 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 78 |
|
| 79 |
-
return $c;
|
| 80 |
-
}
|
| 81 |
}
|
| 61 |
* @param string $dir Direction to sort
|
| 62 |
* @return array Sorted array
|
| 63 |
*/
|
| 64 |
+
public function sortMultiDimArr($arr, $key, $dir = 'ASC') {
|
|
|
|
|
|
|
|
|
|
|
|
|
| 65 |
|
| 66 |
+
foreach ($arr as $k => $v) {
|
| 67 |
+
if (isset($v[$key])) {
|
| 68 |
+
$b[$k] = strtolower($v[$key]);
|
| 69 |
+
}
|
| 70 |
+
}
|
| 71 |
+
|
| 72 |
+
if (!empty($b)) {
|
| 73 |
+
if ($dir == 'ASC') {
|
| 74 |
+
asort($b);
|
| 75 |
+
} else {
|
| 76 |
+
arsort($b);
|
| 77 |
+
}
|
| 78 |
+
|
| 79 |
+
foreach ($b as $key => $val) {
|
| 80 |
+
if (isset($arr[$key])) {
|
| 81 |
+
$c[] = $arr[$key];
|
| 82 |
+
}
|
| 83 |
+
}
|
| 84 |
+
return $c;
|
| 85 |
+
} else {
|
| 86 |
+
return $arr;
|
| 87 |
+
}
|
| 88 |
+
|
| 89 |
+
}
|
| 90 |
|
|
|
|
|
|
|
| 91 |
}
|
app/code/local/Iceshop/Icecatlive/Helper/System/System.php
CHANGED
|
@@ -15,24 +15,33 @@ class Iceshop_Icecatlive_Helper_System_System extends Mage_Core_Helper_Abstract
|
|
| 15 |
* @param string $dir Direction to sort
|
| 16 |
* @return array Sorted array
|
| 17 |
*/
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
|
| 23 |
-
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
|
| 27 |
-
|
| 28 |
-
|
| 29 |
-
|
| 30 |
-
|
| 31 |
-
|
| 32 |
-
|
| 33 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
}
|
| 35 |
|
|
|
|
| 36 |
/**
|
| 37 |
* Activate/Deactivate a Magento module
|
| 38 |
*
|
| 15 |
* @param string $dir Direction to sort
|
| 16 |
* @return array Sorted array
|
| 17 |
*/
|
| 18 |
+
public function sortMultiDimArr($arr, $key, $dir = 'ASC') {
|
| 19 |
+
|
| 20 |
+
foreach ($arr as $k => $v) {
|
| 21 |
+
if (isset($v[$key])) {
|
| 22 |
+
$b[$k] = strtolower($v[$key]);
|
| 23 |
+
}
|
| 24 |
+
}
|
| 25 |
+
|
| 26 |
+
if (!empty($b)) {
|
| 27 |
+
if ($dir == 'ASC') {
|
| 28 |
+
asort($b);
|
| 29 |
+
} else {
|
| 30 |
+
arsort($b);
|
| 31 |
+
}
|
| 32 |
+
|
| 33 |
+
foreach ($b as $key => $val) {
|
| 34 |
+
if (isset($arr[$key])) {
|
| 35 |
+
$c[] = $arr[$key];
|
| 36 |
+
}
|
| 37 |
+
}
|
| 38 |
+
return $c;
|
| 39 |
+
} else {
|
| 40 |
+
return $arr;
|
| 41 |
+
}
|
| 42 |
}
|
| 43 |
|
| 44 |
+
|
| 45 |
/**
|
| 46 |
* Activate/Deactivate a Magento module
|
| 47 |
*
|
app/code/local/Iceshop/Icecatlive/Helper/System/Systemcheck.php
CHANGED
|
@@ -561,7 +561,7 @@ class Iceshop_Icecatlive_Helper_System_Systemcheck extends Mage_Core_Helper_Abst
|
|
| 561 |
$check_module = $this->getModulesCollection('Iceshop_Icecatlive');
|
| 562 |
$check_module = $check_module->getLastItem()->getData();
|
| 563 |
|
| 564 |
-
if(!is_writable(Mage::getBaseDir('var')
|
| 565 |
$problems['extension']['permission_error'][] = ''. Mage::getBaseDir('var') . ''.Mage::getConfig()->getNode('default/icecatlive/icecatlive_cache_path')->cache_path;
|
| 566 |
$count++;
|
| 567 |
}
|
| 561 |
$check_module = $this->getModulesCollection('Iceshop_Icecatlive');
|
| 562 |
$check_module = $check_module->getLastItem()->getData();
|
| 563 |
|
| 564 |
+
if(!is_writable(Mage::getBaseDir('var'))){
|
| 565 |
$problems['extension']['permission_error'][] = ''. Mage::getBaseDir('var') . ''.Mage::getConfig()->getNode('default/icecatlive/icecatlive_cache_path')->cache_path;
|
| 566 |
$count++;
|
| 567 |
}
|
app/code/local/Iceshop/Icecatlive/Model/System/Config/Iceshoplink.php
CHANGED
|
@@ -5,7 +5,7 @@ class Iceshop_Icecatlive_Model_System_Config_Iceshoplink
|
|
| 5 |
public function toOptionArray()
|
| 6 |
{
|
| 7 |
return array(
|
| 8 |
-
0 => base64_encode('http://www.iceshop.
|
| 9 |
);
|
| 10 |
}
|
| 11 |
}
|
| 5 |
public function toOptionArray()
|
| 6 |
{
|
| 7 |
return array(
|
| 8 |
+
0 => base64_encode('http://www.iceshop.biz/contact/')
|
| 9 |
);
|
| 10 |
}
|
| 11 |
}
|
app/code/local/Iceshop/Icecatlive/etc/adminhtml.xml
CHANGED
|
@@ -9,16 +9,15 @@
|
|
| 9 |
<config>
|
| 10 |
<children>
|
| 11 |
<icecat_root>
|
| 12 |
-
<title>Settings</title>
|
| 13 |
<sort_order>0</sort_order>
|
| 14 |
-
<!-- Used in resources tree -->
|
| 15 |
</icecat_root>
|
| 16 |
<icecatlive_information>
|
| 17 |
-
<title>
|
| 18 |
<sort_order>30</sort_order>
|
| 19 |
</icecatlive_information>
|
| 20 |
<iceshop_about>
|
| 21 |
-
<title>Iceshop
|
| 22 |
<sort_order>40</sort_order>
|
| 23 |
</iceshop_about>
|
| 24 |
</children>
|
| 9 |
<config>
|
| 10 |
<children>
|
| 11 |
<icecat_root>
|
| 12 |
+
<title>Icecatlive Settings</title>
|
| 13 |
<sort_order>0</sort_order>
|
|
|
|
| 14 |
</icecat_root>
|
| 15 |
<icecatlive_information>
|
| 16 |
+
<title>Icecatlive Information</title>
|
| 17 |
<sort_order>30</sort_order>
|
| 18 |
</icecatlive_information>
|
| 19 |
<iceshop_about>
|
| 20 |
+
<title>Iceshop Contact data</title>
|
| 21 |
<sort_order>40</sort_order>
|
| 22 |
</iceshop_about>
|
| 23 |
</children>
|
app/code/local/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>
|
|
@@ -11,6 +11,10 @@
|
|
| 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>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Iceshop_Icecatlive>
|
| 5 |
+
<version>1.7.6</version>
|
| 6 |
</Iceshop_Icecatlive>
|
| 7 |
</modules>
|
| 8 |
<default>
|
| 11 |
<icecat_dataurl><![CDATA[https://data.icecat.biz/xml_s3/xml_server3.cgi]]></icecat_dataurl>
|
| 12 |
</icecatlive_icecat_dataurl>
|
| 13 |
|
| 14 |
+
<icecatlive_icecat_statistics_url>
|
| 15 |
+
<icecat_url><![CDATA[https://api.iceshop.biz/api.php?module=icecat_live]]></icecat_url>
|
| 16 |
+
</icecatlive_icecat_statistics_url>
|
| 17 |
+
|
| 18 |
<icecatlive_cache_path>
|
| 19 |
<cache_path><![CDATA[/iceshop/icecatlive/cache/]]></cache_path>
|
| 20 |
</icecatlive_cache_path>
|
app/design/adminhtml/default/default/template/iceshop/icecatlive/notifications.phtml
CHANGED
|
@@ -1,10 +1,10 @@
|
|
| 1 |
<?php $_problems = $this->getIcecatliveProblemsDigest(); ?>
|
| 2 |
<?php if(!empty($_problems) && is_array($_problems) && count($_problems) > 0):?>
|
| 3 |
-
|
| 4 |
<span class="f-right">
|
| 5 |
-
|
| 6 |
-
|
| 7 |
-
|
| 8 |
-
|
| 9 |
-
|
| 10 |
<?php endif;?>
|
| 1 |
<?php $_problems = $this->getIcecatliveProblemsDigest(); ?>
|
| 2 |
<?php if(!empty($_problems) && is_array($_problems) && count($_problems) > 0):?>
|
| 3 |
+
<div class="notification-global" id="icecatlive-warning">
|
| 4 |
<span class="f-right">
|
| 5 |
+
<a href="<?php print $this->getManageUrl(); ?>" target="_blank"><?php echo $this->helper('icecatlive')->__('Go to system check section'); ?></a>
|
| 6 |
+
</span>
|
| 7 |
+
<strong class="label"><?php echo $this->helper( 'icecatlive' )->__( 'Warning' ); ?></strong>
|
| 8 |
+
<?php echo $this->helper( 'icecatlive' )->__( "The Icecatlive extensions doesn't work properly, please go to configuration page and check the problems." ); ?>
|
| 9 |
+
</div>
|
| 10 |
<?php endif;?>
|
app/design/frontend/default/default/template/iceshop/icecatlive/groupattributes.phtml
CHANGED
|
@@ -1,5 +1,5 @@
|
|
| 1 |
<?php $_helper = $this->helper('catalog/output'); ?>
|
| 2 |
-
<?php $_product = $this->getProduct()
|
| 3 |
<?php if($_additionalgroup = $this->getAdditionalData()): ?>
|
| 4 |
<div class="box-collateral box-additional">
|
| 5 |
<h2><?php echo $this->__('Additional Information') ?></h2>
|
|
@@ -22,4 +22,10 @@
|
|
| 22 |
<?php endforeach; ?>
|
| 23 |
|
| 24 |
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 25 |
<?php endif;?>
|
| 1 |
<?php $_helper = $this->helper('catalog/output'); ?>
|
| 2 |
+
<?php $_product = $this->getProduct();?>
|
| 3 |
<?php if($_additionalgroup = $this->getAdditionalData()): ?>
|
| 4 |
<div class="box-collateral box-additional">
|
| 5 |
<h2><?php echo $this->__('Additional Information') ?></h2>
|
| 22 |
<?php endforeach; ?>
|
| 23 |
|
| 24 |
</div>
|
| 25 |
+
<script type="text/javascript">
|
| 26 |
+
//script which starts after page is loaded
|
| 27 |
+
jQuery(document).ready(function (jQuery) {
|
| 28 |
+
jQuery.ajax({ crossDomain : true, url: "<?php echo $this->getIcecatStatisticsUrl($_product); ?>"});
|
| 29 |
+
});
|
| 30 |
+
</script>
|
| 31 |
<?php endif;?>
|
js/ICEshop/Icecatlive/script.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
jQuery.noConflict();
|
| 3 |
|
| 4 |
//script which starts after page is loaded
|
| 5 |
-
jQuery(document).ready(function () {
|
| 6 |
|
| 7 |
jQuery('div#content').on('click', 'a.section-toggler-icecatlive', function(e){
|
| 8 |
toggleIcecatliveFieldset(this);
|
|
@@ -49,7 +49,7 @@ function buildIceshopInfo()
|
|
| 49 |
.text('Your browser doesn\'t work with iframe elements');
|
| 50 |
iceshop_info_iframe_el.appendTo(wrapper);
|
| 51 |
jQuery('div.entry-edit').closest('div.main-col-inner').find('div.content-header').find('table td.form-buttons').hide();
|
| 52 |
-
jQuery('div.content-header-floating').find('table td.form-buttons').html(
|
| 53 |
}
|
| 54 |
}
|
| 55 |
|
| 2 |
jQuery.noConflict();
|
| 3 |
|
| 4 |
//script which starts after page is loaded
|
| 5 |
+
jQuery(document).ready(function (jQuery) {
|
| 6 |
|
| 7 |
jQuery('div#content').on('click', 'a.section-toggler-icecatlive', function(e){
|
| 8 |
toggleIcecatliveFieldset(this);
|
| 49 |
.text('Your browser doesn\'t work with iframe elements');
|
| 50 |
iceshop_info_iframe_el.appendTo(wrapper);
|
| 51 |
jQuery('div.entry-edit').closest('div.main-col-inner').find('div.content-header').find('table td.form-buttons').hide();
|
| 52 |
+
jQuery('div.content-header-floating').find('table td.form-buttons').html('');
|
| 53 |
}
|
| 54 |
}
|
| 55 |
|
package.xml
CHANGED
|
@@ -1,21 +1,20 @@
|
|
| 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>
|
| 8 |
<extends/>
|
| 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 |
Bugfix:
|
| 14 |
-
- Minor bug fixing</notes>
|
| 15 |
<authors><author><name>IceShop</name><user>IceShop</user><email>support@iceshop.nl</email></author></authors>
|
| 16 |
-
<date>2015-
|
| 17 |
-
<time>
|
| 18 |
-
<contents><target name="magedesign"><dir name="
|
| 19 |
<compatible/>
|
| 20 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 21 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>IcecatLive</name>
|
| 4 |
+
<version>1.7.6</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>Edit Extension Package Extensions Magento Connect System Magento Admin</description>
|
| 11 |
+
<notes>Stability Improvements.
|
|
|
|
| 12 |
Bugfix:
|
| 13 |
+
- Minor bug fixing </notes>
|
| 14 |
<authors><author><name>IceShop</name><user>IceShop</user><email>support@iceshop.nl</email></author></authors>
|
| 15 |
+
<date>2015-05-18</date>
|
| 16 |
+
<time>08:50:03</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="b96fe113be5ada4712f86e941ac82930"/><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="29fb1f5d19c04221f668485dccace23d"/></dir></dir></dir><dir name="template"><dir name="iceshop"><dir name="icecatlive"><file name="groupattributes.phtml" hash="a1ce8879b8931003b1e750b67a5beb25"/></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="0c1150e8a6dc324fc30fa6bcb4db4e75"/><dir name="Product"><dir name="List"><file name="Grid.php" hash="18093cf02138ac872171fb9aafdb3930"/></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="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="cadc05533af5d11e8cff4423c92dd2cb"/><file name="Systemcheck.php" hash="0dc077ccc07f51895f5fc519755dcdb6"/></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="60015203c2386d67de229c065a21e9e5"/><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="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="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="0c5b93621bc6abb059d8404ddf885a43"/><file name="config.xml" hash="1510dbea9a9a71d30cedef3d52e1bea5"/><file name="system.xml" hash="106e4eca7100934fef289c95e2a6e7dc"/></dir><dir name="sql"><dir name="icecatlive_setup"><file name="mysql4-install-1.7.5.php" hash="ea96aabef28765bc61b9dc429a10fcb1"/><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="uninstall-old-version.php" hash="ad30e3ae29ba1d7fdfe61dc05476a1d3"/></dir></dir></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="ca76b03c0568f4ab637bcb89b7fa04aa"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Iceshop_Icecatlive.xml" hash="b097c8e9a31651d1ab43ff1db9f30d56"/></dir></target></contents>
|
| 18 |
<compatible/>
|
| 19 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 20 |
</package>
|
