Skip to content

[Port 2.3-develop] Append shipment comment to shipment if appendComment is true #11519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2017
Merged

[Port 2.3-develop] Append shipment comment to shipment if appendComment is true #11519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ public function create(
$appendComment,
$comment->getIsVisibleOnFront()
);

if ($appendComment) {
$shipment->setCustomerNote($comment->getComment());
$shipment->setCustomerNoteNotify($appendComment);
}
}

return $shipment;
Expand Down
8 changes: 6 additions & 2 deletions app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ protected function setUp()

$this->shipmentMock = $this->getMockBuilder(ShipmentInterface::class)
->disableOriginalConstructor()
->setMethods(['addComment', 'addTrack'])
->setMethods(['addComment', 'addTrack', 'setCustomerNote', 'setCustomerNoteNotify'])
->getMockForAbstractClass();

$this->hydratorPoolMock = $this->getMockBuilder(HydratorPool::class)
Expand Down Expand Up @@ -166,7 +166,7 @@ public function testCreate()
if ($appendComment) {
$comment = "New comment!";
$visibleOnFront = true;
$this->commentMock->expects($this->once())
$this->commentMock->expects($this->exactly(2))
->method('getComment')
->willReturn($comment);

Expand All @@ -178,6 +178,10 @@ public function testCreate()
->method('addComment')
->with($comment, $appendComment, $visibleOnFront)
->willReturnSelf();

$this->shipmentMock->expects($this->once())
->method('setCustomerNoteNotify')
->with(true);
}

$this->assertEquals(
Expand Down