Merge branch '20.0' into remove_pagecache_module

Author: fballiano

README.md

@@ -94,6 +94,7 @@ Do not use 20.x.x if you need IE support.
 - reduce needless saves by avoiding setting `_hasDataChanges` flag #2066
 - removed support for `global/sales/old_fields_map` defined in XML #921
 - removed Mage_PageCache module #2258
+- removed lib/flex containing unused ActionScript "file uploader" files #2271
 
 For full list of changes, you can [compare tags](https://github.com/OpenMage/magento-lts/compare/1.9.4.x...20.0).
 

app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest.php

@@ -37,6 +37,7 @@ abstract class Mage_Sales_Model_Api2_Order_Comment_Rest extends Mage_Sales_Model
      * Parameters in request used in model (usually specified in route mask)
      */
     const PARAM_ORDER_ID = 'id';
+    const PARAM_COMMENT_ID = 'comment_id';
     /**#@-*/
 
     /**

app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php

@@ -33,4 +33,68 @@
  */
 class Mage_Sales_Model_Api2_Order_Comment_Rest_Admin_V1 extends Mage_Sales_Model_Api2_Order_Comment_Rest
 {
+    /**
+     * Add comment to order
+     * 
+     * @param array $data
+     * @return string
+     */
+    protected function _create(array $data)
+    {
+        $orderId = $this->getRequest()->getParam(self::PARAM_ORDER_ID);
+        $order   = $this->_loadOrderById($orderId);
+
+        $status         = $data['status'] ?? false;
+        $comment        = $data['comment'] ?? '';
+        $visibleOnFront = $data['is_visible_on_front'] ?? 0;
+        $notifyCustomer = array_key_exists('is_customer_notified', $data) ? $data['is_customer_notified'] : false;
+
+        $historyItem = $order->addStatusHistoryComment($comment, $status);
+        $historyItem->setIsCustomerNotified($notifyCustomer)
+            ->setIsVisibleOnFront((int) $visibleOnFront)
+            ->save();
+
+        try {
+            $oldStore = Mage::getDesign()->getStore();
+            $oldArea = Mage::getDesign()->getArea();
+
+            if ($notifyCustomer && $comment) {
+                Mage::getDesign()->setStore($order->getStoreId());
+                Mage::getDesign()->setArea('frontend');
+            }
+
+            $order->save();
+            $order->sendOrderUpdateEmail((bool) $notifyCustomer, $comment);
+
+            if ($notifyCustomer && $comment) {
+                Mage::getDesign()->setStore($oldStore);
+                Mage::getDesign()->setArea($oldArea);
+            }
+        } catch (Mage_Core_Exception $e) {
+            $this->_critical($e->getMessage(), self::RESOURCE_INTERNAL_ERROR);
+        } catch (Throwable $t) {
+            Mage::logException($t);
+            $this->_critical($t->getMessage(), self::RESOURCE_UNKNOWN_ERROR);
+        }
+
+        return $this->_getLocation($historyItem);
+    }
+
+    /**
+     * Retrieve order comment by id
+     * 
+     * @return array
+     */
+    protected function _retrieve()
+    {
+        $comment = Mage::getModel('sales/order_status_history')->load(
+            $this->getRequest()->getParam(self::PARAM_COMMENT_ID)
+        );
+
+        if (!$comment->getId()) {
+            $this->_critical(self::RESOURCE_NOT_FOUND);
+        }
+
+        return $comment->getData();
+    }
 }

app/code/core/Mage/Sales/etc/api2.xml

@@ -308,6 +308,7 @@
                 <title>Order Comments</title>
                 <privileges>
                     <admin>
+                        <create>1</create>
                         <retrieve>1</retrieve>
                     </admin>
                     <customer>
@@ -328,6 +329,10 @@
                     </customer>
                 </force_attributes>
                 <routes>
+                    <route_entity>
+                        <route>/orders/comments/:comment_id</route>
+                        <action_type>entity</action_type>
+                    </route_entity>
                     <route_collection>
                         <route>/orders/:id/comments</route>
                         <action_type>collection</action_type>

js/.htaccess

@@ -0,0 +1,16 @@
+############################################
+## Disable PHP code execution
+
+<IfModule mod_php7.c>
+    php_flag engine 0
+</IfModule>
+
+<IfModule mod_php8.c>
+    php_flag engine 0 
+</IfModule>
+
+############################################
+## Don't permit execution of CGI scripts
+
+    AddHandler cgi-script .php .pl .py .jsp .asp .sh .cgi
+    Options -ExecCGI