Completed
Push — develop ( fffb13 )
by Laurent
17:36
created
src/AppBundle/Controller/Orders/DeliveriesController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
         $etm = $this->getDoctrine()->getManager();
43 43
         $item = $this->container->getParameter('knp_paginator.page_range');
44 44
         $qbd = $etm->getRepository('AppBundle:Orders\Orders')->createQueryBuilder('o');
45
-        $qbd->where('o.delivdate <= ' . date('Y-m-d'));
45
+        $qbd->where('o.delivdate <= '.date('Y-m-d'));
46 46
         $qbd->andWhere('o.status = 1');
47 47
         
48 48
         $paginator = $this->get('knp_paginator')->paginate($qbd, $request->query->get('page', 1), $item);
Please login to merge, or discard this patch.
src/AppBundle/Form/Type/Staff/GroupType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
     public function buildForm(FormBuilderInterface $builder, array $options)
32 32
     {
33 33
         $builder
34
-            ->add('name', null, ['label' => 'form.group_name', 'translation_domain' => 'FOSUserBundle',]);
34
+            ->add('name', null, ['label' => 'form.group_name', 'translation_domain' => 'FOSUserBundle', ]);
35 35
     }
36 36
 
37 37
     /**
Please login to merge, or discard this patch.
src/AppBundle/Form/Type/Staff/UserFilterType.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -33,15 +33,15 @@  discard block
 block discarded – undo
33 33
     {
34 34
         $builder
35 35
             ->add('username', 'filter_text', ['label' => 'form.username', 'translation_domain' => 'FOSUserBundle',
36
-                'attr' => ['class' => 'pull-right',],])
36
+                'attr' => ['class' => 'pull-right', ], ])
37 37
             ->add('email', 'filter_text', ['label' => 'form.email', 'translation_domain' => 'FOSUserBundle',
38
-                'attr' => ['class' => 'pull-right',],])
39
-            ->add('enabled', 'filter_boolean', ['label' => 'Autorisé',])
38
+                'attr' => ['class' => 'pull-right', ], ])
39
+            ->add('enabled', 'filter_boolean', ['label' => 'Autorisé', ])
40 40
             ->add(
41 41
                 'groups',
42 42
                 'filter_entity',
43 43
                 ['label' => 'Groupes', 'class' => 'AppBundle\Entity\Staff\Group', 'expanded' => true,
44
-                    'multiple' => true, 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
44
+                    'multiple' => true, 'apply_filter' => function(QueryInterface $filterQuery, $field, $values) {
45 45
                         $query = $filterQuery->getQueryBuilder();
46 46
                         $query->leftJoin($field, 'm');
47 47
                         // Filter results using orWhere matching ID
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     public function configureOptions(OptionsResolver $resolver)
60 60
     {
61 61
         $resolver->setDefaults(['data_class' => 'AppBundle\Entity\Staff\User', 'csrf_protection' => false,
62
-            'validation_groups' => ['filter'], 'method' => 'GET',]);
62
+            'validation_groups' => ['filter'], 'method' => 'GET', ]);
63 63
     }
64 64
 
65 65
     /**
Please login to merge, or discard this patch.
src/AppBundle/Form/Type/Staff/UserType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
      */
36 36
     public function buildForm(FormBuilderInterface $builder, array $options)
