Skip to content

Commit 808c123

Browse files
author
Mike Weis
committed
MAGETWO-37847: Unable to place order for product with FPT and catalog prices including tax
- fixed
1 parent 986ab1c commit 808c123

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,15 +301,12 @@ public function getApplied($item)
301301
}
302302
}
303303

304-
/**
305-
* if order item data is old enough then weee_tax_applied cab be
306-
* not valid serialized data
307-
*/
304+
// if order item data is old enough then weee_tax_applied might not be valid
308305
$data = $item->getWeeeTaxApplied();
309306
if (empty($data)) {
310307
return [];
311308
}
312-
return unserialize($item->getWeeeTaxApplied());
309+
return \Zend_Json::decode($item->getWeeeTaxApplied());
313310
}
314311

315312
/**
@@ -321,7 +318,7 @@ public function getApplied($item)
321318
*/
322319
public function setApplied($item, $value)
323320
{
324-
$item->setWeeeTaxApplied(serialize($value));
321+
$item->setWeeeTaxApplied(\Zend_Json::encode($value));
325322
return $this;
326323
}
327324

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ public function processTaxData($observer)
4848
->setPrice($this->getUnitDisplayPriceExclTax($item))
4949
->setPriceInclTax($this->getUnitDisplayPriceInclTax($item));
5050

51-
if ($item->getWeeeTaxApplied()) {
52-
$weeeTaxApplied = unserialize($item->getWeeeTaxApplied());
53-
$item->setWeeeTaxApplied(\Zend_Json::encode($weeeTaxApplied));
54-
}
5551
return $item;
5652
}
5753

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private function setupOrderItem()
6060

6161
$orderItem->setData(
6262
'weee_tax_applied',
63-
serialize(
63+
\Zend_Json::encode(
6464
[
6565
[
6666
WeeeHelper::KEY_WEEE_AMOUNT_INVOICED => self::ROW_AMOUNT_INVOICED,

0 commit comments

Comments
 (0)