Completed
Pull Request — master (#69)
by Laurent
15:31
created
src/AppBundle/Form/Type/InventoryType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
                     'format' => 'dd MMM yyyy',
44 44
                     'html5' => false,
45 45
                     'input' => 'datetime',
46
-                    'attr'  => ['class' => 'form-control',],
46
+                    'attr'  => ['class' => 'form-control', ],
47 47
                 )
48 48
             )
49 49
             ->add('status', HiddenType::class)
Please login to merge, or discard this patch.
src/AppBundle/Form/Type/OrdersArticlesType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
                     'empty_data' => '0,000',
69 69
                     'label' => 'settings.quantity',
70 70
                     'translation_domain' => 'gs_articles',
71
-                    'attr'=> ['class' => 'form-control text-right',],
71
+                    'attr'=> ['class' => 'form-control text-right', ],
72 72
                 )
73 73
             )
74 74
             ->add(
Please login to merge, or discard this patch.
src/AppBundle/Entity/OrdersRepository.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
     {
23 23
         $query = $this->createQueryBuilder('o')
24 24
             ->where('o.status = 1')
25
-            ->andWhere('o.delivdate < ' . date('d-m-Y'))
25
+            ->andWhere('o.delivdate < '.date('d-m-Y'))
26 26
             ->orderBy('o.id', 'DESC')
27 27
             ->setMaxResults($count)
28 28
             ->getQuery();
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     {
41 41
         $query = $this->createQueryBuilder('o')
42 42
             ->where('o.status = 1')
43
-            ->andWhere('o.delivdate >= ' . date('d-m-Y'))
43
+            ->andWhere('o.delivdate >= '.date('d-m-Y'))
44 44
             ->orderBy('o.id', 'DESC')
45 45
             ->setMaxResults($count)
46 46
             ->getQuery();
Please login to merge, or discard this patch.
src/AppBundle/Controller/OrdersController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
         $em = $this->getDoctrine()->getManager();
47 47
         $item = $this->container->getParameter('knp_paginator.page_range');
48 48
         $qb = $em->getRepository('AppBundle:Orders')->createQueryBuilder('o');
49
-        $qb->where('o.orderdate < ' . date('Y-m-d'));
49
+        $qb->where('o.orderdate < '.date('Y-m-d'));
50 50
         
51 51
         $createForm = $this->createCreateForm('orders_create');
52 52
 
@@ -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());
@@ -230,8 +230,8 @@  discard block
 block discarded – undo
230 230
             if ($date >= date('w')) {
231 231
                 $diffOrder = $date - date('w');
232 232
                 $diffDeliv = $diffOrder + $supplier->getDelaydeliv();
233
-                $dateOrder = date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date('j')+$diffOrder, date('Y')));
234
-                $delivDate = date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date('j')+$diffDeliv, date('Y')));
233
+                $dateOrder = date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date('j') + $diffOrder, date('Y')));
234
+                $delivDate = date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date('j') + $diffDeliv, date('Y')));
235 235
                 $orders->setOrderDate(\DateTime::createFromFormat('Y-m-d H:i:s', $dateOrder));
236 236
                 $orders->setDelivDate(\DateTime::createFromFormat('Y-m-d H:i:s', $delivDate));
237 237
                 break;
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
      */
276 276
     public function printAction(Orders $orders)
277 277
     {
278
-        $file = 'order-' . $orders->getId() . '.pdf';
278
+        $file = 'order-'.$orders->getId().'.pdf';
279 279
         $company = $this->getDoctrine()->getManager()->getRepository('AppBundle:Company')->find(1);
280 280
         // Create and save the PDF file to print
281 281
         $html = $this->renderView(
@@ -285,12 +285,12 @@  discard block
 block discarded – undo
285 285
         return new Response(
286 286
             $this->get('knp_snappy.pdf')->getOutputFromHtml(
287 287
                 $html,
288
-                $this->getArray((string)date('d/m/y - H:i:s'), '')
288
+                $this->getArray((string) date('d/m/y - H:i:s'), '')
289 289
             ),
290 290
             200,
291 291
             array(
292 292
                 'Content-Type' => 'application/pdf',
293
-                'Content-Disposition' => 'attachment; filename="' . $file . '"'
293
+                'Content-Disposition' => 'attachment; filename="'.$file.'"'
294 294
             )
295 295
         );
296 296
     }
Please login to merge, or discard this patch.
src/AppBundle/Controller/DeliveriesController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         $em = $this->getDoctrine()->getManager();
44 44
         $item = $this->container->getParameter('knp_paginator.page_range');
45 45
         $qb = $em->getRepository('AppBundle:Orders')->createQueryBuilder('o');
46
-        $qb->where('o.delivdate >= ' . date('Y-m-d'));
46
+        $qb->where('o.delivdate >= '.date('Y-m-d'));
47 47
         $qb->andWhere('o.status = 1');
48 48
         
49 49
         $paginator = $this->get('knp_paginator')->paginate($qb, $request->query->get('page', 1), $item);
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
      */
134 134
     public function printAction(Orders $orders)
135 135
     {
136
-        $file = 'delivery-' . $orders->getId() . '.pdf';
136
+        $file = 'delivery-'.$orders->getId().'.pdf';
137 137
         $company = $this->getDoctrine()->getManager()->getRepository('AppBundle:Company')->find(1);
138 138
         // Create and save the PDF file to print
139 139
         $html = $this->renderView(
@@ -143,12 +143,12 @@  discard block
 block discarded – undo
143 143
         return new Response(
144 144
             $this->get('knp_snappy.pdf')->getOutputFromHtml(
145 145
                 $html,
146
-                $this->getArray((string)date('d/m/y - H:i:s'), '')
146
+                $this->getArray((string) date('d/m/y - H:i:s'), '')
147 147
             ),
148 148
             200,
149 149
             array(
150 150
                 'Content-Type' => 'application/pdf',
151
-                'Content-Disposition' => 'attachment; filename="' . $file . '"'
151
+                'Content-Disposition' => 'attachment; filename="'.$file.'"'
152 152
             )
153 153
         );
154 154
     }
Please login to merge, or discard this patch.