Skip to content

Commit 063950f

Browse files
lenaorobeilenaorobei
committed
Merge branch '2.3-develop' of github.com:magento/graphql-ce into date-type-not-hide-formatting
2 parents 295372e + 4321600 commit 063950f

File tree

33 files changed

+270
-96
lines changed

33 files changed

+270
-96
lines changed

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -482,22 +482,22 @@
482482
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
483483
<label>Base URL</label>
484484
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
485-
<comment>Specify URL or {{base_url}} placeholder.</comment>
485+
<comment><![CDATA[Specify URL or {{base_url}} placeholder.]]></comment>
486486
</field>
487487
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
488488
<label>Base Link URL</label>
489489
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
490-
<comment>May start with {{unsecure_base_url}} placeholder.</comment>
490+
<comment><![CDATA[May start with {{unsecure_base_url}} placeholder.]]></comment>
491491
</field>
492492
<field id="base_static_url" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
493493
<label>Base URL for Static View Files</label>
494494
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
495-
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
495+
<comment><![CDATA[May be empty or start with {{unsecure_base_url}} placeholder.]]></comment>
496496
</field>
497497
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
498498
<label>Base URL for User Media Files</label>
499499
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
500-
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
500+
<comment><![CDATA[May be empty or start with {{unsecure_base_url}} placeholder.]]></comment>
501501
</field>
502502
</group>
503503
<group id="secure" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -506,22 +506,22 @@
506506
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
507507
<label>Secure Base URL</label>
508508
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
509-
<comment>Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.</comment>
509+
<comment><![CDATA[Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
510510
</field>
511511
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
512512
<label>Secure Base Link URL</label>
513513
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
514-
<comment>May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.</comment>
514+
<comment><![CDATA[May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.]]></comment>
515515
</field>
516516
<field id="base_static_url" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
517517
<label>Secure Base URL for Static View Files</label>
518518
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
519-
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
519+
<comment><![CDATA[May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
520520
</field>
521521
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
522522
<label>Secure Base URL for User Media Files</label>
523523
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
524-
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
524+
<comment><![CDATA[May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
525525
</field>
526526
<field id="use_in_frontend" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
527527
<label>Use Secure URLs on Storefront</label>

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
78
namespace Magento\Catalog\Controller\Adminhtml\Product;
89

910
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
1011

12+
/**
13+
* Edit product
14+
*/
1115
class Edit extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface
1216
{
1317
/**
@@ -51,7 +55,7 @@ public function execute()
5155
$productId = (int) $this->getRequest()->getParam('id');
5256
$product = $this->productBuilder->build($this->getRequest());
5357

54-
if (($productId && !$product->getEntityId())) {
58+
if ($productId && !$product->getEntityId()) {
5559
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
5660
$resultRedirect = $this->resultRedirectFactory->create();
5761
$this->messageManager->addErrorMessage(__('This product doesn\'t exist.'));

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
726726

727727
// TODO: getAttributeModel() should not be used when MAGETWO-48284 is complete
728728
$childData = $this->arrayManager->get($configPath, $meta, []);
729-
if (($rules = $this->catalogEavValidationRules->build($this->getAttributeModel($attribute), $childData))) {
729+
if ($rules = $this->catalogEavValidationRules->build($this->getAttributeModel($attribute), $childData)) {
730730
$meta = $this->arrayManager->merge($configPath, $meta, ['validation' => $rules]);
731731
}
732732

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,13 @@
507507
})(jQuery);
508508
this.closeModal();
509509
}
510-
}]
511-
510+
}],
511+
keyEventHandlers: {
512+
enterKey: function (event) {
513+
this.buttons[1].click();
514+
event.preventDefault();
515+
}
516+
}
512517
}).trigger('openModal');
513518

514519
}

‎app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private function getCategoryUrlSuffix($storeId = null): string
148148
CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
149149
ScopeInterface::SCOPE_STORE,
150150
$storeId
151-
);
151+
) ?? '';
152152
}
153153

154154
/**

‎app/code/Magento/Directory/Setup/Patch/Data/AddCountriesCaribbeanCuracaoKosovoSintMaarten.php

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\Directory\Setup\Patch\Data;
10+
11+
use Magento\Framework\Setup\ModuleDataSetupInterface;
12+
use Magento\Framework\Setup\Patch\DataPatchInterface;
13+
14+
/**
15+
* Class AddCountriesCaribbeanCuracaoKosovoSintMaarten
16+
*
17+
* @package Magento\Directory\Setup\Patch
18+
*/
19+
class AddCountriesCaribbeanCuracaoKosovoSintMaarten implements DataPatchInterface
20+
{
21+
/**
22+
* @var ModuleDataSetupInterface
23+
*/
24+
private $moduleDataSetup;
25+
26+
/**
27+
* AddCountriesCaribbeanCuracaoKosovoSintMaarten constructor.
28+
* @param ModuleDataSetupInterface $moduleDataSetup
29+
*/
30+
public function __construct(
31+
ModuleDataSetupInterface $moduleDataSetup
32+
) {
33+
$this->moduleDataSetup = $moduleDataSetup;
34+
}
35+
36+
/**
37+
* @inheritdoc
38+
*/
39+
public function apply()
40+
{
41+
/**
42+
* Fill table directory/country
43+
*/
44+
$data = [
45+
[
46+
'country_id' => 'BQ',
47+
'iso2_code' => 'BQ',
48+
'iso3_code' => 'BES',
49+
],
50+
[
51+
'country_id' => 'CW',
52+
'iso2_code' => 'CW',
53+
'iso3_code' => 'CUW',
54+
],
55+
[
56+
'country_id' => 'SX',
57+
'iso2_code' => 'SX',
58+
'iso3_code' => 'SXM',
59+
],
60+
[
61+
'country_id' => 'XK',
62+
'iso2_code' => 'XK',
63+
'iso3_code' => 'XKX',
64+
],
65+
];
66+
67+
$this->moduleDataSetup->getConnection()->insertOnDuplicate(
68+
$this->moduleDataSetup->getTable('directory_country'),
69+
$data
70+
);
71+
}
72+
73+
/**
74+
* @inheritdoc
75+
*/
76+
public static function getDependencies()
77+
{
78+
return [
79+
InitializeDirectoryData::class
80+
];
81+
}
82+
83+
/**
84+
* @inheritdoc
85+
*/
86+
public function getAliases()
87+
{
88+
return [];
89+
}
90+
}

‎app/code/Magento/Directory/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<general>
3737
<country>
3838
<optional_zip_countries>HK,IE,MO,PA,GB</optional_zip_countries>
39-
<allow>AF,AL,DZ,AS,AD,AO,AI,AQ,AG,AR,AM,AW,AU,AT,AX,AZ,BS,BH,BD,BB,BY,BE,BZ,BJ,BM,BL,BT,BO,BA,BW,BV,BR,IO,VG,BN,BG,BF,BI,KH,CM,CA,CD,CV,KY,CF,TD,CL,CN,CX,CC,CO,KM,CG,CK,CR,HR,CU,CY,CZ,DK,DJ,DM,DO,EC,EG,SV,GQ,ER,EE,ET,FK,FO,FJ,FI,FR,GF,PF,TF,GA,GM,GE,DE,GG,GH,GI,GR,GL,GD,GP,GU,GT,GN,GW,GY,HT,HM,HN,HK,HU,IS,IM,IN,ID,IR,IQ,IE,IL,IT,CI,JE,JM,JP,JO,KZ,KE,KI,KW,KG,LA,LV,LB,LS,LR,LY,LI,LT,LU,ME,MF,MO,MK,MG,MW,MY,MV,ML,MT,MH,MQ,MR,MU,YT,FX,MX,FM,MD,MC,MN,MS,MA,MZ,MM,NA,NR,NP,NL,AN,NC,NZ,NI,NE,NG,NU,NF,KP,MP,NO,OM,PK,PW,PA,PG,PY,PE,PH,PN,PL,PS,PT,PR,QA,RE,RO,RS,RU,RW,SH,KN,LC,PM,VC,WS,SM,ST,SA,SN,SC,SL,SG,SK,SI,SB,SO,ZA,GS,KR,ES,LK,SD,SR,SJ,SZ,SE,CH,SY,TL,TW,TJ,TZ,TH,TG,TK,TO,TT,TN,TR,TM,TC,TV,VI,UG,UA,AE,GB,US,UM,UY,UZ,VU,VA,VE,VN,WF,EH,YE,ZM,ZW</allow>
39+
<allow>AF,AL,DZ,AS,AD,AO,AI,AQ,AG,AR,AM,AW,AU,AT,AX,AZ,BS,BH,BD,BB,BY,BE,BZ,BJ,BM,BL,BT,BO,BQ,BA,BW,BV,BR,IO,VG,BN,BG,BF,BI,KH,CM,CA,CD,CV,KY,CF,TD,CL,CN,CX,CW,CC,CO,KM,CG,CK,CR,HR,CU,CY,CZ,DK,DJ,DM,DO,EC,EG,SV,GQ,ER,EE,ET,FK,FO,FJ,FI,FR,GF,PF,TF,GA,GM,GE,DE,GG,GH,GI,GR,GL,GD,GP,GU,GT,GN,GW,GY,HT,HM,HN,HK,HU,IS,IM,IN,ID,IR,IQ,IE,IL,IT,CI,JE,JM,JP,JO,KZ,KE,KI,KW,KG,LA,LV,LB,LS,LR,LY,LI,LT,LU,ME,MF,MO,MK,MG,MW,MY,MV,ML,MT,MH,MQ,MR,MU,YT,FX,MX,FM,MD,MC,MN,MS,MA,MZ,MM,NA,NR,NP,NL,AN,NC,NZ,NI,NE,NG,NU,NF,KP,MP,NO,OM,PK,PW,PA,PG,PY,PE,PH,PN,PL,PS,PT,PR,QA,RE,RO,RS,RU,RW,SH,KN,LC,PM,VC,WS,SM,ST,SA,SN,SC,SL,SG,SK,SI,SB,SO,ZA,GS,KR,ES,LK,SD,SR,SJ,SZ,SE,CH,SX,SY,TL,TW,TJ,TZ,TH,TG,TK,TO,TT,TN,TR,TM,TC,TV,VI,UG,UA,AE,GB,US,UM,UY,UZ,VU,VA,VE,VN,WF,EH,XK,YE,ZM,ZW</allow>
4040
<default>US</default>
4141
</country>
4242
<locale>

‎app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
use \Magento\Framework\HTTP\ZendClient;
99

10+
/**
11+
* Performs the request to make the deployment
12+
*/
1013
class Deployments
1114
{
1215
/**
@@ -88,7 +91,7 @@ public function setDeployment($description, $change = false, $user = false)
8891
return false;
8992
}
9093

91-
if (($response->getStatus() < 200 || $response->getStatus() > 210)) {
94+
if ($response->getStatus() < 200 || $response->getStatus() > 210) {
9295
$this->logger->warning('Deployment marker request did not send a 200 status code.');
9396
return false;
9497
}

‎app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
78
namespace Magento\Persistent\Observer;
89

910
use Magento\Framework\Event\ObserverInterface;
1011

12+
/**
13+
* Make persistent quote to be guest
14+
*
15+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
16+
*/
1117
class MakePersistentQuoteGuestObserver implements ObserverInterface
1218
{
1319
/**
@@ -65,8 +71,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
6571
/** @var $action \Magento\Persistent\Controller\Index */
6672
$action = $observer->getEvent()->getControllerAction();
6773
if ($action instanceof \Magento\Persistent\Controller\Index) {
68-
if ((($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
69-
|| $this->_persistentData->isShoppingCartPersist())
74+
if (($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
75+
|| $this->_persistentData->isShoppingCartPersist()
7076
) {
7177
$this->quoteManager->setGuest(true);
7278
}

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderAddProductCheckboxTest.xml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCreateOrderAddProductCheckboxTest">
12+
<annotations>
13+
<title value="Create Order in Admin and Add Product"/>
14+
<stories value="Create order and add product using checkbox"/>
15+
<description value="Create order in Admin panel, add product by clicking checkbox, and verify it is checked"/>
16+
<features value="Sales"/>
17+
<severity value="AVERAGE"/>
18+
<group value="Sales"/>
19+
</annotations>
20+
21+
<before>
22+
<!-- Create simple customer -->
23+
<createData entity="Simple_US_Customer_CA" stepKey="createSimpleCustomer"/>
24+
25+
<!-- Create simple product -->
26+
<createData entity="ApiProductWithDescription" stepKey="createSimpleProduct"/>
27+
28+
<!-- Login to Admin Panel -->
29+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
30+
</before>
31+
32+
<!-- Initiate create new order -->
33+
<actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
34+
<argument name="customer" value="$$createSimpleCustomer$$"/>
35+
</actionGroup>
36+
37+
<click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
38+
<fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="$$createSimpleProduct.sku$$" stepKey="fillSkuFilterBundle"/>
39+
<click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchBundle"/>
40+
<scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
41+
<checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectProduct"/>
42+
<seeCheckboxIsChecked selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="verifyProductChecked"/>
43+
44+
<after>
45+
<actionGroup ref="logout" stepKey="logout"/>
46+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
47+
<deleteData createDataKey="createSimpleCustomer" stepKey="deleteSimpleCustomer"/>
48+
</after>
49+
</test>
50+
</tests>

0 commit comments

Comments
 (0)