@@ -47,7 +47,8 @@ discard block |
||
| 47 | 47 | * |
| 48 | 48 | * @return \Doctrine\ORM\QueryBuilder |
| 49 | 49 | */ |
| 50 | - public function findOrders() { |
|
| 50 | + public function findOrders() |
|
| 51 | + { |
|
| 51 | 52 | $query = $this->findActive() |
| 52 | 53 | ->andWhere('o.delivdate > :date') |
| 53 | 54 | ->setParameter('date', date('Y-m-d')); |
@@ -60,7 +61,8 @@ discard block |
||
| 60 | 61 | * |
| 61 | 62 | * @return \Doctrine\ORM\QueryBuilder |
| 62 | 63 | */ |
| 63 | - public function findDeliveries() { |
|
| 64 | + public function findDeliveries() |
|
| 65 | + { |
|
| 64 | 66 | $query = $this->findActive() |
| 65 | 67 | ->andWhere('o.delivdate <= :date') |
| 66 | 68 | ->setParameter('date', date('Y-m-d')); |
@@ -68,7 +70,8 @@ discard block |
||
| 68 | 70 | return $query; |
| 69 | 71 | } |
| 70 | 72 | |
| 71 | - private function findActive() { |
|
| 73 | + private function findActive() |
|
| 74 | + { |
|
| 72 | 75 | $query = $this->createQueryBuilder('o') |
| 73 | 76 | ->orderBy('o.id', 'DESC') |
| 74 | 77 | ->where('o.status = 1'); |
@@ -57,7 +57,8 @@ |
||
| 57 | 57 | * @param integer $pDays Delta for the day of delivery |
| 58 | 58 | * @return integer Delta next business day |
| 59 | 59 | */ |
| 60 | - function getNextOpenDay ($pDate, $pDays) { |
|
| 60 | + function getNextOpenDay ($pDate, $pDays) |
|
| 61 | + { |
|
| 61 | 62 | $aBankHolidays = ['1_1', '1_5', '8_5', '14_7', '15_8', '1_11', '11_11', '25_12', ]; |
| 62 | 63 | if (function_exists ('easter_date')) { |
| 63 | 64 | $pEaster = easter_date ((int)date('Y'), $pDate); |