version

karliuka · Jan 22, 2017 · e526a01 · e526a01
1 parent 2365c39
commit e526a01
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/Observer/ValidateObserver.php b/Observer/ValidateObserver.php
@@ -113,15 +113,16 @@ public function execute(Observer $observer)
 					}		
 				}
 			}
-			
+
 			$message = new Phrase('There was an error with the reCAPTCHA code, please try again.');
 			$this->_messageManager->addError($message);
 
 			/** @var \Magento\Framework\App\Action\Action $controller */
 			$controller = $observer->getEvent()->getControllerAction();	
 
 			$this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-			$this->_redirect->redirect($controller->getResponse(), $this->_helper->getRedirectUrl($action));			
+			$this->_redirect->redirect($controller->getResponse(), $this->_helper->getRedirectUrl($action));
+			return $this;			
 		}
     }
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "faonni/module-re-captcha",
     "description": "Extension is integrate Google Recaptcha with your Magento2 store.",
     "type": "magento2-module",
-	"version": "2.0.1",
+	"version": "2.0.2",
 	"license": [
 		"OSL-3.0"
 		],

diff --git a/etc/di.xml b/etc/di.xml
@@ -44,10 +44,10 @@
                     <item name="handle" xsi:type="string">recaptcha_form_additional_info</item>
                     <item name="post" xsi:type="string">customer_account_forgotpasswordpost</item>
                 </item>                              
-                <item name="contacts_index_index" xsi:type="array">
+                <item name="contact_index_index" xsi:type="array">
                     <item name="label" xsi:type="string">Contact Us</item>
                     <item name="handle" xsi:type="string">recaptcha_form_additional_info</item>
-                    <item name="post" xsi:type="string">contacts_index_post</item>
+                    <item name="post" xsi:type="string">contact_index_post</item>
                 </item>                
             </argument>
         </arguments>

diff --git a/etc/module.xml b/etc/module.xml
@@ -23,5 +23,5 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Faonni_ReCaptcha" setup_version="2.0.1"/>
+    <module name="Faonni_ReCaptcha" setup_version="2.0.2"/>
 </config> 
diff --git a/view/frontend/layout/recaptcha_form_additional_info.xml b/view/frontend/layout/recaptcha_form_additional_info.xml
@@ -24,7 +24,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
-		<referenceContainer name="head.additional" ifconfig="contact/map/enabled">
+		<referenceContainer name="head.additional">
             <block class="Faonni\ReCaptcha\Block\Head" name="faonni.recaptcha.head" template="Faonni_ReCaptcha::head.phtml" />
 		</referenceContainer> 		
         <referenceContainer name="form.additional.info">

diff --git a/view/frontend/web/css/source/_module.less b/view/frontend/web/css/source/_module.less
@@ -0,0 +1,3 @@
+.customer-account-login .g-recaptcha {
+    margin-bottom: 40px;
+}