Merge branch 'FearlessKiwis-MAGETWO-37847-fpt-cannot-order-when-catalog-price-incl-tax' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop

Author: Robert He

app/code/Magento/Weee/Helper/Data.php

@@ -301,15 +301,12 @@ public function getApplied($item)
             }
         }
 
-        /**
-         * if order item data is old enough then weee_tax_applied cab be
-         * not valid serialized data
-         */
+        // if order item data is old enough then weee_tax_applied might not be valid
         $data = $item->getWeeeTaxApplied();
         if (empty($data)) {
             return [];
         }
-        return unserialize($item->getWeeeTaxApplied());
+        return \Zend_Json::decode($item->getWeeeTaxApplied());
     }
 
     /**
@@ -321,7 +318,7 @@ public function getApplied($item)
      */
     public function setApplied($item, $value)
     {
-        $item->setWeeeTaxApplied(serialize($value));
+        $item->setWeeeTaxApplied(\Zend_Json::encode($value));
         return $this;
     }
 

app/code/Magento/Weee/Model/Total/Observer/Webapi/Item.php

@@ -48,10 +48,6 @@ public function processTaxData($observer)
             ->setPrice($this->getUnitDisplayPriceExclTax($item))
             ->setPriceInclTax($this->getUnitDisplayPriceInclTax($item));
 
-        if ($item->getWeeeTaxApplied()) {
-            $weeeTaxApplied = unserialize($item->getWeeeTaxApplied());
-            $item->setWeeeTaxApplied(\Zend_Json::encode($weeeTaxApplied));
-        }
         return $item;
     }
 

app/code/Magento/Weee/Test/Unit/Helper/DataTest.php

@@ -60,7 +60,7 @@ private function setupOrderItem()
 
         $orderItem->setData(
             'weee_tax_applied',
-            serialize(
+            \Zend_Json::encode(
                 [
                     [
                         WeeeHelper::KEY_WEEE_AMOUNT_INVOICED => self::ROW_AMOUNT_INVOICED,