Merge pull request #466 from magento-firedrakes/last_bugs (0b8fc261) · Commits · KIII-12 / Magento

There was an error fetching the commit references. Please try again later.

Commit 0b8fc261 authored 9 years ago by

Ivashchenko,Sergii(sivashchenko)

Merge pull request #466 from magento-firedrakes/last_bugs

[Firedrakes] Bugfixes

parents b498e5f5 d3547808

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Checkout/Block/Cart/Shipping.php 10 additions, 18 deletions

app/code/Magento/Checkout/Block/Cart/Shipping.php
app/code/Magento/Checkout/Model/Cart/CollectQuote.php 87 additions, 0 deletions

app/code/Magento/Checkout/Model/Cart/CollectQuote.php
app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php 18 additions, 172 deletions

...de/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php 3 additions, 3 deletions

...figurableProduct/Block/Product/View/Type/Configurable.php
app/code/Magento/ConfigurableProduct/Helper/Data.php 0 additions, 1 deletion

app/code/Magento/ConfigurableProduct/Helper/Data.php
app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php 1 addition, 4 deletions

...Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js 10 additions, 12 deletions

.../ConfigurableProduct/view/frontend/web/js/configurable.js
app/code/Magento/Sales/Block/Adminhtml/Order/Grid.php 0 additions, 47 deletions

app/code/Magento/Sales/Block/Adminhtml/Order/Grid.php
app/code/Magento/Sales/Controller/AbstractController/OrderLoader.php 11 additions, 2 deletions

...gento/Sales/Controller/AbstractController/OrderLoader.php
app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php 1 addition, 1 deletion

...o/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
app/code/Magento/Sales/Model/Resource/AbstractGrid.php 9 additions, 0 deletions

app/code/Magento/Sales/Model/Resource/AbstractGrid.php
app/code/Magento/Sales/Model/Resource/Order.php 3 additions, 1 deletion

app/code/Magento/Sales/Model/Resource/Order.php
app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/GridTest.php 2 additions, 49 deletions

...agento/Sales/Test/Unit/Block/Adminhtml/Order/GridTest.php
app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceTest.php 269 additions, 26 deletions

app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceTest.php
app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php 236 additions, 2 deletions

app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
app/code/Magento/Sales/Test/Unit/Model/Order/Status/HistoryTest.php 102 additions, 0 deletions

...agento/Sales/Test/Unit/Model/Order/Status/HistoryTest.php
app/code/Magento/Sales/Test/Unit/Model/Resource/OrderTest.php 52 additions, 4 deletions

...code/Magento/Sales/Test/Unit/Model/Resource/OrderTest.php
app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_grid_block.xml 4 additions, 4 deletions

.../view/adminhtml/layout/sales_order_invoice_grid_block.xml
app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js 6 additions, 16 deletions

app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js
app/code/Magento/Ui/view/base/web/js/grid/search/search.js 1 addition, 0 deletions

app/code/Magento/Ui/view/base/web/js/grid/search/search.js

with 825 additions and 362 deletions

Please register or to comment

Admin message

Merge pull request #466 from magento-firedrakes/last_bugs