Merge branch 'develop' into MAGETWO-28051 (28fb5b6a) · Commits · KIII-12 / Magento

Commit 28fb5b6a authored 9 years ago by

Dmytro Voskoboinikov

Merge branch 'develop' into MAGETWO-28051

Conflicts:
	app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
	app/code/Magento/Quote/etc/di.xml

parents 475c6098 9e7fcb20

Branches

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Captcha/Model/Cart/ConfigPlugin.php 35 additions, 0 deletions

app/code/Magento/Captcha/Model/Cart/ConfigPlugin.php
app/code/Magento/Captcha/Model/Checkout/Plugin/Validation.php 0 additions, 60 deletions

...code/Magento/Captcha/Model/Checkout/Plugin/Validation.php
app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php 29 additions, 15 deletions

app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
app/code/Magento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php 122 additions, 0 deletions

...agento/Captcha/Test/Unit/Controller/Refresh/IndexTest.php
app/code/Magento/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php 121 additions, 0 deletions

...o/Captcha/Test/Unit/Model/Checkout/ConfigProviderTest.php
app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php 173 additions, 0 deletions

...Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
app/code/Magento/Captcha/composer.json 0 additions, 1 deletion

app/code/Magento/Captcha/composer.json
app/code/Magento/Captcha/etc/di.xml 4 additions, 5 deletions

app/code/Magento/Captcha/etc/di.xml
app/code/Magento/Captcha/etc/frontend/di.xml 0 additions, 1 deletion

app/code/Magento/Captcha/etc/frontend/di.xml
app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml 48 additions, 19 deletions

...o/Captcha/view/frontend/layout/checkout_onepage_index.xml
app/code/Magento/Captcha/view/frontend/layout/default.xml 33 additions, 0 deletions

app/code/Magento/Captcha/view/frontend/layout/default.xml
app/code/Magento/Captcha/view/frontend/web/js/action/refresh.js 3 additions, 2 deletions

...de/Magento/Captcha/view/frontend/web/js/action/refresh.js
app/code/Magento/Captcha/view/frontend/web/js/model/captcha.js 11 additions, 2 deletions

...ode/Magento/Captcha/view/frontend/web/js/model/captcha.js
app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js 10 additions, 6 deletions

...tcha/view/frontend/web/js/view/checkout/defaultCaptcha.js
app/code/Magento/Captcha/view/frontend/web/js/view/checkout/guestCaptcha.js 0 additions, 45 deletions

...aptcha/view/frontend/web/js/view/checkout/guestCaptcha.js
app/code/Magento/Captcha/view/frontend/web/js/view/checkout/loginCaptcha.js 12 additions, 13 deletions

...aptcha/view/frontend/web/js/view/checkout/loginCaptcha.js
app/code/Magento/Captcha/view/frontend/web/js/view/checkout/registerCaptcha.js 0 additions, 45 deletions

...cha/view/frontend/web/js/view/checkout/registerCaptcha.js
app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html 1 addition, 1 deletion

.../Captcha/view/frontend/web/template/checkout/captcha.html
app/code/Magento/Catalog/Test/Unit/Helper/Product/ConfigurationPoolTest.php 54 additions, 0 deletions

...atalog/Test/Unit/Helper/Product/ConfigurationPoolTest.php
app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php 57 additions, 0 deletions

...ode/Magento/Checkout/Api/Data/PaymentDetailsInterface.php

with 713 additions and 215 deletions

Please register or to comment

Admin message

Merge branch 'develop' into MAGETWO-28051