Преглед на файлове

Nombre maximum de commandes / semaine

feature/export_comptable
Guillaume преди 4 години
родител
ревизия
e5cc53a978
променени са 2 файла, в които са добавени 16 реда и са изтрити 2 реда
  1. +10
    -1
      ShopBundle/Repository/OrderShopRepository.php
  2. +6
    -1
      ShopBundle/Services/OrderUtils.php

+ 10
- 1
ShopBundle/Repository/OrderShopRepository.php Целия файл

@@ -85,6 +85,10 @@ class OrderShopRepository extends BaseRepository implements DefaultRepositoryInt
{
$query = $this->findByMerchantQuery() ;

if(isset($params['count']) && $params['count']) {
$query->select('count(e.id)') ;
}

if(isset($params['dateStart']) || isset($params['dateEnd'])) {
$params['dateField'] = isset($params['dateField']) ? $params['dateField'] : 'validationDate' ;
}
@@ -120,6 +124,11 @@ class OrderShopRepository extends BaseRepository implements DefaultRepositoryInt
$query->addOrderBy('deliverySlotPointSale.day', 'ASC') ;
$query->addOrderBy('deliverySlotPointSale.timeStart', 'ASC') ;

return $query->getQuery()->getResult() ;
if(isset($params['count']) && $params['count']) {
return $query->getQuery()->getSingleScalarResult();
}
else {
return $query->getQuery()->getResult() ;
}
}
}

+ 6
- 1
ShopBundle/Services/OrderUtils.php Целия файл

@@ -448,7 +448,12 @@ class OrderUtils
$orderPayment->setAmount($amount) ;
$orderPayment->setReference($reference) ;
$orderPayment->setComment($comment) ;
$orderPayment->setPaidAt($paidAt) ;
if($paidAt) {
$orderPayment->setPaidAt($paidAt) ;
}
else {
$orderPayment->setPaidAt(new \DateTime('now')) ;
}

$this->em->persist($orderPayment) ;
$this->em->flush() ;

Loading…
Отказ
Запис