Skip to content

Commit 37f121f

Browse files
rganinrganin
authored
Merge pull request #3633 from magento-epam/EPAM-PR-33
Fixed: MAGETWO-91688 Exception when login as restricted admin with access only to CMS Block MAGETWO-95819 Customer registration fields not translated MAGETWO-95816 Invoice PDF contain different address when use arabic symbols MAGETWO-96404 [2.3.x] Cannot refresh Captcha image in production mode
2 parents 00042d2 + 20a62ad commit 37f121f

32 files changed

+360
-97
lines changed

‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml ‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
1011
<actionGroup name="GoToUserRoles">
1112
<click selector="#menu-magento-backend-system" stepKey="clickOnSystemIcon"/>
1213
<waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
@@ -15,18 +16,19 @@
1516
</actionGroup>
1617

1718
<!--Create new role-->
18-
<actionGroup name="AdminCreateRole">
19+
<actionGroup name="AdminCreateNewRole">
1920
<arguments>
2021
<argument name="role" type="string" defaultValue=""/>
2122
<argument name="resource" type="string" defaultValue="All"/>
23+
<argument name="scope" type="string" defaultValue="Custom"/>
24+
<argument name="websites" type="string" defaultValue="Main Website"/>
2225
</arguments>
2326
<click selector="{{AdminCreateRoleSection.create}}" stepKey="clickToAddNewRole"/>
2427
<fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="setRoleName"/>
2528
<fillField stepKey="setPassword" selector="{{AdminCreateRoleSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
2629
<click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
2730
<waitForPageLoad stepKey="waitForRoleResourcePage" time="5"/>
28-
<click selector="{{AdminCreateRoleSection.roleScope}}" stepKey="clickToExpandScopeAccess"/>
29-
<click selector="{{AdminCreateRoleSection.scopeValue(resource)}}" stepKey="clickToSelectScopeAccess"/>
31+
<click stepKey="checkSales" selector="//a[text()='Sales']"/>
3032
<click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
3133
<waitForPageLoad stepKey="waitForPageLoad" time="10"/>
3234
<see userInput="You saved the role." stepKey="seeSuccessMessage" />
@@ -46,4 +48,4 @@
4648
<waitForPageLoad stepKey="waitForPageLoad" time="10"/>
4749
<see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
4850
</actionGroup>
49-
</actionGroups>
51+
</actionGroups>

‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml ‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141

4242

4343
<!--Delete User-->
44-
<actionGroup name="AdminDeleteUserActionGroup">
44+
<actionGroup name="AdminDeleteNewUserActionGroup">
45+
4546
<click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser}}"/>
46-
<waitForPageLoad stepKey="waitForUserPageToLoad"/>
4747
<fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
4848
<scrollToTopOfPage stepKey="scrollToTop"/>
4949
<click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
@@ -52,4 +52,5 @@
5252
<waitForPageLoad stepKey="waitForPageLoad" time="10"/>
5353
<see userInput="You deleted the user." stepKey="seeSuccessMessage" />
5454
</actionGroup>
55+
5556
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,18 @@
4040

4141
<!--Create New Role-->
4242
<actionGroup ref="GoToUserRoles" stepKey="GoToUserRoles"/>
43-
<actionGroup ref="AdminCreateRole" stepKey="AdminCreateNewRole"/>
43+
<waitForPageLoad stepKey="waitForAllRoles" time="15"/>
44+
<actionGroup ref="AdminCreateNewRole" stepKey="AdminCreateNewRole"/>
4445

45-
<!--Create New User With Specific Role-->
46+
<!--Create new admin user-->
4647
<actionGroup ref="GoToAllUsers" stepKey="GoToAllUsers"/>
48+
<waitForPageLoad stepKey="waitForUsers" time="15"/>
4749
<actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>
4850

4951
<!--SignOut-->
5052
<actionGroup ref="logout" stepKey="signOutFromAdmin"/>
5153

52-
<!--SignIn New User-->
54+
<!--Log in as new user-->
5355
<actionGroup ref="LoginNewUser" stepKey="signInNewUser"/>
5456
<waitForPageLoad stepKey="waitForLogin" time="3"/>
5557

@@ -93,7 +95,7 @@
9395

9496
<!--Delete User -->
9597
<actionGroup ref="GoToAllUsers" stepKey="GoBackToAllUsers"/>
96-
<actionGroup ref="AdminDeleteUserActionGroup" stepKey="AdminDeleteUserActionGroup"/>
98+
<actionGroup ref="AdminDeleteNewUserActionGroup" stepKey="AdminDeleteUserActionGroup"/>
9799

