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 · 2017-05-30 16:15:30 +02:00 · 47476ca025
Commit 47476ca025
--- a/copy_this/modules/d3/d3dev/IntelliSenseHelper.php
+++ b/copy_this/modules/d3/d3dev/IntelliSenseHelper.php
@ -21,6 +21,11 @@ class d3_dev_thankyou_parent extends thankyou {}
 */
 class d3_dev_oxorder_parent extends oxorder {}

+/**
+ * Class d3_dev_d3inquiry_parent
+ */
+class d3_dev_d3inquiry_parent extends d3inquiry {}
+
 /**
 * Class d3_dev_oxorderarticle
 */
--- a/copy_this/modules/d3/d3dev/controllers/d3dev.php
+++ b/copy_this/modules/d3/d3dev/controllers/d3dev.php
@ -35,4 +35,24 @@ class d3dev extends oxUBase
        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
@ -31,10 +31,14 @@ $aModule = array(
            '<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">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">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">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">User Plain</a></li></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',
@ -80,3 +84,9 @@ $aModule = array(
        ),
    ),
 );
+
+
+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
@ -52,4 +52,20 @@ class d3_dev_thankyou extends d3_dev_thankyou_parent

        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
@ -0,0 +1,154 @@
+<?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_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
@ -0,0 +1,38 @@
+<?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_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_oxemail.php
+++ b/copy_this/modules/d3/d3dev/modules/models/d3_dev_oxemail.php
@ -79,4 +79,68 @@ class d3_dev_oxemail extends d3_dev_oxemail_parent

        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));
+    }
 }