Skip to content

Commit e03bc48

Browse files
devaruldevarul
committed
Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-2127
2 parents 9f57557 + c333d32 commit e03bc48

File tree

24 files changed

+567
-86
lines changed

24 files changed

+567
-86
lines changed

‎app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* Category resource collection
1717
*
1818
* @api
19-
* @author Magento Core Team <core@magentocommerce.com>
2019
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2120
* @since 100.0.2
2221
*/
@@ -568,8 +567,7 @@ private function getProductsCountFromCategoryTable(Category $item, string $websi
568567
*/
569568
private function getProductsCountQuery(array $categoryIds, $addVisibilityFilter = true): Select
570569
{
571-
$connections = $this->_resource->getConnection();
572-
$categoryTable = $connections->getTableName('catalog_category_product_index');
570+
$categoryTable = $this->_resource->getTableName('catalog_category_product_index');
573571
$select = $this->_conn->select()
574572
->from(
575573
['cat_index' => $categoryTable],

‎app/code/Magento/Config/Console/Command/ConfigSetCommand.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ public function __construct(
9292
$this->changeDetector = $changeDetector;
9393
$this->processorFacadeFactory = $processorFacadeFactory;
9494
$this->deploymentConfig = $deploymentConfig;
95-
$this->localeEmulator = $localeEmulator ??
96-
ObjectManager::getInstance()->get(LocaleEmulatorInterface::class);
95+
$this->localeEmulator = $localeEmulator;
9796

9897
parent::__construct();
9998
}

‎app/code/Magento/Config/Console/Command/ConfigShowCommand.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ public function __construct(
126126
?: ObjectManager::getInstance()->get(PathValidatorFactory::class);
127127
$this->emulatedAreaProcessor = $emulatedAreaProcessor
128128
?: ObjectManager::getInstance()->get(EmulatedAdminhtmlAreaProcessor::class);
129-
$this->localeEmulator = $localeEmulator
130-
?: ObjectManager::getInstance()->get(LocaleEmulatorInterface::class);
129+
$this->localeEmulator = $localeEmulator;
131130
}
132131

133132
/**

‎app/code/Magento/Config/etc/di.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<preference for="Magento\Framework\App\Config\ConfigResource\ConfigInterface" type="Magento\Config\Model\ResourceModel\Config" />
1212
<preference for="Magento\Framework\App\Config\CommentParserInterface" type="Magento\Config\Model\Config\Parser\Comment" />
1313
<preference for="Magento\Config\Model\Config\Structure\ElementVisibilityInterface" type="Magento\Config\Model\Config\Structure\ElementVisibilityComposite" />
14-
<preference for="Magento\Config\Console\Command\LocaleEmulatorInterface" type="Magento\Config\Console\Command\LocaleEmulator\Proxy" />
14+
<preference for="Magento\Config\Console\Command\LocaleEmulatorInterface" type="Magento\Config\Console\Command\LocaleEmulator" />
1515
<type name="Magento\Config\Model\Config\Structure\ElementVisibilityComposite">
1616
<arguments>
1717
<argument name="visibility" xsi:type="array">
@@ -310,6 +310,12 @@
310310
<type name="Magento\Config\Console\Command\ConfigShowCommand">
311311
<arguments>
312312
<argument name="configSource" xsi:type="object">configShowSourceAggregated</argument>
313+
<argument name="localeEmulator" xsi:type="object">Magento\Config\Console\Command\LocaleEmulatorInterface\Proxy</argument>
314+
</arguments>
315+
</type>
316+
<type name="Magento\Config\Console\Command\ConfigSetCommand">
317+
<arguments>
318+
<argument name="localeEmulator" xsi:type="object">Magento\Config\Console\Command\LocaleEmulatorInterface\Proxy</argument>
313319
</arguments>
314320
</type>
315321
<type name="Magento\Framework\Console\CommandListInterface">

‎app/code/Magento/Fedex/Model/Carrier.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php
2-
/**
2+
/************************************************************************
3+
*
34
* Copyright 2023 Adobe
45
* All Rights Reserved.
56
*
6-
* ADOBE CONFIDENTIAL
7-
*
87
* NOTICE: All information contained herein is, and remains
98
* the property of Adobe and its suppliers, if any. The intellectual
109
* and technical concepts contained herein are proprietary to Adobe
@@ -13,6 +12,7 @@
1312
* Dissemination of this information or reproduction of this material
1413
* is strictly forbidden unless prior written permission is obtained
1514
* from Adobe.
15+
* ***********************************************************************
1616
*/
1717

1818
namespace Magento\Fedex\Model;

‎app/code/Magento/Fedex/Model/Source/PickupType.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?php
22
/************************************************************************
3-
*
4-
* ADOBE CONFIDENTIAL
5-
* ___________________
63
*
74
* Copyright 2023 Adobe
85
* All Rights Reserved.

‎app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php
2-
/**
2+
/************************************************************************
3+
*
34
* Copyright 2023 Adobe
45
* All Rights Reserved.
56
*
6-
* ADOBE CONFIDENTIAL
7-
*
87
* NOTICE: All information contained herein is, and remains
98
* the property of Adobe and its suppliers, if any. The intellectual
109
* and technical concepts contained herein are proprietary to Adobe
@@ -13,6 +12,7 @@
1312
* Dissemination of this information or reproduction of this material
1413
* is strictly forbidden unless prior written permission is obtained
1514
* from Adobe.
15+
* ***********************************************************************
1616
*/
1717

1818
declare(strict_types=1);

‎app/code/Magento/Fedex/etc/adminhtml/system.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
33
/************************************************************************
4-
*
5-
* ADOBE CONFIDENTIAL
6-
* ___________________
74
*
85
* Copyright 2014 Adobe
96
* All Rights Reserved.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
33
/************************************************************************
4-
*
5-
* ADOBE CONFIDENTIAL
6-
* ___________________
74
*
85
* Copyright 2014 Adobe
96
* All Rights Reserved.

‎app/code/Magento/OrderCancellationGraphQl/Model/Resolver/CancelOrder.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,13 @@ public function resolve(
107107
];
108108
}
109109

110+
if ($order->hasShipments()) {
111+
return [
112+
'error' => __('Order with one or more items shipped cannot be cancelled'),
113+
'order' => $this->orderFormatter->format($order)
114+
];
115+
}
116+
110117
if (!$this->config->isOrderCancellationEnabledForStore((int)$order->getStoreId())) {
111118
return [
112119
'error' => __('Order cancellation is not enabled for requested store.')

0 commit comments

Comments
 (0)