Version Notes
Channable Connect
Download this release
Release Info
| Developer | Magmodules |
| Extension | Magmodules_Channable |
| Version | 1.4.8 |
| Comparing to | |
| See all releases | |
Code changes from version 1.4.7 to 1.4.8
- app/code/community/Magmodules/Channable/Block/Adminhtml/Widget/Info/Info.php +6 -6
- app/code/community/Magmodules/Channable/Helper/Data.php +21 -9
- app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Attribute.php +1 -0
- app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Configurable.php +1 -1
- app/code/community/Magmodules/Channable/Model/Channable.php +19 -8
- app/code/community/Magmodules/Channable/Model/Common.php +49 -21
- app/code/community/Magmodules/Channable/etc/config.xml +1 -1
- package.xml +5 -5
app/code/community/Magmodules/Channable/Block/Adminhtml/Widget/Info/Info.php
CHANGED
|
@@ -30,19 +30,19 @@ class Magmodules_Channable_Block_Adminhtml_Widget_Info_Info extends Mage_Adminht
|
|
| 30 |
<br />
|
| 31 |
<table width="500px" border="0">
|
| 32 |
<tr>
|
| 33 |
-
<td width="58%">
|
| 34 |
<td width="42%"><a href="http://www.magentocommerce.com/magento-connect/developer/Magmodules" target="_blank">Magento Connect</a></td>
|
| 35 |
</tr>
|
| 36 |
<tr>
|
| 37 |
-
<td
|
| 38 |
-
<td><a href="
|
| 39 |
</tr>
|
| 40 |
<tr>
|
| 41 |
-
<td
|
| 42 |
-
<td
|
| 43 |
</tr>
|
| 44 |
<tr>
|
| 45 |
-
<td height="30"><strong>Read everything about the extension configuration in our <a href="http://www.magmodules.eu/help/channable-connect" target="_blank">Knowledgebase</a></strong>.</td>
|
| 46 |
<td> </td>
|
| 47 |
</tr>
|
| 48 |
</table>
|
| 30 |
<br />
|
| 31 |
<table width="500px" border="0">
|
| 32 |
<tr>
|
| 33 |
+
<td width="58%">More Extensions from Magmodules:</td>
|
| 34 |
<td width="42%"><a href="http://www.magentocommerce.com/magento-connect/developer/Magmodules" target="_blank">Magento Connect</a></td>
|
| 35 |
</tr>
|
| 36 |
<tr>
|
| 37 |
+
<td>For Help:</td>
|
| 38 |
+
<td><a href="https://www.magmodules.eu/support.html?ext=channable-connect">Visit our Support Page</a></td>
|
| 39 |
</tr>
|
| 40 |
<tr>
|
| 41 |
+
<td height="30">Visit Our Website:</td>
|
| 42 |
+
<td><a href="http://www.magmodules.eu" target="_blank">www.magmodules.eu</a></td>
|
| 43 |
</tr>
|
| 44 |
<tr>
|
| 45 |
+
<td height="30"><strong>Read everything about the extension configuration in our <a href="http://www.magmodules.eu/help/channable-connect#" target="_blank">Knowledgebase</a></strong>.</td>
|
| 46 |
<td> </td>
|
| 47 |
</tr>
|
| 48 |
</table>
|
app/code/community/Magmodules/Channable/Helper/Data.php
CHANGED
|
@@ -81,7 +81,7 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 81 |
$value = $this->getProductWeight($product_data, $config);
|
| 82 |
break;
|
| 83 |
case 'price':
|
| 84 |
-
$value = $this->getProductPrice($product_data, $config);
|
| 85 |
break;
|
| 86 |
case 'bundle':
|
| 87 |
$value = $this->getProductBundle($product_data, $config);
|
|
@@ -89,6 +89,9 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 89 |
case 'parent_id':
|
| 90 |
$value = $this->getProductData($parent, $data);
|
| 91 |
break;
|
|
|
|
|
|
|
|
|
|
| 92 |
case 'categories':
|
| 93 |
$value = $this->getProductCategories($product_data, $config);
|
| 94 |
break;
|
|
@@ -351,6 +354,11 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 351 |
}
|
| 352 |
}
|
| 353 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 354 |
public function getProductCategories($product, $config)
|
| 355 |
{
|
| 356 |
if(isset($config['category_data'])) {
|
|
@@ -420,7 +428,7 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 420 |
return $value;
|
| 421 |
}
|
| 422 |
|
| 423 |
-
public function getProductPrice($product, $config)
|
| 424 |
{
|
| 425 |
$price_data = array();
|
| 426 |
$price_markup = $this->getPriceMarkup($config);
|
|
@@ -455,7 +463,7 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 455 |
}
|
| 456 |
}
|
| 457 |
}
|
| 458 |
-
|
| 459 |
if(($product->getTypeId() == 'bundle') && ($price < 0.01)) {
|
| 460 |
$price = $this->getPriceBundle($product, $config['store_id']);
|
| 461 |
}
|
|
@@ -477,10 +485,7 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 477 |
$price_data['sales_price'] = number_format(($sales_price * $price_markup), 2, '.', '') . $currency;
|
| 478 |
}
|
| 479 |
|
| 480 |
-
|
| 481 |
-
return $price_data;
|
| 482 |
-
}
|
| 483 |
-
|
| 484 |
}
|
| 485 |
|
| 486 |
public function getPriceMarkup($config)
|
|
@@ -708,13 +713,16 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 708 |
$attributes = $product->getTypeInstance(true)->getConfigurableAttributes($product);
|
| 709 |
$att_prices = array();
|
| 710 |
$base_price = $product->getFinalPrice();
|
|
|
|
| 711 |
foreach ($attributes as $attribute){
|
| 712 |
$prices = $attribute->getPrices();
|
| 713 |
foreach ($prices as $price){
|
| 714 |
if ($price['is_percent']) {
|
| 715 |
$att_prices[$price['value_index']] = (float)(($price['pricing_value'] * $base_price / 100) * $config['markup']);
|
|
|
|
| 716 |
} else {
|
| 717 |
$att_prices[$price['value_index']] = (float)($price['pricing_value'] * $config['markup']);
|
|
|
|
| 718 |
}
|
| 719 |
}
|
| 720 |
}
|
|
@@ -722,13 +730,16 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 722 |
$simple_prices = array();
|
| 723 |
foreach($simple as $sProduct) {
|
| 724 |
$total_price = $base_price;
|
|
|
|
| 725 |
foreach($attributes as $attribute) {
|
| 726 |
$value = $sProduct->getData($attribute->getProductAttribute()->getAttributeCode());
|
| 727 |
if(isset($att_prices[$value])) {
|
| 728 |
$total_price += $att_prices[$value];
|
|
|
|
| 729 |
}
|
| 730 |
}
|
| 731 |
-
$type_prices[$sProduct->getEntityId()] = number_format(($total_price * $config['markup']), 2, '.', '')
|
|
|
|
| 732 |
}
|
| 733 |
}
|
| 734 |
}
|
|
@@ -785,10 +796,11 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 785 |
{
|
| 786 |
$suffix = Mage::getStoreConfig('catalog/seo/product_url_suffix', $storeId);
|
| 787 |
if(!empty($suffix)) {
|
| 788 |
-
if($suffix[0] != '.') {
|
| 789 |
$suffix = '.' . $suffix;
|
| 790 |
}
|
| 791 |
}
|
| 792 |
return $suffix;
|
| 793 |
}
|
|
|
|
| 794 |
}
|
| 81 |
$value = $this->getProductWeight($product_data, $config);
|
| 82 |
break;
|
| 83 |
case 'price':
|
| 84 |
+
$value = $this->getProductPrice($product_data, $config, $parent);
|
| 85 |
break;
|
| 86 |
case 'bundle':
|
| 87 |
$value = $this->getProductBundle($product_data, $config);
|
| 89 |
case 'parent_id':
|
| 90 |
$value = $this->getProductData($parent, $data);
|
| 91 |
break;
|
| 92 |
+
case 'attribute_set_id':
|
| 93 |
+
$value = $this->getAttributeSetName($product_data, $data);
|
| 94 |
+
break;
|
| 95 |
case 'categories':
|
| 96 |
$value = $this->getProductCategories($product_data, $config);
|
| 97 |
break;
|
| 354 |
}
|
| 355 |
}
|
| 356 |
|
| 357 |
+
public function getAttributeSetName($product, $data)
|
| 358 |
+
{
|
| 359 |
+
return Mage::getModel('eav/entity_attribute_set')->load($product->getAttributeSetId())->getAttributeSetName();
|
| 360 |
+
}
|
| 361 |
+
|
| 362 |
public function getProductCategories($product, $config)
|
| 363 |
{
|
| 364 |
if(isset($config['category_data'])) {
|
| 428 |
return $value;
|
| 429 |
}
|
| 430 |
|
| 431 |
+
public function getProductPrice($product, $config, $parent)
|
| 432 |
{
|
| 433 |
$price_data = array();
|
| 434 |
$price_markup = $this->getPriceMarkup($config);
|
| 463 |
}
|
| 464 |
}
|
| 465 |
}
|
| 466 |
+
|
| 467 |
if(($product->getTypeId() == 'bundle') && ($price < 0.01)) {
|
| 468 |
$price = $this->getPriceBundle($product, $config['store_id']);
|
| 469 |
}
|
| 485 |
$price_data['sales_price'] = number_format(($sales_price * $price_markup), 2, '.', '') . $currency;
|
| 486 |
}
|
| 487 |
|
| 488 |
+
return $price_data;
|
|
|
|
|
|
|
|
|
|
| 489 |
}
|
| 490 |
|
| 491 |
public function getPriceMarkup($config)
|
| 713 |
$attributes = $product->getTypeInstance(true)->getConfigurableAttributes($product);
|
| 714 |
$att_prices = array();
|
| 715 |
$base_price = $product->getFinalPrice();
|
| 716 |
+
$base_price_reg = $product->getPrice();
|
| 717 |
foreach ($attributes as $attribute){
|
| 718 |
$prices = $attribute->getPrices();
|
| 719 |
foreach ($prices as $price){
|
| 720 |
if ($price['is_percent']) {
|
| 721 |
$att_prices[$price['value_index']] = (float)(($price['pricing_value'] * $base_price / 100) * $config['markup']);
|
| 722 |
+
$att_prices[$price['value_index'] . '_reg'] = (float)(($price['pricing_value'] * $base_price_reg / 100) * $config['markup']);
|
| 723 |
} else {
|
| 724 |
$att_prices[$price['value_index']] = (float)($price['pricing_value'] * $config['markup']);
|
| 725 |
+
$att_prices[$price['value_index'] . '_reg'] = (float)($price['pricing_value'] * $config['markup']);
|
| 726 |
}
|
| 727 |
}
|
| 728 |
}
|
| 730 |
$simple_prices = array();
|
| 731 |
foreach($simple as $sProduct) {
|
| 732 |
$total_price = $base_price;
|
| 733 |
+
$total_price_reg = $base_price_reg;
|
| 734 |
foreach($attributes as $attribute) {
|
| 735 |
$value = $sProduct->getData($attribute->getProductAttribute()->getAttributeCode());
|
| 736 |
if(isset($att_prices[$value])) {
|
| 737 |
$total_price += $att_prices[$value];
|
| 738 |
+
$total_price_reg += $att_prices[$value . '_reg'];
|
| 739 |
}
|
| 740 |
}
|
| 741 |
+
$type_prices[$sProduct->getEntityId()] = number_format(($total_price * $config['markup']), 2, '.', '');
|
| 742 |
+
$type_prices[$sProduct->getEntityId() . '_reg'] = number_format(($total_price_reg * $config['markup']), 2, '.', '');
|
| 743 |
}
|
| 744 |
}
|
| 745 |
}
|
| 796 |
{
|
| 797 |
$suffix = Mage::getStoreConfig('catalog/seo/product_url_suffix', $storeId);
|
| 798 |
if(!empty($suffix)) {
|
| 799 |
+
if(($suffix[0] != '.') && ($suffix != '/')) {
|
| 800 |
$suffix = '.' . $suffix;
|
| 801 |
}
|
| 802 |
}
|
| 803 |
return $suffix;
|
| 804 |
}
|
| 805 |
+
|
| 806 |
}
|
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Attribute.php
CHANGED
|
@@ -24,6 +24,7 @@ class Magmodules_Channable_Model_Adminhtml_System_Config_Source_Attribute {
|
|
| 24 |
$optionArray[] = array('label' => Mage::helper('channable')->__('- Product ID'), 'value' => 'entity_id');
|
| 25 |
$optionArray[] = array('label' => Mage::helper('channable')->__('- Final Price'), 'value' => 'final_price');
|
| 26 |
$optionArray[] = array('label' => Mage::helper('channable')->__('- Product Type'), 'value' => 'type_id');
|
|
|
|
| 27 |
$backend_types = array('text', 'select', 'textarea', 'date', 'int', 'boolean', 'static', 'varchar', 'decimal');
|
| 28 |
$attributes = Mage::getResourceModel('catalog/product_attribute_collection')->setOrder('frontend_label','ASC')->addFieldToFilter('backend_type', $backend_types);
|
| 29 |
foreach($attributes as $attribute) {
|
| 24 |
$optionArray[] = array('label' => Mage::helper('channable')->__('- Product ID'), 'value' => 'entity_id');
|
| 25 |
$optionArray[] = array('label' => Mage::helper('channable')->__('- Final Price'), 'value' => 'final_price');
|
| 26 |
$optionArray[] = array('label' => Mage::helper('channable')->__('- Product Type'), 'value' => 'type_id');
|
| 27 |
+
$optionArray[] = array('label' => Mage::helper('channable')->__('- Attribute Set'), 'value' => 'attribute_set_id');
|
| 28 |
$backend_types = array('text', 'select', 'textarea', 'date', 'int', 'boolean', 'static', 'varchar', 'decimal');
|
| 29 |
$attributes = Mage::getResourceModel('catalog/product_attribute_collection')->setOrder('frontend_label','ASC')->addFieldToFilter('backend_type', $backend_types);
|
| 30 |
foreach($attributes as $attribute) {
|
app/code/community/Magmodules/Channable/Model/Adminhtml/System/Config/Source/Configurable.php
CHANGED
|
@@ -20,7 +20,7 @@ class Magmodules_Channable_Model_Adminhtml_System_Config_Source_Configurable {
|
|
| 20 |
public function toOptionArray()
|
| 21 |
{
|
| 22 |
$attributes = Mage::getModel("channable/channable")->getFeedAttributes();
|
| 23 |
-
$attributes_skip = array('id','parent_id','price');
|
| 24 |
$att = array();
|
| 25 |
foreach ($attributes as $key => $attribute) {
|
| 26 |
if(!in_array($key,$attributes_skip)) {
|
| 20 |
public function toOptionArray()
|
| 21 |
{
|
| 22 |
$attributes = Mage::getModel("channable/channable")->getFeedAttributes();
|
| 23 |
+
$attributes_skip = array('id','parent_id','price','stock','stock_status','visibility','status','type');
|
| 24 |
$att = array();
|
| 25 |
foreach ($attributes as $key => $attribute) {
|
| 26 |
if(!in_array($key,$attributes_skip)) {
|
app/code/community/Magmodules/Channable/Model/Channable.php
CHANGED
|
@@ -33,9 +33,11 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
|
|
| 33 |
{
|
| 34 |
$count = $this->getProducts($config, '', '', 'count');
|
| 35 |
foreach($products as $product) {
|
| 36 |
-
$parent_id = Mage::helper('channable')->getParentData($product, $config)
|
| 37 |
-
|
| 38 |
-
|
|
|
|
|
|
|
| 39 |
if($product_data = Mage::helper('channable')->getProductDataRow($product, $config, $parent)) {
|
| 40 |
foreach($product_data as $key => $value) {
|
| 41 |
if(!is_array($value)) { $product_row[$key] = $value; }
|
|
@@ -91,6 +93,8 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
|
|
| 91 |
$config['hide_no_stock'] = Mage::getStoreConfig('channable/filter/stock', $storeId);
|
| 92 |
$config['conf_enabled'] = Mage::getStoreConfig('channable/data/conf_enabled', $storeId);
|
| 93 |
$config['conf_fields'] = Mage::getStoreConfig('channable/data/conf_fields', $storeId);
|
|
|
|
|
|
|
| 94 |
$config['conf_switch_urls'] = Mage::getStoreConfig('channable/data/conf_switch_urls', $storeId);
|
| 95 |
$config['stock_manage'] = Mage::getStoreConfig('cataloginventory/item_options/manage_stock');
|
| 96 |
$config['use_qty_increments'] = Mage::getStoreConfig('cataloginventory/item_options/enable_qty_increments');
|
|
@@ -179,11 +183,19 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
|
|
| 179 |
return Mage::helper('channable')->addAttributeData($attributes, $config);
|
| 180 |
}
|
| 181 |
|
| 182 |
-
protected function getPrices($data, $conf_prices, $
|
| 183 |
{
|
| 184 |
$prices = array();
|
|
|
|
| 185 |
if(!empty($conf_prices[$id])) {
|
| 186 |
-
$
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 187 |
} else {
|
| 188 |
$prices['price'] = $data['price'];
|
| 189 |
$prices['special_price'] = '';
|
|
@@ -351,7 +363,7 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
|
|
| 351 |
{
|
| 352 |
$_extra = array();
|
| 353 |
if(!empty($product_data['price'])) {
|
| 354 |
-
if($_prices = $this->getPrices($product_data['price'], $prices, $product
|
| 355 |
$_extra = array_merge($_extra, $_prices);
|
| 356 |
}
|
| 357 |
}
|
|
@@ -419,5 +431,4 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
|
|
| 419 |
}
|
| 420 |
}
|
| 421 |
}
|
| 422 |
-
|
| 423 |
-
}
|
| 33 |
{
|
| 34 |
$count = $this->getProducts($config, '', '', 'count');
|
| 35 |
foreach($products as $product) {
|
| 36 |
+
if($parent_id = Mage::helper('channable')->getParentData($product, $config)) {
|
| 37 |
+
$parent = $this->loadParentProduct($parent_id, $config['store_id'], $config['parent_att']);
|
| 38 |
+
} else {
|
| 39 |
+
$parent = '';
|
| 40 |
+
}
|
| 41 |
if($product_data = Mage::helper('channable')->getProductDataRow($product, $config, $parent)) {
|
| 42 |
foreach($product_data as $key => $value) {
|
| 43 |
if(!is_array($value)) { $product_row[$key] = $value; }
|
| 93 |
$config['hide_no_stock'] = Mage::getStoreConfig('channable/filter/stock', $storeId);
|
| 94 |
$config['conf_enabled'] = Mage::getStoreConfig('channable/data/conf_enabled', $storeId);
|
| 95 |
$config['conf_fields'] = Mage::getStoreConfig('channable/data/conf_fields', $storeId);
|
| 96 |
+
$config['parent_att'] = $this->getParentAttributeSelection($config['conf_fields']);
|
| 97 |
+
|
| 98 |
$config['conf_switch_urls'] = Mage::getStoreConfig('channable/data/conf_switch_urls', $storeId);
|
| 99 |
$config['stock_manage'] = Mage::getStoreConfig('cataloginventory/item_options/manage_stock');
|
| 100 |
$config['use_qty_increments'] = Mage::getStoreConfig('cataloginventory/item_options/enable_qty_increments');
|
| 183 |
return Mage::helper('channable')->addAttributeData($attributes, $config);
|
| 184 |
}
|
| 185 |
|
| 186 |
+
protected function getPrices($data, $conf_prices, $product, $currency)
|
| 187 |
{
|
| 188 |
$prices = array();
|
| 189 |
+
$id = $product->getEntityId();
|
| 190 |
if(!empty($conf_prices[$id])) {
|
| 191 |
+
$conf_price = Mage::helper('tax')->getPrice($product, $conf_prices[$id], true);
|
| 192 |
+
$conf_price_reg = Mage::helper('tax')->getPrice($product, $conf_prices[$id . '_reg'], true);
|
| 193 |
+
if($conf_price_reg > $conf_price) {
|
| 194 |
+
$prices['special_price'] = number_format($conf_price, 2, '.', '') . ' ' . $currency;
|
| 195 |
+
$prices['price'] = number_format($conf_price_reg, 2, '.', '') . ' ' . $currency;
|
| 196 |
+
} else {
|
| 197 |
+
$prices['price'] = number_format($conf_price, 2, '.', '') . ' ' . $currency;
|
| 198 |
+
}
|
| 199 |
} else {
|
| 200 |
$prices['price'] = $data['price'];
|
| 201 |
$prices['special_price'] = '';
|
| 363 |
{
|
| 364 |
$_extra = array();
|
| 365 |
if(!empty($product_data['price'])) {
|
| 366 |
+
if($_prices = $this->getPrices($product_data['price'], $prices, $product, $config['currency'])) {
|
| 367 |
$_extra = array_merge($_extra, $_prices);
|
| 368 |
}
|
| 369 |
}
|
| 431 |
}
|
| 432 |
}
|
| 433 |
}
|
| 434 |
+
}
|
|
|
app/code/community/Magmodules/Channable/Model/Common.php
CHANGED
|
@@ -53,26 +53,7 @@ class Magmodules_Channable_Model_Common extends Mage_Core_Helper_Abstract {
|
|
| 53 |
|
| 54 |
if($type != 'count') {
|
| 55 |
|
| 56 |
-
|
| 57 |
-
$attributes = array();
|
| 58 |
-
$attributes[] = 'url_key';
|
| 59 |
-
$attributes[] = 'sku';
|
| 60 |
-
$attributes[] = 'price';
|
| 61 |
-
$attributes[] = 'final_price';
|
| 62 |
-
$attributes[] = 'price_model';
|
| 63 |
-
$attributes[] = 'price_type';
|
| 64 |
-
$attributes[] = 'special_price';
|
| 65 |
-
$attributes[] = 'special_from_date';
|
| 66 |
-
$attributes[] = 'special_to_date';
|
| 67 |
-
$attributes[] = 'type_id';
|
| 68 |
-
$attributes[] = 'tax_class_id';
|
| 69 |
-
$attributes[] = 'tax_percent';
|
| 70 |
-
$attributes[] = 'weight';
|
| 71 |
-
$attributes[] = 'visibility';
|
| 72 |
-
$attributes[] = 'type_id';
|
| 73 |
-
$attributes[] = 'image';
|
| 74 |
-
$attributes[] = 'small_image';
|
| 75 |
-
$attributes[] = 'thumbnail';
|
| 76 |
|
| 77 |
if(!empty($config['filter_exclude'])) {
|
| 78 |
$attributes[] = $config['filter_exclude'];
|
|
@@ -158,6 +139,8 @@ class Magmodules_Channable_Model_Common extends Mage_Core_Helper_Abstract {
|
|
| 158 |
$products = $collection->load();
|
| 159 |
|
| 160 |
} else {
|
|
|
|
|
|
|
| 161 |
|
| 162 |
if(!empty($config['filters'])) {
|
| 163 |
foreach($config['filters'] as $filter) {
|
|
@@ -199,5 +182,50 @@ class Magmodules_Channable_Model_Common extends Mage_Core_Helper_Abstract {
|
|
| 199 |
}
|
| 200 |
return $products;
|
| 201 |
}
|
| 202 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 203 |
}
|
| 53 |
|
| 54 |
if($type != 'count') {
|
| 55 |
|
| 56 |
+
$attributes = $this->getDefaultAttributes();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 57 |
|
| 58 |
if(!empty($config['filter_exclude'])) {
|
| 59 |
$attributes[] = $config['filter_exclude'];
|
| 139 |
$products = $collection->load();
|
| 140 |
|
| 141 |
} else {
|
| 142 |
+
|
| 143 |
+
$collection->addAttributeToFilter('type_id', array('neq' => 'configurable'));
|
| 144 |
|
| 145 |
if(!empty($config['filters'])) {
|
| 146 |
foreach($config['filters'] as $filter) {
|
| 182 |
}
|
| 183 |
return $products;
|
| 184 |
}
|
| 185 |
+
|
| 186 |
+
public function loadParentProduct($parentId, $storeId, $attributes)
|
| 187 |
+
{
|
| 188 |
+
$parent = Mage::getResourceModel('catalog/product_collection')
|
| 189 |
+
->setStore($storeId)
|
| 190 |
+
->addStoreFilter($storeId)
|
| 191 |
+
->addFinalPrice()
|
| 192 |
+
->addUrlRewrite()
|
| 193 |
+
->addAttributeToFilter('entity_id', $parentId)
|
| 194 |
+
->addAttributeToSelect(array_unique($attributes))
|
| 195 |
+
->getFirstItem();
|
| 196 |
+
return $parent;
|
| 197 |
+
}
|
| 198 |
+
|
| 199 |
+
public function getDefaultAttributes()
|
| 200 |
+
{
|
| 201 |
+
$attributes = array();
|
| 202 |
+
$attributes[] = 'url_key';
|
| 203 |
+
$attributes[] = 'url_path';
|
| 204 |
+
$attributes[] = 'sku';
|
| 205 |
+
$attributes[] = 'price';
|
| 206 |
+
$attributes[] = 'final_price';
|
| 207 |
+
$attributes[] = 'price_model';
|
| 208 |
+
$attributes[] = 'price_type';
|
| 209 |
+
$attributes[] = 'special_price';
|
| 210 |
+
$attributes[] = 'special_from_date';
|
| 211 |
+
$attributes[] = 'special_to_date';
|
| 212 |
+
$attributes[] = 'type_id';
|
| 213 |
+
$attributes[] = 'tax_class_id';
|
| 214 |
+
$attributes[] = 'tax_percent';
|
| 215 |
+
$attributes[] = 'weight';
|
| 216 |
+
$attributes[] = 'visibility';
|
| 217 |
+
$attributes[] = 'type_id';
|
| 218 |
+
$attributes[] = 'image';
|
| 219 |
+
$attributes[] = 'small_image';
|
| 220 |
+
$attributes[] = 'thumbnail';
|
| 221 |
+
$attributes[] = 'status';
|
| 222 |
+
return $attributes;
|
| 223 |
+
}
|
| 224 |
+
|
| 225 |
+
public function getParentAttributeSelection($atts)
|
| 226 |
+
{
|
| 227 |
+
$attributes = $this->getDefaultAttributes();
|
| 228 |
+
$extraAttributes = explode(',', $atts);
|
| 229 |
+
return array_merge($attributes, $extraAttributes);
|
| 230 |
+
}
|
| 231 |
}
|
app/code/community/Magmodules/Channable/etc/config.xml
CHANGED
|
@@ -19,7 +19,7 @@
|
|
| 19 |
<config>
|
| 20 |
<modules>
|
| 21 |
<Magmodules_Channable>
|
| 22 |
-
<version>1.4.
|
| 23 |
</Magmodules_Channable>
|
| 24 |
</modules>
|
| 25 |
<global>
|
| 19 |
<config>
|
| 20 |
<modules>
|
| 21 |
<Magmodules_Channable>
|
| 22 |
+
<version>1.4.8</version>
|
| 23 |
</Magmodules_Channable>
|
| 24 |
</modules>
|
| 25 |
<global>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Magmodules_Channable</name>
|
| 4 |
-
<version>1.4.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -10,9 +10,9 @@
|
|
| 10 |
<description>Magmodules_Channable</description>
|
| 11 |
<notes>Channable Connect</notes>
|
| 12 |
<authors><author><name>Magmodules</name><user>magmodules</user><email>info@magmodules.nl</email></author></authors>
|
| 13 |
-
<date>2016-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magecommunity"><dir name="Magmodules"><dir name="Channable"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Extra.php" hash="73e9ccaafacba4153962b37a8038c1ad"/><file name="Filter.php" hash="b64842b1a7bbe5b879468c034ade22bd"/><file name="Shipping.php" hash="7f15ea3b4fed5dcb20b37a78dd84cf5d"/></dir><dir name="Renderer"><file name="Select.php" hash="90a71e109a5f96bca26209c922a74961"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feeds.php" hash="e1127c67a55f163e0c17ae54111b4538"/><file name="Heading.php" hash="cf8597dec6375bbf35014e1a491605d6"/><file name="Note.php" hash="6d7c8056bf0418ab6008dd86ed1d93ca"/><file name="Token.php" hash="d6f89e494288e7d90525d8067a7bb1de"/><file name="Version.php" hash="7be709c731b412258539184c3c4e01dd"/></dir></dir></dir></dir><dir name="Widget"><dir name="Info"><file name="Info.php" hash="
|
| 16 |
<compatible/>
|
| 17 |
-
<dependencies><required><php><min>5.1.0</min><max>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Magmodules_Channable</name>
|
| 4 |
+
<version>1.4.8</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
|
| 7 |
<channel>community</channel>
|
| 10 |
<description>Magmodules_Channable</description>
|
| 11 |
<notes>Channable Connect</notes>
|
| 12 |
<authors><author><name>Magmodules</name><user>magmodules</user><email>info@magmodules.nl</email></author></authors>
|
| 13 |
+
<date>2016-11-05</date>
|
| 14 |
+
<time>09:10:34</time>
|
| 15 |
+
<contents><target name="magecommunity"><dir name="Magmodules"><dir name="Channable"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Extra.php" hash="73e9ccaafacba4153962b37a8038c1ad"/><file name="Filter.php" hash="b64842b1a7bbe5b879468c034ade22bd"/><file name="Shipping.php" hash="7f15ea3b4fed5dcb20b37a78dd84cf5d"/></dir><dir name="Renderer"><file name="Select.php" hash="90a71e109a5f96bca26209c922a74961"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feeds.php" hash="e1127c67a55f163e0c17ae54111b4538"/><file name="Heading.php" hash="cf8597dec6375bbf35014e1a491605d6"/><file name="Note.php" hash="6d7c8056bf0418ab6008dd86ed1d93ca"/><file name="Token.php" hash="d6f89e494288e7d90525d8067a7bb1de"/><file name="Version.php" hash="7be709c731b412258539184c3c4e01dd"/></dir></dir></dir></dir><dir name="Widget"><dir name="Info"><file name="Info.php" hash="4b52212fe588a6b04fdf39b7ca774e0a"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="e91b6cf953f21722fe79d539046e9b7a"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Extra.php" hash="6f888d0db7ed195c93a84748dd0a0c94"/><file name="Filter.php" hash="6609193f2296111f82276f09dc548be2"/><file name="Shipping.php" hash="6bea82000c4341ff2c5a9b05c992406c"/></dir></dir><dir name="Source"><file name="Action.php" hash="d655c22564992e02daccd9aac650358a"/><file name="Attribute.php" hash="b1752d5c43ba5cb0fc56369860d821ce"/><file name="Category.php" hash="bad1adc7e7890cfa5b83de0cd7a16835"/><file name="Categorytype.php" hash="7284943e01d7fe3346da7233ea827086"/><file name="Conditions.php" hash="aeb42d43282065fda73860f6a6d9da46"/><file name="Configurable.php" hash="dda4ec0248f90dabc248d6cea37dcbfb"/><file name="Countries.php" hash="ca6b39297950c9800059c34f7307d627"/><file name="Images.php" hash="d1c8294e6434fa3b0c03635b45964cc0"/><file name="Mainimage.php" hash="c85a8c05df234c188a0aff45a93a6b5c"/><file name="Name.php" hash="86af909704dc4f9320f2154d7c38ff4b"/><file name="Pricemodel.php" hash="359aeff8e7dc6099f55c493abed92a75"/><file name="Selectattribute.php" hash="5579305934bb5b51a443cc9525215975"/><file name="Shipping.php" hash="da2a147c1b6cf21a9f6f47e0456524dd"/><file name="Tax.php" hash="1b50c014c9e204e60cbbfcb883c76a9b"/><file name="Textattribute.php" hash="ea0a682c8a1aa0b51ee3e529c60fcbe8"/><file name="Type.php" hash="ffe6276231f501ac35943d3a83c77447"/><file name="Visibility.php" hash="c2e80831d9d8b5fc6cd642a590812a56"/><file name="Weight.php" hash="ba1e3c862ea2779c275d3d267b819435"/></dir></dir></dir></dir><file name="Channable.php" hash="b6220d27cf9dac27b86fd097f20216f8"/><file name="Common.php" hash="f1417b4f7e75d7961f45478942243a8a"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ChannableController.php" hash="e6110aeea10eca08da781c70206f6ed9"/></dir><file name="FeedController.php" hash="e2b205016ebdc274835165111b1ed7f9"/></dir><dir name="etc"><file name="adminhtml.xml" hash="f6d3e3176f08cd111e0655837c3365dd"/><file name="config.xml" hash="021eec145f6c0c1304b71b617eec82a6"/><file name="system.xml" hash="a899289abe17ad825fcac279374743c1"/></dir></dir></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Magmodules_Channable.csv" hash="b7f6f15de57f502ccf1c98e71006a823"/></dir><dir name="nl_NL"><file name="Magmodules_Channable.csv" hash="2eaec8847182a0005c575e0acf6e1c1d"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Channable.xml" hash="061032d718f1ddd64de211fc7133685c"/></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
+
<dependencies><required><php><min>5.1.0</min><max>7.9.9</max></php></required></dependencies>
|
| 18 |
</package>
|
