Merge remote-tracking branch 'origin/MAGETWO-65703' into 2.2-develop-pr9

Author: RomaKis

dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml

@@ -48,8 +48,7 @@
             </data>
             <constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertExportAdvancedPricing"/>
         </variation>
-        <variation name="ExportAdvancedPricingTestVariation4" summary="Trying export product data for product available on main website with default currency and custom website with different currency" ticketId="MAGETWO-48298">
-            <data name="issue" xsi:type="string">MAGETWO-65703: Fatal error on creation simple product with tier price in custom website via webapi handler</data>
+        <variation name="ExportAdvancedPricingTestVariation4" summary="Trying export product data for product available on main website with default currency and custom website with different currency" ticketId="MAGETWO-46153">
             <data name="configData" xsi:type="string">price_scope_website</data>
             <data name="exportData" xsi:type="string">csv_with_advanced_pricing</data>
             <data name="products/0" xsi:type="array">

dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Webapi.php

@@ -288,7 +288,11 @@ protected function prepareTierPrice()
                 $priceInfo['qty'] = $priceInfo['price_qty'];
                 unset($priceInfo['price_qty']);
 
-                unset($priceInfo['website_id']);
+                if (isset($priceInfo['website_id'])) {
+                    $priceInfo['extension_attributes']['website_id'] = $priceInfo['website_id'];
+                    unset($priceInfo['website_id']);
+                }
+
                 unset($priceInfo['delete']);
 
                 $this->fields['product']['tier_prices'][$key] = $priceInfo;