Merge remote-tracking branch 'origin/MAGETWO-88946' into MAGETWO-88946

slavvka · slavvka · commit 8738b1996561 · 2018-03-10T14:52:14.000-06:00
diff --git a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
@@ -242,7 +242,8 @@ protected function getFormattedBundleSelections($optionValues, SelectionCollecti
                 'price' => $selection->getSelectionPriceValue(),
                 'default' => $selection->getIsDefault(),
                 'default_qty' => $selection->getSelectionQty(),
-                'price_type' => $this->getPriceTypeValue($selection->getSelectionPriceType())
+                'price_type' => $this->getPriceTypeValue($selection->getSelectionPriceType()),
+                'can_change_qty' => $selection->getSelectionCanChangeQty(),
             ];
             $bundleData .= $optionValues
                 . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
diff --git a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
@@ -299,6 +299,7 @@ protected function populateSelectionTemplate($selection, $optionId, $parentId, $
         } else {
             $productId = $selection['product_id'];
         }
+
         $populatedSelection = [
             'selection_id' => null,
             'option_id' => (int)$optionId,
@@ -310,7 +311,8 @@ protected function populateSelectionTemplate($selection, $optionId, $parentId, $
                 ? self::SELECTION_PRICE_TYPE_FIXED : self::SELECTION_PRICE_TYPE_PERCENT,
             'selection_price_value' => (isset($selection['price'])) ? (float)$selection['price'] : 0.0,
             'selection_qty' => (isset($selection['default_qty'])) ? (float)$selection['default_qty'] : 1.0,
-            'selection_can_change_qty' => 1,
+            'selection_can_change_qty' => isset($selection['can_change_qty'])
+                ? ($selection['can_change_qty'] ? 1 : 0) : 1,
         ];
         if (isset($selection['selection_id'])) {
             $populatedSelection['selection_id'] = $selection['selection_id'];
diff --git a/app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php b/app/code/Magento/BundleImportExport/Test/Unit/Model/Export/Product/RowCustomizerTest.php
@@ -105,12 +105,20 @@ protected function setUp()
         );
         $this->selection = $this->createPartialMock(
             \Magento\Catalog\Model\Product::class,
-            ['getSku', 'getSelectionPriceValue', 'getIsDefault', 'getSelectionQty', 'getSelectionPriceType']
+            [
+                'getSku',
+                'getSelectionPriceValue',
+                'getIsDefault',
+                'getSelectionQty',
+                'getSelectionPriceType',
+                'getSelectionCanChangeQty'
+            ]
         );
         $this->selection->expects($this->any())->method('getSku')->willReturn(1);
         $this->selection->expects($this->any())->method('getSelectionPriceValue')->willReturn(1);
         $this->selection->expects($this->any())->method('getSelectionQty')->willReturn(1);
         $this->selection->expects($this->any())->method('getSelectionPriceType')->willReturn(1);
+        $this->selection->expects($this->any())->method('getSelectionCanChangeQty')->willReturn(1);
         $this->selectionsCollection = $this->createPartialMock(
             \Magento\Bundle\Model\ResourceModel\Selection\Collection::class,
             ['getIterator', 'addAttributeToSort']
@@ -168,6 +176,19 @@ public function testAddData()
             'additional_attributes' => $attributes
         ];
         $preparedRow = $preparedData->addData($dataRow, 1);
+
+        $bundleValues = [
+            'name=title',
+            'type=1',
+            'required=1',
+            'sku=1',
+            'price=1',
+            'default=',
+            'default_qty=1',
+            'price_type=percent',
+            'can_change_qty=1',
+        ];
+
         $expected = [
             'sku' => 'sku1',
             'additional_attributes' => 'attribute=1,attribute2="Text",attribute3=One,Two,Three',
@@ -176,7 +197,7 @@ public function testAddData()
             'bundle_sku_type' => 'fixed',
             'bundle_price_view' => 'As low as',
             'bundle_weight_type' => 'fixed',
-            'bundle_values' => 'name=title,type=1,required=1,sku=1,price=1,default=,default_qty=1,price_type=percent'
+            'bundle_values' => implode(',', $bundleValues)
         ];
         $this->assertEquals($expected, $preparedRow);
     }
diff --git a/app/code/Magento/Deploy/Console/ConsoleLogger.php b/app/code/Magento/Deploy/Console/ConsoleLogger.php
@@ -82,8 +82,8 @@ class ConsoleLogger extends AbstractLogger
         LogLevel::CRITICAL => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::ERROR => OutputInterface::VERBOSITY_NORMAL,
         LogLevel::WARNING => OutputInterface::VERBOSITY_NORMAL,
