Input amount in payment

zubroide · Dec 11, 2018 · 9848098 · 9848098
1 parent 2546d76
commit 9848098
Show file tree

Hide file tree

Showing 20 changed files with 153 additions and 26 deletions.
diff --git a/app/Http/Controllers/ContributorController.php b/app/Http/Controllers/ContributorController.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers;
 
+use App\Model\Entity\Contributor;
 use App\Model\Service\Eloquent\EloquentContributorService;
+use App\Providers\AppServiceProvider;
 
 class ContributorController extends CrudController
 {
@@ -11,7 +13,16 @@ class ContributorController extends CrudController
      */
     protected function getService()
     {
-        return app(EloquentContributorService::class);
+        return app(AppServiceProvider::ELOQUENT_CONTRIBUTOR_SERVICE);
+    }
+
+    public function rate(int $id)
+    {
+        /** @var Contributor $contributor */
+        $contributor = $this->getService()->getObjectForEdit($id);
+        return $this->jsonSuccess([
+            'hour_rate' => $contributor->extra ? $contributor->extra->hour_rate : null,
+        ]);
     }
 
 }
diff --git a/app/Http/Controllers/IssueController.php b/app/Http/Controllers/IssueController.php
@@ -16,7 +16,7 @@ class IssueController extends CrudController
      */
     protected function getService()
     {
-        return app(EloquentIssueService::class);
+        return app(AppServiceProvider::ELOQUENT_ISSUE_SERVICE);
     }
 
     protected function prepareDataForIndex(FormRequest $request, array $data)

diff --git a/app/Http/Controllers/MilestoneController.php b/app/Http/Controllers/MilestoneController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Model\Service\Eloquent\EloquentMilestoneService;
+use App\Providers\AppServiceProvider;
 
 class MilestoneController extends CrudController
 {
@@ -11,7 +12,7 @@ class MilestoneController extends CrudController
      */
     protected function getService()
     {
-        return app(EloquentMilestoneService::class);
+        return app(AppServiceProvider::ELOQUENT_GROUP_MILESTONE_SERVICE);
     }
 
 }
diff --git a/app/Http/Controllers/NoteController.php b/app/Http/Controllers/NoteController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Model\Service\Eloquent\EloquentNoteService;
+use App\Providers\AppServiceProvider;
 
 class NoteController extends CrudController
 {
@@ -11,7 +12,7 @@ class NoteController extends CrudController
      */
     protected function getService()
     {
-        return app(EloquentNoteService::class);
+        return app(AppServiceProvider::ELOQUENT_NOTE_SERVICE);
     }
 
 }
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
@@ -22,7 +22,7 @@ class PaymentController extends CrudController
      */
     protected function getService()
     {
-        return app(EloquentPaymentService::class);
+        return app(AppServiceProvider::ELOQUENT_PAYMENT_SERVICE);
     }
 
     protected function prepareDataForCreate(FormRequest $request, array $data)

diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Model\Service\Eloquent\EloquentProjectService;
+use App\Providers\AppServiceProvider;
 
 class ProjectController extends CrudController
 {
@@ -11,7 +12,7 @@ class ProjectController extends CrudController
      */
     protected function getService()
     {
-        return app(EloquentProjectService::class);
+        return app(AppServiceProvider::ELOQUENT_PROJECT_SERVICE);
     }
 
 }
diff --git a/app/Http/Controllers/TimeController.php b/app/Http/Controllers/TimeController.php
@@ -21,7 +21,7 @@ class TimeController extends CrudController
      */
     protected function getService()
     {
-        return app(EloquentSpentService::class);
+        return app(AppServiceProvider::ELOQUENT_SPENT_SERVICE);
     }
 
     protected function prepareDataForIndex(FormRequest $request, array $data)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -15,7 +15,7 @@ class UserController extends CrudController
      */
     protected function getService()
     {
-        return app(EloquentUserService::class);
+        return app(AppServiceProvider::ELOQUENT_USER_SERVICE);
     }
 
     protected function prepareDataForEdit(FormRequest $request, array $data)

diff --git a/app/Model/Entity/Contributor.php b/app/Model/Entity/Contributor.php
@@ -9,6 +9,7 @@
  * @property string state
  * @property string avatar_url
  * @property string web_url
