Cleanup appstore and composer.json

classes/Modules/Appstore/www/css/appstore.css

@@ -555,10 +555,6 @@ body.module-appstore #page_container > div > div.ui-tabs-panel {
     background-color: #42b8c4;
 }
 
-#anfragepopup{
-    display: none;
-}
-
 a.dropdown-link.activated span.caret {
     background-image: url('../themes/new/images/caret_light.png');
 }

classes/Modules/Appstore/www/js/appstore.js → classes/Modules/Appstore/www/js/entry.js

@@ -1,3 +1,4 @@
+import '../css/appstore.css';
 $(document).ready(function () {
     $('body').addClass('module-appstore');
 
@@ -60,18 +61,6 @@ $(document).ready(function () {
         }
     }
 
-    // Testversion anfragen
-    $('.testversion').on('click', function (e) {
-        e.preventDefault();
-        var hash = $(this).data('hash');
-
-        if (typeof hash == 'undefined') {
-            var $modulediv = $(this).parents('div.module').first();
-            hash = typeof $modulediv[0].id != 'undefined' ? $modulediv[0].id : $modulediv.id;
-        }
-        getanfrage(hash);
-    });
-
     // Suchen beim Tippen im Suchfeld
     appstore.search.on('keyup', function () {
         appstore.activePhrase = $(this).val()
@@ -124,45 +113,6 @@ $(document).ready(function () {
         });
     });
 
-    $('#anfragepopup').dialog(
-        {
-            modal: true,
-            autoOpen: false,
-            minWidth: 940,
-            title: 'Testmodul anfragen',
-            buttons: {
-                'Testmodul anfragen': function () {
-                    if (!confirmAppTest(false)) {
-                        confirmAppTest(true);
-                    }
-                },
-                'Abbrechen': function () {
-                    $(this).dialog('close');
-                }
-            },
-            close: function (event, ui) {
-
-            }
-        }
-    );
-
-    $('#anfrageokpopup').dialog(
-        {
-            modal: true,
-            autoOpen: false,
-            minWidth: 940,
-            title: 'Testmodul anfragen',
-            buttons: {
-                OK: function () {
-                    $(this).dialog('close');
-                }
-            },
-            close: function (event, ui) {
-
-            }
-        }
-    );
-
     $('a.activate').on('click', function (e) {
         e.preventDefault();
         $.ajax({
@@ -235,45 +185,6 @@ $(document).ready(function () {
     });
 });
 
-function confirmAppTest(showError) {
-    var ok = false;
-    $.ajax({
-        url: 'index.php?module=appstore&action=list',
-        type: 'POST',
-        dataType: 'json',
-        async: false,
-        data: {modulbestaetigen: $('#anfragemd5').val(), testen: 1},
-        success: function (data) {
-            if (typeof data.html != 'undefined' && data.html != '') {
-                $('#anfragepopup').dialog('close');
-                $('#anfragemd5').val('');
-                $('#anfrageokpopup').dialog('open');
-                $('#anfrageoknachricht').html(data.html);
-                ok = true;
-            } else {
-                if (showError) {
-                    $('#anfragepopup').dialog('close');
-                    $('#anfragemd5').val('');
-                    $('#anfrageokpopup').dialog('open');
-                    $('#anfrageoknachricht').html(
-                        '<div class="error">Es ist ein Fehler bei der Anfrage aufgetreten.</div>'
-                    );
-                }
-            }
-        },
-        beforeSend: function () {
-
-        }
-    });
-
-    return ok;
-}
-
-function getanfrage(anfragemd5) {
-    $('#anfragemd5').val(anfragemd5);
-    $('#anfragepopup').dialog('open');
-}
-
 /**
  *
  * @param {String} phrase

phpwf/class.player.php

@@ -227,7 +227,7 @@ public function Run($sessionObj)
 
     $moduleClassName = strtoupper($module[0]) . substr($module, 1);
     $this->app->ModuleScriptCache->IncludeModule($moduleClassName);
-    $this->app->ModuleScriptCache->IncludeJavascriptModules('_theme_', ['www/themes/new/js/main.js']);
+    $this->app->ModuleScriptCache->IncludeJavascriptModules(['www/themes/new/js/entry.js']);
     $this->app->Tpl->Add('MODULESTYLESHEET', $this->app->ModuleScriptCache->GetStylesheetHtmlTags());
     $this->app->Tpl->Add('MODULEJAVASCRIPTHEAD', $this->app->ModuleScriptCache->GetJavascriptHtmlTags('head'));
     $this->app->Tpl->Add('MODULEJAVASCRIPTBODY', $this->app->ModuleScriptCache->GetJavascriptHtmlTags('body'));

phpwf/plugins/class.modulescriptcache.php

@@ -106,7 +106,7 @@ public function IncludeModule($legacyModuleClassName)
 
     $this->IncludeJavascriptFiles($newModuleName, $javascript);
     $this->IncludeStylesheetFiles($newModuleName, $stylesheet);
-    $this->IncludeJavascriptModules($newModuleName, $jsmodules);
+    $this->IncludeJavascriptModules($jsmodules);
   }
 
   /**
@@ -215,7 +215,7 @@ protected function IncludeJavascriptBodyFiles($cacheName, array $files)
     }
   }
 
-  public function IncludeJavascriptModules(string $moduleName, array $files) : void
+  public function IncludeJavascriptModules(array $files) : void
   {
     foreach ($files as $file) {
       $realPath = realpath($this->baseDir . '/' . $file);

vendor/composer/autoload_classmap.php

@@ -2727,6 +2727,7 @@
     'Xentral\\Modules\\Api\\Controller\\Version1\\DocumentScannerController' => $baseDir . '/classes/Modules/Api/Controller/Version1/DocumentScannerController.php',
     'Xentral\\Modules\\Api\\Controller\\Version1\\FileController' => $baseDir . '/classes/Modules/Api/Controller/Version1/FileController.php',
     'Xentral\\Modules\\Api\\Controller\\Version1\\GenericController' => $baseDir . '/classes/Modules/Api/Controller/Version1/GenericController.php',
+    'Xentral\\Modules\\Api\\Controller\\Version1\\ImportCSVController' => $baseDir . '/classes/Modules/Api/Controller/Version1/ImportCSVController.php',
     'Xentral\\Modules\\Api\\Controller\\Version1\\ReportsController' => $baseDir . '/classes/Modules/Api/Controller/Version1/ReportsController.php',
     'Xentral\\Modules\\Api\\Controller\\Version1\\StartController' => $baseDir . '/classes/Modules/Api/Controller/Version1/StartController.php',
     'Xentral\\Modules\\Api\\Controller\\Version1\\TrackingNumberController' => $baseDir . '/classes/Modules/Api/Controller/Version1/TrackingNumberController.php',

vendor/composer/autoload_static.php

@@ -3029,6 +3029,7 @@ class ComposerStaticInit0c49a81c1214ef2f7493c6ce921b17ee
         'Xentral\\Modules\\Api\\Controller\\Version1\\DocumentScannerController' => __DIR__ . '/../..' . '/classes/Modules/Api/Controller/Version1/DocumentScannerController.php',
         'Xentral\\Modules\\Api\\Controller\\Version1\\FileController' => __DIR__ . '/../..' . '/classes/Modules/Api/Controller/Version1/FileController.php',
         'Xentral\\Modules\\Api\\Controller\\Version1\\GenericController' => __DIR__ . '/../..' . '/classes/Modules/Api/Controller/Version1/GenericController.php',
+        'Xentral\\Modules\\Api\\Controller\\Version1\\ImportCSVController' => __DIR__ . '/../..' . '/classes/Modules/Api/Controller/Version1/ImportCSVController.php',
         'Xentral\\Modules\\Api\\Controller\\Version1\\ReportsController' => __DIR__ . '/../..' . '/classes/Modules/Api/Controller/Version1/ReportsController.php',
         'Xentral\\Modules\\Api\\Controller\\Version1\\StartController' => __DIR__ . '/../..' . '/classes/Modules/Api/Controller/Version1/StartController.php',
         'Xentral\\Modules\\Api\\Controller\\Version1\\TrackingNumberController' => __DIR__ . '/../..' . '/classes/Modules/Api/Controller/Version1/TrackingNumberController.php',

www/dist/.vite/manifest.json

@@ -13,9 +13,9 @@
       "_vue-9Z3BxQCl.js"
     ]
   },
-  "_vue-!~{005}~.js": {
+  "_vue-!~{006}~.js": {
     "file": "assets/vue-CMXOvwpj.css",
-    "src": "_vue-!~{005}~.js"
+    "src": "_vue-!~{006}~.js"
   },
   "_vue-9Z3BxQCl.js": {
     "file": "vue-9Z3BxQCl.js",
@@ -31,6 +31,15 @@
       "assets/primeicons-Dr5RGzOO.svg"
     ]
   },
+  "classes/Modules/Appstore/www/js/entry.js": {
+    "file": "modules/Appstore-7MmwZc_b.js",
+    "name": "modules/Appstore",
+    "src": "classes/Modules/Appstore/www/js/entry.js",
+    "isEntry": true,
+    "css": [
+      "assets/Appstore-DQlBPe5p.css"
+    ]
+  },
   "classes/Modules/CrossSelling/www/js/entry.js": {
     "file": "modules/CrossSelling-YhKr7DSR.js",
     "name": "modules/CrossSelling",