Merge branch '2.1' into MAGETWO-55354

magento-services-vantiv-deploy · magento-services-vantiv-deploy · commit 18e69a149cf8 · 2016-07-27T14:25:20.000+03:00
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php
@@ -127,7 +127,10 @@ protected function placeCheckoutOrder()
             );
         } catch (\Exception $exception) {
             $result->setData('error', true);
-            $result->setData('error_messages', __('Unable to place order. Please try again later.'));
+            $result->setData(
+                'error_messages',
+                __('An error occurred on the server. Please try to place the order again.')
+            );
         }
         if ($response instanceof Http) {
             $response->representJson($this->jsonHelper->jsonEncode($result));
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php b/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php
@@ -280,7 +280,10 @@ public function textExecuteFailedPlaceOrderDataProvider()
     {
         $objectFailed = new \Magento\Framework\DataObject();
         $objectFailed->setData('error', true);
-        $objectFailed->setData('error_messages', __('Unable to place order. Please try again later.'));
+        $objectFailed->setData(
+            'error_messages',
+            __('An error occurred on the server. Please try to place the order again.')
+        );
 
         return [
             [
diff --git a/app/code/Magento/Authorizenet/i18n/en_US.csv b/app/code/Magento/Authorizenet/i18n/en_US.csv
@@ -2,7 +2,7 @@
 "Order saving error: %1","Order saving error: %1"
 "Please choose a payment method.","Please choose a payment method."
 "We can\'t process your order right now. Please try again later.","We can\'t process your order right now. Please try again later."
-"Unable to place order. Please try again later.","Unable to place order. Please try again later."
+"An error occurred on the server. Please try to place the order again.","An error occurred on the server. Please try to place the order again."
 "Credit Card: xxxx-%1","Credit Card: xxxx-%1"
 "amount %1","amount %1"
 failed.,failed.
diff --git a/app/code/Magento/Catalog/Setup/CategorySetup.php b/app/code/Magento/Catalog/Setup/CategorySetup.php
@@ -66,6 +66,7 @@ public function getDefaultEntities()
     {
         return [
             'catalog_category' => [
+                'entity_type_id' => 3,
                 'entity_model' => 'Magento\Catalog\Model\ResourceModel\Category',
                 'attribute_model' => 'Magento\Catalog\Model\ResourceModel\Eav\Attribute',
                 'table' => 'catalog_category_entity',
@@ -334,6 +335,7 @@ public function getDefaultEntities()
                 ],
             ],
             'catalog_product' => [
+                'entity_type_id' => 4,
                 'entity_model' => 'Magento\Catalog\Model\ResourceModel\Product',
                 'attribute_model' => 'Magento\Catalog\Model\ResourceModel\Eav\Attribute',
                 'table' => 'catalog_product_entity',
diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -80,7 +80,10 @@ public function savePaymentInformationAndPlaceOrder(
         try {
             $orderId = $this->cartManagement->placeOrder($cartId);
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Unable to place order. Please try again later.'), $e);
+            throw new CouldNotSaveException(
+                __('An error occurred on the server. Please try to place the order again.'),
+                $e
+            );
         }
         return $orderId;
     }
diff --git a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
@@ -68,7 +68,10 @@ public function savePaymentInformationAndPlaceOrder(
         try {
             $orderId = $this->cartManagement->placeOrder($cartId);
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Unable to place order. Please try again later.'), $e);
+            throw new CouldNotSaveException(
+                __('An error occurred on the server. Please try to place the order again.'),
+                $e
+            );
         }
         return $orderId;
     }
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
@@ -93,7 +93,7 @@ public function testSavePaymentInformationAndPlaceOrder()
     }
 
     /**
-     * @expectedExceptionMessage Unable to place order. Please try again later.
+     * @expectedExceptionMessage An error occurred on the server. Please try to place the order again.
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
      */
     public function testSavePaymentInformationAndPlaceOrderException()
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
@@ -70,7 +70,7 @@ public function testSavePaymentInformationAndPlaceOrder()
     }
 
     /**
-     * @expectedExceptionMessage Unable to place order. Please try again later.
+     * @expectedExceptionMessage An error occurred on the server. Please try to place the order again.
      * @expectedException \Magento\Framework\Exception\CouldNotSaveException
      */
     public function testSavePaymentInformationAndPlaceOrderException()
diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -40,7 +40,7 @@ Checkout,Checkout
 "This quote item does not exist.","This quote item does not exist."
 "Display number of items in cart","Display number of items in cart"
 "Display item quantities","Display item quantities"
-"Unable to place order. Please try again later.","Unable to place order. Please try again later."
+"An error occurred on the server. Please try to place the order again.","An error occurred on the server. Please try to place the order again."
 "Shipping address is not set","Shipping address is not set"
 "Unable to save address. Please check input data.","Unable to save address. Please check input data."
 "Carrier with such method not found: %1, %2","Carrier with such method not found: %1, %2"
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -246,6 +246,7 @@ define([
                 target = $(this.options.minicart.list),
                 outerHeight;
 
+            self.scrollHeight = 0;
             target.children().each(function () {
 
                 if ($(this).find('.options').length > 0) {
@@ -259,7 +260,7 @@ define([
                 self.scrollHeight += outerHeight;
             });
 
-            target.height(height);
+            target.parent().height(height);
         }
     });
 
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -13,6 +13,7 @@
 use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Data\Form\FormKey\Validator;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
@@ -179,6 +180,10 @@ public function execute()
                     $message = __('Invalid login or password.');
                     $this->messageManager->addError($message);
                     $this->session->setUsername($login['username']);
+                } catch (LocalizedException $e) {
+                    $message = $e->getMessage();
+                    $this->messageManager->addError($message);
+                    $this->session->setUsername($login['username']);
                 } catch (\Exception $e) {
                     // PA DSS violation: throwing or logging an exception here can disclose customer password
                     $this->messageManager->addError(
diff --git a/app/code/Magento/Customer/Controller/Ajax/Login.php b/app/code/Magento/Customer/Controller/Ajax/Login.php
@@ -12,6 +12,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Customer\Model\Account\Redirect as AccountRedirect;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Login controller
@@ -182,6 +183,11 @@ public function execute()
                 'errors' => true,
                 'message' => $e->getMessage()
             ];
+        } catch (LocalizedException $e) {
+            $response = [
+                'errors' => true,
+                'message' => $e->getMessage()
+            ];
         } catch (\Exception $e) {
             $response = [
                 'errors' => true,
diff --git a/app/code/Magento/Customer/Setup/CustomerSetup.php b/app/code/Magento/Customer/Setup/CustomerSetup.php
@@ -126,6 +126,7 @@ public function getDefaultEntities()
     {
         $entities = [
             'customer' => [
+                'entity_type_id' => \Magento\Customer\Api\CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER,
                 'entity_model' => 'Magento\Customer\Model\ResourceModel\Customer',
                 'attribute_model' => 'Magento\Customer\Model\Attribute',
                 'table' => 'customer_entity',
@@ -338,6 +339,7 @@ public function getDefaultEntities()
                 ],
             ],
             'customer_address' => [
+                'entity_type_id' => \Magento\Customer\Api\AddressMetadataInterface::ATTRIBUTE_SET_ID_ADDRESS,
                 'entity_model' => 'Magento\Customer\Model\ResourceModel\Address',
                 'attribute_model' => 'Magento\Customer\Model\Attribute',
                 'table' => 'customer_address_entity',
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -192,14 +192,21 @@ public function addEntityType($code, array $params)
             'additional_attribute_table' => $this->_getValue($params, 'additional_attribute_table'),
             'entity_attribute_collection' => $this->_getValue($params, 'entity_attribute_collection'),
         ];
+        if (isset($params['entity_type_id'])) {
+            $data['entity_type_id'] = $params['entity_type_id'];
+        }
 
         if ($this->getEntityType($code, 'entity_type_id')) {
             $this->updateEntityType($code, $data);
         } else {
             $this->setup->getConnection()->insert($this->setup->getTable('eav_entity_type'), $data);
         }
 
-        $this->addAttributeSet($code, $this->_defaultAttributeSetName);
+        if (isset($params['entity_type_id'])) {
+            $this->addAttributeSet($code, $this->_defaultAttributeSetName, null, $params['entity_type_id']);
+        } else {
+            $this->addAttributeSet($code, $this->_defaultAttributeSetName);
+        }
         $this->addAttributeGroup($code, $this->_defaultGroupName, $this->_generalGroupName);
 
         return $this;
@@ -310,16 +317,21 @@ public function getAttributeSetSortOrder($entityTypeId, $sortOrder = null)
      * @param int|string $entityTypeId
      * @param string $name
      * @param int $sortOrder
+     * @param int $setId
      * @return $this
      */
-    public function addAttributeSet($entityTypeId, $name, $sortOrder = null)
+    public function addAttributeSet($entityTypeId, $name, $sortOrder = null, $setId = null)
     {
         $data = [
             'entity_type_id' => $this->getEntityTypeId($entityTypeId),
             'attribute_set_name' => $name,
             'sort_order' => $this->getAttributeSetSortOrder($entityTypeId, $sortOrder),
         ];
 
+        if ($setId !== null) {
+            $data['attribute_set_id'] = $setId;
+        }
+
         $setId = $this->getAttributeSet($entityTypeId, $name, 'attribute_set_id');
         if ($setId) {
             $this->updateAttributeSet($entityTypeId, $setId, $data);
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
@@ -39,7 +39,7 @@ $params = $block->getParams();
                     var parent = window.top;
                     $(parent).trigger('clearTimeout');
                     globalMessageList.addErrorMessage({
-                        message: $t('Unable to place order. Please try again later.')
+                        message: $t('An error occurred on the server. Please try to place the order again.')
                     });
                 }
             );
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -349,7 +349,9 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
         $order = $this->submit($quote);
 
         if (null == $order) {
-            throw new LocalizedException(__('Unable to place order. Please try again later.'));
+            throw new LocalizedException(
+                __('An error occurred on the server. Please try to place the order again.')
+            );
         }
 
         $this->checkoutSession->setLastQuoteId($quote->getId());
diff --git a/app/code/Magento/Quote/i18n/en_US.csv b/app/code/Magento/Quote/i18n/en_US.csv
@@ -36,7 +36,7 @@ Subtotal,Subtotal
 "Cannot assign customer to the given cart. The cart belongs to different store.","Cannot assign customer to the given cart. The cart belongs to different store."
 "Cannot assign customer to the given cart. The cart is not anonymous.","Cannot assign customer to the given cart. The cart is not anonymous."
 "Cannot assign customer to the given cart. Customer already has active cart.","Cannot assign customer to the given cart. Customer already has active cart."
-"Unable to place order. Please try again later.","Unable to place order. Please try again later."
+"An error occurred on the server. Please try to place the order again.","An error occurred on the server. Please try to place the order again."
 "This item price or quantity is not valid for checkout.","This item price or quantity is not valid for checkout."
 "Please check the shipping address information. %1","Please check the shipping address information. %1"
 "Please specify a shipping method.","Please specify a shipping method."
diff --git a/app/code/Magento/Sales/Setup/InstallSchema.php b/app/code/Magento/Sales/Setup/InstallSchema.php
@@ -3216,12 +3216,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             '12,4',
             [],
             'Grand Total'
-        )->addColumn(
-            'base_grand_total',
-            \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
-            '12,4',
-            [],
-            'Base Grand Total'
         )->addColumn(
             'created_at',
             \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
@@ -3240,9 +3234,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         )->addIndex(
             $installer->getIdxName('sales_invoice_grid', ['grand_total']),
             ['grand_total']
-        )->addIndex(
-            $installer->getIdxName('sales_invoice_grid', ['base_grand_total']),
-            ['base_grand_total']
         )->addIndex(
             $installer->getIdxName('sales_invoice_grid', ['order_id']),
             ['order_id']
diff --git a/app/code/Magento/Sales/Setup/SalesSetup.php b/app/code/Magento/Sales/Setup/SalesSetup.php
@@ -214,27 +214,31 @@ public function getDefaultEntities()
     {
         $entities = [
             'order' => [
+                'entity_type_id' => 5,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order',
                 'table' => 'sales_order',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
                 'increment_per_store' => true,
                 'attributes' => [],
             ],
             'invoice' => [
+                'entity_type_id' => 6,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order\Invoice',
                 'table' => 'sales_invoice',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
                 'increment_per_store' => true,
                 'attributes' => [],
             ],
             'creditmemo' => [
+                'entity_type_id' => 7,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order\Creditmemo',
                 'table' => 'sales_creditmemo',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
                 'increment_per_store' => true,
                 'attributes' => [],
             ],
             'shipment' => [
+                'entity_type_id' => 8,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order\Shipment',
                 'table' => 'sales_shipment',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
diff --git a/app/code/Magento/Sales/Setup/UpgradeSchema.php b/app/code/Magento/Sales/Setup/UpgradeSchema.php
@@ -7,6 +7,7 @@
 use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 
 /**
  * @codeCoverageIgnore
@@ -53,5 +54,43 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
 
             $installer->endSetup();
         }
+        if (version_compare($context->getVersion(), '2.0.3', '<')) {
+            $this->addColumnBaseGrandTotal($installer);
+            $this->addIndexBaseGrandTotal($installer);
+        }
+    }
+
+    /**
+     * @param SchemaSetupInterface $installer
+     * @return void
+     */
+    private function addColumnBaseGrandTotal(SchemaSetupInterface $installer)
+    {
+        $connection = $installer->getConnection();
+        $connection->addColumn(
+            $installer->getTable('sales_invoice_grid'),
+            'base_grand_total',
+            [
+                'type' => \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL,
+                'nullable' => true,
+                'length' => '12,4',
+                'comment' => 'Base Grand Total',
+                'after' => 'grand_total'
+            ]
+        );
+    }
+
+    /**
+     * @param SchemaSetupInterface $installer
+     * @return void
+     */
+    private function addIndexBaseGrandTotal(SchemaSetupInterface $installer)
+    {
+        $connection = $installer->getConnection();
+        $connection->addIndex(
+            $installer->getTable('sales_invoice_grid'),
+            $installer->getIdxName('sales_invoice_grid', ['base_grand_total']),
+            ['base_grand_total']
+        );
     }
 }
diff --git a/app/code/Magento/Sales/etc/module.xml b/app/code/Magento/Sales/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Sales" setup_version="2.0.2">
+    <module name="Magento_Sales" setup_version="2.0.3">
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
@@ -223,6 +223,7 @@
                     <item name="frontName" xsi:type="null" />
                     <item name="router" xsi:type="string">standard</item>
                 </item>
+                <item name="setup" xsi:type="null"/>
             </argument>
             <argument name="default" xsi:type="string">frontend</argument>
         </arguments>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/CreateProductsStep.php
@@ -60,7 +60,7 @@ public function __construct(FixtureFactory $fixtureFactory, $products, array $da
     public function run()
     {
         $products = [];
-        $productsDataSets = explode(',', $this->products);
+        $productsDataSets = is_array($this->products) ? $this->products : explode(',', $this->products);
         foreach ($productsDataSets as $key => $productDataSet) {
             $productDataSet = explode('::', $productDataSet);
             $fixtureClass = $productDataSet[0];
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php
diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,10 @@ public function textExecuteFailedPlaceOrderDataProvider()`
`280`	`280`	`{`
`281`	`281`	`$objectFailed = new \Magento\Framework\DataObject();`
`282`	`282`	`$objectFailed->setData('error', true);`
`283`		`- $objectFailed->setData('error_messages', __('Unable to place order. Please try again later.'));`
	`283`	`+ $objectFailed->setData(`
	`284`	`+ 'error_messages',`
	`285`	`+ __('An error occurred on the server. Please try to place the order again.')`
	`286`	`+ );`
`284`	`287`
`285`	`288`	`return [`
`286`	`289`	`[`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,10 @@ public function savePaymentInformationAndPlaceOrder(`
`80`	`80`	`try {`
`81`	`81`	`$orderId = $this->cartManagement->placeOrder($cartId);`
`82`	`82`	`} catch (\Exception $e) {`
`83`		`- throw new CouldNotSaveException(__('Unable to place order. Please try again later.'), $e);`
	`83`	`+ throw new CouldNotSaveException(`
	`84`	`+ __('An error occurred on the server. Please try to place the order again.'),`
	`85`	`+ $e`
	`86`	`+ );`
`84`	`87`	`}`
`85`	`88`	`return $orderId;`
`86`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,10 @@ public function savePaymentInformationAndPlaceOrder(`
`68`	`68`	`try {`
`69`	`69`	`$orderId = $this->cartManagement->placeOrder($cartId);`
`70`	`70`	`} catch (\Exception $e) {`
`71`		`- throw new CouldNotSaveException(__('Unable to place order. Please try again later.'), $e);`
	`71`	`+ throw new CouldNotSaveException(`
	`72`	`+ __('An error occurred on the server. Please try to place the order again.'),`
	`73`	`+ $e`
	`74`	`+ );`
`72`	`75`	`}`
`73`	`76`	`return $orderId;`
`74`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function testSavePaymentInformationAndPlaceOrder()`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`/**`
`96`		`- * @expectedExceptionMessage Unable to place order. Please try again later.`
	`96`	`+ * @expectedExceptionMessage An error occurred on the server. Please try to place the order again.`
`97`	`97`	`* @expectedException \Magento\Framework\Exception\CouldNotSaveException`
`98`	`98`	`*/`
`99`	`99`	`public function testSavePaymentInformationAndPlaceOrderException()`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function testSavePaymentInformationAndPlaceOrder()`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/**`
`73`		`- * @expectedExceptionMessage Unable to place order. Please try again later.`
	`73`	`+ * @expectedExceptionMessage An error occurred on the server. Please try to place the order again.`
`74`	`74`	`* @expectedException \Magento\Framework\Exception\CouldNotSaveException`
`75`	`75`	`*/`
`76`	`76`	`public function testSavePaymentInformationAndPlaceOrderException()`