magento
diff --git a/‎app/code/Magento/Backend/etc/di.xml
Lines changed: 0 additions & 1 deletion b/‎app/code/Magento/Backend/etc/di.xml
Lines changed: 0 additions & 1 deletion
diff --git a/‎app/code/Magento/Checkout/Controller/Cart/Configure.php
Lines changed: 7 additions & 6 deletions b/‎app/code/Magento/Checkout/Controller/Cart/Configure.php
Lines changed: 7 additions & 6 deletions
diff --git a/‎app/code/Magento/Checkout/Controller/Cart/Index.php
Lines changed: 1 addition & 0 deletions b/‎app/code/Magento/Checkout/Controller/Cart/Index.php
Lines changed: 1 addition & 0 deletions
diff --git a/‎app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
Lines changed: 3 additions & 0 deletions b/‎app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
Lines changed: 3 additions & 0 deletions
diff --git a/‎app/code/Magento/Core/etc/di.xml
Lines changed: 0 additions & 2 deletions b/‎app/code/Magento/Core/etc/di.xml
Lines changed: 0 additions & 2 deletions
diff --git a/‎app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml
Lines changed: 3 additions & 0 deletions b/‎app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml
Lines changed: 3 additions & 0 deletions
diff --git a/‎app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php
Lines changed: 32 additions & 0 deletions b/‎app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php
Lines changed: 32 additions & 0 deletions
diff --git a/‎app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
Lines changed: 1 addition & 21 deletions b/‎app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
Lines changed: 1 addition & 21 deletions
diff --git a/‎app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
Lines changed: 1 addition & 21 deletions b/‎app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
Lines changed: 1 addition & 21 deletions
diff --git a/‎app/code/Magento/OfflinePayments/Model/Banktransfer.php
Lines changed: 0 additions & 10 deletions b/‎app/code/Magento/OfflinePayments/Model/Banktransfer.php
Lines changed: 0 additions & 10 deletions
@@ -12,7 +12,6 @@
     <preference for="Magento\Backend\Model\Config\Structure\SearchInterface" type="Magento\Backend\Model\Config\Structure" />
     <preference for="Magento\Backend\Model\Config\Backend\File\RequestData\RequestDataInterface" type="Magento\Backend\Model\Config\Backend\File\RequestData" />
     <preference for="Magento\Backend\Model\Auth\Credential\StorageInterface" type="Magento\User\Model\User" />
-    <preference for="Magento\Adminhtml\Helper\Data" type="Magento\Backend\Helper\Data" />
     <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
     <preference for="Magento\Backend\Model\UrlInterface" type="Magento\Backend\Model\Url" />
     <preference for="Magento\Backend\Block\Widget\Button\ToolbarInterface" type="Magento\Backend\Block\Widget\Button\Toolbar" />
 
