Skip to content

Commit

Permalink
OM PR 4243
Browse files Browse the repository at this point in the history
fballiano committed Oct 14, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 5bc82bf commit 1fa9004
Showing 8 changed files with 69 additions and 21 deletions.
3 changes: 1 addition & 2 deletions app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php
Original file line number Diff line number Diff line change
@@ -291,8 +291,7 @@ protected function _prepareColumns()
);

if (Mage::helper('catalog')->isModuleEnabled('Mage_Rss') &&
Mage::helper('rss')->isRssEnabled() &&
Mage::getStoreConfigFlag('rss/catalog/notifystock')
Mage::helper('rss')->isRssAdminCatalogNotifyStockEnabled()
) {
$this->addRssList('rss/catalog/notifystock', Mage::helper('catalog')->__('Notify Low Stock RSS'));
}
5 changes: 2 additions & 3 deletions app/code/core/Mage/Adminhtml/Block/Review/Grid.php
Original file line number Diff line number Diff line change
@@ -188,7 +188,7 @@ protected function _prepareColumns()
'ret' => (Mage::registry('usePendingFilter')) ? 'pending' : null
]
],
'field' => 'id'
'field' => 'id'
]
],
'filter' => false,
@@ -197,8 +197,7 @@ protected function _prepareColumns()
);

if (Mage::helper('catalog')->isModuleEnabled('Mage_Rss') &&
Mage::helper('rss')->isRssEnabled() &&
Mage::getStoreConfigFlag('rss/catalog/review')
Mage::helper('rss')->isRssAdminCatalogReviewEnabled()
) {
$this->addRssList('rss/catalog/review', Mage::helper('catalog')->__('Pending Reviews RSS'));
}
14 changes: 9 additions & 5 deletions app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php
Original file line number Diff line number Diff line change
@@ -140,11 +140,15 @@ protected function _prepareColumns()
);
}

