Merge pull request #777 from magento-mpi/mpi-pr-ce-s85

[MPI]Sprint-85
magento · Jan 27, 2017 · 8f95b3d · 8f95b3d
2 parents 02e1c6b + f7bad54
commit 8f95b3d
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 2 deletions.
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
@@ -23,6 +23,7 @@
                 <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Info" name="order_tab_info" template="order/view/tab/info.phtml">
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Messages" name="order_messages"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
+                    <container name="order_additional_info"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Items" name="order_items" template="order/view/items.phtml">
                         <arguments>
                             <argument name="columns" xsi:type="array">

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
@@ -40,6 +40,8 @@
     </div>
 </section>
 
+<?php echo $block->getChildHtml('order_additional_info') ?>
+
 <?php echo $block->getGiftOptionsHtml() ?>
 
 <section class="admin__page-section">

diff --git a/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less
@@ -0,0 +1,13 @@
+// /**
+//  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Order Case Info
+//  ---------------------------------------------
+
+.order-case-table {
+  &:extend(.abs-order-tables all);
+  &:extend(.abs-order-tbody-border all);
+}
diff --git a/app/etc/di.xml b/app/etc/di.xml
@@ -18,6 +18,8 @@
     <preference for="Magento\Framework\Search\Adapter\Mysql\Field\FieldInterface" type="Magento\Framework\Search\Adapter\Mysql\Field\Field"/>
     <preference for="Magento\Framework\Search\Adapter\Aggregation\AggregationResolverInterface" type="Magento\Framework\Search\Adapter\Aggregation\AggregationResolver"/>
     <preference for="Magento\Framework\App\RequestInterface" type="Magento\Framework\App\Request\Http" />
+    <preference for="Magento\Framework\App\PlainTextRequestInterface" type="Magento\Framework\App\Request\Http" />
+    <preference for="Magento\Framework\App\RequestContentInterface" type="Magento\Framework\App\Request\Http" />
     <preference for="Magento\Framework\App\Request\PathInfoProcessorInterface" type="Magento\Store\App\Request\PathInfoProcessor" />
     <preference for="Magento\Framework\App\ResponseInterface" type="Magento\Framework\App\Response\Http" />
     <preference for="Magento\Framework\App\RouterListInterface" type="Magento\Framework\App\RouterList" />

diff --git a/lib/internal/Magento/Framework/App/PlainTextRequestInterface.php b/lib/internal/Magento/Framework/App/PlainTextRequestInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App;
+
+/**
+ * Interface provides low-level access to Magento Application Request and represent it as a simple string.
+ * This interface does not define format of the request content.
+ * Clients of this interface must be able to validate syntax of request and parse it.
+ *
+ * To read already parsed request data use \Magento\Framework\App\RequestInterface.
+ *
+ * @api
+ */
+interface PlainTextRequestInterface
+{
+    /**
+     * Returns textual representation of request to Magento.
+     *
+     * @return string
+     */
+    public function getContent();
+}
diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\App\Request;
 
-use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\RequestContentInterface;
 use Magento\Framework\App\RequestSafetyInterface;
 use Magento\Framework\App\Route\ConfigInterface\Proxy as ConfigInterface;
 use Magento\Framework\HTTP\PhpEnvironment\Request;
@@ -16,7 +16,7 @@
 /**
  * Http request
  */
-class Http extends Request implements RequestInterface, RequestSafetyInterface
+class Http extends Request implements RequestContentInterface, RequestSafetyInterface
 {
     /**#@+
      * HTTP Ports

diff --git a/lib/internal/Magento/Framework/App/RequestContentInterface.php b/lib/internal/Magento/Framework/App/RequestContentInterface.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App;
+
+/**
+ * Interface provides access to parsed request data as well as to the request textual representation.
+ * This interface exists to provide backward compatibility.
+ * Direct usage of RequestInterface and PlainTextRequestInterface is preferable.
+ *
+ * @api
+ */
+interface RequestContentInterface extends RequestInterface, PlainTextRequestInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -178,6 +178,9 @@ public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '
             curl_setopt($this->_getResource(), CURLOPT_POSTFIELDS, $body);
         } elseif ($method == \Zend_Http_Client::GET) {
             curl_setopt($this->_getResource(), CURLOPT_HTTPGET, true);
+        } elseif ($method == \Zend_Http_Client::PUT) {
+            curl_setopt($this->_getResource(), CURLOPT_CUSTOMREQUEST, \Zend_Http_Client::PUT);
+            curl_setopt($this->_getResource(), CURLOPT_POSTFIELDS, $body);
         }
 
         if (is_array($headers)) {