Skip to content

leading zeros doesn't accountable in the cart for the cart price rule… #39525

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
magento-devops-reposync-svc merged 10 commits into from
Apr 16, 2025
Merged

leading zeros doesn't accountable in the cart for the cart price rule… #39525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cab3a07
leading zeros doesn't accountable in the cart for the cart price rule…
magentoabu Jan 6, 2025
8561b89
Copyright fixed
magentoabu Jan 30, 2025
cfac88f
Merge branch '2.4-develop' into 37919-cart-leadingzeros-issue
engcom-Hotel Jan 31, 2025
8521188
Merge branch '2.4-develop' into 37919-cart-leadingzeros-issue
engcom-Dash Mar 11, 2025
46caa5e
39525: Modified the code for leading 0 strings as === failing other c…
engcom-Dash Mar 17, 2025
922951b
Added Unit Test cases for both Validated value & value
engcom-Dash Mar 18, 2025
7834444
Fixed Static Test Case
engcom-Dash Mar 18, 2025
53899c1
Merge branch '2.4-develop' into 37919-cart-leadingzeros-issue
engcom-Dash Mar 18, 2025
d0dea2d
37919: Added More Test Cases for Validation & and updated the Copyrig…
engcom-Dash Mar 20, 2025
d52ec01
Merge branch '2.4-develop' into 37919-cart-leadingzeros-issue
engcom-Bravo Mar 24, 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
14 changes: 11 additions & 3 deletions app/code/Magento/Rule/Model/Condition/AbstractCondition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2011 Adobe
* All Rights Reserved.
*/

namespace Magento\Rule\Model\Condition;

use Magento\Framework\Data\Form;
Expand Down Expand Up @@ -866,6 +865,11 @@ public function validateAttribute($validatedValue)
}
}
break;
case '===':
if (!is_array($validatedValue) && !is_array($value)) {
$result = $this->_compareValues($validatedValue, $value);
}
break;
}

if ('!=' == $option || '>' == $option || '<' == $option || '!{}' == $option || '!()' == $option) {
Expand All @@ -886,6 +890,10 @@ public function validateAttribute($validatedValue)
protected function _compareValues($validatedValue, $value, $strict = true)
{
if ($strict && is_numeric($validatedValue) && is_numeric($value)) {
$pattern = '/^0\d+$/';
if (preg_match($pattern, $validatedValue) || preg_match($pattern, $value)) {
return $validatedValue === $value;
}
return $validatedValue == $value;
}

Expand Down
16 changes: 14 additions & 2 deletions app/code/Magento/Rule/Test/Unit/Model/Condition/AbstractConditionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2013 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -65,6 +65,18 @@ public static function validateAttributeDataProvider()
[null, '==', 0, false],
[null, '==', 0.00, false],

// Test cases for strict equality with leading zeros
['0123', '===', '123', false],
['000123', '===', '123', false],
['123', '===', '0123', false],
['123', '===', '000123', false],
['0123', '===', '0123', true],

// Test cases for strict equality with different numeric types
[0123, '===', '0123', false],
['123', '===', 0123, false],
[0123, '===', 0123, true],

[1, '!=', 1, false],
[0, '!=', 1, true],
['0', '!=', 1, true],
Expand Down