Added refresh finances button to transactions list #130

app/Http/Controllers/Api/PirepController.php

@@ -13,6 +13,7 @@ use App\Http\Requests\Acars\PrefileRequest;
 use App\Http\Requests\Acars\RouteRequest;
 use App\Http\Requests\Acars\UpdateRequest;
 use App\Http\Resources\AcarsRoute as AcarsRouteResource;
+use App\Http\Resources\JournalTransaction as JournalTransactionResource;
 use App\Http\Resources\Pirep as PirepResource;
 use App\Http\Resources\PirepComment as PirepCommentResource;
 use App\Models\Acars;
@@ -23,7 +24,9 @@ use App\Models\Enums\PirepStatus;
 use App\Models\Pirep;
 use App\Models\PirepComment;
 use App\Repositories\AcarsRepository;
+use App\Repositories\JournalRepository;
 use App\Repositories\PirepRepository;
+use App\Services\FinanceService;
 use App\Services\GeoService;
 use App\Services\PIREPService;
 use App\Services\UserService;
@@ -33,8 +36,10 @@ use Log;
 
 class PirepController extends RestController
 {
-    protected $acarsRepo,
+    private $acarsRepo,
+            $financeSvc,
             $geoSvc,
+            $journalRepo,
             $pirepRepo,
             $pirepSvc,
             $userSvc;
@@ -42,20 +47,26 @@ class PirepController extends RestController
     /**
      * PirepController constructor.
      * @param AcarsRepository $acarsRepo
+     * @param FinanceService $financeSvc
      * @param GeoService $geoSvc
+     * @param JournalRepository $journalRepo
      * @param PirepRepository $pirepRepo
      * @param PIREPService $pirepSvc
      * @param UserService $userSvc
      */
     public function __construct(
         AcarsRepository $acarsRepo,
+        FinanceService $financeSvc,
         GeoService $geoSvc,
+        JournalRepository $journalRepo,
         PirepRepository $pirepRepo,
         PIREPService $pirepSvc,
         UserService $userSvc
     ) {
         $this->acarsRepo = $acarsRepo;
+        $this->financeSvc = $financeSvc;
         $this->geoSvc = $geoSvc;
+        $this->journalRepo = $journalRepo;
         $this->pirepRepo = $pirepRepo;
         $this->pirepSvc = $pirepSvc;
         $this->userSvc = $userSvc;
@@ -436,6 +447,37 @@ class PirepController extends RestController
         return new PirepCommentResource($comment);
     }
 
+    /**
+     * @param $id
+     * @param Request $request
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
+     */
+    public function finances_get($id, Request $request)
+    {
+        $pirep = $this->pirepRepo->find($id);
+        $transactions = $this->journalRepo->getAllForObject($pirep);
+        return JournalTransactionResource::collection($transactions);
+    }
+
+    /**
+     * @param $id
+     * @param Request $request
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
+     * @throws \UnexpectedValueException
+     * @throws \InvalidArgumentException
+     * @throws \Exception
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
+     */
+    public function finances_recalculate($id, Request $request)
+    {
+        $pirep = $this->pirepRepo->find($id);
+        $this->financeSvc->processFinancesForPirep($pirep);
+
+        $pirep->refresh();
+        $transactions = $this->journalRepo->getAllForObject($pirep);
+        return JournalTransactionResource::collection($transactions['transactions']);
+    }
+
     /**
      * @param $id
      * @param Request $request

app/Http/Resources/JournalTransaction.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\Resource;
+
+class JournalTransaction extends Resource
+{
+    public function toArray($request)
+    {
+        $transaction = parent::toArray($request);
+        return $transaction;
+    }
+}

app/Routes/api.php

@@ -45,6 +45,9 @@ Route::group(['middleware' => ['api.auth']], function ()
     Route::post('pireps/{pirep_id}/comments', 'PirepController@comments_post');
     Route::delete('pireps/{pirep_id}/cancel', 'PirepController@cancel');
 
+    Route::get('pireps/{pirep_id}/finances', 'PirepController@finances_get');
+    Route::post('pireps/{pirep_id}/finances/recalculate', 'PirepController@finances_recalculate');
+
     Route::get('pireps/{pirep_id}/route', 'PirepController@route_get');
     Route::post('pireps/{pirep_id}/route', 'PirepController@route_post');
     Route::delete('pireps/{pirep_id}/route', 'PirepController@route_delete');

resources/views/admin/pireps/edit.blade.php

@@ -44,6 +44,11 @@
 
     <div class="card border-blue-bottom">
         <div class="content">
+            <div class="pull-right">
+                <button id="recalculate-finances"
+                        class="btn btn-success"
+                        data-pirep-id="{!! $pirep->id !!}">Recalcuate Finances</button>
+            </div>
             <h4>transactions</h4>
             @include('admin.pireps.transactions')
         </div>

resources/views/admin/pireps/scripts.blade.php

@@ -15,7 +15,7 @@ const changeStatus = (values, fn) => {
     });
 };
 
-$(document).ready(function() {
+$(document).ready(() => {
 
     const select_id = "select#aircraft_select";
     const destContainer = $('#fares_container');
@@ -40,7 +40,7 @@ $(document).ready(function() {
         });
     });
 
-    $(document).on('submit', 'form.pjax_form', function (event) {
+    $(document).on('submit', 'form.pjax_form', (event) => {
         event.preventDefault();
         $.pjax.submit(event, '#pirep_comments_wrapper', {push: false});
     });
@@ -49,7 +49,28 @@ $(document).ready(function() {
         $(".select2").select2();
     });
 
-    $(document).on('submit', 'form.pirep_submit_status', function (event) {
+    /**
+     * Recalculate finances button is clicked
+     */
+    $('button#recalculate-finances').on('click', (event) => {
+        event.preventDefault();
+        console.log('Sending recalculate finances request');
+        const pirep_id = $(event.currentTarget).attr('data-pirep-id');
+
+        $.ajax({
+            url: BASE_URL + '/api/pireps/' + pirep_id + '/finances/recalculate',
+            type: 'POST',
+            headers: {
+                'x-api-key': PHPVMS_USER_API_KEY
+            },
+            success: (data) => {
+                console.log(data);
+                //location.reload();
+            }
+        });
+    });
+
+    $(document).on('submit', 'form.pirep_submit_status', (event) => {
         console.log(event);
 
         event.preventDefault();
@@ -64,7 +85,7 @@ $(document).ready(function() {
         });
     });
 
-    $(document).on('submit', 'form.pirep_change_status', function(event) {
+    $(document).on('submit', 'form.pirep_change_status', (event) => {
         event.preventDefault();
         changeStatus({
             pirep_id: $(this).attr('pirep_id'),

resources/views/admin/pireps/transactions.blade.php

@@ -1,5 +1,5 @@
-@if(count($journal['transactions']) > 0)
 <div class="col-12">
+@if(count($journal['transactions']) > 0)
     <table class="table table-hover" id="users-table">
         <tbody>
         @foreach($journal['transactions'] as $entry)