D3Public/GoogleServices
8
0
Fork 0
Code Pull Requests Releases Activity

Merge all from fix_3246 at 202 (reintegration)

Browse Source
This commit is contained in:
RayEhrhardt 2014-11-20 11:18:50 +00:00
parent d14f80df8f
commit c44f66609a
6 changed files with 29 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
copy_this/modules/d3/d3_googleanalytics/metadata.php
View File

@ -40,7 +40,7 @@ $aModule = array(
'Trusted Shops account to your shop.', 'Trusted Shops account to your shop.',
), ),
'thumbnail' => 'picture.png', 'thumbnail' => 'picture.png',
'version' => '3.3.0.0', 'version' => '3.3.0.1',
'author' => 'D³ Data Development (Inh. Thomas Dartsch)', 'author' => 'D³ Data Development (Inh. Thomas Dartsch)',
'email' => 'support@shopmodule.com', 'email' => 'support@shopmodule.com',
'url' => 'http://www.oxidmodule.com/', 'url' => 'http://www.oxidmodule.com/',

8
copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
View File

@ -293,7 +293,8 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
public function d3GetGTSLang() public function d3GetGTSLang()
{ {
$aHomeCountries = oxRegistry::getConfig()->getConfigParam('aHomeCountry'); $aHomeCountries = oxRegistry::getConfig()->getConfigParam('aHomeCountry');
$sHomeCountryId = $aHomeCountries[array_keys($aHomeCountries)[0]]; $aKeys = array_keys($aHomeCountries);
$sHomeCountryId = $aHomeCountries[current($aKeys)];
/** @var oxcountry $oCountry */ /** @var oxcountry $oCountry */
$oCountry = oxNew('oxcountry'); $oCountry = oxNew('oxcountry');
$oCountry->load($sHomeCountryId); $oCountry->load($sHomeCountryId);
@ -326,7 +327,6 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
return array('aArtIdList' => $aArticleIds); return array('aArtIdList' => $aArticleIds);
} }
/** /**
* @param array $aArticleIds * @param array $aArticleIds
* *
@ -335,7 +335,9 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
public function d3GATSGetProdIdList($aArticleIds) public function d3GATSGetProdIdList($aArticleIds)
{ {
if (count($aArticleIds)) { if (count($aArticleIds)) {
return $aArticleIds[array_keys($aArticleIds)[0]]; $aKeys = array_keys($aArticleIds);
return $aArticleIds[current($aKeys)];
} else { } else {
return "not_set"; return "not_set";
} }

42
copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxorder_googleanalytics.php
View File

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

16
copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php
View File

@ -21,18 +21,18 @@ class d3_googleanalytics_update extends d3install_updatebase
public $sModName = 'Google Services Schnittstelle'; 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 // heredoc syntax using for class members is available from PHP 5.3 up
public $sBaseConf = public $sBaseConf =
"2kGUVVXMXJZNUlFdkwvcCtzTEJ1QkxvSW1HSm5zV3M4a1UxTU90VEtBaGNIeTZKSGVPRXJ6MDc0UTk4O "J0wL0pyTiszdC83VWJsWXhPZ0RIQm93RVI4ampycUNBdTZQYnFlT1dMemIybnU0Z0wrUThLM21IS2dyY
FpodEtKUEZuc2hxSDZnUEhaQmtqRFBoN3dqN21ncm9zY1FGaEdqUE15T0JoSGllSU8rWVZUbWhHSnpxM VdZbjM2QnovWmREQ1d0cUlWS3JVY3oycklqMU5Odm5WMzg0empqNmlGMVFZVWlKeHI3QWJSaUJKMktVd
UNXSnpyUm1GYWZaN092Rkw1T2tEZXliTml4OFFlRTZGWnY5emxKa0JjV1VTZ2I5T2FETklZOEwyd2Rnc UZwTlR3S05yZGZSNEQvSkExSEphQ3JDanU3L1ZrVks5WFF2eHNMUTJkejNHQ3Z3T2YwelZTWHdNOFdWa
FF3S3pHMklCbkZyVGNvQkIvUDlQWENNTHBJQmNPKzBvSFZnUUxVSTVYOUU3OW9YeWJqRkxZZUs5YjFSS Vk2ZFNzRzNzVktNZjNaUjdtYkxrQVYwWDQwUXNSZkdkMUxMZUpKNnRWMVVxN0pVcHZkQWdjMWxrMTVSO
XNCYTJ0SzNZZ1J4bUFNK25HM1FkQ3NxLzRvWkYwYjVvdXZKNXdWV0FZT0FPemsyRjI5TGJUbWZJMnU2Q Fc2dE5iei9xdWFjMkgxOEdJSUt5QXVhbHBWTUdJNEFzMmM4cXpGVmNkeWJROU1pTitkVThlSjhEamZhe
nc9"; G89";
public $sRequirements = ''; public $sRequirements = '';

2
setup+doku/Precheck/d3precheck.php
View File

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

3
setup+doku/changelog.txt
View File

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