Index: /mods/wpsg_mod_statistics.class.php =================================================================== --- /mods/wpsg_mod_statistics.class.php (revision 8313) +++ /mods/wpsg_mod_statistics.class.php (revision 8314) @@ -519,8 +519,77 @@ } - if ((int)$this->shop->get_option('wpsg_mod_statistics_google_active') == 1) - { - $this->simulateUrl = $this->shop->getURL(wpsg_ShopController::URL_BASKET).'?wpsg_done'; - add_action('wp_footer', array($this, 'get_googleanalytics_html'), 100); + if ($this->shop->get_option('wpsg_mod_statistics_google_ecommerce') == '1') + { + + if (!empty($done_view['basket']['coupon']['0']['code'])) $coupon_code = $done_view['basket']['coupon']['0']['code']; + else $coupon_code = false; + + $products = ''; + foreach($done_view['basket']['produkte'] as $p) { + + $oProduct = wpsg_product::getInstance($p['id']); + $productCat = ''; + + if ($this->shop->hasMod('wpsg_mod_produktartikel')) + { + + $categoryID = $oProduct->getPostID(); + $terms = get_the_terms($categoryID, get_taxonomies()); + + if ($terms) + { + + $termNames = array(); + foreach ($terms as $term) $termNames[] = $term->name; + + for ($i = 0; $i < 5; $i++) + { + + if (isset($termNames[$i])) $productCat .= 'item_category'.($i+1).': "'.$termNames[$i].'", '; + else $productCat .= 'item_category'.($i+1).': "false", '; + + } + + } + + } else $productCat = 'item_category: "false",'; + + if ($this->shop->hasMod('wpsg_mod_productvariants')) $arVariInfo = $this->shop->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($p['product_key'])); + else $arVariInfo = '"false"'; + + $products .= '{ + item_id: "'. $p['id'] .'", + item_name: "'. $p['name'] .'", + affiliation: "false", + coupon: "false", + discount: false, + index: '. $p['product_index'] .', + item_brand: "false", + '. $productCat .' // maximal 5 Porduktkategorien - API limitierung + item_list_id: "false", + item_list_name: "false", + item_variant: "'. $arVariInfo['key'] .'", + location_id: "false", + price: '. $p['preis_brutto'] .', + quantity: '. $p['menge'] .' + },'; + + } + $products = rtrim($products, ','); + + echo ''; + } @@ -556,67 +625,100 @@ public function wp_head() { - - // https://developer.matomo.org/guides/tracking-javascript-guide - - if (!$this->usePiwik()) return false; - - echo ''; - - if ($this->shop->get_option('wpsg_mod_statistics_piwik_trackingcode') == '1') - { - - $url = $this->shop->get_option('wpsg_mod_statistics_piwik_url'); - - echo ' - - - - '; - - echo ' - - '; + + if ($this->shop->get_option('wpsg_mod_statistics_piwik_trackingcode') == '1') + { + + $url = $this->shop->get_option('wpsg_mod_statistics_piwik_url'); - _paq.push(["setTrackerUrl", pkBaseURL + "matomo.php"]); - _paq.push(["setSiteId", '.$this->shop->get_option('wpsg_mod_statistics_piwik_SiteId').']); - - } catch(err) { } - - - '; - - } - - if ($this->shop->get_option('wpsg_mod_statistics_piwik_generel') == '1') - { - - echo ' - - - - '; - - } + echo ' + + + + '; + + echo ' + + + + '; + + } + + if ($this->shop->get_option('wpsg_mod_statistics_piwik_generel') == '1') + { + + echo ' + + + + '; + + } + + } + + if ($this->useGA4()) + { + + // https://developers.google.com/analytics/devguides/collection/ga4/set-up-ecommerce + if ($this->shop->get_option('wpsg_mod_statistics_google_active') == '1') + { + + $tag_id = $this->shop->get_option('wpsg_mod_statistics_google_tracking_code'); + + echo ' + + + '; + + } + + } + + } + else return false; + } // public function wp_head() @@ -756,9 +858,4 @@ add_action('wp_dashboard_setup', array($this, 'wpsg_statistics_add_dashboard_widgets')); // Hint: For Multisite Network Admin Dashboard use wp_network_dashboard_setup instead of wp_dashboard_setup. - - if ((int)$this->shop->get_option('wpsg_mod_statistics_google_active') == 1 && !isset($_GET['wpsg_done'])) - { - add_action('wp_footer', array($this, 'get_googleanalytics_html'), 100); - } add_action('wp_footer', array($this, 'productCat_bottom')); @@ -921,28 +1018,28 @@ { -/* - $o = wpsg_getStr($this->shop->view['filter']['order']); - $s = wpsg_getStr($this->shop->view['filter']['sort']); - $r = wpsg_getStr($this->shop->view['standardFilter'][wpsg_getStr($this->shop->view['filter']['related'])]['point']); - $p = $this->shop->view['standardFilter'][$this->shop->view['filter']['standard']]['point']; - - //$this->shop->view['chart']['data'] = - //$objchartClass->$chartFunction($this->shop->view['standardFilter'][$this->shop->view['filter']['standard']]['point'], - //array('relatedpoint' => $this->shop->view['standardFilter'][wpsg_getStr($this->shop->view['filter']['related'])]['point'], - // 'order' => wpsg_getStr($this->shop->view['filter']['order']), - // 'sort' => wpsg_getStr($this->shop->view['filter']['sort']))); - - $this->shop->view['chart']['data'] = $objchartClass->$chartFunction($p, array('relatedpoint' => $r, 'order' => $o, 'sort' => $s)); - - //if ((array_key_exists('related', $this->shop->view['filter'])) && ($this->shop->view['filter']['related'] != null)) - //{ - // $this->shop->view['chart']['data'] = $objchartClass->$chartFunction($this->shop->view['standardFilter'][$this->shop->view['filter']['standard']]['point'], array('relatedpoint' => $this->shop->view['standardFilter'][wpsg_getStr($this->shop->view['filter']['related'])]['point'], 'order' => wpsg_getStr($this->shop->view['filter']['order']), 'sort' => wpsg_getStr($this->shop->view['filter']['sort']))); - //} - - if (($_REQUEST['page'] == 'wpsg-Statistics') && (wpsg_isSizedString($_REQUEST['id']) != 4)) - { - $this->shop->view['chart']['info'] = $this->shop->view['charts'][$_REQUEST['id']]['type'][$_REQUEST['type']]; - } -*/ + /* + $o = wpsg_getStr($this->shop->view['filter']['order']); + $s = wpsg_getStr($this->shop->view['filter']['sort']); + $r = wpsg_getStr($this->shop->view['standardFilter'][wpsg_getStr($this->shop->view['filter']['related'])]['point']); + $p = $this->shop->view['standardFilter'][$this->shop->view['filter']['standard']]['point']; + + //$this->shop->view['chart']['data'] = + //$objchartClass->$chartFunction($this->shop->view['standardFilter'][$this->shop->view['filter']['standard']]['point'], + //array('relatedpoint' => $this->shop->view['standardFilter'][wpsg_getStr($this->shop->view['filter']['related'])]['point'], + // 'order' => wpsg_getStr($this->shop->view['filter']['order']), + // 'sort' => wpsg_getStr($this->shop->view['filter']['sort']))); + + $this->shop->view['chart']['data'] = $objchartClass->$chartFunction($p, array('relatedpoint' => $r, 'order' => $o, 'sort' => $s)); + + //if ((array_key_exists('related', $this->shop->view['filter'])) && ($this->shop->view['filter']['related'] != null)) + //{ + // $this->shop->view['chart']['data'] = $objchartClass->$chartFunction($this->shop->view['standardFilter'][$this->shop->view['filter']['standard']]['point'], array('relatedpoint' => $this->shop->view['standardFilter'][wpsg_getStr($this->shop->view['filter']['related'])]['point'], 'order' => wpsg_getStr($this->shop->view['filter']['order']), 'sort' => wpsg_getStr($this->shop->view['filter']['sort']))); + //} + + if (($_REQUEST['page'] == 'wpsg-Statistics') && (wpsg_isSizedString($_REQUEST['id']) != 4)) + { + $this->shop->view['chart']['info'] = $this->shop->view['charts'][$_REQUEST['id']]['type'][$_REQUEST['type']]; + } + */ if (($_REQUEST['page'] == 'wpsg-Statistics')) @@ -1047,18 +1144,8 @@ $this->shop->update_option('wpsg_mod_statistics_google_active', $_REQUEST['wpsg_mod_statistics_google_active'], false, false, WPSG_SANITIZE_CHECKBOX); - $this->shop->update_option('wpsg_mod_statistics_google_domainname', $_REQUEST['wpsg_mod_statistics_google_domainname'], false, false, WPSG_SANITIZE_DOMAIN); $this->shop->update_option('wpsg_mod_statistics_google_tracking_code', $_REQUEST['wpsg_mod_statistics_google_tracking_code'], false, false, WPSG_SANITIZE_TEXTFIELD); - $this->shop->update_option('wpsg_mod_statistics_google_anonymise_ip_address', $_REQUEST['wpsg_mod_statistics_google_anonymise_ip_address'], false, false, WPSG_SANITIZE_CHECKBOX); - $this->shop->update_option('wpsg_mod_statistics_google_opt_out', $_REQUEST['wpsg_mod_statistics_google_opt_out'], false, false, WPSG_SANITIZE_CHECKBOX); - $this->shop->update_option('wpsg_mod_statistics_google_enhanced_tracking_code', $_REQUEST['wpsg_mod_statistics_google_enhanced_tracking_code'], false, false, WPSG_SANITIZE_CHECKBOX); - - $this->shop->update_option('wpsg_mod_statistics_google_track_page_load_time', $_REQUEST['wpsg_mod_statistics_google_track_page_load_time'], false, false, WPSG_SANITIZE_CHECKBOX); - $this->shop->update_option('wpsg_mod_statistics_google_done', $_REQUEST['wpsg_mod_statistics_google_done'], false, false, WPSG_SANITIZE_TEXTFIELD); - $this->shop->update_option('wpsg_mod_statistics_google_basket', $_REQUEST['wpsg_mod_statistics_google_basket'], false, false, WPSG_SANITIZE_TEXTFIELD); - $this->shop->update_option('wpsg_mod_statistics_google_checkout', $_REQUEST['wpsg_mod_statistics_google_checkout'], false, false, WPSG_SANITIZE_TEXTFIELD); - $this->shop->update_option('wpsg_mod_statistics_google_checkout2', $_REQUEST['wpsg_mod_statistics_google_checkout2'], false, false, WPSG_SANITIZE_TEXTFIELD); - $this->shop->update_option('wpsg_mod_statistics_google_overview', $_REQUEST['wpsg_mod_statistics_google_overview'], false, false, WPSG_SANITIZE_TEXTFIELD); - - $this->shop->update_option('wpsg_mod_statistics_socialmedia_fb_px', $_REQUEST['wpsg_mod_statistics_socialmedia_fb_px'], false, false, WPSG_SANITIZE_URL); + $this->shop->update_option('wpsg_mod_statistics_google_ecommerce', $_REQUEST['wpsg_mod_statistics_google_ecommerce'], false, false, WPSG_SANITIZE_TEXTFIELD); + + // $this->shop->update_option('wpsg_mod_statistics_socialmedia_fb_px', $_REQUEST['wpsg_mod_statistics_socialmedia_fb_px'], false, false, WPSG_SANITIZE_URL); $this->shop->update_option('wpsg_mod_statistics_line_chart_width', $_REQUEST['wpsg_mod_statistics_line_chart_width'], false, false, WPSG_SANITIZE_INT, ['allowEmpty' => true]); @@ -1081,76 +1168,5 @@ $this->shop->update_option('wpsg_mod_statistics_googlekey', $_REQUEST['wpsg_mod_statistics_googlekey'], false, false, WPSG_SANITIZE_TEXTFIELD); $this->shop->update_option('wpsg_mod_statistics_productinterval', $_REQUEST['wpsg_mod_statistics_productinterval'], false, false, WPSG_SANITIZE_INT); - - } - - public function get_pagetrackingcode() - { - - if (wpsg_isSizedString($this->simulateUrl)) - { - $requestURI = $this->simulateUrl; - } - else - { - $requestURI = $_SERVER['REQUEST_URI']; - } - - //url to track - $pageURL = trim(str_replace(get_site_url().'/', '', $requestURI)); - if ($pageURL && preg_match('/^\/.*/i', $pageURL)) { - $pageURL = strval(wpsg_jsquoteescape($pageURL)); - } - - $html = ' - _gaq.push(["_setAccount", "' . wpsg_jsquoteescape($this->shop->get_option('wpsg_mod_statistics_google_tracking_code')) . '"]'; - - if ($domainName = $this->shop->get_option('wpsg_mod_statistics_google_domainname')) { - $html .=' ,["_setDomainName","' . $domainName . '"]'; - } - if($anonymise = $this->shop->get_option('wpsg_mod_statistics_google_anonymise_ip_address')) { - $html .=', ["_gat._anonymizeIp"]'; - } - - /*if($this->shop->get_option('wpsg_mod_statistics_google_enable_first_touch_tracking')) { - $html .='); - asyncDistilledFirstTouch(_gaq); - _gaq.push(["_trackPageview","' . $pageURL . '"]'; - } else { - $html .=', ["_trackPageview","' . $pageURL . '"]'; - }*/ - - if($this->shop->get_option('wpsg_mod_statistics_google_track_page_load_time')) { - $html .=', ["_trackPageLoadTime"]'; - } - - $html .=');'; - - return $html; - - } - - public function get_googleanalytics_html() - { - - $html = ' - - - -'; - echo $html; + } @@ -1181,4 +1197,20 @@ } // private function usePiwik() + + /** + * Wird irgendeine Google Analytics Konfiguration verwendet + */ + private function useGA4() + { + + $arConfGA4 = array( + 'wpsg_mod_statistics_google_ecommerce' + ); + + foreach ($arConfGA4 as $c) { if ($this->shop->get_option($c) == '1') { return true; } } + + return false; + + } // private function useGA4() /** @@ -1208,9 +1240,4 @@ } // public function loadTopProducts() - public function onBasketShow() - { - - } - /* * Abrufen der Statistikdaten im Produktbackend an Index: /views/mods/mod_statistics/settings_edit.phtml =================================================================== --- /views/mods/mod_statistics/settings_edit.phtml (revision 8313) +++ /views/mods/mod_statistics/settings_edit.phtml (revision 8314) @@ -6,5 +6,5 @@
    • -
    • +
    • @@ -59,5 +59,4 @@ get_option('wpsg_mod_statistics_piwik_generel'), array('help' => 'wpsg_mod_statistics_piwik_generel')); ?> get_option('wpsg_mod_statistics_piwik_ecommerce'), array('help' => 'wpsg_mod_statistics_piwik_ecommerce')); ?> -
    get_option('wpsg_mod_statistics_piwik_productView'), array('help' => 'wpsg_mod_statistics_piwik_productView')); ?> hasMod('wpsg_mod_produktartikel')) echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_piwik_categoryView', __('Produktkategorien tracken', 'wpsg'), $this->get_option('wpsg_mod_statistics_piwik_categoryView'), array('help' => 'wpsg_mod_statistics_piwik_categoryView')); ?> @@ -72,25 +71,25 @@ get_option('wpsg_mod_statistics_piwik_basket'), array('help' => 'wpsg_mod_statistics_piwik_basketdata')); ?>
    get_option('wpsg_mod_statistics_piwik_checkout')); ?>
    get_option('wpsg_mod_statistics_piwik_checkout2')); ?>
    get_option('wpsg_mod_statistics_piwik_overview')); ?>
    get_option('wpsg_mod_statistics_piwik_done')); ?> @@ -166,77 +165,64 @@
    - get_option('wpsg_mod_statistics_google_active'), array('help' => 'wpsg_mod_statistics_google_active')); - - echo wpsg_drawForm_Input('wpsg_mod_statistics_google_tracking_code', __('Tracking-Code', 'wpsg'), $this->get_option('wpsg_mod_statistics_google_tracking_code'), array('help' => 'wpsg_mod_statistics_google_tracking_code')); - - echo wpsg_drawForm_Input('wpsg_mod_statistics_google_domainname', __('Domainname', 'wpsg'), $this->get_option('wpsg_mod_statistics_google_domainname'), array('help' => 'wpsg_mod_statistics_google_domainname')); - - echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_google_anonymise_ip_address', __('IP Adresse anonymisieren', 'wpsg'), $this->get_option('wpsg_mod_statistics_google_anonymise_ip_address'), array('help' => 'wpsg_mod_statistics_google_anonymise_ip_address')); - - //echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_google_enable_first_touch_tracking', __('Enable First Touch Tracking', 'wpsg'), $this->get_option('wpsg_mod_statistics_google_enable_first_touch_tracking')); - - echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_google_track_page_load_time', __('Ladegeschwindigkeit der Website erfassen', 'wpsg'), $this->get_option('wpsg_mod_statistics_google_track_page_load_time'), array('help' => 'wpsg_mod_statistics_google_track_page_load_time')); - - echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_google_opt_out', __('Google Opt Out', 'wpsg'), $this->get_option('wpsg_mod_statistics_google_opt_out'), array('help' => 'wpsg_mod_statistics_google_opt_out')); - - echo wpsg_drawForm_Checkbox('wpsg_mod_statistics_google_enhanced_tracking_code', __('Enhanced Tacking Code', 'wpsg'), $this->get_option('wpsg_mod_statistics_google_enhanced_tracking_code'), array('help' => 'wpsg_mod_statistics_google_enhanced_tracking_code')); - ?> -

    - - true)); - ?> - - - true)); - ?> - - - -
    -
    - -
    - get_option('wpsg_mod_statistics_socialmedia_fb_px'), array('help' => 'wpsg_mod_statistics_socialmedia_fb_px')); - ?> -
    -
    + +
    + + + +

    + + get_option('wpsg_mod_statistics_google_active'), array('help' => 'wpsg_mod_statistics_google_active')); ?> + +
    + + get_option('wpsg_mod_statistics_google_ecommerce'), array('help' => 'wpsg_mod_statistics_google_ecommerce')); ?> + +
    + + + + + +
    - get_option('wpsg_mod_statistics_line_chart_width'), array('help' => 'wpsg_mod_statistics_line_chart_width')); - echo wpsg_drawForm_Input('wpsg_mod_statistics_line_chart_height', __('Liniendiagramm (Hoehe in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_line_chart_height'), array('help' => 'wpsg_mod_statistics_line_chart_height')); - - echo wpsg_drawForm_Input('wpsg_mod_statistics_pie_chart_width', __('Kuchendiagramm (Breite in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_pie_chart_width'), array('help' => 'wpsg_mod_statistics_pie_chart_width')); - echo wpsg_drawForm_Input('wpsg_mod_statistics_pie_chart_height', __('Kuchendiagramm (Höhe in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_pie_chart_height'), array('help' => 'wpsg_mod_statistics_pie_chart_height')); - - echo wpsg_drawForm_Input('wpsg_mod_statistics_bar_chart_width', __('Balkendiagramm (Breite in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_bar_chart_width'), array('help' => 'wpsg_mod_statistics_bar_chart_width')); - echo wpsg_drawForm_Input('wpsg_mod_statistics_bar_chart_height', __('Balkendiagramm (Höhe in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_bar_chart_height'), array('help' => 'wpsg_mod_statistics_bar_chart_height')); - - echo wpsg_drawForm_Input('wpsg_mod_statistics_topproductcount', __('Anzeige Top-Produkte', 'wpsg'), $this->get_option('wpsg_mod_statistics_topproductcount'), array('help' => 'wpsg_mod_statistics_topproductcount')); - - echo wpsg_drawForm_Input('wpsg_mod_statistics_productinterval', __('Intervall-Zeitraum fÌr Produktstatistik', 'wpsg'), $this->get_option('wpsg_mod_statistics_productinterval'), array('help' => 'wpsg_mod_statistics_productinterval')); - ?> + get_option('wpsg_mod_statistics_line_chart_width'), array('help' => 'wpsg_mod_statistics_line_chart_width')); ?> + get_option('wpsg_mod_statistics_line_chart_height'), array('help' => 'wpsg_mod_statistics_line_chart_height')); ?> + get_option('wpsg_mod_statistics_pie_chart_width'), array('help' => 'wpsg_mod_statistics_pie_chart_width')); ?> + get_option('wpsg_mod_statistics_pie_chart_height'), array('help' => 'wpsg_mod_statistics_pie_chart_height')); ?> + get_option('wpsg_mod_statistics_bar_chart_width'), array('help' => 'wpsg_mod_statistics_bar_chart_width')); ?> + get_option('wpsg_mod_statistics_bar_chart_height'), array('help' => 'wpsg_mod_statistics_bar_chart_height')); ?> + get_option('wpsg_mod_statistics_topproductcount'), array('help' => 'wpsg_mod_statistics_topproductcount')); ?> + get_option('wpsg_mod_statistics_productinterval'), array('help' => 'wpsg_mod_statistics_productinterval')); ?>