Merge pull request #1 from scommercemage/SCOM-949

Scom 949
scommercemage · Feb 5, 2024 · aee40d3 · aee40d3
2 parents 16c66de + 18933b2
commit aee40d3
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 6 deletions.
diff --git a/Controller/Adminhtml/WrongLicense/Index.php b/Controller/Adminhtml/WrongLicense/Index.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Scommerce\SecurityBase\Controller\Adminhtml\WrongLicense;
+
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Backend\App\Action;
+
+class Index extends Action
+{
+    public $resultPageFactory;
+
+    /**
+     * Index constructor.
+     * @param Context $context
+     * @param PageFactory $resultPageFactory
+     */
+    public function __construct(
+        Context $context,
+        PageFactory $resultPageFactory
+    ) {
+        parent::__construct($context);
+        $this->resultPageFactory = $resultPageFactory;
+    }
+
+    public function execute()
+    {
+        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        $resultPage = $this->resultPageFactory->create();
+
+        return $resultPage;
+    }
+}
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -14,6 +14,7 @@
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\Model\Exception;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\Controller\ResultFactory;
 
 class Data extends AbstractHelper
 {
@@ -36,17 +37,21 @@ class Data extends AbstractHelper
      */
     protected $_coreHelper;
 
+    /** @var ResultFactory */
+    protected $resultFactory;
+
     /**
      * @param Context $context
      * @param CoreHelper $coreHelper
      */
     public function __construct(
         Context $context,
-        CoreHelper $coreHelper
-    )
-    {
-        $this->_coreHelper = $coreHelper;
+        CoreHelper $coreHelper,
+        ResultFactory $resultFactory
+    ) {
         parent::__construct($context);
+        $this->_coreHelper = $coreHelper;
+        $this->resultFactory = $resultFactory;
     }
 
     /**
@@ -60,6 +65,14 @@ public function isEnabled($storeId = null)
         return $this->isCliMode() ? $enabled : $enabled && $this->isLicenseValid();
     }
 
+    public function getNoRouteRedirect()
+    {
+        $redirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        $redirectUrl = "scommercesecurity/wronglicense/index";
+        $redirect->setPath($redirectUrl);
+        return $redirect;
+    }
+
     /**
      * Returns license key administration configuration option
      * @param int $storeId

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
   },
   "type": "magento2-module",
   "license": "Commercial",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "authors": [
     {
       "name": "Scommerce Mage",

diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="scommercesecurity" frontName="scommercesecurity">
+            <module name="Scommerce_SecurityBase" before="Magento_Backend" />
+        </route>
+    </router>
+</config>
diff --git a/etc/module.xml b/etc/module.xml
@@ -8,7 +8,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Scommerce_SecurityBase" setup_version="2.0.0">
+    <module name="Scommerce_SecurityBase" setup_version="2.0.1">
         <sequence>
             <module name="Scommerce_Core"/>
         </sequence>

diff --git a/view/adminhtml/layout/scommercesecurity_wronglicense_index.xml b/view/adminhtml/layout/scommercesecurity_wronglicense_index.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="content">
+            <block class="Magento\Framework\View\Element\Template" template="Scommerce_SecurityBase::wronglicense.phtml" name="scommerce-security-wronglicense">
+            </block>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/adminhtml/templates/wronglicense.phtml b/view/adminhtml/templates/wronglicense.phtml
@@ -0,0 +1 @@
+<h1>Extension is disabled or license key is invalid</h1>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<h1>Extension is disabled or license key is invalid</h1>