98100
<!--Delete Role-->
99101
<actionGroup ref="GoToUserRoles" stepKey="GoBackToUserRoles"/>

‎app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml

-13
This file was deleted.

‎app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ public function testPrepareMetadata()
118118
'config' => [
119119
'editorConfig' => [
120120
'enabled' => false
121-
]
121+
],
122+
'componentType' => \Magento\Ui\Component\Container::NAME
122123
]
123124
]
124125
]

‎app/code/Magento/Cms/Ui/Component/DataProvider.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
use Magento\Framework\AuthorizationInterface;
1414
use Magento\Framework\View\Element\UiComponent\DataProvider\Reporting;
1515

16+
/**
17+
* DataProvider for cms ui.
18+
*/
1619
class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider
1720
{
1821
/**
@@ -67,6 +70,8 @@ public function __construct(
6770
}
6871

6972
/**
73+
* Get authorization info.
74+
*
7075
* @deprecated 101.0.7
7176
* @return AuthorizationInterface|mixed
7277
*/
@@ -95,7 +100,8 @@ public function prepareMetadata()
95100
'config' => [
96101
'editorConfig' => [
97102
'enabled' => false
98-
]
103+
],
104+
'componentType' => \Magento\Ui\Component\Container::NAME
99105
]
100106
]
101107
]

‎app/code/Magento/Customer/Block/Widget/Dob.php

+26-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function __construct(
6161
}
6262

6363
/**
64-
* @return void
64+
* @inheritdoc
6565
*/
6666
public function _construct()
6767
{
@@ -70,6 +70,8 @@ public function _construct()
7070
}
7171

7272
/**
73+
* Check if dob attribute enabled in system
74+
*
7375
* @return bool
7476
*/
7577
public function isEnabled()
@@ -79,6 +81,8 @@ public function isEnabled()
7981
}
8082

8183
/**
84+
* Check if dob attribute marked as required
85+
*
8286
* @return bool
8387
*/
8488
public function isRequired()
@@ -88,6 +92,8 @@ public function isRequired()
8892
}
8993

9094
/**
95+
* Set date
96+
*
9197
* @param string $date
9298
* @return $this
9399
*/
@@ -135,6 +141,8 @@ protected function applyOutputFilter($value)
135141
}
136142

137143
/**
144+
* Get day
145+
*
138146
* @return string|bool
139147
*/
140148
public function getDay()
@@ -143,6 +151,8 @@ public function getDay()
143151
}
144152

145153
/**
154+
* Get month
155+
*
146156
* @return string|bool
147157
*/
148158
public function getMonth()
@@ -151,6 +161,8 @@ public function getMonth()
151161
}
152162

153163
/**
164+
* Get year
165+
*
154166
* @return string|bool
155167
*/
156168
public function getYear()
@@ -168,6 +180,19 @@ public function getLabel()
168180
return __('Date of Birth');
169181
}
170182

183+
/**
184+
* Retrieve store attribute label
185+
*
186+
* @param string $attributeCode
187+
*
188+
* @return string
189+
*/
190+
public function getStoreLabel($attributeCode)
191+
{
192+
$attribute = $this->_getAttribute($attributeCode);
193+
return $attribute ? __($attribute->getStoreLabel()) : '';
194+
}
195+
171196
/**
172197
* Create correct date field
173198
*

‎app/code/Magento/Customer/Block/Widget/Gender.php

+16
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public function _construct()
6464

6565
/**
6666
* Check if gender attribute enabled in system
67+
*
6768
* @return bool
6869
*/
6970
public function isEnabled()
@@ -73,13 +74,27 @@ public function isEnabled()
7374

7475
/**
7576
* Check if gender attribute marked as required
77+
*
7678
* @return bool
7779
*/
7880
public function isRequired()
7981
{
8082
return $this->_getAttribute('gender') ? (bool)$this->_getAttribute('gender')->isRequired() : false;
8183
}
8284

85+
/**
86+
* Retrieve store attribute label
87+
*
88+
* @param string $attributeCode
89+
*
90+
* @return string
91+
*/
92+
public function getStoreLabel($attributeCode)
93+
{
94+
$attribute = $this->_getAttribute($attributeCode);
95+
return $attribute ? __($attribute->getStoreLabel()) : '';
96+
}
97+
8398
/**
8499
* Get current customer from session
85100
*
@@ -92,6 +107,7 @@ public function getCustomer()
92107

93108
/**
94109
* Returns options from gender attribute
110+
*
95111
* @return OptionInterface[]
96112
*/
97113
public function getGenderOptions()