37 37
     {
38
-        $builder ->add('username', null, ['label' => "Nom d'utilisateur", 'attr'  => ['class' => 'form-control'],])
38
+        $builder ->add('username', null, ['label' => "Nom d'utilisateur", 'attr'  => ['class' => 'form-control'], ])
39 39
             ->add('email', EmailType::class, array(
40 40
                 'required' => false,
41 41
                 'label' => 'E-mail',
Please login to merge, or discard this patch.
src/AppBundle/Form/Type/Stocks/InventoryArticlesZonesType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
      */
42 42
     public function configureOptions(OptionsResolver $resolver)
43 43
     {
44
-        $resolver->setDefaults(['data_class' => 'AppBundle\Entity\Stocks\InventoryArticles',]);
44
+        $resolver->setDefaults(['data_class' => 'AppBundle\Entity\Stocks\InventoryArticles', ]);
45 45
     }
46 46
 
47 47
     /**
Please login to merge, or discard this patch.
src/AppBundle/Form/Type/Stocks/InventoryType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
         $builder
37 37
             ->add('date', DateType::class, ['label' => 'gestock.date', 'widget' => 'single_text',
38 38
                 'format' => 'dd MMM yyyy', 'html5' => false, 'input' => 'datetime',
39
-                'attr'  => ['class' => 'form-control',],])
39
+                'attr'  => ['class' => 'form-control', ], ])
40 40
             ->add('status', HiddenType::class)
41 41
             ->add('amount', HiddenType::class)
42 42
         ;
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
      */
48 48
     public function configureOptions(OptionsResolver $resolver)
49 49
     {
50
-        $resolver->setDefaults(['data_class' => 'AppBundle\Entity\Stocks\Inventory',]);
50
+        $resolver->setDefaults(['data_class' => 'AppBundle\Entity\Stocks\Inventory', ]);
51 51
     }
52 52
 
53 53
     /**
Please login to merge, or discard this patch.
src/AppBundle/Form/Type/Stocks/InventoryEditZonesType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
         parent::buildForm($builder, $options);
38 38
         $builder
39 39
             ->remove('articles')
40
-            ->add('articles', CollectionType::class, ['entry_type' => InventoryArticlesZonesType::class,]);
40
+            ->add('articles', CollectionType::class, ['entry_type' => InventoryArticlesZonesType::class, ]);
41 41
     }
42 42
 
43 43
     /**
Please login to merge, or discard this patch.
src/AppBundle/Form/Type/Stocks/InventoryArticlesType.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -37,28 +37,28 @@
 block discarded – undo
37 37
         $builder
38 38
             ->add('inventory', EntityType::class, ['class' => 'AppBundle:Stocks\Inventory', 'choice_label' => 'id',
39 39
                 'label' => 'gestock.id', 'translation_domain' => 'messages', 'empty_data' => null,
40
-                'attr'=> ['class' => 'form-control', 'readonly' => true,],])
40
+                'attr'=> ['class' => 'form-control', 'readonly' => true, ], ])
41 41
             ->add('article', EntityType::class, ['class' => 'AppBundle:Settings\Article', 'choice_label' => 'name',
42 42
                 'label' => 'title', 'translation_domain' => 'gs_articles', 'empty_data' => null,
43
-                'attr'=> ['class' => 'form-control', 'readonly' => true,],])
43
+                'attr'=> ['class' => 'form-control', 'readonly' => true, ], ])
44 44
             ->add('quantity', NumberType::class, ['scale' => 3, 'grouping' => true, 'empty_data' => '0,000',
45 45
                     'label' => 'settings.quantity', 'translation_domain' => 'gs_articles',
46
-                    'attr'=> ['class' => 'inventory form-control', 'readonly' => true,],])
46
+                    'attr'=> ['class' => 'inventory form-control', 'readonly' => true, ], ])
47 47
             ->add('realstock', NumberType::class, ['scale' => 3, 'grouping' => true, 'empty_data' => '0,000',
48 48
                     'label' => 'seizure.realstock', 'translation_domain' => 'gs_inventories',
49
-                    'attr'=> ['class' => 'inventory form-control',],])
49
+                    'attr'=> ['class' => 'inventory form-control', ], ])
50 50
             ->add('unitStorage', EntityType::class, ['class' => 'AppBundle:Settings\Diverse\UnitStorage',
51 51
                     'choice_label' => 'abbr', 'label' => 'gestock.settings.diverse.unitstorage', 'empty_data' => null,
52
-                    'attr'=> ['class' => 'form-control', 'readonly' => true,],])
52
+                    'attr'=> ['class' => 'form-control', 'readonly' => true, ], ])
53 53
             ->add('price', MoneyType::class, ['scale' => 3, 'grouping' => true, 'currency' => 'EUR',
54 54
                     'label' => 'settings.price', 'translation_domain' => 'gs_articles',
55
-                    'attr'=> ['class' => 'inventory form-control', 'readonly' => true,],])
55
+                    'attr'=> ['class' => 'inventory form-control', 'readonly' => true, ], ])
56 56
             ->add('total', MoneyType::class, ['scale' => 3, 'grouping' => true, 'currency' => 'EUR',
57 57
                     'label' => 'seizure.total', 'translation_domain' => 'gs_inventories', 'mapped' => false,
58
-                    'attr'=> ['class' => 'inventory form-control', 'readonly' => true,],])
58
+                    'attr'=> ['class' => 'inventory form-control', 'readonly' => true, ], ])
59 59
             ->add('gap', NumberType::class, ['scale' => 3, 'grouping' => true, 'label' => 'seizure.gap',
60 60
                     'translation_domain' => 'gs_inventories', 'mapped' => false,
61
-                    'attr'=> ['class' => 'inventory form-control', 'readonly' =>true,],]);
61
+                    'attr'=> ['class' => 'inventory form-control', 'readonly' =>true, ], ]);
62 62
     }
63 63
 
64 64
     /**
Please login to merge, or discard this patch.
src/AppBundle/Form/Type/Settings/SupplierType.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -40,49 +40,49 @@  discard block
 block discarded – undo
40 40
     public function buildForm(FormBuilderInterface $builder, array $options)
41 41
     {
42 42
         $builder
43
-            ->add('name', TextType::class, ['label' => 'gestock.name', 'attr'  => ['class' => 'form-control',],])
43
+            ->add('name', TextType::class, ['label' => 'gestock.name', 'attr'  => ['class' => 'form-control', ], ])
44 44
             ->add('address', TextType::class, ['label' => 'gestock.address',
45
-                'attr'  => ['placeholder' => 'gestock.address', 'class' => 'form-control',],])
45
+                'attr'  => ['placeholder' => 'gestock.address', 'class' => 'form-control', ], ])
46 46
             ->add('zipcode', TextType::class, ['attr' => ['placeholder' => 'gestock.zipcode',
47
-                'class' => 'form-control half',],])
47
+                'class' => 'form-control half', ], ])
48 48
             ->add('town', TextType::class, ['attr'  => ['placeholder' => 'gestock.town',
49
-                'class' => 'form-control half',],])
49
+                'class' => 'form-control half', ], ])
50 50
             ->add('phone', PhoneNumberType::class, ['default_region' => 'FR', 'format' => PhoneNumberFormat::NATIONAL,
51
-                    'widget' => PhoneNumberType::WIDGET_COUNTRY_CHOICE, 'country_choices' => ['FR', 'GB', 'DE', 'IT',],
52
-                    'preferred_country_choices' => ['FR',], 'label' => 'gestock.phone',])
51
+                    'widget' => PhoneNumberType::WIDGET_COUNTRY_CHOICE, 'country_choices' => ['FR', 'GB', 'DE', 'IT', ],
52
+                    'preferred_country_choices' => ['FR', ], 'label' => 'gestock.phone', ])
53 53
             ->add('fax', PhoneNumberType::class, ['default_region' => 'FR', 'format' => PhoneNumberFormat::NATIONAL,
54
-                    'widget' => PhoneNumberType::WIDGET_COUNTRY_CHOICE, 'country_choices' => ['FR', 'GB', 'DE', 'IT',],
55
-                    'preferred_country_choices' => ['FR',], 'label' => 'gestock.fax',
56
-                    'attr'  => ['class' => 'form-control',]])
57
-            ->add('mail', EmailType::class, ['label' => 'gestock.mail', 'attr'  => ['class' => 'form-control',]])
58
-            ->add('contact', TextType::class, ['label' => 'gestock.contact', 'attr'  => ['class' => 'form-control',],])
54
+                    'widget' => PhoneNumberType::WIDGET_COUNTRY_CHOICE, 'country_choices' => ['FR', 'GB', 'DE', 'IT', ],
55
+                    'preferred_country_choices' => ['FR', ], 'label' => 'gestock.fax',
56
+                    'attr'  => ['class' => 'form-control', ]])
57
+            ->add('mail', EmailType::class, ['label' => 'gestock.mail', 'attr'  => ['class' => 'form-control', ]])
58
+            ->add('contact', TextType::class, ['label' => 'gestock.contact', 'attr'  => ['class' => 'form-control', ], ])
59 59
             ->add('gsm', PhoneNumberType::class, ['default_region' => 'FR', 'format' => PhoneNumberFormat::NATIONAL,
60
-                    'widget' => PhoneNumberType::WIDGET_COUNTRY_CHOICE, 'country_choices' => ['FR', 'GB', 'DE', 'IT',],
61
-                    'preferred_country_choices' => ['FR',], 'label' => 'gestock.gsm',
62
-                'attr'  => ['class' => 'form-control',]])
60
+                    'widget' => PhoneNumberType::WIDGET_COUNTRY_CHOICE, 'country_choices' => ['FR', 'GB', 'DE', 'IT', ],
61
+                    'preferred_country_choices' => ['FR', ], 'label' => 'gestock.gsm',
62
+                'attr'  => ['class' => 'form-control', ]])
63 63
             /**
64 64
              * Délai de livraison A = jour de Cmde,
65 65
              * (B, C, D, E) = jour de livraison
66 66
              */
67 67
             ->add('delaydeliv', ChoiceType::class, ['choices' => ['form.atob' => 1, 'form.atoc' => 2,
68
-                'form.atod' => 3, 'form.atoe' => 4,], 'choices_as_values' => true, 'label' => 'settings.delay',
69
-                    'translation_domain' => 'gs_suppliers', 'attr'  => ['class' => 'form-control half',]])
68
+                'form.atod' => 3, 'form.atoe' => 4, ], 'choices_as_values' => true, 'label' => 'settings.delay',
69
+                    'translation_domain' => 'gs_suppliers', 'attr'  => ['class' => 'form-control half', ]])
70 70
             /**
71 71
              * Choix du jour de la semaine pour les Cmdes
72 72
              * Numérotation voir http://php.net/manual/fr/function.date.php format 'N'
73 73
              */
