Skip to content

Commit 482dda5

Browse files
magento-engcom-teammagento-engcom-team
committed
Merge branch 2.3-develop into ENGCOM-4242-magento-magento2-21180
2 parents 29f5e93 + 6d8e725 commit 482dda5

File tree

24 files changed

+1022
-192
lines changed

24 files changed

+1022
-192
lines changed

‎app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,12 @@ public function getFields(array $context = []): array
137137
$searchCriteria = $this->searchCriteriaBuilder->create();
138138
$groups = $this->groupRepository->getList($searchCriteria)->getItems();
139139
$priceAttribute = $this->attributeAdapterProvider->getByAttributeCode('price');
140+
$ctx = isset($context['websiteId']) ? ['websiteId' => $context['websiteId']] : [];
140141
foreach ($groups as $group) {
142+
$ctx['customerGroupId'] = $group->getId();
141143
$groupPriceKey = $this->fieldNameResolver->getFieldName(
142144
$priceAttribute,
143-
['customerGroupId' => $group->getId(), 'websiteId' => $context['websiteId']]
145+
$ctx
144146
);
145147
$allAttributes[$groupPriceKey] = [
146148
'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_FLOAT),

‎app/code/Magento/Elasticsearch6/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<type name="Magento\Search\Model\Search\PageSizeProvider">
159159
<arguments>
160160
<argument name="pageSizeBySearchEngine" xsi:type="array">
161-
<item name="elasticsearch6" xsi:type="number">2147483647</item>
161+
<item name="elasticsearch6" xsi:type="number">10000</item>
162162
</argument>
163163
</arguments>
164164
</type>

‎app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ public function execute(string $cartHash, ?int $customerId): Quote
6969
);
7070
}
7171

72+
if (false === (bool)$cart->getIsActive()) {
73+
throw new GraphQlNoSuchEntityException(
74+
__('Current user does not have an active cart.')
75+
);
76+
}
77+
7278
$cartCustomerId = (int)$cart->getCustomerId();
7379

7480
/* Guest cart, allow operations */

‎app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ protected function _prepareForm()
132132
$this->_addAttributesToForm($attributes, $fieldset);
133133

134134
$this->_form->addFieldNameSuffix('order[account]');
135-
136-
$formValues = $this->extractValuesFromAttributes($attributes);
137-
$this->_form->setValues($formValues);
135+
$this->_form->setValues($this->extractValuesFromAttributes($attributes));
138136

139137
return $this;
140138
}

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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="AdminChangeCustomerGroupInNewOrder">
12+
<annotations>
13+
<title value="Customer account group cannot be selected while creating a new customer in order"/>
14+
<stories value="MC-15290: Customer account group cannot be selected while creating a new customer in order"/>
15+
<description value="Customer account group cannot be selected while creating a new customer in order"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="MC-15290"/>
18+
<useCaseId value="MC-15289"/>
19+
<group value="sales"/>
20+
</annotations>
21+
22+
<before>
23+
<actionGroup ref="LoginAsAdmin" stepKey="login"/>
24+
</before>
25+
<after>
26+
<actionGroup ref="logout" stepKey="logout"/>
27+
</after>
28+
29+
<actionGroup ref="navigateToNewOrderPageNewCustomerSingleStore" stepKey="openNewOrder"/>
30+
<selectOption selector="{{AdminOrderFormAccountSection.group}}" userInput="Retailer" stepKey="selectCustomerGroup"/>
31+
<waitForPageLoad stepKey="waitForPageLoad"/>
32+
<grabValueFrom selector="{{AdminOrderFormAccountSection.group}}" stepKey="grabGroupValue"/>
33+
<assertEquals stepKey="assertValueIsStillSelected">
34+
<actualResult type="variable">$grabGroupValue</actualResult>
35+
<expectedResult type="string">3</expectedResult>
36+
</assertEquals>
37+
</test>
38+
</tests>

‎app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomWebsiteActionGroup.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
</arguments>
1414
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
1515
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
16-
<waitForPageLoad stepKey="waitForPageLoadAfterResetButtonClicked" time="10"/>
1716
<fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
1817
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton" />
19-
<waitForPageLoad stepKey="waitForPageLoadAfterSearch" time="10"/>
2018
<see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
2119
<click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
22-
20+
<waitForPageLoad stepKey="waitForPageLoadAfterWebsiteSelected" time="30"/>
2321
<click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditStorePage"/>
2422
<selectOption userInput="No" selector="{{AdminStoresDeleteWebsiteSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
2523
<click selector="{{AdminStoresDeleteWebsiteSection.deleteButton}}" stepKey="clickDeleteButtonOnDeleteWebsitePage"/>
24+
<see selector="{{AdminMessagesSection.successMessage}}" userInput="You deleted the website." stepKey="checkSuccessMessage"/>
2625
</actionGroup>
2726
</actionGroups>

