Merged revision(s) 216-225 from branches/rel_3.x to trunk

2015-07-29 07:08:55 +00:00 · 2015-07-29 07:08:55 +00:00 · 0e6663c139
parent 1ca54a1744 e59fdfdbeb
commit 0e6663c139
16 changed files with 111 additions and 38 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -5,7 +5,7 @@ Sources/FireShot[!!-~]Screen[!!-~]Capture[!!-~]#251[!!-~]-[!!-~]'Conversion-Trac
 Sources/FireShot[!!-~]Screen[!!-~]Capture[!!-~]#252[!!-~]-[!!-~]'Google[!!-~]Analytics'[!!-~]-[!!-~]www_google_com_analytics_web__authuser=0#management_Settings_a50621059w82651812p85583465__m_page=CustomMetrics.png -text
 Sources/Google[!!-~]AdWords-Einrichtung.docx -text
 Sources/Google[!!-~]Analytics-Einrichtung.docx -text
-Sources/Google[!!-~]Analytics-Installation.docx -text
+Sources/Google[!!-~]Services-Installation.docx -text
 Sources/UGA_Custom_Dimensions.jpg -text
 Sources/UGA_Einstellungen.jpg -text
 Sources/UGA_Trichtereinrichtung.jpg -text
@ -60,6 +60,6 @@ copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_m
 copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl -text
 setup+doku/Google[!!-~]AdWords-Einrichtung.pdf -text svneol=unset#unset
 setup+doku/Google[!!-~]Analytics-Einrichtung.pdf -text svneol=unset#unset
-setup+doku/Google[!!-~]Analytics-Installation.pdf -text
+setup+doku/Google[!!-~]Services-Installation.pdf -text
 setup+doku/Precheck/d3precheck.php -text
 setup+doku/changelog.txt -text
--- a/Analytics-Installation.docx
+++ b/Analytics-Installation.docx
--- a/Services-Installation.docx
+++ b/Services-Installation.docx
--- a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl
+++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl
@ -206,8 +206,8 @@
                })();
            </script>