74 74
             ->add('orderdate', ChoiceType::class, ['choices' => ['Monday' => 1, 'Tuesday' => 2, 'Wednesday' => 3,
75
-                'Thursday' => 4, 'Friday' => 5, 'Saturday' => 6, 'Sunday' => 7,], 'choices_as_values' => true,
75
+                'Thursday' => 4, 'Friday' => 5, 'Saturday' => 6, 'Sunday' => 7, ], 'choices_as_values' => true,
76 76
                 'choice_translation_domain' => true, 'translation_domain' => 'messages', 'label' => 'day_order',
77
-                'attr'  => ['class' => 'form-control',], 'expanded' => true, 'multiple' => true,])
77
+                'attr'  => ['class' => 'form-control', ], 'expanded' => true, 'multiple' => true, ])
78 78
             ->add('familyLog', EntityType::class, ['class' => 'AppBundle:Settings/Diverse/FamilyLog',
79
-                    'query_builder' => function (EntityRepository $er) {
79
+                    'query_builder' => function(EntityRepository $er) {
80 80
                         return $er->createQueryBuilder('f')
81 81
                             ->orderBy('f.path', 'ASC');
82 82
                     }, 'choice_label' => 'indentedName', 'multiple' => false,
83 83
                     'placeholder' => 'gestock.settings.diverse.choice_family', 'empty_data' => null,
84
-                    'label' => 'gestock.settings.diverse.familylog', 'attr'  => ['class' => 'form-control half',]])
85
-            ->add('active', HiddenType::class, ['data' => true,]);
84
+                    'label' => 'gestock.settings.diverse.familylog', 'attr'  => ['class' => 'form-control half', ]])
85
+            ->add('active', HiddenType::class, ['data' => true, ]);
86 86
     }
87 87
 
88 88
     /**
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
      */
91 91
     public function configureOptions(OptionsResolver $resolver)
92 92
     {
93
-        $resolver->setDefaults(['data_class' => 'AppBundle\Entity\Settings\Supplier',]);
93
+        $resolver->setDefaults(['data_class' => 'AppBundle\Entity\Settings\Supplier', ]);
94 94
     }
95 95
 
96 96
     /**
Please login to merge, or discard this patch.