Merge remote-tracking branch 'mainline/develop' into develop

Author: Mike Weis

app/code/Magento/Backend/Model/Url.php

@@ -86,6 +86,7 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
      * @param \Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolverFactory
      * @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Framework\Url\RouteParamsPreprocessorInterface $routeParamsPreprocessor
      * @param string $scopeType
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param Menu\Config $menuConfig
@@ -108,6 +109,7 @@ public function __construct(
         \Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolverFactory,
         \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Framework\Url\RouteParamsPreprocessorInterface $routeParamsPreprocessor,
         $scopeType,
         \Magento\Backend\Helper\Data $backendHelper,
         \Magento\Backend\Model\Menu\Config $menuConfig,
@@ -129,6 +131,7 @@ public function __construct(
             $routeParamsResolverFactory,
             $queryParamsResolver,
             $scopeConfig,
+            $routeParamsPreprocessor,
             $scopeType,
             $data
         );

app/code/Magento/Sales/Api/Data/ShippingAssignmentInterface.php

@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Api\Data;
+
+use Magento\Framework\Api\ExtensibleDataInterface;
+
+/**
+ * Interface ShippingAssignmentInterface
+ */
+interface ShippingAssignmentInterface extends ExtensibleDataInterface
+{
+    /**#@+
+     * Shipping assignment object data keys
+     */
+    const KEY_SHIPPING = 'shipping';
+
+    const KEY_ITEMS = 'items';
+
+    const KEY_STOCK_ID = 'stock_id';
+    /**#@-*/
+
+    /**
+     * Gets shipping object
+     *
+     * @return \Magento\Sales\Api\Data\ShippingInterface
+     */
+    public function getShipping();
+
+    /**
+     * Gets order items of shipping assignment
+     *
+     * @return \Magento\Sales\Api\Data\OrderItemInterface[]
+     */
+    public function getItems();
+
+    /**
+     * Gets stock id
+     *
+     * @return int|null
+     */
+    public function getStockId();
+
+    /**
+     * Sets shipping
+     *
+     * @param \Magento\Sales\Api\Data\ShippingInterface $shipping
+     * @return $this
+     */
+    public function setShipping(\Magento\Sales\Api\Data\ShippingInterface $shipping);
+
+    /**
+     * Sets order items to shipping assignment
+     *
+     * @param \Magento\Sales\Api\Data\OrderItemInterface[] $items
+     * @return $this
+     */
+    public function setItems(array $items);
+
+    /**
+     * Sets stock id
+     *
+     * @param int|null $stockId
+     * @return $this
+     */
+    public function setStockId($stockId = null);
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
+     *
+     * @return \Magento\Sales\Api\Data\ShippingAssignmentExtensionInterface|null
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\Sales\Api\Data\ShippingAssignmentExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\Sales\Api\Data\ShippingAssignmentExtensionInterface $extensionAttributes
+    );
+}

app/code/Magento/Sales/Api/Data/ShippingInterface.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Api\Data;
+
+/**
+ * Interface ShippingInterface
+ */
+interface ShippingInterface extends \Magento\Framework\Api\ExtensibleDataInterface
+{
+    /**#@+
+     * Shipping object data keys
+     */
+    const KEY_ADDRESS = 'address';
+
+    const KEY_METHOD = 'method';
+
+    const KEY_TOTAL = 'total';
+    /**#@-*/
+
+    /**
+     * Gets shipping address
+     *
+     * @return \Magento\Sales\Api\Data\OrderAddressInterface|null
+     */
+    public function getAddress();
+
+    /**
+     * Gets shipping method
+     *
+     * @return string|null
+     */
+    public function getMethod();
+
+    /**
+     * Gets object with shipping totals
+     *
+     * @return \Magento\Sales\Api\Data\TotalInterface|null
+     */
+    public function getTotal();
+
+    /**
+     * Sets address to shipping
+     *
+     * @param \Magento\Sales\Api\Data\OrderAddressInterface $address
+     * @return $this
+     */
+    public function setAddress(\Magento\Sales\Api\Data\OrderAddressInterface $address);
+
+    /**
+     * Sets method to shipping
+     *
+     * @param string $method
+     * @return $this
+     */
+    public function setMethod($method);
+
+    /**
+     * Sets total object to shipping
+     *
+     * @param \Magento\Sales\Api\Data\TotalInterface $total
+     * @return $this
+     */
+    public function setTotal(\Magento\Sales\Api\Data\TotalInterface $total);
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
+     *
+     * @return \Magento\Sales\Api\Data\ShippingExtensionInterface|null
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\Sales\Api\Data\ShippingExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\Sales\Api\Data\ShippingExtensionInterface $extensionAttributes
+    );
+}