Improve pilot pay import from v5 (#1801)

* Improve pilot pay import from v5 * Apply fixes from StyleCI --------- Co-authored-by: arthurpar06 <arthurpar06@users.noreply.github.com>
nabeelio · May 1, 2024 · 2040c99 · 2040c99
1 parent 8554a3b
commit 2040c99
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 78 deletions.
diff --git a/app/Services/LegacyImporter/LedgerImporter.php b/app/Services/LegacyImporter/LedgerImporter.php
diff --git a/app/Services/LegacyImporter/PirepImporter.php b/app/Services/LegacyImporter/PirepImporter.php
@@ -42,6 +42,7 @@ public function run($start = 0)
             'fuelprice',
             'expenses',
             'gross',
+            'pilotpay',
         ];
 
         // See if there's a flightlevel column, export that if there is
@@ -131,6 +132,14 @@ public function run($start = 0)
             // TODO: Add extra fields in as PIREP fields
             $this->idMapper->addMapping('pireps', $row->pirepid, $pirep->id);
 
+            if ($pirep->wasRecentlyCreated) {
+                $count++;
+            }
+
+            if (!$pirep->airline || !$pirep->airline->journal) {
+                continue;
+            }
+
             // Some financial imports
             if ($row->fuelprice && $row->fuelprice != 0) {
                 $fuel_price = Money::createFromAmount($row->fuelprice);
@@ -168,8 +177,25 @@ public function run($start = 0)
                 );
             }
 
-            if ($pirep->wasRecentlyCreated) {
-                $count++;
+            if ($row->pilotpay && $row->pilotpay != 0) {
+                $pilot_pay = Money::createFromAmount($row->pilotpay * $duration / 60);
+                $financeSvc->debitFromJournal(
+                    $pirep->airline->journal,
+                    $pilot_pay,
+                    $pirep,
+                    'Pilot payment',
+                    'Pilot Pay',
+                    'pilot_pay'
+                );
+
+                $financeSvc->creditToJournal(
+                    $pirep->user->journal,
+                    $pilot_pay,
+                    $pirep,
+                    'Pilot payment',
+                    'Pilot Pay',
+                    'pilot_pay'
+                );
             }
         }
 

diff --git a/app/Services/LegacyImporterService.php b/app/Services/LegacyImporterService.php
@@ -13,7 +13,6 @@
 use App\Services\LegacyImporter\FinalizeImporter;
 use App\Services\LegacyImporter\FlightImporter;
 use App\Services\LegacyImporter\GroupImporter;
-use App\Services\LegacyImporter\LedgerImporter;
 use App\Services\LegacyImporter\PirepImporter;
 use App\Services\LegacyImporter\RankImport;
 use App\Services\LegacyImporter\SettingsImporter;
@@ -45,7 +44,6 @@ class LegacyImporterService extends Service
         UserImport::class,
         PirepImporter::class,
         ExpenseImporter::class,
-        LedgerImporter::class,
         SettingsImporter::class,
         FinalizeImporter::class,
     ];