diff --git a/Block/Adminhtml/ReCaptcha.php b/Block/Adminhtml/ReCaptcha.php
index ba8a8d2..9a4db79 100644
--- a/Block/Adminhtml/ReCaptcha.php
+++ b/Block/Adminhtml/ReCaptcha.php
@@ -54,6 +54,24 @@ public function getPublicKey()
return $this->config->getPublicKey();
}
+ /**
+ * Get backend theme
+ * @return string
+ */
+ public function getTheme()
+ {
+ return $this->config->getBackendTheme();
+ }
+
+ /**
+ * Get backend size
+ * @return string
+ */
+ public function getSize()
+ {
+ return $this->config->getBackendSize();
+ }
+
/**
* Return true if can display reCaptcha
* @return bool
diff --git a/Model/Config.php b/Model/Config.php
index 60fe6f9..41c87e2 100644
--- a/Model/Config.php
+++ b/Model/Config.php
@@ -28,7 +28,6 @@ class Config
const XML_PATH_ENABLED_BACKEND = 'msp_securitysuite_recaptcha/backend/enabled';
const XML_PATH_ENABLED_FRONTEND = 'msp_securitysuite_recaptcha/frontend/enabled';
- const XML_PATH_TYPE_BACKEND = 'msp_securitysuite_recaptcha/backend/type';
const XML_PATH_TYPE_FRONTEND = 'msp_securitysuite_recaptcha/frontend/type';
const XML_PATH_POSITION_FRONTEND = 'msp_securitysuite_recaptcha/frontend/position';
@@ -180,10 +179,6 @@ public function getFrontendSize()
*/
public function getBackendSize()
{
- if ($this->getBackendType() == Type::TYPE_INVISIBLE) {
- return 'invisible';
- }
-
return $this->scopeConfig->getValue(static::XML_PATH_SIZE_BACKEND);
}
@@ -206,10 +201,6 @@ public function getFrontendTheme()
*/
public function getBackendTheme()
{
- if ($this->getBackendType() == Type::TYPE_INVISIBLE) {
- return null;
- }
-
return $this->scopeConfig->getValue(static::XML_PATH_THEME_BACKEND);
}
@@ -234,13 +225,4 @@ public function getFrontendType()
{
return $this->scopeConfig->getValue(static::XML_PATH_TYPE_FRONTEND);
}
-
- /**
- * Get data size
- * @return string
- */
- public function getBackendType()
- {
- return $this->scopeConfig->getValue(static::XML_PATH_TYPE_BACKEND);
- }
}
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 00dd00e..4cc4336 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -49,13 +49,6 @@
Magento\Config\Model\Config\Source\Yesno
-
-
- MSP\ReCaptcha\Model\Config\Source\Type
-
- 1
-
-
MSP\ReCaptcha\Model\Config\Source\Theme
diff --git a/etc/config.xml b/etc/config.xml
index 1b5005a..3d71868 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -26,7 +26,6 @@
0
normal
- standard
light
diff --git a/view/adminhtml/templates/msp_recaptcha.phtml b/view/adminhtml/templates/msp_recaptcha.phtml
index 20a6039..153cbf5 100644
--- a/view/adminhtml/templates/msp_recaptcha.phtml
+++ b/view/adminhtml/templates/msp_recaptcha.phtml
@@ -22,6 +22,10 @@
?>
canDisplayCaptcha()): ?>
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index a0d0fc3..06133ba 100644
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -37,6 +37,7 @@
- checkoutConfig
- msp-recaptcha-popup-login
- login
+ - inline
diff --git a/view/frontend/web/js/reCaptcha.js b/view/frontend/web/js/reCaptcha.js
index 896bff8..7fa8788 100644
--- a/view/frontend/web/js/reCaptcha.js
+++ b/view/frontend/web/js/reCaptcha.js
@@ -72,6 +72,7 @@ define(
// Move our (last) handler topmost. We need this to avoid submit bindings with ko.
var listeners = $._data($parentForm[0], 'events').submit;
+ debugger;
listeners.unshift(listeners.pop());
// Create a virtual token field