From 59376b8428e8690711df213453b3a88bec7a435a Mon Sep 17 00:00:00 2001
From: MaxBUhe <mb@shopmodule.com>
Date: Fri, 3 Jun 2022 09:46:49 +0200
Subject: [PATCH] extended preparation for oxid64; add d3metadata

---
 composer.json      |  4 ++--
 src/d3metadata.php | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 src/metadata.php   | 37 ++-----------------------------
 3 files changed, 58 insertions(+), 37 deletions(-)
 create mode 100644 src/d3metadata.php

diff --git a/composer.json b/composer.json
index c9de142..52e31cd 100644
--- a/composer.json
+++ b/composer.json
@@ -34,8 +34,8 @@
   },
   "require": {
     "php": "7.1 - 7.4", "ext-ionCube-Loader": "*",
-    "oxid-esales/oxideshop-metapackage-ce": "~6.0.3 || ~6.1.0 || ^6.0",
-    "d3/modcfg": ">=5.1.0.0 || ^6.0.0.0"
+    "oxid-esales/oxideshop-metapackage-ce": "6.0 - 6.4",
+    "d3/modcfg": ">=5.1.0.0 || ^6.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/d3metadata.php b/src/d3metadata.php
new file mode 100644
index 0000000..99946e6
--- /dev/null
+++ b/src/d3metadata.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * This Software is the property of Data Development and is protected
+ * by copyright law - it is NOT Freeware.
+ *
+ * Any unauthorized use of this software without a valid license
+ * is a violation of the license agreement and will be prosecuted by
+ * civil and criminal law.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <support@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+use D3\ModCfg\setup as ModuleSetup;
+$aModule = [
+    'd3FileRegister'    => [
+        'd3/printorder/metadata.php',
+        'd3/printorder/d3metadata.php',
+        'd3/printorder/Setup/InstallRoutine.php',
+        'd3/printorder/IntelliSenseHelper.php',
+
+
+        'd3/printorder/Modules/Application/Model/d3_oxorder_printorder.php',
+        'd3/printorder/Modules/Application/Model/d3_oxorderarticle_printorder.php',
+        'd3/printorder/Modules/Core/d3_oxemail_printorder.php',
+
+        'd3/printorder/Application/Controller/Admin/adminList.php',
+        'd3/printorder/Application/Controller/Admin/main.php',
+        'd3/printorder/Application/Controller/Admin/settings.php',
+        'd3/printorder/Application/Controller/Admin/support.php',
+        'd3/printorder/Application/Controller/printorderPreview.php',
+        'd3/printorder/Application/Model/printOrder.php',
+
+        'd3/printorder/Application/translations/de/d3orderprint_lang.php',
+        'd3/printorder/Application/translations/en/d3orderprint_lang.php',
+
+        'd3/printorder/Application/views/admin/de/d3orderprint_lang.php',
+        'd3/printorder/Application/views/admin/de/module_options.php',
+        'd3/printorder/Application/views/admin/en/d3orderprint_lang.php',
+        'd3/printorder/Application/views/admin/en/module_options.php',
+
+        'd3/printorder/Application/views/admin/tpl/settingsprintorder.tpl',
+        'd3/printorder/Application/views/tpl/email_order_cust_print.tpl',
+        'd3/printorder/Application/views/azure/tpl/d3printorder_account_order.tpl',
+        'd3/printorder/Application/views/flow/tpl/d3printorder_account_order.tpl'
+    ],
+    'd3SetupClasses'    => [
+        ModuleSetup\d3_cfg_mod_update::class,
+        ModuleSetup\d3log_update::class,
+        ModuleSetup\InstallRoutine::class
+    ]
+];
\ No newline at end of file
diff --git a/src/metadata.php b/src/metadata.php
index 76c10f4..dabcbd4 100644
--- a/src/metadata.php
+++ b/src/metadata.php
@@ -21,7 +21,7 @@ use OxidEsales\Eshop\Core as OxidCore;
 /**
  * Metadata version
  */
-$sMetadataVersion = '2.0';
+$sMetadataVersion = '2.1';
 $sD3Logo          = (class_exists( d3utils::class) ? d3utils::getInstance()->getD3Logo() : 'D&sup3;');
 $sModuleId = 'd3printorder';
 
@@ -105,38 +105,5 @@ $aModule = array(
             'type'      => 'str',
             'value'     => ''
         ),
-    ),
-    'd3FileRegister' => array(
-        'd3/printorder/metadata.php',
-        'd3/printorder/Setup/InstallRoutine.php',
-        'd3/printorder/IntelliSenseHelper.php',
-
-
-        'd3/printorder/Modules/Application/Model/d3_oxorder_printorder.php',
-        'd3/printorder/Modules/Application/Model/d3_oxorderarticle_printorder.php',
-        'd3/printorder/Modules/Core/d3_oxemail_printorder.php',
-
-        'd3/printorder/Application/Controller/Admin/adminList.php',
-        'd3/printorder/Application/Controller/Admin/main.php',
-        'd3/printorder/Application/Controller/Admin/settings.php',
-        'd3/printorder/Application/Controller/Admin/support.php',
-        'd3/printorder/Application/Controller/printorderPreview.php',
-        'd3/printorder/Application/Model/printOrder.php',
-
-        'd3/printorder/Application/translations/de/d3orderprint_lang.php',
-        'd3/printorder/Application/translations/en/d3orderprint_lang.php',
-
-        'd3/printorder/Application/views/admin/de/d3orderprint_lang.php',
-        'd3/printorder/Application/views/admin/de/module_options.php',
-        'd3/printorder/Application/views/admin/en/d3orderprint_lang.php',
-        'd3/printorder/Application/views/admin/en/module_options.php',
-
-        'd3/printorder/Application/views/admin/tpl/settingsprintorder.tpl',
-        'd3/printorder/Application/views/tpl/email_order_cust_print.tpl',
-        'd3/printorder/Application/views/azure/tpl/d3printorder_account_order.tpl',
-        'd3/printorder/Application/views/flow/tpl/d3printorder_account_order.tpl'
-    ),
-    'd3SetupClasses' => array(
-        ModuleSetup\InstallRoutine::class,
-    ),
+    )
 );