if (Mage::helper('catalog')->isModuleEnabled('Mage_Rss') &&
Mage::helper('rss')->isRssEnabled() &&
Mage::getStoreConfigFlag('rss/order/new')
) {
$this->addRssList('rss/order/new', Mage::helper('sales')->__('New Order RSS'));
if (Mage::helper('sales')->isModuleOutputEnabled('Mage_Rss')) {
$filterString = $this->getParam($this->getVarNameFilter());
$filter = Mage::helper('adminhtml')->prepareFilterString($filterString);
$storeId = array_key_exists('store_id', $filter) ? $filter['store_id'] : null;

if (Mage::helper('rss')->isRssAdminOrderNewEnabled($storeId)) {
$slug = $storeId ? '/store/' . $storeId : '';
$this->addRssList('rss/order/new' . $slug, Mage::helper('sales')->__('New Order RSS'));
}
}

$this->addExportType('*/*/exportCsv', Mage::helper('sales')->__('CSV'));
8 changes: 7 additions & 1 deletion app/code/core/Mage/Rss/Block/Order/New.php
Original file line number Diff line number Diff line change
@@ -43,9 +43,11 @@ protected function _construct()
#[\Override]
protected function _toHtml()
{
$storeId = $this->getRequest()->getParam('store');
$order = Mage::getModel('sales/order');
$period = Mage::helper('rss')->getRssAdminOrderNewPeriod($storeId);
$passDate = $order->getResource()->formatDate(
mktime(0, 0, 0, (int)date('m'), (int)date('d') - 7)
mktime(0, 0, 0, (int)date('m'), (int)date('d') - $period)
);

$newurl = Mage::helper('adminhtml')->getUrl('adminhtml/sales_order', ['_secure' => true, '_nosecret' => true]);
@@ -64,6 +66,10 @@ protected function _toHtml()
->addAttributeToSort('created_at', 'desc')
;

if ($storeId) {
$collection->addAttributeToFilter('store_id', $storeId);
}

$detailBlock = Mage::getBlockSingleton('rss/order_details');

Mage::dispatchEvent('rss_order_new_collection_select', ['collection' => $collection]);
32 changes: 31 additions & 1 deletion app/code/core/Mage/Rss/Helper/Data.php
Original file line number Diff line number Diff line change
@@ -20,7 +20,11 @@ class Mage_Rss_Helper_Data extends Mage_Core_Helper_Abstract
/**
* Config path to RSS field
*/
public const XML_PATH_RSS_ACTIVE = 'rss/config/active';
public const XML_PATH_RSS_ACTIVE = 'rss/config/active';
public const XML_PATH_RSS_ADMIN_CATALOG_NOTIFYSTOCK = 'rss/admin_catalog/notifystock';
public const XML_PATH_RSS_ADMIN_CATALOG_REVIEW = 'rss/admin_catalog/review';
public const XML_PATH_RSS_ADMIN_ORDER_NEW = 'rss/admin_order/new';
public const XML_PATH_RSS_ADMIN_ORDER_NEW_PERIOD = 'rss/admin_order/new_period';

protected $_moduleName = 'Mage_Rss';

@@ -127,4 +131,30 @@ public function isRssEnabled()
{
return Mage::getStoreConfigFlag(self::XML_PATH_RSS_ACTIVE);
}

public function isRssAdminCatalogNotifyStockEnabled(): bool
{
return $this->isRssEnabled() && Mage::getStoreConfigFlag(self::XML_PATH_RSS_ADMIN_CATALOG_NOTIFYSTOCK);
}

public function isRssAdminCatalogReviewEnabled(): bool
{
return $this->isRssEnabled() && Mage::getStoreConfigFlag(self::XML_PATH_RSS_ADMIN_CATALOG_REVIEW);
}

/**
* @param null|string|bool|int|Mage_Core_Model_Store $store
*/
public function isRssAdminOrderNewEnabled($store = null): bool
{
return $this->isRssEnabled() && Mage::getStoreConfigFlag(self::XML_PATH_RSS_ADMIN_ORDER_NEW, $store);
}

/**
* @param null|string|bool|int|Mage_Core_Model_Store $store
*/
public function getRssAdminOrderNewPeriod($store = null): int
{
return (int)Mage::getStoreConfig(self::XML_PATH_RSS_ADMIN_ORDER_NEW_PERIOD, $store);
}
}
5 changes: 5 additions & 0 deletions app/code/core/Mage/Rss/etc/config.xml
Original file line number Diff line number Diff line change
@@ -108,6 +108,11 @@
</layout>
</frontend>
<default>
<rss>
<admin_order>
<new_period>7</new_period>
</admin_order>
</rss>
<validators>
<custom_layout>
<disallowed_block>
22 changes: 13 additions & 9 deletions app/code/core/Mage/Rss/etc/system.xml
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<fields>
<active translate="label">
<active translate="label">
<label>Enable RSS</label>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_enabledisable</source_model>
@@ -136,7 +136,7 @@
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<fields>
<status_notified translate="label comment">
<status_notified translate="label comment">
<label>Customer Order Status Notification</label>
<comment>Enabling can increase security risk by exposing some order details.</comment>
<frontend_type>select</frontend_type>
@@ -170,26 +170,20 @@
<label>Admin Catalog</label>
<sort_order>5</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<fields>
<review translate="label">
<label>Review Notification</label>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_enabledisable</source_model>
<sort_order>10</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</review>
<notifystock translate="label">
<label>Stock Notification</label>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_enabledisable</source_model>
<sort_order>20</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</notifystock>
</fields>
</admin_catalog>
@@ -200,7 +194,7 @@
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<fields>
<new translate="label">
<new translate="label">
<label>New Order Notification</label>
<frontend_type>select</frontend_type>
<source_model>adminhtml/system_config_source_enabledisable</source_model>
@@ -209,6 +203,16 @@
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
</new>
<new_period translate="label">
<label>New Order Period (days)</label>
<validate>validate-digits</validate>
<sort_order>20</sort_order>
<show_in_default>1</show_in_default>
<show_in_website>1</show_in_website>
<show_in_store>1</show_in_store>
<depends><new>1</new></depends>
<validate>required-entry validate-digits validate-greater-than-zero</validate>
</new_period>
</fields>
</admin_order>
</groups>
1 change: 1 addition & 0 deletions app/locale/en_US/Mage_Rss.csv
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@
"Message:","Message:"
"Miscellaneous Feeds","Miscellaneous Feeds"
"New Order Notification","New Order Notification"
"New Order Period (days)","New Order Period (days)"
"New Orders","New Orders"
"New Products","New Products"
"New Products from %s","New Products from %s"

0 comments on commit 1fa9004

Please sign in to comment.