diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2019-11-18 10:08:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-18 10:08:16 +0300 |
| commit | 60009312a44f1aa728a0f9f6f7e0a8a59068544d (patch) | |
| tree | 2b037e8abdf08ed024946a6a841757162ea9443f /core/DataAccess | |
| parent | 12011166e3934f1d76f2d183a63cfe2ff9bde8e6 (diff) | |
Add product name, product category, product sku, product price segments (#15144)
* Add product category segment.
* Fix productCategory action, add productName, productSku, productPrice segments.
* Hide productCategory1...5 segments in UI/API.
* fix tests
* Do not select conversion items that are deleted in segments + fix bug in ecommerce item insert (do not fail whole insert if one duplicate primary key is found).
* update expected files
* Fix unit test.
Diffstat (limited to 'core/DataAccess')
| -rw-r--r-- | core/DataAccess/LogQueryBuilder/JoinGenerator.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/DataAccess/LogQueryBuilder/JoinGenerator.php b/core/DataAccess/LogQueryBuilder/JoinGenerator.php index 08f6ebdc2a..133c670b33 100644 --- a/core/DataAccess/LogQueryBuilder/JoinGenerator.php +++ b/core/DataAccess/LogQueryBuilder/JoinGenerator.php @@ -277,6 +277,10 @@ class JoinGenerator return null; } + if ($table == 'log_conversion_item') { // by default we don't want to consider deleted columns + $join .= sprintf(' AND `%s`.deleted = 0', $table); + } + return $join; } |