diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2019-05-28 03:57:20 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2019-05-28 03:57:20 +0300 |
| commit | e35fcd8ce317a83d85543259cfd61f7e5f756931 (patch) | |
| tree | 9464bf351dedd85cf204069c407048ee78c5a119 /plugins | |
| parent | d8c99bf1462acf03a164adebf19e2d393d314091 (diff) | |
Couple changes to visitor log for proxysite (#14481)
* Check if product categories key is defined.
* Update custom dimensions submodule + use query var id site if not set by Live API.
Diffstat (limited to 'plugins')
| m--------- | plugins/CustomDimensions | 0 | ||||
| -rw-r--r-- | plugins/Live/VisitorDetails.php | 3 | ||||
| -rw-r--r-- | plugins/Live/templates/_actionEcommerce.twig | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 5e08ac672fb14c61062ea334ab86ecd2e44b6dd +Subproject 34721e30c70c9b3183128a50a144440fa1f033d diff --git a/plugins/Live/VisitorDetails.php b/plugins/Live/VisitorDetails.php index 42a79d7d49..fc77c1605b 100644 --- a/plugins/Live/VisitorDetails.php +++ b/plugins/Live/VisitorDetails.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\Live; use Piwik\API\Request; +use Piwik\Common; use Piwik\Config; use Piwik\Date; use Piwik\DataTable; @@ -155,7 +156,7 @@ class VisitorDetails extends VisitorDetailsAbstract function getIdSite() { - return $this->details['idsite']; + return isset($this->details['idsite']) ? $this->details['idsite'] : Common::getRequestVar('idSite'); } function getFingerprint() diff --git a/plugins/Live/templates/_actionEcommerce.twig b/plugins/Live/templates/_actionEcommerce.twig index 229067d998..a5d345a08a 100644 --- a/plugins/Live/templates/_actionEcommerce.twig +++ b/plugins/Live/templates/_actionEcommerce.twig @@ -40,7 +40,7 @@ {% for product in action.itemDetails %} <li> {{ product.itemSKU }}{% if product.itemName is not empty %}: {{ product.itemName }}{% endif -%} - {%- if product.categories is not empty %} ({% for category in product.categories %}{{ category }}{% if not loop.last %}, {% endif %}{% endfor %}){% endif %}, + {%- if product.categories is defined and product.categories is not empty %} ({% for category in product.categories %}{{ category }}{% if not loop.last %}, {% endif %}{% endfor %}){% endif %}, {{ 'General_Quantity'|translate }}: {{ product.quantity }}, {{ 'General_Price'|translate }}: {{ product.price|money(visitInfo.idSite)|raw }} </li> |