Skip to content

ISSUE 30481 - Detach google adwords from google analytics #31885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
Open

ISSUE 30481 - Detach google adwords from google analytics #31885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions app/code/Magento/GoogleAdwords/etc/acl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
<acl>
<resources>
<resource id="Magento_Backend::admin">
<resource id="Magento_Backend::stores">
<resource id="Magento_Backend::stores_settings">
<resource id="Magento_Config::config">
<resource id="Magento_GoogleAdwords::google" title="Google AdWords" translate="title" />
</resource>
</resource>
</resource>
</resource>
</resources>
</acl>
</config>
14 changes: 13 additions & 1 deletion app/code/Magento/GoogleAdwords/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
<system>
<section id="google" translate="label">
<section id="google_adwords" translate="label" type="text" sortOrder="345" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Google AdWords</label>
<tab>sales</tab>
<resource>Magento_GoogleAdwords::google</resource>
<group id="adwords" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Google AdWords</label>
<field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Enable</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>google/adwords/active</config_path>
</field>
<field id="conversion_id" translate="label" type="text" sortOrder="11" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Conversion ID</label>
Expand All @@ -21,46 +25,53 @@
<depends>
<field id="*/*/active">1</field>
</depends>
<config_path>google/adwords/conversion_id</config_path>
</field>
<field id="conversion_language" translate="label" type="select" sortOrder="12" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Conversion Language</label>
<source_model>Magento\GoogleAdwords\Model\Config\Source\Language</source_model>
<depends>
<field id="*/*/active">1</field>
</depends>
<config_path>google/adwords/conversion_language</config_path>
</field>
<field id="conversion_format" translate="label" type="text" sortOrder="13" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Conversion Format</label>
<depends>
<field id="*/*/active">1</field>
</depends>
<config_path>google/adwords/conversion_format</config_path>
</field>
<field id="conversion_color" translate="label" type="text" sortOrder="14" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Conversion Color</label>
<backend_model>Magento\GoogleAdwords\Model\Config\Backend\Color</backend_model>
<depends>
<field id="*/*/active">1</field>
</depends>
<config_path>google/adwords/conversion_color</config_path>
</field>
<field id="conversion_label" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Conversion Label</label>
<depends>
<field id="*/*/active">1</field>
</depends>
<config_path>google/adwords/conversion_label</config_path>
</field>
<field id="conversion_value_type" translate="label" type="select" sortOrder="16" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Conversion Value Type</label>
<source_model>Magento\GoogleAdwords\Model\Config\Source\ValueType</source_model>
<depends>
<field id="*/*/active">1</field>
</depends>
<config_path>google/adwords/conversion_value_type</config_path>
</field>
<field id="conversion_value" translate="label" type="text" sortOrder="17" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Conversion Value</label>
<depends>
<field id="*/*/active">1</field>
<field id="*/*/conversion_value_type">0</field>
</depends>
<config_path>google/adwords/conversion_value</config_path>
</field>
<field id="send_currency" translate="label" type="select" sortOrder="18" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Send Order Currency</label>
Expand All @@ -69,6 +80,7 @@
<field id="*/*/active">1</field>
<field id="*/*/conversion_value_type">1</field>
</depends>
<config_path>google/adwords/send_currency</config_path>
</field>
</group>
</section>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/GoogleAnalytics/etc/acl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<resource id="Magento_Backend::stores">
<resource id="Magento_Backend::stores_settings">
<resource id="Magento_Config::config">
<resource id="Magento_GoogleAnalytics::google" title="Google API" translate="title" />
<resource id="Magento_GoogleAnalytics::google" title="Google Analytics" translate="title" />
</resource>
</resource>
</resource>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/GoogleAnalytics/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
<system>
<section id="google" translate="label" type="text" sortOrder="340" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Google API</label>
<label>Google Analytics</label>
<tab>sales</tab>
<resource>Magento_GoogleAnalytics::google</resource>
<group id="analytics" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
Expand Down