TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor stat on OrderQuery

Browse Source
This commit is contained in:
Manuel Raynaud
2014-02-07 11:18:34 +01:00
parent 2fd17b9e22
commit acb1fdd60a
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/lib/Thelia/Model/OrderQuery.php
View File

@@ -6,8 +6,11 @@ use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\ActiveQuery\Join; use Propel\Runtime\ActiveQuery\Join;
use Propel\Runtime\Propel;
use Thelia\Model\Base\OrderQuery as BaseOrderQuery; use Thelia\Model\Base\OrderQuery as BaseOrderQuery;
use Thelia\Model\Map\OrderProductTableMap;
use Thelia\Model\Map\OrderProductTaxTableMap;
use Thelia\Model\Map\OrderTableMap; use Thelia\Model\Map\OrderTableMap;
/** /**
@@ -97,17 +100,31 @@ class OrderQuery extends BaseOrderQuery
*/ */
public static function getSaleStats(\DateTime $startDate, \DateTime $endDate, $includeShipping) public static function getSaleStats(\DateTime $startDate, \DateTime $endDate, $includeShipping)
{ {
$amount = 0;
foreach(self::create() $orderTaxJoin = new Join();
->filterByStatusId(array(2,3,4), Criteria::IN) $orderTaxJoin->addExplicitCondition(OrderProductTableMap::TABLE_NAME, 'ID', null, OrderProductTaxTableMap::TABLE_NAME, 'ORDER_PRODUCT_ID', null);
->filterByCreatedAt(sprintf("%s 00:00:00", $startDate->format('Y-m-d')), Criteria::GREATER_EQUAL) $orderTaxJoin->setJoinType(Criteria::INNER_JOIN);
->filterByCreatedAt(sprintf("%s 23:59:59", $endDate->format('Y-m-d')), Criteria::LESS_EQUAL)
->find() as $order) { $query = self::create('o')
$tax = 0; ->filterByCreatedAt(sprintf("%s 00:00:00", $startDate->format('Y-m-d')), Criteria::GREATER_EQUAL)
$amount += $order->getTotalAmount($tax, $includeShipping); ->filterByCreatedAt(sprintf("%s 23:59:59", $endDate->format('Y-m-d')), Criteria::LESS_EQUAL)
->filterByStatusId("2,3,4", Criteria::IN)
->innerJoinOrderProduct()
->addJoinObject($orderTaxJoin)
;
if($includeShipping) {
$query->withColumn("SUM((`order_product`.QUANTITY * IF(`order_product`.WAS_IN_PROMO,`order_product`.PROMO_PRICE+`order_product_tax`.PROMO_AMOUNT,`order_product`.PRICE+`order_product_tax`.AMOUNT)) + `order`.postage )", 'TOTAL');
} else {
$query->withColumn("SUM((`order_product`.QUANTITY * IF(`order_product`.WAS_IN_PROMO,`order_product`.PROMO_PRICE+`order_product_tax`.PROMO_AMOUNT,`order_product`.PRICE+`order_product_tax`.AMOUNT)))", 'TOTAL');
} }
return $amount; $query->select('TOTAL');
$amount = $query->findOne();
return null === $amount ? 0 : round($amount, 2);
} }
/** /**