Skip to content

Commit df50692

Browse files
author
Magento Team
committed
Merge branch 'develop' of https://github.com/magento/magento2ce into 2.3-develop
2 parents d513d77 + 0f71c20 commit df50692

File tree

8 files changed

+54
-23
lines changed

8 files changed

+54
-23
lines changed

‎app/code/Magento/Catalog/Helper/Product/ProductList.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ class ProductList
3030
*/
3131
protected $scopeConfig;
3232

33+
/**
34+
* @var \Magento\Framework\Registry
35+
*/
36+
private $coreRegistry;
37+
3338
/**
3439
* Default limits per page
3540
*
@@ -41,9 +46,11 @@ class ProductList
4146
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
4247
*/
4348
public function __construct(
44-
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
49+
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
50+
\Magento\Framework\Registry $coreRegistry = null
4551
) {
4652
$this->scopeConfig = $scopeConfig;
53+
$this->coreRegistry = $coreRegistry ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\Registry::class);
4754
}
4855

4956
/**
@@ -97,6 +104,11 @@ public function getDefaultViewMode($options = [])
97104
*/
98105
public function getDefaultSortField()
99106
{
107+
$currentCategory = $this->coreRegistry->registry('current_category');
108+
if ($currentCategory) {
109+
return $currentCategory->getDefaultSortBy();
110+
}
111+
100112
return $this->scopeConfig->getValue(
101113
\Magento\Catalog\Model\Config::XML_PATH_LIST_DEFAULT_SORT_BY,
102114
\Magento\Store\Model\ScopeInterface::SCOPE_STORE

‎app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<argument name="at_call" xsi:type="string">getShortDescription</argument>
9595
<argument name="at_code" xsi:type="string">short_description</argument>
9696
<argument name="css_class" xsi:type="string">overview</argument>
97-
<argument name="at_label" xsi:type="string">none</argument>
97+
<argument name="at_label" translate="true" xsi:type="string">none</argument>
9898
<argument name="title" translate="true" xsi:type="string">Overview</argument>
9999
<argument name="add_attribute" xsi:type="string">itemprop="description"</argument>
100100
</arguments>
@@ -135,7 +135,7 @@
135135
<argument name="at_call" xsi:type="string">getDescription</argument>
136136
<argument name="at_code" xsi:type="string">description</argument>
137137
<argument name="css_class" xsi:type="string">description</argument>
138-
<argument name="at_label" xsi:type="string">none</argument>
138+
<argument name="at_label" translate="true" xsi:type="string">none</argument>
139139
<argument name="title" translate="true" xsi:type="string">Details</argument>
140140
</arguments>
141141
</block>

‎app/code/Magento/Checkout/Model/Cart.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,7 @@ public function addProduct($productInfo, $requestInfo = null)
366366
) {
367367
$request->setQty($minimumQty);
368368
}
369-
}
370369

371-
if ($productId) {
372370
try {
373371
$result = $this->getQuote()->addProduct($product, $request);
374372
} catch (\Magento\Framework\Exception\LocalizedException $e) {

‎app/code/Magento/Sales/Model/Service/OrderService.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public function __construct(
8787
public function cancel($id)
8888
{
8989
$order = $this->orderRepository->get($id);
90-
if ((bool)$order->cancel()) {
90+
if ($order->canCancel()) {
91+
$order->cancel();
9192
$this->orderRepository->save($order);
9293
return true;
9394
}

‎app/code/Magento/Sales/Test/Unit/Model/Service/OrderServiceTest.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,30 @@ public function testCancel()
163163
$this->orderMock->expects($this->once())
164164
->method('cancel')
165165
->willReturn($this->orderMock);
166+
$this->orderMock->expects($this->once())
167+
->method('canCancel')
168+
->willReturn(true);
166169
$this->assertTrue($this->orderService->cancel(123));
167170
}
168171

172+
/**
173+
* test for Order::cancel() fail case
174+
*/
175+
public function testCancelFailed()
176+
{
177+
$this->orderRepositoryMock->expects($this->once())
178+
->method('get')
179+
->with(123)
180+
->willReturn($this->orderMock);
181+
$this->orderMock->expects($this->never())
182+
->method('cancel')
183+
->willReturn($this->orderMock);
184+
$this->orderMock->expects($this->once())
185+
->method('canCancel')
186+
->willReturn(false);
187+
$this->assertFalse($this->orderService->cancel(123));
188+
}
189+
169190
public function testGetCommentsList()
170191
{
171192
$this->filterBuilderMock->expects($this->once())

‎app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,21 @@
4141
<item name="total" xsi:type="string" translate="true">Row Total</item>
4242
</argument>
4343
</arguments>
44-
<block class="Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer" as="default" template="Magento_Sales::order/view/items/renderer/default.phtml">
45-
<arguments>
46-
<argument name="columns" xsi:type="array">
47-
<item name="product" xsi:type="string" translate="false">col-product</item>
48-
<item name="status" xsi:type="string" translate="false">col-status</item>
49-
<item name="price-original" xsi:type="string" translate="false">col-price-original</item>
50-
<item name="price" xsi:type="string" translate="false">col-price</item>
51-
<item name="qty" xsi:type="string" translate="false">col-ordered-qty</item>
52-
<item name="subtotal" xsi:type="string" translate="false">col-subtotal</item>
53-
<item name="tax-amount" xsi:type="string" translate="false">col-tax-amount</item>
54-
<item name="tax-percent" xsi:type="string" translate="false">col-tax-percent</item>
55-
<item name="discont" xsi:type="string" translate="false">col-discont</item>
56-
<item name="total" xsi:type="string" translate="false">col-total</item>
57-
</argument>
58-
</arguments>
44+
<block class="Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer" as="default" name="default_order_items_renderer" template="Magento_Sales::order/view/items/renderer/default.phtml">
45+
<arguments>
46+
<argument name="columns" xsi:type="array">
47+
<item name="product" xsi:type="string" translate="false">col-product</item>
48+
<item name="status" xsi:type="string" translate="false">col-status</item>
49+
<item name="price-original" xsi:type="string" translate="false">col-price-original</item>
50+
<item name="price" xsi:type="string" translate="false">col-price</item>
51+
<item name="qty" xsi:type="string" translate="false">col-ordered-qty</item>
52+
<item name="subtotal" xsi:type="string" translate="false">col-subtotal</item>
53+
<item name="tax-amount" xsi:type="string" translate="false">col-tax-amount</item>
54+
<item name="tax-percent" xsi:type="string" translate="false">col-tax-percent</item>
55+
<item name="discont" xsi:type="string" translate="false">col-discont</item>
56+
<item name="total" xsi:type="string" translate="false">col-total</item>
57+
</argument>
58+
</arguments>
5959
</block>
6060
<block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
6161
<block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>

‎app/code/Magento/Swagger/Block/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Index extends Template
1919
*/
2020
private function getParamStore()
2121
{
22-
return ($this->getRequest()->getParam('store')) ? $this->getRequest()->getParam('store') : 'all';
22+
return $this->getRequest()->getParam('store') ?: 'all';
2323
}
2424

2525
/**

‎app/code/Magento/Tax/etc/config.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<based_on>shipping</based_on>
2121
<price_includes_tax>0</price_includes_tax>
2222
<shipping_includes_tax>0</shipping_includes_tax>
23-
<discount_tax>0</discount_tax>
2423
<apply_tax_on>0</apply_tax_on>
2524
</calculation>
2625
<defaults>

0 commit comments

Comments
 (0)