Skip to content

Commit 9adf329

Browse files
magento-mts-svcmagento-mts-svc
authored
merge magento/2.4.1-develop into magento-pangolin/MQE-2271-2.4.1-dev
2 parents c129d31 + b246e2a commit 9adf329

File tree

11 files changed

+119
-80
lines changed

11 files changed

+119
-80
lines changed

‎app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,6 @@ private function getBillingAddressComponent($paymentCode, $elements)
351351
],
352352
],
353353
'telephone' => [
354-
'validation' => [
355-
'validate-phoneStrict' => 0,
356-
],
357354
'config' => [
358355
'tooltip' => [
359356
'description' => __('For delivery questions.'),

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,6 @@
223223
</item>
224224
</item>
225225
<item name="telephone" xsi:type="array">
226-
<item name="validation" xsi:type="array">
227-
<item name="validate-phoneStrict" xsi:type="number">0</item>
228-
</item>
229226
<item name="config" xsi:type="array">
230227
<item name="tooltip" xsi:type="array">
231228
<item name="description" xsi:type="string" translate="true">For delivery questions.</item>

‎app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<item>Bld D</item>
2020
</array>
2121
<data key="company">Magento</data>
22-
<data key="telephone">123-456-7890</data>
22+
<data key="telephone">1234568910</data>
2323
<data key="fax">1234568910</data>
2424
<data key="postcode">78729</data>
2525
<data key="city">Austin</data>
@@ -172,7 +172,7 @@
172172
<data key="city">London</data>
173173
<data key="postcode">SE1 7RW</data>
174174
<data key="country_id">GB</data>
175-
<data key="telephone">444-444-4444</data>
175+
<data key="telephone">444-44-444-44</data>
176176
</entity>
177177
<entity name="US_Address_Utah" type="address">
178178
<data key="firstname">John</data>
@@ -227,7 +227,7 @@
227227
<data key="firstname">John</data>
228228
<data key="lastname">Doe</data>
229229
<data key="company">Magento</data>
230-
<data key="telephone">888-777-7890</data>
230+
<data key="telephone">0123456789-02134567</data>
231231
<array key="street">
232232
<item>172, Westminster Bridge Rd</item>
233233
<item>7700 xyz street</item>
@@ -305,7 +305,7 @@
305305
<data key="firstname">Jane</data>
306306
<data key="lastname">Miller</data>
307307
<data key="company">Magento</data>
308-
<data key="telephone">123-456-7899</data>
308+
<data key="telephone">44 20 7123 1234</data>
309309
<array key="street">
310310
<item>1 London Bridge Street</item>
311311
</array>

‎app/code/Magento/PageCache/Plugin/AppendNoStoreCacheHeader.php

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
/**
3+
*
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
8+
declare(strict_types=1);
9+
10+
namespace Magento\PageCache\Plugin;
11+
12+
use Magento\Framework\App\FrontControllerInterface;
13+
use Magento\Framework\App\Response\HttpInterface;
14+
15+
class AppendNoStoreCacheHeader
16+
{
17+
/**
18+
* Set cache-control header
19+
*
20+
* @param FrontControllerInterface $controller
21+
* @param HttpInterface $response
22+
* @return HttpInterface
23+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
24+
*/
25+
public function afterDispatch(FrontControllerInterface $controller, HttpInterface $response): HttpInterface
26+
{
27+
$response->setHeader('Cache-Control', 'no-store');
28+
return $response;
29+
}
30+
}

‎app/code/Magento/PageCache/etc/webapi_rest/di.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
9+
<type name="Magento\Framework\App\FrontControllerInterface">
10+
<plugin name="append_no_store_cache_header" type="Magento\PageCache\Plugin\AppendNoStoreCacheHeader" />
11+
</type>
12+
</config>

‎app/code/Magento/PageCache/etc/webapi_soap/di.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
9+
<type name="Magento\Framework\App\FrontControllerInterface">
10+
<plugin name="append_no_store_cache_header" type="Magento\PageCache\Plugin\AppendNoStoreCacheHeader" />
11+
</type>
12+
</config>

‎app/code/Magento/QuoteGraphQl/etc/graphql/events.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
9+
<event name="sales_model_service_quote_submit_success">
10+
<observer name="sendEmail" instance="Magento\Quote\Observer\SubmitObserver" />
11+
</event>
12+
</config>

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\Framework\Registry;
1414
use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory as QuoteCollectionFactory;
1515
use Magento\Sales\Api\OrderRepositoryInterface;
16+
use Magento\Sales\Model\OrderFactory;
1617
use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
1718
use Magento\TestFramework\Helper\Bootstrap;
1819
use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -57,23 +58,31 @@ class CheckoutEndToEndTest extends GraphQlAbstract
5758
*/
5859
private $orderRepository;
5960

61+
/**
62+
* @var OrderFactory
63+
*/
64+
private $orderFactory;
65+
6066
/**
6167
* @var array
6268
*/
6369
private $headers = [];
6470

71+
/**
72+
* @inheritdoc
73+
*/
6574
protected function setUp(): void
6675
{
67-
parent::setUp();
68-
6976
$objectManager = Bootstrap::getObjectManager();
77+
7078
$this->registry = $objectManager->get(Registry::class);
7179
$this->quoteCollectionFactory = $objectManager->get(QuoteCollectionFactory::class);
7280
$this->quoteResource = $objectManager->get(QuoteResource::class);
7381
$this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
74-
$this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
82+
$this->customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
7583
$this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
7684
$this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
85+
$this->orderFactory = $objectManager->get(OrderFactory::class);
7786
}
7887

7988
/**
@@ -97,8 +106,13 @@ public function testCheckoutWorkflow()
97106
$paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
98107
$this->setPaymentMethod($cartId, $paymentMethod);
99108

100-
$orderId = $this->placeOrder($cartId);
101-
$this->checkOrderInHistory($orderId);
109+
$orderIncrementId = $this->placeOrder($cartId);
110+
111+
$order = $this->orderFactory->create();
112+
$order->loadByIncrementId($orderIncrementId);
113+
114+
$this->checkOrderInHistory($orderIncrementId);
115+
$this->assertNotEmpty($order->getEmailSent());
102116
}
103117

104118
/**
@@ -208,7 +222,7 @@ private function createEmptyCart(): string
208222
private function addProductToCart(string $cartId, float $qty, string $sku): void
209223
{
210224
$query = <<<QUERY
211-
mutation {
225+
mutation {
212226
addSimpleProductsToCart(
213227
input: {
214228
cart_id: "{$cartId}"
@@ -350,7 +364,7 @@ private function setShippingMethod(string $cartId, array $method): array
350364
$query = <<<QUERY
351365
mutation {
352366
setShippingMethodsOnCart(input: {
353-
cart_id: "{$cartId}",
367+
cart_id: "{$cartId}",
354368
shipping_methods: [
355369
{
356370
carrier_code: "{$method['carrier_code']}"

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Magento\Framework\Registry;
1212
use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
1313
use Magento\Sales\Api\OrderRepositoryInterface;
14+
use Magento\Sales\Model\OrderFactory;
1415
use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
1516
use Magento\TestFramework\Helper\Bootstrap;
1617
use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -40,6 +41,11 @@ class PlaceOrderTest extends GraphQlAbstract
4041
*/
4142
private $registry;
4243

44+
/**
45+
* @var OrderFactory
46+
*/
47+
private $orderFactory;
48+
4349
/**
4450
* @inheritdoc
4551
*/
@@ -49,6 +55,7 @@ protected function setUp(): void
4955
$this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
5056
$this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
5157
$this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
58+
$this->orderFactory = $objectManager->get(OrderFactory::class);
5259
$this->registry = Bootstrap::getObjectManager()->get(Registry::class);
5360
}
5461

@@ -80,6 +87,10 @@ public function testPlaceOrder()
8087
self::assertArrayHasKey('placeOrder', $response);
8188
self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
8289
self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
90+
$orderIncrementId = $response['placeOrder']['order']['order_number'];
91+
$order = $this->orderFactory->create();
92+
$order->loadByIncrementId($orderIncrementId);
93+
$this->assertNotEmpty($order->getEmailSent());
8394
}
8495

8596
/**

0 commit comments

Comments
 (0)