Skip to content

Commit 750628e

Browse files
authored
Merge pull request #107 from magento-pangolin/2.3-dev-pan-2.3.6
2.3 dev pan 2.3.6
2 parents 1a5ed8d + 6fe8311 commit 750628e

30 files changed

+27366
-14125
lines changed

app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<element name="taxDisplayProductPricesDisabled" type="select" selector="#tax_display_type[disabled='disabled']"/>
3636
<element name="taxDisplayProductPricesInherit" type="checkbox" selector="#tax_display_type_inherit"/>
3737

38+
<element name="taxSalesDisplay" type="block" selector=".config.admin__collapsible-block#tax_sales_display" timeout="30"/>
3839
<element name="shoppingCartDisplay" type="block" selector="#tax_cart_display-head" timeout="30"/>
3940
<element name="systemValueIncludeTaxTotalCart" type="checkbox" selector="#row_tax_cart_display_grandtotal input[type='checkbox']"/>
4041
<element name="dropdownIncludeTaxTotalCart" type="checkbox" selector="#row_tax_cart_display_grandtotal select"/>

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"require-dev": {
8585
"friendsofphp/php-cs-fixer": "~2.13.0",
8686
"lusitanian/oauth": "~0.8.10",
87-
"magento/magento2-functional-testing-framework": "2.3.5",
87+
"magento/magento2-functional-testing-framework": "2.3.6",
8888
"pdepend/pdepend": "2.5.2",
8989
"phpmd/phpmd": "@stable",
9090
"phpunit/phpunit": "~6.5.0",

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

setup/pub/angular-ng-storage/angular-ng-storage.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)