Version Notes
Magmodules_Sooqr
Download this release
Release Info
| Developer | Magmodules |
| Extension | Magmodules_Sooqr |
| Version | 1.1.0 |
| Comparing to | |
| See all releases | |
Code changes from version 1.0.0 to 1.1.0
- app/code/community/Magmodules/Sooqr/Block/Adminhtml/Config/Form/Field/Extra.php +1 -1
- app/code/community/Magmodules/Sooqr/Block/Adminhtml/Config/Form/Field/Filter.php +72 -0
- app/code/community/Magmodules/Sooqr/Block/Adminhtml/System/Config/Form/Field/Feeds.php +6 -4
- app/code/community/Magmodules/Sooqr/Helper/Data.php +1 -1
- app/code/community/Magmodules/Sooqr/Model/{System → Adminhtml/System}/Config/Backend/Design/Extra.php +1 -1
- app/code/community/Magmodules/Sooqr/Model/Adminhtml/System/Config/Backend/Design/Filter.php +52 -0
- app/code/community/Magmodules/Sooqr/Model/{Source → Adminhtml/System/Config/Source}/Action.php +0 -0
- app/code/community/Magmodules/Sooqr/Model/Adminhtml/System/Config/Source/Attribute.php +22 -50
- app/code/community/Magmodules/Sooqr/Model/Adminhtml/System/Config/Source/Conditions.php +37 -0
- app/code/community/Magmodules/Sooqr/Model/{Source → Adminhtml/System/Config/Source}/Tax.php +1 -1
- app/code/community/Magmodules/Sooqr/Model/Common.php +34 -7
- app/code/community/Magmodules/Sooqr/Model/Observer.php +3 -3
- app/code/community/Magmodules/Sooqr/Model/Sooqr.php +4 -3
- app/code/community/Magmodules/Sooqr/Model/Source/Attribute.php +0 -39
- app/code/community/Magmodules/Sooqr/Model/Source/Countries.php +0 -25
- app/code/community/Magmodules/Sooqr/controllers/Adminhtml/SooqrController.php +54 -20
- app/code/community/Magmodules/Sooqr/etc/config.xml +1 -1
- app/code/community/Magmodules/Sooqr/etc/system.xml +26 -10
- package.xml +6 -6
app/code/community/Magmodules/Sooqr/Block/Adminhtml/Config/Form/Field/Extra.php
CHANGED
|
@@ -23,7 +23,7 @@ class Magmodules_Sooqr_Block_Adminhtml_Config_Form_Field_Extra extends Mage_Admi
|
|
| 23 |
{
|
| 24 |
$layout = Mage::app()->getFrontController()->getAction()->getLayout();
|
| 25 |
$renderer_attribute = $layout->createBlock('sooqr/adminhtml_config_form_renderer_select', '', array('is_render_to_js_template' => true));
|
| 26 |
-
$renderer_attribute->setOptions(Mage::getModel('sooqr/
|
| 27 |
$this->addColumn('attribute', array(
|
| 28 |
'label' => Mage::helper('sooqr')->__('Attribute'),
|
| 29 |
'style' => 'width:180px',
|
| 23 |
{
|
| 24 |
$layout = Mage::app()->getFrontController()->getAction()->getLayout();
|
| 25 |
$renderer_attribute = $layout->createBlock('sooqr/adminhtml_config_form_renderer_select', '', array('is_render_to_js_template' => true));
|
| 26 |
+
$renderer_attribute->setOptions(Mage::getModel('sooqr/adminhtml_system_config_source_attribute')->toOptionArray());
|
| 27 |
$this->addColumn('attribute', array(
|
| 28 |
'label' => Mage::helper('sooqr')->__('Attribute'),
|
| 29 |
'style' => 'width:180px',
|
app/code/community/Magmodules/Sooqr/Block/Adminhtml/Config/Form/Field/Filter.php
ADDED
|
@@ -0,0 +1,72 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magmodules.eu - http://www.magmodules.eu - info@magmodules.eu
|
| 4 |
+
* =============================================================
|
| 5 |
+
* NOTICE OF LICENSE [Single domain license]
|
| 6 |
+
* This source file is subject to the EULA that is
|
| 7 |
+
* available through the world-wide-web at:
|
| 8 |
+
* http://www.magmodules.eu/license-agreement/
|
| 9 |
+
* =============================================================
|
| 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 |
+
*/
|
| 17 |
+
|
| 18 |
+
class Magmodules_Sooqr_Block_Adminhtml_Config_Form_Field_Filter extends Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract {
|
| 19 |
+
|
| 20 |
+
protected $_renders = array();
|
| 21 |
+
|
| 22 |
+
/**
|
| 23 |
+
* Magmodules_Sooqr_Block_Adminhtml_Config_Form_Field_Shipping constructor.
|
| 24 |
+
*/
|
| 25 |
+
public function __construct()
|
| 26 |
+
{
|
| 27 |
+
$layout = Mage::app()->getFrontController()->getAction()->getLayout();
|
| 28 |
+
$renderer_attributes = $layout->createBlock('sooqr/adminhtml_config_form_renderer_select', '', array('is_render_to_js_template' => true));
|
| 29 |
+
$renderer_attributes->setOptions(Mage::getModel('sooqr/adminhtml_system_config_source_attribute')->toOptionArray());
|
| 30 |
+
|
| 31 |
+
$renderer_conditions = $layout->createBlock('sooqr/adminhtml_config_form_renderer_select', '', array('is_render_to_js_template' => true));
|
| 32 |
+
$renderer_conditions->setOptions(Mage::getModel('sooqr/adminhtml_system_config_source_conditions')->toOptionArray());
|
| 33 |
+
|
| 34 |
+
$this->addColumn('attribute', array(
|
| 35 |
+
'label' => Mage::helper('sooqr')->__('Attribute'),
|
| 36 |
+
'style' => 'width:100px',
|
| 37 |
+
'renderer' => $renderer_attributes
|
| 38 |
+
));
|
| 39 |
+
|
| 40 |
+
$this->addColumn('condition', array(
|
| 41 |
+
'label' => Mage::helper('sooqr')->__('Condition'),
|
| 42 |
+
'style' => 'width:100px',
|
| 43 |
+
'renderer' => $renderer_conditions
|
| 44 |
+
));
|
| 45 |
+
|
| 46 |
+
$this->addColumn('value', array(
|
| 47 |
+
'label' => Mage::helper('sooqr')->__('Value'),
|
| 48 |
+
'style' => 'width:100px',
|
| 49 |
+
));
|
| 50 |
+
|
| 51 |
+
$this->_renders['attribute'] = $renderer_attributes;
|
| 52 |
+
$this->_renders['condition'] = $renderer_conditions;
|
| 53 |
+
|
| 54 |
+
$this->_addAfter = false;
|
| 55 |
+
$this->_addButtonLabel = Mage::helper('sooqr')->__('Add Filter');
|
| 56 |
+
parent::__construct();
|
| 57 |
+
}
|
| 58 |
+
|
| 59 |
+
/**
|
| 60 |
+
* @param Varien_Object $row
|
| 61 |
+
*/
|
| 62 |
+
protected function _prepareArrayRow(Varien_Object $row)
|
| 63 |
+
{
|
| 64 |
+
foreach ($this->_renders as $key => $render){
|
| 65 |
+
$row->setData(
|
| 66 |
+
'option_extra_attr_' . $render->calcOptionHash($row->getData($key)),
|
| 67 |
+
'selected="selected"'
|
| 68 |
+
);
|
| 69 |
+
}
|
| 70 |
+
}
|
| 71 |
+
|
| 72 |
+
}
|
app/code/community/Magmodules/Sooqr/Block/Adminhtml/System/Config/Form/Field/Feeds.php
CHANGED
|
@@ -19,22 +19,24 @@ 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/
|
|
|
|
| 26 |
$feed_text = Mage::getStoreConfig('sooqr_connect/generate/feed_result', $storeId);
|
| 27 |
if(empty($feed_text)) {
|
| 28 |
$feed_text = Mage::helper('sooqr')->__('No active feed found');
|
|
|
|
| 29 |
}
|
| 30 |
$store_title = Mage::app()->getStore($storeId)->getName();
|
| 31 |
$store_code = Mage::app()->getStore($storeId)->getCode();
|
| 32 |
-
$html_feedlinks .= '<tr><td valign="top">' . $store_title . '
|
| 33 |
}
|
| 34 |
if(empty($html_feedlinks)) {
|
| 35 |
$html_feedlinks = Mage::helper('sooqr')->__('No enabled feed(s) found');
|
| 36 |
} else {
|
| 37 |
-
$html_header = '<div class="grid"><table cellpadding="0" cellspacing="0" class="border" style="width: 100%"><tbody><tr class="headings"><th>
|
| 38 |
$html_footer = '</tbody></table></div>';
|
| 39 |
$html_feedlinks = $html_header . $html_feedlinks . $html_footer;
|
| 40 |
}
|
| 19 |
|
| 20 |
public function render(Varien_Data_Form_Element_Abstract $element)
|
| 21 |
{
|
| 22 |
+
$store_ids = Mage::helper('sooqr')->getStoreIds('sooqr/generate/enabled');
|
| 23 |
$html_feedlinks = '';
|
| 24 |
foreach($store_ids as $storeId) {
|
| 25 |
+
$generate_url = $this->getUrl('*/sooqr/generateFeed/store_id/' . $storeId);
|
| 26 |
+
$download_url = $this->getUrl('*/sooqr/download/store_id/' . $storeId);
|
| 27 |
$feed_text = Mage::getStoreConfig('sooqr_connect/generate/feed_result', $storeId);
|
| 28 |
if(empty($feed_text)) {
|
| 29 |
$feed_text = Mage::helper('sooqr')->__('No active feed found');
|
| 30 |
+
$download_url = '';
|
| 31 |
}
|
| 32 |
$store_title = Mage::app()->getStore($storeId)->getName();
|
| 33 |
$store_code = Mage::app()->getStore($storeId)->getCode();
|
| 34 |
+
$html_feedlinks .= '<tr><td valign="top">' . $store_title . '<br/><small>Code: ' . $store_code . '</small></td><td>' . $feed_text . '</td><td><a href="' . $generate_url . '">' . Mage::helper('sooqr')->__('Generate New') . '</a><br/><a href="' . $download_url . '">' . Mage::helper('sooqr')->__('Download Last') . '</a></td></tr>';
|
| 35 |
}
|
| 36 |
if(empty($html_feedlinks)) {
|
| 37 |
$html_feedlinks = Mage::helper('sooqr')->__('No enabled feed(s) found');
|
| 38 |
} else {
|
| 39 |
+
$html_header = '<div class="grid"><table cellpadding="0" cellspacing="0" class="border" style="width: 100%"><tbody><tr class="headings"><th>' . Mage::helper('sooqr')->__('Storeview') . '</th><th>' . Mage::helper('sooqr')->__('Feed') . '</th><th>' . Mage::helper('sooqr')->__('Action') . '</th></tr>';
|
| 40 |
$html_footer = '</tbody></table></div>';
|
| 41 |
$html_feedlinks = $html_header . $html_feedlinks . $html_footer;
|
| 42 |
}
|
app/code/community/Magmodules/Sooqr/Helper/Data.php
CHANGED
|
@@ -404,7 +404,7 @@ class Magmodules_Sooqr_Helper_Data extends Mage_Core_Helper_Abstract {
|
|
| 404 |
$pricerule_price = Mage::helper('tax')->getPrice($product, $product->getFinalPrice(), $tax_param);
|
| 405 |
|
| 406 |
$special_price = ''; $special_date = '';
|
| 407 |
-
if(($pricerule_price > 0) && ($pricerule_price < $
|
| 408 |
$sales_price = $pricerule_price;
|
| 409 |
$specialPriceFromDate = $product->getSpecialFromDate();
|
| 410 |
$specialPriceToDate = $product->getSpecialToDate();
|
| 404 |
$pricerule_price = Mage::helper('tax')->getPrice($product, $product->getFinalPrice(), $tax_param);
|
| 405 |
|
| 406 |
$special_price = ''; $special_date = '';
|
| 407 |
+
if(($pricerule_price > 0) && ($pricerule_price < $price)) {
|
| 408 |
$sales_price = $pricerule_price;
|
| 409 |
$specialPriceFromDate = $product->getSpecialFromDate();
|
| 410 |
$specialPriceToDate = $product->getSpecialToDate();
|
app/code/community/Magmodules/Sooqr/Model/{System → Adminhtml/System}/Config/Backend/Design/Extra.php
RENAMED
|
@@ -15,7 +15,7 @@
|
|
| 15 |
* =============================================================
|
| 16 |
*/
|
| 17 |
|
| 18 |
-
class
|
| 19 |
|
| 20 |
protected function _beforeSave()
|
| 21 |
{
|
| 15 |
* =============================================================
|
| 16 |
*/
|
| 17 |
|
| 18 |
+
class Magmodules_Sooqr_Model_Adminhtml_System_Config_Backend_Design_Extra extends Mage_Adminhtml_Model_System_Config_Backend_Serialized_Array {
|
| 19 |
|
| 20 |
protected function _beforeSave()
|
| 21 |
{
|
app/code/community/Magmodules/Sooqr/Model/Adminhtml/System/Config/Backend/Design/Filter.php
ADDED
|
@@ -0,0 +1,52 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magmodules.eu - http://www.magmodules.eu - info@magmodules.eu
|
| 4 |
+
* =============================================================
|
| 5 |
+
* NOTICE OF LICENSE [Single domain license]
|
| 6 |
+
* This source file is subject to the EULA that is
|
| 7 |
+
* available through the world-wide-web at:
|
| 8 |
+
* http://www.magmodules.eu/license-agreement/
|
| 9 |
+
* =============================================================
|
| 10 |
+
* @category Magmodules
|
| 11 |
+
* @package Magmodules_Sooqr
|
| 12 |
+
* @author Magmodules <info@magmodules.eu>
|
| 13 |
+
* @copyright Copyright (c) 2015 (http://www.magmodules.eu)
|
| 14 |
+
* @license http://www.magmodules.eu/license-agreement/
|
| 15 |
+
* =============================================================
|
| 16 |
+
*/
|
| 17 |
+
|
| 18 |
+
class Magmodules_Sooqr_Model_Adminhtml_System_Config_Backend_Design_Filter extends Mage_Adminhtml_Model_System_Config_Backend_Serialized_Array {
|
| 19 |
+
|
| 20 |
+
protected function _beforeSave()
|
| 21 |
+
{
|
| 22 |
+
$value = $this->getValue();
|
| 23 |
+
if(is_array($value)) {
|
| 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 |
+
}
|
| 41 |
+
$this->setValue($value);
|
| 42 |
+
parent::_beforeSave();
|
| 43 |
+
}
|
| 44 |
+
|
| 45 |
+
function orderData($data, $sort)
|
| 46 |
+
{
|
| 47 |
+
$code = "return strnatcmp(\$a['$sort'], \$b['$sort']);";
|
| 48 |
+
usort($data, create_function('$a,$b', $code));
|
| 49 |
+
return $data;
|
| 50 |
+
}
|
| 51 |
+
|
| 52 |
+
}
|
app/code/community/Magmodules/Sooqr/Model/{Source → Adminhtml/System/Config/Source}/Action.php
RENAMED
|
File without changes
|
app/code/community/Magmodules/Sooqr/Model/Adminhtml/System/Config/Source/Attribute.php
CHANGED
|
@@ -17,55 +17,27 @@
|
|
| 17 |
|
| 18 |
class Magmodules_Sooqr_Model_Adminhtml_System_Config_Source_Attribute {
|
| 19 |
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
|
| 23 |
-
'
|
| 24 |
-
'
|
| 25 |
-
'
|
| 26 |
-
'
|
| 27 |
-
'
|
| 28 |
-
|
| 29 |
-
|
| 30 |
-
|
| 31 |
-
|
| 32 |
-
|
| 33 |
-
|
| 34 |
-
'msrp_display_actual_price_type',
|
| 35 |
-
'msrp_enabled',
|
| 36 |
-
'options_container',
|
| 37 |
-
'price_view',
|
| 38 |
-
'page_layout',
|
| 39 |
-
'samples_title',
|
| 40 |
-
'sku_type',
|
| 41 |
-
'tier_price',
|
| 42 |
-
'url_key',
|
| 43 |
-
'small_image',
|
| 44 |
-
'small_image_label',
|
| 45 |
-
'thumbnail',
|
| 46 |
-
'thumbnail_label',
|
| 47 |
-
'recurring_profile',
|
| 48 |
-
'version_info',
|
| 49 |
-
'meta_title',
|
| 50 |
-
'meta_keyword',
|
| 51 |
-
);
|
| 52 |
-
|
| 53 |
-
public function toOptionArray()
|
| 54 |
-
{
|
| 55 |
-
$options = array();
|
| 56 |
-
$options[] = array('value' => '', 'label' => Mage::helper('adminhtml')->__('-- none'));
|
| 57 |
-
$entityTypeId = Mage::getModel('eav/entity_type')->loadByCode('catalog_product')->getEntityTypeId();
|
| 58 |
-
$attributes = Mage::getModel('eav/entity_attribute')->getCollection()->addFilter('entity_type_id', $entityTypeId)->setOrder('attribute_code', 'ASC');
|
| 59 |
-
foreach ($attributes as $attribute){
|
| 60 |
-
if(($attribute->getBackendType() == 'text') || ($attribute->getBackendType() == 'varchar') || ($attribute->getBackendType() == 'static') || ($attribute->getBackendType() == 'int')) {
|
| 61 |
-
if($attribute->getFrontendLabel()) {
|
| 62 |
-
if(!in_array($attribute->getAttributeCode(), $this->_ignore)) {
|
| 63 |
-
$options[] = array('value'=> $attribute->getAttributeCode(), 'label'=> $attribute->getFrontendLabel());
|
| 64 |
-
}
|
| 65 |
-
}
|
| 66 |
}
|
| 67 |
-
|
| 68 |
-
|
| 69 |
-
|
| 70 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 71 |
}
|
| 17 |
|
| 18 |
class Magmodules_Sooqr_Model_Adminhtml_System_Config_Source_Attribute {
|
| 19 |
|
| 20 |
+
public function toOptionArray()
|
| 21 |
+
{
|
| 22 |
+
$optionArray = array();
|
| 23 |
+
$optionArray[] = array('value' => '', 'label' => Mage::helper('sooqr')->__('-- none'));
|
| 24 |
+
$optionArray[] = array('label' => Mage::helper('sooqr')->__('- Product ID'), 'value' => 'entity_id');
|
| 25 |
+
$optionArray[] = array('label' => Mage::helper('sooqr')->__('- Final Price'), 'value' => 'final_price');
|
| 26 |
+
$optionArray[] = array('label' => Mage::helper('sooqr')->__('- 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) {
|
| 30 |
+
if($attribute->getData('frontend_label')) {
|
| 31 |
+
$label = str_replace("'", "", $attribute->getData('frontend_label'));
|
| 32 |
+
} else {
|
| 33 |
+
$label = str_replace("'", "", $attribute->getData('attribute_code'));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
}
|
| 35 |
+
$optionArray[] = array(
|
| 36 |
+
'value' => $attribute->getData('attribute_code'),
|
| 37 |
+
'label' => $label,
|
| 38 |
+
);
|
| 39 |
+
}
|
| 40 |
+
return $optionArray;
|
| 41 |
+
}
|
| 42 |
+
|
| 43 |
}
|
app/code/community/Magmodules/Sooqr/Model/Adminhtml/System/Config/Source/Conditions.php
ADDED
|
@@ -0,0 +1,37 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/**
|
| 3 |
+
* Magmodules.eu - http://www.magmodules.eu - info@magmodules.eu
|
| 4 |
+
* =============================================================
|
| 5 |
+
* NOTICE OF LICENSE [Single domain license]
|
| 6 |
+
* This source file is subject to the EULA that is
|
| 7 |
+
* available through the world-wide-web at:
|
| 8 |
+
* http://www.magmodules.eu/license-agreement/
|
| 9 |
+
* =============================================================
|
| 10 |
+
* @category Magmodules
|
| 11 |
+
* @package Magmodules_Sooqr
|
| 12 |
+
* @author Magmodules <info@magmodules.eu>
|
| 13 |
+
* @copyright Copyright (c) 2015 (http://www.magmodules.eu)
|
| 14 |
+
* @license http://www.magmodules.eu/license-agreement/
|
| 15 |
+
* =============================================================
|
| 16 |
+
*/
|
| 17 |
+
|
| 18 |
+
class Magmodules_Sooqr_Model_Adminhtml_System_Config_Source_Conditions {
|
| 19 |
+
|
| 20 |
+
public function toOptionArray() {
|
| 21 |
+
$type = array();
|
| 22 |
+
$type[] = array('value'=> '', 'label'=> Mage::helper('sooqr')->__(''));
|
| 23 |
+
$type[] = array('value'=> 'eq', 'label'=> Mage::helper('sooqr')->__('Equal'));
|
| 24 |
+
$type[] = array('value'=> 'neq', 'label'=> Mage::helper('sooqr')->__('Not equal'));
|
| 25 |
+
$type[] = array('value'=> 'gt', 'label'=> Mage::helper('sooqr')->__('Greater than'));
|
| 26 |
+
$type[] = array('value'=> 'gteq', 'label'=> Mage::helper('sooqr')->__('Greater than or equal to'));
|
| 27 |
+
$type[] = array('value'=> 'lt', 'label'=> Mage::helper('sooqr')->__('Less than'));
|
| 28 |
+
$type[] = array('value'=> 'lteg', 'label'=> Mage::helper('sooqr')->__('Less than or equal to'));
|
| 29 |
+
$type[] = array('value'=> 'in', 'label'=> Mage::helper('sooqr')->__('In'));
|
| 30 |
+
$type[] = array('value'=> 'nin', 'label'=> Mage::helper('sooqr')->__('Not in'));
|
| 31 |
+
$type[] = array('value'=> 'like', 'label'=> Mage::helper('sooqr')->__('Like'));
|
| 32 |
+
$type[] = array('value'=> 'empty', 'label'=> Mage::helper('sooqr')->__('Empty'));
|
| 33 |
+
$type[] = array('value'=> 'not-empty', 'label'=> Mage::helper('sooqr')->__('Not Empty'));
|
| 34 |
+
return $type;
|
| 35 |
+
}
|
| 36 |
+
|
| 37 |
+
}
|
app/code/community/Magmodules/Sooqr/Model/{Source → Adminhtml/System/Config/Source}/Tax.php
RENAMED
|
@@ -15,7 +15,7 @@
|
|
| 15 |
* =============================================================
|
| 16 |
*/
|
| 17 |
|
| 18 |
-
class
|
| 19 |
|
| 20 |
public function toOptionArray()
|
| 21 |
{
|
| 15 |
* =============================================================
|
| 16 |
*/
|
| 17 |
|
| 18 |
+
class Magmodules_Sooqr_Model_Adminhtml_System_Config_Source_Tax {
|
| 19 |
|
| 20 |
public function toOptionArray()
|
| 21 |
{
|
app/code/community/Magmodules/Sooqr/Model/Common.php
CHANGED
|
@@ -43,9 +43,9 @@ class Magmodules_Sooqr_Model_Common extends Mage_Core_Helper_Abstract {
|
|
| 43 |
$collection->addAttributeToFilter('status', 1);
|
| 44 |
|
| 45 |
if($limit) {
|
| 46 |
-
$collection->
|
| 47 |
}
|
| 48 |
-
|
| 49 |
if(!empty($config['conf_enabled'])) {
|
| 50 |
$collection->addAttributeToFilter('visibility', array('in' => array('1','3','4')));
|
| 51 |
} else {
|
|
@@ -83,11 +83,38 @@ class Magmodules_Sooqr_Model_Common extends Mage_Core_Helper_Abstract {
|
|
| 83 |
}
|
| 84 |
|
| 85 |
$collection->addAttributeToSelect($attributes);
|
| 86 |
-
|
| 87 |
-
if($
|
| 88 |
-
|
| 89 |
-
$
|
| 90 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 91 |
}
|
| 92 |
|
| 93 |
$collection->joinTable('cataloginventory/stock_item', 'product_id=entity_id', array("qty" => "qty", "stock_status" => "is_in_stock", "manage_stock" => "manage_stock", "use_config_manage_stock" => "use_config_manage_stock"))->addAttributeToSelect(array('qty', 'stock_status', 'manage_stock', 'use_config_manage_stock'));
|
| 43 |
$collection->addAttributeToFilter('status', 1);
|
| 44 |
|
| 45 |
if($limit) {
|
| 46 |
+
$collection->setPage(1, $limit)->getCurPage();
|
| 47 |
}
|
| 48 |
+
|
| 49 |
if(!empty($config['conf_enabled'])) {
|
| 50 |
$collection->addAttributeToFilter('visibility', array('in' => array('1','3','4')));
|
| 51 |
} else {
|
| 83 |
}
|
| 84 |
|
| 85 |
$collection->addAttributeToSelect($attributes);
|
| 86 |
+
|
| 87 |
+
if(!empty($config['filters'])) {
|
| 88 |
+
foreach($config['filters'] as $filter) {
|
| 89 |
+
$attribute = $filter['attribute'];
|
| 90 |
+
if($filter['type'] == 'select') {
|
| 91 |
+
$attribute = $filter['attribute'] . '_value';
|
| 92 |
+
}
|
| 93 |
+
$condition = $filter['condition'];
|
| 94 |
+
$value = $filter['value'];
|
| 95 |
+
switch ($condition) {
|
| 96 |
+
case 'nin':
|
| 97 |
+
if(strpos($value, ',') !== FALSE) { $value = explode(',', $value); }
|
| 98 |
+
$collection->addAttributeToFilter(array(array('attribute' => $attribute, $condition => $value), array('attribute' => $attribute, 'null' => true)));
|
| 99 |
+
break;
|
| 100 |
+
case 'in';
|
| 101 |
+
if(strpos($value, ',') !== FALSE) { $value = explode(',', $value); }
|
| 102 |
+
$collection->addAttributeToFilter($attribute, array($condition => $value));
|
| 103 |
+
break;
|
| 104 |
+
case 'neq':
|
| 105 |
+
$collection->addAttributeToFilter(array(array('attribute' => $attribute, $condition => $value), array('attribute' => $attribute, 'null' => true)));
|
| 106 |
+
break;
|
| 107 |
+
case 'empty':
|
| 108 |
+
$collection->addAttributeToFilter($attribute, array('null' => true));
|
| 109 |
+
break;
|
| 110 |
+
case 'not-empty':
|
| 111 |
+
$collection->addAttributeToFilter($attribute, array('notnull' => true));
|
| 112 |
+
break;
|
| 113 |
+
default:
|
| 114 |
+
$collection->addAttributeToFilter($attribute, array($condition => $value));
|
| 115 |
+
break;
|
| 116 |
+
}
|
| 117 |
+
}
|
| 118 |
}
|
| 119 |
|
| 120 |
$collection->joinTable('cataloginventory/stock_item', 'product_id=entity_id', array("qty" => "qty", "stock_status" => "is_in_stock", "manage_stock" => "manage_stock", "use_config_manage_stock" => "use_config_manage_stock"))->addAttributeToSelect(array('qty', 'stock_status', 'manage_stock', 'use_config_manage_stock'));
|
app/code/community/Magmodules/Sooqr/Model/Observer.php
CHANGED
|
@@ -19,11 +19,11 @@ class Magmodules_Sooqr_Model_Observer {
|
|
| 19 |
|
| 20 |
public function scheduledGenerateSooqr($schedule)
|
| 21 |
{
|
| 22 |
-
|
| 23 |
$cron = Mage::getStoreConfig('sooqr_connect/generate/cron');
|
| 24 |
$next_store = Mage::getStoreConfig('sooqr_connect/generate/cron_next');
|
| 25 |
if($enabled && $cron) {
|
| 26 |
-
$storeIds = Mage::helper('sooqr')->getStoreIds('
|
| 27 |
if(empty($next_store) || ($next_store >= count($storeIds))) {
|
| 28 |
$next_store = 0;
|
| 29 |
}
|
|
@@ -32,7 +32,7 @@ class Magmodules_Sooqr_Model_Observer {
|
|
| 32 |
$appEmulation = Mage::getSingleton('core/app_emulation');
|
| 33 |
$initialEnvironmentInfo = $appEmulation->startEnvironmentEmulation($store_id);
|
| 34 |
if($result = Mage::getModel('sooqr/sooqr')->generateFeed($store_id)) {
|
| 35 |
-
$html = '<a href="' . $result['url'] . '">' . $result['url'] .
|
| 36 |
$config = new Mage_Core_Model_Config();
|
| 37 |
$config->saveConfig('sooqr_connect/generate/feed_result', $html, 'stores', $store_id);
|
| 38 |
}
|
| 19 |
|
| 20 |
public function scheduledGenerateSooqr($schedule)
|
| 21 |
{
|
| 22 |
+
$enabled = Mage::getStoreConfig('sooqr_connect/general/enabled');
|
| 23 |
$cron = Mage::getStoreConfig('sooqr_connect/generate/cron');
|
| 24 |
$next_store = Mage::getStoreConfig('sooqr_connect/generate/cron_next');
|
| 25 |
if($enabled && $cron) {
|
| 26 |
+
$storeIds = Mage::helper('sooqr')->getStoreIds('sooqr/generate/enabled');
|
| 27 |
if(empty($next_store) || ($next_store >= count($storeIds))) {
|
| 28 |
$next_store = 0;
|
| 29 |
}
|
| 32 |
$appEmulation = Mage::getSingleton('core/app_emulation');
|
| 33 |
$initialEnvironmentInfo = $appEmulation->startEnvironmentEmulation($store_id);
|
| 34 |
if($result = Mage::getModel('sooqr/sooqr')->generateFeed($store_id)) {
|
| 35 |
+
$html = '<a href="' . $result['url'] . '" target="_blank">' . $result['url'] .'</a><br/><small>Date: ' . $result['date'] . ' (cron) - Products: ' . $result['qty'] . ' - Time: ' . number_format((microtime(true) - $time_start), 4) . '</small>';
|
| 36 |
$config = new Mage_Core_Model_Config();
|
| 37 |
$config->saveConfig('sooqr_connect/generate/feed_result', $html, 'stores', $store_id);
|
| 38 |
}
|
app/code/community/Magmodules/Sooqr/Model/Sooqr.php
CHANGED
|
@@ -84,7 +84,8 @@ class Magmodules_Sooqr_Model_Sooqr extends Magmodules_Sooqr_Model_Common {
|
|
| 84 |
$config['filter_cat'] = Mage::getStoreConfig('sooqr_connect/products/categories', $storeId);
|
| 85 |
$config['filter_type'] = Mage::getStoreConfig('sooqr_connect/products/category_type', $storeId);
|
| 86 |
$config['cms_pages'] = Mage::getStoreConfig('sooqr_connect/products/cms_pages', $storeId);
|
| 87 |
-
|
|
|
|
| 88 |
// PRICE
|
| 89 |
$config['price_scope'] = Mage::getStoreConfig('catalog/price/scope');
|
| 90 |
$config['price_add_tax'] = Mage::getStoreConfig('sooqr_connect/products/add_tax', $storeId);
|
|
@@ -142,7 +143,7 @@ class Magmodules_Sooqr_Model_Sooqr extends Magmodules_Sooqr_Model_Common {
|
|
| 142 |
return Mage::helper('sooqr')->addAttributeData($attributes, $config);
|
| 143 |
}
|
| 144 |
|
| 145 |
-
public function getFileName($type, $storeId)
|
| 146 |
{
|
| 147 |
if(!$fileName = Mage::getStoreConfig('sooqr_connect/generate/filename', $storeId)) {
|
| 148 |
$fileName = $type . '.xml';
|
|
@@ -159,7 +160,7 @@ class Magmodules_Sooqr_Model_Sooqr extends Magmodules_Sooqr_Model_Common {
|
|
| 159 |
}
|
| 160 |
|
| 161 |
$fileName = Mage::getBaseDir() . DS . 'media' . DS . $type . DS . $fileName;
|
| 162 |
-
if(file_exists($fileName)) {
|
| 163 |
unlink($fileName);
|
| 164 |
}
|
| 165 |
return $fileName;
|
| 84 |
$config['filter_cat'] = Mage::getStoreConfig('sooqr_connect/products/categories', $storeId);
|
| 85 |
$config['filter_type'] = Mage::getStoreConfig('sooqr_connect/products/category_type', $storeId);
|
| 86 |
$config['cms_pages'] = Mage::getStoreConfig('sooqr_connect/products/cms_pages', $storeId);
|
| 87 |
+
$config['filters'] = @unserialize(Mage::getStoreConfig('sooqr_connect/products/advanced', $storeId));
|
| 88 |
+
|
| 89 |
// PRICE
|
| 90 |
$config['price_scope'] = Mage::getStoreConfig('catalog/price/scope');
|
| 91 |
$config['price_add_tax'] = Mage::getStoreConfig('sooqr_connect/products/add_tax', $storeId);
|
| 143 |
return Mage::helper('sooqr')->addAttributeData($attributes, $config);
|
| 144 |
}
|
| 145 |
|
| 146 |
+
public function getFileName($type, $storeId, $refresh = 1)
|
| 147 |
{
|
| 148 |
if(!$fileName = Mage::getStoreConfig('sooqr_connect/generate/filename', $storeId)) {
|
| 149 |
$fileName = $type . '.xml';
|
| 160 |
}
|
| 161 |
|
| 162 |
$fileName = Mage::getBaseDir() . DS . 'media' . DS . $type . DS . $fileName;
|
| 163 |
+
if(file_exists($fileName) && ($refresh)) {
|
| 164 |
unlink($fileName);
|
| 165 |
}
|
| 166 |
return $fileName;
|
app/code/community/Magmodules/Sooqr/Model/Source/Attribute.php
DELETED
|
@@ -1,39 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
/**
|
| 3 |
-
* Magmodules.eu - http://www.magmodules.eu - info@magmodules.eu
|
| 4 |
-
* =============================================================
|
| 5 |
-
* NOTICE OF LICENSE [Single domain license]
|
| 6 |
-
* This source file is subject to the EULA that is
|
| 7 |
-
* available through the world-wide-web at:
|
| 8 |
-
* http://www.magmodules.eu/license-agreement/
|
| 9 |
-
* =============================================================
|
| 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 |
-
*/
|
| 17 |
-
|
| 18 |
-
class Magmodules_Sooqr_Model_Source_Attribute {
|
| 19 |
-
|
| 20 |
-
public function toOptionArray()
|
| 21 |
-
{
|
| 22 |
-
$optionArray = array();
|
| 23 |
-
$optionArray[] = array('label' => Mage::helper('sooqr')->__('- Product ID'), 'value' => 'entity_id');
|
| 24 |
-
$optionArray[] = array('label' => Mage::helper('sooqr')->__('- Final Price'), 'value' => 'final_price');
|
| 25 |
-
|
| 26 |
-
$attributes = Mage::getResourceModel('catalog/product_attribute_collection')
|
| 27 |
-
->addVisibleFilter()
|
| 28 |
-
->addFieldToFilter('backend_type', array('text', 'select', 'textarea', 'date', 'int', 'boolean', 'static', 'varchar'));
|
| 29 |
-
|
| 30 |
-
foreach($attributes as $attribute) {
|
| 31 |
-
$optionArray[] = array(
|
| 32 |
-
'label' => str_replace("'", "", $attribute->getData('frontend_label')),
|
| 33 |
-
'value' => $attribute->getData('attribute_code')
|
| 34 |
-
);
|
| 35 |
-
}
|
| 36 |
-
return $optionArray;
|
| 37 |
-
}
|
| 38 |
-
|
| 39 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Magmodules/Sooqr/Model/Source/Countries.php
DELETED
|
@@ -1,25 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
/**
|
| 3 |
-
* Magmodules.eu - http://www.magmodules.eu - info@magmodules.eu
|
| 4 |
-
* =============================================================
|
| 5 |
-
* NOTICE OF LICENSE [Single domain license]
|
| 6 |
-
* This source file is subject to the EULA that is
|
| 7 |
-
* available through the world-wide-web at:
|
| 8 |
-
* http://www.magmodules.eu/license-agreement/
|
| 9 |
-
* =============================================================
|
| 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 |
-
*/
|
| 17 |
-
|
| 18 |
-
class Magmodules_Sooqr_Model_Source_Countries {
|
| 19 |
-
|
| 20 |
-
public function toOptionArray()
|
| 21 |
-
{
|
| 22 |
-
return Mage::getResourceModel('directory/country_collection')->loadData()->toOptionArray(true);
|
| 23 |
-
}
|
| 24 |
-
|
| 25 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Magmodules/Sooqr/controllers/Adminhtml/SooqrController.php
CHANGED
|
@@ -10,45 +10,79 @@
|
|
| 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 |
*/
|
| 17 |
|
| 18 |
class Magmodules_Sooqr_Adminhtml_SooqrController extends Mage_Adminhtml_Controller_Action {
|
| 19 |
|
| 20 |
-
public function
|
| 21 |
{
|
| 22 |
-
|
| 23 |
-
|
| 24 |
-
$
|
| 25 |
-
|
| 26 |
-
|
| 27 |
-
|
| 28 |
-
$
|
| 29 |
-
|
| 30 |
-
|
| 31 |
-
|
| 32 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 33 |
}
|
| 34 |
-
|
| 35 |
-
|
|
|
|
| 36 |
$this->_redirect('adminhtml/system_config/edit/section/sooqr_connect');
|
| 37 |
}
|
| 38 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 39 |
public function addToFlatAction()
|
| 40 |
{
|
| 41 |
-
$
|
| 42 |
-
foreach($
|
| 43 |
-
$
|
|
|
|
|
|
|
|
|
|
| 44 |
}
|
| 45 |
Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('sooqr')->__('Attributes added to Flat Catalog, please reindex Product Flat Data.'));
|
| 46 |
-
$this->_redirect('adminhtml/system_config/edit/section/
|
| 47 |
}
|
| 48 |
|
| 49 |
protected function _isAllowed()
|
| 50 |
{
|
| 51 |
-
return Mage::getSingleton('admin/session')->isAllowed('admin/
|
| 52 |
}
|
| 53 |
|
| 54 |
}
|
| 10 |
* @category Magmodules
|
| 11 |
* @package Magmodules_Sooqr
|
| 12 |
* @author Magmodules <info@magmodules.eu>
|
| 13 |
+
* @copyright Copyright (c) 2015 (http://www.magmodules.eu)
|
| 14 |
* @license http://www.magmodules.eu/license-agreement/
|
| 15 |
* =============================================================
|
| 16 |
*/
|
| 17 |
|
| 18 |
class Magmodules_Sooqr_Adminhtml_SooqrController extends Mage_Adminhtml_Controller_Action {
|
| 19 |
|
| 20 |
+
public function generateFeedAction($store_id = '')
|
| 21 |
{
|
| 22 |
+
if(Mage::getStoreConfig('sooqr/general/enabled')) {
|
| 23 |
+
$store_id = $this->getRequest()->getParam('store_id');
|
| 24 |
+
if(!empty($store_id)) {
|
| 25 |
+
$time_start = microtime(true);
|
| 26 |
+
$appEmulation = Mage::getSingleton('core/app_emulation');
|
| 27 |
+
$initialEnvironmentInfo = $appEmulation->startEnvironmentEmulation($store_id);
|
| 28 |
+
if($result = Mage::getModel('sooqr/sooqr')->generateFeed($store_id, '', $time_start)) {
|
| 29 |
+
$html = '<a href="' . $result['url'] . '" target="_blank">' . $result['url'] .'</a><br/><small>Date: ' . $result['date'] . ' (manual) - Products: ' . $result['qty'] . ' - Time: ' . number_format((microtime(true) - $time_start), 4) . '</small>';
|
| 30 |
+
$config = new Mage_Core_Model_Config();
|
| 31 |
+
$config->saveConfig('sooqr_connect/generate/feed_result', $html, 'stores', $store_id);
|
| 32 |
+
Mage::app()->getCacheInstance()->cleanType('config');
|
| 33 |
+
Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('sooqr')->__('Generated feed with %s products. %s', $result['qty'], '<a style="float:right;" href="' . $this->getUrl('*/sooqr/download/store_id/' . $store_id) . '">Download XML</a>'));
|
| 34 |
+
$limit = Mage::getStoreConfig('sooqr_connect/generate/limit', $store_id);
|
| 35 |
+
if($limit > 0) {
|
| 36 |
+
Mage::getSingleton('adminhtml/session')->addNotice(Mage::helper('sooqr')->__('Note, in the feed generate configuration tab you have enabled the product limit of %s.', $limit));
|
| 37 |
+
}
|
| 38 |
+
} else {
|
| 39 |
+
$config = new Mage_Core_Model_Config();
|
| 40 |
+
$config->saveConfig('sooqr_connect/generate/feed_result', '', 'stores', $store_id);
|
| 41 |
+
Mage::getSingleton('adminhtml/session')->addError(Mage::helper('sooqr')->__('No products found, make sure your filters are configured with existing values.'));
|
| 42 |
+
Mage::app()->getCacheInstance()->cleanType('config');
|
| 43 |
+
}
|
| 44 |
+
$appEmulation->stopEnvironmentEmulation($initialEnvironmentInfo);
|
| 45 |
}
|
| 46 |
+
} else {
|
| 47 |
+
Mage::getSingleton('adminhtml/session')->addError(Mage::helper('sooqr')->__('Please enable the extension before generating the xml'));
|
| 48 |
+
}
|
| 49 |
$this->_redirect('adminhtml/system_config/edit/section/sooqr_connect');
|
| 50 |
}
|
| 51 |
|
| 52 |
+
public function downloadAction()
|
| 53 |
+
{
|
| 54 |
+
$store_id = $this->getRequest()->getParam('store_id');
|
| 55 |
+
$filepath = Mage::getModel('sooqr/sooqr')->getFileName('sooqr', $store_id, 0);
|
| 56 |
+
if(file_exists($filepath)) {
|
| 57 |
+
$this->getResponse()
|
| 58 |
+
->setHttpResponseCode(200)
|
| 59 |
+
->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0', true)
|
| 60 |
+
->setHeader('Pragma','no-cache',1)
|
| 61 |
+
->setHeader('Content-type', 'application/force-download')
|
| 62 |
+
->setHeader('Content-Length', filesize($filepath) )
|
| 63 |
+
->setHeader('Content-Disposition', 'attachment' . '; filename=' . basename($filepath) );
|
| 64 |
+
$this->getResponse()->clearBody();
|
| 65 |
+
$this->getResponse()->sendHeaders();
|
| 66 |
+
readfile($filepath);
|
| 67 |
+
}
|
| 68 |
+
}
|
| 69 |
+
|
| 70 |
public function addToFlatAction()
|
| 71 |
{
|
| 72 |
+
$store_ids = Mage::helper('sooqr')->getStoreIds('sooqr_connect/generate/enabled');
|
| 73 |
+
foreach($store_ids as $store_id) {
|
| 74 |
+
$non_flat_attributes = Mage::helper('sooqr')->checkFlatCatalog(Mage::getModel("sooqr/sooqr")->getFeedAttributes($store_id, 'flatcheck'));
|
| 75 |
+
foreach($non_flat_attributes as $key => $value) {
|
| 76 |
+
$_attribute = Mage::getModel('catalog/resource_eav_attribute')->load($key)->setUsedInProductListing(1)->save();
|
| 77 |
+
}
|
| 78 |
}
|
| 79 |
Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('sooqr')->__('Attributes added to Flat Catalog, please reindex Product Flat Data.'));
|
| 80 |
+
$this->_redirect('adminhtml/system_config/edit/section/sooqr');
|
| 81 |
}
|
| 82 |
|
| 83 |
protected function _isAllowed()
|
| 84 |
{
|
| 85 |
+
return Mage::getSingleton('admin/session')->isAllowed('admin/sooqr_connect/sooqr');
|
| 86 |
}
|
| 87 |
|
| 88 |
}
|
app/code/community/Magmodules/Sooqr/etc/config.xml
CHANGED
|
@@ -19,7 +19,7 @@
|
|
| 19 |
<config>
|
| 20 |
<modules>
|
| 21 |
<Magmodules_Sooqr>
|
| 22 |
-
<version>1.
|
| 23 |
</Magmodules_Sooqr>
|
| 24 |
</modules>
|
| 25 |
<global>
|
| 19 |
<config>
|
| 20 |
<modules>
|
| 21 |
<Magmodules_Sooqr>
|
| 22 |
+
<version>1.1.0</version>
|
| 23 |
</Magmodules_Sooqr>
|
| 24 |
</modules>
|
| 25 |
<global>
|
app/code/community/Magmodules/Sooqr/etc/system.xml
CHANGED
|
@@ -181,7 +181,7 @@
|
|
| 181 |
</fields>
|
| 182 |
</general>
|
| 183 |
<products translate="label" module="sooqr">
|
| 184 |
-
<label>Product Data</label>
|
| 185 |
<frontend_type>text</frontend_type>
|
| 186 |
<sort_order>3</sort_order>
|
| 187 |
<show_in_default>1</show_in_default>
|
|
@@ -217,7 +217,7 @@
|
|
| 217 |
<name_attribute translate="label">
|
| 218 |
<label>Name</label>
|
| 219 |
<frontend_type>select</frontend_type>
|
| 220 |
-
<source_model>sooqr/
|
| 221 |
<sort_order>12</sort_order>
|
| 222 |
<show_in_default>1</show_in_default>
|
| 223 |
<show_in_website>1</show_in_website>
|
|
@@ -226,7 +226,7 @@
|
|
| 226 |
<sku_attribute translate="label">
|
| 227 |
<label>Sku</label>
|
| 228 |
<frontend_type>select</frontend_type>
|
| 229 |
-
<source_model>sooqr/
|
| 230 |
<sort_order>13</sort_order>
|
| 231 |
<show_in_default>1</show_in_default>
|
| 232 |
<show_in_website>1</show_in_website>
|
|
@@ -235,7 +235,7 @@
|
|
| 235 |
<description_attribute translate="label">
|
| 236 |
<label>Description</label>
|
| 237 |
<frontend_type>select</frontend_type>
|
| 238 |
-
<source_model>sooqr/
|
| 239 |
<sort_order>14</sort_order>
|
| 240 |
<show_in_default>1</show_in_default>
|
| 241 |
<show_in_website>1</show_in_website>
|
|
@@ -305,7 +305,6 @@
|
|
| 305 |
<depends><image_resize>custom</image_resize></depends>
|
| 306 |
<comment>Example format: 200x300</comment>
|
| 307 |
</image_size_custom>
|
| 308 |
-
|
| 309 |
<extra_heading translate="label">
|
| 310 |
<label>Extra Fields</label>
|
| 311 |
<frontend_model>sooqr/adminhtml_system_config_form_field_heading</frontend_model>
|
|
@@ -325,7 +324,7 @@
|
|
| 325 |
<extra>
|
| 326 |
<label>Extra Fields</label>
|
| 327 |
<frontend_model>sooqr/adminhtml_config_form_field_extra</frontend_model>
|
| 328 |
-
<backend_model>sooqr/
|
| 329 |
<sort_order>32</sort_order>
|
| 330 |
<show_in_default>1</show_in_default>
|
| 331 |
<show_in_website>1</show_in_website>
|
|
@@ -350,7 +349,7 @@
|
|
| 350 |
<force_tax translate="label">
|
| 351 |
<label>Force Tax Usage</label>
|
| 352 |
<frontend_type>select</frontend_type>
|
| 353 |
-
<source_model>sooqr/
|
| 354 |
<sort_order>42</sort_order>
|
| 355 |
<show_in_default>1</show_in_default>
|
| 356 |
<show_in_website>1</show_in_website>
|
|
@@ -446,10 +445,27 @@
|
|
| 446 |
<show_in_store>1</show_in_store>
|
| 447 |
<depends><category_enabled>1</category_enabled></depends>
|
| 448 |
</categories>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 449 |
<cms_heading translate="label">
|
| 450 |
<label>Export CMS Pages</label>
|
| 451 |
<frontend_model>sooqr/adminhtml_system_config_form_field_heading</frontend_model>
|
| 452 |
-
<sort_order>
|
| 453 |
<show_in_default>1</show_in_default>
|
| 454 |
<show_in_website>1</show_in_website>
|
| 455 |
<show_in_store>1</show_in_store>
|
|
@@ -458,13 +474,13 @@
|
|
| 458 |
<label>Enable</label>
|
| 459 |
<frontend_type>select</frontend_type>
|
| 460 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 461 |
-
<sort_order>
|
| 462 |
<show_in_default>1</show_in_default>
|
| 463 |
<show_in_website>1</show_in_website>
|
| 464 |
<show_in_store>1</show_in_store>
|
| 465 |
</cms_pages>
|
| 466 |
</fields>
|
| 467 |
-
</products>
|
| 468 |
<generate translate="label" module="sooqr">
|
| 469 |
<label>Feed Generation Settings</label>
|
| 470 |
<frontend_type>text</frontend_type>
|
| 181 |
</fields>
|
| 182 |
</general>
|
| 183 |
<products translate="label" module="sooqr">
|
| 184 |
+
<label>Product & CMS Data</label>
|
| 185 |
<frontend_type>text</frontend_type>
|
| 186 |
<sort_order>3</sort_order>
|
| 187 |
<show_in_default>1</show_in_default>
|
| 217 |
<name_attribute translate="label">
|
| 218 |
<label>Name</label>
|
| 219 |
<frontend_type>select</frontend_type>
|
| 220 |
+
<source_model>sooqr/adminhtml_system_config_source_attribute</source_model>
|
| 221 |
<sort_order>12</sort_order>
|
| 222 |
<show_in_default>1</show_in_default>
|
| 223 |
<show_in_website>1</show_in_website>
|
| 226 |
<sku_attribute translate="label">
|
| 227 |
<label>Sku</label>
|
| 228 |
<frontend_type>select</frontend_type>
|
| 229 |
+
<source_model>sooqr/adminhtml_system_config_source_attribute</source_model>
|
| 230 |
<sort_order>13</sort_order>
|
| 231 |
<show_in_default>1</show_in_default>
|
| 232 |
<show_in_website>1</show_in_website>
|
| 235 |
<description_attribute translate="label">
|
| 236 |
<label>Description</label>
|
| 237 |
<frontend_type>select</frontend_type>
|
| 238 |
+
<source_model>sooqr/adminhtml_system_config_source_attribute</source_model>
|
| 239 |
<sort_order>14</sort_order>
|
| 240 |
<show_in_default>1</show_in_default>
|
| 241 |
<show_in_website>1</show_in_website>
|
| 305 |
<depends><image_resize>custom</image_resize></depends>
|
| 306 |
<comment>Example format: 200x300</comment>
|
| 307 |
</image_size_custom>
|
|
|
|
| 308 |
<extra_heading translate="label">
|
| 309 |
<label>Extra Fields</label>
|
| 310 |
<frontend_model>sooqr/adminhtml_system_config_form_field_heading</frontend_model>
|
| 324 |
<extra>
|
| 325 |
<label>Extra Fields</label>
|
| 326 |
<frontend_model>sooqr/adminhtml_config_form_field_extra</frontend_model>
|
| 327 |
+
<backend_model>sooqr/adminhtml_system_config_backend_design_extra</backend_model>
|
| 328 |
<sort_order>32</sort_order>
|
| 329 |
<show_in_default>1</show_in_default>
|
| 330 |
<show_in_website>1</show_in_website>
|
| 349 |
<force_tax translate="label">
|
| 350 |
<label>Force Tax Usage</label>
|
| 351 |
<frontend_type>select</frontend_type>
|
| 352 |
+
<source_model>sooqr/adminhtml_system_config_source_tax</source_model>
|
| 353 |
<sort_order>42</sort_order>
|
| 354 |
<show_in_default>1</show_in_default>
|
| 355 |
<show_in_website>1</show_in_website>
|
| 445 |
<show_in_store>1</show_in_store>
|
| 446 |
<depends><category_enabled>1</category_enabled></depends>
|
| 447 |
</categories>
|
| 448 |
+
<advanced_heading translate="label">
|
| 449 |
+
<label>Advanced</label>
|
| 450 |
+
<frontend_model>sooqr/adminhtml_system_config_form_field_heading</frontend_model>
|
| 451 |
+
<sort_order>70</sort_order>
|
| 452 |
+
<show_in_default>1</show_in_default>
|
| 453 |
+
<show_in_website>1</show_in_website>
|
| 454 |
+
<show_in_store>1</show_in_store>
|
| 455 |
+
</advanced_heading>
|
| 456 |
+
<advanced>
|
| 457 |
+
<label>Advanced Filter</label>
|
| 458 |
+
<frontend_model>sooqr/adminhtml_config_form_field_filter</frontend_model>
|
| 459 |
+
<backend_model>sooqr/adminhtml_system_config_backend_design_filter</backend_model>
|
| 460 |
+
<sort_order>71</sort_order>
|
| 461 |
+
<show_in_default>1</show_in_default>
|
| 462 |
+
<show_in_website>1</show_in_website>
|
| 463 |
+
<show_in_store>1</show_in_store>
|
| 464 |
+
</advanced>
|
| 465 |
<cms_heading translate="label">
|
| 466 |
<label>Export CMS Pages</label>
|
| 467 |
<frontend_model>sooqr/adminhtml_system_config_form_field_heading</frontend_model>
|
| 468 |
+
<sort_order>80</sort_order>
|
| 469 |
<show_in_default>1</show_in_default>
|
| 470 |
<show_in_website>1</show_in_website>
|
| 471 |
<show_in_store>1</show_in_store>
|
| 474 |
<label>Enable</label>
|
| 475 |
<frontend_type>select</frontend_type>
|
| 476 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 477 |
+
<sort_order>81</sort_order>
|
| 478 |
<show_in_default>1</show_in_default>
|
| 479 |
<show_in_website>1</show_in_website>
|
| 480 |
<show_in_store>1</show_in_store>
|
| 481 |
</cms_pages>
|
| 482 |
</fields>
|
| 483 |
+
</products>
|
| 484 |
<generate translate="label" module="sooqr">
|
| 485 |
<label>Feed Generation Settings</label>
|
| 486 |
<frontend_type>text</frontend_type>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Magmodules_Sooqr</name>
|
| 4 |
-
<version>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-04-
|
| 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="
|
| 16 |
<compatible/>
|
| 17 |
-
<dependencies
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Magmodules_Sooqr</name>
|
| 4 |
+
<version>1.1.0</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>magmodules</user><email>info@magmodules.nl</email></author></authors>
|
| 13 |
+
<date>2016-04-28</date>
|
| 14 |
+
<time>10:06:24</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="387c6c08d987e6e5ff0b844540586285"/><file name="Heading.php" hash="a89db4f294f9c9e6785745163b1aed5f"/><file name="Note.php" hash="f131e40d8a0f4ed2e444d9e692a91ed5"/><file name="Version.php" hash="f71fe94b80dbcde3fbc6e763f5224f86"/></dir></dir></dir></dir><dir name="Widget"><dir name="Info"><file name="Info.php" hash="2e283e75b6af11273b34994894932132"/></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="4a007538ff88c296789899c32ed90e3a"/></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="0b63acba113e8835929cdfe9ae8f16ec"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="SooqrController.php" hash="9e3b65dc743fad313bab7ee198895a8d"/></dir><file name="InstallationController.php" hash="a96e58cbab2c7b6a3a4c9b42de62a59f"/></dir><dir name="etc"><file name="adminhtml.xml" hash="3f450c304adfd64d95814e552e41398d"/><file name="config.xml" hash="6ecfa78e7485004b8a5f854b3a7db84f"/><file name="system.xml" hash="54460f3418fd5924b4fd46b473a94843"/></dir></dir></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Magmodules_Sooqr.csv" hash="38992a5f4cf87eeee3d06ab38ead900b"/></dir><dir name="nl_NL"><file name="Magmodules_Sooqr.csv" hash="2fe3afa7c7597cf53c985aef2388ae24"/></dir></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><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
| 18 |
</package>
|
