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

Author: Natalia Momotenko

app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php

@@ -15,6 +15,7 @@
 use Magento\Framework\Registry;
 use Magento\Payment\Model\IframeConfigProvider;
 use Magento\Quote\Api\CartManagementInterface;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Class Place
@@ -125,6 +126,9 @@ protected function placeCheckoutOrder()
                     'action' => $this
                 ]
             );
+        } catch (LocalizedException $exception) {
+            $result->setData('error', true);
+            $result->setData('error_messages', $exception->getMessage());
         } catch (\Exception $exception) {
             $result->setData('error', true);
             $result->setData('error_messages', __('Unable to place order. Please try again later.'));

app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php

@@ -502,7 +502,7 @@ public function getAttributeRawValue($entityId, $attribute, $store)
                 $staticTable,
                 $staticAttributes
             )->join(
-                ['e' => $this->getTable('catalog_product_entity')],
+                ['e' => $this->getTable($this->getEntityTable())],
                 'e.' . $this->getLinkField() . ' = ' . $staticTable . '.' . $this->getLinkField()
             )->where(
                 'e.entity_id = :entity_id'
@@ -523,7 +523,7 @@ public function getAttributeRawValue($entityId, $attribute, $store)
                 $select = $connection->select()
                     ->from(['default_value' => $table], ['attribute_id'])
                     ->join(
-                        ['e' => $this->getTable('catalog_product_entity')],
+                        ['e' => $this->getTable($this->getEntityTable())],
                         'e.' . $this->getLinkField() . ' = ' . 'default_value.' . $this->getLinkField(),
                         ''
                     )->where('default_value.attribute_id IN (?)', array_keys($_attributes))

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php

@@ -213,7 +213,6 @@ private function prepareMeta()
                 'dataScope' => 'qty',
                 'validation' => [
                     'validate-number' => true,
-                    'validate-digits' => true,
                     'less-than-equals-to' => StockDataFilter::MAX_QTY_VALUE,
                 ],
                 'imports' => [

app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

@@ -95,7 +95,6 @@
                         <item name="dataScope" xsi:type="string">quantity_and_stock_status.qty</item>
                         <item name="validation" xsi:type="array">
                             <item name="validate-number" xsi:type="boolean">true</item>
-                            <item name="validate-digits" xsi:type="boolean">true</item>
                             <item name="less-than-equals-to" xsi:type="number">99999999</item>
                         </item>
                         <item name="sortOrder" xsi:type="number">200</item>

app/code/Magento/CatalogInventory/view/adminhtml/web/js/components/qty-validator-changer.js

@@ -19,8 +19,7 @@ define([
         handleChanges: function (value) {
             var isDigits = value !== 1;
 
-            this.validation['validate-number'] = !isDigits;
-            this.validation['validate-digits'] = isDigits;
+            this.validation['validate-integer'] = isDigits;
             this.validation['less-than-equals-to'] = isDigits ? 99999999 : 99999999.9999;
             this.validate();
         }

app/code/Magento/Checkout/Block/Cart/Link.php

@@ -65,7 +65,7 @@ public function getHref()
      */
     protected function _toHtml()
     {
-        if ($this->_moduleManager->isOutputEnabled('Magento_Checkout')) {
+        if (!$this->_moduleManager->isOutputEnabled('Magento_Checkout')) {
             return '';
         }
         return parent::_toHtml();

app/code/Magento/Checkout/Test/Unit/Block/Cart/LinkTest.php

@@ -57,7 +57,7 @@ public function testToHtml()
         )->with(
             'Magento_Checkout'
         )->will(
-            $this->returnValue(true)
+            $this->returnValue(false)
         );
         $this->assertSame('', $block->toHtml());
     }

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

@@ -242,7 +242,7 @@ define(
                     emailValidationResult = customer.isLoggedIn();
 
                 if (!quote.shippingMethod()) {
-                    this.errorValidationMessage('Please specify a shipping method.');
+                    this.errorValidationMessage($.mage.__('Please specify a shipping method.'));
 
                     return false;
                 }

app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php

@@ -15,6 +15,13 @@
  */
 class MassDelete extends \Magento\Backend\App\Action
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Cms::page_delete';
+
     /**
      * @var Filter
      */

app/code/Magento/Cms/etc/frontend/page_types.xml

@@ -9,7 +9,6 @@
     <type id="cms_index_defaultindex" label="CMS Home Default Page"/>
     <type id="cms_index_defaultnoroute" label="CMS No-Route Default Page"/>
     <type id="cms_index_index" label="CMS Home Page"/>
-    <type id="cms_index_test" label="CMS Home Page"/>
     <type id="cms_index_nocookies" label="CMS No-Cookies Page"/>
     <type id="cms_index_noroute" label="CMS No-Route Page"/>
     <type id="cms_page_view" label="CMS Pages (All)"/>