Merge remote-tracking branch 'origin/ref-2940' into ref-2940

OpenMage · Oct 14, 2024 · 99defaf · 99defaf
2 parents 9085a10 + 30f22b3
commit 99defaf
Show file tree

Hide file tree

Showing 11 changed files with 241 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -283,6 +283,7 @@ UPS shut down their old CGI APIs so we removed the support for it from the Mage_
 - `catalog/search/search_separator`
 - `dev/log/max_level`
 - `newsletter/security/enable_form_key`
+- `rss/admin_order/new_period`
 - `sitemap/category/lastmod`
 - `sitemap/page/lastmod`
 - `sitemap/product/lastmod`

diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php
@@ -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'));
         }

diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php
@@ -189,7 +189,7 @@ protected function _prepareColumns()
                                 'ret'       => (Mage::registry('usePendingFilter')) ? 'pending' : null
                             ]
                         ],
-                         'field'   => 'id'
+                        'field'   => 'id'
                     ]
                 ],
                 'filter'    => false,
@@ -198,8 +198,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'));
         }

diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php
@@ -141,11 +141,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'));

diff --git a/app/code/core/Mage/Rss/Block/Order/New.php b/app/code/core/Mage/Rss/Block/Order/New.php
@@ -44,9 +44,11 @@ protected function _construct()
      */
     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]);
@@ -65,6 +67,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]);

diff --git a/app/code/core/Mage/Rss/Helper/Data.php b/app/code/core/Mage/Rss/Helper/Data.php
@@ -24,7 +24,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';
 
@@ -131,4 +135,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);
+    }
 }
diff --git a/app/code/core/Mage/Rss/etc/config.xml b/app/code/core/Mage/Rss/etc/config.xml
@@ -113,6 +113,11 @@
         </layout>
     </frontend>
     <default>
+        <rss>
+            <admin_order>
+                <new_period>7</new_period>
+            </admin_order>
+        </rss>
         <validators>
             <custom_layout>
                 <disallowed_block>

diff --git a/app/code/core/Mage/Rss/etc/system.xml b/app/code/core/Mage/Rss/etc/system.xml
@@ -50,7 +50,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>
@@ -140,7 +140,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>
@@ -174,26 +174,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>
@@ -204,7 +198,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>
@@ -213,6 +207,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>

diff --git a/app/locale/en_US/Mage_Rss.csv b/app/locale/en_US/Mage_Rss.csv
@@ -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"

diff --git a/composer.json b/composer.json
@@ -32,10 +32,12 @@
         "phpseclib/mcrypt_compat": "^2.0.3",
         "phpseclib/phpseclib": "^3.0.14",
         "shardj/zf1-future": "1.24.0",
-        "symfony/polyfill-php74": "^1.29",
-        "symfony/polyfill-php80": "^1.29",
-        "symfony/polyfill-php81": "^1.29",
-        "symfony/polyfill-php82": "^1.29"
+        "symfony/polyfill-php74": "^1.31",
+        "symfony/polyfill-php80": "^1.31",
+        "symfony/polyfill-php81": "^1.31",
+        "symfony/polyfill-php82": "^1.31",
+        "symfony/polyfill-php83": "^1.31",
+        "symfony/polyfill-php84": "^1.31"
     },
     "require-dev": {
         "ext-xmlreader": "*",