#3246

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.0.0',
+    'version'      => '3.3.0.1',
     'author'       => 'D³ Data Development (Inh. Thomas Dartsch)',
     'email'        => 'support@shopmodule.com',
     'url'          => 'http://www.oxidmodule.com/',

copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxorder_googleanalytics.php

@@ -13,11 +13,10 @@
  *
  *    For further informations, see <http://www.gnu.org/licenses/>.
  *
- * @link      http://www.oxidmodule.com
- * @link      http://www.shopmodule.com
+ * @link          http://www.oxidmodule.com
+ * @link          http://www.shopmodule.com
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
  */
-
 class d3_oxorder_googleanalytics extends d3_oxorder_googleanalytics_parent
 {
     /**
@@ -57,40 +56,21 @@ class d3_oxorder_googleanalytics extends d3_oxorder_googleanalytics_parent
      *
      * @return null|void
      */
-    protected function _setOrderArticles( $aArticleList )
+    protected function _setOrderArticles($aArticleList)
     {
         parent::_setOrderArticles($aArticleList);
 
         /** @var d3_oxbasketitem_googleanalytics $oBasketItem */
         foreach ($aArticleList as $oBasketItem) {
-            $oOrderArticle = $this->_d3getOrderArticleFromBasketItem($oBasketItem);
-            if ($oOrderArticle) {
-                $aContent['d3_galocator'] = $oBasketItem->d3GetLocatorTitle();
-                $oOrderArticle->assign($aContent);
-                $oOrderArticle->save();
+            /** @var oxorderarticle $oOrderArticle */
+            foreach ($this->_oArticles as $sArticleId => $oOrderArticle) {
+                $blArtIdMatch     = $oOrderArticle->getFieldData('oxartid') == $oBasketItem->getProductId();
+                $blAmountMatch    = $oOrderArticle->getFieldData('oxamount') == $oBasketItem->getAmount();
+                $blPersParamMatch = (null == $oBasketItem->getPersParams() || $oOrderArticle->getFieldData('oxpersparam') == $oBasketItem->getPersParams());
+                if ($blArtIdMatch && $blAmountMatch && $blPersParamMatch) {
+                    $this->_oArticles->offsetGet($sArticleId)->assign(array('d3_galocator' => $oBasketItem->d3GetLocatorTitle()));
+                }
             }
         }
     }
-
-    /**
-     * @param oxbasketitem $oBasketItem
-     *
-     * @return false|oxorderarticle
-     */
-    protected function _d3getOrderArticleFromBasketItem($oBasketItem)
-    {
-        $aPersParams = $oBasketItem->getPersParams();
-
-        /** @var oxorderarticle $oOrderArticle */
-        foreach ($this->_oArticles as $sArticleId => $oOrderArticle) {
-            if ($oOrderArticle->getFieldData('oxartid') == $oBasketItem->getProductId() &&
-                $oOrderArticle->getFieldData('oxamount') == $oBasketItem->getAmount() &&
-                (null == $aPersParams || $oOrderArticle->getFieldData('oxpersparam') == $aPersParams)
-            ) {
-                return $this->_oArticles->offsetGet($sArticleId);
-            }
-        }
-
-        return false;
-    }
 }

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.0.0';
+    public $sModVersion = '3.3.0.1';
 
-    public $sModRevision = '196';
+    public $sModRevision = '197';
 
     // heredoc syntax using for class members is available from PHP 5.3 up
     public $sBaseConf =
-    "2kGUVVXMXJZNUlFdkwvcCtzTEJ1QkxvSW1HSm5zV3M4a1UxTU90VEtBaGNIeTZKSGVPRXJ6MDc0UTk4O
-FpodEtKUEZuc2hxSDZnUEhaQmtqRFBoN3dqN21ncm9zY1FGaEdqUE15T0JoSGllSU8rWVZUbWhHSnpxM
-UNXSnpyUm1GYWZaN092Rkw1T2tEZXliTml4OFFlRTZGWnY5emxKa0JjV1VTZ2I5T2FETklZOEwyd2Rnc
-FF3S3pHMklCbkZyVGNvQkIvUDlQWENNTHBJQmNPKzBvSFZnUUxVSTVYOUU3OW9YeWJqRkxZZUs5YjFSS
-XNCYTJ0SzNZZ1J4bUFNK25HM1FkQ3NxLzRvWkYwYjVvdXZKNXdWV0FZT0FPemsyRjI5TGJUbWZJMnU2Q
-nc9";
+    "J0wL0pyTiszdC83VWJsWXhPZ0RIQm93RVI4ampycUNBdTZQYnFlT1dMemIybnU0Z0wrUThLM21IS2dyY
+VdZbjM2QnovWmREQ1d0cUlWS3JVY3oycklqMU5Odm5WMzg0empqNmlGMVFZVWlKeHI3QWJSaUJKMktVd
+UZwTlR3S05yZGZSNEQvSkExSEphQ3JDanU3L1ZrVks5WFF2eHNMUTJkejNHQ3Z3T2YwelZTWHdNOFdWa
+Vk2ZFNzRzNzVktNZjNaUjdtYkxrQVYwWDQwUXNSZkdkMUxMZUpKNnRWMVVxN0pVcHZkQWdjMWxrMTVSO
+Fc2dE5iei9xdWFjMkgxOEdJSUt5QXVhbHBWTUdJNEFzMmM4cXpGVmNkeWJROU1pTitkVThlSjhEamZhe
+G89";
 
     public $sRequirements = '';
 

setup+doku/Precheck/d3precheck.php

@@ -43,7 +43,7 @@ class requConfig
 
     public $sModId = 'd3_googleanalytics';
 
-    public $sModVersion = '3.3.0.0';
+    public $sModVersion = '3.3.0.1';
 
     /********************** check configuration section ************************/
 

setup+doku/changelog.txt

@@ -1,3 +1,6 @@
+=> 3.3.0.1
+- Kompatibilität zu Egate Media PayPal verbessert
+
 => 3.3.0.0
 - Google Zertifierte Händler eingefügt
 - Hilfetexte erweitert