Skip to content
Snippets Groups Projects
Commit 7c9c0cb0 authored by Stanislav Idolov's avatar Stanislav Idolov
Browse files

MAGETWO-39197: There is no CAPTCHA on shipping step login and Sign In

parent f92176b0
Branches
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 352 deletions
app/code/Magento/Captcha/etc/di.xml
+ 1
− 1
View file @ 7c9c0cb0
......@@ -23,7 +23,7 @@
<arguments>
<argument name="formIds" xsi:type="array">
<item name="user_login" xsi:type="string">user_login</item>
<item name="checkout_email" xsi:type="string">checkout_email</item>
<item name="guest_checkout" xsi:type="string">guest_checkout</item>
</argument>
</arguments>
</type>
......
app/code/Magento/Captcha/etc/frontend/di.xml
+ 1
− 1
View file @ 7c9c0cb0
......@@ -17,7 +17,7 @@
<arguments>
<argument name="formIds" xsi:type="array">
<item name="user_login" xsi:type="string">user_login</item>
<item name="checkout_email" xsi:type="string">checkout_email</item>
<item name="guest_checkout" xsi:type="string">guest_checkout</item>
</argument>
</arguments>
</type>
......
app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml
+ 22
− 1
View file @ 7c9c0cb0
......@@ -35,7 +35,28 @@
<item name="captcha" xsi:type="array">
<item name="component" xsi:type="string">Magento_Captcha/js/view/checkout/loginCaptcha</item>
<item name="displayArea" xsi:type="string">additional-login-form-fields</item>
<item name="formId" xsi:type="string">checkout_email</item>
<item name="formId" xsi:type="string">guest_checkout</item>
</item>
</item>
</item>
</item>
</item>
</item>
</item>
</item>
</item>
<item name="billing-step" xsi:type="array">
<item name="children" xsi:type="array">
<item name="payment" xsi:type="array">
<item name="children" xsi:type="array">
<item name="customer-email" xsi:type="array">
<item name="children" xsi:type="array">
<item name="additional-login-form-fields" xsi:type="array">
<item name="children" xsi:type="array">
<item name="captcha" xsi:type="array">
<item name="component" xsi:type="string">Magento_Captcha/js/view/checkout/loginCaptcha</item>
<item name="displayArea" xsi:type="string">additional-login-form-fields</item>
<item name="formId" xsi:type="string">guest_checkout</item>
</item>
</item>
</item>
......
app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_original.xml deleted 100644 → 0
+ 0
− 47
View file @ f92176b0
<?xml version="1.0"?>
<!--
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<!-- TODO remove this file as soon as enhanced checkout is implemented -->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="checkout.root">
<arguments>
<argument name="jsLayout" xsi:type="array">
<item name="components" xsi:type="array">
<item name="checkout" xsi:type="array">
<item name="children" xsi:type="array">
<item name="steps" xsi:type="array">
<item name="children" xsi:type="array">
<item name="authentication" xsi:type="array">
<item name="children" xsi:type="array">
<item name="captcha" xsi:type="array">
<item name="component" xsi:type="string">Magento_Captcha/js/view/checkout/loginCaptcha</item>
<item name="displayArea" xsi:type="string">additional-login-form-fields</item>
<item name="formId" xsi:type="string">user_login</item>
</item>
</item>
</item>
<item name="billingAddress" xsi:type="array">
<item name="children" xsi:type="array">
<item name="captcha_guest_checkout" xsi:type="array">
<item name="component" xsi:type="string">Magento_Captcha/js/view/checkout/guestCaptcha</item>
<item name="displayArea" xsi:type="string">additional-fieldsets</item>
<item name="formId" xsi:type="string">guest_checkout</item>
<item name="dataScope" xsi:type="string">additionalAddressData</item>
</item>
</item>
</item>
</item>
</item>
</item>
</item>
</item>
</argument>
</arguments>
</referenceBlock>
</body>
</page>
\ No newline at end of file
app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js
+ 1
− 2
View file @ 7c9c0cb0
......@@ -9,11 +9,10 @@ define(
'jquery',
'ko',
'uiComponent',
'Magento_Customer/js/model/customer',
'Magento_Captcha/js/model/captcha',
'Magento_Captcha/js/model/captchaList'
],
function ($, ko, Component, customer, Captcha, captchaList) {
function ($, ko, Component, Captcha, captchaList) {
"use strict";
var captchaConfig = window.checkoutConfig.captcha;
return Component.extend({
......
app/code/Magento/Checkout/view/frontend/web/template/cart/authentication.html
+ 8
− 0
View file @ 7c9c0cb0
......@@ -36,6 +36,9 @@
<!-- ko foreach: getRegion('messages') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
<!-- ko foreach: getRegion('before') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko -->
<div class="block-content" aria-labelledby="block-customer-login-heading">
<form class="form form-login"
method="post"
......@@ -62,7 +65,12 @@
data-validate="{required:true, 'validate-password':true}">
</div>
</div>
<!-- ko foreach: getRegion('additional-login-form-fields') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!-- /ko -->
</div>
<div class="actions-toolbar">
<input name="context" type="hidden" value="checkout" />
<div class="primary">
<button type="submit" class="action action-login secondary" name="send" id="send2">
<span data-bind="text: $t('Sign In')"></span>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment