Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.3-develop
Browse files Browse the repository at this point in the history
Accepted Public Pull Requests:
 - #18439: Use SVG badge (by @hugovk)
 - #18343: Add required fields to templates (by @miguelbalparda)
 - #18506: Added missing throw tag for exception to docblock of construct (by @peterjaap)
 - #18505: Fixed typo from filed to field (by @peterjaap)
 - #18490: [Sales] Covering the AssignOrderToCustomerObserver by Unit Test (by @eduard13)
 - #18487: Prevent XSS on checkout (by @samgranger)
 - #18500: [Forwardport] Fix category tree in cart price rule #17493 (by @gelanivishal)
 - #18499: [Forwardport] Fix table rate failing for zip+4 address #17770 (by @gelanivishal)
 - #18498: [Forwardport] Fix setup wizard page logo (by @gelanivishal)
 - #18481: Added validation on maximum quantity allowed in shopping cart (by @gelanivishal)
 - #18434: [FORWARDPORT] [FEATURE] [issue-3283] Added Filter Support for Yes/No (by @lewisvoncken)
 - #18416: throw exception InvalidArgumentException during validate scheme (by @ArtsiomBruneuski)
 - #18404: [Forwardport] Implemented 17964: Backend Order creation Authorizenet: If invalid cr� (by @mage2pratik)
 - #18405: [2.3] Admin Grid column ordering/positioning not working when single store mode set On (by @gwharton)
 - #18394: [Forwardport] Fixed issue with lib-line-height mixin failing when value of 'normal'� (by @mage2pratik)
 - #17803: Make report bugs link optional (by @arnoudhgz)
 - #18271: Update CategoryProcessor.php (by @ulftietze)
 - #18221: Empty option label should always be a space even if attribute is required (by @VincentMarmiesse)
 - #18257: [Forwardport] Module Catalog: fix issue with custom option price conversion for different base currency on website level (by @oleksii-lisovyi)
 - #18204: [Forwardport] Fix currency symbol setting back to default #17567 (by @mage2pratik)


Fixed GitHub Issues:
 - #17493: Catalog Rule & Selected Categories with level > 3 (reported by @SKovbel) has been fixed in #18500 by @gelanivishal in 2.3-develop branch
   Related commits:
     1. cfc2339

 - #17770: Table rate fail when using ZIP+4 shipping address (reported by @werfu) has been fixed in #18499 by @gelanivishal in 2.3-develop branch
   Related commits:
     1. fe3fd54

 - #18477: Set maximum Qty Allowed in Shopping Cart is 0 still allow adding to cart (reported by @duongdiep212) has been fixed in #18481 by @gelanivishal in 2.3-develop branch
   Related commits:
     1. d866790

 - #3283: «Yes/No» attributes should be allowed in the Layered Navigation (reported by @dmitry-fedyuk) has been fixed in #18434 by @lewisvoncken in 2.3-develop branch
   Related commits:
     1. e6833c8

 - #14555: Communication's component validator does not propagate exceptions, obscuring the cause of the error (reported by @nikita2206) has been fixed in #18416 by @ArtsiomBruneuski in 2.3-develop branch
   Related commits:
     1. 9a1b8fd
     2. 4f017f8
     3. 6dd7115
     4. 335c201
     5. 7903cd5
     6. dfda407
     7. b2621a5
     8. 7392ba6
     9. b37d2d6
     10. 9f1d4bf

 - #12070: M2.2.0 Admin Grid column ordering/positioning not working when single store mode set On (reported by @gwharton) has been fixed in #18405 by @gwharton in 2.3-develop branch
   Related commits:
     1. ed1f6a5

 - #18234: Product Import -> Upsert Category: Url Rewrites are just created for default website (reported by @ulftietze) has been fixed in #18271 by @ulftietze in 2.3-develop branch
   Related commits:
     1. 53a3456
     2. 543fce4

 - #17567: Currency symbol cannot be changed back to default value from admin panel in Single-store mode (reported by @sivaschenko) has been fixed in #18204 by @mage2pratik in 2.3-develop branch
   Related commits:
     1. 4741320
  • Loading branch information