-            [{if (!$oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou') &&
-                  !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode')}]
+            [{if (false == $oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou') &&
+                  $oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode')}]
                [{$oD3GASettings->getValue('sD3GACampaignCode')}]
            [{/if}]
        [{/strip}]
--- a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl
+++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl
@ -50,7 +50,7 @@
                <span id="gts-o-total">[{$sTotal|string_format:"%.2f"}]</span>
                <span id="gts-o-discounts">-[{$oOrder->getFieldData('oxdiscount')|string_format:"%.2f"}]</span>
                <span id="gts-o-shipping-total">[{$oOrder->getFieldData('oxdelcost')|string_format:"%.2f"}]</span>
-                <span id="gts-o-tax-total">[{math equation="fi + se + th + fo" fi=$oOrder->getFieldData('oxartvatprice1') se=$oOrder->getFieldData('oxartvatprice2') th=$oOrder->getFieldData('oxpayvat') fo=$oOrder->getFieldData('oxdelvat') format="%.2f"}]</span>
+                <span id="gts-o-tax-total">[{$oOrder->d3GetTaxTotal()}]</span>
                <span id="gts-o-est-delivery-date">[{$oView->d3GAgetEstimatedDeliveryDate()|date_format:"%Y-%m-%d"}]</span>
                <span id="gts-o-est-ship-date">[{$oView->d3GAgetEstimatedShippingDate()|date_format:"%Y-%m-%d"}]</span>
                <span id="gts-o-has-preorder">[{$oView->d3GAhasBackorderPreorder()}]</span>
--- a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php
+++ b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php
@ -27,4 +27,12 @@ class d3_cfg_googleanalytics_licence extends d3_cfg_mod_licence
    protected $_hasNewsletterForm = false;

    protected $_hasUpdate = true;
+
+    protected $_sDefaultHelpLinkAdd = 'Fragen-zu-speziellen-Modulen/Google-Analytics/';
+    /**
+     * additional multilang item, which will added as last part to help url
+     *
+     * @var string
+     */
+    protected $_sHelpLinkMLAdd = '';
 }
--- a/copy_this/modules/d3/d3_googleanalytics/metadata.php
+++ b/copy_this/modules/d3/d3_googleanalytics/metadata.php
@ -40,7 +40,7 @@ $aModule = array(
                'Trusted Shops account to your shop.',
    ),
    'thumbnail'    => 'picture.png',
-    'version'      => '3.3.1.0',
+    'version'      => '3.3.2.0',
    'author'       => 'D&sup3; Data Development (Inh. Thomas Dartsch)',
    'email'        => 'support@shopmodule.com',
    'url'          => 'http://www.oxidmodule.com/',
--- a/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
+++ b/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
@ -55,9 +55,12 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
            $oParentView->addTplParam('blD3GAIsMobile', $this->d3isMobile());
            $oParentView->addTplParam('iD3GASendNoBounceEventTime', $this->d3GetSendNoBounceEventTime());

+            if ($oSet->getValue('sD3GATSActive')) {
+                $oParentView->addTplParam('sD3CurrentGTSLang', $this->d3GetGTSLang());
+            }
+
            if ($oSet->getValue('sD3GATSActive') && $oSet->getValue('sD3GATSShoppingActive')) {
                $aInfos = $this->d3GATSGetProdInfos();
-                $oParentView->addTplParam('sD3CurrentGTSLang', $this->d3GetGTSLang());
                $oParentView->addTplParam('sD3GATSProdId', $this->d3GATSGetProdIdList($aInfos['aArtIdList']));
            }

--- a/copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxorder_googleanalytics.php
+++ b/copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxorder_googleanalytics.php
@ -73,4 +73,51 @@ class d3_oxorder_googleanalytics extends d3_oxorder_googleanalytics_parent
            }
        }
    }
+
+    /**
+     * @return float
+     */
+    public function d3GetOrderPayVat()
+    {
+        return $this->getFieldData('oxpaycost') / 100 * $this->getFieldData('oxpayvat');
+    }
+
+    /**
+     * @return float
+     */
+    public function d3GetOrderDelVat()
+    {
+        return $this->getFieldData('oxdelcost') / 100 * $this->getFieldData('oxdelvat');
+    }
+
+    /**
+     * @return float
+     */
+    public function d3GetOrderWrapVat()
+    {
+        return $this->getFieldData('oxwrapcost') / 100 * $this->getFieldData('oxwrapvat');
+    }
+
+    /**
+     * @return float
+     */
+    public function d3GetOrderCardVat()
+    {
+        return $this->getFieldData('oxcardcost') / 100 * $this->getFieldData('oxcardvat');
+    }
+
+    /**
+     * @return float
+     */
+    public function d3GetTaxTotal()
+    {
+        $dVat =  $this->getFieldData('oxartvatprice1')
+            + $this->getFieldData('oxartvatprice2')
+            + $this->d3GetOrderPayVat()
+            + $this->d3GetOrderDelVat()
+            + $this->d3GetOrderWrapVat()
+            + $this->d3GetOrderCardVat();
+
+        return sprintf('%.2f', $dVat);
+    }
 }
--- a/copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php
+++ b/copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php
@ -21,18 +21,18 @@ class d3_googleanalytics_update extends d3install_updatebase

    public $sModName = 'Google Services Schnittstelle';

-    public $sModVersion = '3.3.1.0';
+    public $sModVersion = '3.3.2.0';

-    public $sModRevision = '214';
+    public $sModRevision = '228';

    // heredoc syntax using for class members is available from PHP 5.3 up
    public $sBaseConf =
-    "U88cS9acWI1SStIK2FRa1hienV0TW43N1djMUFrQTBmdEpsKzF4U2t3M3h6Wk1KcnI4bjFFZ3pUWFgxY
-XNCc2VDSHIzSTFDN2xURkIxSUZuMG12cnQ3ajJKWEozRmNoZ2Y3TVRkK2hsSFFCU3BXcEh1ekdQcnR2V
-S9yL3QzT0NuZm1LNHQ2R3RCOHlzekIrTjFJTjhucm0rY29WeTEzeFgzc3Y5MkFUYlh3ZkFuc3ByRkZYT
-2ZSWVYvaHpJY3A5Ky85cDJnYTkrc3l6MXgzK0NTcmY2MTZDV0hIMmFuRmJ1MzFHSnNJUEFDLzUvSGxWT
-DRNWEFybDE3SGJXdjJNS1R1a0lPejFqZFVMN3JzMWYrRElYY2t0RTdQUmN6bnJmdDNaNnR1SndaSjcza
-kk9";
+    "9I7SjYrOVJJbDRCZTBFTjhiOVI5VElTamJwNDQ3Qk9FeWdLQjVXaHBaRFBHemxYV0NZYVJ2ZWN2SmMrS
+m1taGh4OHk3Z0NXbUFDWUJaWjZXYVJicEM3a3AwTTFYWlVOZXlhYitWa2ptTDBLSVh0R1ArbkRYT3Jub
+jE0cm1sSVgxOWpIMGQ1NjJ3TklEVTE1YW5YR1VueW4zcUNqZHNQK0NKRW1WOFpENGdISms4QTlDdS8xQ
+kYzUldpVkJiNXVkUVZFK0dyd2hTcXRRb0tjN0ZCdHJ3VGJyVzZSbFdyc01yeXp4WVM3Sk9DblhqR0ZIY
+lZWa0h3WGF3b0NYWlloT0dsU0dPYkJpWjR6M3dWdllFVFE0eVhiQWM0cHdLdmQ4cHhYR1kySWZ3T2EzW
+DQ9";

    public $sRequirements = '';

@ -78,7 +78,7 @@ kk9";
    public function checkModCfgItemExist()
    {
        $blRet = false;
-        foreach ($this->_getShopList() as $oShop) {
+        foreach ($this->getShopList() as $oShop) {
            /** @var $oShop oxshop */
            $aWhere = array(
                'oxmodid'       => $this->sModKey,
@ -104,7 +104,7 @@ kk9";
        $blRet = false;

        if ($this->checkModCfgItemExist()) {
-            foreach ($this->_getShopList() as $oShop) {
+            foreach ($this->getShopList() as $oShop) {
                /** @var $oShop oxshop */
                $aWhere = array(
                    'oxmodid'       => $this->sModKey,
@ -178,10 +178,10 @@ kk9";
                            'use_quote'    => true,
                        ),
                    );
-                    $aRet          = $this->_updateTableItem('d3_cfg_mod', $aInsertFields, $aWhere);
+                    $aRet          = $this->_updateTableItem2('d3_cfg_mod', $aInsertFields, $aWhere);
                    $blRet         = $aRet['blRet'];
-                    $this->_setActionLog('SQL', $aRet['sql'], __METHOD__);
-                    $this->_setUpdateBreak(false);
+                    $this->setActionLog('SQL', $aRet['sql'], __METHOD__);
+                    $this->setUpdateBreak(false);

                    if ($this->getStepByStepMode()) {
                        break;
@ -199,7 +199,7 @@ kk9";
    public function checkContentGANoticeItemExist()
    {
        $blRet = false;
-        foreach ($this->_getShopList() as $oShop) {
+        foreach ($this->getShopList() as $oShop) {
            /** @var $oShop oxshop */
            $aWhere = array(
                'oxloadid' => 'Analytics_Security_Informations',
@ -224,7 +224,7 @@ kk9";
        $blRet = false;

        if ($this->checkContentGANoticeItemExist()) {
-            foreach ($this->_getShopList() as $oShop) {
+            foreach ($this->getShopList() as $oShop) {
                /** @var $oShop oxshop */
                $aWhere = array(
                    'oxloadid' => 'Analytics_Security_Informations',
@ -282,11 +282,11 @@ kk9";
                            'force_update' => false,
                        ),
                    );
-                    $aRet          = $this->_updateTableItem('oxcontents', $aInsertFields, $aWhere);
+                    $aRet          = $this->_updateTableItem2('oxcontents', $aInsertFields, $aWhere);
                    $blRet         = $aRet['blRet'];

-                    $this->_setActionLog('SQL', $aRet['sql'], __METHOD__);
-                    $this->_setUpdateBreak(false);
+                    $this->setActionLog('SQL', $aRet['sql'], __METHOD__);
+                    $this->setUpdateBreak(false);

                    if ($this->getStepByStepMode()) {
                        break;
@ -316,8 +316,8 @@ kk9";
        if ($this->checkModCfgSameRevision($this->sModKey)) {
            $aRet = $this->_updateModCfgSameRevision($this->sModKey);

-            $this->_setActionLog('SQL', $aRet['sql'], __METHOD__);
-            $this->_setUpdateBreak(false);
+            $this->setActionLog('SQL', $aRet['sql'], __METHOD__);
+            $this->setUpdateBreak(false);
            $blRet = $aRet['blRet'];
        }

--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
@ -398,11 +398,12 @@ $aLang = array(
        'mit dem das Tracking für diese Seite deaktiviert wird.</p><p>Weitere Informationen zu dieser Option finden '.
        'Sie in der <a href="https://www.google.de/search?q=Analytics+_opt+out+script" target="gahelp">Google-Suche'.
        '</a>.</p>',
+
+    // Erweiterung des Links in der Fussnote "Hilfe Starten"
+    'D3_GOOGLEANALYTICS_HELPLINK' => 'Fragen-zu-speziellen-Modulen/Google-Analytics/',
 );


 /*
-
-[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }]
-
+[{oxmultilang ident="GENERAL_YOUWANTTODELETE"}]
 */
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php
@ -398,6 +398,9 @@ $aLang = array(
        'mit dem für diesen Nutzer das Tracking für diese Seite deaktiviert wird.</p><p>Weitere Informationen zu '.
        'dieser Option finden Sie in der <a href="https://www.google.de/search?q=Analytics+_opt+out+script" '.
        'target="gahelp">Google-Suche</a>.</p>',
+
+    // Erweiterung des Links in der Fussnote "Hilfe Starten"
+    'D3_GOOGLEANALYTICS_HELPLINK' => 'Fragen-zu-speziellen-Modulen/Google-Analytics/',
 );


--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl
@ -113,7 +113,7 @@
                            <label for="sD3GATSActive">[{oxmultilang ident="D3_GOOGLEANALYTICS_TS_ACTIVE"}]</label>
                        </dt>
                        <dd>
-                            <input type="hidden" name="" value="0">
+                            <input type="hidden" name="value[sD3GATSActive]" value="0">
                            <input id="sD3GATSActive" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('sD3GATSActive')}]checked[{/if}] name="value[sD3GATSActive]">
                            [{oxinputhelp ident="D3_GOOGLEANALYTICS_TS_ACTIVE_DESC"}]
                        </dd>
@ -172,7 +172,7 @@
                            <label for="sD3GATSShoppingActive">[{oxmultilang ident="D3_GOOGLEANALYTICS_TS_SHOPPINGACTIVE"}]</label>
                        </dt>
                        <dd>
-                            <input type="hidden" name="" value="0">
+                            <input type="hidden" name="value[sD3GATSShoppingActive]" value="0">
                            <input id="sD3GATSShoppingActive" class="edittext ext_edittext" type="checkbox" value="1" [{if $edit->getValue('sD3GATSShoppingActive')}]checked[{/if}] name="value[sD3GATSShoppingActive]">
                            [{oxinputhelp ident="D3_GOOGLEANALYTICS_TS_SHOPPINGACTIVE_DESC"}]
                        </dd>
--- a/Analytics-Installation.pdf
+++ b/Analytics-Installation.pdf
--- a/setup+doku/Precheck/d3precheck.php
+++ b/setup+doku/Precheck/d3precheck.php
@ -41,9 +41,9 @@ class requConfig
 {
    public $sModName = 'D³ Google Services';

-    public $sModId = 'd3_googleanalytics';
+    public $sModId   = 'd3_googleanalytics';

-    public $sModVersion = '3.3.1.0';
+    public $sModVersion = '3.3.2.0';

    /********************** check configuration section ************************/

@ -113,9 +113,9 @@ class requConfig
        'hasMaxShopVersion'      => array(
            'blExec'  => 1,
            'aParams' => array(
-                'PE' => '4.9.0',
-                'CE' => '4.9.0',
-                'EE' => '5.2.0'
+                'PE' => '4.9.4',
+                'CE' => '4.9.4',
+                'EE' => '5.2.4'
            ),
        ),

@ -143,7 +143,7 @@ class requConfig
                'aParams' => array(
                    'id'      => 'd3modcfg_lib',
                    'name'    => 'Modul-Connector',
-                    'version' => '4.0.0.0',
+                    'version' => '4.3.3.0',
                ),
            ),
        ),
--- a/setup+doku/changelog.txt
+++ b/setup+doku/changelog.txt
@ -1,3 +1,14 @@
+=> 3.3.2.0
+- fix: Optionen im Admin können nicht deaktivert werden
+       - "Zertifizierter Händler" im Shop aktivieren
+       - zusätzliche Daten aus Google Shopping übertragen
+- fix: Zertifizierte Händler, „locale“ Eintrag auch ohne 
+       aktive Option "zusätzliche Daten aus Google Shopping übertragen"
+- fix: Kampagnencode wurde nicht übertragen	   
+- Link "Hilfe starten" korrigieren
+- Aktualisierung der Modulinstallationsanleitung / Vorabprüfung (d3precheck) 
+- freigegeben bis PHP 5.6
+
 => 3.3.1.0
 - Lieferzeitangabe kann nun für lagernde und nicht lagernde Artikel getrennt angegeben werden
 - Domainliste bei Verwendung mehrerer Shop-Domains korrigiert