Tag version 2.1.1.3, make installable in OXID 6.5.3

Application/Controller/Admin/d3ActionWizard.php

@@ -40,6 +40,10 @@ class d3ActionWizard extends AdminDetailsController
         $this->configuration = oxNew(Configuration::class);
     }
 
+    public function getViewId()
+    {
+        return 'd3mxDataWizard_Action';
+    }
     public function getGroups(): array
     {
         return $this->configuration->getActionGroups();

Application/Controller/Admin/d3ExportWizard.php

@@ -45,6 +45,11 @@ class d3ExportWizard extends AdminDetailsController
         $this->configuration = oxNew(Configuration::class);
     }
 
+    public function getViewId()
+    {
+        return 'd3mxDataWizard_Export';
+    }
+
     public function getGroups(): array
     {
         return $this->configuration->getExportGroups();

Application/views/admin/tpl/inc/Wizards.tpl

@@ -6,6 +6,12 @@
 [{oxscript include="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"}]
 [{oxstyle include="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/solid.min.css"}]
 
+[{if $readonly}]
+    [{assign var="readonly" value="readonly disabled"}]
+[{else}]
+    [{assign var="readonly" value=""}]
+[{/if}]
+
 <style>
     button {
         margin: 1em 1em 1em 5em;
@@ -41,43 +47,45 @@
         }, 3000);
         document.getElementById('mask').className='on';
         document.getElementById('popup2').className='d3loader-2 on';
-        document.getElementById('taskid').value = id;
-        document.getElementById('format').value = format;
-        document.getElementById('myedit').submit();
+        form = document.getElementById('form_' + id);
+        form.format.value = format;
+        form.submit();
     }
 [{/strip}][{/capture}]
 [{oxscript add=$smarty.capture.d3script}]
 
-<form name="myedit" id="myedit" action="[{$oViewConf->getSelfLink()}]" method="post" style="padding: 0;margin: 0;height:0;">
-    [{$oViewConf->getHiddenSid()}]
-    <input type="hidden" name="cl" value="[{$oViewConf->getActiveClassName()}]">
-    <input type="hidden" name="fnc" value="runTask">
-    <input type="hidden" name="taskid" id="taskid" value="">
-    <input type="hidden" name="format" id="format" value="CSV">
+[{assign var="groups" value=$oView->getGroups()}]
+[{if $groups|@count}]
+    <div id="accordion">
+        [{foreach from=$oView->getGroups() item="group"}]
+            <div class="card mb-2">
+                <div class="card-header p-1" id="heading[{$group}]">
+                    <h4 class="mb-0">
+                        <span class="btn p-1" data-toggle="collapse" data-target="#collapse[{$group}]" aria-expanded="false" aria-controls="collapse[{$group}]">
+                            [{oxmultilang ident=$group}]
+                        </span>
+                    </h4>
+                </div>
+
+                <div id="collapse[{$group}]" class="collapse" aria-labelledby="heading[{$group}]" data-parent="#accordion">
+                    <div class="card-body pb-0">
+                        <div class="row">
+                            [{foreach from=$oView->getGroupTasks($group) key="id" item="item"}]
+                                <div class="col-sm-6 col-md-4 col-lg-3 pb-4">
+                                    <div class="card">
+                                        <h5 class="card-header">
+                                            [{$item->getTitle()}]
+                                        </h5>
+                                        <div class="card-body">
+
+                                            <form name="myedit" id="form_[{$id}]" action="[{$oViewConf->getSelfLink()}]" method="post">
+                                                [{$oViewConf->getHiddenSid()}]
+                                                <input type="hidden" name="cl" value="[{$oViewConf->getActiveClassName()}]">
+                                                <input type="hidden" name="fnc" value="runTask">
+                                                <input type="hidden" name="taskid" value="[{$id}]">
+                                                <input type="hidden" name="format" value="CSV">
 
-    [{assign var="groups" value=$oView->getGroups()}]
-    [{if $groups|@count}]
-        <div id="accordion">
-            [{foreach from=$oView->getGroups() item="group"}]
-                <div class="card mb-2">
-                    <div class="card-header p-1" id="heading[{$group}]">
-                        <h4 class="mb-0">
-                            <span class="btn p-1" data-toggle="collapse" data-target="#collapse[{$group}]" aria-expanded="false" aria-controls="collapse[{$group}]">
-                                [{oxmultilang ident=$group}]
-                            </span>
-                        </h4>
-                    </div>
 
-                    <div id="collapse[{$group}]" class="collapse" aria-labelledby="heading[{$group}]" data-parent="#accordion">
-                        <div class="card-body pb-0">
-                            <div class="row">
-                                [{foreach from=$oView->getGroupTasks($group) key="id" item="item"}]
-                                    <div class="col-sm-6 col-md-4 col-lg-3 pb-4">
-                                        <div class="card">
-                                            <h5 class="card-header">
-                                                [{$item->getTitle()}]
-                                            </h5>
-                                            <div class="card-body">
                                                 [{if $item->getDescription()}]
                                                     [{assign var="description" value=$item->getDescription()}]
                                                     [{assign var="sectionlength" value="100"}]
