Merge pull request #581 from magento-folks/bugfix (b56df96c) · Commits · KIII-12 / Magento

Commit b56df96c authored 8 years ago by

Alexander Akimov Committed by GitHub 8 years ago

Merge pull request #581 from magento-folks/bugfix

[Folks] Bugs

parents e643a676 c67d8dee

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Checkout/Controller/Cart/CouponPost.php 11 additions, 20 deletions

app/code/Magento/Checkout/Controller/Cart/CouponPost.php
app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php 16 additions, 0 deletions

...nto/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
app/code/Magento/Eav/Model/AttributeManagement.php 29 additions, 4 deletions

app/code/Magento/Eav/Model/AttributeManagement.php
app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php 18 additions, 0 deletions

...e/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
app/code/Magento/Sales/Model/Order/Payment.php 1 addition, 1 deletion

app/code/Magento/Sales/Model/Order/Payment.php
app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php 1 addition, 1 deletion

app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
app/code/Magento/Swatches/Helper/Data.php 29 additions, 1 deletion

app/code/Magento/Swatches/Helper/Data.php
app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php 20 additions, 2 deletions

app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php 4 additions, 0 deletions

...t/Model/ResourceModel/Widget/Instance/Options/ThemeId.php
app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/Themes.php 41 additions, 0 deletions

...et/Model/ResourceModel/Widget/Instance/Options/Themes.php
app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Widget/Instance/Options/ThemesTest.php 55 additions, 0 deletions

...odel/ResourceModel/Widget/Instance/Options/ThemesTest.php
app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_block.xml 1 addition, 1 deletion

...view/adminhtml/layout/adminhtml_widget_instance_block.xml
app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout.less 17 additions, 2 deletions

...to_Checkout/web/css/source/module/checkout/_checkout.less
app/design/frontend/Magento/blank/Magento_Rma/web/css/source/_module.less 5 additions, 4 deletions

...end/Magento/blank/Magento_Rma/web/css/source/_module.less
app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less 17 additions, 2 deletions

...to_Checkout/web/css/source/module/checkout/_checkout.less
app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less 5 additions, 4 deletions

...tend/Magento/luma/Magento_Rma/web/css/source/_module.less
dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php 13 additions, 1 deletion

...t/Constraint/AssertAddedProductAttributeOnProductForm.php
dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php 6 additions, 2 deletions

...tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php
dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php 2 additions, 2 deletions

...tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php
dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/WidgetGrid.php 31 additions, 0 deletions

...Magento/Widget/Test/Block/Adminhtml/Widget/WidgetGrid.php

with 322 additions and 47 deletions

Please register or to comment

Admin message

Merge pull request #581 from magento-folks/bugfix