Skip to content

Commit ac8ca8b

Browse files
author
Stanislav Idolov
committed
magento-engcom/magento2ce#2287: Code style fixes
1 parent 9212fa3 commit ac8ca8b

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

app/code/Magento/Sales/Model/Order/Creditmemo/Total/Discount.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@
55
*/
66
namespace Magento\Sales\Model\Order\Creditmemo\Total;
77

8+
/**
9+
* Discount total calculator
10+
*/
811
class Discount extends AbstractTotal
912
{
1013
/**
14+
* Collect discount
15+
*
1116
* @param \Magento\Sales\Model\Order\Creditmemo $creditmemo
1217
* @return $this
1318
* @throws \Magento\Framework\Exception\LocalizedException
@@ -34,7 +39,7 @@ public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
3439
*/
3540
if ($baseShippingAmount && $order->getBaseShippingAmount() <= 0) {
3641
throw new \Magento\Framework\Exception\LocalizedException(
37-
new \Magento\Framework\Phrase("You can not refund shipping if there is no shipping amount.", [])
42+
__("You can not refund shipping if there is no shipping amount.")
3843
);
3944
}
4045
if ($baseShippingAmount) {

app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/DiscountTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ public function testCollectNonZeroShipping()
292292
->method('getBaseShippingDiscountAmount');
293293
$this->orderMock->expects($this->once())
294294
->method('getBaseShippingAmount')
295-
->willReturn( '0.0000');
295+
->willReturn('0.0000');
296296
$this->assertEquals($this->total, $this->total->collect($this->creditmemoMock));
297297
}
298298
}

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,8 @@
627627
}
628628

629629
&-item-details {
630-
padding-bottom: 35px;
631630
display: table-cell;
631+
padding-bottom: 35px;
632632
vertical-align: top;
633633
white-space: normal;
634634
width: 99%;

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,9 @@ define([
152152
});
153153

154154
it('test subscribe when cart data was changed', function () {
155-
mocks['Magento_Customer/js/customer-data'].get('cart')({ data_id: 2 });
155+
mocks['Magento_Customer/js/customer-data'].get('cart')({
156+
data_id: 2
157+
});
156158
expect(mocks['Magento_Checkout/js/model/cart/totals-processor/default'].estimateTotals).toHaveBeenCalled();
157159
});
158160
});

0 commit comments

Comments
 (0)