Stanislav Idolov authored Oct 12, 2018
2 parents de50d12 + 8180574 commit 4f94998
Show file tree
Hide file tree
Showing 45 changed files with 476 additions and 114 deletions.
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
- Information on your environment,
- Steps to reproduce,
- Expected and actual results,
Fields marked with (*) are required. Please don't remove the template.
Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
-->

### Preconditions
### Preconditions (*)
<!---
Please provide as detailed information about your environment as possible.
For example Magento version, tag, HEAD, PHP & MySQL version, etc..
-->
1.
2.

### Steps to reproduce
### Steps to reproduce (*)
<!---
It is important to provide a set of clear steps to reproduce this bug.
If relevant please include code samples
Expand All @@ -26,10 +27,10 @@
2.
3.

### Expected result
### Expected result (*)
<!--- Tell us what should happen -->
1. [Screenshots, logs or description]

### Actual result
### Actual result (*)
<!--- Tell us what happens instead -->
1. [Screenshots, logs or description]
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,29 @@ about: Technical issue with the Magento 2 core components

<!---
Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
Fields marked with (*) are required. Please don't remove the template.
-->

### Preconditions
### Preconditions (*)
<!---
Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
-->
1.
2.

### Steps to reproduce
### Steps to reproduce (*)
<!---
Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
-->
1.
2.

### Expected result
### Expected result (*)
<!--- Tell us what do you expect to happen. -->
1. [Screenshots, logs or description]
2.

### Actual result
### Actual result (*)
<!--- Tell us what happened instead. Include error messages and issues. -->
1. [Screenshots, logs or description]
2.
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/developer-experience-issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ about: Issues related to customization, extensibility, modularity

<!---
Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
Fields marked with (*) are required. Please don't remove the template.
-->

### Summary
### Summary (*)
<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->

### Examples
### Examples (*)
<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->

### Proposed solution
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ about: Please consider reporting directly to https://github.com/magento/communit
---

<!---
Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum.
Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum. Fields marked with (*) are required. Please don't remove the template.
-->

### Description
### Description (*)
<!--- Describe the feature you would like to add. -->

### Expected behavior
### Expected behavior (*)
<!--- What is the expected behavior of this feature? How is it going to work? -->

### Benefits
Expand Down
9 changes: 5 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
To help us process this pull request we recommend that you add the following information:
- Summary of the pull request,
- Issue(s) related to the changes made,
- Manual testing scenarios,
- Manual testing scenarios
Fields marked with (*) are required. Please don't remove the template.
-->

<!--- Please provide a general summary of the Pull Request in the Title above -->

### Description
### Description (*)
<!---
Please provide a description of the changes proposed in the pull request.
Letting us know what has changed and why it needed changing will help us validate this pull request.
Expand All @@ -22,15 +23,15 @@
1. magento/magento2#<issue_number>: Issue title
2. ...

### Manual testing scenarios
### Manual testing scenarios (*)
<!---
Please provide a set of unambiguous steps to test the proposed code change.
Giving us manual testing scenarios will help with the processing and validation process.
-->
1. ...
2. ...

