jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

enhanced plugin support (#634)

Browse Source 
- refactored admin controller and templates
- plugin support for entity actions
- changed column mail to email in customer table
- refactored theme events
This commit is contained in:
Kevin Papst
2019-03-11 14:46:30 +01:00
committed by GitHub
parent 519be2d5a2
commit 3ac72a5c89
104 changed files with 1878 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Form/ActivityEditForm.php
View File

@@ -96,12 +96,12 @@ class ActivityEditForm extends AbstractType
$builder
->add('fixedRate', MoneyType::class, [
'label' => 'label.fixed_rate',
'label' => 'label.fixedRate',
'required' => false,
'currency' => $currency,
])
->add('hourlyRate', MoneyType::class, [
'label' => 'label.hourly_rate',
'label' => 'label.hourlyRate',
'required' => false,
'currency' => $currency,
])

8
src/Form/CustomerEditForm.php
View File

@@ -42,7 +42,7 @@ class CustomerEditForm extends AbstractType
'label' => 'label.name',
])
->add('number', TextType::class, [
'label' => 'label.customer_number',
'label' => 'label.number',
'required' => false,
])
->add('comment', TextareaType::class, [
@@ -81,7 +81,7 @@ class CustomerEditForm extends AbstractType
'required' => false,
'attr' => ['icon' => 'mobile'],
])
->add('mail', EmailType::class, [
->add('email', EmailType::class, [
'label' => 'label.email',
'required' => false,
])
@@ -93,12 +93,12 @@ class CustomerEditForm extends AbstractType
'label' => 'label.timezone',
])
->add('fixedRate', MoneyType::class, [
'label' => 'label.fixed_rate',
'label' => 'label.fixedRate',
'required' => false,
'currency' => $customer->getCurrency() ?? false,
])
->add('hourlyRate', MoneyType::class, [
'label' => 'label.hourly_rate',
'label' => 'label.hourlyRate',
'required' => false,
'currency' => $customer->getCurrency() ?? false,
])

6
src/Form/ProjectEditForm.php
View File

@@ -52,7 +52,7 @@ class ProjectEditForm extends AbstractType
'required' => false,
])
->add('orderNumber', TextType::class, [
'label' => 'label.order_number',
'label' => 'label.orderNumber',
'required' => false,
])
->add('customer', CustomerType::class, [
@@ -62,12 +62,12 @@ class ProjectEditForm extends AbstractType
},
])
->add('fixedRate', MoneyType::class, [
'label' => 'label.fixed_rate',
'label' => 'label.fixedRate',
'required' => false,
'currency' => $currency,
])
->add('hourlyRate', MoneyType::class, [
'label' => 'label.hourly_rate',
'label' => 'label.hourlyRate',
'required' => false,
'currency' => $currency,
])

4
src/Form/TimesheetEditForm.php
View File

@@ -265,12 +265,12 @@ class TimesheetEditForm extends AbstractType
if ($options['include_rate']) {
$builder
->add('fixedRate', MoneyType::class, [
'label' => 'label.fixed_rate',
'label' => 'label.fixedRate',
'required' => false,
'currency' => $currency,
])
->add('hourlyRate', MoneyType::class, [
'label' => 'label.hourly_rate',
'label' => 'label.hourlyRate',
'required' => false,
'currency' => $currency,
]);