|
@@ -45,7 +45,7 @@ discard block |
|
|
block discarded – undo |
|
45
|
45
|
$etm = $this->getDoctrine()->getManager(); |
|
46
|
46
|
$item = $this->container->getParameter('knp_paginator.page_range'); |
|
47
|
47
|
$qbd = $etm->getRepository('AppBundle:Orders')->createQueryBuilder('o'); |
|
48
|
|
- $qbd->where('o.delivdate > ' . date('Y-m-d')); |
|
|
48
|
+ $qbd->where('o.delivdate > '.date('Y-m-d')); |
|
49
|
49
|
$qbd->andWhere('o.status = 1'); |
|
50
|
50
|
|
|
51
|
51
|
$createForm = $this->createCreateForm('orders_create'); |
|
@@ -114,7 +114,7 @@ discard block |
|
|
block discarded – undo |
|
114
|
114
|
|
|
115
|
115
|
$orders = new Orders(); |
|
116
|
116
|
$form = $this->createForm(OrdersType::class, $orders); |
|
117
|
|
- $return = ['orders' => $orders, 'form' => $form->createView(),]; |
|
|
117
|
+ $return = ['orders' => $orders, 'form' => $form->createView(), ]; |
|
118
|
118
|
$form->handleRequest($request); |
|
119
|
119
|
$supplier = $orders->getSupplier(); |
|
120
|
120
|
$articles = $etm->getRepository('AppBundle:Article')->getArticleFromSupplier($supplier->getId()); |
|
@@ -220,8 +220,8 @@ discard block |
|
|
block discarded – undo |
|
220
|
220
|
if ($date >= date('w')) { |
|
221
|
221
|
$diffOrder = $date - date('w'); |
|
222
|
222
|
$diffDeliv = $diffOrder + $supplier->getDelaydeliv(); |
|
223
|
|
- $dateOrder = date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date('j')+$diffOrder, date('Y'))); |
|
224
|
|
- $delivDate = date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date('j')+$diffDeliv, date('Y'))); |
|
|
223
|
+ $dateOrder = date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date('j') + $diffOrder, date('Y'))); |
|
|
224
|
+ $delivDate = date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date('j') + $diffDeliv, date('Y'))); |
|
225
|
225
|
$setOrderDate = \DateTime::createFromFormat('Y-m-d H:i:s', $dateOrder); |
|
226
|
226
|
$setDelivDate = \DateTime::createFromFormat('Y-m-d H:i:s', $delivDate); |
|
227
|
227
|
if ($setOrderDate !== false && $setDelivDate !== false) { |
Dev-Int /
glsr
