Skip to content

Commit d583e6b

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-90145' into 2.3-develop-pr13
2 parents ff5ca90 + d6fab07 commit d583e6b

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

app/code/Magento/Tax/etc/di.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
<item name="zip_is_range" xsi:type="string">main_table.zip_is_range</item>
117117
<item name="zip_from" xsi:type="string">main_table.zip_from</item>
118118
<item name="zip_to" xsi:type="string">main_table.zip_to</item>
119+
<item name="region_name" xsi:type="string">region_table.code</item>
119120
</argument>
120121
</arguments>
121122
</virtualType>

dev/tests/integration/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,6 @@ public function testDeleteThrowsExceptionIfTargetTaxRateDoesNotExist()
557557
}
558558

559559
/**
560-
*
561560
* @param \Magento\Framework\Api\Filter[] $filters
562561
* @param \Magento\Framework\Api\Filter[] $filterGroup
563562
* @param $expectedRateCodes
@@ -629,7 +628,17 @@ public function searchTaxRatesDataProvider()
629628
],
630629
[],
631630
['US - 42 - 7.5', 'US - 12 - 7.5'],
632-
]
631+
],
632+
'like_region_name' => [
633+
[
634+
$filterBuilder->setField(Rate::KEY_REGION_NAME)
635+
->setValue('%NM%')
636+
->setConditionType('like')
637+
->create(),
638+
],
639+
null,
640+
['US - 42 - 7.5', 'US - 42 - 22'],
641+
],
633642
];
634643
}
635644
}

0 commit comments

Comments
 (0)