diff --git a/src/Client/TradeTrackerClient.php b/src/Client/TradeTrackerClient.php index c0b1d47..efc4369 100644 --- a/src/Client/TradeTrackerClient.php +++ b/src/Client/TradeTrackerClient.php @@ -410,13 +410,17 @@ public function getTouchpoints(int $conversionTransactionId) * * @param \DateTime $startDate The start date of the transactions. * @param \DateTime $endDate The end date of the transactions. + * @param Model\AffiliateSite[] $affiliateSites Affiliate site array. Can be obtained with getAffiliateSites() method * * @return array */ - public function getTransactions(\DateTime $startDate, \DateTime $endDate) + public function getTransactions(\DateTime $startDate, \DateTime $endDate, array $affiliateSites = []) { $data = []; - $affiliateSites = $this->getAffiliateSites(); + + if (empty($affiliateSites)) { + $affiliateSites = $this->getAffiliateSites(); + } $filter = new Filter\ConversionTransactionFilter(); $filter->setRegistrationDateFrom($startDate->format('Y-m-d')); diff --git a/src/Mapper/CampaignInfoMapper.php b/src/Mapper/CampaignInfoMapper.php index d7186c2..454f0f2 100644 --- a/src/Mapper/CampaignInfoMapper.php +++ b/src/Mapper/CampaignInfoMapper.php @@ -74,6 +74,8 @@ public function hydrate($value) $campaignInfo->setAttributionModelSales( (new CampaignAttributionModelMapper())->hydrate($value->attributionModelSales) ); + + $campaignInfo->setTimezone($value->timeZone); return $campaignInfo; } diff --git a/src/Model/CampaignAffiliatePolicyStatus.php b/src/Model/CampaignAffiliatePolicyStatus.php index 433778b..a0c0255 100644 --- a/src/Model/CampaignAffiliatePolicyStatus.php +++ b/src/Model/CampaignAffiliatePolicyStatus.php @@ -38,4 +38,12 @@ public function setStatus($status) { $this->status = $status; } + + /** + * @return string + */ + public function __toString() + { + return $this->status; + } } diff --git a/src/Model/CampaignAssignmentStatus.php b/src/Model/CampaignAssignmentStatus.php index 895af02..a3d1bdc 100644 --- a/src/Model/CampaignAssignmentStatus.php +++ b/src/Model/CampaignAssignmentStatus.php @@ -41,4 +41,12 @@ public function setStatus($status) { $this->status = $status; } + + /** + * @return string + */ + public function __toString() + { + return $this->status; + } } diff --git a/src/Model/CampaignInfo.php b/src/Model/CampaignInfo.php index e70a3cb..7ae7690 100644 --- a/src/Model/CampaignInfo.php +++ b/src/Model/CampaignInfo.php @@ -128,6 +128,27 @@ class CampaignInfo * @var CampaignAttributionModel */ private $attributionModelSales; + + /** + * @var string|null + */ + private $timeZone; + + /** + * @return string|null + */ + public function getTimeZone(): ?string + { + return $this->timeZone; + } + + /** + * @param string|null $timeZone + */ + public function setTimeZone(?string $timeZone): void + { + $this->timeZone = $timeZone; + } /** * @return CampaignCategory