Skip to content

Fix for #40153 #40155

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

Open
wants to merge 4 commits into
base: 2.4-develop
Choose a base branch
from
+33 −11
Open

Fix for #40153 #40155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6b1e88
#40153-Added conditional check based on function argument
Thirumalbalu Aug 25, 2025
6bccd9c
#40153 Updating unit test
Thirumalbalu Aug 25, 2025
425ffd7
Merge branch '2.4-develop' into fix-for-40153
Thirumalbalu Sep 1, 2025
4d61916
Merge branch '2.4-develop' into fix-for-40153
Thirumalbalu Sep 19, 2025
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
11 changes: 7 additions & 4 deletions app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,14 @@ public function __construct(
public function toOptionArray($isActiveOnlyFlag = false)
{
$methods = [['value' => '', 'label' => '']];
$carriers = $this->_shippingConfig->getAllCarriers();

if ($isActiveOnlyFlag) {
$carriers = $this->_shippingConfig->getActiveCarriers();
} else {
$carriers = $this->_shippingConfig->getAllCarriers();
}

foreach ($carriers as $carrierCode => $carrierModel) {
if (!$carrierModel->isActive() && (bool)$isActiveOnlyFlag === true) {
continue;
}
$carrierMethods = $carrierModel->getAllowedMethods();
if (!$carrierMethods) {
continue;
Expand Down
33 changes: 26 additions & 7 deletions app/code/Magento/Shipping/Test/Unit/Model/Config/Source/AllmethodsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,28 +58,45 @@ protected function setUp(): void
}

/**
* Ensure that options converted correctly
* Ensure that options converted correctly when isActiveOnlyFlag=false
*
* @dataProvider getCarriersMethodsProvider
* @param array $expectedArray
* @return void
*/
public function testToOptionArray(array $expectedArray): void
public function testToOptionArrayGetAllCarriers(array $expectedArray): void
{
$expectedArray['getAllCarriers'] = [$this->carriersMock];

$this->shippingConfig->expects($this->once())
->method('getAllCarriers')
->willReturn($expectedArray['getAllCarriers']);
$this->carriersMock->expects($this->once())
->method('isActive')
->willReturn(true);
$this->carriersMock->expects($this->once())
->method('getAllowedMethods')
->willReturn($expectedArray['allowedMethods']);
$this->assertEquals([$expectedArray['expected_result']], $this->allmethods->toOptionArray());
}

/**
* Ensure that options converted correctly when isActiveOnlyFlag=true
*
* @dataProvider getCarriersMethodsProvider
* @param array $expectedArray
* @return void
*/
public function testToOptionArrayGetActiveCarriers(array $expectedArray): void
{
$expectedArray['getActiveCarriers'] = [$this->carriersMock];

$this->shippingConfig->expects($this->once())
->method('getActiveCarriers')
->willReturn($expectedArray['getActiveCarriers']);
$this->carriersMock->expects($this->once())
->method('getAllowedMethods')
->willReturn($expectedArray['allowedMethods']);
$this->assertEquals([$expectedArray['expected_result']], $this->allmethods->toOptionArray(true));
}

/**
* Returns providers data for test
*
Expand All @@ -92,12 +109,14 @@ public static function getCarriersMethodsProvider(): array
[
'allowedMethods' => [null => 'method_title'],
'expected_result' => [ 'value' => [], 'label' => null],
'getAllCarriers' => []
'getAllCarriers' => [],
'getActiveCarriers' => []
],
[
'allowedMethods' => ['method_code' => 'method_title'],
'expected_result' => [ 'value' => [], 'label' => 'method_code'],
'getAllCarriers' => []
'getAllCarriers' => [],
'getActiveCarriers' => []
]

]
Expand Down