Skip to content

Commit bb46a2f

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop Minor Fixes
Accepted Public Pull Requests: - #18386: Cleaner documentation for Travis CI static tests (by @Thundar) - #22075: Add space after asterisk to show as list (by @likemusic) - #22055: Correct spelling (by @ravi-chandra3197) - #22056: Spelling Correction (by @ansari-krish) - #22026: Removed two time zlib.output_compression on section (by @samuel20miglia) - #21940: [UI] Adjusting the Magento_Ui typos (by @eduard13) - #21896: Contact us layout in I-pad not proper (by @amol2jcommerce) - #21927: Removing obsolete non-English translation files, these aren't transla� (by @hostep) - #21767: Magento should create a log entry if an observer does not implement ObserverInterface (by @Nazar65) - #21216: Elasticsearch price fieldname is incorrect during indexing when storeId and websiteId do not match (by @alexander-aleman) - #19765: Resolved undefined index issue for import adapter (by @jaimin-ktpl) Fixed GitHub Issues: - #13951: Exception on customer edit under restricted admin access (reported by @Kasoi-free) has been fixed in #18386 by @Thundar in 2.3-develop branch Related commits: 1. bd224a5 2. 34fdfec 3. 05e02c2 4. 5ba0f1d 5. 2766e27 - #21755: Magento should create a log entry if an observer does not implement ObserverInterface (reported by @bnymn) has been fixed in #21767 by @Nazar65 in 2.3-develop branch Related commits: 1. c3e4f07 2. 2e0a846 3. 0d75cd0 4. a6ef118 - #19761: Custom import adapter data validation issue (reported by @jaimin-ktpl) has been fixed in #19765 by @jaimin-ktpl in 2.3-develop branch Related commits: 1. 6b9aa47 2. 939b665
2 parents 62ae101 + 76ea73d commit bb46a2f

File tree

53 files changed

+137
-203
lines changed

Some content is hidden

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

53 files changed

+137
-203
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ Tests:
785785
* Refactored controller actions in the Product area
786786
* Moved commands cache.php, indexer.php, log.php, test.php, compiler.php, singletenant\_compiler.php, generator.php, pack.php, deploy.php and file\_assembler.php to the new bin/magento CLI framework
787787
* Data Migration Tool
788-
* The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
788+
* The Data Migration Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
789789
* Fixed bugs
790790
* Fixed an issue where error appeared during placing order with virtual product
791791
* Fixed an issue where billing and shipping sections didn't contain address information on order print

app/code/Magento/Contact/view/frontend/web/css/source/_module.less

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@
2121
}
2222
}
2323

24+
//
25+
// Desktop
26+
// _____________________________________________
27+
28+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
29+
.contact-index-index .column:not(.sidebar-additional) .form.contact {
30+
min-width: 600px;
31+
}
32+
}
33+
2434
// Mobile
2535
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
2636
.contact-index-index {

app/code/Magento/Customer/Model/Address.php

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function __construct(
122122
}
123123

124124
/**
125-
* Init model
125+
* Initialize address model
126126
*
127127
* @return void
128128
*/
@@ -167,7 +167,14 @@ public function updateData(AddressInterface $address)
167167
}
168168

169169
/**
170-
* @inheritdoc
170+
* Create address data object based on current address model.
171+
*
172+
* @param int|null $defaultBillingAddressId
173+
* @param int|null $defaultShippingAddressId
174+
* @return AddressInterface
175+
* Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
176+
* the instance of Api/Data/AddressInterface
177+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
171178
*/
172179
public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
173180
{
@@ -257,7 +264,7 @@ public function getDefaultAttributeCodes()
257264
}
258265

259266
/**
260-
* Clone object handler
267+
* Clone address
261268
*
262269
* @return void
263270
*/
@@ -356,7 +363,11 @@ public function reindex()
356363
}
357364

358365
/**
359-
* @inheritdoc
366+
* Get a list of custom attribute codes.
367+
*
368+
* By default, entity can be extended only using extension attributes functionality.
369+
*
370+
* @return string[]
360371
* @since 100.0.6
361372
*/
362373
protected function getCustomAttributesCodes()

app/code/Magento/Customer/Model/Customer.php

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,17 +1054,6 @@ public function resetErrors()
10541054
return $this;
10551055
}
10561056

