Skip to content

Commit 0556ed2

Browse files
rbayetrbayet
committed
Merge branch '2.10.x' into 2.11.x
2 parents 2cf0d04 + f1c9500 commit 0556ed2

File tree

6 files changed

+92
-15
lines changed

6 files changed

+92
-15
lines changed

‎src/module-elasticsuite-analytics/Model/Search/Usage/Kpi/AggregationProvider.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,33 @@ private function getQueries()
112112
'value' => 'catalogsearch_result_index',
113113
]
114114
),
115+
'product_views' => $this->queryFactory->create(
116+
QueryInterface::TYPE_TERM,
117+
[
118+
'field' => 'page.type.identifier',
119+
'value' => 'catalog_product_view',
120+
]
121+
),
122+
'category_views' => $this->queryFactory->create(
123+
QueryInterface::TYPE_TERM,
124+
[
125+
'field' => 'page.type.identifier',
126+
'value' => 'catalog_category_view',
127+
]
128+
),
129+
'add_to_cart' => $this->queryFactory->create(
130+
QueryInterface::TYPE_EXISTS,
131+
[
132+
'field' => 'page.cart.product_id',
133+
]
134+
),
135+
'sales' => $this->queryFactory->create(
136+
QueryInterface::TYPE_TERM,
137+
[
138+
'field' => 'page.type.identifier',
139+
'value' => 'checkout_onepage_success',
140+
]
141+
),
115142
];
116143

117144
return $queries;

