Skip to content

Commit 8e8453d

Browse files
author
Vladyslav Shcherbyna
committed
Merge branch 'MAGETWO-45612' into bugfixes
2 parents 5c085d7 + 212a2d8 commit 8e8453d

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

app/code/Magento/Sales/etc/fieldset.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@
508508
</field>
509509
<field name="base_shipping_amount">
510510
<aspect name="to_quote_address_shipping" />
511-
<aspect name="to_cm"/>
512511
</field>
513512
<field name="base_shipping_incl_tax">
514513
<aspect name="to_quote_address_shipping" />
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\Convert;
8+
9+
use Magento\TestFramework\Helper\Bootstrap;
10+
11+
/**
12+
* Class OrderTest
13+
*/
14+
class OrderTest extends \PHPUnit_Framework_TestCase
15+
{
16+
/** @var Order */
17+
protected $_model;
18+
19+
protected function setUp()
20+
{
21+
$this->_model = Bootstrap::getObjectManager()->create('Magento\Sales\Model\Convert\Order');
22+
}
23+
24+
/**
25+
* @magentoDataFixture Magento/Sales/_files/order.php
26+
*/
27+
public function testConvertToCreditmemo()
28+
{
29+
/** @var \Magento\Sales\Model\Order $order */
30+
$order = Bootstrap::getObjectManager()->create('Magento\Sales\Model\Order');
31+
$order->loadByIncrementId('100000001');
32+
//MAGETWO-45612 fix
33+
$order->setBaseShippingAmount(5);
34+
$this->assertNull($this->_model->toCreditmemo($order)->getBaseShippingAmount());
35+
}
36+
}

0 commit comments

Comments
 (0)