added internal rates (#1591)

src/Form/API/ActivityRateApiForm.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\API;
+
+use App\Form\ActivityRateForm;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class ActivityRateApiForm extends ActivityRateForm
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        parent::configureOptions($resolver);
+
+        $resolver->setDefaults([
+            'csrf_protection' => false,
+        ]);
+    }
+}

src/Form/API/CustomerRateApiForm.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\API;
+
+use App\Form\CustomerRateForm;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class CustomerRateApiForm extends CustomerRateForm
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        parent::configureOptions($resolver);
+
+        $resolver->setDefaults([
+            'csrf_protection' => false,
+        ]);
+    }
+}

src/Form/API/ProjectRateApiForm.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form\API;
+
+use App\Form\ProjectRateForm;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class ProjectRateApiForm extends ProjectRateForm
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        parent::configureOptions($resolver);
+
+        $resolver->setDefaults([
+            'csrf_protection' => false,
+        ]);
+    }
+}

src/Form/AbstractRateForm.php

@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Form;
+
+use App\Form\Type\UserType;
+use App\Form\Type\YesNoType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\MoneyType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+abstract class AbstractRateForm extends AbstractType
+{
+    protected function addFields(FormBuilderInterface $builder, ?string $currency)
+    {
+        $builder
+            ->add('user', UserType::class, [
+                'required' => false,
+            ])
+            ->add('rate', MoneyType::class, [
+                // documentation is for NelmioApiDocBundle
+                'documentation' => [
+                    'type' => 'number',
+                    'description' => 'Rate',
+                ],
+                'label' => 'label.rate',
+                'attr' => [
+                    'autofocus' => 'autofocus'
+                ],
+                'currency' => $currency,
+                'help' => 'help.rate',
+            ])
+            ->add('internalRate', MoneyType::class, [
+                // documentation is for NelmioApiDocBundle
+                'documentation' => [
+                    'type' => 'number',
+                    'description' => 'Internal rate',
+                ],
+                'label' => 'label.rate_internal',
+                'currency' => $currency,
+                'required' => false,
+                'help' => 'help.rate_internal',
+            ])
+            ->add('isFixed', YesNoType::class, [
+                'label' => 'label.fixedRate',
+                'help' => 'help.fixedRate',
+            ])
+        ;
+    }
+}

src/Form/ActivityRateForm.php

@@ -11,14 +11,10 @@ namespace App\Form;
 
 use App\Entity\ActivityRate;
 use App\Entity\Rate;
-use App\Form\Type\UserType;
-use App\Form\Type\YesNoType;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\MoneyType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class ActivityRateForm extends AbstractType
+class ActivityRateForm extends AbstractRateForm
 {
     /**
      * {@inheritdoc}
@@ -27,7 +23,7 @@ class ActivityRateForm extends AbstractType
     {
         $currency = null;
 
-        if ($options['data']) {
+        if (!empty($options['data'])) {
             /** @var ActivityRate $rate */
             $rate = $options['data'];
 
@@ -36,21 +32,7 @@ class ActivityRateForm extends AbstractType
             }
         }
 
-        $builder
-            ->add('user', UserType::class, [
-                'required' => false,
-            ])
-            ->add('rate', MoneyType::class, [
-                'label' => 'label.rate',
-                'attr' => [
-                    'autofocus' => 'autofocus'
-                ],
-                'currency' => $currency,
-            ])
-            ->add('isFixed', YesNoType::class, [
-                'label' => 'label.fixedRate'
-            ])
-        ;
+        $this->addFields($builder, $currency);
     }
 
     /**

src/Form/CustomerRateForm.php

@@ -11,14 +11,10 @@ namespace App\Form;
 
 use App\Entity\CustomerRate;
 use App\Entity\Rate;
-use App\Form\Type\UserType;
-use App\Form\Type\YesNoType;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\MoneyType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class CustomerRateForm extends AbstractType
+class CustomerRateForm extends AbstractRateForm
 {
     /**
      * {@inheritdoc}
@@ -26,7 +22,8 @@ class CustomerRateForm extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $currency = null;
-        if ($options['data']) {
+
+        if (!empty($options['data'])) {
             /** @var CustomerRate $rate */
             $rate = $options['data'];
 
@@ -35,21 +32,7 @@ class CustomerRateForm extends AbstractType
             }
         }
 
-        $builder
-            ->add('user', UserType::class, [
-                'required' => false,
-            ])
-            ->add('rate', MoneyType::class, [
-                'label' => 'label.rate',
-                'attr' => [
-                    'autofocus' => 'autofocus'
-                ],
-                'currency' => $currency,
-            ])
-            ->add('isFixed', YesNoType::class, [
-                'label' => 'label.fixedRate'
-            ])
-        ;
+        $this->addFields($builder, $currency);
     }
 
     /**

src/Form/ProjectRateForm.php

@@ -11,14 +11,10 @@ namespace App\Form;
 
 use App\Entity\ProjectRate;
 use App\Entity\Rate;
-use App\Form\Type\UserType;
-use App\Form\Type\YesNoType;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\MoneyType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class ProjectRateForm extends AbstractType
+class ProjectRateForm extends AbstractRateForm
 {
     /**
      * {@inheritdoc}
@@ -26,7 +22,8 @@ class ProjectRateForm extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $currency = null;
-        if ($options['data']) {
+
+        if (!empty($options['data'])) {
             /** @var ProjectRate $rate */
             $rate = $options['data'];
 
@@ -35,21 +32,7 @@ class ProjectRateForm extends AbstractType
             }
         }
 
-        $builder
-            ->add('user', UserType::class, [
-                'required' => false,
-            ])
-            ->add('rate', MoneyType::class, [
-                'label' => 'label.rate',
-                'attr' => [
-                    'autofocus' => 'autofocus'
-                ],
-                'currency' => $currency,
-            ])
-            ->add('isFixed', YesNoType::class, [
-                'label' => 'label.fixedRate'
-            ])
-        ;
+        $this->addFields($builder, $currency);
     }
 
     /**