make installable in OXID 6.5.2

make installable in OXID 6.3.1
fix readme file encoding
2023-05-12 10:31:40 +02:00 · 2021-08-19 15:47:44 +02:00 · 2021-04-28 22:50:58 +02:00 · 2021-04-28 22:43:55 +02:00 · 2021-04-28 22:41:03 +02:00 · 2021-04-28 16:14:29 +02:00
32 changed files with 1326 additions and 868 deletions
--- a/.gitattributes
+++ b/.gitattributes
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,53 @@
+# Created by .ignore support plugin (hsz.mobi)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+cmake-build-release/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1,58 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+---
+
+## 3.0.0.1 (2021-04-28)
+### Changed
+- Modul verwendbar in OXID 6.3
+### Fixed
+- falsche prepared statement Kombination korrigiert
+
+---
+
+## 3.0.0.0 (2020-11-11)
+### Changed
+- Modul verwendbar in OXID 6.2, deprecated Code bestm<74>glich entfernt
+- Anzeige von Anfragemails entfernt, da dazugeh<65>riges Modul nicht weiter entwickelt wird
+
+---
+
+## 2.0.1.0 (2019-10-21)
+### Changed
+- Mails k<>nnen auch Dreingabeartikel regenerieren und darstellen
+- weitere Mailinformationen werden f<>r Mailumleitung ge<67>ndert
+### Fixed
+- verhindert Thankyou Redirect, wenn keine Order geladen wurde
+- Debugging von Mails mit Dreingabebestellungen l<>scht diese Discounts in der gesamten Bestellung
+
+---
+
+## 2.0.0.0 (2018-02-23)
+### Added
+- verf<72>gbar f<>r OXID 6
+- Installation via Composer
+
+---
+
+## 1.2.0.0 (2017-11-21)
+### Added
+- Mail-Anzeige fordert zus<75>tzlich Authentfikation mit einem Shopadmin-Konto
+- Seitenencoding definiert
+### Changed
+- Dokumentation erg<72>nzt
+
+---
+
+## 1.1.0.0 (2017-05-31)
+### Added
+- Mailversand <20>bers Shopframework wird blockiert oder
+- Mails werden an alternative Mailadresse umgeleitet
+
+---
+
+## 1.0.0.0 (2015-12-16)
+### Added
+- unterbindet das L<>schen des Warenkorbs nach Bestellabschluss
+- Thankyou ist ohne Bestellabschluss aufrufbar (unter Angabe der Bestellnummer auch f<>r eine bestimmte Bestellung)
+- Bestellbest<73>tigungsmails und (sofern D3-Modul installiert) Anfragebest<73>tigungsmails sind im Browser darstellbar (unter Angabe der Bestellnummer auch f<>r eine bestimmte Bestellung)
--- a/README.md
+++ b/README.md
@ -0,0 +1,52 @@
+# TPL Development Helper
+
+## Versionsübersicht:
+
+* 3.x - OXID 6.2 bis 6.3
+* 2.x - OXID 6.0 bis 6.1
+* 1.x - bis OXID 4.10 / 5.3
+
+## Installation
+
+    composer require d3/devhelper:"^3.0"
+
+## Features
+    
+### Entwicklungswerkzeug zur Kontrolle schwer zugänglicher Shopinhalte
+
+Diese Tool soll bei täglichen Entwicklungsaufgaben im OXID eShop helfen, die (systembedingt) vom Shopsystem erschwert werden.
+
+* Mailversand (übers Shopframework) übers Shopframework wird blockiert __oder__
+* Mails (übers Shopframework) werden an alternative Mailadresse umgeleitet
+    (Das Tool setzt direkt an der oxemail::_sendMail()-Methode an und kann damit __jeden__ Mailversand kontrollieren, der übers Framework läuft. Man muss nicht X verschiedene Module überwachen und hat auch Kontrolle über Mailerweiterungen, die keinen Stage-Einsatz vorsehen.)
+* unterbindet das Löschen des Warenkorbs nach Bestellabschluss
+* Thankyou-Seite ist auch ohne Bestellabschluss aufrufbar (unter Angabe der Bestellnummer auch für eine bestimmte Bestellung)
+* Bestellbestätigungsmails und sind im Browser darstellbar (unter Angabe der Bestellnummer auch für eine bestimmte Bestellung)
+
+## Sicherheitshinweis
+
+    Da hiermit gezielt Mails der Shopbestellungen angezeigt werden können, ist das Modul mit entsprechender Vorsicht zu verwenden. Die Hürden für die Anzeige der Mails sind daher absichtlich sehr hoch gesetzt. Vor der Verwendung sind Einstellungen zu ändern. Denken Sie unbedingt daran, diese Einstellungen im Anschluss wieder zurückzusetzen. Sonst sind Kunden- und Bestelldaten frei abrufbar. Wir übernehmen für daraus resultierenden Schäden keine Haftung.
+
+## Verwendung
+
+Um unser Tool verwenden zu können, folgen Sie bitte diesen Schritten:
+
+1. Produktivmodus entfernen
+
+   ![Adminbereich -> Stammdaten -> Grundeinstellungen -> Haken bei Produktivmodus entfernen](docs/step1.jpg "Produktivmodus entfernen")
+
+2. Modul aktivieren
+
+   ![Adminbereich -> Erweiterungen -> Module -> TPL Development Tool -> Aktivieren](docs/step2.jpg "Modul aktivieren")
+   
+3. In den Einstellungen die gewünschten Funktionen freischalten
+
+   ![Adminbereich -> Erweiterungen -> Module -> TPL Development Tool -> Einstell.](docs/step3.jpg "gewünschte Funktionen freischalten")
+   
+4. Über die Links im Tab "Stamm" können Sie die betreffenden Seiten aufrufen. Vor der Darstellung wird ein Benutzername und Passwort abgefragt. Hierfür verwenden Sie die Anmeldedaten des Adminbereichs Ihres Shops.
+
+5. An den E-Mail- und Thankyou-Links gibt es einen leeren Parameter, den Sie bei Bedarf mit einer Bestellnummer füllen können. Dann wird statt der letzten Bestellung ganz gezielt eine andere Bestellung zur Darstellung verwendet.
+
+6. Beachten Sie unbedingt, dass Sie nach der Verwendung unbedingt das Modul wieder deaktivieren und den Produktivmodus wieder anschalten.
+
+Berücksichtigen Sie bei der Darstellung der E-Mails bitte, dass die Mailprogramme diese möglicherweise anders darstellen, als der Browser dies tut. Daher kann die Darstellung im Browser nur ein Anhaltspunkt sein.
--- a/composer.json
+++ b/composer.json
@ -0,0 +1,43 @@
+{
+  "name": "d3/devhelper",
+  "description": "Manipulate shop standard processes for easier development",
+  "type": "oxideshop-module",
+  "keywords": [
+    "oxid",
+    "modules",
+    "eShop",
+    "d3",
+    "devhelper",
+    "developer",
+    "development",
+    "tools",
+    "template",
+    "e-mail",
+    "thankyou"
+  ],
+  "authors": [
+    {
+        "name": "D3 Data Development (Inh. Thomas Dartsch)",
+        "email": "info@shopmodule.com",
+        "homepage": "https://www.d3data.de"
+    }
+  ],
+  "homepage": "https://www.oxidmodule.com/",
+  "license": [
+    "GPL-3.0-or-later"
+  ],
+  "extra": {
+    "oxideshop": {
+      "source-directory": "/src",
+      "target-directory": "d3/devhelper"
+    }
+  },
+  "require": {
+    "oxid-esales/oxideshop-ce": "6.5 - 6.14"
+  },
+  "autoload": {
+    "psr-4": {
+      "D3\\Devhelper\\": "../../../source/modules/d3/devhelper"
+    }
+  }
+}
--- a/copy_this/modules/d3/d3dev/IntelliSenseHelper.php
+++ b/copy_this/modules/d3/d3dev/IntelliSenseHelper.php
@ -1,52 +0,0 @@
-<?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.
- *
- * http://www.shopmodule.com
- *
- * @copyright <20> D<> Data Development, Thomas Dartsch
- * @author    D<> Data Development - Daniel Seifert <ds@shopmodule.com>
- * @link      http://www.oxidmodule.com
- */
-
-class d3_dev_thankyou_parent extends thankyou {}
-
-/**
- * Class d3_dev_oxorder_parent
- */
-class d3_dev_oxorder_parent extends oxorder {}
-
-/**
- * Class d3_dev_d3inquiry_parent
- */
-class d3_dev_d3inquiry_parent extends d3inquiry {}
-
-/**
- * Class d3_dev_oxorderarticle
- */
-class d3_dev_oxorderarticle_parent extends oxOrderArticle {}
-
-/**
- * Class d3_dev_oxemail_parent
- */
-class d3_dev_oxemail_parent extends oxemail {}
-
-/**
- * Class d3_dev_order_parent
- */
-class d3_dev_order_parent extends order {}
-
-/**
- * Class d3_dev_oxbasket_parent
- */
-class d3_dev_oxbasket_parent extends oxbasket {}
-
-/**
- * Class d3_dev_oxbasketitem_parent
- */
-class d3_dev_oxbasketitem_parent extends oxBasketItem {}
--- a/copy_this/modules/d3/d3dev/controllers/d3dev.php
+++ b/copy_this/modules/d3/d3dev/controllers/d3dev.php
@ -1,58 +0,0 @@
-<?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.
- *
- * http://www.shopmodule.com
- *
- * @copyright <20> D<> Data Development, Thomas Dartsch
- * @author    D<> Data Development - Daniel Seifert <ds@shopmodule.com>
- * @link      http://www.oxidmodule.com
- */
-
-class d3dev extends oxUBase
-{
-    public function showOrderMailContent()
-    {
-        if (oxRegistry::getConfig()->getActiveShop()->oxshops__oxproductive->value
-            || false == oxRegistry::getConfig()->getConfigParam('blD3DevShowOrderMailsInBrowser')
-        ) {
-            oxRegistry::getUtils()->redirect(oxRegistry::getConfig()->getShopUrl().'index.php?cl=start');
-        }
-
-        $sTpl = oxRegistry::getConfig()->getRequestParameter('type');
-
-        /** @var d3_dev_thankyou $oThankyou */
-        $oThankyou = oxNew('thankyou');
-        $oOrder = $oThankyou->d3GetLastOrder();
-
-        /** @var d3_dev_oxemail $oEmail */
-        $oEmail = oxNew('oxemail');
-        echo $oEmail->d3GetOrderMailContent($oOrder, $sTpl);
-        die();
-    }
-
-    public function showInquiryMailContent()
-    {
-        if (oxRegistry::getConfig()->getActiveShop()->oxshops__oxproductive->value
-            || false == oxRegistry::getConfig()->getConfigParam('blD3DevShowOrderMailsInBrowser')
-        ) {
-            oxRegistry::getUtils()->redirect(oxRegistry::getConfig()->getShopUrl().'index.php?cl=start');
-        }
-
-        $sTpl = oxRegistry::getConfig()->getRequestParameter('type');
-
-        /** @var d3_dev_thankyou $oThankyou */
-        $oThankyou = oxNew('thankyou');
-        $oOrder = $oThankyou->d3GetLastInquiry();
-
-        /** @var d3_dev_oxemail $oEmail */
-        $oEmail = oxNew('oxemail');
-        echo $oEmail->d3GetInquiryMailContent($oOrder, $sTpl);
-        die();
-    }
-}
--- a/copy_this/modules/d3/d3dev/metadata.php
+++ b/copy_this/modules/d3/d3dev/metadata.php
@ -1,92 +0,0 @@
-<?php
-/**
- * Metadata version
- */
-$sMetadataVersion = '1.1';
-
-$sStyle = class_exists('d3dev') ? "background-color: darkred; color: white; padding: 0 10px;" : "";
-
-/**
- * Module information
- */
-$aModule = array(
-    'id'           => 'd3dev',
-    'title'        =>
-        (class_exists('d3utils') ? d3utils::getInstance()->getD3Logo() : 'D&sup3;') .
-        ' <span style="'.$sStyle.'">TPL Development Tool</span>',
-    'description'  => array(
-        'de'    => '<script type="text/javascript"><!--
-                    function showNote() {
-                        var _oElem = document.getElementById("secnote");
-                        if (_oElem.style.display == "block") {
-                            _oElem.style.display = "none";
-                        } else {
-                            _oElem.style.display = "block";
-                        }
-                    }
-                    --></script>
-                    <p style="background-color: darkred; padding: 5px;"><a href="#" style="text-decoration: underline; color: white;" onclick="showNote(); return false;"><b>Sicherheitshinweis</b></a></p>
-                    <p style="display: none; background-color: darkred; color: white; padding: 5px;" id="secnote">Diese Shoperweiterung stellt Entwicklungshilfen zur Verf&uuml;gung, die im Livebetrieb sicherheitskritisch sein k&ouml;nnen. Es k&ouml;nnen Kunden- und Bestelldaten ausgelesen und auch Shopfunktionen manipuliert werden. Aktivieren Sie diese Erweiterung daher nur in einem Umfeld, in dem Sie Missbrauch ausschlie&szligen k&ouml;nnen. F&uuml;r entstandene Sch&auml;den lehnen wir jede Haftung ab.</p>
-                    <ul><li>unterbindet L&ouml;schen des WKs nach Bestellabschluss</li>'.
-            '<li><a style="text-decoration: underline;" href="'.oxRegistry::getConfig()->getCurrentShopUrl(false).'index.php?cl=thankyou&d3dev=1&d3ordernr=" target="_new">Thankyou ist ohne Bestellung aufrufbar</a></li>'.
-            '<li>Mail-Templates k&ouml;nnen im Browser ausgegeben werden'.
-                '<ul>'.
-                '<li><a style="text-decoration: underline;" href="'.oxRegistry::getConfig()->getCurrentShopUrl(false).'index.php?cl=d3dev&fnc=showOrderMailContent&type=owner_html&d3ordernr=" target="_new">Order Owner HTML</a></li>'.
-                '<li><a style="text-decoration: underline;" href="'.oxRegistry::getConfig()->getCurrentShopUrl(false).'index.php?cl=d3dev&fnc=showOrderMailContent&type=owner_plain&d3ordernr=" target="_new">Order Owner Plain</a></li>'.
-                '<li><a style="text-decoration: underline;" href="'.oxRegistry::getConfig()->getCurrentShopUrl(false).'index.php?cl=d3dev&fnc=showOrderMailContent&type=user_html&d3ordernr=" target="_new">Order User HTML</a></li>'.
-                '<li><a style="text-decoration: underline;" href="'.oxRegistry::getConfig()->getCurrentShopUrl(false).'index.php?cl=d3dev&fnc=showOrderMailContent&type=user_plain&d3ordernr=" target="_new">Order User Plain</a></li>'.
-                '<li><a style="text-decoration: underline;" href="'.oxRegistry::getConfig()->getCurrentShopUrl(false).'index.php?cl=d3dev&fnc=showInquiryMailContent&type=owner_html&d3inquirynr=" target="_new">Inquiry Owner HTML</a></li>'.
-                '<li><a style="text-decoration: underline;" href="'.oxRegistry::getConfig()->getCurrentShopUrl(false).'index.php?cl=d3dev&fnc=showInquiryMailContent&type=owner_plain&d3inquirynr=" target="_new">Inquiry Owner Plain</a></li>'.
-                '<li><a style="text-decoration: underline;" href="'.oxRegistry::getConfig()->getCurrentShopUrl(false).'index.php?cl=d3dev&fnc=showInquiryMailContent&type=user_html&d3inquirynr=" target="_new">Inquiry User HTML</a></li>'.
-                '<li><a style="text-decoration: underline;" href="'.oxRegistry::getConfig()->getCurrentShopUrl(false).'index.php?cl=d3dev&fnc=showInquiryMailContent&type=user_plain&d3inquirynr=" target="_new">Inquiry User Plain</a></li></ul>'.
-            '</li></ul>Jede dieser Optionen muss aus Sicherheitsgr&uuml;nden unter "Einstell." aktiviert werden. Weiterhin darf der Shop nicht im Produktivmodus betrieben werden.',
-        'en'    => ''),
-    // 'thumbnail'    => 'picture.png',
-    'version'      => '0.1',
-    'author'       => 'D&sup3; Data Development (Inh.: Thomas Dartsch)',
-    'email'        => 'support@shopmodule.com',
-    'url'          => 'http://www.oxidmodule.com/',
-    'extend'      => array(
-        'thankyou'  => 'd3/d3dev/modules/controllers/d3_dev_thankyou',
-        'oxorder'   => 'd3/d3dev/modules/models/d3_dev_oxorder',
-        'oxorderarticle'   => 'd3/d3dev/modules/models/d3_dev_oxorderarticle',
-        'oxemail'   => 'd3/d3dev/modules/models/d3_dev_oxemail',
-        'oxbasket'  => 'd3/d3dev/modules/models/d3_dev_oxbasket',
-        'oxbasketitem'  => 'd3/d3dev/modules/models/d3_dev_oxbasketitem',
-    ),
-    'files'       => array(
-        'd3dev'     => 'd3/d3dev/controllers/d3dev.php',
-    ),
-    'templates'   => array(
-    ),
-    'events'      => array(
-    ),
-    'blocks'      => array(
-    ),
-    'settings'    => array(
-        array(
-            'group' => 'd3dev_order',
-            'name' => 'blD3DevAvoidDelBasket',
-            'type' => 'bool',
-            'value' => 'false'
-        ),
-        array(
-            'group' => 'd3dev_order',
-            'name' => 'blD3DevShowThankyou',
-            'type' => 'bool',
-            'value' => 'false'
-        ),
-        array(
-            'group' => 'd3dev_mail',
-            'name' => 'blD3DevShowOrderMailsInBrowser',
-            'type' => 'bool',
-            'value' => 'false'
-        ),
-    ),
-);
-
-
-if (class_exists('d3inquiry')) {
-    $aModule['extend']['d3inquiry']  = 'd3/d3dev/modules/models/d3_dev_d3inquiry';
-    $aModule['extend']['d3inquiryarticle']  = 'd3/d3dev/modules/models/d3_dev_d3inquiryarticle';
-}
--- a/copy_this/modules/d3/d3dev/modules/controllers/d3_dev_thankyou.php
+++ b/copy_this/modules/d3/d3dev/modules/controllers/d3_dev_thankyou.php
@ -1,71 +0,0 @@
-<?php
-
-// .../?cl=thankyou[&d3orderid=23]
-
- /**
- * 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.
- *
- * http://www.shopmodule.com
- *
- * @copyright <20> D<> Data Development, Thomas Dartsch
- * @author    D<> Data Development - Daniel Seifert <ds@shopmodule.com>
- * @link      http://www.oxidmodule.com
- */
-
-class d3_dev_thankyou extends d3_dev_thankyou_parent
-{
-    public function init()
-    {
-        $sSessChallenge = oxRegistry::getSession()->getVariable('sess_challenge');
-
-        parent::init();
-
-        oxRegistry::getSession()->setVariable('sess_challenge', $sSessChallenge);
-
-        if (oxRegistry::getConfig()->getRequestParameter('d3dev')
-            && false == (bool) oxRegistry::getConfig()->getActiveShop()->oxshops__oxproductive->value
-            && oxRegistry::getConfig()->getConfigParam('blD3DevShowThankyou')
-        ) {
-            $oOrder = $this->d3GetLastOrder();
-            $oBasket = $oOrder->d3DevGetOrderBasket();
-            $this->_oBasket = $oBasket;
-        }
-    }
-
-    /**
-     * @return d3_dev_oxorder
-     */
-    public function d3GetLastOrder()
-    {
-        if (oxRegistry::getConfig()->getActiveShop()->oxshops__oxproductive->value) {
-            return false;
-        }
-
-        /** @var d3_dev_oxorder $oOrder */
-        $oOrder = oxNew('oxorder');
-        $oOrder->d3getLastOrder();
-
-        return $oOrder;
-    }
-
-    /**
-     * @return d3_dev_d3inquiry
-     */
-    public function d3GetLastInquiry()
-    {
-        if (oxRegistry::getConfig()->getActiveShop()->oxshops__oxproductive->value) {
-            return false;
-        }
-
-        /** @var d3_dev_d3inquiry $oInquiry */
-        $oInquiry = oxNew('d3inquiry');
-        $oInquiry->d3getLastInquiry();
-
-        return $oInquiry;
-    }
-}
--- a/copy_this/modules/d3/d3dev/modules/models/d3_dev_d3inquiry.php
+++ b/copy_this/modules/d3/d3dev/modules/models/d3_dev_d3inquiry.php
@ -1,154 +0,0 @@
-<?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.
- *
- * http://www.shopmodule.com
- *
- * @copyright <20> D<> Data Development, Thomas Dartsch
- * @author    D<> Data Development - Daniel Seifert <ds@shopmodule.com>
- * @link      http://www.oxidmodule.com
- */
-
-class d3_dev_d3inquiry extends d3_dev_d3inquiry_parent
-{
-    protected $_oOrderBasket = null;
-
-    /**
-     * @return d3_dev_oxbasket
-     */
-    public function d3DevGetOrderBasket()
-    {
-        /** @var oxbasket $oBasket */
-        $oBasket = $this->_getInquiryBasket();
-
-        // unsetting bundles
-        $oOrderArticles = $this->getInquiryArticles();
-        foreach ($oOrderArticles as $sItemId => $oItem) {
-            if ($oItem->isBundle()) {
-                $oOrderArticles->offsetUnset($sItemId);
-            }
-        }
-
-        // add this order articles to basket and recalculate basket
-        $oBasket = $this->_addInquiryArticlesToBasket($this->getInquiryUser(), $oOrderArticles);
-        // recalculating basket
-        $oBasket->calculateBasket(true);
-        $oBasket->d3ClearBasketItemArticles();
-
-        return $oBasket;
-    }
-
-    /**
-     * @return string
-     */
-    public function d3getLastInquiryId()
-    {
-        if (oxRegistry::getConfig()->getRequestParameter('d3inquirynr')) {
-            $sWhere = ' oxinquirynr = ' . (int) oxRegistry::getConfig()->getRequestParameter('d3inquirynr');
-        } else {
-            $sWhere = 1;
-        }
-
-        $sSelect = "SELECT oxid FROM ".getViewName('d3inquiry')." WHERE ".$sWhere." ORDER BY oxinquirydate DESC LIMIT 1";
-
-        return oxDb::getDb(oxDb::FETCH_MODE_ASSOC)->getOne($sSelect);
-    }
-
-    public function d3getLastInquiry()
-    {
-        $this->load($this->d3getLastInquiryId());
-        //$this->_d3AddVouchers();
-    }
-
-    /**
-     * @return oxBasket
-     */
-    public function getBasket()
-    {
-        $oBasket = parent::getBasket();
-
-        if (false == $oBasket && oxRegistry::getConfig()->getActiveView()->getClassName() == 'd3dev') {
-            $oBasket = $this->d3DevGetOrderBasket();
-        }
-
-        return $oBasket;
-    }
-    
-    protected function _d3AddVouchers()
-    {
-        $sSelect = "SELECT oxid FROM oxvouchers WHERE oxorderid = ".oxDb::getDb(oxDb::FETCH_MODE_ASSOC)->quote($this->getId()).";";
-        
-        $aResult = oxDb::getDb(oxDb::FETCH_MODE_ASSOC)->getArray($sSelect);
-
-        foreach ($aResult as $aFields) {
-            $oVoucher = oxNew('oxvoucher');
-            $oVoucher->load($aFields['oxid']);
-            $this->_aVoucherList[$oVoucher->getId()] = $oVoucher;
-        }
-    }
-
-    /**
-     * Returns basket object filled up with discount, delivery, wrapping and all other info
-     *
-     * @param bool $blStockCheck perform stock check or not (default true)
-     *
-     * @return oxBasket
-     */
-    protected function _getInquiryBasket($blStockCheck = true)
-    {
-        $this->_oOrderBasket = oxNew("oxBasket");
-        $this->_oOrderBasket->enableSaveToDataBase(false);
-
-        //setting recalculation mode
-        $this->_oOrderBasket->setCalculationModeNetto($this->isNettoMode());
-
-        // setting stock check mode
-        $this->_oOrderBasket->setStockCheckMode($blStockCheck);
-
-        // setting virtual basket user
-        $this->_oOrderBasket->setBasketUser($this->getInquiryUser());
-
-        // transferring order id
-        $this->_oOrderBasket->setInquiryId($this->getId());
-
-        // setting basket currency order uses
-        $aCurrencies = $this->getConfig()->getCurrencyArray();
-        foreach ($aCurrencies as $oCur) {
-            if ($oCur->name == $this->oxorder__oxcurrency->value) {
-                $oBasketCur = $oCur;
-                break;
-            }
-        }
-
-        // setting currency
-        $this->_oOrderBasket->setBasketCurrency($oBasketCur);
-
-        // set basket card id and message
-        $this->_oOrderBasket->setCardId($this->oxorder__oxcardid->value);
-        $this->_oOrderBasket->setCardMessage($this->oxorder__oxcardtext->value);
-
-        if ($this->_blReloadDiscount) {
-            $oDb = oxDb::getDb(oxDb::FETCH_MODE_ASSOC);
-            // disabling availability check
-            $this->_oOrderBasket->setSkipVouchersChecking(true);
-
-            // add previously used vouchers
-            $sQ = 'select oxid from oxvouchers where oxorderid = ' . $oDb->quote($this->getId());
-            $aVouchers = $oDb->getAll($sQ);
-            foreach ($aVouchers as $aVoucher) {
-                $this->_oOrderBasket->addVoucher($aVoucher['oxid']);
-            }
-        } else {
-            $this->_oOrderBasket->setDiscountCalcMode(false);
-            $this->_oOrderBasket->setVoucherDiscount($this->oxorder__oxvoucherdiscount->value);
-            $this->_oOrderBasket->setTotalDiscount($this->oxorder__oxdiscount->value);
-        }
-
-        return $this->_oOrderBasket;
-    }
-}
--- a/copy_this/modules/d3/d3dev/modules/models/d3_dev_d3inquiryarticle.php
+++ b/copy_this/modules/d3/d3dev/modules/models/d3_dev_d3inquiryarticle.php
@ -1,38 +0,0 @@
-<?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.
- *
- * http://www.shopmodule.com
- *
- * @copyright <20> D<> Data Development, Thomas Dartsch
- * @author    D<> Data Development - Daniel Seifert <ds@shopmodule.com>
- * @link      http://www.oxidmodule.com
- */
-
-class d3_dev_d3inquiryarticle extends d3_dev_d3inquiryarticle_parent
-{
-    /**
-     * @return array
-     */
-    public function getCustomerAlsoBoughtThisProducts()
-    {
-        $oArticle = $this->getArticle();
-
-        return $oArticle->getCustomerAlsoBoughtThisProducts();
-    }
-
-    /**
-     * Returns true if ordered product is bundle
-     *
-     * @return bool
-     */
-    public function isBundle()
-    {
-        return ( bool ) $this->d3inquiryarticles__oxisbundle->value;
-    }
-}
--- a/copy_this/modules/d3/d3dev/modules/models/d3_dev_oxbasket.php
+++ b/copy_this/modules/d3/d3dev/modules/models/d3_dev_oxbasket.php
@ -1,59 +0,0 @@
-<?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.
- *
- * http://www.shopmodule.com
- *
- * @copyright <20> D<> Data Development, Thomas Dartsch
- * @author    D<> Data Development - Daniel Seifert <ds@shopmodule.com>
- * @link      http://www.oxidmodule.com
- */
-
-class d3_dev_oxbasket extends d3_dev_oxbasket_parent
-{
-    public function deleteBasket()
-    {
-        if (oxRegistry::getConfig()->getActiveShop()->oxshops__oxproductive->value
-            || false == oxRegistry::getConfig()->getConfigParam('blD3DevAvoidDelBasket')
-        ) {
-            parent::deleteBasket();
-        }
-
-        // else do nothing;
-    }
-
-    public function d3ClearBasketItemArticles()
-    {
-        /** @var d3_dev_oxbasketitem $oBasketItem */
-        foreach ($this->_aBasketContents as $oBasketItem) {
-            $oBasketItem->d3ClearArticle();
-        }
-    }
-
-    /**
-     * Calculates total basket discount value.
-     */
-    protected function _calcBasketTotalDiscount()
-    {
-        if ($this->_oTotalDiscount === null || (!$this->isAdmin())) {
-            $this->_oTotalDiscount = $this->_getPriceObject();
-
-            if (is_array($this->_aDiscounts)) {
-                foreach ($this->_aDiscounts as $oDiscount) {
-                    // skipping bundle discounts
-                    if ($oDiscount->sType == 'itm') {
-                        continue;
-                    }
-
-                    // add discount value to total basket discount
-                    $this->_oTotalDiscount->add($oDiscount->dDiscount);
-                }
-            }
-        }
-    }
-}
--- a/copy_this/modules/d3/d3dev/modules/models/d3_dev_oxbasketitem.php
+++ b/copy_this/modules/d3/d3dev/modules/models/d3_dev_oxbasketitem.php
@ -1,23 +0,0 @@
-<?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.
- *
- * http://www.shopmodule.com
- *
- * @copyright <20> D<> Data Development, Thomas Dartsch
- * @author    D<> Data Development - Daniel Seifert <ds@shopmodule.com>
- * @link      http://www.oxidmodule.com
- */
-
-class d3_dev_oxbasketitem extends d3_dev_oxbasketitem_parent
-{
-    public function d3ClearArticle()
-    {
-        $this->_oArticle = null;
-    }
-}
--- a/copy_this/modules/d3/d3dev/modules/models/d3_dev_oxemail.php
+++ b/copy_this/modules/d3/d3dev/modules/models/d3_dev_oxemail.php
@ -1,146 +0,0 @@
-<?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.
- *
- * http://www.shopmodule.com
- *
- * @copyright <20> D<> Data Development, Thomas Dartsch
- * @author    D<> Data Development - Daniel Seifert <ds@shopmodule.com>
- * @link      http://www.oxidmodule.com
- */
-
-class d3_dev_oxemail extends d3_dev_oxemail_parent
-{
-    /**
-     * @param d3_dev_oxorder $oOrder
-     *
-     * @return mixed|string
-     */
-    public function d3GetOrderMailContent($oOrder, $sType)
-    {
-        if (oxRegistry::getConfig()->getActiveShop()->oxshops__oxproductive->value) {
-            return '';
-        }
-
-        switch (strtolower($sType)) {
-            case 'owner_html':
-                $sTpl = $this->_sOrderOwnerTemplate;
-                break;
-            case 'owner_plain':
-                $sTpl = $this->_sOrderOwnerPlainTemplate;
-                break;
-            case 'user_plain':
-                $sTpl = $this->_sOrderUserPlainTemplate;
-                break;
-            case 'user_html':
-            default:
-                $sTpl = $this->_sOrderUserTemplate;
-        }
-
-        $myConfig = $this->getConfig();
-
-        $oShop = $this->_getShop();
-
-        // cleanup
-        $this->_clearMailer();
-
-        // add user defined stuff if there is any
-        $oOrder = $this->_addUserInfoOrderEMail($oOrder);
-
-        $oUser = $oOrder->getOrderUser();
-        $this->setUser($oUser);
-
-        // send confirmation to shop owner
-        // send not pretending from order user, as different email domain rise spam filters
-        $this->setFrom($oShop->oxshops__oxowneremail->value);
-
-        $oLang = oxRegistry::getLang();
-        $iOrderLang = $oLang->getObjectTplLanguage();
-
-        // if running shop language is different from admin lang. set in config
-        // we have to load shop in config language
-        if ($oShop->getLanguage() != $iOrderLang) {
-            $oShop = $this->_getShop($iOrderLang);
-        }
-
-        $this->setSmtp($oShop);
-
-        // create messages
-        $oSmarty = $this->_getSmarty();
-        $this->setViewData("order", $oOrder);
-
-        // Process view data array through oxoutput processor
-        $this->_processViewArray();
-
-        return $oSmarty->fetch($myConfig->getTemplatePath($sTpl, false));
-    }
-
-    /**
-     * @param d3_dev_d3inquiry $oInquiry
-     *
-     * @return mixed|string
-     */
-    public function d3GetInquiryMailContent($oInquiry, $sType)
-    {
-        if (oxRegistry::getConfig()->getActiveShop()->oxshops__oxproductive->value) {
-            return '';
-        }
-
-        switch (strtolower($sType)) {
-            case 'owner_html':
-                $sTpl = $this->_sInquiryOwnerTemplate;
-                break;
-            case 'owner_plain':
-                $sTpl = $this->_sInquiryOwnerPlainTemplate;
-                break;
-            case 'user_plain':
-                $sTpl = $this->_sInquiryUserPlainTemplate;
-                break;
-            case 'user_html':
-            default:
-                $sTpl = $this->_sInquiryUserTemplate;
-        }
-
-        $myConfig = $this->getConfig();
-
-        $oShop = $this->_getShop();
-
-        // cleanup
-        $this->_clearMailer();
-
-        // add user defined stuff if there is any
-        $oInquiry = $this->_addUserInfoOrderEMail($oInquiry);
-
-        $oUser = $oInquiry->getInquiryUser();
-        $this->setUser($oUser);
-
-        // send confirmation to shop owner
-        // send not pretending from order user, as different email domain rise spam filters
-        $this->setFrom($oShop->oxshops__oxowneremail->value);
-
-        $oLang = oxRegistry::getLang();
-        $iOrderLang = $oLang->getObjectTplLanguage();
-
-        // if running shop language is different from admin lang. set in config
-        // we have to load shop in config language
-        if ($oShop->getLanguage() != $iOrderLang) {
-            $oShop = $this->_getShop($iOrderLang);
-        }
-
-        $this->setSmtp($oShop);
-
-        // create messages
-        $oSmarty = $this->_getSmarty();
-        $this->setViewData("inquiry", $oInquiry);
-
-        // Process view data array through oxoutput processor
-        $this->_processViewArray();
-
-        return $oSmarty->fetch($myConfig->getTemplatePath($sTpl, false));
-    }
-}
--- a/copy_this/modules/d3/d3dev/modules/models/d3_dev_oxorder.php
+++ b/copy_this/modules/d3/d3dev/modules/models/d3_dev_oxorder.php
@ -1,94 +0,0 @@
-<?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.
- *
- * http://www.shopmodule.com
- *
- * @copyright <20> D<> Data Development, Thomas Dartsch
- * @author    D<> Data Development - Daniel Seifert <ds@shopmodule.com>
- * @link      http://www.oxidmodule.com
- */
-
-class d3_dev_oxorder extends d3_dev_oxorder_parent
-{
-    /**
-     * @return d3_dev_oxbasket
-     */
-    public function d3DevGetOrderBasket()
-    {
-        /** @var d3_dev_oxbasket $oBasket */
-        $oBasket = $this->_getOrderBasket();
-
-        // unsetting bundles
-        $oOrderArticles = $this->getOrderArticles();
-        foreach ($oOrderArticles as $sItemId => $oItem) {
-            if ($oItem->isBundle()) {
-                $oOrderArticles->offsetUnset($sItemId);
-            }
-        }
-
-        // add this order articles to basket and recalculate basket
-        $this->_addOrderArticlesToBasket($oBasket, $oOrderArticles);
-        // recalculating basket
-        $oBasket->calculateBasket(true);
-        $oBasket->d3ClearBasketItemArticles();
-
-        $this->_oPayment = $this->_setPayment($oBasket->getPaymentId());
-
-        return $oBasket;
-    }
-
-    /**
-     * @return string
-     */
-    public function d3getLastOrderId()
-    {
-        if (oxRegistry::getConfig()->getRequestParameter('d3ordernr')) {
-            $sWhere = ' oxordernr = ' . (int) oxRegistry::getConfig()->getRequestParameter('d3ordernr');
-        } else {
-            $sWhere = 1;
-        }
-
-        $sSelect = "SELECT oxid FROM ".getViewName('oxorder')." WHERE ".$sWhere." ORDER BY oxorderdate DESC LIMIT 1";
-
-        return oxDb::getDb(oxDb::FETCH_MODE_ASSOC)->getOne($sSelect);
-    }
-
-    public function d3getLastOrder()
-    {
-        $this->load($this->d3getLastOrderId());
-        $this->_d3AddVouchers();
-    }
-
-    /**
-     * @return oxBasket
-     */
-    public function getBasket()
-    {
-        $oBasket = parent::getBasket();
-
-        if (false == $oBasket && oxRegistry::getConfig()->getActiveView()->getClassName() == 'd3dev') {
-            $oBasket = $this->d3DevGetOrderBasket();
-        }
-
-        return $oBasket;
-    }
-    
-    protected function _d3AddVouchers()
-    {
-        $sSelect = "SELECT oxid FROM oxvouchers WHERE oxorderid = ".oxDb::getDb(oxDb::FETCH_MODE_ASSOC)->quote($this->getId()).";";
-        
-        $aResult = oxDb::getDb(oxDb::FETCH_MODE_ASSOC)->getArray($sSelect);
-
-        foreach ($aResult as $aFields) {
-            $oVoucher = oxNew('oxvoucher');
-            $oVoucher->load($aFields['oxid']);
-            $this->_aVoucherList[$oVoucher->getId()] = $oVoucher;
-        }
-    }
-}
--- a/copy_this/modules/d3/d3dev/views/admin/de/d3dev_lang.php
+++ b/copy_this/modules/d3/d3dev/views/admin/de/d3dev_lang.php
@ -1,49 +0,0 @@
-<?php
-
-/**
- * TPL Development Tool
- * 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.
- * http://www.shopmodule.com
- *
- * @copyright <20> D<> Data Development, Thomas Dartsch
- * @package   OrderManager
- * @author    D<> Data Development - Daniel Seifert <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
- */
-
-$sLangName = "Deutsch";
-
-// -------------------------------
-// RESOURCE IDENTITFIER = STRING
-// -------------------------------
-$aLang = array(
-    //Navigation
-    'charset'                                                   => 'ISO-8859-15',
-
-    'SHOP_MODULE_GROUP_d3dev_order'                             => 'Bestellungsablauf manipulieren',
-    'SHOP_MODULE_blD3DevAvoidDelBasket'                         => 'Warenkorb wird nach Bestellabschluss nicht geleert',
-    'HELP_SHOP_MODULE_blD3DevAvoidDelBasket'                    => 'Damit kann auf der Bestellbest<73>tigungsseite '.
-        '(Thankyou) durch den "zur<75>ck"-Button in den Warenkorb Schritt 4 gewechselt werden und die Bestellung erneut '.
-        'abgeschickt werden. Eine erneute Best<73>ckung des Warenkorbs ist nicht n<>tig. Beim erneuten Absenden wird '.
-        'jeweils eine weitere Bestellung angelegt werden. Eventuell verwendete Gutscheine m<>ssen so eingestellt '.
-        'werden, dass diese mehrfach verwendet werden k<>nnen.',
-    'SHOP_MODULE_blD3DevShowThankyou'                           => 'Thankyou-Seite kann auch ohne Bestellung '.
-        'aufgerufen werden',
-    'HELP_SHOP_MODULE_blD3DevShowThankyou'                      => 'Ohne abgesendete Bestellung l<><6C>t sich die '.
-        'Thankyou-Seite im Standardshop nicht aufrufen. Diese Option stellt dies f<>r Entwicklungszwecke zur '.
-        'Verf<72>gung. <br>Den Link zum Seitenaufruf haben wir hier im Stamm-Tab hinterlegt. Die Seite <20>ffnet sich in '.
-        'einem neuen Browserfenster. <br>F<>r die Anzeige wird die letzte vorliegende Bestellung geladen. <20>ber den '.
-        'Parameter "d3ordernr=X" kann eine bestimmten Bestellung vorgegeben werden.',
-
-    'SHOP_MODULE_GROUP_d3dev_mail'                              => 'Mailanzeige',
-    'SHOP_MODULE_blD3DevShowOrderMailsInBrowser'                => 'Bestellbest<73>tigungsmails k<>nnen im Browser '.
-        'angezeigt werden',
-    'HELP_SHOP_MODULE_blD3DevShowOrderMailsInBrowser'           => 'Die Links zu den '.
-        'jeweiligen Mails sind im Stamm-Tab aufgelistet.<br>F<>r die Anzeige wird ohne Angabe der Bestellnummer die '.
-        'letzte vorliegende Bestellung geladen. <20>ber den Parameter "d3ordernr=X" kann eine bestimmten Bestellung '.
-        'vorgegeben werden.',
-);
--- a/copy_this/modules/d3/vendormetadata.php
+++ b/copy_this/modules/d3/vendormetadata.php
--- a/docs/step1.jpg
+++ b/docs/step1.jpg
--- a/docs/step2.jpg
+++ b/docs/step2.jpg
--- a/docs/step3.jpg
+++ b/docs/step3.jpg
--- a/setup+doku/changelog.txt
+++ b/setup+doku/changelog.txt
@ -1,4 +0,0 @@
-=> 1.0.0.0
- unterbindet das L<>schen des Warenkorbs nach Bestellabschluss
- Thankyou ist ohne Bestellabschluss aufrufbar (unter Angabe der Bestellnummer auch f<>r eine bestimmte Bestellung)
- Bestellbest<73>tigungsmails sind im Browser darstellbar (unter Angabe der Bestellnummer auch f<>r eine bestimmte Bestellung)
--- a/src/Application/Controller/d3dev.php
+++ b/src/Application/Controller/d3dev.php
@ -0,0 +1,106 @@
+<?php
+
+namespace D3\Devhelper\Application\Controller;
+
+use D3\Devhelper\Modules\Application\Controller as ModuleController;
+use D3\Devhelper\Modules\Core as ModuleCore;
+use Exception;
+use OxidEsales\Eshop\Application\Controller\FrontendController;
+use OxidEsales\Eshop\Application\Controller\ThankYouController;
+use OxidEsales\Eshop\Application\Model\User;
+use OxidEsales\Eshop\Core\Email;
+use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
+use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
+use OxidEsales\Eshop\Core\Exception\UserException;
+use OxidEsales\Eshop\Core\Registry;
+
+/**
+ * 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.
+ *
+ * http://www.shopmodule.com
+ *
+ * @copyright © D³ Data Development, Thomas Dartsch
+ * @author    D³ Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+
+class d3dev extends FrontendController
+{
+    public function init()
+    {
+        $this->_authenticate();
+
+        parent::init();
+    }
+
+    protected function _authenticate ()
+    {
+        try {
+            $sUser = Registry::getRequest()->getRequestEscapedParameter('usr');
+            $sPassword = Registry::getRequest()->getRequestEscapedParameter('pwd');
+
+            if ( !$sUser || !$sPassword ) {
+                $sUser = $_SERVER[ 'PHP_AUTH_USER' ];
+                $sPassword = $_SERVER[ 'PHP_AUTH_PW' ];
+            }
+
+            if ( !$sUser || !$sPassword ) {
+                $sHttpAuthorization = $_REQUEST[ 'HTTP_AUTHORIZATION' ];
+                if ( $sHttpAuthorization ) {
+                    $sUser = null;
+                    $sPassword = null;
+                    $aHttpAuthorization = explode( ' ', $sHttpAuthorization );
+                    if ( is_array( $aHttpAuthorization ) && count( $aHttpAuthorization ) >= 2 && strtolower( $aHttpAuthorization[ 0 ] ) == 'basic' ) {
+                        $sBasicAuthorization = base64_decode( $aHttpAuthorization[ 1 ] );
+                        $aBasicAuthorization = explode( ':', $sBasicAuthorization );
+                        if ( is_array( $aBasicAuthorization ) && count( $aBasicAuthorization ) >= 2 ) {
+                            $sUser = $aBasicAuthorization[ 0 ];
+                            $sPassword = $aBasicAuthorization[ 1 ];
+                        }
+                    }
+                }
+            }
+            $oUser = oxNew( User::class );
+            if ( !$sUser || !$sPassword || !$oUser->login( $sUser, $sPassword ) ) {
+                throw oxNew( UserException::class, 'EXCEPTION_USER_NOVALIDLOGIN' );
+            }
+        }
+        catch ( Exception $oEx ) {
+            $oShop = Registry::getConfig()->getActiveShop();
+            header( 'WWW-Authenticate: Basic realm="' . $oShop->getFieldData('oxname') . '"' );
+            header( 'HTTP/1.0 401 Unauthorized' );
+            exit( 1 );
+        }
+    }
+
+    /**
+     * @throws DatabaseConnectionException
+     * @throws DatabaseErrorException
+     */
+    public function showOrderMailContent()
+    {
+        header('Content-type: text/html; charset='.Registry::getLang()->translateString('charset'));
+
+        if (Registry::getConfig()->getActiveShop()->isProductiveMode()
+            || false == Registry::getConfig()->getConfigParam(ModuleCore\d3_dev_conf::OPTION_SHOWMAILSINBROWSER)
+        ) {
+            Registry::getUtils()->redirect(Registry::getConfig()->getShopUrl().'index.php?cl=start');
+        }
+
+        $sTpl = Registry::getRequest()->getRequestEscapedParameter('type');
+
+        /** @var ModuleController\d3_dev_thankyou $oThankyou */
+        $oThankyou = oxNew(ThankYouController::class);
+        $oOrder = $oThankyou->d3GetLastOrder();
+
+        /** @var ModuleCore\d3_dev_oxemail $oEmail */
+        $oEmail = oxNew(Email::class);
+        echo $oEmail->d3GetOrderMailContent($oOrder, $sTpl);
+        die();
+    }
+}
--- a/src/Application/views/admin/de/d3dev_lang.php
+++ b/src/Application/views/admin/de/d3dev_lang.php
@ -0,0 +1,57 @@
+<?php
+
+/**
+ * TPL Development Tool
+ * 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.
+ * http://www.shopmodule.com
+ *
+ * @copyright © D³ Data Development, Thomas Dartsch
+ * @package   OrderManager
+ * @author    D³ Data Development - Daniel Seifert <support@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+
+$sLangName = "Deutsch";
+
+// -------------------------------
+// RESOURCE IDENTITFIER = STRING
+// -------------------------------
+$aLang = array(
+    //Navigation
+    'charset'                                                   => 'UTF-8',
+
+    'SHOP_MODULE_GROUP_d3dev_order'                             => 'Bestellungsablauf manipulieren',
+    'SHOP_MODULE_blD3DevAvoidDelBasket'                         => 'Warenkorb wird nach Bestellabschluss nicht geleert',
+    'HELP_SHOP_MODULE_blD3DevAvoidDelBasket'                    => 'Damit kann auf der Bestellbestätigungsseite '.
+        '(Thankyou) durch den "zurück"-Button in den Warenkorb Schritt 4 gewechselt werden und die Bestellung erneut '.
+        'abgeschickt werden. Eine erneute Bestückung des Warenkorbs ist nicht nötig. Beim erneuten Absenden wird '.
+        'jeweils eine weitere Bestellung angelegt werden. Eventuell verwendete Gutscheine müssen so eingestellt '.
+        'werden, dass diese mehrfach verwendet werden können.',
+    'SHOP_MODULE_blD3DevShowThankyou'                           => 'Thankyou-Seite kann auch ohne Bestellung '.
+        'aufgerufen werden',
+    'HELP_SHOP_MODULE_blD3DevShowThankyou'                      => 'Ohne abgesendete Bestellung läßt sich die '.
+        'Thankyou-Seite im Standardshop nicht aufrufen. Diese Option stellt dies für Entwicklungszwecke zur '.
+        'Verfügung. <br>Den Link zum Seitenaufruf haben wir hier im Stamm-Tab hinterlegt. Die Seite öffnet sich in '.
+        'einem neuen Browserfenster. <br>Für die Anzeige wird die letzte vorliegende Bestellung geladen. Über den '.
+        'Parameter "d3ordernr=X" kann eine bestimmten Bestellung vorgegeben werden.',
+
+    'SHOP_MODULE_GROUP_d3dev_mail'                              => 'Mailanzeige',
+    'SHOP_MODULE_blD3DevShowOrderMailsInBrowser'                => 'Bestellbestätigungsmails können im Browser '.
+        'angezeigt werden',
+    'HELP_SHOP_MODULE_blD3DevShowOrderMailsInBrowser'           => 'Die Links zu den '.
+        'jeweiligen Mails sind im Stamm-Tab aufgelistet.<br>Für die Anzeige wird ohne Angabe der Bestellnummer die '.
+        'letzte vorliegende Bestellung geladen. Über den Parameter "d3ordernr=X" kann eine bestimmten Bestellung '.
+        'vorgegeben werden.',
+
+    'SHOP_MODULE_GROUP_d3dev_mailblock'                         => 'Mailversand',
+    'SHOP_MODULE_blD3DevBlockMails'                             => 'Mails an beliebige Mailadressen werden nicht '.
+        'versandt',
+    'HELP_SHOP_MODULE_blD3DevBlockMails'                        => 'Der Mailversand wird komplett geblockt.',
+    'SHOP_MODULE_sD3DevRedirectMail'                            => 'versendete Mails an diese Adresse umleiten',
+    'HELP_SHOP_MODULE_sD3DevRedirectMail'                       => 'Wenn leer, erfolgt keine Umleitung. Ohne '.
+        'zusätzliche Blockieroption werden die Mails dann an den original Empfänger gesendet.',
+);
--- a/src/IntelliSenseHelper.php
+++ b/src/IntelliSenseHelper.php
@ -0,0 +1,48 @@
+<?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.
+ *
+ * http://www.shopmodule.com
+ *
+ * @copyright © D³ Data Development, Thomas Dartsch
+ * @author    D³ Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+
+namespace D3\Devhelper\Modules\Application\Controller
+{
+    use OxidEsales\Eshop\Application\Controller\ThankYouController;
+
+    class d3_dev_thankyou_parent extends ThankYouController {}
+}
+
+namespace D3\Devhelper\Modules\Application\Model
+{
+    use OxidEsales\Eshop\Application\Controller\OrderController;
+    use OxidEsales\Eshop\Application\Model\Basket;
+    use OxidEsales\Eshop\Application\Model\BasketItem;
+    use OxidEsales\Eshop\Application\Model\Order;
+    use OxidEsales\Eshop\Application\Model\OrderArticle;
+
+    class d3_dev_oxorder_parent extends Order {}
+
+    class d3_dev_oxorderarticle_parent extends OrderArticle {}
+
+    class d3_dev_oxbasket_parent extends Basket {}
+
+    class d3_dev_oxbasketitem_parent extends BasketItem {}
+
+    class d3_dev_order_parent extends OrderController {}
+}
+
+namespace D3\Devhelper\Modules\Core
+{
+    use OxidEsales\Eshop\Core\Email;
+
+    class d3_dev_oxemail_parent extends Email {}
+}
--- a/src/Modules/Application/Controller/d3_dev_thankyou.php
+++ b/src/Modules/Application/Controller/d3_dev_thankyou.php
@ -0,0 +1,174 @@
+<?php
+
+namespace D3\Devhelper\Modules\Application\Controller;
+
+// .../?cl=thankyou[&d3orderid=23]
+use D3\Devhelper\Modules\Application\Model\d3_dev_oxorder;
+use D3\Devhelper\Modules\Core\d3_dev_conf;
+use Exception;
+use OxidEsales\Eshop\Application\Model\Order;
+use OxidEsales\Eshop\Application\Model\User;
+use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
+use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
+use OxidEsales\Eshop\Core\Exception\UserException;
+use OxidEsales\Eshop\Core\Registry;
+use oxOrder;
+
+/**
+ * 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.
+ *
+ * http://www.shopmodule.com
+ *
+ * @copyright © D³ Data Development, Thomas Dartsch
+ * @author    D³ Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+
+class d3_dev_thankyou extends d3_dev_thankyou_parent
+{
+    /**
+     * @throws DatabaseConnectionException
+     * @throws DatabaseErrorException
+     */
+    public function init()
+    {
+        $sSessChallenge = Registry::getSession()->getVariable('sess_challenge');
+
+        parent::init();
+
+        if (Registry::getRequest()->getRequestEscapedParameter("d3dev")
+            && false == (bool) Registry::getConfig()->getActiveShop()->isProductiveMode()
+            && Registry::getConfig()->getConfigParam(d3_dev_conf::OPTION_PREVENTDELBASKET)
+        ) {
+            Registry::getSession()->setVariable( 'sess_challenge', $sSessChallenge );
+        }
+
+        if ($this->d3DevCanShowThankyou()) {
+            $this->_d3authenticate();
+            $oOrder = $this->d3GetLastOrder();
+            $this->_oBasket = $oOrder->d3DevGetOrderBasket();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function d3DevCanShowThankyou()
+    {
+        return Registry::getRequest()->getRequestEscapedParameter("d3dev")
+        && false == (bool) Registry::getConfig()->getActiveShop()->isProductiveMode()
+        && Registry::getConfig()->getConfigParam(d3_dev_conf::OPTION_SHOWTHANKYOU);
+    }
+
+    /**
+     * @return string
+     */
+    public function render()
+    {
+        $currentClass = '';
+        if ($this->d3DevCanShowThankyou()) {
+            $currentClass = $this->getViewConfig()->getViewConfigParam('cl');
+        }
+
+        $ret = parent::render();
+
+        if ($this->d3DevCanShowThankyou()) {
+            $this->getViewConfig()->setViewConfigParam('cl', $currentClass);
+        }
+
+        return $ret;
+    }
+
+    protected function _d3authenticate ()
+    {
+        try {
+            $sUser = Registry::getRequest()->getRequestEscapedParameter( 'usr');
+            $sPassword = Registry::getRequest()->getRequestEscapedParameter('pwd');
+
+            if ( !$sUser || !$sPassword ) {
+                $sUser = $_SERVER[ 'PHP_AUTH_USER' ];
+                $sPassword = $_SERVER[ 'PHP_AUTH_PW' ];
+            }
+
+            if ( !$sUser || !$sPassword ) {
+                $sHttpAuthorization = $_REQUEST[ 'HTTP_AUTHORIZATION' ];
+                if ( $sHttpAuthorization ) {
+                    $sUser = null;
+                    $sPassword = null;
+                    $aHttpAuthorization = explode( ' ', $sHttpAuthorization );
+                    if ( is_array( $aHttpAuthorization ) && count( $aHttpAuthorization ) >= 2 && strtolower( $aHttpAuthorization[ 0 ] ) == 'basic' ) {
+                        $sBasicAuthorization = base64_decode( $aHttpAuthorization[ 1 ] );
+                        $aBasicAuthorization = explode( ':', $sBasicAuthorization );
+                        if ( is_array( $aBasicAuthorization ) && count( $aBasicAuthorization ) >= 2 ) {
+                            $sUser = $aBasicAuthorization[ 0 ];
+                            $sPassword = $aBasicAuthorization[ 1 ];
+                        }
+                    }
+                }
+            }
+            /** @var User $oUser */
+            $oUser = oxNew(User::class);
+            if ( !$sUser || !$sPassword || !$oUser->login( $sUser, $sPassword ) ) {
+                /** @var UserException $oEx */
+                $oEx = oxNew(UserException::class, 'EXCEPTION_USER_NOVALIDLOGIN');
+                throw $oEx;
+            }
+        }
+        catch ( Exception $oEx ) {
+            $oShop = Registry::getConfig()->getActiveShop();
+            header( 'WWW-Authenticate: Basic realm="{' . $oShop->getFieldData('oxname') . '"' );
+            header( 'HTTP/1.0 401 Unauthorized' );
+            exit( 1 );
+        }
+    }
+
+    /**
+     * @return bool|d3_dev_oxorder|oxOrder
+     * @throws DatabaseConnectionException
+     * @throws DatabaseErrorException
+     */
+    public function getOrder()
+    {
+        $oOrder = parent::getOrder();
+
+        if ((false == $oOrder || !$oOrder->getFieldData('oxordernr'))
+            && $this->d3DevCanShowThankyou()
+        ) {
+            try {
+                $this->_oOrder = $this->d3GetLastOrder();
+                $oOrder = $this->_oOrder;
+
+                if (!$oOrder || !$oOrder->getFieldData('oxordernr')) {
+                    throw oxNew(\RuntimeException::class, 'unknown order');
+                }
+            } catch (Exception $e) {
+                die($e->getMessage());
+            }
+        }
+
+        return $oOrder;
+    }
+
+    /**
+     * @return bool|d3_dev_oxorder
+     * @throws DatabaseConnectionException
+     * @throws DatabaseErrorException
+     */
+    public function d3GetLastOrder()
+    {
+        if (Registry::getConfig()->getActiveShop()->isProductiveMode()) {
+            return false;
+        }
+
+        /** @var d3_dev_oxorder $oOrder */
+        $oOrder = oxNew(Order::class);
+        $oOrder->d3getLastOrder();
+
+        return $oOrder;
+    }
+}
--- a/src/Modules/Application/Model/d3_dev_oxbasket.php
+++ b/src/Modules/Application/Model/d3_dev_oxbasket.php
@ -0,0 +1,102 @@
+<?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.
+ *
+ * http://www.shopmodule.com
+ *
+ * @copyright © D³ Data Development, Thomas Dartsch
+ * @author    D³ Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+
+namespace D3\Devhelper\Modules\Application\Model;
+
+use D3\Devhelper\Modules\Core\d3_dev_conf;
+use oxArticleInputException;
+use OxidEsales\Eshop\Application\Model\BasketItem;
+use OxidEsales\Eshop\Application\Model\OrderArticle;
+use OxidEsales\Eshop\Core\Registry;
+use oxNoArticleException;
+
+class d3_dev_oxbasket extends d3_dev_oxbasket_parent
+{
+    public function deleteBasket()
+    {
+        if (Registry::getConfig()->getActiveShop()->isProductiveMode()
+            || false == Registry::getConfig()->getConfigParam(d3_dev_conf::OPTION_PREVENTDELBASKET)
+        ) {
+            parent::deleteBasket();
+        }
+
+        // else do nothing;
+    }
+
+    public function d3ClearBasketItemArticles()
+    {
+        /** @var d3_dev_oxbasketitem $oBasketItem */
+        foreach ($this->_aBasketContents as $oBasketItem) {
+            $oBasketItem->d3ClearArticle();
+        }
+    }
+
+    /**
+     * Calculates total basket discount value.
+     */
+    protected function _calcBasketTotalDiscount()
+    {
+        if ($this->_oTotalDiscount === null || (!$this->isAdmin())) {
+            $this->_oTotalDiscount = $this->_getPriceObject();
+
+            if (is_array($this->_aDiscounts)) {
+                foreach ($this->_aDiscounts as $oDiscount) {
+                    // skipping bundle discounts
+                    if ($oDiscount->sType == 'itm') {
+                        continue;
+                    }
+
+                    // add discount value to total basket discount
+                    $this->_oTotalDiscount->add($oDiscount->dDiscount);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param OrderArticle $oOrderArticle
+     *
+     * @return d3_dev_oxbasketitem|null
+     * @throws oxArticleInputException
+     * @throws oxNoArticleException
+     */
+    public function d3addOrderArticleToBasket($oOrderArticle)
+    {
+        // adding only if amount > 0
+        if ($oOrderArticle->getFieldData('oxamount') > 0) {
+            $this->_isForOrderRecalculation = true;
+            $sItemId = $oOrderArticle->getId();
+
+            //inserting new
+            /** @var d3_dev_oxbasketitem $oBasketItem */
+            $oBasketItem = oxNew( BasketItem::class);
+            $oBasketItem->initFromOrderArticle($oOrderArticle);
+            $oBasketItem->d3ConvertToArticleObject();
+            $oBasketItem->setWrapping($oOrderArticle->getFieldData('oxwrapid'));
+            $oBasketItem->setBundle($oOrderArticle->isBundle());
+
+            $this->_aBasketContents[$sItemId] = $oBasketItem;
+
+            //calling update method
+            $this->onUpdate();
+
+            return $this->_aBasketContents[$sItemId];
+        }
+
+        return null;
+    }
+}
--- a/src/Modules/Application/Model/d3_dev_oxbasketitem.php
+++ b/src/Modules/Application/Model/d3_dev_oxbasketitem.php
@ -0,0 +1,66 @@
+<?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.
+ *
+ * http://www.shopmodule.com
+ *
+ * @copyright © D³ Data Development, Thomas Dartsch
+ * @author    D³ Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+
+namespace D3\Devhelper\Modules\Application\Model;
+
+use oxArticleInputException;
+use OxidEsales\Eshop\Application\Model\Article;
+use OxidEsales\Eshop\Application\Model\OrderArticle;
+use OxidEsales\Eshop\Core\Exception\ArticleException;
+use OxidEsales\Eshop\Core\Exception\ArticleInputException;
+use OxidEsales\Eshop\Core\Exception\NoArticleException;
+use oxNoArticleException;
+
+class d3_dev_oxbasketitem extends d3_dev_oxbasketitem_parent
+{
+    public function d3ClearArticle()
+    {
+        $this->_oArticle = null;
+    }
+
+    /**
+     * @return string
+     * @throws ArticleException
+     * @throws ArticleInputException
+     * @throws NoArticleException
+     */
+    public function getTitle()
+    {
+        $oArticle = $this->getArticle();
+        $this->_sTitle = $oArticle->getFieldData('oxtitle');
+
+        if ($oArticle->getFieldData('oxvarselect')) {
+            $this->_sTitle = $this->_sTitle . ', ' . $this->getVarSelect();
+        }
+
+        return $this->_sTitle;
+    }
+
+    /**
+     * @throws oxArticleInputException
+     * @throws oxNoArticleException
+     */
+    public function d3ConvertToArticleObject()
+    {
+        $oEmbeddedArticle = $this->getArticle();
+
+        if ($oEmbeddedArticle instanceof OrderArticle) {
+            $oArticle = oxNew(Article::class);
+            $oArticle->load($oEmbeddedArticle->getFieldData('oxartid'));
+            $this->_oArticle = $oArticle;
+        }
+    }
+}
--- a/src/Modules/Application/Model/d3_dev_oxorder.php
+++ b/src/Modules/Application/Model/d3_dev_oxorder.php
@ -0,0 +1,137 @@
+<?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.
+ *
+ * http://www.shopmodule.com
+ *
+ * @copyright © D³ Data Development, Thomas Dartsch
+ * @author    D³ Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+
+namespace D3\Devhelper\Modules\Application\Model;
+
+use oxarticleinputexception;
+use OxidEsales\Eshop\Application\Model\Basket;
+use OxidEsales\Eshop\Application\Model\Order;
+use OxidEsales\Eshop\Application\Model\Voucher;
+use OxidEsales\Eshop\Core\DatabaseProvider;
+use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
+use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
+use OxidEsales\Eshop\Core\Model\ListModel;
+use OxidEsales\Eshop\Core\Registry;
+use oxnoarticleexception;
+
+class d3_dev_oxorder extends d3_dev_oxorder_parent
+{
+    /**
+     * @return d3_dev_oxbasket
+     */
+    public function d3DevGetOrderBasket()
+    {
+        /** @var d3_dev_oxbasket $oBasket */
+        $oBasket = $this->_getOrderBasket();
+
+        // add this order articles to basket and recalculate basket
+        $this->_d3AddOrderArticlesToBasket($oBasket, $this->getOrderArticles());
+
+        // recalculating basket
+        $oBasket->calculateBasket(true);
+        $oBasket->d3ClearBasketItemArticles();
+
+        $this->_oPayment = $this->_setPayment($oBasket->getPaymentId());
+
+        return $oBasket;
+    }
+
+    /**
+     * @return string
+     * @throws DatabaseConnectionException
+     */
+    public function d3getLastOrderId()
+    {
+        $orderNr = (int) Registry::getRequest()->getRequestEscapedParameter('d3ordernr');
+        $sWhere = 1;
+        $parameters = [];
+        if ($orderNr) {
+            $sWhere = ' oxordernr = ? ';
+            $parameters[] = $orderNr;
+        }
+
+        $sSelect = "SELECT oxid FROM ".oxNew(Order::class)->getViewName()." WHERE ".
+            "oxuserid != '' AND ".
+            "oxshopid = ".Registry::getConfig()->getShopId()." AND ".
+            $sWhere." ORDER BY oxorderdate DESC LIMIT 1";
+
+        return DatabaseProvider::getDb(DatabaseProvider::FETCH_MODE_ASSOC)->getOne($sSelect, $parameters);
+    }
+
+    /**
+     * @throws DatabaseConnectionException
+     * @throws DatabaseErrorException
+     */
+    public function d3getLastOrder()
+    {
+        $this->load($this->d3getLastOrderId());
+        $this->_d3AddVouchers();
+    }
+
+    /**
+     * @return d3_dev_oxbasket|Basket
+     */
+    public function getBasket()
+    {
+        $oBasket = parent::getBasket();
+
+        if (false == $oBasket && Registry::getConfig()->getActiveView()->getClassKey() == 'd3dev') {
+            $oBasket = $this->d3DevGetOrderBasket();
+        }
+
+        return $oBasket;
+    }
+
+    /**
+     * @throws DatabaseConnectionException
+     * @throws DatabaseErrorException
+     */
+    protected function _d3AddVouchers()
+    {
+        $sSelect = "SELECT oxid FROM ".oxNew(Voucher::class)->getViewName()." WHERE oxorderid = ?";
+
+        $aResult = DatabaseProvider::getDb(DatabaseProvider::FETCH_MODE_ASSOC)->getAll(
+            $sSelect,
+            [$this->getId()]
+        );
+
+        foreach ($aResult as $aFields) {
+            $oVoucher = oxNew(Voucher::class);
+            $oVoucher->load($aFields['oxid']);
+            $this->_aVoucherList[$oVoucher->getId()] = $oVoucher;
+        }
+    }
+
+    /**
+     * Adds order articles back to virtual basket. Needed for recalculating order.
+     *
+     * @param d3_dev_oxbasket $oBasket        basket object
+     * @param ListModel                                      $aOrderArticles order articles
+     * @throws oxArticleInputException
+     * @throws oxNoArticleException
+     */
+    protected function _d3AddOrderArticlesToBasket($oBasket, $aOrderArticles)
+    {
+        // if no order articles, return empty basket
+        if (count($aOrderArticles) > 0) {
+            //adding order articles to basket
+            foreach ($aOrderArticles as $oOrderArticle) {
+                $oBasket->d3addOrderArticleToBasket($oOrderArticle);
+            }
+        }
+    }
+}
--- a/copy_this/modules/d3/d3dev/modules/models/d3_dev_oxorderarticle.php
+++ b/copy_this/modules/d3/d3dev/modules/models/d3_dev_oxorderarticle.php
@ -1,28 +1,35 @@
-<?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.
- *
- * http://www.shopmodule.com
- *
- * @copyright © D³ Data Development, Thomas Dartsch
- * @author    D³ Data Development - Daniel Seifert <ds@shopmodule.com>
- * @link      http://www.oxidmodule.com
- */
-
-class d3_dev_oxorderarticle extends d3_dev_oxorderarticle_parent
-{
-    /**
-     * @return array
-     */
-    public function getCustomerAlsoBoughtThisProducts()
-    {
-        $oArticle = $this->getArticle();
-
-        return $oArticle->getCustomerAlsoBoughtThisProducts();
-    }
-}
+<?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.
+ *
+ * http://www.shopmodule.com
+ *
+ * @copyright © D³ Data Development, Thomas Dartsch
+ * @author    D³ Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+
+namespace D3\Devhelper\Modules\Application\Model;
+
+use OxidEsales\Eshop\Application\Model\ArticleList;
+
+class d3_dev_oxorderarticle extends d3_dev_oxorderarticle_parent
+{
+    /**
+     * @return null|ArticleList
+     */
+    public function getCustomerAlsoBoughtThisProducts()
+    {
+        $oArticle = $this->getArticle();
+
+        /** @var ArticleList $artList */
+        $artList = $oArticle->getCustomerAlsoBoughtThisProducts();
+
+        return $artList;
+    }
+}
--- a/src/Modules/Core/d3_dev_conf.php
+++ b/src/Modules/Core/d3_dev_conf.php
@ -0,0 +1,29 @@
+<?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.
+ *
+ * http://www.shopmodule.com
+ *
+ * @copyright © D³ Data Development, Thomas Dartsch
+ * @author    D³ Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+
+namespace D3\Devhelper\Modules\Core;
+
+class d3_dev_conf
+{
+    const OPTION_PREVENTDELBASKET = 'blD3DevAvoidDelBasket';
+    const OPTION_SHOWTHANKYOU = 'blD3DevShowThankyou';
+
+    const OPTION_SHOWMAILSINBROWSER = 'blD3DevShowOrderMailsInBrowser';
+
+    const OPTION_BLOCKMAIL = 'blD3DevBlockMails';
+    const OPTION_REDIRECTMAIL = 'sD3DevRedirectMail';
+}
--- a/src/Modules/Core/d3_dev_oxemail.php
+++ b/src/Modules/Core/d3_dev_oxemail.php
@ -0,0 +1,245 @@
+<?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.
+ *
+ * http://www.shopmodule.com
+ *
+ * @copyright © D³ Data Development, Thomas Dartsch
+ * @author    D³ Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+
+namespace D3\Devhelper\Modules\Core;
+
+use D3\Devhelper\Modules\Application\Model as ModuleModel;
+use OxidEsales\Eshop\Core\Exception\StandardException;
+use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
+use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRendererBridgeInterface;
+use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRendererInterface;
+
+class d3_dev_oxemail extends d3_dev_oxemail_parent
+{
+    /**
+     * @param ModuleModel\d3_dev_oxorder $oOrder
+     * @param                $sType
+     * @return mixed|string
+     */
+    public function d3GetOrderMailContent($oOrder, $sType)
+    {
+        if (Registry::getConfig()->getActiveShop()->isProductiveMode()) {
+            return '';
+        }
+
+        switch (strtolower($sType)) {
+            case 'owner_html':
+                $sTpl = $this->_sOrderOwnerTemplate;
+                break;
+            case 'owner_plain':
+                $sTpl = $this->_sOrderOwnerPlainTemplate;
+                break;
+            case 'user_plain':
+                $sTpl = $this->_sOrderUserPlainTemplate;
+                break;
+            case 'user_html':
+            default:
+                $sTpl = $this->_sOrderUserTemplate;
+        }
+
+        $myConfig = Registry::getConfig();
+
+        $oShop = $this->_getShop();
+
+        // cleanup
+        $this->_clearMailer();
+
+        // add user defined stuff if there is any
+        $oOrder = $this->_addUserInfoOrderEMail($oOrder);
+
+        $oUser = $oOrder->getOrderUser();
+        $this->setUser($oUser);
+
+        // send confirmation to shop owner
+        // send not pretending from order user, as different email domain rise spam filters
+        $this->setFrom($oShop->getFieldData('oxowneremail'));
+
+        $oLang = Registry::getLang();
+        $iOrderLang = $oLang->getObjectTplLanguage();
+
+        // if running shop language is different from admin lang. set in config
+        // we have to load shop in config language
+        if ($oShop->getLanguage() != $iOrderLang) {
+            $oShop = $this->_getShop($iOrderLang);
+        }
+
+        $this->setSmtp($oShop);
+
+        // create messages
+        $this->setViewData("order", $oOrder);
+
+        // Process view data array through oxoutput processor
+        $this->_processViewArray();
+
+        $renderer = $this->getRenderer();
+        return $renderer->renderTemplate($myConfig->getTemplatePath($sTpl, false), $this->getViewData());
+    }
+
+    /**
+     * required because private in Email class
+     * Templating instance getter
+     *
+     * @return TemplateRendererInterface
+     */
+    protected function getRenderer()
+    {
+        $bridge = ContainerFactory::getInstance()->getContainer()
+            ->get(TemplateRendererBridgeInterface::class);
+        $bridge->setEngine($this->_getSmarty());
+
+        return $bridge->getTemplateRenderer();
+    }
+
+    /**
+     * @param $aRecInfo
+     * @param array $aCc
+     * @return array
+     */
+    public function d3ChangeRecipient($aRecInfo, array $aCc): array
+    {
+        if (($sNewRecipient = $this->getNewRecipient($aRecInfo[0]))
+            && $sNewRecipient != $aRecInfo[0]
+        ) {
+            $aRecInfo[1] = $aRecInfo[1] . " (" . $aRecInfo[0] . ")";
+            $aRecInfo[0] = $sNewRecipient;
+            $aCc[] = $aRecInfo;
+        } elseif (($sNewRecipient = $this->getNewRecipient($aRecInfo[0]))) {
+            $aCc[] = $aRecInfo;
+        }
+        return $aCc;
+    }
+
+    /**
+     * @return bool
+     * @throws StandardException
+     */
+    protected function _sendMail()
+    {
+        if (Registry::getConfig()->getActiveShop()->isProductiveMode()) {
+            return parent::_sendMail();
+        }
+
+        $this->d3clearRecipients();
+        $this->d3clearReplies();
+        $this->d3clearReplyTo();
+        $this->d3clearCC();
+        $this->d3clearBCC();
+
+        if (count($this->getRecipient())) {
+            return parent::_sendMail();
+        }
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     * @throws StandardException
+     */
+    protected function sendMail()
+    {
+        if (Registry::getConfig()->getActiveShop()->isProductiveMode()) {
+            return parent::sendMail();
+        }
+
+        $this->d3clearRecipients();
+        $this->d3clearReplies();
+        $this->d3clearReplyTo();
+        $this->d3clearCC();
+        $this->d3clearBCC();
+
+        if (count($this->getRecipient())) {
+            return parent::sendMail();
+        }
+
+        return true;
+    }
+
+    public function d3clearRecipients()
+    {
+        $aRecipients = array();
+        if (is_array($this->_aRecipients) && count($this->_aRecipients)) {
+            foreach ($this->_aRecipients as $aRecInfo) {
+                $aRecipients = $this->d3ChangeRecipient($aRecInfo, $aRecipients);
+            }
+        }
+        $this->_aRecipients = $aRecipients;
+    }
+
+    public function d3clearReplies()
+    {
+        $aRecipients = array();
+        if (is_array($this->_aReplies) && count($this->_aReplies)) {
+            foreach ($this->_aReplies as $aRecInfo) {
+                $aRecipients = $this->d3ChangeRecipient($aRecInfo, $aRecipients);
+            }
+        }
+        $this->_aReplies = $aRecipients;
+    }
+
+    public function d3clearReplyTo()
+    {
+        $aRecipients = array();
+        if (is_array($this->ReplyTo) && count($this->ReplyTo)) {
+            foreach ($this->ReplyTo as $aRecInfo) {
+                $aRecipients = $this->d3ChangeRecipient($aRecInfo, $aRecipients);
+            }
+        }
+        $this->ReplyTo = $aRecipients;
+    }
+
+    public function d3clearCC()
+    {
+        $aCc = array();
+        if (is_array($this->cc) && count($this->cc)) {
+            foreach ($this->cc as $aRecInfo) {
+                $aCc = $this->d3ChangeRecipient($aRecInfo, $aCc);
+            }
+        }
+
+        $this->cc = $aCc;
+    }
+
+    public function d3clearBCC()
+    {
+        $aCc = array();
+        if (is_array($this->bcc) && count($this->bcc)) {
+            foreach ($this->bcc as $aRecInfo) {
+                $aCc = $this->d3ChangeRecipient($aRecInfo, $aCc);
+            }
+        }
+
+        $this->bcc = $aCc;
+    }
+
+    /**
+     * @param $sMailAddress
+     *
+     * @return bool|string
+     */
+    public function getNewRecipient($sMailAddress)
+    {
+        if (Registry::getConfig()->getConfigParam(d3_dev_conf::OPTION_BLOCKMAIL)) {
+            return false;
+        } elseif (Registry::getConfig()->getConfigParam(d3_dev_conf::OPTION_REDIRECTMAIL)) {
+            return trim(Registry::getConfig()->getConfigParam(d3_dev_conf::OPTION_REDIRECTMAIL));
+        }
+
+        return $sMailAddress;
+    }
+}
--- a/src/metadata.php
+++ b/src/metadata.php
@ -0,0 +1,121 @@
+<?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.
+ *
+ * http://www.shopmodule.com
+ *
+ * @copyright <20> D<> Data Development, Thomas Dartsch
+ * @author    D<> Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      http://www.oxidmodule.com
+ */
+
+use D3\Devhelper\Application\Controller\d3dev;
+use D3\Devhelper\Modules\Core as ModuleCore;
+use D3\Devhelper\Modules\Application\Controller as ModuleController;
+use D3\Devhelper\Modules\Application\Model as ModuleModel;
+use OxidEsales\Eshop\Application\Controller as OxidController;
+use OxidEsales\Eshop\Application\Model as OxidModel;
+use OxidEsales\Eshop\Core as OxidCore;
+use OxidEsales\Eshop\Core\Registry;
+
+/**
+ * Metadata version
+ */
+$sMetadataVersion = '2.1';
+$sLogo = '<img src="https://logos.oxidmodule.com/d3logo.svg" alt="(D3)" style="height:1em;width:1em"> ';
+
+$shopUrl = function_exists('oxNew') ? Registry::getConfig()->getCurrentShopUrl(false) : '../';
+    
+
+/**
+ * Module information
+ */
+$aModule = array(
+    'id'           => 'd3dev',
+    'title'        => [
+        'de'    => $sLogo . 'TPL Entwicklerwerkzeug',
+        'en'    => $sLogo . 'TPL Development Tool'
+    ],
+    'description'  => [
+        'de'    => '<script type="text/javascript"><!--
+                    function showNote() {
+                        let _oElem = document.getElementById("secnote");
+                        if (_oElem.style.display === "block") {
+                            _oElem.style.display = "none";
+                        } else {
+                            _oElem.style.display = "block";
+                        }
+                    }
+                    --></script>
+                    <p style="background-color: darkred; padding: 5px;"><a href="#" style="text-decoration: underline; color: white;" onclick="showNote(); return false;"><b>Sicherheitshinweis</b></a></p>
+                    <p style="display: none; background-color: darkred; color: white; padding: 5px;" id="secnote">Diese Shoperweiterung stellt Entwicklungshilfen zur Verf&uuml;gung, die im Livebetrieb sicherheitskritisch sein k&ouml;nnen. Es k&ouml;nnen Kunden- und Bestelldaten ausgelesen und auch Shopfunktionen manipuliert werden. Aktivieren Sie diese Erweiterung daher nur in einem Umfeld, in dem Sie Missbrauch ausschlie&szligen k&ouml;nnen. F&uuml;r entstandene Sch&auml;den lehnen wir jede Haftung ab.</p>
+                    <ul><li>unterbindet L&ouml;schen des Warenkorbs nach Bestellabschluss</li>'.
+            '<li><a style="text-decoration: underline;" href="'.$shopUrl.'index.php?cl=thankyou&d3dev=1&d3ordernr=" target="_new">Thankyou-Seite ist ohne Bestellung aufrufbar*</a></li>'.
+            '<li>Mail-Templates k&ouml;nnen im Browser ausgegeben werden'.
+                '<ul>'.
+                '<li><a style="text-decoration: underline;" href="'.$shopUrl.'index.php?cl=d3dev&fnc=showOrderMailContent&type=owner_html&d3ordernr=" target="_new">Order Owner HTML*</a></li>'.
+                '<li><a style="text-decoration: underline;" href="'.$shopUrl.'index.php?cl=d3dev&fnc=showOrderMailContent&type=owner_plain&d3ordernr=" target="_new">Order Owner Plain*</a></li>'.
+                '<li><a style="text-decoration: underline;" href="'.$shopUrl.'index.php?cl=d3dev&fnc=showOrderMailContent&type=user_html&d3ordernr=" target="_new">Order User HTML*</a></li>'.
+                '<li><a style="text-decoration: underline;" href="'.$shopUrl.'index.php?cl=d3dev&fnc=showOrderMailContent&type=user_plain&d3ordernr=" target="_new">Order User Plain*</a></li>'.
+            '</li>'.
+            '<li>blockiert &uuml;bers Framework versendete Mails oder leitet diese um</li>'.
+            '</ul><br>Jede dieser Optionen muss aus Sicherheitsgr&uuml;nden unter "Einstell." aktiviert werden. Weiterhin darf der Shop nicht im Produktivmodus betrieben werden.<br><br>'.
+            '* Ordernummer an URL erg&auml;nzen, wenn bestimmte Bestellungen angezeigt werden sollen',
+        'en'    => ''],
+    'version'      => '3.0.0.1',
+    'author'       => 'D&sup3; Data Development (Inh.: Thomas Dartsch)',
+    'email'        => 'support@shopmodule.com',
+    'url'          => 'http://www.oxidmodule.com/',
+    'extend'      => [
+        OxidController\ThankYouController::class    => ModuleController\d3_dev_thankyou::class,
+        OxidModel\Order::class                      => ModuleModel\d3_dev_oxorder::class,
+        OxidModel\OrderArticle::class               => ModuleModel\d3_dev_oxorderarticle::class,
+        OxidCore\Email::class                       => ModuleCore\d3_dev_oxemail::class,
+        OxidModel\Basket::class                     => ModuleModel\d3_dev_oxbasket::class,
+        OxidModel\BasketItem::class                 => ModuleModel\d3_dev_oxbasketitem::class,
+    ],
+    'controllers'       => [
+        'd3dev'     => d3dev::class,
+    ],
+    'templates'   => [],
+    'events'      => [],
+    'blocks'      => [],
+    'settings'    => [
+        [
+            'group' => 'd3dev_order',
+            'name' => ModuleCore\d3_dev_conf::OPTION_PREVENTDELBASKET,
+            'type' => 'bool',
+            'value' => 'false'
+        ],
+        [
+            'group' => 'd3dev_order',
+            'name' => ModuleCore\d3_dev_conf::OPTION_SHOWTHANKYOU,
+            'type' => 'bool',
+            'value' => 'false'
+        ],
+        [
+            'group' => 'd3dev_mail',
+            'name' => ModuleCore\d3_dev_conf::OPTION_SHOWMAILSINBROWSER,
+            'type' => 'bool',
+            'value' => 'false'
+        ],
+        [
+            'group' => 'd3dev_mailblock',
+            'name' => ModuleCore\d3_dev_conf::OPTION_BLOCKMAIL,
+            'type' => 'bool',
+            'value' => 'false'
+        ],
+        [
+            'group' => 'd3dev_mailblock',
+            'name' => ModuleCore\d3_dev_conf::OPTION_REDIRECTMAIL,
+            'type' => 'str',
+            'value' => 'd3test1@shopmodule.com'
+        ],
+    ],
+);
Author	SHA1	Message	Date
Daniel Seifert	b374688479	make installable in OXID 6.5.2	2023-05-12 10:31:40 +02:00
Daniel Seifert	7785181e4c	make installable in OXID 6.3.1	2021-08-19 15:47:44 +02:00
Daniel Seifert	67a046476f	fix readme file encoding	2021-04-28 22:50:58 +02:00
Daniel Seifert	ea982a89d0	adjust version informations	2021-04-28 22:43:55 +02:00
Daniel Seifert	3d52203d94	fix prepared statement combination	2021-04-28 22:41:03 +02:00
Daniel Seifert	564ddd891d	prevent getting faulty config instance in composer installation	2021-04-28 16:14:29 +02:00
Daniel Seifert	09fa1bce31	make installable in OXID 6.3	2021-04-28 15:58:16 +02:00
Daniel Seifert	622b2c7e57	exclude orders from foreign shops and unset user ids	2020-11-24 23:05:30 +01:00
Daniel Seifert	1379b76f2d	make installable in OXID 6.2.3	2020-11-24 20:47:59 +01:00
Daniel Seifert	da08b322f4	change license	2020-11-12 09:09:56 +01:00
Daniel Seifert	d2599a57b6	add version list	2020-11-12 08:55:37 +01:00
Daniel Seifert	767750a09a	remove inquiry mail viewer	2020-11-12 08:50:36 +01:00
Daniel Seifert	eac41bc94d	change fox OXID 6.2 explicit	2020-11-11 23:59:40 +01:00
Daniel Seifert	d1c1ba90b8	update for OXID 6.2	2020-11-11 22:29:10 +01:00
Daniel Seifert	11d4227874	make dev helper installable in OXID 6.2	2020-11-11 11:43:32 +01:00
Daniel Seifert	3635f3c7e9	change module title logo (D3) source to external asset	2020-06-16 10:05:31 +02:00
Daniel Seifert	b0b0c93691	fix non https url in composer.json	2020-06-08 10:07:01 +02:00
Daniel Seifert	a4fa041154	change line endings for easy patching	2020-05-25 10:14:56 +02:00
Daniel Seifert	ccb48a73c1	change dependency to oxid-esales/oxideshop-ce	2020-04-07 20:49:44 +02:00
Daniel Seifert	f59d6b4cc7	fix typo	2019-10-22 10:21:46 +02:00
Daniel Seifert	81e730ca8f	change special chars in README	2019-10-21 08:56:21 +02:00
Daniel Seifert	c899d09f77	make changelog more precise	2019-10-21 08:47:56 +02:00
Daniel Seifert	0f4561d6f6	change README to utf-8	2019-10-18 22:13:16 +02:00
Daniel Seifert	62a534d42f	change version in metadata and changelog	2019-10-18 22:08:52 +02:00
Daniel Seifert	ef589ee8a3	prevent thankyou redirect in case of missing order	2019-10-16 15:16:33 +02:00
Daniel Seifert	bf9bd60921	in case of mail redirect changed some more informations to the redirection address	2019-10-16 14:59:57 +02:00
Daniel Seifert	73f38afc7f	adjust displayed mails to show bundle articles	2019-10-16 14:56:55 +02:00
Daniel Seifert	46d447dba7	remove d3 satis instructions	2018-12-21 10:25:40 +01:00
Daniel Seifert	049d38c77d	Merge branch 'rel_2.x' of https://github.com/d3datadevelopment/TPL-development-helper into rel_2.x # Conflicts: # composer.json	2018-09-04 12:41:19 +02:00
Daniel Seifert	6e50a3844c	available for OXID compilation 6.0 + 6.1	2018-09-04 12:39:57 +02:00
Daniel Seifert	98faef8eaa	change composer.json to eshop 6.2	2018-04-11 10:56:12 +02:00
Daniel Seifert	f146c21cf9	use satis service as composer source	2018-02-23 13:26:28 +01:00
Daniel Seifert	c96203da2c	adjustments for OXID version 6	2018-02-23 12:30:57 +01:00
Daniel Seifert	8debed2717	moved folder	2018-02-23 11:15:46 +01:00
Daniel Seifert	35c851b37f	add namespaces	2018-02-23 11:06:24 +01:00
Daniel Seifert	a0a2d925f8	add installation instructions, fix composer.json	2018-02-23 10:29:51 +01:00
Daniel Seifert	f9fd93c7e3	composer.json added, folder structure changed	2018-02-23 10:11:26 +01:00
kristianhempel	7d9c9a9837	changed CRLF to LF changed case to UTF-8	2018-01-25 11:30:17 +01:00
kristianhempel	1187854c86	migrate classes to OXID-eSales/oxideshop_ce V6.0.0 added .gitignore	2018-01-25 11:27:47 +01:00
kristianhempel	62413d02ef	migrate metadata, IntelliSenseHelper and class d3dev to oxid V6.0.0	2018-01-25 10:53:09 +01:00
Daniel Seifert	f46ac0e6da	add user authentification	2017-11-21 16:35:36 +01:00
Daniel Seifert	a136926975	readme updated	2017-11-21 16:30:05 +01:00
Daniel Seifert	bc6352d893	set encoding header	2017-11-17 12:38:46 +01:00
Daniel Seifert	1b60e58e85	readme completed	2017-05-31 09:55:54 +02:00
Daniel Seifert	1d182f9f31	readme added	2017-05-31 09:51:37 +02:00
Daniel Seifert	34c9c2f1ed	changelog completed	2017-05-31 09:22:52 +02:00
Daniel Seifert	440fa1a71c	add mail blocker && mail redirect	2017-05-30 17:10:16 +02:00
Daniel Seifert	6d777cd9f5	...	2017-05-30 16:17:39 +02:00
Daniel Seifert	47476ca025	Merge branch 'rel_1.x' of https://github.com/d3datadevelopment/TPL-development-helper into rel_1.x # Conflicts: # copy_this/modules/d3/d3dev/IntelliSenseHelper.php # copy_this/modules/d3/d3dev/controllers/d3dev.php # copy_this/modules/d3/d3dev/metadata.php # copy_this/modules/d3/d3dev/modules/controllers/d3_dev_thankyou.php # copy_this/modules/d3/d3dev/modules/models/d3_dev_oxemail.php	2017-05-30 16:15:30 +02:00
Daniel Seifert	f1369d0b4d	...	2017-05-30 16:00:47 +02:00