-        LogLevel::NOTICE => OutputInterface::VERBOSITY_VERBOSE,
-        LogLevel::INFO => OutputInterface::VERBOSITY_VERY_VERBOSE,
+        LogLevel::NOTICE => OutputInterface::VERBOSITY_NORMAL,
+        LogLevel::INFO => OutputInterface::VERBOSITY_VERBOSE,
         LogLevel::DEBUG => OutputInterface::VERBOSITY_DEBUG
     ];
 
diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php
@@ -161,7 +161,7 @@ public function process()
             foreach ($packages as $name => $packageJob) {
                 $this->assertAndExecute($name, $packages, $packageJob);
             }
-            $this->logger->notice('.');
+            $this->logger->info('.');
             sleep(3);
             foreach ($this->inProgress as $name => $package) {
                 if ($this->isDeployed($package)) {
@@ -214,7 +214,7 @@ private function awaitForAllProcesses()
                     unset($this->inProgress[$name]);
                 }
             }
-            $this->logger->notice('.');
+            $this->logger->info('.');
             sleep(5);
         }
         if ($this->isCanBeParalleled()) {
diff --git a/app/code/Magento/Deploy/Service/DeployPackage.php b/app/code/Magento/Deploy/Service/DeployPackage.php
@@ -267,7 +267,7 @@ private function register(Package $package, PackageFile $file = null, $skipLoggi
         $this->deployStaticFile->writeTmpFile('info.json', $package->getPath(), json_encode($info));
 
         if (!$skipLogging) {
-            $this->logger->notice($logMessage);
+            $this->logger->info($logMessage);
         }
     }
 }
diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
@@ -128,8 +128,8 @@ public function getOrdersTrackingCode()
                         'price': '%s',
                         'quantity': %s
                     });",
-                    $this->escapeJs($item->getSku()),
-                    $this->escapeJs($item->getName()),
+                    $this->escapeJsQuote($item->getSku()),
+                    $this->escapeJsQuote($item->getName()),
                     $item->getPrice(),
                     $item->getQtyOrdered()
                 );
@@ -144,7 +144,7 @@ public function getOrdersTrackingCode()
                     'shipping': '%s'
                 });",
                 $order->getIncrementId(),
-                $this->escapeJs($this->_storeManager->getStore()->getFrontendName()),
+                $this->escapeJsQuote($this->_storeManager->getStore()->getFrontendName()),
                 $order->getGrandTotal(),
                 $order->getTaxAmount(),
                 $order->getShippingAmount()
@@ -234,15 +234,15 @@ public function getOrdersTrackingData()
         foreach ($collection as $order) {
             foreach ($order->getAllVisibleItems() as $item) {
                 $result['products'][] = [
-                    'id' => $this->escapeJs($item->getSku()),
-                    'name' =>  $this->escapeJs($item->getName()),
+                    'id' => $this->escapeJsQuote($item->getSku()),
+                    'name' =>  $this->escapeJsQuote($item->getName()),
                     'price' => $item->getPrice(),
                     'quantity' => $item->getQtyOrdered(),
                 ];
             }
             $result['orders'][] = [
                 'id' =>  $order->getIncrementId(),
-                'affiliation' => $this->escapeJs($this->_storeManager->getStore()->getFrontendName()),
+                'affiliation' => $this->escapeJsQuote($this->_storeManager->getStore()->getFrontendName()),
                 'revenue' => $order->getGrandTotal(),
                 'tax' => $order->getTaxAmount(),
                 'shipping' => $order->getShippingAmount(),
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/discount.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/discount.phtml
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -38,7 +38,6 @@
 </tr>
 
 <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value != 0): ?>
-    <?php $isTop = 1; ?>
     <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
         <?php if (isset($info['hidden']) && $info['hidden']) {
             continue;
@@ -64,7 +63,6 @@
                 <?php endif; ?>
             </tr>
             <?php $isFirst = 0; ?>
-            <?php $isTop = 0; ?>
         <?php endforeach; ?>
     <?php endforeach; ?>
 <?php endif;?>
diff --git a/dev/tests/acceptance/composer.json b/dev/tests/acceptance/composer.json
@@ -1,5 +1,4 @@
 {
-    "name": "magento/magento2ce-functional-tests",
     "description": "Magento 2 (Open Source) Functional Tests",
     "type": "project",
     "version": "1.0.0-dev",
diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php
@@ -104,6 +104,18 @@ public function testBundleImport()
                 $optionSku = 'Simple ' . ($optionKey + 1 + $linkKey);
                 $this->assertEquals($optionIdList[$optionSku], $productLink->getData('entity_id'));
                 $this->assertEquals($optionSku, $productLink->getData('sku'));
+
+                switch ($optionKey + 1 + $linkKey) {
+                    case 1:
+                        $this->assertEquals(1, (int) $productLink->getCanChangeQuantity());
+                        break;
+                    case 2:
+                        $this->assertEquals(0, (int) $productLink->getCanChangeQuantity());
+                        break;
+                    case 3:
+                        $this->assertEquals(1, (int) $productLink->getCanChangeQuantity());
+                        break;
+                }
             }
         }
     }
diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle.csv b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle.csv
@@ -2,4 +2,4 @@ sku,store_view_code,attribute_set_code,product_type,product_websites,name,produc
 Simple 1,,Default,simple,base,Simple 1,1,100,,1000,0,1,,,,,
 Simple 2,,Default,simple,base,Simple 2,1,200,,1000,0,1,,,,,
 Simple 3,,Default,simple,base,Simple 3,1,300,,1000,0,1,,,,,
-Bundle 1,,Default,bundle,base,Bundle 1,1,,shipment_type=separately,0,0,1,dynamic,dynamic,Price range,dynamic,"name=Option 1,type=checkbox,required=1,sku=Simple 1,price=0.0000,default=0,default_qty=1.0000,price_type=fixed|name=Option 2,type=checkbox,required=1,sku=Simple 2,price=0.0000,default=0,default_qty=1.0000,price_type=fixed|name=Option 2,type=checkbox,required=1,sku=Simple 3,price=0.0000,default=0,default_qty=1.0000,price_type=fixed"
+Bundle 1,,Default,bundle,base,Bundle 1,1,,shipment_type=separately,0,0,1,dynamic,dynamic,Price range,dynamic,"name=Option 1,type=checkbox,required=1,sku=Simple 1,price=0.0000,default=0,default_qty=1.0000,price_type=fixed,can_change_qty=1|name=Option 2,type=checkbox,required=1,sku=Simple 2,price=0.0000,default=0,default_qty=1.0000,price_type=fixed,can_change_qty=0|name=Option 2,type=checkbox,required=1,sku=Simple 3,price=0.0000,default=0,default_qty=1.0000,price_type=fixed"
diff --git a/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php b/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
@@ -127,7 +127,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $logger = $this->consoleLoggerFactory->getLogger($output, $verbose);
         if (!$refreshOnly) {
-            $logger->alert(PHP_EOL . "Deploy using {$options[Options::STRATEGY]} strategy");
+            $logger->notice(PHP_EOL . "Deploy using {$options[Options::STRATEGY]} strategy");
         }
 
         $this->mockCache();
@@ -140,7 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $deployService->deploy($options);
 
         if (!$refreshOnly) {
-            $logger->alert(PHP_EOL . "Execution time: " . (microtime(true) - $time));
+            $logger->notice(PHP_EOL . "Execution time: " . (microtime(true) - $time));
         }
 
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
@@ -102,7 +102,7 @@ public function testExecute($input)
 
         $this->consoleLoggerFactory->expects($this->once())
             ->method('getLogger')->willReturn($this->logger);
-        $this->logger->expects($this->exactly(2))->method('alert');
+        $this->logger->expects($this->exactly(2))->method('notice');
 
         $this->objectManager->expects($this->once())->method('create')->willReturn($this->deployService);
         $this->deployService->expects($this->once())->method('deploy');

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public function process()`
`161`	`161`	`foreach ($packages as $name => $packageJob) {`
`162`	`162`	`$this->assertAndExecute($name, $packages, $packageJob);`
`163`	`163`	`}`
`164`		`- $this->logger->notice('.');`
	`164`	`+ $this->logger->info('.');`
`165`	`165`	`sleep(3);`
`166`	`166`	`foreach ($this->inProgress as $name => $package) {`
`167`	`167`	`if ($this->isDeployed($package)) {`
`@@ -214,7 +214,7 @@ private function awaitForAllProcesses()`
`214`	`214`	`unset($this->inProgress[$name]);`
`215`	`215`	`}`
`216`	`216`	`}`
`217`		`- $this->logger->notice('.');`
	`217`	`+ $this->logger->info('.');`
`218`	`218`	`sleep(5);`
`219`	`219`	`}`
`220`	`220`	`if ($this->isCanBeParalleled()) {`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ private function register(Package $package, PackageFile $file = null, $skipLoggi`
`267`	`267`	`$this->deployStaticFile->writeTmpFile('info.json', $package->getPath(), json_encode($info));`
`268`	`268`
`269`	`269`	`if (!$skipLogging) {`
`270`		`- $this->logger->notice($logMessage);`
	`270`	`+ $this->logger->info($logMessage);`
`271`	`271`	`}`
`272`	`272`	`}`
`273`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{`
`2`		`- "name": "magento/magento2ce-functional-tests",`
`3`	`2`	`"description": "Magento 2 (Open Source) Functional Tests",`
`4`	`3`	`"type": "project",`
`5`	`4`	`"version": "1.0.0-dev",`