Merge pull request #43 from SauravKumar-Webkul/master

Fixed Area Code Issue
webkul · Feb 13, 2024 · da33720 · da33720
2 parents 9aa062e + ae097b3
commit da33720
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 62 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/Console/Command/Generate.php b/Console/Command/Generate.php
@@ -52,8 +52,6 @@ public function __construct(
         $this->validators = $validators;
         $this->optionsPool = \Magento\Framework\App\ObjectManager::getInstance()
         ->get(\Webkul\CodeGenerator\Model\OptionsPool::class);
-        $state = \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\App\State::class);
-        $state->setAreaCode("adminhtml");
         parent::__construct();
     }
 

diff --git a/Model/Generate/Model.php b/Model/Generate/Model.php
@@ -144,7 +144,7 @@ public function createApiClass($dir, $data, $columns)
                                 $column['type']
                             )]),
                             new Tag\ReturnTag([
-                                'datatype'  => $nameSpace.'\\'.$data['name'].'Interface',
+                                'datatype'  => '\\'.$nameSpace.'\\'.$data['name'].'Interface',
                             ]),
                         ],
                     ]),
@@ -299,7 +299,7 @@ public function createModelClass($dir, $data, $columns)
                     'tags'             => [
                         new Tag\ParamTag($camelCase, [$this->helper->getReturnType($column['type'])]),
                         new Tag\ReturnTag([
-                            'datatype'  => $nameSpace.'\\'.$data['name'].'Interface',
+                            'datatype'  => '\\'.$nameSpace.'\\'.$data['name'].'Interface',
                         ]),
                     ],
                 ]),

diff --git a/Model/Generate/NewModule.php b/Model/Generate/NewModule.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate;

diff --git a/Model/Generate/NewModule/Validator.php b/Model/Generate/NewModule/Validator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate\NewModule;

diff --git a/Model/Generate/Shipping.php b/Model/Generate/Shipping.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate;

diff --git a/Model/Generate/Shipping/Validator.php b/Model/Generate/Shipping/Validator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate\Shipping;

diff --git a/Model/Generate/View.php b/Model/Generate/View.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate;

diff --git a/Model/Generate/View/Validator.php b/Model/Generate/View/Validator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 namespace Webkul\CodeGenerator\Model\Generate\View;
 

diff --git a/Model/XmlGenerator.php b/Model/XmlGenerator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model;

diff --git a/templates/composer.json.dist b/templates/composer.json.dist
@@ -5,8 +5,7 @@
     "license": "proprietary",
     "authors": [
         {
-            "email": "[email protected]",
-            "name": "Mahesh Singh"
+            "name": "Webkul"
         }
     ],
     "require": {},

diff --git a/templates/module.xml.dist b/templates/module.xml.dist
@@ -11,5 +11,5 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="%moduleName%" setup_version="1.0.0"/>
+	<module name="%moduleName%"/>
 </config>