Skip to content

Conversation

@VincentMarmiesse
Copy link
Contributor

@VincentMarmiesse VincentMarmiesse commented Jan 31, 2018

Hello

Description

The node tax/calculation/discount_tax is in double in file Magento/Tax/etc/config.xml.

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)

@orlangur orlangur self-assigned this Jan 31, 2018
@orlangur
Copy link
Contributor

Backport of https://github.com/magento/magento2/pull/11001/files.

@VincentMarmiesse could you please squash changes into single commit and force push?

dvoskoboinikov and others added 2 commits February 1, 2018 00:30
Fixed issues:
- MAGETWO-81802: Magento 2.2.0rc23: Customer Grid Indexer not working magento#10838
- MAGETWO-84448: Product Import does not allow store-specific Custom Option labels
- MAGETWO-85207: Customer's order grid is not displaying
- MAGETWO-86657: Import existing customer with only three columns will override customer group_id and store_id
- MAGETWO-86154: Wrong page cached for logged in user
- MAGETWO-83293: Inefficient SQL query on applying filter on sales order grid
- MAGETWO-83343: Customer shopping cart not accessible in admin order
- MAGETWO-85708: Zoom the image can't be closed by iPhone with Safari browser

MAGETWO-87132: Remove JsTestDriver from Magento codebase

MAGETWO-84219: Creditmemo comment via REST api does not send creditmemo update email

MAGETWO-84219: Creditmemo comment via REST api does not send creditmemo update email

MAGETWO-86452: [Backport for 2.2.x] Update copyright year

alignement array assignement

For Your Eyes Only

Remove whitespace at end of line

FIX: out-of-stock options for configurable product visible on frontend as sellable

Adapt \Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel::render method to use current locale to render time zone label, as done in \Magento\Framework\Locale\TranslatedLists::getOptionTimezones

Handle transparncy correctly for watermark

The watermark functionality uses imagecopymerge for copying the
watermark into the image, this function loses the alpha information.

Therefor use imagecopy for 100% opacity and use imagefilter in other
cases.

Resolves: magento#10661

Fix handling of watermark with alpha for Imagick

When adding a watermark that already has an alpha channel this was reset
because the overal opacity was set for the image. Instead we should
multiply the original alpha with the requested opacity

Handle non true color images with GD2

Add integration test for watermark with alpha

Added integration tests for handling alpha transparency in watermarks.
Renamed the current test for watermarks as it only tests if the
watermark is correctly places

Fix issues with static tests

Remove ui-state-active from siblings of the expanded menu item

Previously when a menu item was expanded the class `ui-state-active` was
not removed from the previous expanded menu item. This resulted in two
(or more if you expanded more) menu items with this class.

Clean region when select country

:bug: add fallback for Product_links position attribute if position index was not set in API request

:ok_hand: shortening variable name

:bug: fix variable re-naming

:ok_hand: drop multiple empty lines

:ok_hand: closing parenthesis and the opening brace of a multi-line function on the same line

:ok_hand: closing parenthesis and the opening brace of a multi-line function on the same line

:ok_hand: reset protected variable naming

:ok_hand: rename isPositionsSet function to isPositionSet to keep consistency

Fix typo

:ok_hand: apply code enhancement

:ok_hand: apply code enhancement

Add type hint
@VincentMarmiesse VincentMarmiesse force-pushed the fix-discount-tax-calculation-default branch from efbf047 to d37bc6e Compare January 31, 2018 23:34
@VincentMarmiesse VincentMarmiesse deleted the fix-discount-tax-calculation-default branch January 31, 2018 23:36
@orlangur orlangur added this to the January 2018 milestone Jan 31, 2018
@VincentMarmiesse
Copy link
Contributor Author

@orlangur Sorry I fucked up with git, here is the new PR: #13449.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants