Merge pull request #991 from magento-engcom/develop-prs

[EngCom] Public Pull Requests
magento · Apr 1, 2017 · 26fd5fb · 26fd5fb
2 parents 47b5ed2 + 0737b31
commit 26fd5fb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
@@ -182,5 +182,10 @@ private function updateAddressData(Address $address, array $addressData)
         $address->setRegionCode($addressData['region']);
         $address->setCountryId($addressData['countryCodeAlpha2']);
         $address->setPostcode($addressData['postalCode']);
+
+        // PayPal's address supposes not saving against customer account
+        $address->setSaveInAddressBook(false);
+        $address->setSameAsBilling(false);
+        $address->setCustomerAddressId(null);
     }
 }
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -316,9 +316,11 @@ protected function calculateDynamicBundleAmount($basePriceValue, $bundleProduct,
 
         foreach ($selectionPriceList as $selectionPrice) {
             ++$i;
-            $amountList[$i]['amount'] = $selectionPrice->getAmount();
-            // always honor the quantity given
-            $amountList[$i]['quantity'] = $selectionPrice->getQuantity();
+            if ($selectionPrice) {
+                $amountList[$i]['amount'] = $selectionPrice->getAmount();
+                // always honor the quantity given
+                $amountList[$i]['quantity'] = $selectionPrice->getQuantity();
+            }
         }
 
         /** @var  Store $store */

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
@@ -249,6 +249,7 @@ public function getDuplicateUrl()
     }
 
     /**
+     * @deprecated
      * @return string
      */
     public function getHeader()

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -583,8 +583,10 @@ public function getIsActiveAttributeId()
      */
     public function findWhereAttributeIs($entityIdsFilter, $attribute, $expectedValue)
     {
+        // @codingStandardsIgnoreStart
         $serializeData = $this->serializer->serialize($entityIdsFilter);
         $entityIdsFilterHash = md5($serializeData);
+        // @codingStandardsIgnoreEnd
 
         if (!isset($this->entitiesWhereAttributesIs[$entityIdsFilterHash][$attribute->getId()][$expectedValue])) {
             $linkField = $this->getLinkField();
@@ -767,7 +769,6 @@ public function getChildren($category, $recursive = true)
         $backendTable = $this->getTable([$this->getEntityTablePrefix(), 'int']);
         $connection = $this->getConnection();
         $checkSql = $connection->getCheckSql('c.value_id > 0', 'c.value', 'd.value');
-        $linkField = $this->getLinkField();
         $bind = [
             'attribute_id' => $attributeId,
             'store_id' => $category->getStoreId(),
-Original file line number
+Diff line change
@@ Expand Up / @@ -249,6 +249,7 @@ public function getDuplicateUrl() @@
         }
         /**
+         * @deprecated
          * @return string
          */
         public function getHeader()
@@ Expand Down @@