@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | */ |
151 | 151 | public function setAmount($amount) |
152 | 152 | { |
153 | - $this->amount = (double)$amount; |
|
153 | + $this->amount = (double) $amount; |
|
154 | 154 | |
155 | 155 | return $this; |
156 | 156 | } |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | */ |
174 | 174 | public function setTva($tva) |
175 | 175 | { |
176 | - $this->tva = (double)$tva; |
|
176 | + $this->tva = (double) $tva; |
|
177 | 177 | |
178 | 178 | return $this; |
179 | 179 | } |
@@ -100,7 +100,7 @@ |
||
100 | 100 | $form = $this->createForm(GroupType::class, $group); |
101 | 101 | AbstractController::addRolesAction($form, $group); |
102 | 102 | $form->handleRequest($request); |
103 | - $return = ['group' => $group, 'form' => $form->createView(),]; |
|
103 | + $return = ['group' => $group, 'form' => $form->createView(), ]; |
|
104 | 104 | |
105 | 105 | if ($form->isValid()) { |
106 | 106 | $etm = $this->getDoctrine()->getManager(); |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | * @param Object $entity Entity |
258 | 258 | * @param Request $request Request in progress |
259 | 259 | * @param string $entityName Name of Entity |
260 | - * @return array |
|
260 | + * @return \Symfony\Component\HttpFoundation\RedirectResponse |
|
261 | 261 | */ |
262 | 262 | public function abstractDeleteWithArticlesAction($entity, Request $request, $entityName) |
263 | 263 | { |
@@ -278,6 +278,9 @@ discard block |
||
278 | 278 | return $this->redirect($this->generateUrl($entityName)); |
279 | 279 | } |
280 | 280 | |
281 | + /** |
|
282 | + * @param string $entityName |
|
283 | + */ |
|
281 | 284 | private function testReturnParam($entity, $entityName) |
282 | 285 | { |
283 | 286 | $entityArray = ['company', 'settings', 'group', 'tva']; |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | $this->addRolesAction($form, $entityNew); |
154 | 154 | } |
155 | 155 | $form->handleRequest($request); |
156 | - $return = [$entity => $entityNew, 'form' => $form->createView(),]; |
|
156 | + $return = [$entity => $entityNew, 'form' => $form->createView(), ]; |
|
157 | 157 | |
158 | 158 | if ($form->isValid()) { |
159 | 159 | $etm = $this->getDoctrine()->getManager(); |
@@ -262,9 +262,9 @@ discard block |
||
262 | 262 | public function abstractDeleteWithArticlesAction($entity, Request $request, $entityName) |
263 | 263 | { |
264 | 264 | $etm = $this->getDoctrine()->getManager(); |
265 | - $form = $this->createDeleteForm($entity->getId(), $entityName . '_delete'); |
|
265 | + $form = $this->createDeleteForm($entity->getId(), $entityName.'_delete'); |
|
266 | 266 | $entityArticles = $etm |
267 | - ->getRepository('AppBundle:' . ucfirst($entityName) . 'Articles') |
|
267 | + ->getRepository('AppBundle:'.ucfirst($entityName).'Articles') |
|
268 | 268 | ->findBy([$entityName => $entity->getId()]); |
269 | 269 | |
270 | 270 | if ($form->handleRequest($request)->isValid()) { |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | { |
317 | 317 | $session = new Session(); |
318 | 318 | |
319 | - return $session->has('sort.' . $name) ? $session->get('sort.' . $name) : null; |
|
319 | + return $session->has('sort.'.$name) ? $session->get('sort.'.$name) : null; |
|
320 | 320 | } |
321 | 321 | |
322 | 322 | /** |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | } else { |
341 | 341 | $alias = current($qbd->getDQLPart('from'))->getAlias(); |
342 | 342 | } |
343 | - $qbd->orderBy($alias . '.' . $order['field'], $order['type']); |
|
343 | + $qbd->orderBy($alias.'.'.$order['field'], $order['type']); |
|
344 | 344 | } |
345 | 345 | } |
346 | 346 |
@@ -45,7 +45,7 @@ discard block |
||
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.orderdate < ' . date('Y-m-d')); |
|
48 | + $qbd->where('o.orderdate < '.date('Y-m-d')); |
|
49 | 49 | |
50 | 50 | $createForm = $this->createCreateForm('orders_create'); |
51 | 51 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | $orders = new Orders(); |
115 | 115 | $form = $this->createForm(OrdersType::class, $orders); |
116 | - $return = ['orders' => $orders, 'form' => $form->createView(),]; |
|
116 | + $return = ['orders' => $orders, 'form' => $form->createView(), ]; |
|
117 | 117 | $form->handleRequest($request); |
118 | 118 | $supplier = $orders->getSupplier(); |
119 | 119 | $articles = $etm->getRepository('AppBundle:Article')->getArticleFromSupplier($supplier->getId()); |
@@ -219,8 +219,8 @@ discard block |
||
219 | 219 | if ($date >= date('w')) { |
220 | 220 | $diffOrder = $date - date('w'); |
221 | 221 | $diffDeliv = $diffOrder + $supplier->getDelaydeliv(); |
222 | - $dateOrder = date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date('j')+$diffOrder, date('Y'))); |
|
223 | - $delivDate = date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date('j')+$diffDeliv, date('Y'))); |
|
222 | + $dateOrder = date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date('j') + $diffOrder, date('Y'))); |
|
223 | + $delivDate = date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date('j') + $diffDeliv, date('Y'))); |
|
224 | 224 | $orders->setOrderDate(\DateTime::createFromFormat('Y-m-d H:i:s', $dateOrder)); |
225 | 225 | $orders->setDelivDate(\DateTime::createFromFormat('Y-m-d H:i:s', $delivDate)); |
226 | 226 | break; |
@@ -99,9 +99,9 @@ discard block |
||
99 | 99 | public function createAction(Request $request) |
100 | 100 | { |
101 | 101 | $user = new User(); |
102 | - $form = $this->createForm(UserType::class, $user, ['action' => $this->generateUrl('user_create'),]); |
|
102 | + $form = $this->createForm(UserType::class, $user, ['action' => $this->generateUrl('user_create'), ]); |
|
103 | 103 | $form->handleRequest($request); |
104 | - $return = ['user' => $user, 'form' => $form->createView(),]; |
|
104 | + $return = ['user' => $user, 'form' => $form->createView(), ]; |
|
105 | 105 | |
106 | 106 | if ($form->isValid()) { |
107 | 107 | $user = $this->getRoles($user); |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | $editForm->handleRequest($request); |
168 | 168 | $return = ['user' => $user, |
169 | 169 | 'edit_form' => $editForm->createView(), |
170 | - 'delete_form' => $deleteForm->createView(),]; |
|
170 | + 'delete_form' => $deleteForm->createView(), ]; |
|
171 | 171 | |
172 | 172 | if ($editForm->isValid()) { |
173 | 173 | $user = $this->getRoles($user); |