1057-
/**
1058-
* Prepare customer for delete
1059-
*
1060-
* @return $this
1061-
*/
1062-
public function beforeDelete()
1063-
{
1064-
//TODO : Revisit and figure handling permissions in MAGETWO-11084 Implementation: Service Context Provider
1065-
return parent::beforeDelete();
1066-
}
1067-
10681057
/**
10691058
* Processing object after save data
10701059
*
@@ -1305,7 +1294,7 @@ public function getResetPasswordLinkExpirationPeriod()
13051294
}
13061295

13071296
/**
1308-
* Create address instance
1297+
* Create Address from Factory
13091298
*
13101299
* @return Address
13111300
*/
@@ -1315,7 +1304,7 @@ protected function _createAddressInstance()
13151304
}
13161305

13171306
/**
1318-
* Create address collection instance
1307+
* Create Address Collection from Factory
13191308
*
13201309
* @return \Magento\Customer\Model\ResourceModel\Address\Collection
13211310
*/
@@ -1325,7 +1314,7 @@ protected function _createAddressCollection()
13251314
}
13261315

13271316
/**
1328-
* Returns templates types
1317+
* Get Template Types
13291318
*
13301319
* @return array
13311320
*/

app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,14 @@ public function __construct(
171171
}
172172

173173
/**
174-
* @inheritdoc
174+
* Create or update a customer.
175+
*
176+
* @param \Magento\Customer\Api\Data\CustomerInterface $customer
177+
* @param string $passwordHash
178+
* @return \Magento\Customer\Api\Data\CustomerInterface
179+
* @throws \Magento\Framework\Exception\InputException If bad input is provided
180+
* @throws \Magento\Framework\Exception\State\InputMismatchException If the provided email is already used
181+
* @throws \Magento\Framework\Exception\LocalizedException
175182
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
176183
* @SuppressWarnings(PHPMD.NPathComplexity)
177184
*/
@@ -304,7 +311,13 @@ private function populateCustomerWithSecureData($customerModel, $passwordHash =
304311
}
305312

306313
/**
307-
* @inheritdoc
314+
* Retrieve customer.
315+
*
316+
* @param string $email
317+
* @param int|null $websiteId
318+
* @return \Magento\Customer\Api\Data\CustomerInterface
319+
* @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified email does not exist.
320+
* @throws \Magento\Framework\Exception\LocalizedException
308321
*/
309322
public function get($email, $websiteId = null)
310323
{
@@ -313,7 +326,12 @@ public function get($email, $websiteId = null)
313326
}
314327

315328
/**
316-
* @inheritdoc
329+
* Get customer by Customer ID.
330+
*
331+
* @param int $customerId
332+
* @return \Magento\Customer\Api\Data\CustomerInterface
333+
* @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified ID does not exist.
334+
* @throws \Magento\Framework\Exception\LocalizedException
317335
*/
318336
public function getById($customerId)
319337
{
@@ -322,7 +340,15 @@ public function getById($customerId)
322340
}
323341

324342
/**
325-
* @inheritdoc
343+
* Retrieve customers which match a specified criteria.
344+
*
345+
* This call returns an array of objects, but detailed information about each object’s attributes might not be
346+
* included. See http://devdocs.magento.com/codelinks/attributes.html#CustomerRepositoryInterface to determine
347+
* which call to use to get detailed information about all attributes for an object.
348+
*
349+
* @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
350+
* @return \Magento\Customer\Api\Data\CustomerSearchResultsInterface
351+
* @throws \Magento\Framework\Exception\LocalizedException
326352
*/
327353
public function getList(SearchCriteriaInterface $searchCriteria)
328354
{
@@ -362,15 +388,24 @@ public function getList(SearchCriteriaInterface $searchCriteria)
362388
}
363389

364390
/**
365-
* @inheritdoc
391+
* Delete customer.
392+
*
393+
* @param \Magento\Customer\Api\Data\CustomerInterface $customer
394+
* @return bool true on success
395+
* @throws \Magento\Framework\Exception\LocalizedException
366396
*/
367397
public function delete(CustomerInterface $customer)
368398
{
369399
return $this->deleteById($customer->getId());
370400
}
371401