@@ -44,18 +44,19 @@ public function execute()
     {
         // Extract item and product to configure
         $id = (int)$this->getRequest()->getParam('id');
+        $productId = (int)$this->getRequest()->getParam('product_id');
         $quoteItem = null;
         if ($id) {
             $quoteItem = $this->cart->getQuote()->getItemById($id);
         }
 
-        if (!$quoteItem) {
-            $this->messageManager->addError(__("We can't find the quote item."));
-            $this->_redirect('checkout/cart');
-            return;
-        }
-
         try {
+            if (!$quoteItem || $productId != $quoteItem->getProduct()->getId()) {
+                $this->messageManager->addError(__("We can't find the quote item."));
+                $this->_redirect('checkout/cart');
+                return;
+            }
+
             $params = new \Magento\Framework\Object();
             $params->setCategoryId(false);
             $params->setConfigureMode(true);
 
@@ -15,6 +15,7 @@ class Index extends \Magento\Checkout\Controller\Cart
      */
     public function execute()
     {
+        $this->_eventManager->dispatch('collect_totals_failed_items');
         if ($this->cart->getQuote()->getItemsCount()) {
             $this->cart->init();
             $this->cart->save();
 
@@ -6,6 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
+    <head>
+        <title>Success Page</title>
+    </head>
     <body>
         <referenceBlock name="page.main.title">
             <block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success.print.button" template="button.phtml"/>
 
@@ -14,14 +14,12 @@
     <preference for="Magento\Framework\Authorization\PolicyInterface" type="Magento\Framework\Authorization\Policy\DefaultPolicy" />
     <preference for="Magento\Framework\Authorization\RoleLocatorInterface" type="Magento\Framework\Authorization\RoleLocator\DefaultRoleLocator" />
     <preference for="Magento\Framework\Session\SessionManagerInterface" type="Magento\Framework\Session\Generic" />
-    <preference for="Magento\Core\Model\DataService\ConfigInterface" type="Magento\Core\Model\DataService\Config" />
     <preference for="Magento\Framework\App\Config\ScopeConfigInterface" type="Magento\Framework\App\Config" />
     <preference for="Magento\Framework\App\Config\ReinitableConfigInterface" type="Magento\Framework\App\ReinitableConfig" />
     <preference for="Magento\Framework\App\Config\MutableScopeConfigInterface" type="Magento\Framework\App\MutableScopeConfig" />
     <preference for="Magento\Framework\App\Config\Storage\WriterInterface" type="Magento\Framework\App\Config\Storage\Writer" />
     <preference for="Magento\Framework\View\Design\Theme\FileInterface" type="Magento\Core\Model\Theme\File" />
     <preference for="Magento\Framework\Config\ConverterInterface" type="Magento\Framework\Config\Converter\Dom"/>
-    <preference for="Magento\Core\Model\Url\SecurityInfoInterface" type="Magento\Core\Model\Url\SecurityInfo\Proxy" />
     <preference for="Magento\Framework\App\DefaultPathInterface" type="Magento\Framework\App\DefaultPath\DefaultPath" />
     <preference for="Magento\Framework\Encryption\EncryptorInterface" type="Magento\Framework\Encryption\Encryptor" />
     <preference for="Magento\Framework\Filter\Encrypt\AdapterInterface" type="Magento\Framework\Filter\Encrypt\Basic" />
 
@@ -7,6 +7,9 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <update handle="multishipping_checkout"/>
+    <head>
+        <title>Success Page</title>
+    </head>
     <body>
         <referenceBlock name="page.main.title">
             <action method="setPageTitle">
 
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\OfflinePayments\Block\Form;
+
+/**
+ * Abstract class for Cash On Delivery and Bank Transfer payment method form
+ */
+abstract class AbstractInstruction extends \Magento\Payment\Block\Form
+{
+    /**
+     * Instructions text
+     *
+     * @var string
+     */
+    protected $_instructions;
+
+    /**
+     * Get instructions text from config
+     *
+     * @return string
+     */
+    public function getInstructions()
+    {
+        if (is_null($this->_instructions)) {
+            $this->_instructions = $this->getMethod()->getInstructions();
+        }
+        return $this->_instructions;
+    }
+}
@@ -8,32 +8,12 @@
 /**
  * Block for Bank Transfer payment method form
  */
-class Banktransfer extends \Magento\Payment\Block\Form
+class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstruction
 {
-    /**
-     * Instructions text
-     *
-     * @var string
-     */
-    protected $_instructions;
-
     /**
      * Bank transfer template
      *
      * @var string
      */
     protected $_template = 'form/banktransfer.phtml';
-
-    /**
-     * Get instructions text from config
-     *
-     * @return string
-     */
-    public function getInstructions()
-    {
-        if (is_null($this->_instructions)) {
-            $this->_instructions = $this->getMethod()->getInstructions();
-        }
-        return $this->_instructions;
-    }
 }
@@ -8,32 +8,12 @@
 /**
  * Block for Cash On Delivery payment method form
  */
-class Cashondelivery extends \Magento\Payment\Block\Form
+class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruction
 {
-    /**
-     * Instructions text
-     *
-     * @var string
-     */
-    protected $_instructions;
-
     /**
      * Cash on delivery template
      *
      * @var string
      */
     protected $_template = 'form/cashondelivery.phtml';
-
-    /**
-     * Get instructions text from config
-     *
-     * @return string
-     */
-    public function getInstructions()
-    {
-        if (is_null($this->_instructions)) {
-            $this->_instructions = $this->getMethod()->getInstructions();
-        }
-        return $this->_instructions;
-    }
 }
@@ -39,14 +39,4 @@ class Banktransfer extends \Magento\Payment\Model\Method\AbstractMethod
      * @var bool
      */
     protected $_isOffline = true;
-
-    /**
-     * Get instructions text from config
-     *
-     * @return string
-     */
-    public function getInstructions()
-    {
-        return trim($this->getConfigData('instructions'));
-    }
 }
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ class Index extends \Magento\Checkout\Controller\Cart`
`15`	`15`	`*/`
`16`	`16`	`public function execute()`
`17`	`17`	`{`
	`18`	`+ $this->_eventManager->dispatch('collect_totals_failed_items');`
`18`	`19`	`if ($this->cart->getQuote()->getItemsCount()) {`
`19`	`20`	`$this->cart->init();`
`20`	`21`	`$this->cart->save();`