‎app/code/Magento/Customer/Block/Widget/Taxvat.php

+13
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,17 @@ public function isRequired()
6363
{
6464
return $this->_getAttribute('taxvat') ? (bool)$this->_getAttribute('taxvat')->isRequired() : false;
6565
}
66+
67+
/**
68+
* Retrieve store attribute label
69+
*
70+
* @param string $attributeCode
71+
*
72+
* @return string
73+
*/
74+
public function getStoreLabel($attributeCode)
75+
{
76+
$attribute = $this->_getAttribute($attributeCode);
77+
return $attribute ? __($attribute->getStoreLabel()) : '';
78+
}
6679
}

‎app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php

+19-7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Magento\Framework\App\Cache\StateInterface;
1313
use Magento\Framework\App\CacheInterface;
1414
use Magento\Framework\Serialize\SerializerInterface;
15+
use Magento\Store\Model\StoreManagerInterface;
1516

1617
/**
1718
* Cache for attribute metadata
@@ -53,24 +54,33 @@ class AttributeMetadataCache
5354
*/
5455
private $serializer;
5556

57+
/**
58+
* @var StoreManagerInterface
59+
*/
60+
private $storeManager;
61+
5662
/**
5763
* Constructor
5864
*
5965
* @param CacheInterface $cache
6066
* @param StateInterface $state
6167
* @param SerializerInterface $serializer
6268
* @param AttributeMetadataHydrator $attributeMetadataHydrator
69+
* @param StoreManagerInterface $storeManager
6370
*/
6471
public function __construct(
6572
CacheInterface $cache,
6673
StateInterface $state,
6774
SerializerInterface $serializer,
68-
AttributeMetadataHydrator $attributeMetadataHydrator
75+
AttributeMetadataHydrator $attributeMetadataHydrator,
76+
StoreManagerInterface $storeManager = null
6977
) {
7078
$this->cache = $cache;
7179
$this->state = $state;
7280
$this->serializer = $serializer;
7381
$this->attributeMetadataHydrator = $attributeMetadataHydrator;
82+
$this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
83+
->get(StoreManagerInterface::class);
7484
}
7585

7686
/**
@@ -82,19 +92,20 @@ public function __construct(
8292
*/
8393
public function load($entityType, $suffix = '')
8494
{
85-
if (isset($this->attributes[$entityType . $suffix])) {
86-
return $this->attributes[$entityType . $suffix];
95+
$storeId = $this->storeManager->getStore()->getId();
96+
if (isset($this->attributes[$entityType . $suffix . $storeId])) {
97+
return $this->attributes[$entityType . $suffix . $storeId];
8798
}
8899
if ($this->isEnabled()) {
89-
$cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
100+
$cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
90101
$serializedData = $this->cache->load($cacheKey);
91102
if ($serializedData) {
92103
$attributesData = $this->serializer->unserialize($serializedData);
93104
$attributes = [];
94105
foreach ($attributesData as $key => $attributeData) {
95106
$attributes[$key] = $this->attributeMetadataHydrator->hydrate($attributeData);
96107
}
97-
$this->attributes[$entityType . $suffix] = $attributes;
108+
$this->attributes[$entityType . $suffix . $storeId] = $attributes;
98109
return $attributes;
99110
}
100111
}
@@ -111,9 +122,10 @@ public function load($entityType, $suffix = '')
111122
*/
112123
public function save($entityType, array $attributes, $suffix = '')
113124
{
114-
$this->attributes[$entityType . $suffix] = $attributes;
125+
$storeId = $this->storeManager->getStore()->getId();
126+
$this->attributes[$entityType . $suffix . $storeId] = $attributes;
115127
if ($this->isEnabled()) {
116-
$cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
128+
$cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
117129
$attributesData = [];
118130
foreach ($attributes as $key => $attribute) {
119131
$attributesData[$key] = $this->attributeMetadataHydrator->extract($attribute);

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<section name="StorefrontCustomerCreateFormSection">
1212
<element name="firstnameField" type="input" selector="#firstname"/>
1313
<element name="lastnameField" type="input" selector="#lastname"/>
14+
<element name="lastnameLabel" type="text" selector="//label[@for='lastname']"/>
1415
<element name="emailField" type="input" selector="#email_address"/>
1516
<element name="passwordField" type="input" selector="#password"/>
1617
<element name="confirmPasswordField" type="input" selector="#password-confirmation"/>

0 commit comments

Comments
 (0)