diff --git a/packages/common/package.json b/packages/common/package.json index dbeb0d2..ad67a9b 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -16,7 +16,7 @@ "@parameter1/base-cms-image": "^4.47.1", "@parameter1/base-cms-marko-core": "^4.54.2", "@parameter1/base-cms-marko-newsletters": "^4.55.0", - "@parameter1/base-cms-marko-newsletters-email-x": "^4.50.0", + "@parameter1/base-cms-marko-newsletters-email-x": "^4.55.3", "@parameter1/base-cms-marko-newsletters-gam": "^4.40.3", "@parameter1/base-cms-marko-newsletters-native-x": "^4.52.0", "@parameter1/base-cms-marko-newsletters-omail": "^4.5.12", diff --git a/tenants/multi/components/ad-unit.marko b/tenants/multi/components/ad-unit.marko index e7b2962..61f0d28 100644 --- a/tenants/multi/components/ad-unit.marko +++ b/tenants/multi/components/ad-unit.marko @@ -14,13 +14,6 @@ $ const { $ const { alias } = newsletter; -$ const { query } = req; -$ const esp = query.esp || config.get("defaultEsp"); -$ const emailMergeVars = { - email: esp === "et" ? "%%emailaddr%%" : "@{delivery_email}@", - send: esp === "et" ? "%%jobid%%" : "@{track_id}@", -}; - $ let adUnit; $ if (gamEnabled) { adUnit = GAM.getAdUnit({ name, alias, targeting: buildGAMTargeting({ newsletter, date, dateInfo }) }); @@ -36,10 +29,14 @@ $ if (gamEnabled) { - + <@ad-unit ...adUnit /> - <@params date=date email=emailMergeVars.email send=emailMergeVars.send /> - <@image class="scaleAd" /> - + <@params date=input.date email="@{delivery_email}@" send="@{track_id}@" include-advertiser=true /> + + + <@image class="scaleAd" /> + + + diff --git a/tenants/multi/package.json b/tenants/multi/package.json index f69db7c..515b154 100644 --- a/tenants/multi/package.json +++ b/tenants/multi/package.json @@ -25,7 +25,7 @@ "@industrial-media/common": "^2.1.0", "@parameter1/base-cms-marko-core": "^4.54.2", "@parameter1/base-cms-marko-newsletters": "^4.55.0", - "@parameter1/base-cms-marko-newsletters-email-x": "^4.50.0", + "@parameter1/base-cms-marko-newsletters-email-x": "^4.55.3", "@parameter1/base-cms-marko-newsletters-gam": "^4.40.3", "@parameter1/base-cms-marko-newsletters-native-x": "^4.52.0", "@parameter1/base-cms-marko-web-native-x": "^4.54.2", diff --git a/yarn.lock b/yarn.lock index 0d2d97d..75565b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1015,10 +1015,10 @@ marko "~4.20.0" pretty "^2.0.0" -"@parameter1/base-cms-marko-newsletters-email-x@^4.50.0": - version "4.50.0" - resolved "https://registry.yarnpkg.com/@parameter1/base-cms-marko-newsletters-email-x/-/base-cms-marko-newsletters-email-x-4.50.0.tgz#f01535be0d8aa658475484838da09b4092675dba" - integrity sha512-JNm+1Zt+zwOcwD+VuogljNznSmIxeXddTT/vuQ6x0CRl+rvowqf7vblCue92uVbnq9aP8pDROrZcaimJRWzgvQ== +"@parameter1/base-cms-marko-newsletters-email-x@^4.55.3": + version "4.55.3" + resolved "https://registry.yarnpkg.com/@parameter1/base-cms-marko-newsletters-email-x/-/base-cms-marko-newsletters-email-x-4.55.3.tgz#3ca98e3f7285fdb59da53fb97ec7c91c536ae628" + integrity sha512-tZjY+AyyZqU86ZCQ41kKNXWVuChZ717nNb1vbiUeyZ5lZwOMVx0jYp6FIjSCdjc25pB7PqKc0YnnionUmEZbtQ== dependencies: "@parameter1/base-cms-object-path" "^4.40.3" "@parameter1/base-cms-utils" "^4.40.3"