‎app/code/Magento/Store/Test/Mftf/Section/AdminStoresDeleteWebsiteSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
99
<section name="AdminStoresDeleteWebsiteSection">
1010
<element name="createDbBackup" type="select" selector="#store_create_backup"/>
11-
<element name="deleteButton" type="button" selector="#delete" timeout="30"/>
11+
<element name="deleteButton" type="button" selector="#delete" timeout="120"/>
1212
</section>
1313
</sections>

‎dev/tests/api-functional/testsuite/Magento/GraphQl/OfflineShipping/SetOfflineShippingMethodsOnCartTest.php

Lines changed: 210 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,210 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\GraphQl\OfflineShipping;
9+
10+
use Magento\Integration\Api\CustomerTokenServiceInterface;
11+
use Magento\Quote\Model\QuoteFactory;
12+
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
13+
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
14+
use Magento\TestFramework\Helper\Bootstrap;
15+
use Magento\TestFramework\TestCase\GraphQlAbstract;
16+
17+
/**
18+
* Test for setting offline shipping methods on cart
19+
*/
20+
class SetOfflineShippingMethodsOnCartTest extends GraphQlAbstract
21+
{
22+
/**
23+
* @var QuoteFactory
24+
*/
25+
private $quoteFactory;
26+
27+
/**
28+
* @var CustomerTokenServiceInterface
29+
*/
30+
private $customerTokenService;
31+
32+
/**
33+
* @var QuoteResource
34+
*/
35+
private $quoteResource;
36+
37+
/**
38+
* @var QuoteIdToMaskedQuoteIdInterface
39+
*/
40+
private $quoteIdToMaskedId;
41+
42+
/**
43+
* @inheritdoc
44+
*/
45+
protected function setUp()
46+
{
47+
$objectManager = Bootstrap::getObjectManager();
48+
$this->quoteResource = $objectManager->get(QuoteResource::class);
49+
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
50+
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
51+
$this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
52+
}
53+
54+
/**
55+
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
56+
* @magentoApiDataFixture Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
57+
* @magentoApiDataFixture Magento/OfflineShipping/_files/tablerates_weight.php
58+
*
59+
* @param string $carrierCode
60+
* @param string $methodCode
61+
* @param float $amount
62+
* @param string $label
63+
* @dataProvider offlineShippingMethodDataProvider
64+
*/
65+
public function testSetOfflineShippingMethod(string $carrierCode, string $methodCode, float $amount, string $label)
66+
{
67+
$quote = $this->quoteFactory->create();
68+
$this->quoteResource->load(
69+
$quote,
70+
'test_order_1',
71+
'reserved_order_id'
72+
);
73+
$maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
74+
$shippingAddressId = (int)$quote->getShippingAddress()->getId();
75+
76+
$query = $this->getQuery(
77+
$maskedQuoteId,
78+
$shippingAddressId,
79+
$carrierCode,
80+
$methodCode
81+
);
82+
83+
$response = $this->sendRequestWithToken($query);
84+
85+
$addressesInformation = $response['setShippingMethodsOnCart']['cart']['shipping_addresses'];
86+
self::assertEquals($addressesInformation[0]['selected_shipping_method']['carrier_code'], $carrierCode);
87+
self::assertEquals($addressesInformation[0]['selected_shipping_method']['method_code'], $methodCode);
88+
self::assertEquals($addressesInformation[0]['selected_shipping_method']['amount'], $amount);
89+
self::assertEquals($addressesInformation[0]['selected_shipping_method']['label'], $label);
90+
}
91+
92+
/**
93+
* @return array
94+
*/
95+
public function offlineShippingMethodDataProvider()
96+
{
97+
return [
98+
'flatrate_flatrate' => ['flatrate', 'flatrate', 10, 'Flat Rate - Fixed'],
99+
'tablerate_bestway' => ['tablerate', 'bestway', 10, 'Best Way - Table Rate'],
100+
'freeshipping_freeshipping' => ['freeshipping', 'freeshipping', 0, 'Free Shipping - Free'],
101+
];
102+
}
103+
104+
/**
105+
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_address_saved.php
106+
* @magentoApiDataFixture Magento/OfflineShipping/_files/enable_offline_shipping_methods.php
107+
*/
108+
public function testSetShippingMethodTwiceInOneRequest()
109+
{
110+
$quote = $this->quoteFactory->create();
111+
$this->quoteResource->load(
112+
$quote,
113+
'test_order_1',
114+
'reserved_order_id'
115+
);
116+
$shippingAddress = $quote->getShippingAddress();
117+
$shippingAddressId = $shippingAddress->getId();
118+
$maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
119+
120+
$query = <<<QUERY
121+
mutation {
122+
setShippingMethodsOnCart(input: {
123+
cart_id: "$maskedQuoteId"
124+
shipping_methods: [
125+
{
126+
cart_address_id: $shippingAddressId
127+
carrier_code: "flatrate"
128+
method_code: "flatrate"
129+
}
130+
{
131+
cart_address_id: $shippingAddressId
132+
carrier_code: "freeshipping"
133+
method_code: "freeshipping"
134+
}
135+
]
136+
}) {
137+
cart {
138+
shipping_addresses {
139+
selected_shipping_method {
140+
carrier_code
141+
method_code
142+
label
143+
amount
144+
}
145+
}
146+
}
147+
}
148+
}
149+
QUERY;
150+
self::expectExceptionMessage('You cannot specify multiple shipping methods.');
151+
$this->sendRequestWithToken($query);
152+
}
153+
154+
/**
155+
* Generates query for setting the specified shipping method on cart
156+
*
157+
* @param int $shippingAddressId
158+
* @param string $maskedQuoteId
159+
* @param string $carrierCode
160+
* @param string $methodCode
161+
* @return string
162+
*/
163+
private function getQuery(
164+
string $maskedQuoteId,
165+
int $shippingAddressId,
166+
string $carrierCode,
167+
string $methodCode
168+
): string {
169+
return <<<QUERY
170+
mutation {
171+
setShippingMethodsOnCart(input: {
172+
cart_id: "$maskedQuoteId"
173+
shipping_methods: [
174+
{
175+
cart_address_id: $shippingAddressId
176+
carrier_code: "$carrierCode"
177+
method_code: "$methodCode"
178+
}
179+
]
180+
}) {
181+
cart {
182+
shipping_addresses {
183+
selected_shipping_method {
184+
carrier_code
185+
method_code
186+
label
187+
amount
188+
}
189+
}
190+
}
191+
}
192+
}
193+
QUERY;
194+
}
195+
196+
/**
197+
* Sends a GraphQL request with using a bearer token
198+
*
199+
* @param string $query
200+
* @return array
201+
* @throws \Magento\Framework\Exception\AuthenticationException
202+
*/
203+
private function sendRequestWithToken(string $query): array
204+
{
205+
$customerToken = $this->customerTokenService->createCustomerAccessToken('[email protected]', 'password');
206+
$headerMap = ['Authorization' => 'Bearer ' . $customerToken];
207+
208+
return $this->graphQlQuery($query, [], '', $headerMap);
209+
}
210+
}

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,43 @@ public function getAddSimpleProductQuery(string $maskedQuoteId, string $sku, int
105105
}
106106
QUERY;
107107
}
108+
109+
/**
110+
* @magentoApiDataFixture Magento/Catalog/_files/products.php
111+
* @expectedException \Exception
112+
* @expectedExceptionMessage Could not find a cart with ID "wrong_cart_hash"
113+
*/
114+
public function testAddProductWithWrongCartHash()
115+
{
116+
$sku = 'simple';
117+
$qty = 1;
118+
119+
$maskedQuoteId = 'wrong_cart_hash';
120+
121+
$query = <<<QUERY
122+
mutation {
123+
addSimpleProductsToCart(
124+
input: {
125+
cart_id: "{$maskedQuoteId}"
126+
cartItems: [
127+
{
128+
data: {
129+
qty: $qty
130+
sku: "$sku"
131+
}
132+
}
133+
]
134+
}
135+
) {
136+
cart {
137+
items {
138+
qty
139+
}
140+
}
141+
}
142+
}
143+
QUERY;
144+
145+
$this->graphQlQuery($query);
146+
}
108147
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,26 @@ public function testGetNonExistentCart()
114114
$this->graphQlQuery($query, [], '', $this->getHeaderMap());
115115
}
116116

117+
/**
118+
* @magentoApiDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
119+
* @magentoApiDataFixture Magento/Customer/_files/customer.php
120+
* @expectedException \Exception
121+
* @expectedExceptionMessage Current user does not have an active cart.
122+
*/
123+
public function testGetInactiveCart()
124+
{
125+
$quote = $this->quoteFactory->create();
126+
$this->quoteResource->load($quote, 'test_order_with_simple_product_without_address', 'reserved_order_id');
127+
$quote->setCustomerId(1);
128+
$quote->setIsActive(false);
129+
$this->quoteResource->save($quote);
130+
$maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
131+
132+
$query = $this->getCartQuery($maskedQuoteId);
133+
134+
$this->graphQlQuery($query, [], '', $this->getHeaderMap());
135+
}
136+
117137
/**
118138
* @param string $maskedQuoteId
119139
* @return string

0 commit comments

Comments
 (0)