Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.3-develop Minor Fixes
Browse files Browse the repository at this point in the history
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
  • Loading branch information
magento-engcom-team authored Apr 5, 2019
2 parents 62ae101 + 76ea73d commit bb46a2f
Show file tree
Hide file tree
Showing 53 changed files with 137 additions and 203 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ Tests:
* Refactored controller actions in the Product area
* 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
* Data Migration Tool
* The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
* The Data Migration Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
* Fixed bugs
* Fixed an issue where error appeared during placing order with virtual product
* Fixed an issue where billing and shipping sections didn't contain address information on order print
Expand Down
10 changes: 10 additions & 0 deletions app/code/Magento/Contact/view/frontend/web/css/source/_module.less
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@
}
}

//
// Desktop
// _____________________________________________

.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
.contact-index-index .column:not(.sidebar-additional) .form.contact {
min-width: 600px;
}
}

// Mobile
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.contact-index-index {
Expand Down
19 changes: 15 additions & 4 deletions app/code/Magento/Customer/Model/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public function __construct(
}

/**
* Init model
* Initialize address model
*
* @return void
*/
Expand Down Expand Up @@ -167,7 +167,14 @@ public function updateData(AddressInterface $address)
}

/**
* @inheritdoc
* Create address data object based on current address model.
*
* @param int|null $defaultBillingAddressId
* @param int|null $defaultShippingAddressId
* @return AddressInterface
* Use Api/Data/AddressInterface as a result of service operations. Don't rely on the model to provide
* the instance of Api/Data/AddressInterface
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
{
Expand Down Expand Up @@ -257,7 +264,7 @@ public function getDefaultAttributeCodes()
}

/**
* Clone object handler
* Clone address
*
* @return void
*/
Expand Down Expand Up @@ -356,7 +363,11 @@ public function reindex()
}

/**
* @inheritdoc
* Get a list of custom attribute codes.
*
* By default, entity can be extended only using extension attributes functionality.
*
* @return string[]
* @since 100.0.6
*/
protected function getCustomAttributesCodes()
Expand Down
17 changes: 3 additions & 14 deletions app/code/Magento/Customer/Model/Customer.php
Original file line number Diff line number Diff line change
Expand Up @@ -1054,17 +1054,6 @@ public function resetErrors()
return $this;
}

/**
* Prepare customer for delete
*
* @return $this
*/
public function beforeDelete()
{
//TODO : Revisit and figure handling permissions in MAGETWO-11084 Implementation: Service Context Provider
return parent::beforeDelete();
}

/**
* Processing object after save data
*
Expand Down Expand Up @@ -1305,7 +1294,7 @@ public function getResetPasswordLinkExpirationPeriod()
}

/**
* Create address instance
* Create Address from Factory
*
* @return Address
*/
Expand All @@ -1315,7 +1304,7 @@ protected function _createAddressInstance()
}

/**
* Create address collection instance
* Create Address Collection from Factory
*
* @return \Magento\Customer\Model\ResourceModel\Address\Collection
*/
Expand All @@ -1325,7 +1314,7 @@ protected function _createAddressCollection()
}

/**
* Returns templates types
* Get Template Types
*
* @return array
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,14 @@ public function __construct(
}

/**
* @inheritdoc
* Create or update a customer.
*
* @param \Magento\Customer\Api\Data\CustomerInterface $customer
* @param string $passwordHash
* @return \Magento\Customer\Api\Data\CustomerInterface
* @throws \Magento\Framework\Exception\InputException If bad input is provided
* @throws \Magento\Framework\Exception\State\InputMismatchException If the provided email is already used
* @throws \Magento\Framework\Exception\LocalizedException
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
Expand Down Expand Up @@ -304,7 +311,13 @@ private function populateCustomerWithSecureData($customerModel, $passwordHash =
}

/**
* @inheritdoc
* Retrieve customer.
*
* @param string $email
* @param int|null $websiteId
* @return \Magento\Customer\Api\Data\CustomerInterface
* @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified email does not exist.
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function get($email, $websiteId = null)
{
Expand All @@ -313,7 +326,12 @@ public function get($email, $websiteId = null)
}

/**
* @inheritdoc
* Get customer by Customer ID.
*
* @param int $customerId
* @return \Magento\Customer\Api\Data\CustomerInterface
* @throws \Magento\Framework\Exception\NoSuchEntityException If customer with the specified ID does not exist.
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function getById($customerId)
{
Expand All @@ -322,7 +340,15 @@ public function getById($customerId)
}

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

/**
* @inheritdoc
* Delete customer.
*
* @param \Magento\Customer\Api\Data\CustomerInterface $customer
* @return bool true on success
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function delete(CustomerInterface $customer)
{
return $this->deleteById($customer->getId());
}

/**
* @inheritdoc
* Delete customer by Customer ID.
*
* @param int $customerId
* @return bool true on success
* @throws \Magento\Framework\Exception\NoSuchEntityException
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function deleteById($customerId)
{
Expand Down
5 changes: 0 additions & 5 deletions app/code/Magento/Developer/i18n/de_DE.csv

This file was deleted.

5 changes: 0 additions & 5 deletions app/code/Magento/Developer/i18n/es_ES.csv

This file was deleted.

5 changes: 0 additions & 5 deletions app/code/Magento/Developer/i18n/fr_FR.csv

This file was deleted.

5 changes: 0 additions & 5 deletions app/code/Magento/Developer/i18n/nl_NL.csv

This file was deleted.

5 changes: 0 additions & 5 deletions app/code/Magento/Developer/i18n/pt_BR.csv

This file was deleted.

5 changes: 0 additions & 5 deletions app/code/Magento/Developer/i18n/zh_Hans_CN.csv

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,15 @@ public function __construct(
*/
public function getFields(array $productIds, $storeId)
{
$websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();

$priceData = $this->dataProvider->getSearchableAttribute('price')
? $this->resourceIndex->getPriceIndexData($productIds, $storeId)
: [];

$fields = [];
foreach ($productIds as $productId) {
$fields[$productId] = $this->getProductPriceData($productId, $storeId, $priceData);
$fields[$productId] = $this->getProductPriceData($productId, $websiteId, $priceData);
}

return $fields;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,9 @@ protected function _saveValidatedBunches()
if ($source->valid()) {
try {
$rowData = $source->current();
$skuSet[$rowData['sku']] = true;
if (array_key_exists('sku', $rowData)) {
$skuSet[$rowData['sku']] = true;
}
} catch (\InvalidArgumentException $e) {
$this->addRowError($e->getMessage(), $this->_processedRowsCount);
$this->_processedRowsCount++;
Expand Down Expand Up @@ -436,7 +438,7 @@ protected function _saveValidatedBunches()
$source->next();
}
}
$this->_processedEntitiesCount = count($skuSet);
$this->_processedEntitiesCount = (count($skuSet)) ? : $this->_processedRowsCount;

return $this;
}
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Msrp/i18n/de_DE.csv