‎src/module-elasticsuite-analytics/Model/Search/Usage/Kpi/Report.php‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ class Report extends AbstractReport
2727
* @var array
2828
*/
2929
private $defaultKeys = [
30-
'page_view_counts',
30+
'page_views_count',
31+
'product_views_count',
32+
'category_views_count',
33+
'add_to_cart_count',
34+
'sales_count',
3135
'sessions_count',
3236
'visitors_count',
3337
'search_page_views_count',
@@ -49,12 +53,15 @@ protected function processResponse(\Smile\ElasticsuiteCore\Search\Adapter\Elasti
4953
if ($value->getValue() == 'all') {
5054
$data['sessions_count'] = (int) $value->getMetrics()['unique_sessions'];
5155
$data['visitors_count'] = (int) $value->getMetrics()['unique_visitors'];
52-
} else {
56+
} elseif ($value->getValue() == 'searches') {
5357
$data['search_page_views_count'] = (int) $value->getMetrics()['count'];
5458
$data['search_sessions_count'] = (int) $value->getMetrics()['unique_sessions'];
5559
$data['search_usage_rate'] = round($data['search_page_views_count'] / ($data['search_sessions_count'] ?: 1), 1);
5660
$data['spellcheck_usage_count'] = (int) $value->getMetrics()['spellcheck_usage']['sum'];
5761
$data['spellcheck_usage_rate'] = $value->getMetrics()['spellcheck_usage']['avg'];
62+
} elseif (in_array($value->getValue(), ['product_views', 'category_views', 'add_to_cart', 'sales'])) {
63+
$key = sprintf("%s_count", $value->getValue());
64+
$data[$key] = (int) $value->getMetrics()['count'];
5865
}
5966
}
6067

‎src/module-elasticsuite-analytics/i18n/en_US.csv‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
"Searches","Searches"
22
"Page views","Page views"
3+
"Category views","Category views"
4+
"Product views","Product views"
5+
"Products added to cart","Products added to cart"
6+
"Sales","Sales"
37
"Sessions","Sessions"
48
"Sessions with search","Sessions with search"
59
"Sessions without search","Sessions without search"

‎src/module-elasticsuite-analytics/i18n/fr_FR.csv‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
"Searches","Recherches"
22
"Page views","Pages vues"
3+
"Category views","Catégories vues"
4+
"Product views","Produits vus"
5+
"Products added to cart","Ajouts au panier"
6+
"Sales","Ventes"
37
"Sessions","Sessions"
48
"Sessions with search","Sessions avec recherche"
59
"Sessions without search","Sessions sans recherche"

‎src/module-elasticsuite-analytics/view/adminhtml/templates/search/usage/kpi.phtml‎

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,56 +21,84 @@
2121
$data = $block->getKpi();
2222
?>
2323

24-
<div class="dashboard-main col-m-10 col-m-push-1">
24+
<div class="dashboard-main col-m-11">
2525
<div class="dashboard-totals">
2626
<?php if (empty($data)) : ?>
2727
<div class="empty-text" style="width:100%; text-align:center">
2828
<em><?= __('No data over the selected period.'); ?></em>
2929
</div>
3030
<?php else : ?>
3131
<ul class="dashboard-totals-list">
32-
<li class="dashboard-totals-item" style="width:16%; text-align:center;">
32+
<li class="dashboard-totals-item">
3333
<span class="dashboard-totals-label"><?= __('Searches') ?></span>
3434
<strong class="dashboard-totals-value">
3535
<span class="value"><?= $data['search_page_views_count']; ?></span>
3636
<span class="dashboard-totals-decimals"></span>
3737
</strong>
3838
</li>
39-
<li class="dashboard-totals-item" style="width:16%; text-align:center;">
39+
<li class="dashboard-totals-item">
4040
<span class="dashboard-totals-label"><?= __('Page views') ?></span>
4141
<strong class="dashboard-totals-value">
4242
<span class="value"><?= $data['page_views_count']; ?></span>
4343
<span class="dashboard-totals-decimals"></span>
4444
</strong>
4545
</li>
46-
<li class="dashboard-totals-item" style="width:16%; text-align:center;">
47-
<span class="dashboard-totals-label"><?= __('Sessions') ?></span>
46+
<li class="dashboard-totals-item">
47+
<span class="dashboard-totals-label"><?= __('Category views') ?></span>
4848
<strong class="dashboard-totals-value">
49-
<span class="value"><?= $data['sessions_count']; ?></span>
49+
<span class="value"><?= $data['category_views_count']; ?></span>
5050
<span class="dashboard-totals-decimals"></span>
5151
</strong>
5252
</li>
53-
<li class="dashboard-totals-item" style="width:16%; text-align:center;">
54-
<span class="dashboard-totals-label"><?= __('Sessions with search') ?></span>
53+
<li class="dashboard-totals-item">
54+
<span class="dashboard-totals-label"><?= __('Product views') ?></span>
5555
<strong class="dashboard-totals-value">
56-
<span class="value"><?= $data['search_sessions_count']; ?></span>
56+
<span class="value"><?= $data['product_views_count']; ?></span>
5757
<span class="dashboard-totals-decimals"></span>
5858
</strong>
5959
</li>
60-
<li class="dashboard-totals-item" style="width:16%; text-align:center;">
61-
<span class="dashboard-totals-label"><?= __('Searches per session') ?></span>
60+
<li class="dashboard-totals-item">
61+
<span class="dashboard-totals-label"><?= __('Products added to cart') ?></span>
6262
<strong class="dashboard-totals-value">
63-
<span class="value"><?= $data['search_usage_rate']; ?></span>
63+
<span class="value"><?= $data['add_to_cart_count']; ?></span>
64+
<span class="dashboard-totals-decimals"></span>
65+
</strong>
66+
</li>
67+
<li class="dashboard-totals-item">
68+
<span class="dashboard-totals-label"><?= __('Sales') ?></span>
69+
<strong class="dashboard-totals-value">
70+
<span class="value"><?= $data['sales_count']; ?></span>
6471
<span class="dashboard-totals-decimals"></span>
6572
</strong>
6673
</li>
67-
<li class="dashboard-totals-item" style="width:16%; text-align:center;">
74+
<li class="dashboard-totals-item">
6875
<span class="dashboard-totals-label"><?= __('Visitors') ?></span>
6976
<strong class="dashboard-totals-value">
7077
<span class="value"><?= $data['visitors_count']; ?></span>
7178
<span class="dashboard-totals-decimals"></span>
7279
</strong>
7380
</li>
81+
<li class="dashboard-totals-item">
82+
<span class="dashboard-totals-label"><?= __('Sessions') ?></span>
83+
<strong class="dashboard-totals-value">
84+
<span class="value"><?= $data['sessions_count']; ?></span>
85+
<span class="dashboard-totals-decimals"></span>
86+
</strong>
87+
</li>
88+
<li class="dashboard-totals-item">
89+
<span class="dashboard-totals-label"><?= __('Sessions with search') ?></span>
90+
<strong class="dashboard-totals-value">
91+
<span class="value"><?= $data['search_sessions_count']; ?></span>
92+
<span class="dashboard-totals-decimals"></span>
93+
</strong>
94+
</li>
95+
<li class="dashboard-totals-item">
96+
<span class="dashboard-totals-label"><?= __('Searches per session') ?></span>
97+
<strong class="dashboard-totals-value">
98+
<span class="value"><?= $data['search_usage_rate']; ?></span>
99+
<span class="dashboard-totals-decimals"></span>
100+
</strong>
101+
</li>
74102
</ul>
75103
<?php endif; ?>
76104
</div>

‎src/module-elasticsuite-analytics/view/adminhtml/web/css/source/_module.less‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424
display: none;
2525
}
2626

27+
.dashboard-totals-list {
28+
.dashboard-totals-item {
29+
width: 10%;
30+
text-align: center
31+
}
32+
}
33+
2734
.admin__table-primary {
2835
&.dashboard-data {
2936
&.terms-report {

0 commit comments

Comments
 (0)