+ * @property ContributorExtra extra
  */
 class Contributor extends EntityAbstract
 {

diff --git a/app/Model/Entity/Payment.php b/app/Model/Entity/Payment.php
@@ -7,9 +7,14 @@
  * @property int id
  * @property string title
  * @property string description
+ * @property float amount
+ * @property float hour_rate
+ * @property float hours
  * @property int status_id
  * @property string payment_date
- * @property int user_id
+ * @property int contributor_id
+ * @property int created_by_id
+ * @property int updated_by_id
  */
 class Payment extends EntityAbstract
 {
@@ -26,6 +31,8 @@ class Payment extends EntityAbstract
         'id',
         'title',
         'description',
+        'amount',
+        'hour_rate',
         'hours',
         'status_id',
         'payment_date',

diff --git a/...ase/migrations/2018_12_11_172003_alter_payment_table_add_amount_and_hour_rate_columns.php b/...ase/migrations/2018_12_11_172003_alter_payment_table_add_amount_and_hour_rate_columns.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AlterPaymentTableAddAmountAndHourRateColumns extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('payment', function (Blueprint $table) {
+            $table->decimal('amount')->nullable();
+            $table->decimal('hour_rate')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('payment', function (Blueprint $table)
+        {
+            $table->dropColumn('amount');
+            $table->dropColumn('hour_rate');
+        });
+    }
+}
diff --git a/database/seeds/RolePermissionSeeder.php b/database/seeds/RolePermissionSeeder.php
@@ -69,6 +69,9 @@ public function run()
                 $defaultPermissions,
             User::ROLE_FINANCE =>
                 $defaultPermissions +
+                [
+                    'contributor.rate' => 'contributor.rate',
+                ] +
                 $this->generatePermissions('contributor', self::TYPE_VIEW) +
                 $this->generatePermissions('contributor', self::TYPE_WRITE) +
                 $this->generatePermissions('payment', self::TYPE_VIEW) +

diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
@@ -16,6 +16,7 @@
     'Add' => 'Add',
     'Added by mistake or occurs problem with payment' => 'Added by mistake or occurs problem with payment',
     'Admin' => 'Admin',
+    'Amount' => 'Amount',
     'Apply' => 'Apply',
     'Assignee' => 'Assignee',
     'Author' => 'Author',

diff --git a/resources/lang/ru/messages.php b/resources/lang/ru/messages.php
@@ -16,6 +16,7 @@
     'Add' => 'Добавить',
     'Added by mistake or occurs problem with payment' => 'Добавлено ошибочно или возникла проблема с платежом',
     'Admin' => 'Администрирование',
+    'Amount' => 'Сумма',
     'Apply' => 'Применить',
     'Assignee' => 'Исполнитель',
     'Author' => 'Автор',

diff --git a/resources/views/gitpab/contributor/index_table.blade.php b/resources/views/gitpab/contributor/index_table.blade.php
@@ -56,10 +56,7 @@
         <tr>
             <td class="col-md-1"><a href="{{ route('contributor.show', $item->id) }}">{{ $item->id }}</a></td>
             <td class="col-md-4">
-                @if ($item->avatar_url)
-                    <img src="{{ $item->avatar_url }}" class="cell-avatar"/>
-                @endif
-                {{ $item->name }}
+                @include('partial.table.td-contributor', ['item' => $item])
             </td>
             <td class="col-md-2">
                 <a href="{{ $item->web_url }}">{{ $item->username }}</a>

diff --git a/resources/views/gitpab/payment/create.blade.php b/resources/views/gitpab/payment/create.blade.php
@@ -6,22 +6,22 @@
 
     <div class="row">
         <div class="col-md-6">
-            @include('partial.form.element.text', [
-                'name' => 'hours',
-                'label' => __('messages.Payed hours'),
+            @include('partial.form.element.select', [
+                'name' => 'contributor_id',
+                'label' => __('messages.Employer'),
+                'list' => $contributorList ?? [],
             ])
         </div>
         <div class="col-md-6">
             @include('partial.form.element.text', [
-                'name' => 'title',
-                'label' => __('messages.Short comment'),
+                'name' => 'hour_rate',
+                'label' => __('messages.Hour rate'),
             ])
         </div>
         <div class="col-md-6">
-            @include('partial.form.element.select', [
-                'name' => 'contributor_id',
-                'label' => __('messages.Employer'),
-                'list' => $contributorList ?? [],
+            @include('partial.form.element.text', [
+                'name' => 'amount',
+                'label' => __('messages.Amount'),
             ])
         </div>
         <div class="col-md-6">
@@ -31,6 +31,20 @@
                 'list' => $statusList ?? [],
             ])
         </div>
+    </div>
+    <div class="row">
+        <div class="col-md-6">
+            @include('partial.form.element.text', [
+                'name' => 'hours',
+                'label' => __('messages.Payed hours'),
+            ])
+        </div>
+        <div class="col-md-6">
+            @include('partial.form.element.text', [
+                'name' => 'title',
+                'label' => __('messages.Short comment'),
+            ])
+        </div>
         <div class="col-md-6">
             @include('partial.form.element.date', [
                 'name' => 'payment_date',
@@ -48,4 +62,36 @@
         </div>
     </div>
 
-@endsection
+@endsection
+
+@push('js')
+    <script>
+        function calculateHours() {
+            console.log('-');
+            var payedHours = null;
+            if ($('[name="hour_rate"]').val()) {
+                payedHours = $('[name="amount"]').val() / $('[name="hour_rate"]').val();
+                payedHours = payedHours.toFixed(2);
+            }
+            $('[name="hours"]').val(payedHours);
+        }
+
+        $('[name="contributor_id"]').on('select2:select', function (e) {
+            $.get('{{ route('contributor.rate', '#contributor_id#') }}'.replace('#contributor_id#', e.params.data.id))
+                .done(function(response) {
+                    if (response.status && response.status.result === 'success') {
+                        $('[name="hour_rate"]').val(response.data.hour_rate);
+                        calculateHours();
+                    }
+                });
+        });
+
+        $('[name="hour_rate"]').on('input', function (e) {
+            calculateHours();
+        });
+
+        $('[name="amount"]').on('input', function (e) {
+            calculateHours();
+        });
+    </script>
+@endpush
diff --git a/resources/views/gitpab/payment/index_table.blade.php b/resources/views/gitpab/payment/index_table.blade.php
@@ -15,6 +15,14 @@
             'orderLinkRoute' => $indexRoute,
         ])
 
+        @include('partial.table.thcell', [
+            'column' => 'amount',
+            'label' => __('messages.Amount'),
+            'order' => $order,
+            'orderDirection' => $orderDirection,
+            'orderLinkRoute' => $indexRoute
+        ])
+
         @include('partial.table.thcell', [
             'column' => 'hours',
             'label' => __('messages.Payed hours'),
@@ -72,9 +80,12 @@
     @forelse ($itemsList->items() as $key => $item)
         <tr>
             <td class="col-md-1"><a href="{{ route('payment.show', $item->id) }}">{{ $item->id }}</a></td>
+            <td class="col-md-1">{{ $item->amount }}</td>
             <td class="col-md-1">{{ $item->hours }}</td>
-            <td class="col-md-2">{{ $item->contributor->name }}</td>
-            <td class="col-md-3">{{ $item->title }}</td>
+            <td class="col-md-2">
+                @include('partial.table.td-contributor', ['item' => $item->contributor])
+            </td>
+            <td class="col-md-2">{{ $item->title }}</td>
             <td class="col-md-1">@lang($item->status->title)</td>
             <td class="col-md-1">{{ $item->payment_date }}</td>
             <td class="col-md-1">

diff --git a/resources/views/gitpab/user/index_table.blade.php b/resources/views/gitpab/user/index_table.blade.php
@@ -54,7 +54,9 @@
         <tr>
             <td class="col-md-1"><a href="{{ route('user.show', $item->id) }}">{{ $item->id }}</a></td>
             <td class="col-md-2">{{ $item->name }}</td>
-            <td class="col-md-2">{{ $item->contributor ? $item->contributor->name : '' }}</td>
+            <td class="col-md-2">
+                @include('partial.table.td-contributor', ['item' => $item->contributor])
+            </td>
             <td class="col-md-2">{{ $item->email }}</td>
             <td class="col-md-2">
                 @foreach ($item->roles as $role)

diff --git a/resources/views/partial/table/td-contributor.blade.php b/resources/views/partial/table/td-contributor.blade.php
@@ -0,0 +1,6 @@
+@if ($item)
+    @if ($item->avatar_url)
+        <img src="{{ $item->avatar_url }}" class="cell-avatar"/>
+    @endif
+    {{ $item->name }}
+@endif
diff --git a/routes/web.php b/routes/web.php
@@ -45,4 +45,7 @@
     Route::resource('payment', '\\' . PaymentController::class);
     Route::resource('user', '\\' . UserController::class);
 
+    Route::get('/contributor/{id}/rate', '\\' . ContributorController::class . '@rate')
+        ->name('contributor.rate');
+
 });