From a9878f243e1ec4527f99d2c8f72997d2d860c25c Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Fri, 3 May 2019 19:41:10 -0500
Subject: [PATCH] cleanup work

---
 app/Jobs/AwardContract.php                    | 34 -------------------
 app/Jobs/ContractMailer.php                   | 34 -------------------
 app/Library/Finances/Helper/FinanceHelper.php | 22 ++++++------
 3 files changed, 11 insertions(+), 79 deletions(-)
 delete mode 100644 app/Jobs/AwardContract.php
 delete mode 100644 app/Jobs/ContractMailer.php

diff --git a/app/Jobs/AwardContract.php b/app/Jobs/AwardContract.php
deleted file mode 100644
index a18da50d6..000000000
--- a/app/Jobs/AwardContract.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-
-class AwardContract implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        //
-    }
-}
diff --git a/app/Jobs/ContractMailer.php b/app/Jobs/ContractMailer.php
deleted file mode 100644
index 0c3603887..000000000
--- a/app/Jobs/ContractMailer.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-
-class ContractMailer implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        //
-    }
-}
diff --git a/app/Library/Finances/Helper/FinanceHelper.php b/app/Library/Finances/Helper/FinanceHelper.php
index 7a72c37fd..5119e98bd 100644
--- a/app/Library/Finances/Helper/FinanceHelper.php
+++ b/app/Library/Finances/Helper/FinanceHelper.php
@@ -34,17 +34,6 @@ class FinanceHelper {
     public function GetWalletTransaction($division, $charId) {
         //Declare the lookup class helper
         $lookups = new LookupHelper;
-        
-        //Get the ESI refresh token for the corporation to add new wallet journals into the database
-        $tokenData = $this->TokenInfo($charId);
-        $token = $tokenData['token'];
-        $scope = $tokenData['scope'];
-
-        //If the token is not found, send the user an eve mail, and just exit out of the function
-        if($this->TokenNotFound($token, $scope)) {
-            printr("Token not found\n");
-            return null;
-        }
 
         //Setup array for PI items
         $pi_items = [
@@ -138,6 +127,17 @@ class FinanceHelper {
             '2876',
         ];
 
+        //Get the ESI refresh token for the corporation to add new wallet journals into the database
+        $tokenData = $this->TokenInfo($charId);
+        $token = $tokenData['token'];
+        $scope = $tokenData['scope'];
+
+        //If the token is not found, send the user an eve mail, and just exit out of the function
+        if($this->TokenNotFound($token, $scope)) {
+            printr("Token not found\n");
+            return null;
+        }
+
         //Reference to see if the character is in our look up table for corporations and characters
         $corpId = $lookups->LookupCharacter($charId);