Skip to content

Commit 71b489f

Browse files
wanzewanze
committed
Rename module to commerce_google_tag_manager
1 parent 420b540 commit 71b489f

19 files changed

+92
-110
lines changed

‎commerce_gtm_enhanced_ecommerce.info.yml ‎commerce_google_tag_manager.info.yml

File renamed without changes.

‎commerce_gtm_enhanced_ecommerce.libraries.yml ‎commerce_google_tag_manager.libraries.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
commerce_gtm_enhanced_ecommerce:
1+
commerce_google_tag_manager:
22
version: VERSION
33
js:
4-
js/commerce_gtm_enhanced_ecommerce.js: {}
4+
js/commerce_google_tag_manager.js: {}
55
dependencies:
66
- core/jquery
77
- core/drupal

‎commerce_gtm_enhanced_ecommerce.module ‎commerce_google_tag_manager.module

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/**
44
* @file
5-
* Module file for the commerce_gtm_enhanced_ecommerce module.
5+
* Module file for the commerce_google_tag_manager module.
66
*/
77

88
use Drupal\Core\Cache\CacheableMetadata;
@@ -12,10 +12,10 @@ use Drupal\Core\Cache\CacheableMetadata;
1212
*
1313
* Implements hook_page_attachments().
1414
*/
15-
function commerce_gtm_enhanced_ecommerce_page_attachments(array &$page) {
16-
$page['#attached']['library'][] = 'commerce_gtm_enhanced_ecommerce/commerce_gtm_enhanced_ecommerce';
17-
$page['#attached']['drupalSettings']['commerceGtmEnhancedEcommerce'] = [
18-
'eventsUrl' => Drupal::service('url_generator')->generateFromRoute('commerce_gtm_enhanced_ecommerce.events'),
15+
function commerce_google_tag_manager_page_attachments(array &$page) {
16+
$page['#attached']['library'][] = 'commerce_google_tag_manager/commerce_google_tag_manager';
17+
$page['#attached']['drupalSettings']['commerceGoogleTagManager'] = [
18+
'eventsUrl' => Drupal::service('url_generator')->generateFromRoute('commerce_google_tag_manager.events'),
1919
'dataLayerVariable' => Drupal::config('google_tag.settings')->get('data_layer') ?: 'dataLayer',
2020
];
2121

@@ -30,12 +30,12 @@ function commerce_gtm_enhanced_ecommerce_page_attachments(array &$page) {
3030
*
3131
* Implements hook_entity_view().
3232
*/
33-
function commerce_gtm_enhanced_ecommerce_commerce_product_view(&$build) {
33+
function commerce_google_tag_manager_commerce_product_view(&$build) {
3434
if (Drupal::request()->getMethod() === 'GET' && $build['#view_mode'] === 'full') {
3535
/** @var \Drupal\commerce_product\Entity\ProductInterface $product */
3636
$product = $build['#commerce_product'];
37-
/** @var \Drupal\commerce_gtm_enhanced_ecommerce\EventTrackerService $event_tracker */
38-
$event_tracker = Drupal::service('commerce_gtm_enhanced_ecommerce.event_tracker');
37+
/** @var \Drupal\commerce_google_tag_manager\EventTrackerService $event_tracker */
38+
$event_tracker = Drupal::service('commerce_google_tag_manager.event_tracker');
3939
$event_tracker->productDetailViews([$product->getDefaultVariation()]);
4040
}
4141
}

‎commerce_google_tag_manager.routing.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
commerce_google_tag_manager.events:
2+
path: 'commerce_google_tag_manager'
3+
defaults:
4+
_controller: '\Drupal\commerce_google_tag_manager\Controller\EventsController::getEvents'
5+
_disable_route_normalizer: 'TRUE'
6+
methods: [GET]
7+
requirements:
8+
_permission: 'access content'
9+
options:
10+
no_cache: 'TRUE'

‎commerce_google_tag_manager.services.yml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
services:
2+
commerce_google_tag_manager.event_tracker:
3+
class: Drupal\commerce_google_tag_manager\EventTrackerService
4+
arguments: ['@commerce_google_tag_manager.event_storage', '@event_dispatcher']
5+
commerce_google_tag_manager.event_storage:
6+
class: Drupal\commerce_google_tag_manager\EventStorageService
7+
arguments: ['@tempstore.private', '@event_dispatcher']
8+
commerce_google_tag_manager.commerce_events_subscriber:
9+
class: Drupal\commerce_google_tag_manager\EventSubscriber\CommerceEventsSubscriber
10+
arguments: ['@commerce_google_tag_manager.event_tracker']
11+
tags:
12+
- { name: 'event_subscriber' }
13+
commerce_google_tag_manager.kernel_events_subscriber:
14+
class: Drupal\commerce_google_tag_manager\EventSubscriber\KernelEventsSubscriber
15+
arguments: ['@commerce_google_tag_manager.event_tracker', '@current_route_match', '@commerce_checkout.checkout_order_manager']
16+
tags:
17+
- { name: 'event_subscriber' }

‎commerce_gtm_enhanced_ecommerce.routing.yml

-10
This file was deleted.

‎commerce_gtm_enhanced_ecommerce.services.yml

-17
This file was deleted.

‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "gridonic/commerce_gtm_enhanced_ecommerce",
2+
"name": "drupal/commerce_google_tag_manager",
33
"type": "drupal-module",
44
"description": "Provides Commerce integration for Enhanced Ecommerce events via Google Tag Manager",
5-
"homepage": "https://github.com/gridonic/commerce_gtm_enhanced_ecommerce",
5+
"homepage": "https://www.drupal.org/project/commerce_google_tag_manager",
66
"license": "GPL-2.0+",
77
"keywords": ["drupal", "commerce", "google tag manager", "enhanced ecommerce"],
88
"require": {

‎js/commerce_gtm_enhanced_ecommerce.js ‎js/commerce_google_tag_manager.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @file
3-
* Defines Javascript behaviors for commerce GTM enhanced ecommerce module.
3+
* Defines Javascript behaviors for the commerce_google_tag_manager module.
44
*/
55

66
(function ($, window, drupalSettings) {
@@ -11,7 +11,7 @@
1111
return;
1212
}
1313

14-
var settings = window.drupalSettings.commerceGtmEnhancedEcommerce || {};
14+
var settings = drupalSettings.commerceGoogleTagManager || {};
1515
var url = settings.eventsUrl;
1616
var dataLayerVariable = settings.dataLayerVariable;
1717

‎src/Controller/EventsController.php

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

3-
namespace Drupal\commerce_gtm_enhanced_ecommerce\Controller;
3+
namespace Drupal\commerce_google_tag_manager\Controller;
44

5-
use Drupal\commerce_gtm_enhanced_ecommerce\EventStorageService;
5+
use Drupal\commerce_google_tag_manager\EventStorageService;
66
use Drupal\Core\Controller\ControllerBase;
77
use Symfony\Component\DependencyInjection\ContainerInterface;
88
use Symfony\Component\HttpFoundation\JsonResponse;
@@ -12,28 +12,26 @@
1212
*
1313
* Called via ajax on a page load to actually send the tracked events
1414
* (server-side) to Google Tag Manager.
15-
*
16-
* @package Drupal\commerce_gtm_enhanced_ecommerce
1715
*/
1816
class EventsController extends ControllerBase {
1917

2018
/**
21-
* @var \Drupal\commerce_gtm_enhanced_ecommerce\EventStorageService
19+
* @var \Drupal\commerce_google_tag_manager\EventStorageService
2220
*/
23-
private $ecommerceEventStorageService;
21+
private $eventStorageService;
2422

2523
/**
26-
* @param \Drupal\commerce_gtm_enhanced_ecommerce\EventStorageService $ecommerceEventStorageService
24+
* @param \Drupal\commerce_google_tag_manager\EventStorageService $eventStorageService
2725
*/
28-
public function __construct(EventStorageService $ecommerceEventStorageService) {
29-
$this->ecommerceEventStorageService = $ecommerceEventStorageService;
26+
public function __construct(EventStorageService $eventStorageService) {
27+
$this->eventStorageService = $eventStorageService;
3028
}
3129

3230
/**
3331
* @inheritdoc
3432
*/
3533
public static function create(ContainerInterface $container) {
36-
return new static($container->get('commerce_gtm_enhanced_ecommerce.event_storage'));
34+
return new static($container->get('commerce_google_tag_manager.event_storage'));
3735
}
3836

3937
/**
@@ -42,8 +40,8 @@ public static function create(ContainerInterface $container) {
4240
* @return \Symfony\Component\HttpFoundation\JsonResponse
4341
*/
4442
public function getEvents() {
45-
$events = $this->ecommerceEventStorageService->getEvents();
46-
$this->ecommerceEventStorageService->flush();
43+
$events = $this->eventStorageService->getEvents();
44+
$this->eventStorageService->flush();
4745

4846
return new JsonResponse($events);
4947
}

‎src/Event/AlterEventDataEvent.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
22

3-
namespace Drupal\commerce_gtm_enhanced_ecommerce\Event;
3+
namespace Drupal\commerce_google_tag_manager\Event;
44

55
use Symfony\Component\EventDispatcher\Event;
66

77
/**
88
* Event to alter Enhanced Ecommerce event data before being
99
* sent to the Google Tag Manager.
10-
*
11-
* @package Drupal\commerce_gtm_enhanced_ecommerce\Event
1210
*/
1311
class AlterEventDataEvent extends Event {
1412

‎src/Event/AlterProductEvent.php

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
<?php
22

3-
namespace Drupal\commerce_gtm_enhanced_ecommerce\Event;
3+
namespace Drupal\commerce_google_tag_manager\Event;
44

5-
use Drupal\commerce_gtm_enhanced_ecommerce\Product;
5+
use Drupal\commerce_google_tag_manager\Product;
66
use Drupal\commerce_product\Entity\ProductVariationInterface;
77
use Symfony\Component\EventDispatcher\Event;
88

99
/**
1010
* Event to alter the Enhanced Ecommerce product mapped from a
1111
* commerce product variation.
12-
*
13-
* @package Drupal\commerce_gtm_enhanced_ecommerce\Event
1412
*/
1513
class AlterProductEvent extends Event {
1614

1715
/**
18-
* @var \Drupal\commerce_gtm_enhanced_ecommerce\Product
16+
* @var \Drupal\commerce_google_tag_manager\Product
1917
*/
2018
private $product;
2119

@@ -25,7 +23,7 @@ class AlterProductEvent extends Event {
2523
private $productVariation;
2624

2725
/**
28-
* @param \Drupal\commerce_gtm_enhanced_ecommerce\Product $product
26+
* @param \Drupal\commerce_google_tag_manager\Product $product
2927
* @param \Drupal\commerce_product\Entity\ProductVariationInterface $productVariation
3028
*/
3129
public function __construct(Product $product,
@@ -36,7 +34,7 @@ public function __construct(Product $product,
3634
}
3735

3836
/**
39-
* @return \Drupal\commerce_gtm_enhanced_ecommerce\Product
37+
* @return \Drupal\commerce_google_tag_manager\Product
4038
*/
4139
public function getProduct() {
4240
return $this->product;

‎src/Event/EnhancedEcommerceEvents.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Drupal\commerce_gtm_enhanced_ecommerce\Event;
3+
namespace Drupal\commerce_google_tag_manager\Event;
44

55
/**
66
* Defines events for the Commerce Google Tag Manager Enhanced Ecommerce module.
@@ -15,28 +15,28 @@ final class EnhancedEcommerceEvents {
1515
*
1616
* @Event
1717
*
18-
* @see \Drupal\commerce_postfinance\Event\AlterProductEvent
18+
* @see \Drupal\commerce_google_tag_manager\Event\AlterProductEvent
1919
*/
20-
const ALTER_PRODUCT = 'commerce_gtm_enhanced_ecommerce.alter_product';
20+
const ALTER_PRODUCT = 'commerce_google_tag_manager.alter_product';
2121

2222
/**
2323
* Allows to alter the event data of each Enhanced Ecommerce event
2424
* before it gets pushed to the data layer.
2525
*
2626
* @Event
2727
*
28-
* @see \Drupal\commerce_gtm_enhanced_ecommerce\Event\AlterEventDataEvent
28+
* @see \Drupal\commerce_google_tag_manager\Event\AlterEventDataEvent
2929
*/
30-
const ALTER_EVENT_DATA = 'commerce_gtm_enhanced_ecommerce.alter_event_data';
30+
const ALTER_EVENT_DATA = 'commerce_google_tag_manager.alter_event_data';
3131

3232
/**
3333
* Event fired when tracking a checkout step. This allows event listeners
3434
* to track additional checkout step options.
3535
*
3636
* @Event
3737
*
38-
* @see \Drupal\commerce_gtm_enhanced_ecommerce\Event\TrackCheckoutStepEvent
38+
* @see \Drupal\commerce_google_tag_manager\Event\TrackCheckoutStepEvent
3939
*/
40-
const TRACK_CHECKOUT_STEP = 'commerce_gtm_enhanced_ecommerce.track_checkout_step';
40+
const TRACK_CHECKOUT_STEP = 'commerce_google_tag_manager.track_checkout_step';
4141

4242
}

‎src/Event/TrackCheckoutStepEvent.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Drupal\commerce_gtm_enhanced_ecommerce\Event;
3+
namespace Drupal\commerce_google_tag_manager\Event;
44

55
use Drupal\commerce_order\Entity\OrderInterface;
66
use Symfony\Component\EventDispatcher\Event;
@@ -9,8 +9,6 @@
99
* Event dispatched when a checkout step is tracked.
1010
*
1111
* Event listeners may use this event to track checkout options.
12-
*
13-
* @package Drupal\commerce_gtm_enhanced_ecommerce\Event
1412
*/
1513
class TrackCheckoutStepEvent extends Event {
1614

‎src/EventStorageService.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?php
22

3-
namespace Drupal\commerce_gtm_enhanced_ecommerce;
3+
namespace Drupal\commerce_google_tag_manager;
44

5-
use Drupal\commerce_gtm_enhanced_ecommerce\Event\AlterEventDataEvent;
6-
use Drupal\commerce_gtm_enhanced_ecommerce\Event\EnhancedEcommerceEvents;
5+
use Drupal\commerce_google_tag_manager\Event\AlterEventDataEvent;
6+
use Drupal\commerce_google_tag_manager\Event\EnhancedEcommerceEvents;
77
use Drupal\Core\TempStore\PrivateTempStoreFactory;
88
use Drupal\Core\TempStore\TempStoreException;
99
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
1010

1111
/**
1212
* Stores all tracked Enhanced Ecommerce events in a private tempstore.
13-
*
14-
* @package Drupal\commerce_gtm_enhanced_ecommerce
1513
*/
1614
class EventStorageService {
1715

@@ -30,7 +28,7 @@ class EventStorageService {
3028
* @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher
3129
*/
3230
public function __construct(PrivateTempStoreFactory $privateTempStoreFactory, EventDispatcherInterface $eventDispatcher) {
33-
$this->tempStore = $privateTempStoreFactory->get('commerce_gtm_enhanced_ecommerce');
31+
$this->tempStore = $privateTempStoreFactory->get('commerce_google_tag_manager');
3432
$this->eventDispatcher = $eventDispatcher;
3533
}
3634

0 commit comments

Comments
 (0)