Version Notes
Magmodules_Sooqr
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Magmodules_Sooqr |
| Version | 1.1.1 |
| Comparing to | |
| See all releases | |
Code changes from version 1.1.0 to 1.1.1
- app/code/community/Magmodules/Sooqr/Block/Adminhtml/System/Config/Form/Field/Feeds.php +1 -1
- app/code/community/Magmodules/Sooqr/Block/Adminhtml/System/Config/Form/Field/Version.php +1 -3
- app/code/community/Magmodules/Sooqr/Block/Adminhtml/Widget/Info/Info.php +6 -2
- app/code/community/Magmodules/Sooqr/Model/Adminhtml/System/Config/Backend/Design/Filter.php +12 -8
- app/code/community/Magmodules/Sooqr/Model/Sooqr.php +11 -3
- app/code/community/Magmodules/Sooqr/controllers/Adminhtml/SooqrController.php +1 -1
- app/code/community/Magmodules/Sooqr/etc/config.xml +1 -1
- package.xml +6 -6
app/code/community/Magmodules/Sooqr/Block/Adminhtml/System/Config/Form/Field/Feeds.php
CHANGED
|
@@ -19,7 +19,7 @@ class Magmodules_Sooqr_Block_Adminhtml_System_Config_Form_Field_Feeds extends M
|
|
| 19 |
|
| 20 |
public function render(Varien_Data_Form_Element_Abstract $element)
|
| 21 |
{
|
| 22 |
-
$store_ids = Mage::helper('sooqr')->getStoreIds('
|
| 23 |
$html_feedlinks = '';
|
| 24 |
foreach($store_ids as $storeId) {
|
| 25 |
$generate_url = $this->getUrl('*/sooqr/generateFeed/store_id/' . $storeId);
|
| 19 |
|
| 20 |
public function render(Varien_Data_Form_Element_Abstract $element)
|
| 21 |
{
|
| 22 |
+
$store_ids = Mage::helper('sooqr')->getStoreIds('sooqr_connect/generate/enabled');
|
| 23 |
$html_feedlinks = '';
|
| 24 |
foreach($store_ids as $storeId) {
|
| 25 |
$generate_url = $this->getUrl('*/sooqr/generateFeed/store_id/' . $storeId);
|
app/code/community/Magmodules/Sooqr/Block/Adminhtml/System/Config/Form/Field/Version.php
CHANGED
|
@@ -19,9 +19,7 @@ class Magmodules_Sooqr_Block_Adminhtml_System_Config_Form_Field_Version extends
|
|
| 19 |
|
| 20 |
public function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
|
| 21 |
{
|
| 22 |
-
|
| 23 |
-
$modulesArray = (array)$modules;
|
| 24 |
-
return $modulesArray['Magmodules_Sooqr']->version;
|
| 25 |
}
|
| 26 |
|
| 27 |
}
|
| 19 |
|
| 20 |
public function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
|
| 21 |
{
|
| 22 |
+
return Mage::getConfig()->getNode()->modules->Magmodules_Sooqr->version;
|
|
|
|
|
|
|
| 23 |
}
|
| 24 |
|
| 25 |
}
|
app/code/community/Magmodules/Sooqr/Block/Adminhtml/Widget/Info/Info.php
CHANGED
|
@@ -21,7 +21,11 @@ class Magmodules_Sooqr_Block_Adminhtml_Widget_Info_Info extends Mage_Adminhtml_B
|
|
| 21 |
{
|
| 22 |
$account_id = Mage::getStoreConfig('sooqr_connect/general/account_id');
|
| 23 |
$api_key = Mage::getStoreConfig('sooqr_connect/general/api_key');
|
| 24 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 25 |
<h4>About Magmodules.eu</h4>
|
| 26 |
<p>We are a Magento only E-commerce Agency located in the Netherlands and we developed this extension in association with Sooqr.<br>
|
| 27 |
<br />
|
|
@@ -63,7 +67,7 @@ class Magmodules_Sooqr_Block_Adminhtml_Widget_Info_Info extends Mage_Adminhtml_B
|
|
| 63 |
|
| 64 |
if(Mage::getStoreConfig('catalog/frontend/flat_catalog_product')) {
|
| 65 |
$store_id = Mage::helper('sooqr')->getStoreIdConfig();
|
| 66 |
-
$non_flat_attributes = Mage::helper('sooqr')->checkFlatCatalog(Mage::getModel("sooqr/sooqr")->getFeedAttributes($store_id));
|
| 67 |
if(count($non_flat_attributes) > 0) {
|
| 68 |
$html .= '<div id="messages"><ul class="messages"><li class="error-msg"><ul><li><span>';
|
| 69 |
$html .= $this->__('Warning: The following used attribute(s) were not found in the flat catalog: %s. This can result in empty data or higher resource usage. Click <a href="%s">here</a> to add these to the flat catalog. ', implode($non_flat_attributes, ', '), $this->getUrl('*/sooqr/addToFlat'));
|
| 21 |
{
|
| 22 |
$account_id = Mage::getStoreConfig('sooqr_connect/general/account_id');
|
| 23 |
$api_key = Mage::getStoreConfig('sooqr_connect/general/api_key');
|
| 24 |
+
$magento_version = Mage::getVersion();
|
| 25 |
+
$module_version = Mage::getConfig()->getNode()->modules->Magmodules_Feedbackcompany->version;
|
| 26 |
+
$logo_link = '//www.magmodules.eu/logo/sooqr/' . $module_version . '/' . $magento_version . '/logo.png';
|
| 27 |
+
|
| 28 |
+
$html = '<div style="background:url(\'' . $logo_link . '\') no-repeat scroll 15px center #EAF0EE;border:1px solid #CCCCCC;margin-bottom:10px;padding:10px 5px 5px 200px;">
|
| 29 |
<h4>About Magmodules.eu</h4>
|
| 30 |
<p>We are a Magento only E-commerce Agency located in the Netherlands and we developed this extension in association with Sooqr.<br>
|
| 31 |
<br />
|
| 67 |
|
| 68 |
if(Mage::getStoreConfig('catalog/frontend/flat_catalog_product')) {
|
| 69 |
$store_id = Mage::helper('sooqr')->getStoreIdConfig();
|
| 70 |
+
$non_flat_attributes = Mage::helper('sooqr')->checkFlatCatalog(Mage::getModel("sooqr/sooqr")->getFeedAttributes($store_id, 'flatcheck'));
|
| 71 |
if(count($non_flat_attributes) > 0) {
|
| 72 |
$html .= '<div id="messages"><ul class="messages"><li class="error-msg"><ul><li><span>';
|
| 73 |
$html .= $this->__('Warning: The following used attribute(s) were not found in the flat catalog: %s. This can result in empty data or higher resource usage. Click <a href="%s">here</a> to add these to the flat catalog. ', implode($non_flat_attributes, ', '), $this->getUrl('*/sooqr/addToFlat'));
|
app/code/community/Magmodules/Sooqr/Model/Adminhtml/System/Config/Backend/Design/Filter.php
CHANGED
|
@@ -10,7 +10,7 @@
|
|
| 10 |
* @category Magmodules
|
| 11 |
* @package Magmodules_Sooqr
|
| 12 |
* @author Magmodules <info@magmodules.eu>
|
| 13 |
-
* @copyright Copyright (c)
|
| 14 |
* @license http://www.magmodules.eu/license-agreement/
|
| 15 |
* =============================================================
|
| 16 |
*/
|
|
@@ -24,17 +24,21 @@ class Magmodules_Sooqr_Model_Adminhtml_System_Config_Backend_Design_Filter exten
|
|
| 24 |
unset($value['__empty']);
|
| 25 |
if(count($value)) {
|
| 26 |
$value = $this->orderData($value, 'attribute');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 27 |
$keys = array();
|
| 28 |
for($i=0; $i < count($value); $i++){
|
| 29 |
$keys[] = 'filter_' . uniqid();
|
| 30 |
}
|
| 31 |
-
foreach($value as $key => $field){
|
| 32 |
-
$attribute = Mage::getModel('eav/entity_attribute')->loadByCode('catalog_product', $field['attribute']);
|
| 33 |
-
$value[$key]['attribute'] = $field['attribute'];
|
| 34 |
-
$value[$key]['condition'] = $field['condition'];
|
| 35 |
-
$value[$key]['value'] = $field['value'];
|
| 36 |
-
$value[$key]['type'] = $attribute->getFrontendInput();
|
| 37 |
-
}
|
| 38 |
$value = array_combine($keys, array_values($value));
|
| 39 |
}
|
| 40 |
}
|
| 10 |
* @category Magmodules
|
| 11 |
* @package Magmodules_Sooqr
|
| 12 |
* @author Magmodules <info@magmodules.eu>
|
| 13 |
+
* @copyright Copyright (c) 2016 (http://www.magmodules.eu)
|
| 14 |
* @license http://www.magmodules.eu/license-agreement/
|
| 15 |
* =============================================================
|
| 16 |
*/
|
| 24 |
unset($value['__empty']);
|
| 25 |
if(count($value)) {
|
| 26 |
$value = $this->orderData($value, 'attribute');
|
| 27 |
+
foreach($value as $key => $field){
|
| 28 |
+
if(!empty($field['attribute']) && !empty($field['condition']) && !empty($field['value'])) {
|
| 29 |
+
$attribute = Mage::getModel('eav/entity_attribute')->loadByCode('catalog_product', $field['attribute']);
|
| 30 |
+
$value[$key]['attribute'] = $field['attribute'];
|
| 31 |
+
$value[$key]['condition'] = $field['condition'];
|
| 32 |
+
$value[$key]['value'] = $field['value'];
|
| 33 |
+
$value[$key]['type'] = $attribute->getFrontendInput();
|
| 34 |
+
} else {
|
| 35 |
+
unset($value[$key]);
|
| 36 |
+
}
|
| 37 |
+
}
|
| 38 |
$keys = array();
|
| 39 |
for($i=0; $i < count($value); $i++){
|
| 40 |
$keys[] = 'filter_' . uniqid();
|
| 41 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 42 |
$value = array_combine($keys, array_values($value));
|
| 43 |
}
|
| 44 |
}
|
app/code/community/Magmodules/Sooqr/Model/Sooqr.php
CHANGED
|
@@ -60,7 +60,7 @@ class Magmodules_Sooqr_Model_Sooqr extends Magmodules_Sooqr_Model_Common {
|
|
| 60 |
}
|
| 61 |
}
|
| 62 |
|
| 63 |
-
public function getFeedConfig($storeId)
|
| 64 |
{
|
| 65 |
|
| 66 |
$config = array();
|
|
@@ -103,7 +103,7 @@ class Magmodules_Sooqr_Model_Sooqr extends Magmodules_Sooqr_Model_Common {
|
|
| 103 |
$config['use_tax'] = $feed->getTaxUsage($config);
|
| 104 |
|
| 105 |
// FIELD & CATEGORY DATA
|
| 106 |
-
$config['field'] = $this->getFeedAttributes($storeId, $config);
|
| 107 |
$config['category_data'] = $feed->getCategoryData($config, $storeId);
|
| 108 |
|
| 109 |
if($config['image_resize'] == 'fixed') {
|
|
@@ -115,7 +115,7 @@ class Magmodules_Sooqr_Model_Sooqr extends Magmodules_Sooqr_Model_Common {
|
|
| 115 |
return $config;
|
| 116 |
}
|
| 117 |
|
| 118 |
-
public function getFeedAttributes($storeId = 0, $config = '')
|
| 119 |
{
|
| 120 |
$attributes = array();
|
| 121 |
$attributes['id'] = array('label' => 'id', 'source' => Mage::getStoreConfig('sooqr_connect/products/id_attribute', $storeId));
|
|
@@ -140,6 +140,14 @@ class Magmodules_Sooqr_Model_Sooqr extends Magmodules_Sooqr_Model_Common {
|
|
| 140 |
}
|
| 141 |
}
|
| 142 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 143 |
return Mage::helper('sooqr')->addAttributeData($attributes, $config);
|
| 144 |
}
|
| 145 |
|
| 60 |
}
|
| 61 |
}
|
| 62 |
|
| 63 |
+
public function getFeedConfig($storeId, $type = 'xml')
|
| 64 |
{
|
| 65 |
|
| 66 |
$config = array();
|
| 103 |
$config['use_tax'] = $feed->getTaxUsage($config);
|
| 104 |
|
| 105 |
// FIELD & CATEGORY DATA
|
| 106 |
+
$config['field'] = $this->getFeedAttributes($storeId, $type, $config);
|
| 107 |
$config['category_data'] = $feed->getCategoryData($config, $storeId);
|
| 108 |
|
| 109 |
if($config['image_resize'] == 'fixed') {
|
| 115 |
return $config;
|
| 116 |
}
|
| 117 |
|
| 118 |
+
public function getFeedAttributes($storeId = 0, $type = 'xml', $config = '')
|
| 119 |
{
|
| 120 |
$attributes = array();
|
| 121 |
$attributes['id'] = array('label' => 'id', 'source' => Mage::getStoreConfig('sooqr_connect/products/id_attribute', $storeId));
|
| 140 |
}
|
| 141 |
}
|
| 142 |
|
| 143 |
+
if($type == 'flatcheck') {
|
| 144 |
+
if($filters = @unserialize(Mage::getStoreConfig('sooqr_connect/products/advanced', $storeId))) {
|
| 145 |
+
foreach($filters as $filter) {
|
| 146 |
+
$attributes[$filter['attribute']] = array('label' => $filter['attribute'], 'source' => $filter['attribute']);
|
| 147 |
+
}
|
| 148 |
+
}
|
| 149 |
+
}
|
| 150 |
+
|
| 151 |
return Mage::helper('sooqr')->addAttributeData($attributes, $config);
|
| 152 |
}
|
| 153 |
|
app/code/community/Magmodules/Sooqr/controllers/Adminhtml/SooqrController.php
CHANGED
|
@@ -19,7 +19,7 @@ class Magmodules_Sooqr_Adminhtml_SooqrController extends Mage_Adminhtml_Controll
|
|
| 19 |
|
| 20 |
public function generateFeedAction($store_id = '')
|
| 21 |
{
|
| 22 |
-
if(Mage::getStoreConfig('
|
| 23 |
$store_id = $this->getRequest()->getParam('store_id');
|
| 24 |
if(!empty($store_id)) {
|
| 25 |
$time_start = microtime(true);
|
| 19 |
|
| 20 |
public function generateFeedAction($store_id = '')
|
| 21 |
{
|
| 22 |
+
if(Mage::getStoreConfig('sooqr_connect/general/enabled')) {
|
| 23 |
$store_id = $this->getRequest()->getParam('store_id');
|
| 24 |
if(!empty($store_id)) {
|
| 25 |
$time_start = microtime(true);
|
app/code/community/Magmodules/Sooqr/etc/config.xml
CHANGED
|
@@ -19,7 +19,7 @@
|
|
| 19 |
<config>
|
| 20 |
<modules>
|
| 21 |
<Magmodules_Sooqr>
|
| 22 |
-
<version>1.1.
|
| 23 |
</Magmodules_Sooqr>
|
| 24 |
</modules>
|
| 25 |
<global>
|
| 19 |
<config>
|
| 20 |
<modules>
|
| 21 |
<Magmodules_Sooqr>
|
| 22 |
+
<version>1.1.1</version>
|
| 23 |
</Magmodules_Sooqr>
|
| 24 |
</modules>
|
| 25 |
<global>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Magmodules_Sooqr</name>
|
| 4 |
-
<version>1.1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -9,10 +9,10 @@
|
|
| 9 |
<summary>Magmodules_Sooqr</summary>
|
| 10 |
<description>Magmodules_Sooqr</description>
|
| 11 |
<notes>Magmodules_Sooqr</notes>
|
| 12 |
-
<authors><author><name>Magmodules</name><user>
|
| 13 |
-
<date>2016-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magecommunity"><dir name="Magmodules"><dir name="Sooqr"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Extra.php" hash="e583284820c631015ed78c131bf3cfa8"/><file name="Filter.php" hash="e21c1f53da21d4f3afbfe7691efce06e"/></dir><dir name="Renderer"><file name="Select.php" hash="69d71d66aaf7b842ef482affd484ec48"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feeds.php" hash="
|
| 16 |
<compatible/>
|
| 17 |
-
<dependencies
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Magmodules_Sooqr</name>
|
| 4 |
+
<version>1.1.1</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
|
| 7 |
<channel>community</channel>
|
| 9 |
<summary>Magmodules_Sooqr</summary>
|
| 10 |
<description>Magmodules_Sooqr</description>
|
| 11 |
<notes>Magmodules_Sooqr</notes>
|
| 12 |
+
<authors><author><name>Magmodules</name><user>auto-converted</user><email>info@magmodules.nl</email></author></authors>
|
| 13 |
+
<date>2016-05-17</date>
|
| 14 |
+
<time>07:39:38</time>
|
| 15 |
+
<contents><target name="magecommunity"><dir name="Magmodules"><dir name="Sooqr"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Extra.php" hash="e583284820c631015ed78c131bf3cfa8"/><file name="Filter.php" hash="e21c1f53da21d4f3afbfe7691efce06e"/></dir><dir name="Renderer"><file name="Select.php" hash="69d71d66aaf7b842ef482affd484ec48"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feeds.php" hash="29007ed679b14e737b5dd784fc0eb668"/><file name="Heading.php" hash="a89db4f294f9c9e6785745163b1aed5f"/><file name="Note.php" hash="f131e40d8a0f4ed2e444d9e692a91ed5"/><file name="Version.php" hash="5832a42f30122977420d722683211f66"/></dir></dir></dir></dir><dir name="Widget"><dir name="Info"><file name="Info.php" hash="f0b3c0b7e2085f46df42e8f524016d61"/></dir></dir></dir><file name="Search.php" hash="ac26f28b9b19908e75a6631a89000a21"/></dir><dir name="Helper"><file name="Data.php" hash="5619979b0ae8095993849780373bf330"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Extra.php" hash="3e262b80ccc673e415bf51bf172c72d4"/><file name="Filter.php" hash="e6fac56290f6d0d7be78553e75cb18a3"/></dir><dir name="Sooqr"><file name="Cron.php" hash="630c80fd165087f8a75a6c9fa3dad9b6"/></dir></dir><dir name="Source"><file name="Action.php" hash="ef9830d9c1a98c94991626c4cc4909c9"/><file name="Attribute.php" hash="6f3736cd2f7de23b9d74356d7c1c557f"/><file name="Cacheresize.php" hash="86a916189abef3a670e58f3a8298f894"/><file name="Category.php" hash="92b245d0758fbe075b79c397a96d8567"/><file name="Categorytype.php" hash="8bc5f054db86f543019a6762a6a98562"/><file name="Condition.php" hash="bd66be4fe74f549d5fa6c213bd9b64f6"/><file name="Conditions.php" hash="502fe20b60e397240b8d552fd5ea4d81"/><file name="Configurable.php" hash="34a165474618953e44fd1de305371907"/><file name="Frequency.php" hash="f03bd90b098412026b21884e72c89aaf"/><file name="Identifier.php" hash="cdf5bd32696cb92a6f3be396ce5b3a6d"/><file name="Images.php" hash="08658a5e913e334959ec476a61e2891f"/><file name="Pricemodel.php" hash="dbbeabc2853a7caecab3fc42a557766b"/><file name="Productid.php" hash="e4b431e0183d91bdd4f186f001119e77"/><file name="Producttype.php" hash="88d0e8386f59d7c0ea62a19cbf800fa4"/><file name="Resize.php" hash="1a0824757d8c87f85225f063de3a025b"/><file name="Selectattribute.php" hash="bcae6eff0788821f7d3dbf7d224b59e4"/><file name="Status.php" hash="2f474fe7188e3b1cf1d1714ffebcd9e8"/><file name="Tax.php" hash="c6e19d702751bc0c616768fceaf53855"/><file name="Textattribute.php" hash="9645d5652679a972a280cf337ab8662b"/><file name="Varcharattribute.php" hash="37a9253e8ea806f3402052a0b0744707"/><file name="Version.php" hash="906736f8f04f03421ab56a0c042639aa"/><file name="Visibility.php" hash="67f20c3b4581144b11ca8696c885b97d"/><file name="Weight.php" hash="fbc88d0b6bd073d00dc6e4a05ce1b4df"/></dir></dir></dir></dir><file name="Common.php" hash="47450858f3bb2de093f818e6c46c6904"/><file name="Observer.php" hash="3a996b43992803a0d03ffcdae644b40e"/><file name="Sooqr.php" hash="17117380eecf2fb06288cf70597c7017"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="SooqrController.php" hash="2e9a00deee18ce689e8e1941a9a62ac7"/></dir><file name="InstallationController.php" hash="a96e58cbab2c7b6a3a4c9b42de62a59f"/></dir><dir name="etc"><file name="adminhtml.xml" hash="3f450c304adfd64d95814e552e41398d"/><file name="config.xml" hash="77995c0cc888a3301bd86b6fcadb4ae7"/><file name="system.xml" hash="54460f3418fd5924b4fd46b473a94843"/></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Magmodules_Sooqr.csv" hash="38992a5f4cf87eeee3d06ab38ead900b"/></dir><dir name="nl_NL"><file name="Magmodules_Sooqr.csv" hash="2fe3afa7c7597cf53c985aef2388ae24"/></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Sooqr.xml" hash="eeec89a005c4ccb1ed86bf90c446e3ef"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="magmodules"><dir name="sooqr"><file name="form.mini.phtml" hash="2776e200a99a369182599f6c9177e11b"/></dir></dir></dir><dir name="layout"><file name="magmodules_sooqr.xml" hash="ca15953b214016a800c5ef3aa8da4d19"/></dir></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
+
<dependencies/>
|
| 18 |
</package>
|