### Contribution checklist
### Contribution checklist (*)
- [ ] Pull request has a meaningful description of its purpose
- [ ] All commits are accompanied by meaningful commit messages
- [ ] All new or changed code is covered with unit/integration tests (if applicable)
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)
[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
<h2>Welcome</h2>
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.

## Magento system requirements
[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html)
[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).

## Install Magento
To install Magento, see either:

* [Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html)
* [Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).

<h2>Contributing to the Magento 2 code base</h2>
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
Expand Down Expand Up @@ -52,7 +51,7 @@ Stay up-to-date on the latest security news and patches for Magento by signing u

<h2>License</h2>

Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.

http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Catalog/Model/ResourceModel/Category.php
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ public function changeParent(
$childrenCount = $this->getChildrenCount($category->getId()) + 1;
$table = $this->getEntityTable();
$connection = $this->getConnection();
$levelFiled = $connection->quoteIdentifier('level');
$levelField = $connection->quoteIdentifier('level');
$pathField = $connection->quoteIdentifier('path');

/**
Expand Down Expand Up @@ -963,7 +963,7 @@ public function changeParent(
$newPath . '/'
) . ')'
),
'level' => new \Zend_Db_Expr($levelFiled . ' + ' . $levelDisposition)
'level' => new \Zend_Db_Expr($levelField . ' + ' . $levelDisposition)
],
[$pathField . ' LIKE ?' => $category->getPath() . '/%']
);
Expand Down
43 changes: 23 additions & 20 deletions app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ public function __construct(
}

/**
* Init model
*
* @return void
*/
protected function _construct()
Expand Down Expand Up @@ -362,6 +364,7 @@ public function getStoreId()

/**
* Retrieve apply to products array
*
* Return empty array if applied to all products
*
* @return string[]
Expand Down Expand Up @@ -478,7 +481,7 @@ protected function _isOriginalIndexable()
$backendType = $this->getOrigData('backend_type');
$frontendInput = $this->getOrigData('frontend_input');

if ($backendType == 'int' && $frontendInput == 'select') {
if ($backendType == 'int' && ($frontendInput == 'select' || $frontendInput == 'boolean')) {
return true;
} elseif ($backendType == 'varchar' && $frontendInput == 'multiselect') {
return true;
Expand Down Expand Up @@ -507,128 +510,128 @@ public function getIndexType()
}

/**
* @inheritdoc
* @codeCoverageIgnoreStart
* {@inheritdoc}
*/
public function getIsWysiwygEnabled()
{
return $this->_getData(self::IS_WYSIWYG_ENABLED);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getIsHtmlAllowedOnFront()
{
return $this->_getData(self::IS_HTML_ALLOWED_ON_FRONT);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getUsedForSortBy()
{
return $this->_getData(self::USED_FOR_SORT_BY);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getIsFilterable()
{
return $this->_getData(self::IS_FILTERABLE);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getIsFilterableInSearch()
{
return $this->_getData(self::IS_FILTERABLE_IN_SEARCH);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getIsUsedInGrid()
{
return (bool)$this->_getData(self::IS_USED_IN_GRID);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getIsVisibleInGrid()
{
return (bool)$this->_getData(self::IS_VISIBLE_IN_GRID);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getIsFilterableInGrid()
{
return (bool)$this->_getData(self::IS_FILTERABLE_IN_GRID);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getPosition()
{
return $this->_getData(self::POSITION);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getIsSearchable()
{
return $this->_getData(self::IS_SEARCHABLE);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getIsVisibleInAdvancedSearch()
{
return $this->_getData(self::IS_VISIBLE_IN_ADVANCED_SEARCH);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getIsComparable()
{
return $this->_getData(self::IS_COMPARABLE);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getIsUsedForPromoRules()
{
return $this->_getData(self::IS_USED_FOR_PROMO_RULES);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getIsVisibleOnFront()
{
return $this->_getData(self::IS_VISIBLE_ON_FRONT);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getUsedInProductListing()
{
return $this->_getData(self::USED_IN_PRODUCT_LISTING);
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getIsVisible()
{
Expand All @@ -638,7 +641,7 @@ public function getIsVisible()
//@codeCoverageIgnoreEnd

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getScope()
{
Expand Down Expand Up @@ -720,7 +723,7 @@ public function setPosition($position)
/**
* Set apply to value for the element
*
* @param string []|string
* @param string[]|string $applyTo
* @return $this
*/
public function setApplyTo($applyTo)
Expand Down Expand Up @@ -829,7 +832,7 @@ public function setScope($scope)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function afterDelete()
{
Expand Down
Loading

0 comments on commit 4f94998

Please sign in to comment.