Skip to content

Rename "billing_regione" to "billing_region" #26681

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 18 commits into
base: 2.4-develop
Choose a base branch
from
Open

Rename "billing_regione" to "billing_region" #26681

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
81b49b0
Update Collection.php
ageffray Feb 3, 2020
6185a01
Update sales_order_create_customer_block.xml
ageffray Feb 3, 2020
4d7f6f4
rename regione on benchmark.jmx
Feb 3, 2020
3cb5bfe
Merge branch '2.4-develop' of http://github.com/magento/magento2 into…
engcom-Echo Apr 13, 2020
d97a003
Add integration test
engcom-Echo Apr 13, 2020
48855f7
Fix static
engcom-Echo Apr 14, 2020
c76cbf7
Update dev/tests/integration/testsuite/Magento/Sales/Model/ResourceMo…
engcom-Echo May 4, 2020
b214d84
fix requested changes
engcom-Charlie Oct 7, 2020
18c4bb5
Merge branch '2.4-develop' into rename-billing-regione
engcom-Charlie Oct 7, 2020
caa3d9f
Merge branch '2.4-develop' into rename-billing-regione
engcom-Charlie Oct 8, 2020
2f7ce98
fix integration test
engcom-Charlie Oct 9, 2020
dcc9753
Merge branch '2.4-develop' into rename-billing-regione
engcom-Charlie Oct 9, 2020
d3b7eb8
fix conflict
Jun 20, 2023
e4b3c8f
Fix conflict
Jun 20, 2023
afab91c
Merge branch '2.4-develop' into rename-billing-regione
engcom-Lima Jun 21, 2023
defc58e
Merge branch '2.4-develop' into rename-billing-regione
engcom-Lima Jun 22, 2023
e8aaddf
Merge branch '2.4-develop' into rename-billing-regione
engcom-Echo Jul 17, 2024
e4a8561
Fixed static test failures
engcom-Echo Jul 17, 2024
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
7 changes: 6 additions & 1 deletion app/code/Magento/Sales/Model/ResourceModel/Order/Customer/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@
*/
namespace Magento\Sales\Model\ResourceModel\Order\Customer;

/**
* Customer collection
*/
class Collection extends \Magento\Customer\Model\ResourceModel\Customer\Collection
{
/**
* @inheritDoc
*
* @return $this
*/
protected function _initSelect()
Expand Down Expand Up @@ -38,7 +43,7 @@ protected function _initSelect()
null,
'left'
)->joinAttribute(
'billing_regione',
'billing_region',
'customer_address/region',
'default_billing',
null,
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@
<argument name="type" xsi:type="string">country</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.grid.columnSet.billing_regione" as="billing_regione">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.grid.columnSet.billing_region" as="billing_regione">
<arguments>
<argument name="header" xsi:type="string" translate="true">State/Province</argument>
<argument name="index" xsi:type="string">billing_regione</argument>
<argument name="index" xsi:type="string">billing_region</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.grid.columnSet.store_name" as="store_name">
Expand Down
61 changes: 61 additions & 0 deletions ...integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Customer/CollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Sales\Model\ResourceModel\Order\Customer;

use Magento\TestFramework\Helper\Bootstrap;
use PHPUnit\Framework\TestCase;

class CollectionTest extends TestCase
{
/**
* @var Collection
*/
private $collection;

/**
* @inheritDoc
*/
public function setUp()
{
$objectManager = Bootstrap::getObjectManager();
$this->collection = $objectManager->get(Collection::class);
}

/**
* Attribute presence test
*
* @magentoDataFixture Magento/Customer/_files/customer.php
* @magentoDataFixture Magento/Customer/_files/customer_address.php
* @dataProvider joinAttribute
* @param string $attribute
* @return void
*/
public function testAttributePresent($attribute): void
{
$customers = $this->collection->getItems();
foreach ($customers as $customer) {
$this->assertNotEmpty($customer->getData($attribute), "Attribute '$attribute' is not present");
}
}

/**
* Attribute data provider
*
* @return array
*/
public function joinAttribute():array
{
return [
['billing_postcode'],
['billing_city'],
['billing_telephone'],
['billing_region'],
['billing_country_id']
];
}
}
8 changes: 4 additions & 4 deletions setup/performance-toolkit/benchmark.jmx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25113,9 +25113,9 @@ catch (java.lang.Exception e) {
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
</elementProp>
<elementProp name="billing_regione" elementType="HTTPArgument">
<elementProp name="billing_region" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">true</boolProp>
<stringProp name="Argument.name">billing_regione</stringProp>
<stringProp name="Argument.name">billing_region</stringProp>
<stringProp name="Argument.value"/>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
Expand Down Expand Up @@ -66284,9 +66284,9 @@ catch (java.lang.Exception e) {
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
</elementProp>
<elementProp name="billing_regione" elementType="HTTPArgument">
<elementProp name="billing_region" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">true</boolProp>
<stringProp name="Argument.name">billing_regione</stringProp>
<stringProp name="Argument.name">billing_region</stringProp>
<stringProp name="Argument.value"/>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
Expand Down