[FEATURE] Extend Lead CSV download with country, last visit and last …

…download Backported from commit 5af40d4 Related: https://projekte.in2code.de/issues/63177
in2code-de · Apr 11, 2024 · c519163 · c519163
1 parent 848f4f1
commit c519163
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Classes/Domain/Model/Visitor.php b/Classes/Domain/Model/Visitor.php
@@ -1293,7 +1293,14 @@ public function getPhone(): string
  */
  public function getCountry(): string
  {
- return $this->getPropertyFromIpinformations('country');
+ $country = $this->getPropertyFromAttributes('country');
+ if (empty($country)) {
+ $country = $this->getPropertyFromIpinformations('country');
+ }
+ if (empty($country)) {
+ $country = $this->getPropertyFromIpinformations('countryCode');
+ }
+ return $country;
  }
 
  /**

diff --git a/Resources/Private/Templates/Lead/DownloadCsv.html b/Resources/Private/Templates/Lead/DownloadCsv.html
@@ -1,5 +1,5 @@
 <f:spaceless>
- <lux:format.quotes>Lead Ident</lux:format.quotes>;<lux:format.quotes>Lead Scoring</lux:format.quotes>;<lux:format.quotes>Email</lux:format.quotes>;<lux:format.quotes>Company</lux:format.quotes>;<lux:format.quotes>Last Visit</lux:format.quotes>;<lux:format.quotes>Number of Visits</lux:format.quotes>
- <f:for each="{allVisitors}" as="visitor"><lux:format.quotes>{visitor.fullName}</lux:format.quotes>;<lux:format.quotes>{visitor.scoring}</lux:format.quotes>;<lux:format.quotes>{visitor.email}</lux:format.quotes>;<lux:format.quotes>{visitor.company}</lux:format.quotes>;<lux:format.quotes>{f:format.date(date:visitor.dateOfLastVisit,format:'{f:translate(key:\'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:date\')}')}</lux:format.quotes>;<lux:format.quotes>{visitor.visits}</lux:format.quotes>
+ <lux:format.quotes>Lead Ident</lux:format.quotes>;<lux:format.quotes>Lead Scoring</lux:format.quotes>;<lux:format.quotes>Email</lux:format.quotes>;<lux:format.quotes>Company</lux:format.quotes>;<lux:format.quotes>Last Visit</lux:format.quotes>;<lux:format.quotes>Number of Visits</lux:format.quotes>;<lux:format.quotes>Country</lux:format.quotes>;<lux:format.quotes>Last visit</lux:format.quotes>;<lux:format.quotes>Last download</lux:format.quotes>
+ <f:for each="{allVisitors}" as="visitor"><lux:format.quotes>{visitor.fullName}</lux:format.quotes>;<lux:format.quotes>{visitor.scoring}</lux:format.quotes>;<lux:format.quotes>{visitor.email}</lux:format.quotes>;<lux:format.quotes>{visitor.company}</lux:format.quotes>;<lux:format.quotes>{f:format.date(date:visitor.dateOfLastVisit,format:'{f:translate(key:\'LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:date\')}')}</lux:format.quotes>;<lux:format.quotes>{visitor.visits}</lux:format.quotes>;<lux:format.quotes>{visitor.country}</lux:format.quotes>;<lux:format.quotes>{visitor.pagevisitLast.crdate -> f:format.date(format:'Y-m-d')}</lux:format.quotes>;<lux:format.quotes>{visitor.lastDownload.crdate -> f:format.date(format:'Y-m-d')}</lux:format.quotes>
  </f:for>
 </f:spaceless>