Skip to content

Commit a3c655e

Browse files
cparticacpartica
committed
Merge remote-tracking branch 'mainline/2.3-develop' into graphql-issue-230
2 parents 78bb895 + 932acf9 commit a3c655e

File tree

60 files changed

+1167
-241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1167
-241
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="LoggedInCheckoutFillNewBillingAddressActionGroup1">
8282
<argument name="Address" value="US_Address_NY"/>
8383
</actionGroup>
84-
<click selector="{{CheckoutPaymentSection.addressAction('Save Address')}}" stepKey="SaveAddress"/>
84+
<click selector="{{CheckoutPaymentSection.addressAction('Ship here')}}" stepKey="SaveAddress"/>
8585
<waitForPageLoad stepKey="waitForPageLoad9"/>
8686
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext1"/>
8787
<waitForPageLoad stepKey="waitForPageLoad10"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
namespace Magento\Catalog\Controller\Adminhtml\Product;
1010

1111
use Magento\Catalog\Api\Data\ProductInterface;
12+
use Magento\Framework\App\Action\HttpGetActionInterface;
1213

1314
/**
1415
* Controller to search product for ui-select component
1516
*/
16-
class Search extends \Magento\Backend\App\Action
17+
class Search extends \Magento\Backend\App\Action implements HttpGetActionInterface
1718
{
1819
/**
1920
* Authorization level of a basic admin session
@@ -48,6 +49,8 @@ public function __construct(
4849
}
4950

5051
/**
52+
* Execute product search.
53+
*
5154
* @return \Magento\Framework\Controller\ResultInterface
5255
*/
5356
public function execute() : \Magento\Framework\Controller\ResultInterface

‎app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
use Magento\Catalog\Api\Data\ProductInterface;
99
use Magento\Catalog\Model\Product;
1010
use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
11+
use Magento\CatalogSearch\Model\Search\FilterMapper\VisibilityFilter;
1112
use Magento\CatalogSearch\Model\Search\TableMapper;
13+
use Magento\Customer\Model\Session;
1214
use Magento\Eav\Model\Config;
1315
use Magento\Framework\App\Config\ScopeConfigInterface;
1416
use Magento\Framework\App\ObjectManager;
@@ -20,10 +22,11 @@
2022
use Magento\Framework\Search\Adapter\Mysql\Filter\PreprocessorInterface;
2123
use Magento\Framework\Search\Request\FilterInterface;
2224
use Magento\Store\Model\Store;
23-
use Magento\Customer\Model\Session;
24-
use Magento\CatalogSearch\Model\Search\FilterMapper\VisibilityFilter;
2525

2626
/**
27+
* ElasticSearch search filter pre-processor.
28+
*
29+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
2730
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2831
* @deprecated
2932
* @see \Magento\ElasticSearch
@@ -128,18 +131,21 @@ public function __construct(
128131
}
129132

130133
/**
131-
* {@inheritdoc}
134+
* @inheritdoc
132135
*/
133136
public function process(FilterInterface $filter, $isNegation, $query)
134137
{
135138
return $this->processQueryWithField($filter, $isNegation, $query);
136139
}
137140

138141
/**
142+
* Process query with field.
143+
*
139144
* @param FilterInterface $filter
140145
* @param bool $isNegation
141146
* @param string $query
142147
* @return string
148+
* @throws \Magento\Framework\Exception\LocalizedException
143149
*/
144150
private function processQueryWithField(FilterInterface $filter, $isNegation, $query)
145151
{
@@ -170,7 +176,7 @@ private function processQueryWithField(FilterInterface $filter, $isNegation, $qu
170176
} elseif ($filter->getField() === VisibilityFilter::VISIBILITY_FILTER_FIELD) {
171177
return '';
172178
} elseif ($filter->getType() === FilterInterface::TYPE_TERM &&
173-
in_array($attribute->getFrontendInput(), ['select', 'multiselect'], true)
179+
in_array($attribute->getFrontendInput(), ['select', 'multiselect', 'boolean'], true)
174180
) {
175181
$resultQuery = $this->processTermSelect($filter, $isNegation);
176182
} elseif ($filter->getType() === FilterInterface::TYPE_RANGE &&
@@ -204,19 +210,23 @@ private function processQueryWithField(FilterInterface $filter, $isNegation, $qu
204210
->where('main_table.store_id = ?', Store::DEFAULT_STORE_ID)
205211
->having($query);
206212

207-
$resultQuery = 'search_index.entity_id IN (
208-
select entity_id from ' . $this->conditionManager->wrapBrackets($select) . ' as filter
209-
)';
213+
$resultQuery = 'search_index.entity_id IN ('
214+
. 'select entity_id from '
215+
. $this->conditionManager->wrapBrackets($select)
216+
. ' as filter)';
210217
}
211218

212219
return $resultQuery;
213220
}
214221

215222
/**
223+
* Process range numeric.
224+
*
216225
* @param FilterInterface $filter
217226
* @param string $query
218227
* @param Attribute $attribute
219228
* @return string
229+
* @throws \Exception
220230
*/
221231
private function processRangeNumeric(FilterInterface $filter, $query, $attribute)
222232
{
@@ -238,14 +248,17 @@ private function processRangeNumeric(FilterInterface $filter, $query, $attribute
238248
->where('main_table.store_id = ?', $currentStoreId)
239249
->having($query);
240250

241-
$resultQuery = 'search_index.entity_id IN (
242-
select entity_id from ' . $this->conditionManager->wrapBrackets($select) . ' as filter
243-
)';
251+
$resultQuery = 'search_index.entity_id IN ('
252+
. 'select entity_id from '
253+
. $this->conditionManager->wrapBrackets($select)
254+
. ' as filter)';
244255

245256
return $resultQuery;
246257
}
247258

248259
/**
260+
* Process term select.
261+
*
249262
* @param FilterInterface $filter
250263
* @param bool $isNegation
251264
* @return string

‎app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function isCustom(FilterInterface $filter)
4444

4545
return $attribute
4646
&& $filter->getType() === FilterInterface::TYPE_TERM
47-
&& in_array($attribute->getFrontendInput(), ['select', 'multiselect'], true);
47+
&& in_array($attribute->getFrontendInput(), ['select', 'multiselect', 'boolean'], true);
4848
}
4949

5050
/**

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ private function convertElementsToSelect($elements, $attributesToConvert)
122122
if (!in_array($code, $codes)) {
123123
continue;
124124
}
125+
// phpcs:ignore Magento2.Functions.DiscouragedFunction
125126
$options = call_user_func($attributesToConvert[$code]);
126127
if (!is_array($options)) {
127128
continue;
@@ -287,8 +288,14 @@ private function getBillingAddressComponent($paymentCode, $elements)
287288
'provider' => 'checkoutProvider',
288289
'deps' => 'checkoutProvider',
289290
'dataScopePrefix' => 'billingAddress' . $paymentCode,
291+
'billingAddressListProvider' => '${$.name}.billingAddressList',
290292
'sortOrder' => 1,
291293
'children' => [
294+
'billingAddressList' => [
295+
'component' => 'Magento_Checkout/js/view/billing-address/list',
296+
'displayArea' => 'billing-address-list',
297+
'template' => 'Magento_Checkout/billing-address/list'
298+
],
292299
'form-fields' => [
293300
'component' => 'uiComponent',
294301
'displayArea' => 'additional-fieldsets',

‎app/code/Magento/Checkout/Model/DefaultConfigProvider.php

Lines changed: 15 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Magento\Checkout\Model\Session as CheckoutSession;
1111
use Magento\Customer\Api\AddressMetadataInterface;
1212
use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
13+
use Magento\Customer\Model\Address\CustomerAddressDataProvider;
1314
use Magento\Customer\Model\Context as CustomerContext;
1415
use Magento\Customer\Model\Session as CustomerSession;
1516
use Magento\Customer\Model\Url as CustomerUrlManager;
@@ -34,6 +35,7 @@
3435
*
3536
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
3637
* @SuppressWarnings(PHPMD.TooManyFields)
38+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
3739
*/
3840
class DefaultConfigProvider implements ConfigProviderInterface
3941
{
@@ -177,6 +179,11 @@ class DefaultConfigProvider implements ConfigProviderInterface
177179
*/
178180
private $addressMetadata;
179181

182+
/**
183+
* @var CustomerAddressDataProvider
184+
*/
185+
private $customerAddressData;
186+
180187
/**
181188
* @param CheckoutHelper $checkoutHelper
182189
* @param Session $checkoutSession
@@ -206,6 +213,7 @@ class DefaultConfigProvider implements ConfigProviderInterface
206213
* @param UrlInterface $urlBuilder
207214
* @param AddressMetadataInterface $addressMetadata
208215
* @param AttributeOptionManagementInterface $attributeOptionManager
216+
* @param CustomerAddressDataProvider|null $customerAddressData
209217
* @codeCoverageIgnore
210218
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
211219
*/
@@ -237,7 +245,8 @@ public function __construct(
237245
\Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
238246
UrlInterface $urlBuilder,
239247
AddressMetadataInterface $addressMetadata = null,
240-
AttributeOptionManagementInterface $attributeOptionManager = null
248+
AttributeOptionManagementInterface $attributeOptionManager = null,
249+
CustomerAddressDataProvider $customerAddressData = null
241250
) {
242251
$this->checkoutHelper = $checkoutHelper;
243252
$this->checkoutSession = $checkoutSession;
@@ -268,6 +277,8 @@ public function __construct(
268277
$this->addressMetadata = $addressMetadata ?: ObjectManager::getInstance()->get(AddressMetadataInterface::class);
269278
$this->attributeOptionManager = $attributeOptionManager ??
270279
ObjectManager::getInstance()->get(AttributeOptionManagementInterface::class);
280+
$this->customerAddressData = $customerAddressData ?:
281+
ObjectManager::getInstance()->get(CustomerAddressDataProvider::class);
271282
}
272283

273284
/**
@@ -359,57 +370,18 @@ private function isAutocompleteEnabled()
359370
*
360371
* @return array
361372
*/
362-
private function getCustomerData()
373+
private function getCustomerData(): array
363374
{
364375
$customerData = [];
365376
if ($this->isCustomerLoggedIn()) {
377+
/** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
366378
$customer = $this->customerRepository->getById($this->customerSession->getCustomerId());
367379
$customerData = $customer->__toArray();
368-
foreach ($customer->getAddresses() as $key => $address) {
369-
$customerData['addresses'][$key]['inline'] = $this->getCustomerAddressInline($address);
370-
if ($address->getCustomAttributes()) {
371-
$customerData['addresses'][$key]['custom_attributes'] = $this->filterNotVisibleAttributes(
372-
$customerData['addresses'][$key]['custom_attributes']
373-
);
374-
}
375-
}
380+
$customerData['addresses'] = $this->customerAddressData->getAddressDataByCustomer($customer);
376381
}
377382
return $customerData;
378383
}
379384

380-
/**
381-
* Filter not visible on storefront custom attributes.
382-
*
383-
* @param array $attributes
384-
* @return array
385-
*/
386-
private function filterNotVisibleAttributes(array $attributes)
387-
{
388-
$attributesMetadata = $this->addressMetadata->getAllAttributesMetadata();
389-
foreach ($attributesMetadata as $attributeMetadata) {
390-
if (!$attributeMetadata->isVisible()) {
391-
unset($attributes[$attributeMetadata->getAttributeCode()]);
392-
}
393-
}
394-
395-
return $this->setLabelsToAttributes($attributes);
396-
}
397-
398-
/**
399-
* Set additional customer address data
400-
*
401-
* @param \Magento\Customer\Api\Data\AddressInterface $address
402-
* @return string
403-
*/
404-
private function getCustomerAddressInline($address)
405-
{
406-
$builtOutputAddressData = $this->addressMapper->toFlatArray($address);
407-
return $this->addressConfig
408-
->getFormatByCode(\Magento\Customer\Model\Address\Config::DEFAULT_ADDRESS_FORMAT)
409-
->getRenderer()
410-
->renderArray($builtOutputAddressData);
411-
}
412-
413385
/**
414386
* Retrieve quote data
415387
*
@@ -726,61 +698,6 @@ private function getPaymentMethods()
726698
return $paymentMethods;
727699
}
728700

729-
/**
730-
* Set Labels to custom Attributes
731-
*
732-
* @param array $customAttributes
733-
* @return array $customAttributes
734-
* @throws \Magento\Framework\Exception\InputException
735-
* @throws \Magento\Framework\Exception\StateException
736-
*/
737-
private function setLabelsToAttributes(array $customAttributes) : array
738-
{
739-
if (!empty($customAttributes)) {
740-
foreach ($customAttributes as $customAttributeCode => $customAttribute) {
741-
$attributeOptionLabels = $this->getAttributeLabels($customAttribute, $customAttributeCode);
742-
if (!empty($attributeOptionLabels)) {
743-
$customAttributes[$customAttributeCode]['label'] = implode(', ', $attributeOptionLabels);
744-
}
745-
}
746-
}
747-
748-
return $customAttributes;
749-
}
750-
751-
/**
752-
* Get Labels by CustomAttribute and CustomAttributeCode
753-
*
754-
* @param array $customAttribute
755-
* @param string|integer $customAttributeCode
756-
* @return array $attributeOptionLabels
757-
* @throws \Magento\Framework\Exception\InputException
758-
* @throws \Magento\Framework\Exception\StateException
759-
*/
760-
private function getAttributeLabels(array $customAttribute, string $customAttributeCode) : array
761-
{
762-
$attributeOptionLabels = [];
763-
764-
if (!empty($customAttribute['value'])) {
765-
$customAttributeValues = explode(',', $customAttribute['value']);
766-
$attributeOptions = $this->attributeOptionManager->getItems(
767-
\Magento\Customer\Model\Indexer\Address\AttributeProvider::ENTITY,
768-
$customAttributeCode
769-
);
770-
771-
if (!empty($attributeOptions)) {
772-
foreach ($attributeOptions as $attributeOption) {
773-
$attributeOptionValue = $attributeOption->getValue();
774-
if (in_array($attributeOptionValue, $customAttributeValues)) {
775-
$attributeOptionLabels[] = $attributeOption->getLabel() ?? $attributeOptionValue;
776-
}
777-
}
778-
}
779-
}
780-
781-
return $attributeOptionLabels;
782-
}
783-
784701
/**
785702
* Get notification messages for the quote items
786703
*

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,21 @@
241241
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterPaymentMethodSelection"/>
242242
</actionGroup>
243243

244+
<!-- Check selected shipping address information on shipping information step -->
245+
<actionGroup name="CheckSelectedShippingAddressInCheckoutActionGroup">
246+
<arguments>
247+
<argument name="customerVar"/>
248+
<argument name="customerAddressVar"/>
249+
</arguments>
250+
<waitForElement selector="{{CheckoutShippingSection.shippingTab}}" time="30" stepKey="waitForShippingSectionLoaded"/>
251+
<see stepKey="VerifyFirstNameInSelectedAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerVar.firstname}}" />
252+
<see stepKey="VerifyLastNameInSelectedAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerVar.lastname}}" />
253+
<see stepKey="VerifyStreetInSelectedAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.street[0]}}" />
254+
<see stepKey="VerifyCityInSelectedAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.city}}" />
255+
<see stepKey="VerifyZipInSelectedAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.postcode}}" />
256+
<see stepKey="VerifyPhoneInSelectedAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.telephone}}" />
257+
</actionGroup>
258+
244259
<!-- Check billing address in checkout -->
245260
<actionGroup name="CheckBillingAddressInCheckoutActionGroup">
246261
<arguments>
@@ -257,6 +272,22 @@
257272
<see userInput="{{customerAddressVar.telephone}}" selector="{{CheckoutPaymentSection.billingAddress}}" stepKey="assertBillingAddressTelephone"/>
258273
</actionGroup>
259274

275+
<!-- Check billing address in checkout with billing address on payment page -->
276+
<actionGroup name="CheckBillingAddressInCheckoutWithBillingAddressOnPaymentPageActionGroup">
277+
<arguments>
278+
<argument name="customerVar"/>
279+
<argument name="customerAddressVar"/>
280+
</arguments>
281+
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
282+
<see userInput="{{customerVar.firstName}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsFirstName"/>
283+
<see userInput="{{customerVar.lastName}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsLastName"/>
284+
<see userInput="{{customerAddressVar.street[0]}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsStreet"/>
285+
<see userInput="{{customerAddressVar.city}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsCity"/>
286+
<see userInput="{{customerAddressVar.state}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsState"/>
287+
<see userInput="{{customerAddressVar.postcode}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsPostcode"/>
288+
<see userInput="{{customerAddressVar.telephone}}" selector="{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}" stepKey="assertBillingAddressDetailsTelephone"/>
289+
</actionGroup>
290+
260291
<!-- Checkout place order -->
261292
<actionGroup name="CheckoutPlaceOrderActionGroup">
262293
<arguments>

0 commit comments

Comments
 (0)