Merge pull request #525 from magento-south/BUGS (ec436ce5) · Commits · KIII-12 / Magento

Commit ec436ce5 authored 8 years ago by

Momotenko,Natalia(nmomotenko)

Merge pull request #525 from magento-south/BUGS

[SOUTH] Bugfixes + TD

parents d3492997 d851e755

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Config/Model/Config/Backend/File.php 15 additions, 3 deletions

app/code/Magento/Config/Model/Config/Backend/File.php
app/code/Magento/Sales/Model/AdminOrder/Create.php 2 additions, 1 deletion

app/code/Magento/Sales/Model/AdminOrder/Create.php
app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php 22 additions, 2 deletions

...e/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
app/code/Magento/Theme/Controller/Adminhtml/Design/Config/FileUploader/Save.php 7 additions, 7 deletions

.../Controller/Adminhtml/Design/Config/FileUploader/Save.php
app/code/Magento/Theme/Model/Design/Backend/Favicon.php 26 additions, 2 deletions

app/code/Magento/Theme/Model/Design/Backend/Favicon.php
app/code/Magento/Theme/Model/Design/Backend/File.php 195 additions, 0 deletions

app/code/Magento/Theme/Model/Design/Backend/File.php
app/code/Magento/Theme/Model/Design/Backend/Image.php 0 additions, 129 deletions

app/code/Magento/Theme/Model/Design/Backend/Image.php
app/code/Magento/Theme/Model/Design/Backend/Logo.php 24 additions, 2 deletions

app/code/Magento/Theme/Model/Design/Backend/Logo.php
app/code/Magento/Theme/Model/Design/Config/FileUploader/Config.php 0 additions, 147 deletions

...Magento/Theme/Model/Design/Config/FileUploader/Config.php
app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php 71 additions, 15 deletions

.../Theme/Model/Design/Config/FileUploader/FileProcessor.php
app/code/Magento/Theme/Model/Design/Config/Storage.php 4 additions, 2 deletions

app/code/Magento/Theme/Model/Design/Config/Storage.php
app/code/Magento/Theme/Model/Design/Config/ValueChecker.php 9 additions, 5 deletions

app/code/Magento/Theme/Model/Design/Config/ValueChecker.php
app/code/Magento/Theme/Model/Design/Config/ValueProcessor.php 13 additions, 3 deletions

...code/Magento/Theme/Model/Design/Config/ValueProcessor.php
app/code/Magento/Theme/Model/ResourceModel/Design/Config/Collection.php 9 additions, 1 deletion

...to/Theme/Model/ResourceModel/Design/Config/Collection.php
app/code/Magento/Theme/Model/ResourceModel/Design/Config/Scope/Collection.php 3 additions, 1 deletion

...me/Model/ResourceModel/Design/Config/Scope/Collection.php
app/code/Magento/Theme/Model/Theme/Plugin/Registration.php 16 additions, 14 deletions

app/code/Magento/Theme/Model/Theme/Plugin/Registration.php
app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/Design/Config/FileUploader/SaveTest.php 5 additions, 5 deletions

...troller/Adminhtml/Design/Config/FileUploader/SaveTest.php
app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php 69 additions, 44 deletions

...Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
app/code/Magento/Theme/Test/Unit/Model/Design/Config/FileUploader/FileProcessorTest.php 50 additions, 26 deletions

...it/Model/Design/Config/FileUploader/FileProcessorTest.php
app/code/Magento/Theme/Test/Unit/Model/Design/Config/StorageTest.php 5 additions, 2 deletions

...gento/Theme/Test/Unit/Model/Design/Config/StorageTest.php

with 545 additions and 411 deletions

Please register or to comment

Admin message

Merge pull request #525 from magento-south/BUGS