From dfc5337b06b76d8cce651bb087fdc24bcbf139e6 Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Sun, 4 Aug 2019 01:30:03 -0500
Subject: [PATCH] taxes helper

---
 .../Controllers/Dashboard/AdminController.php    |  2 +-
 app/Library/Finances/Helper/FinanceHelper.php    |  3 ++-
 app/Library/Taxes/TaxesHelper.php                | 16 +++++++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/AdminController.php b/app/Http/Controllers/Dashboard/AdminController.php
index 7b79b0bdc..f2808fb99 100644
--- a/app/Http/Controllers/Dashboard/AdminController.php
+++ b/app/Http/Controllers/Dashboard/AdminController.php
@@ -65,7 +65,7 @@ class AdminController extends Controller
             //Get the market taxes for the date range
             $markets[] = [
                 'date' => $date['start']->toFormattedDateString(),
-                'gross' => number_format($tHelper->GetMarketGross($date['start'], $date['end']), 2, ".", ","),
+                'gross' => number_format($tHelper->GetAllianceMarketGross($date['start'], $date['end']), 2, ".", ","),
             ];
             //Get the jump gate taxes for the date range
             $jumpgates[] = [
diff --git a/app/Library/Finances/Helper/FinanceHelper.php b/app/Library/Finances/Helper/FinanceHelper.php
index af255455f..6ab9841e0 100644
--- a/app/Library/Finances/Helper/FinanceHelper.php
+++ b/app/Library/Finances/Helper/FinanceHelper.php
@@ -21,7 +21,8 @@ use App\Models\Mail\EveMail;
 
 //Library
 use App\Library\Esi\Esi;
-use App\Library\Finances\CorpMarketJournal;
+use App\Library\Finances\AllianceMarketTax;
+use App\Library\Finances\CorpMarketTax;
 use App\Library\Finances\MarketTax;
 use App\Library\Finances\PlayerDonation;
 use App\Library\Finances\ReprocessingTax;
diff --git a/app/Library/Taxes/TaxesHelper.php b/app/Library/Taxes/TaxesHelper.php
index f5a3bfd16..1c52c8891 100644
--- a/app/Library/Taxes/TaxesHelper.php
+++ b/app/Library/Taxes/TaxesHelper.php
@@ -16,6 +16,9 @@ use App\Models\Finances\OfficeFeesJournal;
 use App\Models\Finances\CorpMarketJournal;
 use App\Models\Finances\JumpBridgeJournal;
 use App\Models\Finances\PISaleJournal;
+use App\Models\Finances\AllianceMarketJournal;
+use App\Models\Finances\CorpMarketJournal;
+use App\Models\Finances\CorpMarketStructure;
 
 class TaxesHelper {
 
@@ -31,10 +34,21 @@ class TaxesHelper {
         $this->end = $en;
     }
 
+    public function GetAllianceMarketGross($start, $end, $corpId) {
+        $revenue = 0.00;
+
+        $revenue = AllianceMarketJournal::where([
+            'second_party_id' => $corpId,
+        ])->whereBetween('date', [$start, $end])
+          ->sum('amount');
+
+        return $revenue;
+    }
+
     public function GetStructureMarketGross($start, $end, $corpId) {
         $revenue = 0.00;
 
-        $revenu = CorpMarketJournal::where([
+        $revenue = CorpMarketJournal::where([
             'second_party_id' => $corpId,
         ])->whereBetween('date', [$start, $end])
           ->sum('amount');