Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-49914

Author: shiftedreality

.gitignore

@@ -46,5 +46,5 @@ atlassian*
 
 /var/*
 !/var/.htaccess
-/vendor
+/vendor/*
 !/vendor/.htaccess

app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

@@ -41,14 +41,14 @@ public function render(\Magento\Framework\DataObject $row)
     {
         $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
             'Read Details'
-        ) . '</a>' : '';
+        ) . '</a> | ' : '';
 
         $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
             '*/*/markAsRead/',
             ['_current' => true, 'id' => $row->getId()]
         ) . '">' . __(
             'Mark as Read'
-        ) . '</a>' : '';
+        ) . '</a> | ' : '';
 
         $encodedUrl = $this->_urlHelper->getEncodedUrl();
         return sprintf(

app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html

@@ -29,7 +29,7 @@
                 allowtransparency="true"
                 frameborder="0"
                 name="iframeTransparent"
-                style="display:none;width:100%;background-color:transparent">
+                class="payment-method-iframe">
 
         </iframe>
         <form class="form" id="co-transparent-form" action="#" method="post" data-bind="mageInit: {

app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

@@ -28,16 +28,16 @@
     <script data-template="search-suggest" type="text/x-magento-template">
         <ul class="search-global-menu">
         <li class="item">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getURL('catalog/product/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
+            <a id="searchPreviewProducts" href="<?php /* @escapeNotVerified */ echo $block->getURL('catalog/product/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
         </li>
         <li class="item">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getURL('sales/order/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
+            <a id="searchPreviewOrders" href="<?php /* @escapeNotVerified */ echo $block->getURL('sales/order/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
         </li>
         <li class="item">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getURL('customer/index/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
+            <a id="searchPreviewCustomers" href="<?php /* @escapeNotVerified */ echo $block->getURL('customer/index/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
         </li>
         <li class="item">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getURL('cms/page/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
+            <a id="searchPreviewPages" href="<?php /* @escapeNotVerified */ echo $block->getURL('cms/page/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
         </li>
             <% if (data.items.length) { %>
             <% _.each(data.items, function(value){ %>

app/code/Magento/Backup/Helper/Data.php

@@ -122,7 +122,7 @@ public function getExtensions()
             \Magento\Framework\Backup\Factory::TYPE_SYSTEM_SNAPSHOT => 'tgz',
             \Magento\Framework\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'tgz',
             \Magento\Framework\Backup\Factory::TYPE_MEDIA => 'tgz',
-            \Magento\Framework\Backup\Factory::TYPE_DB => 'gz'
+            \Magento\Framework\Backup\Factory::TYPE_DB => 'sql'
         ];
     }
 

app/code/Magento/BraintreeTwo/Block/Paypal/Button.php

@@ -12,6 +12,7 @@
 use Magento\BraintreeTwo\Model\Ui\ConfigProvider;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\BraintreeTwo\Gateway\Config\PayPal\Config;
+use Magento\Payment\Model\MethodInterface;
 
 /**
  * Class Button
@@ -42,6 +43,11 @@ class Button extends Template implements ShortcutInterface
      */
     private $configProvider;
 
+    /**
+     * @var MethodInterface
+     */
+    private $payment;
+
     /**
      * Constructor
      *
@@ -50,6 +56,7 @@ class Button extends Template implements ShortcutInterface
      * @param Session $checkoutSession
      * @param Config $config
      * @param ConfigProvider $configProvider
+     * @param MethodInterface $payment
      * @param array $data
      */
     public function __construct(
@@ -58,6 +65,7 @@ public function __construct(
         Session $checkoutSession,
         Config $config,
         ConfigProvider $configProvider,
+        MethodInterface $payment,
         array $data = []
     ) {
         parent::__construct($context, $data);
@@ -66,6 +74,7 @@ public function __construct(
         $this->checkoutSession = $checkoutSession;
         $this->config = $config;
         $this->configProvider = $configProvider;
+        $this->payment = $payment;
     }
 
     /**
@@ -125,7 +134,8 @@ public function getAmount()
      */
     public function isActive()
     {
-        return $this->config->isActive() && $this->config->isDisplayShoppingCart();
+        return $this->payment->isAvailable($this->checkoutSession->getQuote()) &&
+            $this->config->isDisplayShoppingCart();
     }
 
     /**

app/code/Magento/BraintreeTwo/etc/frontend/di.xml

@@ -49,6 +49,7 @@
                 <item name="alias" xsi:type="string">braintree.paypal.mini-cart</item>
                 <item name="button_id" xsi:type="string">braintree-paypal-mini-cart</item>
             </argument>
+            <argument name="payment" xsi:type="object">BraintreeTwoPayPalFacade</argument>
         </arguments>
     </type>
 </config>

app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php

@@ -173,7 +173,7 @@ private function processPaymentConfiguration(array &$configuration, array $eleme
                                     'telephone' => [
                                         'config' => [
                                             'tooltip' => [
-                                                'description' => 'For delivery questions.',
+                                                'description' => __('For delivery questions.'),
                                             ],
                                         ],
                                     ],

app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml

@@ -29,6 +29,7 @@ require([
     "jquery/jquery.hashchange",
     "mage/mage",
     "prototype",
+    "mage/adminhtml/form",
     "domReady!"
 ], function(jQuery, registry){
 

app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php

@@ -87,47 +87,49 @@ protected function configure()
     {
         parent::configure();
         $this->setDescription('Collects and publishes source files for theme.')
-            ->setDefinition([
-                new InputArgument(
-                    self::FILE_ARGUMENT,
-                    InputArgument::IS_ARRAY,
-                    'Files to pre-process (file should be specified without extension)',
-                    ['css/styles-m', 'css/styles-l']
-                ),
-                new InputOption(
-                    self::TYPE_ARGUMENT,
-                    null,
-                    InputOption::VALUE_REQUIRED,
-                    'Type of source files: [less]',
-                    'less'
-                ),
-                new InputOption(
-                    self::LOCALE_OPTION,
-                    null,
-                    InputOption::VALUE_REQUIRED,
-                    'Locale: [en_US]',
-                    'en_US'
-                ),
-                new InputOption(
-                    self::AREA_OPTION,
-                    null,
-                    InputOption::VALUE_REQUIRED,
-                    'Area: [frontend|adminhtml]',
-                    'frontend'
-                ),
-                new InputOption(
-                    self::THEME_OPTION,
-                    null,
-                    InputOption::VALUE_REQUIRED,
-                    'Theme: [Vendor/theme]',
-                    'Magento/luma'
-                ),
-
-            ]);
+            ->setDefinition(
+                [
+                    new InputArgument(
+                        self::FILE_ARGUMENT,
+                        InputArgument::IS_ARRAY,
+                        'Files to pre-process (file should be specified without extension)',
+                        ['css/styles-m', 'css/styles-l']
+                    ),
+                    new InputOption(
+                        self::TYPE_ARGUMENT,
+                        null,
+                        InputOption::VALUE_REQUIRED,
+                        'Type of source files: [less]',
+                        'less'
+                    ),
+                    new InputOption(
+                        self::LOCALE_OPTION,
+                        null,
+                        InputOption::VALUE_REQUIRED,
+                        'Locale: [en_US]',
+                        'en_US'
+                    ),
+                    new InputOption(
+                        self::AREA_OPTION,
+                        null,
+                        InputOption::VALUE_REQUIRED,
+                        'Area: [frontend|adminhtml]',
+                        'frontend'
+                    ),
+                    new InputOption(
+                        self::THEME_OPTION,
+                        null,
+                        InputOption::VALUE_REQUIRED,
+                        'Theme: [Vendor/theme]',
+                        'Magento/luma'
+                    ),
+
+                ]
+            );
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      * @throws \InvalidArgumentException
      */
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -144,6 +146,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $locale . ' argument has invalid value, please run info:language:list for list of available locales'
             );
         }
+
+        if (!preg_match('#^[\w\-]+\/[\w\-]+$#', $theme)) {
+            throw new \InvalidArgumentException(
+                'Value "' . $theme . '" of the option "' . self::THEME_OPTION .
+                '" has invalid format. The format should be "Vendor/theme".'
+            );
+        }
+
         $message = sprintf(
             '<info>Processed Area: %s, Locale: %s, Theme: %s, File type: %s.</info>',
             $area,
@@ -164,7 +174,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 ]
             );
 
-            $this->assetPublisher->publish($asset);
+            try {
+                $this->assetPublisher->publish($asset);
+            } catch (\Magento\Framework\View\Asset\File\NotFoundException $e) {
+                throw new \InvalidArgumentException(
+                    'Verify entered values of the argument and options. ' . $e->getMessage()
+                );
+            }
+
             $output->writeln('<comment>-> ' . $asset->getFilePath() . '</comment>');
         }