Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix code style and small bugs

Browse Source 
[MAILPOET-2503]
This commit is contained in:
Amine Ben hammou
2020-01-21 14:38:07 +01:00
committed by Jack Kitterhing
parent 4fe760f4b1
commit a5679a5dbf
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/API/JSON/ResponseBuilders/NewslettersResponseBuilder.php
View File

@@ -19,7 +19,7 @@ class NewslettersResponseBuilder {
const RELATION_SCHEDULED = 'scheduled';
const RELATION_STATISTICS = 'statistics';
/** @var NewslettersStatsRepository */
/** @var NewsletterStatisticsRepository */
private $newslettersStatsRepository;
public function __construct(NewsletterStatisticsRepository $newslettersStatsRepository) {
@@ -65,7 +65,7 @@ class NewslettersResponseBuilder {
$data['childrenCount'] = count($newsletter->getChildren());
}
if ($relation === self::RELATION_SCHEDULED) {
$data['totalScheduled'] = (int)SendingQueue::findTaskByNewsletterId($this->id)
$data['totalScheduled'] = (int)SendingQueue::findTaskByNewsletterId($newsletter->getId())
->where('tasks.status', SendingQueue::STATUS_SCHEDULED)
->count();
}

8
lib/Newsletter/Statistics/NewsletterStatisticsRepository.php
View File

@@ -18,8 +18,8 @@ class NewsletterStatisticsRepository extends Repository {
/** @var WCHelper */
private $wcHelper;
public function __construct(EntityManager $entity_manager, WCHelper $wcHelper) {
parent::__construct($entity_manager);
public function __construct(EntityManager $entityManager, WCHelper $wcHelper) {
parent::__construct($entityManager);
$this->wcHelper = $wcHelper;
}
@@ -95,10 +95,10 @@ class NewsletterStatisticsRepository extends Repository {
$currency = $this->wcHelper->getWoocommerceCurrency();
list($data) = $this->entityManager
->createQueryBuilder()
->select('SUM(stats.order_price_total) AS total, COUNT(stats.id) AS cnt')
->select('SUM(stats.orderPriceTotal) AS total, COUNT(stats.id) AS cnt')
->from(StatisticsWooCommercePurchaseEntity::class, 'stats')
->where('stats.newsletter = :newsletter')
->andWhere('stats.order_currency = :currency')
->andWhere('stats.orderCurrency = :currency')
->setParameter('newsletter', $newsletter)
->setParameter('currency', $currency)
->getQuery()

5
tests/integration/_bootstrap.php
View File

@@ -238,3 +238,8 @@ if (!function_exists('WC')) {
}
require_once '_fixtures.php';
if (!function_exists('get_woocommerce_currency')) {
function get_woocommerce_currency() {
return 'USD';
}
}