diff options
author | Peter Zhang <peter@innocraft.com> | 2022-03-26 21:11:32 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-26 21:11:32 +0300 |
commit | e1eea7a08911da4d8718ad9316a19bd326cf02d7 (patch) | |
tree | a8b139206fcc30a334c7cbcc57bb6a124670a601 /plugins | |
parent | b5b62fd5d4f2eaf5fcf59ecb4371aca2e2944568 (diff) |
Add Two New segments (#18953)
* add order revenue
add order revenue
* add order revenue
update
* Update DimensionTest.php
add 2 tests
* update cart
update cart
* update errors
update errors
* update segment, and add tests
update segment, and add tests
* update query on cart left in cart
update query on cart left in cart
* update tests
update tests
* Update Revenue.php
update type
* Update test_apiGetReportMetadata__API.getSegmentsMetadata.xml
update tests
* Update Revenue.php
update
* Update Revenue.php
update checks
* Update Revenue.php
group into functions
* Update Revenue.php
update
* Update Revenue.php
update and
* Update test_ecommerceOrderWithItems_SegmentRevenueOrder__Goals.get_day.xml
update tests
* Update Revenue.php
update support type
* Update Revenue.php
update wrong variable
* tests
Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins')
12 files changed, 1136 insertions, 11 deletions
diff --git a/plugins/API/API.php b/plugins/API/API.php index 2d7241122e..b8ff74519b 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -745,7 +745,7 @@ class API extends \Piwik\Plugin\API $segmentsNeedActionsInfo = array('visitConvertedGoalId', 'pageUrl', 'pageTitle', 'siteSearchKeyword', 'siteSearchCategory', 'siteSearchCount', 'entryPageTitle', 'entryPageUrl', 'exitPageTitle', 'exitPageUrl', - 'outlinkUrl', 'downloadUrl', 'eventUrl', 'orderId', 'productViewName', 'productViewSku', 'productViewPrice', + 'outlinkUrl', 'downloadUrl', 'eventUrl', 'orderId', 'revenueOrder', 'revenueAbandonedCart', 'productViewName', 'productViewSku', 'productViewPrice', 'productViewCategory1', 'productViewCategory2', 'productViewCategory3', 'productViewCategory4', 'productViewCategory5' ); $isCustomVariablePage = stripos($segmentName, 'customVariablePage') !== false; diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_revenueAbandonedCart__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_revenueAbandonedCart__API.getSuggestedValuesForSegment.xml new file mode 100644 index 0000000000..addecb936b --- /dev/null +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_revenueAbandonedCart__API.getSuggestedValuesForSegment.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result/>
\ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_revenueOrder__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_revenueOrder__API.getSuggestedValuesForSegment.xml new file mode 100644 index 0000000000..addecb936b --- /dev/null +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_revenueOrder__API.getSuggestedValuesForSegment.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result/>
\ No newline at end of file diff --git a/plugins/Ecommerce/Columns/Revenue.php b/plugins/Ecommerce/Columns/Revenue.php index 21106f089c..31624f7e92 100644 --- a/plugins/Ecommerce/Columns/Revenue.php +++ b/plugins/Ecommerce/Columns/Revenue.php @@ -8,9 +8,15 @@ */ namespace Piwik\Plugins\Ecommerce\Columns; +use Piwik\Columns\DimensionSegmentFactory; use Piwik\Columns\Discriminator; -use Piwik\Tracker\GoalManager; +use Piwik\Common; +use Piwik\Piwik; +use Piwik\Plugin\Segment; +use Piwik\Segment\SegmentExpression; +use Piwik\Segment\SegmentsList; use Piwik\Tracker\Action; +use Piwik\Tracker\GoalManager; use Piwik\Tracker\Request; use Piwik\Tracker\Visitor; @@ -27,6 +33,70 @@ class Revenue extends BaseConversion return new Discriminator($this->dbTableName, 'idgoal', GoalManager::IDGOAL_ORDER); } + + public function configureSegments(SegmentsList $segmentsList, DimensionSegmentFactory $dimensionSegmentFactory) + { + //new Segment revenue on order + $segment = new Segment(); + $segment->setCategory($this->category); + $segment->setName(Piwik::translate('Ecommerce_OrderRevenue')); + $segment->setSegment('revenueOrder'); + $segment->setSqlSegment('log_conversion.idvisit'); + $segment->setSqlFilter(function ($valueToMatch, $sqlField, $matchType) { + return $this->getRevenueQuery($valueToMatch, $sqlField , $matchType, 0); + }); + $segmentsList->addSegment($dimensionSegmentFactory->createSegment($segment)); + + //new Segment revenue left in cart + $segment = new Segment(); + $segment->setCategory($this->category); + $segment->setName(Piwik::translate('Ecommerce_RevenueLeftInCart')); + $segment->setSegment('revenueAbandonedCart'); + $segment->setSqlSegment('log_conversion.idvisit'); + $segment->setSqlFilter(function ($valueToMatch, $sqlField , $matchType) { + return $this->getRevenueQuery($valueToMatch, $sqlField , $matchType,-1); + }); + $segmentsList->addSegment($dimensionSegmentFactory->createSegment($segment)); + + } + + /** + * revenue sql filter + * @param $valueToMatch + * @param $sqlField + * @param $matchType + * @param false $cart + * @return array + */ + private function getRevenueQuery($valueToMatch, $sqlField , $matchType, $idGoal) + { + //supported operator type + $supportType = [ + SegmentExpression::MATCH_EQUAL, + SegmentExpression::MATCH_GREATER_OR_EQUAL, + SegmentExpression::MATCH_LESS_OR_EQUAL, + SegmentExpression::MATCH_GREATER, + SegmentExpression::MATCH_LESS, + ]; + + if (!in_array($matchType, $supportType)) { + throw new \Exception("This match type $matchType is not available for action-segments."); + } + + //to fit mysql operator + if ($matchType === SegmentExpression::MATCH_EQUAL) { + $matchType = "="; + } + + $table = Common::prefixTable($this->dbTableName); + $sql = " SELECT idvisit from {$table} WHERE (idgoal = {$idGoal} and revenue {$matchType} ?) "; + return [ + 'SQL' => $sql, + 'bind' =>(float)$valueToMatch, + ]; + } + + /** * @param Request $request * @param Visitor $visitor diff --git a/plugins/Ecommerce/Columns/RevenueDiscount.php b/plugins/Ecommerce/Columns/RevenueDiscount.php index 3495e284cd..de0df65ca2 100644 --- a/plugins/Ecommerce/Columns/RevenueDiscount.php +++ b/plugins/Ecommerce/Columns/RevenueDiscount.php @@ -8,8 +8,8 @@ */ namespace Piwik\Plugins\Ecommerce\Columns; -use Piwik\Tracker\GoalManager; use Piwik\Tracker\Action; +use Piwik\Tracker\GoalManager; use Piwik\Tracker\Request; use Piwik\Tracker\Visitor; diff --git a/plugins/Ecommerce/lang/en.json b/plugins/Ecommerce/lang/en.json index 586b514c0f..0788a24457 100644 --- a/plugins/Ecommerce/lang/en.json +++ b/plugins/Ecommerce/lang/en.json @@ -4,6 +4,8 @@ "Sales": "Sales", "Order": "Order", "OrderId": "Order ID", + "OrderRevenue": "Order Revenue", + "RevenueLeftInCart": "Revenue Left In Cart", "Orders": "Orders", "ViewedProductCategory": "Viewed Product Category", "ViewedProductName": "Viewed Product Name", diff --git a/plugins/Ecommerce/tests/System/EcommerceOrderWithItemsTest.php b/plugins/Ecommerce/tests/System/EcommerceOrderWithItemsTest.php index 17c77747c3..a432c345a7 100644 --- a/plugins/Ecommerce/tests/System/EcommerceOrderWithItemsTest.php +++ b/plugins/Ecommerce/tests/System/EcommerceOrderWithItemsTest.php @@ -9,8 +9,8 @@ namespace Piwik\Plugins\Ecommerce\tests\System; use Piwik\Date; use Piwik\Piwik; -use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoSitesEcommerceOrderWithItems; +use Piwik\Tests\Framework\TestCase\SystemTestCase; /** * Tests API methods after ecommerce orders are tracked. @@ -304,6 +304,29 @@ class EcommerceOrderWithItemsTest extends SystemTestCase 'testSuffix' => '_productPrice', 'segment' => 'productPrice>500', ]], + [ + ['Live.getLastVisitsDetails', 'Goals.get'], + [ + 'idSite' => $idSite, + 'date' => $dateTime, + 'periods' => 'day', + 'testSuffix' => '_SegmentRevenueOrder', + 'segment' => 'revenueOrder>500', + ] + ], + [ + ['Live.getLastVisitsDetails', 'Goals.get'], + [ + 'idSite' => $idSite, + 'date' => $dateTime, + 'periods' => 'day', + 'testSuffix' => '_SegmentCartRevenueOrder', + 'segment' => 'revenueAbandonedCart>100', + ] + ], + + + ), self::getApiForTestingScheduledReports($dateTime, 'week') ); diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_SegmentCartRevenueOrder__Goals.get_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_SegmentCartRevenueOrder__Goals.get_day.xml new file mode 100644 index 0000000000..7c67098eb9 --- /dev/null +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_SegmentCartRevenueOrder__Goals.get_day.xml @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<result> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>3111.11</revenue> + <conversion_rate>50%</conversion_rate> + <nb_conversions_new_visit>0</nb_conversions_new_visit> + <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit> + <revenue_new_visit>0</revenue_new_visit> + <conversion_rate_new_visit>0%</conversion_rate_new_visit> + <nb_conversions_returning_visit>2</nb_conversions_returning_visit> + <nb_visits_converted_returning_visit>1</nb_visits_converted_returning_visit> + <revenue_returning_visit>3111.11</revenue_returning_visit> + <conversion_rate_returning_visit>50%</conversion_rate_returning_visit> +</result> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_SegmentCartRevenueOrder__Live.getLastVisitsDetails_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_SegmentCartRevenueOrder__Live.getLastVisitsDetails_day.xml new file mode 100644 index 0000000000..122f85f990 --- /dev/null +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_SegmentCartRevenueOrder__Live.getLastVisitsDetails_day.xml @@ -0,0 +1,618 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <idSite>1</idSite> + <idVisit>3</idVisit> + <visitIp>156.5.3.2</visitIp> + + <fingerprint>c7eabd04b45e68b3</fingerprint> + <actionDetails> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>View product left in cart</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>11</pageId> + <productViewPrice>999</productViewPrice> + <productViewName>PRODUCT THREE LEFT in cart</productViewName> + <productViewSku>SKU VERY nice indeed</productViewSku> + <bandwidth /> + <timeSpent>180</timeSpent> + <timeSpentPretty>3 min 0s</timeSpentPretty> + <pageviewPosition>1</pageviewPosition> + <title>View product left in cart</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>View product left in cart</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>12</pageId> + <productViewPrice>333</productViewPrice> + <productViewName>PRODUCT THREE LEFT in cart</productViewName> + <productViewSku>SKU VERY nice indeed</productViewSku> + <bandwidth /> + <timeSpent>180</timeSpent> + <timeSpentPretty>3 min 0s</timeSpentPretty> + <pageviewPosition>2</pageviewPosition> + <title>View product left in cart</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>View product left in cart</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>13</pageId> + <productViewName>PRODUCT TWO LEFT in cart</productViewName> + <productViewSku>SKU IN ABANDONED CART TWO</productViewSku> + <bandwidth /> + <timeSpent>361</timeSpent> + <timeSpentPretty>6 min 1s</timeSpentPretty> + <pageviewPosition>3</pageviewPosition> + <title>View product left in cart</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <productViewCategories> + <row>Category TWO LEFT in cart</row> + <row>second category</row> + </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>ecommerceAbandonedCart</type> + <revenue>2510.11</revenue> + <items>4</items> + + + <itemDetails> + <row> + <itemSKU>SKU VERY nice indeed</itemSKU> + <itemName>PRODUCT THREE LEFT in cart</itemName> + <itemCategory>Electronics & Cameras</itemCategory> + <price>10</price> + <quantity>1</quantity> + <categories> + <row>Electronics & Cameras</row> + </categories> + </row> + <row> + <itemSKU>SKU IN ABANDONED CART ONE</itemSKU> + <itemName>PRODUCT ONE LEFT in cart</itemName> + <itemCategory /> + <price>500.11</price> + <quantity>1</quantity> + <categories> + </categories> + </row> + <row> + <itemSKU>SKU IN ABANDONED CART TWO</itemSKU> + <itemName>PRODUCT TWO LEFT in cart</itemName> + <itemCategory>Category TWO LEFT in cart</itemCategory> + <price>1000</price> + <quantity>2</quantity> + <categories> + <row>Category TWO LEFT in cart</row> + <row>second category</row> + </categories> + </row> + </itemDetails> + <icon>plugins/Morpheus/images/ecommerceAbandonedCart.png</icon> + <iconSVG>plugins/Morpheus/images/ecommerceAbandonedCart.svg</iconSVG> + <title>Abandoned Cart</title> + <subtitle>$2,510.11 revenue - 4 items: PRODUCT THREE LEFT in cart, PRODUCT ONE LEFT in cart, PRODUCT TWO LEFT in cart)</subtitle> + + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>3</visitCount> + <visitEcommerceStatus>abandonedCart</visitEcommerceStatus> + <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceAbandonedCart.svg</visitEcommerceStatusIcon> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <secondsSinceFirstVisit>27000</secondsSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <secondsSinceLastEcommerceOrder>21240</secondsSinceLastEcommerceOrder> + <visitDuration>721</visitDuration> + <visitDurationPretty>12 min 1s</visitDurationPretty> + <searches>0</searches> + <actions>3</actions> + <interactions>3</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode>pl</languageCode> + <language>Polish</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>13351.11</totalEcommerceRevenue> + <totalEcommerceConversions>4</totalEcommerceConversions> + <totalEcommerceItems>12</totalEcommerceItems> + <totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue> + <totalAbandonedCarts>3</totalAbandonedCarts> + <totalAbandonedCartsItems>12</totalAbandonedCartsItems> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Poland</country> + <countryCode>pl</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/pl.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Poland</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <secondsSinceLastVisit>21240</secondsSinceLastVisit> + <resolution>1024x768</resolution> + <plugins>cookie, flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> + <customVariables> + <row> + <customVariableName3>VisitorName</customVariableName3> + <customVariableValue3>Great name!</customVariableValue3> + </row> + <row> + <customVariableName4>ValueIsZero</customVariableName4> + <customVariableValue4>0</customVariableValue4> + </row> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> + </row> + <row> + <idSite>1</idSite> + <idVisit>2</idVisit> + <visitIp>156.5.3.2</visitIp> + + <fingerprint>c7eabd04b45e68b3</fingerprint> + <actionDetails> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>Looking at Electronics & Cameras page with a page level custom variable</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>5</pageId> + <bandwidth /> + <timeSpent>360</timeSpent> + <timeSpentPretty>6 min 0s</timeSpentPretty> + <pageviewPosition>1</pageviewPosition> + <title>Looking at Electronics & Cameras page with a page level custom variable</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <productViewCategories> + <row>Electronics & Cameras</row> + </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>Looking at Electronics & Cameras page again</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>6</pageId> + <bandwidth /> + <timeSpent>360</timeSpent> + <timeSpentPretty>6 min 0s</timeSpentPretty> + <pageviewPosition>2</pageviewPosition> + <title>Looking at Electronics & Cameras page again</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <productViewCategories> + <row>Electronics & Cameras</row> + </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>Looking at product page</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>7</pageId> + <productViewPrice>666</productViewPrice> + <productViewName>PRODUCT name</productViewName> + <productViewSku>SKU VERY nice indeed</productViewSku> + <bandwidth /> + <timeSpent>720</timeSpent> + <timeSpentPretty>12 min 0s</timeSpentPretty> + <pageviewPosition>3</pageviewPosition> + <title>Looking at product page</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <productViewCategories> + <row>Electronics & Cameras</row> + </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>ecommerceOrder</type> + <orderId>937nsjusu 3894</orderId> + <revenue>1111.11</revenue> + <revenueSubTotal>1000</revenueSubTotal> + <revenueTax>111</revenueTax> + <revenueShipping>0.11</revenueShipping> + <revenueDiscount>666</revenueDiscount> + <items>8</items> + + + <itemDetails> + <row> + <itemSKU>SKU VERY nice indeed</itemSKU> + <itemName>PRODUCT name</itemName> + <itemCategory>Multiple Category 1</itemCategory> + <price>500</price> + <quantity>2</quantity> + <categories> + <row>Multiple Category 1</row> + <row>Multiple Category 2</row> + <row>Electronics & Cameras</row> + <row>Multiple Category 4</row> + <row>Multiple Category 5</row> + </categories> + </row> + <row> + <itemSKU>ANOTHER SKU HERE</itemSKU> + <itemName>PRODUCT name BIS</itemName> + <itemCategory /> + <price>100</price> + <quantity>6</quantity> + <categories> + </categories> + </row> + </itemDetails> + <icon>plugins/Morpheus/images/ecommerceOrder.png</icon> + <iconSVG>plugins/Morpheus/images/ecommerceOrder.svg</iconSVG> + <title>Ordered (937nsjusu 3894)</title> + <subtitle>$1,111.11 revenue - 8 items: PRODUCT name, PRODUCT name BIS)</subtitle> + + </row> + <row> + <type>ecommerceOrder</type> + <orderId>1037nsjusu4s3894</orderId> + <revenue>2000</revenue> + <revenueSubTotal>1500</revenueSubTotal> + <revenueTax>400</revenueTax> + <revenueShipping>100</revenueShipping> + <revenueDiscount>0</revenueDiscount> + <items>2</items> + + + <itemDetails> + <row> + <itemSKU>SKU2</itemSKU> + <itemName>Canon SLR</itemName> + <itemCategory>Electronics & Cameras</itemCategory> + <price>1500</price> + <quantity>1</quantity> + <categories> + <row>Electronics & Cameras</row> + </categories> + </row> + <row> + <itemSKU>SKU VERY nice indeed</itemSKU> + <itemName>PRODUCT name</itemName> + <itemCategory /> + <price>11.22</price> + <quantity>1</quantity> + <categories> + </categories> + </row> + </itemDetails> + <icon>plugins/Morpheus/images/ecommerceOrder.png</icon> + <iconSVG>plugins/Morpheus/images/ecommerceOrder.svg</iconSVG> + <title>Ordered (1037nsjusu4s3894)</title> + <subtitle>$2,000 revenue - 2 items: Canon SLR, PRODUCT name)</subtitle> + + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>View product left in cart</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>8</pageId> + <productViewPrice>999</productViewPrice> + <productViewName>PRODUCT THREE LEFT in cart</productViewName> + <productViewSku>SKU VERY nice indeed</productViewSku> + <bandwidth /> + <timeSpent>180</timeSpent> + <timeSpentPretty>3 min 0s</timeSpentPretty> + <pageviewPosition>4</pageviewPosition> + <title>View product left in cart</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>View product left in cart</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>9</pageId> + <productViewPrice>333</productViewPrice> + <productViewName>PRODUCT THREE LEFT in cart</productViewName> + <productViewSku>SKU VERY nice indeed</productViewSku> + <bandwidth /> + <timeSpent>180</timeSpent> + <timeSpentPretty>3 min 0s</timeSpentPretty> + <pageviewPosition>5</pageviewPosition> + <title>View product left in cart</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>View product left in cart</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>10</pageId> + <productViewName>PRODUCT TWO LEFT in cart</productViewName> + <productViewSku>SKU IN ABANDONED CART TWO</productViewSku> + <bandwidth /> + <timeSpent>361</timeSpent> + <timeSpentPretty>6 min 1s</timeSpentPretty> + <pageviewPosition>6</pageviewPosition> + <title>View product left in cart</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <productViewCategories> + <row>Category TWO LEFT in cart</row> + <row>second category</row> + </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>ecommerceAbandonedCart</type> + <revenue>2510.11</revenue> + <items>4</items> + + + <itemDetails> + <row> + <itemSKU>SKU VERY nice indeed</itemSKU> + <itemName>PRODUCT THREE LEFT in cart</itemName> + <itemCategory>Electronics & Cameras</itemCategory> + <price>10</price> + <quantity>1</quantity> + <categories> + <row>Electronics & Cameras</row> + </categories> + </row> + <row> + <itemSKU>SKU IN ABANDONED CART ONE</itemSKU> + <itemName>PRODUCT ONE LEFT in cart</itemName> + <itemCategory /> + <price>500.11</price> + <quantity>1</quantity> + <categories> + </categories> + </row> + <row> + <itemSKU>SKU IN ABANDONED CART TWO</itemSKU> + <itemName>PRODUCT TWO LEFT in cart</itemName> + <itemCategory>Category TWO LEFT in cart</itemCategory> + <price>1000</price> + <quantity>2</quantity> + <categories> + <row>Category TWO LEFT in cart</row> + <row>second category</row> + </categories> + </row> + </itemDetails> + <icon>plugins/Morpheus/images/ecommerceAbandonedCart.png</icon> + <iconSVG>plugins/Morpheus/images/ecommerceAbandonedCart.svg</iconSVG> + <title>Abandoned Cart</title> + <subtitle>$2,510.11 revenue - 4 items: PRODUCT THREE LEFT in cart, PRODUCT ONE LEFT in cart, PRODUCT TWO LEFT in cart)</subtitle> + + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>2</visitCount> + <visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus> + <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.svg</visitEcommerceStatusIcon> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <secondsSinceFirstVisit>5760</secondsSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <secondsSinceLastEcommerceOrder>0</secondsSinceLastEcommerceOrder> + <visitDuration>3961</visitDuration> + <visitDurationPretty>1 hours 6 min</visitDurationPretty> + <searches>0</searches> + <actions>6</actions> + <interactions>6</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode>pl</languageCode> + <language>Polish</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>13351.11</totalEcommerceRevenue> + <totalEcommerceConversions>4</totalEcommerceConversions> + <totalEcommerceItems>12</totalEcommerceItems> + <totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue> + <totalAbandonedCarts>3</totalAbandonedCarts> + <totalAbandonedCartsItems>12</totalAbandonedCartsItems> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Poland</country> + <countryCode>pl</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/pl.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Poland</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <secondsSinceLastVisit>5760</secondsSinceLastVisit> + <resolution>1024x768</resolution> + <plugins>cookie, flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> + <customVariables> + <row> + <customVariableName3>VisitorName</customVariableName3> + <customVariableValue3>Great name!</customVariableValue3> + </row> + <row> + <customVariableName4>ValueIsZero</customVariableName4> + <customVariableValue4>0</customVariableValue4> + </row> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> + </row> +</result>
\ No newline at end of file diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_SegmentRevenueOrder__Goals.get_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_SegmentRevenueOrder__Goals.get_day.xml new file mode 100644 index 0000000000..0fbef44420 --- /dev/null +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_SegmentRevenueOrder__Goals.get_day.xml @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<result> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>3111.11</revenue> + <conversion_rate>100%</conversion_rate> + <nb_conversions_new_visit>0</nb_conversions_new_visit> + <nb_visits_converted_new_visit>0</nb_visits_converted_new_visit> + <revenue_new_visit>0</revenue_new_visit> + <conversion_rate_new_visit>0%</conversion_rate_new_visit> + <nb_conversions_returning_visit>2</nb_conversions_returning_visit> + <nb_visits_converted_returning_visit>1</nb_visits_converted_returning_visit> + <revenue_returning_visit>3111.11</revenue_returning_visit> + <conversion_rate_returning_visit>100%</conversion_rate_returning_visit> +</result> diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_SegmentRevenueOrder__Live.getLastVisitsDetails_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_SegmentRevenueOrder__Live.getLastVisitsDetails_day.xml new file mode 100644 index 0000000000..cb1dec677e --- /dev/null +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_SegmentRevenueOrder__Live.getLastVisitsDetails_day.xml @@ -0,0 +1,385 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <idSite>1</idSite> + <idVisit>2</idVisit> + <visitIp>156.5.3.2</visitIp> + + <fingerprint>c7eabd04b45e68b3</fingerprint> + <actionDetails> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>Looking at Electronics & Cameras page with a page level custom variable</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>5</pageId> + <bandwidth /> + <timeSpent>360</timeSpent> + <timeSpentPretty>6 min 0s</timeSpentPretty> + <pageviewPosition>1</pageviewPosition> + <title>Looking at Electronics & Cameras page with a page level custom variable</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <productViewCategories> + <row>Electronics & Cameras</row> + </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>Looking at Electronics & Cameras page again</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>6</pageId> + <bandwidth /> + <timeSpent>360</timeSpent> + <timeSpentPretty>6 min 0s</timeSpentPretty> + <pageviewPosition>2</pageviewPosition> + <title>Looking at Electronics & Cameras page again</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <productViewCategories> + <row>Electronics & Cameras</row> + </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>Looking at product page</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>7</pageId> + <productViewPrice>666</productViewPrice> + <productViewName>PRODUCT name</productViewName> + <productViewSku>SKU VERY nice indeed</productViewSku> + <bandwidth /> + <timeSpent>720</timeSpent> + <timeSpentPretty>12 min 0s</timeSpentPretty> + <pageviewPosition>3</pageviewPosition> + <title>Looking at product page</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <productViewCategories> + <row>Electronics & Cameras</row> + </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>ecommerceOrder</type> + <orderId>937nsjusu 3894</orderId> + <revenue>1111.11</revenue> + <revenueSubTotal>1000</revenueSubTotal> + <revenueTax>111</revenueTax> + <revenueShipping>0.11</revenueShipping> + <revenueDiscount>666</revenueDiscount> + <items>8</items> + + + <itemDetails> + <row> + <itemSKU>SKU VERY nice indeed</itemSKU> + <itemName>PRODUCT name</itemName> + <itemCategory>Multiple Category 1</itemCategory> + <price>500</price> + <quantity>2</quantity> + <categories> + <row>Multiple Category 1</row> + <row>Multiple Category 2</row> + <row>Electronics & Cameras</row> + <row>Multiple Category 4</row> + <row>Multiple Category 5</row> + </categories> + </row> + <row> + <itemSKU>ANOTHER SKU HERE</itemSKU> + <itemName>PRODUCT name BIS</itemName> + <itemCategory /> + <price>100</price> + <quantity>6</quantity> + <categories> + </categories> + </row> + </itemDetails> + <icon>plugins/Morpheus/images/ecommerceOrder.png</icon> + <iconSVG>plugins/Morpheus/images/ecommerceOrder.svg</iconSVG> + <title>Ordered (937nsjusu 3894)</title> + <subtitle>$1,111.11 revenue - 8 items: PRODUCT name, PRODUCT name BIS)</subtitle> + + </row> + <row> + <type>ecommerceOrder</type> + <orderId>1037nsjusu4s3894</orderId> + <revenue>2000</revenue> + <revenueSubTotal>1500</revenueSubTotal> + <revenueTax>400</revenueTax> + <revenueShipping>100</revenueShipping> + <revenueDiscount>0</revenueDiscount> + <items>2</items> + + + <itemDetails> + <row> + <itemSKU>SKU2</itemSKU> + <itemName>Canon SLR</itemName> + <itemCategory>Electronics & Cameras</itemCategory> + <price>1500</price> + <quantity>1</quantity> + <categories> + <row>Electronics & Cameras</row> + </categories> + </row> + <row> + <itemSKU>SKU VERY nice indeed</itemSKU> + <itemName>PRODUCT name</itemName> + <itemCategory /> + <price>11.22</price> + <quantity>1</quantity> + <categories> + </categories> + </row> + </itemDetails> + <icon>plugins/Morpheus/images/ecommerceOrder.png</icon> + <iconSVG>plugins/Morpheus/images/ecommerceOrder.svg</iconSVG> + <title>Ordered (1037nsjusu4s3894)</title> + <subtitle>$2,000 revenue - 2 items: Canon SLR, PRODUCT name)</subtitle> + + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>View product left in cart</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>8</pageId> + <productViewPrice>999</productViewPrice> + <productViewName>PRODUCT THREE LEFT in cart</productViewName> + <productViewSku>SKU VERY nice indeed</productViewSku> + <bandwidth /> + <timeSpent>180</timeSpent> + <timeSpentPretty>3 min 0s</timeSpentPretty> + <pageviewPosition>4</pageviewPosition> + <title>View product left in cart</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>View product left in cart</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>9</pageId> + <productViewPrice>333</productViewPrice> + <productViewName>PRODUCT THREE LEFT in cart</productViewName> + <productViewSku>SKU VERY nice indeed</productViewSku> + <bandwidth /> + <timeSpent>180</timeSpent> + <timeSpentPretty>3 min 0s</timeSpentPretty> + <pageviewPosition>5</pageviewPosition> + <title>View product left in cart</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://example.org/index.htm</url> + <pageTitle>View product left in cart</pageTitle> + <pageIdAction>2</pageIdAction> + + + <pageId>10</pageId> + <productViewName>PRODUCT TWO LEFT in cart</productViewName> + <productViewSku>SKU IN ABANDONED CART TWO</productViewSku> + <bandwidth /> + <timeSpent>361</timeSpent> + <timeSpentPretty>6 min 1s</timeSpentPretty> + <pageviewPosition>6</pageviewPosition> + <title>View product left in cart</title> + <subtitle>http://example.org/index.htm</subtitle> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> + + <productViewCategories> + <row>Category TWO LEFT in cart</row> + <row>second category</row> + </productViewCategories> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>ecommerceAbandonedCart</type> + <revenue>2510.11</revenue> + <items>4</items> + + + <itemDetails> + <row> + <itemSKU>SKU VERY nice indeed</itemSKU> + <itemName>PRODUCT THREE LEFT in cart</itemName> + <itemCategory>Electronics & Cameras</itemCategory> + <price>10</price> + <quantity>1</quantity> + <categories> + <row>Electronics & Cameras</row> + </categories> + </row> + <row> + <itemSKU>SKU IN ABANDONED CART ONE</itemSKU> + <itemName>PRODUCT ONE LEFT in cart</itemName> + <itemCategory /> + <price>500.11</price> + <quantity>1</quantity> + <categories> + </categories> + </row> + <row> + <itemSKU>SKU IN ABANDONED CART TWO</itemSKU> + <itemName>PRODUCT TWO LEFT in cart</itemName> + <itemCategory>Category TWO LEFT in cart</itemCategory> + <price>1000</price> + <quantity>2</quantity> + <categories> + <row>Category TWO LEFT in cart</row> + <row>second category</row> + </categories> + </row> + </itemDetails> + <icon>plugins/Morpheus/images/ecommerceAbandonedCart.png</icon> + <iconSVG>plugins/Morpheus/images/ecommerceAbandonedCart.svg</iconSVG> + <title>Abandoned Cart</title> + <subtitle>$2,510.11 revenue - 4 items: PRODUCT THREE LEFT in cart, PRODUCT ONE LEFT in cart, PRODUCT TWO LEFT in cart)</subtitle> + + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.png</visitorTypeIcon> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>2</visitCount> + <visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus> + <visitEcommerceStatusIcon>plugins/Morpheus/images/ecommerceOrder.svg</visitEcommerceStatusIcon> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <secondsSinceFirstVisit>5760</secondsSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <secondsSinceLastEcommerceOrder>0</secondsSinceLastEcommerceOrder> + <visitDuration>3961</visitDuration> + <visitDurationPretty>1 hours 6 min</visitDurationPretty> + <searches>0</searches> + <actions>6</actions> + <interactions>6</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode>pl</languageCode> + <language>Polish</language> + <deviceType>Desktop</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Generic Desktop</deviceModel> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemName>Windows</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemVersion>XP</operatingSystemVersion> + <browserFamily>Gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browser>Firefox 3.6</browser> + <browserName>Firefox</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>13351.11</totalEcommerceRevenue> + <totalEcommerceConversions>4</totalEcommerceConversions> + <totalEcommerceItems>12</totalEcommerceItems> + <totalAbandonedCartsRevenue>7530.33</totalAbandonedCartsRevenue> + <totalAbandonedCarts>3</totalAbandonedCarts> + <totalAbandonedCartsItems>12</totalAbandonedCartsItems> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Poland</country> + <countryCode>pl</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/pl.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Poland</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <secondsSinceLastVisit>5760</secondsSinceLastVisit> + <resolution>1024x768</resolution> + <plugins>cookie, flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> + <customVariables> + <row> + <customVariableName3>VisitorName</customVariableName3> + <customVariableValue3>Great name!</customVariableValue3> + </row> + <row> + <customVariableName4>ValueIsZero</customVariableName4> + <customVariableValue4>0</customVariableValue4> + </row> + <row> + <customVariableName5>VisitorType</customVariableName5> + <customVariableValue5>NewLoggedOut</customVariableValue5> + </row> + </customVariables> + </row> +</result>
\ No newline at end of file diff --git a/plugins/LanguagesManager/tests/Unit/TranslationWriter/Validate/NoScriptsTest.php b/plugins/LanguagesManager/tests/Unit/TranslationWriter/Validate/NoScriptsTest.php index b6b01790fd..8c77400f30 100644 --- a/plugins/LanguagesManager/tests/Unit/TranslationWriter/Validate/NoScriptsTest.php +++ b/plugins/LanguagesManager/tests/Unit/TranslationWriter/Validate/NoScriptsTest.php @@ -86,13 +86,6 @@ class NoScriptsTest extends \PHPUnit\Framework\TestCase array( array( 'test' => array( - 'test' => 'that will fail on document. or not?' - ) - ), - ), - array( - array( - 'test' => array( 'test' => 'bla <a background="yellow">link</a>' ) ), |