Issue 7897

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -7,6 +7,7 @@
 define([
     'jquery',
     'underscore',
+    'mage/utils/wrapper',
     'Magento_Checkout/js/view/payment/default',
     'Magento_Braintree/js/view/payment/adapter',
     'Magento_Checkout/js/model/quote',
@@ -18,6 +19,7 @@ define([
 ], function (
     $,
     _,
+    wrapper,
     Component,
     Braintree,
     quote,
@@ -218,8 +220,9 @@ define([
 
         /**
          * Re-init PayPal Auth Flow
+         * @param {Function} callback - Optional callback
          */
-        reInitPayPal: function () {
+        reInitPayPal: function (callback) {
             if (Braintree.checkout) {
                 Braintree.checkout.teardown(function () {
                     Braintree.checkout = null;
@@ -228,6 +231,18 @@ define([
 
             this.disableButton();
             this.clientConfig.paypal.amount = this.grandTotalAmount;
+            this.clientConfig.paypal.shippingAddressOverride = this.getShippingAddress();
+
+            if (callback) {
+                this.clientConfig.onReady = wrapper.wrap(
+                    this.clientConfig.onReady,
+                    function (original, checkout) {
+                        this.clientConfig.onReady = original;
+                        original(checkout);
+                        callback();
+                    }.bind(this)
+                );
+            }
 
             Braintree.setConfig(this.clientConfig);
             Braintree.setup();
@@ -404,15 +419,19 @@ define([
          * Triggers when customer click "Continue to PayPal" button
          */
         payWithPayPal: function () {
-            if (additionalValidators.validate()) {
+            this.reInitPayPal(function () {
+                if (!additionalValidators.validate()) {
+                    return;
+                }
+
                 try {
                     Braintree.checkout.paypal.initAuthFlow();
                 } catch (e) {
                     this.messageContainer.addErrorMessage({
                         message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
                     });
                 }
-            }
+            }.bind(this));
         },
 
         /**

app/code/Magento/Catalog/Console/Command/ImagesResizeCommand.php

@@ -216,7 +216,7 @@ private function getViewImages(array $themes): array
             ]);
             $images = $config->getMediaEntities('Magento_Catalog', ImageHelper::MEDIA_TYPE_CONFIG_NODE);
             foreach ($images as $imageId => $imageData) {
-                $uniqIndex = $this->getUniqImageIndex($imageData);
+                $uniqIndex = $this->getUniqueImageIndex($imageData);
                 $imageData['id'] = $imageId;
                 $viewImages[$uniqIndex] = $imageData;
             }
@@ -225,11 +225,11 @@ private function getViewImages(array $themes): array
     }
 
     /**
-     * Get uniq image index
+     * Get unique image index
      * @param array $imageData
      * @return string
      */
-    private function getUniqImageIndex(array $imageData): string
+    private function getUniqueImageIndex(array $imageData): string
     {
         ksort($imageData);
         unset($imageData['type']);

app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php

@@ -338,7 +338,7 @@ public function getOptionPrice($optionValue, $basePrice)
     {
         $option = $this->getOption();
 
-        return $this->_getChargableOptionPrice($option->getPrice(), $option->getPriceType() == 'percent', $basePrice);
+        return $this->_getChargeableOptionPrice($option->getPrice(), $option->getPriceType() == 'percent', $basePrice);
     }
 
     /**
@@ -392,14 +392,27 @@ public function getProductOptions()
     }
 
     /**
-     * Return final chargable price for option
-     *
      * @param float $price Price of option
      * @param boolean $isPercent Price type - percent or fixed
      * @param float $basePrice For percent price type
      * @return float
+     * @deprecated 102.0.4 typo in method name
+     * @see _getChargeableOptionPrice
      */
     protected function _getChargableOptionPrice($price, $isPercent, $basePrice)
+    {
+        return $this->_getChargeableOptionPrice($price, $isPercent, $basePrice);
+    }
+
+    /**
+     * Return final chargeable price for option
+     *
+     * @param float $price Price of option
+     * @param boolean $isPercent Price type - percent or fixed
+     * @param float $basePrice For percent price type
+     * @return float
+     */
+    protected function _getChargeableOptionPrice($price, $isPercent, $basePrice)
     {
         if ($isPercent) {
             return $basePrice * $price / 100;

app/code/Magento/Catalog/Model/Product/Option/Type/Select.php

@@ -222,7 +222,7 @@ public function getOptionPrice($optionValue, $basePrice)
             foreach (explode(',', $optionValue) as $value) {
                 $_result = $option->getValueById($value);
                 if ($_result) {
-                    $result += $this->_getChargableOptionPrice(
+                    $result += $this->_getChargeableOptionPrice(
                         $_result->getPrice(),
                         $_result->getPriceType() == 'percent',
                         $basePrice
@@ -237,7 +237,7 @@ public function getOptionPrice($optionValue, $basePrice)
         } elseif ($this->_isSingleSelection()) {
             $_result = $option->getValueById($optionValue);
             if ($_result) {
-                $result = $this->_getChargableOptionPrice(
+                $result = $this->_getChargeableOptionPrice(
                     $_result->getPrice(),
                     $_result->getPriceType() == 'percent',
                     $basePrice

app/code/Magento/Catalog/Setup/InstallSchema.php

@@ -674,7 +674,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
                 null,
                 ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-                'Attriute Set ID'
+                'Attribute Set ID'
             )
             ->addColumn(
                 'parent_id',

app/code/Magento/Paypal/Model/Api/Nvp.php

@@ -1027,7 +1027,7 @@ public function callGetPalDetails()
     }
 
     /**
-     * Set Customer BillingA greement call
+     * Set Customer BillingAgreement call
      *
      * @return void
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_SetCustomerBillingAgreement
@@ -1427,15 +1427,15 @@ protected function _deformatNVP($nvpstr)
         $nvpstr = strpos($nvpstr, "\r\n\r\n") !== false ? substr($nvpstr, strpos($nvpstr, "\r\n\r\n") + 4) : $nvpstr;
 
         while (strlen($nvpstr)) {
-            //postion of Key
+            //position of Key
             $keypos = strpos($nvpstr, '=');
             //position of value
             $valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr);
 
             /*getting the Key and Value values and storing in a Associative Array*/
             $keyval = substr($nvpstr, $intial, $keypos);
             $valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1);
-            //decoding the respose
+            //decoding the response
             $nvpArray[urldecode($keyval)] = urldecode($valval);
             $nvpstr = substr($nvpstr, $valuepos + 1, strlen($nvpstr));
         }

app/code/Magento/Ui/etc/di.xml

@@ -251,6 +251,7 @@
     <type name="Magento\Framework\Data\Argument\Interpreter\Composite">
         <arguments>
             <argument name="interpreters" xsi:type="array">
+                <item name="const" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Constant</item>
                 <item name="object" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="configurableObject" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="array" xsi:type="object">arrayArgumentInterpreterProxy</item>

app/design/frontend/Magento/blank/web/css/source/_navigation.less

@@ -312,9 +312,9 @@
 }
 
 .navigation{
-    ul, ol{
-        > li{
-            position: relative;
+        ul, ol{
+                >li{
+            position:relative;
         }
     }
 }

dev/tests/functional/lib/Magento/Mtf/Client/Element/SimplifiedselectElement.php

@@ -21,7 +21,7 @@ class SimplifiedselectElement extends SelectElement
     protected $optionGroupValue = ".//*[@data-title='%s' or contains(normalize-space(.), %s)]";
 
     /**
-     * Select value in ropdown which has option groups.
+     * Select value in dropdown which has option groups.
      *
      * @param string $value
      * @return void

dev/tests/functional/lib/Magento/Mtf/Client/Element/SwitcherElement.php

@@ -22,7 +22,7 @@ class SwitcherElement extends SimpleElement
     protected $parentContainer = 'parent::div[@data-role="switcher"]';
 
     /**
-     * XPath selector for label text on swticher element.
+     * XPath selector for label text on switcher element.
      *
      * @var string
      */

dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CancelPartiallyInvoicedOrderTest.php

@@ -20,7 +20,7 @@
  * 3. Open the created order.
  * 4. Create partial invoice
  * 4. Do cancel Order.
- * 5. Perform all assetions.
+ * 5. Perform all assertions.
  *
  * @group Order_Management
  * @ZephyrId MAGETWO-67787

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Attributes/Search.php

@@ -37,7 +37,7 @@ class Search extends SuggestElement
     protected $actionToggle = '.action-toggle';
 
     /**
-     * Saerch result dropdown.
+     * Search result dropdown.
      *
      * @var string
      */

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php

@@ -23,7 +23,7 @@ class AssertProductAttributeIsHtmlAllowed extends AbstractConstraint
 
     /**
      * Check whether html tags are using in attribute value.
-     * Checked tag structure <b><i>atttribute_default_value</p></i></b>
+     * Checked tag structure <b><i>attribute_default_value</p></i></b>
      *
      * @param InjectableFixture $product
      * @param CatalogProductAttribute $attribute

dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/WebsiteIds.php

@@ -37,7 +37,7 @@ class WebsiteIds extends DataSource
     private $fixtureFactory;
 
     /**
-     * Rought fixture field data.
+     * Rough fixture field data.
      *
      * @var array
      */

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ReSavingProductAfterInitialSaveTest.php

@@ -19,7 +19,7 @@
  *
  * 1. Login to backend.
  * 2. Create a product with invalid from and To dates
- * 3. Save the product which generates an error messsage
+ * 3. Save the product which generates an error message
  * 4. Modify the  dates to valid values
  * 5. Save the product again
  * 6. Product is saved successfully

dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertBillingAddressSameAsShippingCheckbox.php

@@ -37,7 +37,7 @@ public function processAssert(CheckoutOnepage $checkoutOnepage, $billingCheckbox
     }
 
     /**
-     * Returns a string representation of successfull assertion.
+     * Returns a string representation of successful assertion.
      *
      * @return string
      */

dev/tests/functional/tests/app/Magento/Config/Test/TestCase/VerifyAdminAccountSharingEntityTest.php

@@ -13,7 +13,7 @@
  * Steps:
  * 1. Log in to Admin.
  * 2. Go to Stores>Configuration>Advanced>admin>Security.
- * 3. * 7. Verify admin Acoount Sharing option availability.
+ * 3. Verify admin Account Sharing option availability.
  *
  * @group Config_(PS)
  * @ZephyrId MAGETWO-47822

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductTierPriceOnProductPage.php

@@ -10,7 +10,7 @@
 use Magento\ConfigurableProduct\Test\Block\Product\View\ConfigurableOptions;
 
 /**
- * Open created configurble product on frontend and choose variation with tier price
+ * Open created configurable product on frontend and choose variation with tier price
  */
 class AssertProductTierPriceOnProductPage extends AssertProductPage
 {

dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer/WebsiteId.php

@@ -38,7 +38,7 @@ class WebsiteId extends DataSource
     private $fixtureFactory;
 
     /**
-     * Rought fixture field data.
+     * Rough fixture field data.
      *
      * @var array
      */

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/AbstractApplyVatIdTest.php

@@ -76,7 +76,7 @@ public function __prepare(FixtureFactory $fixtureFactory)
     }
 
     /**
-     * Prepare VAT ID confguration.
+     * Prepare VAT ID configuration.
      *
      * @param ConfigData $vatConfig
      * @param string $customerGroup

dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest.php

@@ -51,7 +51,7 @@ class ReAuthorizeTokensIntegrationEntityTest extends Injectable
      *
      * @param FixtureFactory $fixtureFactory
      * @param IntegrationIndex $integrationIndex
-     * @retun void
+     * @return void
      */
     public function __inject(IntegrationIndex $integrationIndex, FixtureFactory $fixtureFactory)
     {

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/CustomerActivities/Sidebar.php

@@ -36,7 +36,7 @@ abstract class Sidebar extends Block
     protected $addToOrderProductName = './/tr/td[.="%s"]';
 
     /**
-     * Add productz to order.
+     * Add products to order.
      *
      * @param array $products
      * @return void

dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.php

@@ -23,7 +23,7 @@
  * 2. Sales > Orders.
  * 3. Open the created order.
  * 4. Do cancel Order.
- * 5. Perform all assetions.
+ * 5. Perform all assertions.
  *
  * @group Order_Management
  * @ZephyrId MAGETWO-28191

dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCustomOrderStatusEntityTest.php

@@ -30,7 +30,7 @@ class CreateCustomOrderStatusEntityTest extends Injectable
     /* end tags */
 
     /**
-     * Order staus page.
+     * Order status page.
      *
      * @var OrderStatusIndex
      */

dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php

@@ -10,7 +10,7 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Assert sales rule delte message.
+ * Assert sales rule delete message.
  */
 class AssertCartPriceRuleSuccessDeleteMessage extends AbstractConstraint
 {

dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenEditingIntegrationTest.php

@@ -84,15 +84,15 @@ public function __inject(
     /**
      * Run Lock user when creating new integration test.
      *
-     * @param Integration $initintegration
+     * @param Integration $initIntegration
      * @param Integration $integration
      * @param int $attempts
      * @param User $customAdmin
      * @param string $configData
      * @return void
      */
     public function test(
-        Integration $initintegration,
+        Integration $initIntegration,
         Integration $integration,
         $attempts,
         User $customAdmin,
@@ -106,15 +106,15 @@ public function test(
             ['configData' => $this->configData]
         )->run();
         $customAdmin->persist();
-        $initintegration->persist();
+        $initIntegration->persist();
 
         // login to backend with new user
         $this->adminAuthLogin->open();
         $this->adminAuthLogin->getLoginBlock()->fill($customAdmin);
         $this->adminAuthLogin->getLoginBlock()->submit();
 
         // Steps
-        $filter = ['name' => $initintegration->getName()];
+        $filter = ['name' => $initIntegration->getName()];
         $this->integrationIndexPage->open();
         $this->integrationIndexPage->getIntegrationGrid()->searchAndOpen($filter);
         for ($i = 0; $i < $attempts; $i++) {