From a7dfae8c5d3e56bef3c2e78def96cd4e4364a3e4 Mon Sep 17 00:00:00 2001
From: MaxBuhe01 <mb@shopmodule.com>
Date: Sat, 16 Nov 2024 13:50:58 +0100
Subject: [PATCH] [Changed] rework for OXID 7

---
 .../de/d3manufacturerinformation_lang.php     |   0
 .../en/d3manufacturerinformation_lang.php     |   0
 image-file.png => assets/image-file.png       | Bin
 composer.json                                 |  29 +++---------------
 metadata.php                                  |  20 ++++++------
 .../smarty/admin}/d3manufacturer_longdesc.tpl |   0
 6 files changed, 15 insertions(+), 34 deletions(-)
 rename Application/views/{admin => admin_smarty}/de/d3manufacturerinformation_lang.php (100%)
 rename Application/views/{admin => admin_smarty}/en/d3manufacturerinformation_lang.php (100%)
 rename image-file.png => assets/image-file.png (100%)
 rename {Application/views/admin/tpl => views/smarty/admin}/d3manufacturer_longdesc.tpl (100%)

diff --git a/Application/views/admin/de/d3manufacturerinformation_lang.php b/Application/views/admin_smarty/de/d3manufacturerinformation_lang.php
similarity index 100%
rename from Application/views/admin/de/d3manufacturerinformation_lang.php
rename to Application/views/admin_smarty/de/d3manufacturerinformation_lang.php
diff --git a/Application/views/admin/en/d3manufacturerinformation_lang.php b/Application/views/admin_smarty/en/d3manufacturerinformation_lang.php
similarity index 100%
rename from Application/views/admin/en/d3manufacturerinformation_lang.php
rename to Application/views/admin_smarty/en/d3manufacturerinformation_lang.php
diff --git a/image-file.png b/assets/image-file.png
similarity index 100%
rename from image-file.png
rename to assets/image-file.png
diff --git a/composer.json b/composer.json
index de464de..cdb986c 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,9 @@
     "oxid",
     "modules",
     "eShop",
-    "d3"
+    "d3",
+    "manufacturer",
+    "information"
   ],
   "authors": [
     {
@@ -24,28 +26,7 @@
 	"proprietary"
   ],
   "require": {
-    "php": "~7.0 || ~8.0",
-    "oxid-esales/oxideshop-ce": "v6.6.0 - v6.14.3"
-  },
-  "require-dev": {
-    "phpunit/phpunit" : "^9.5",
-    "friendsofphp/php-cs-fixer": "^3.9",
-    "phpstan/phpstan": "^1.8"
-  },
-  "extra": {
-    "oxideshop": {
-      "blacklist-filter": [
-        "*.md",
-        "composer.json",
-        ".php-cs-fixer.php",
-        "*.neon"
-      ],
-      "target-directory": "d3/manufacturerinformation"
-    }
-  },
-  "autoload": {
-    "psr-4": {
-      "D3\\ManufacturerInformation\\": "../../../source/modules/d3/manufacturerinformation"
-    }
+    "php": "^8.0",
+    "oxid-esales/oxideshop-ce": "7.0 - 7.1"
   }
 }
diff --git a/metadata.php b/metadata.php
index 0a5308e..faed67f 100644
--- a/metadata.php
+++ b/metadata.php
@@ -12,7 +12,7 @@
  */
 
 declare(strict_types=1);
-	
+
 use D3\ManufacturerInformation\Application\Controller\Admin\ManufacturerInfoLongdesc;
 use D3\ManufacturerInformation\Application\Model\Constants;
 use D3\ManufacturerInformation\Modules\Application\Model\D3ManufacturerLongDesc;
@@ -22,22 +22,22 @@ use OxidEsales\Eshop\Application\Model\ManufacturerList as OEManufacturerList;
 
 $sMetadataVersion = '2.1';
 
-$sModuleId = Constants::OXID_MODULE_ID;
-$logo = '<img src="https://logos.oxidmodule.com/d3logo.svg" alt="(D3)" style="height:1em;width:1em">';
-
 /**
  * Module information
  */
 $aModule = [
-    'id'          => $sModuleId,
-    'title'       => $logo.' Herstellerinformationen',
-    'description' => [
+    'id'          => Constants::OXID_MODULE_ID,
+	'title'         => [
+		'de'        => '(D3) Herstellerinformationen',
+		'en'        => '(D3) Manufacturer information',
+	],
+	'description' => [
         'de' => 'fügt Informationen der Hersteller zur Artikelliste hinzu',
         'en' => 'adds manufacturer information to the article list',
     ],
     'thumbnail'   => 'image-file.png',
-    'version'     => '1.1.0.0',
-    'author'      => $logo.' Data Development (Inh.: Thomas Dartsch)',
+    'version'     => '2.0.0.0',
+    'author'      => '(D3) Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
     'controllers' => [
@@ -48,6 +48,6 @@ $aModule = [
 	    OEManufacturerList::class => ManufacturerInfoList::class
     ],
     'templates'   => [
-	    'd3manufacturerlongdesc.tpl'        => 'd3/manufacturerinformation/Application/views/admin/tpl/d3manufacturer_longdesc.tpl',
+	    '@' . Constants::OXID_MODULE_ID . 'admin/d3manufacturerlongdesc.tpl'        => 'views/smarty/admin/d3manufacturer_longdesc.tpl',
     ],
 ];
diff --git a/Application/views/admin/tpl/d3manufacturer_longdesc.tpl b/views/smarty/admin/d3manufacturer_longdesc.tpl
similarity index 100%
rename from Application/views/admin/tpl/d3manufacturer_longdesc.tpl
rename to views/smarty/admin/d3manufacturer_longdesc.tpl