Merge remote-tracking branch 'origin/develop' into PR

Author: Oleksandr Dubovyk

app/code/Magento/Backend/Model/Locale/Manager.php

@@ -26,22 +26,30 @@ class Manager
      * @var \Magento\Framework\TranslateInterface
      */
     protected $_translator;
+    
+    /**
+     * @var \Magento\Backend\App\ConfigInterface
+     */
+    protected $_backendConfig;
 
     /**
      * Constructor
      *
      * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\TranslateInterface $translator
+     * @param \Magento\Backend\App\ConfigInterface $backendConfig
      */
     public function __construct(
         \Magento\Backend\Model\Session $session,
         \Magento\Backend\Model\Auth\Session $authSession,
-        \Magento\Framework\TranslateInterface $translator
+        \Magento\Framework\TranslateInterface $translator,
+        \Magento\Backend\App\ConfigInterface $backendConfig
     ) {
         $this->_session = $session;
         $this->_authSession = $authSession;
         $this->_translator = $translator;
+        $this->_backendConfig = $backendConfig;
     }
 
     /**
@@ -53,28 +61,40 @@ public function __construct(
     public function switchBackendInterfaceLocale($localeCode)
     {
         $this->_session->setSessionLocale(null);
-
+        
         $this->_authSession->getUser()->setInterfaceLocale($localeCode);
-
+        
         $this->_translator->setLocale($localeCode)->loadData(null, true);
-
+        
         return $this;
     }
 
+    /**
+     * Get general interface locale 
+     *
+     * @return string
+     */
+    public function getGeneralLocale()
+    {
+        return $this->_backendConfig->getValue('general/locale/code');
+    }
+
     /**
      * Get user interface locale stored in session data
      *
      * @return string
      */
     public function getUserInterfaceLocale()
     {
-        $interfaceLocale = \Magento\Framework\Locale\Resolver::DEFAULT_LOCALE;
-
         $userData = $this->_authSession->getUser();
+        $interfaceLocale = \Magento\Framework\Locale\Resolver::DEFAULT_LOCALE;
+        
         if ($userData && $userData->getInterfaceLocale()) {
             $interfaceLocale = $userData->getInterfaceLocale();
+        } elseif ($this->getGeneralLocale()) {
+            $interfaceLocale = $this->getGeneralLocale();
         }
-
+        
         return $interfaceLocale;
     }
 }

app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php

@@ -15,7 +15,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     protected $_model;
 
     /**
-     * @var \Magento\Framework\TranslateInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\TranslateInterface
      */
     protected $_translator;
 
@@ -25,9 +25,14 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     protected $_session;
 
     /**
-     * @var \Magento\Backend\Model\Auth\Session
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session
      */
     protected $_authSession;
+    
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\App\ConfigInterface
+     */
+    protected $_backendConfig;
 
     protected function setUp()
     {
@@ -40,7 +45,9 @@ protected function setUp()
             '',
             false
         );
-
+        
+        $this->_backendConfig = $this->getMockForAbstractClass('Magento\Backend\App\ConfigInterface', [], '', false);
+        
         $userMock = new \Magento\Framework\DataObject();
 
         $this->_authSession->expects($this->any())->method('getUser')->will($this->returnValue($userMock));
@@ -54,7 +61,8 @@ protected function setUp()
         $this->_model = new \Magento\Backend\Model\Locale\Manager(
             $this->_session,
             $this->_authSession,
-            $this->_translator
+            $this->_translator,
+            $this->_backendConfig
         );
     }
 
@@ -102,4 +110,17 @@ public function testGetUserInterfaceLocale()
 
         $this->assertEquals($locale, 'de_DE');
     }
+
+    /**
+     * @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
+     */
+    public function testGetUserInterfaceGeneralLocale()
+    {
+        $this->_backendConfig->expects($this->any())
+            ->method('getValue')
+            ->with('general/locale/code')
+            ->willReturn('test_locale');
+        $locale = $this->_model->getUserInterfaceLocale();
+        $this->assertEquals($locale, 'test_locale');
+    }
 }

app/code/Magento/Bundle/Model/Product/CopyConstructor/Bundle.php

@@ -5,58 +5,30 @@
  */
 namespace Magento\Bundle\Model\Product\CopyConstructor;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type;
+
 class Bundle implements \Magento\Catalog\Model\Product\CopyConstructorInterface
 {
     /**
      * Duplicating bundle options and selections
      *
-     * @param \Magento\Catalog\Model\Product $product
-     * @param \Magento\Catalog\Model\Product $duplicate
+     * @param Product $product
+     * @param Product $duplicate
      * @return void
      */
-    public function build(\Magento\Catalog\Model\Product $product, \Magento\Catalog\Model\Product $duplicate)
+    public function build(Product $product, Product $duplicate)
     {
-        if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
+        if ($product->getTypeId() != Type::TYPE_BUNDLE) {
             //do nothing if not bundle
             return;
         }
 
-        $product->getTypeInstance()->setStoreFilter($product->getStoreId(), $product);
-        $optionCollection = $product->getTypeInstance()->getOptionsCollection($product);
-        $selectionCollection = $product->getTypeInstance()->getSelectionsCollection(
-            $product->getTypeInstance()->getOptionsIds($product),
-            $product
-        );
-        $optionCollection->appendSelections($selectionCollection);
-
-        $optionRawData = [];
-        $selectionRawData = [];
-
-        $i = 0;
-        foreach ($optionCollection as $option) {
-            $optionRawData[$i] = [
-                'required' => $option->getData('required'),
-                'position' => $option->getData('position'),
-                'type' => $option->getData('type'),
-                'title' => $option->getData('title') ? $option->getData('title') : $option->getData('default_title'),
-                'delete' => '',
-            ];
-            foreach ($option->getSelections() as $selection) {
-                $selectionRawData[$i][] = [
-                    'product_id' => $selection->getProductId(),
-                    'position' => $selection->getPosition(),
-                    'is_default' => $selection->getIsDefault(),
-                    'selection_price_type' => $selection->getSelectionPriceType(),
-                    'selection_price_value' => $selection->getSelectionPriceValue(),
-                    'selection_qty' => $selection->getSelectionQty(),
-                    'selection_can_change_qty' => $selection->getSelectionCanChangeQty(),
-                    'delete' => '',
-                ];
-            }
-            $i++;
+        $bundleOptions = $product->getExtensionAttributes()->getBundleProductOptions();
+        $duplicatedBundleOptions = [];
+        foreach ($bundleOptions as $key => $bundleOption) {
+            $duplicatedBundleOptions[$key] = clone $bundleOption;
         }
-
-        $duplicate->setBundleOptionsData($optionRawData);
-        $duplicate->setBundleSelectionsData($selectionRawData);
+        $duplicate->getExtensionAttributes()->setBundleProductOptions($duplicatedBundleOptions);
     }
 }