@@ -89,7 +97,7 @@
                                                         <p class="card-text" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample" style="cursor: pointer">
                                                             [{$shorttext}]...
                                                         </p>
-                                                        <p class="card-text collapse" id="collapseExample">
+                                                        <p class="card-text collapse" id="collapseExample_[{$id}]">
                                                             ...[{$description|replace:$shorttext:''}]
                                                         </p>
                                                     [{/if}]
@@ -104,25 +112,27 @@
                                                 [{block name="exportSubmit"}]
                                                     [{include file=$submit}]
                                                 [{/block}]
-                                            </div>
+
+                                            </form>
+
                                         </div>
                                     </div>
-                                [{/foreach}]
-                            </div>
-
-                            <div class="clear"></div>
+                                </div>
+                            [{/foreach}]
                         </div>
+
+                        <div class="clear"></div>
                     </div>
                 </div>
+            </div>
 
-            [{/foreach}]
-        </div>
-    [{else}]
-        <div class="alert alert-primary" role="alert">
-            [{oxmultilang ident=$d3dw_noitemmessageid}]
-        </div>
-    [{/if}]
-</form>
+        [{/foreach}]
+    </div>
+[{else}]
+    <div class="alert alert-primary" role="alert">
+        [{oxmultilang ident=$d3dw_noitemmessageid}]
+    </div>
+[{/if}]
 
 <div id="mask" class=""></div>
 <div id="popup2" class="d3loader-2">

Application/views/admin/tpl/inc/actionSubmit.tpl

@@ -1,6 +1,6 @@
 [{block name="submitElements"}]
-    <div class="btn-group">
-        <button type="button" class="btn btn-primary" onclick="if (confirm('[{oxmultilang ident="D3_DATAWIZARD_ACTION_SUBMIT_CONFIRM"}]') === true) {startTask('[{$id}]')}">
+    <div class="btn-group" [{$readonly}]>
+        <button type="button" class="btn btn-primary" onclick="if (confirm('[{oxmultilang ident="D3_DATAWIZARD_ACTION_SUBMIT_CONFIRM"}]') === true) {startTask('[{$id}]')}" [{$readonly}]>
             <i class="fas fa-fw fa-magic"></i>
             [{oxmultilang ident=$item->getButtonText()}]
         </button>

Application/views/admin/tpl/inc/exportSubmit.tpl

@@ -1,10 +1,10 @@
 [{block name="submitElements"}]
-    <div class="btn-group">
-        <button type="button" class="btn btn-primary" onclick="startTask('[{$id}]', 'CSV')">
+    <div class="btn-group" [{$readonly}]>
+        <button type="button" class="btn btn-primary" onclick="startTask('[{$id}]', 'CSV')" [{$readonly}]>
             <i class="fas fa-fw fa-magic"></i>
             [{oxmultilang ident=$item->getButtonText()}]
         </button>
-        <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" [{$readonly}]>
             <span class="sr-only">
                 <i class="fas fa-fw fa-magic"></i>
                 [{oxmultilang ident=$item->getButtonText()}]
@@ -14,7 +14,7 @@
             [{block name="dataWizardFormat"}]
                 [{assign var="rendererBridge" value=$item->getRendererBridge()}]
                 [{foreach from=$rendererBridge->getTranslatedRendererIdList() key="key" item="translationId"}]
-                    <button class="dropdown-item" onclick="startTask('[{$id}]', '[{$key}]')">
+                    <button class="dropdown-item" onclick="startTask('[{$id}]', '[{$key}]')" [{$readonly}]>
                         [{oxmultilang ident=$translationId}]
                     </button>
                 [{/foreach}]

CHANGELOG.md

@@ -4,7 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.0...rel_2.x)
+## [2.1.1.3](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.2...rel_2.x) - 2023-09-12
+### Added
+- apply roles and rights
+
+## [2.1.1.2](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.1...2.1.1.2) - 2023-03-30
+### Fixed
+- fix JavaScript for multiple forms
+
+## [2.1.1.1](https://git.d3data.de/D3Public/DataWizard/compare/2.1.1.0...2.1.1.1) - 2023-03-22
+### Fixed
+- wrong cascaded HTML elements
 
 ## [2.1.1.0](https://git.d3data.de/D3Public/DataWizard/compare/2.1.0.0...2.1.1.0) - 2022-12-24
 ### Added

composer.json

@@ -26,7 +26,7 @@
   ],
   "require": {
     "php": ">=7.3",
-    "oxid-esales/oxideshop-ce": "6.8 - 6.13",
+    "oxid-esales/oxideshop-ce": "6.8 - 6.14",
     "league/csv": "^9.0",
     "mathieuviossat/arraytotexttable": "^1.0",
     "form-manager/form-manager": "^6.1",

metadata.php

@@ -31,8 +31,8 @@ $aModule = [
         'de' => '',
         'en' => '',
     ],
-    'thumbnail'   => '',
-    'version'     => '2.1.1.0',
+    'thumbnail'   => 'logo.png',
+    'version'     => '2.1.1.3',
     'author'      => 'D³ Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',