372402
/**
373-
* @inheritdoc
403+
* Delete customer by Customer ID.
404+
*
405+
* @param int $customerId
406+
* @return bool true on success
407+
* @throws \Magento\Framework\Exception\NoSuchEntityException
408+
* @throws \Magento\Framework\Exception\LocalizedException
374409
*/
375410
public function deleteById($customerId)
376411
{

app/code/Magento/Developer/i18n/de_DE.csv

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

app/code/Magento/Developer/i18n/es_ES.csv

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

app/code/Magento/Developer/i18n/fr_FR.csv

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

app/code/Magento/Developer/i18n/nl_NL.csv

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

app/code/Magento/Developer/i18n/pt_BR.csv

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

app/code/Magento/Developer/i18n/zh_Hans_CN.csv

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

app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,15 @@ public function __construct(
7272
*/
7373
public function getFields(array $productIds, $storeId)
7474
{
75+
$websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
76+
7577
$priceData = $this->dataProvider->getSearchableAttribute('price')
7678
? $this->resourceIndex->getPriceIndexData($productIds, $storeId)
7779
: [];
7880

7981
$fields = [];
8082
foreach ($productIds as $productId) {
81-
$fields[$productId] = $this->getProductPriceData($productId, $storeId, $priceData);
83+
$fields[$productId] = $this->getProductPriceData($productId, $websiteId, $priceData);
8284
}
8385

8486
return $fields;

app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,9 @@ protected function _saveValidatedBunches()
408408
if ($source->valid()) {
409409
try {
410410
$rowData = $source->current();
411-
$skuSet[$rowData['sku']] = true;
411+
if (array_key_exists('sku', $rowData)) {
412+
$skuSet[$rowData['sku']] = true;
413+
}
412414
} catch (\InvalidArgumentException $e) {
413415
$this->addRowError($e->getMessage(), $this->_processedRowsCount);
414416
$this->_processedRowsCount++;
@@ -436,7 +438,7 @@ protected function _saveValidatedBunches()
436438
$source->next();
437439
}
438440
}
439-
$this->_processedEntitiesCount = count($skuSet);
441+
$this->_processedEntitiesCount = (count($skuSet)) ? : $this->_processedRowsCount;
440442

441443
return $this;
442444
}

app/code/Magento/Msrp/i18n/de_DE.csv

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

app/code/Magento/Msrp/i18n/es_ES.csv

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

app/code/Magento/Msrp/i18n/fr_FR.csv

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

app/code/Magento/Msrp/i18n/nl_NL.csv

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

app/code/Magento/Msrp/i18n/pt_BR.csv

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

app/code/Magento/Msrp/i18n/zh_Hans_CN.csv

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

app/code/Magento/Paypal/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Module Magento\PayPal implements integration with the PayPal payment system. Namely, it enables the following payment methods:
2-
*PayPal Express Checkout
3-
*PayPal Payments Standard
4-
*PayPal Payments Pro
5-
*PayPal Credit
6-
*PayFlow Payment Gateway
2+
* PayPal Express Checkout
3+
* PayPal Payments Standard
4+
* PayPal Payments Pro
5+
* PayPal Credit
6+
* PayFlow Payment Gateway

app/code/Magento/ProductVideo/i18n/de_DE.csv

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

app/code/Magento/ProductVideo/i18n/es_ES.csv

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

app/code/Magento/ProductVideo/i18n/fr_FR.csv

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

app/code/Magento/ProductVideo/i18n/nl_NL.csv

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

app/code/Magento/ProductVideo/i18n/pt_BR.csv

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

app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv

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

app/code/Magento/Search/i18n/de_DE.csv

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/code/Magento/Search/i18n/es_ES.csv

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/code/Magento/Search/i18n/fr_FR.csv

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/code/Magento/Search/i18n/nl_NL.csv

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/code/Magento/Search/i18n/pt_BR.csv

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/code/Magento/Search/i18n/zh_Hans_CN.csv

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/code/Magento/Swatches/i18n/de_DE.csv

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

app/code/Magento/Swatches/i18n/es_ES.csv

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

app/code/Magento/Swatches/i18n/fr_FR.csv

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

0 commit comments

Comments
 (0)