This file was deleted.

2 changes: 0 additions & 2 deletions app/code/Magento/Msrp/i18n/es_ES.csv

This file was deleted.

2 changes: 0 additions & 2 deletions app/code/Magento/Msrp/i18n/fr_FR.csv

This file was deleted.

2 changes: 0 additions & 2 deletions app/code/Magento/Msrp/i18n/nl_NL.csv

This file was deleted.

2 changes: 0 additions & 2 deletions app/code/Magento/Msrp/i18n/pt_BR.csv

This file was deleted.

2 changes: 0 additions & 2 deletions app/code/Magento/Msrp/i18n/zh_Hans_CN.csv

This file was deleted.

10 changes: 5 additions & 5 deletions app/code/Magento/Paypal/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Module Magento\PayPal implements integration with the PayPal payment system. Namely, it enables the following payment methods:
*PayPal Express Checkout
*PayPal Payments Standard
*PayPal Payments Pro
*PayPal Credit
*PayFlow Payment Gateway
* PayPal Express Checkout
* PayPal Payments Standard
* PayPal Payments Pro
* PayPal Credit
* PayFlow Payment Gateway
10 changes: 0 additions & 10 deletions app/code/Magento/ProductVideo/i18n/de_DE.csv

This file was deleted.

10 changes: 0 additions & 10 deletions app/code/Magento/ProductVideo/i18n/es_ES.csv

This file was deleted.

10 changes: 0 additions & 10 deletions app/code/Magento/ProductVideo/i18n/fr_FR.csv

This file was deleted.

10 changes: 0 additions & 10 deletions app/code/Magento/ProductVideo/i18n/nl_NL.csv

This file was deleted.

10 changes: 0 additions & 10 deletions app/code/Magento/ProductVideo/i18n/pt_BR.csv

This file was deleted.

10 changes: 0 additions & 10 deletions app/code/Magento/ProductVideo/i18n/zh_Hans_CN.csv

This file was deleted.

1 change: 0 additions & 1 deletion app/code/Magento/Search/i18n/de_DE.csv

This file was deleted.

1 change: 0 additions & 1 deletion app/code/Magento/Search/i18n/es_ES.csv

This file was deleted.

1 change: 0 additions & 1 deletion app/code/Magento/Search/i18n/fr_FR.csv

This file was deleted.

1 change: 0 additions & 1 deletion app/code/Magento/Search/i18n/nl_NL.csv

This file was deleted.

1 change: 0 additions & 1 deletion app/code/Magento/Search/i18n/pt_BR.csv

This file was deleted.

1 change: 0 additions & 1 deletion app/code/Magento/Search/i18n/zh_Hans_CN.csv

This file was deleted.

2 changes: 0 additions & 2 deletions app/code/Magento/Swatches/i18n/de_DE.csv

This file was deleted.

2 changes: 0 additions & 2 deletions app/code/Magento/Swatches/i18n/es_ES.csv

This file was deleted.

2 changes: 0 additions & 2 deletions app/code/Magento/Swatches/i18n/fr_FR.csv

This file was deleted.

Loading

0 comments on commit bb46a2f

Please sign in to comment.