Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.2 develop-update #7

Merged
merged 56 commits into from
Nov 22, 2018
Merged

2.2 develop-update #7

merged 56 commits into from
Nov 22, 2018

Conversation

speedy008
Copy link
Owner

Description (*)

Fixed Issues (if relevant)

  1. magento/magento2#<issue_number>: Issue title
  2. ...

Manual testing scenarios (*)

  1. ...
  2. ...

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)
  • All automated tests passed successfully (all builds on Travis CI are green)

novikor and others added 30 commits June 22, 2018 17:48
…-not-work-for-configurable-products.

Use configurable product`s children for shopping cart rules validation
for cases when attribute exists for children only (E.g. special_price)
…-not-work-for-configurable-products.

Revert "Removed dependency to configurable product"

This reverts commit d2a0de8.
…-not-work-for-configurable-products.

Made getProductToValidate method private according to Technical Guideline (2.7)
…-not-work-for-configurable-products.

Added configurable product to dependencies
…ice-does-not-work-for-configurable-products. Added configurable product to dependencies"

This reverts commit 887ee4a
…ondition-over-special-price-does-not-work-for-configurable-products

# Conflicts:
#	app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
…-not-work-for-configurable-products.

Restored \Magento\SalesRule\Model\Rule\Condition\Product to its previous state except PHPDocs.
…-not-work-for-configurable-products

Removed an empty line.
…Sales-Rule-with-negated-condition-over-special-price-does-not-work-for-configurable-products
…ted-condition-over-special-price-does-not-work-for-configurable-products' into #14020-Cart-Sales-Rule-with-negated-condition-over-special-price-does-not-work-for-configurable-products
…-not-work-for-configurable-products.

Unit tests coverage: case when child should be used
…-not-work-for-configurable-products.

Fixed mock objects comparison
…-not-work-for-configurable-products.

Fixed static tests.
…Sales-Rule-with-negated-condition-over-special-price-does-not-work-for-configurable-products
…al-price-does… #16342

 - Merge Pull Request #16342 from novikor/magento2:#14020-Cart-Sales-Rule-with-negated-condition-over-special-price-does-not-work-for-configurable-products
 - Merged commits:
   1. 90b6803
   2. 2717cb1
   3. d2a0de8
   4. fae98c0
   5. 9a35b45
   6. 887ee4a
   7. 0c9aa81
   8. 4e68337
   9. 5b95b22
   10. 618f408
   11. 7c8482b
   12. e7130bf
   13. 5a7e78a
   14. 8d417ac
   15. 90ff989
   16. c52e0e8
   17. 5c3154b
   18. 51adb9d
…18685 #18808

 - Merge Pull Request #18808 from ashutoshwebkul/magento2:2.2-develop
 - Merged commits:
   1. 09586e4
   2. 1638891
   3. 175ebc0
   4. 59bd874
p-bystritsky and others added 26 commits November 7, 2018 13:31
…ugin #19240

 - Merge Pull Request #19240 from gelanivishal/magento2:2.2-develop-PR-port-18906
 - Merged commits:
   1. 64718ce
… Unit Test #19217

 - Merge Pull Request #19217 from eduard13/magento2:2.2-develop-19175-bp
 - Merged commits:
   1. 7415cdd
…Tests #19216

 - Merge Pull Request #19216 from eduard13/magento2:2.2-develop-19103-bp
 - Merged commits:
   1. a9ac1c4
 - Merge Pull Request #19237 from gelanivishal/magento2:2.2-develop-PR-port-18958
 - Merged commits:
   1. aa4abec
   2. acefdb3
   3. 5866a39
   4. fee2712
   5. 7be21e2
…e is checkbox and add to cart with 3 values only 2 values added to cart. #19260

 - Merge Pull Request #19260 from maheshWebkul721/magento2:bundle-product-addto-cart
 - Merged commits:
   1. aa379ea
   2. 1a321d2
…e is checkbox and add to cart with 3 values only 2 values added to cart. #19260
Accepted Public Pull Requests:
 - #19260: Issue #19205 Fixed: Bundle Product Option with input type is checkbox and add to cart with 3 values only 2 values added to cart. (by @maheshWebkul721)
 - #19237: [Backport] #18956 Fixes for set root_category_id (by @gelanivishal)
 - #19240: [Backport] Add missing unit test for WishlistSettings plugin (by @gelanivishal)
 - #19216: [Backport] Covering the \Magento\Weee observers by Unit Tests (by @eduard13)
 - #19217: [Backport] Covering the CheckUserLoginBackendObserver by Unit Test (by @eduard13)
 - #18808: fixed Quote Item Prices are NULL in cart related events. #18685 (by @ashutoshwebkul)
 - #16342: #14020-Cart-Sales-Rule-with-negated-condition-over-special-price-does� (by @novikor)


Fixed GitHub Issues:
 - #19205: Bundle Product Option with input type is checkbox and add to cart with 3 values only 2 values added to cart (reported by @sneha-panchal) has been fixed in #19260 by @maheshWebkul721 in 2.2-develop branch
   Related commits:
     1. aa379ea
     2. 1a321d2

 - #18956: Import of RootCategoryId should be possbile (Magento/Store/Model/Config/Importer/Processor/Create.php) (reported by @larsroettig) has been fixed in #19237 by @gelanivishal in 2.2-develop branch
   Related commits:
     1. aa4abec
     2. acefdb3
     3. 5866a39
     4. fee2712
     5. 7be21e2

 - #18685: Quote Item Prices are NULL in cart related events. (reported by @qsolutions-pl) has been fixed in #18808 by @ashutoshwebkul in 2.2-develop branch
   Related commits:
     1. 09586e4
     2. 1638891
     3. 175ebc0
     4. 59bd874

 - #14020: Cart Sales Rule with negated condition over special_price does not work for configurable products (reported by @Filipe-Bicho) has been fixed in #16342 by @novikor in 2.2-develop branch
   Related commits:
     1. 90b6803
     2. 2717cb1
     3. d2a0de8
     4. fae98c0
     5. 9a35b45
     6. 887ee4a
     7. 0c9aa81
     8. 4e68337
     9. 5b95b22
     10. 618f408
     11. 7c8482b
     12. e7130bf
     13. 5a7e78a
     14. 8d417ac
     15. 90ff989
     16. c52e0e8
     17. 5c3154b
     18. 51adb9d
@speedy008 speedy008 merged commit 4fcc190 into speedy008:2.2-develop Nov 22, 2018
speedy008 pushed a commit that referenced this pull request Feb 11, 2019
Update branch 2.3-develop
speedy008 pushed a commit that referenced this pull request Feb 15, 2019
Magento 2.3-develop Latest Pull
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.