diff --git a/app/Console/Commands/MiningTaxes/MiningTaxesInvoicesNew.php b/app/Console/Commands/MiningTaxes/MiningTaxesInvoicesNew.php
new file mode 100644
index 000000000..5cfabb68b
--- /dev/null
+++ b/app/Console/Commands/MiningTaxes/MiningTaxesInvoicesNew.php
@@ -0,0 +1,211 @@
+SetStartStatus();
+
+ //Get the characters for each non-invoiced ledger entry
+ $charIds = Ledger::where([
+ 'invoiced' => 'No',
+ ])->distinct('character_id')
+ ->pluck('character_id');
+
+ if($charIds == null) {
+ //Set the task status as done and Log the issue
+ $task->SetStopStatus();
+ Log::warning("No characters found to send invoices to in MiningTaxesInvoices Command.");
+ return 0;
+ }
+
+ //Foreach character tally up the mining ledger.
+ foreach($charIds as $charId) {
+ //Declare some variables we need for each iteration of the loop
+ $invoice = array();
+ $ores = array();
+ $totalPrice = 0.00;
+ $body = null;
+
+ $alts = UserAlts::where([
+ 'main_id' => $charId,
+ ])->get();
+
+ //Get the actual rows
+ $rows = Ledger::where([
+ 'character_id' => $charId,
+ 'invoiced' => 'No',
+ ])->get()->toArray();
+
+ if($alts->count() > 0) {
+ foreach($alts as $alt) {
+ $altRows = Ledger::where([
+ 'character_id' => $alt->character_id,
+ 'invoiced' => 'No',
+ ])->get()->toArray();
+
+ foreach($altRows as $altRow) {
+ array_push($rows, $altRow);
+ }
+ }
+ }
+
+ //Taly up the item composition from each row and multiply by the quantity
+ if(sizeof($rows) > 0) {
+ foreach($rows as $row) {
+ if(!isset($ores[$row['type_id']])) {
+ $ores[$row['type_id']] = 0;
+ }
+ $ores[$row['type_id']] = $ores[$row['type_id']] + $row['quantity'];
+
+ //Add up the total price from the ledger rows for the report later
+ $totalPrice = $totalPrice + $row['amount'];
+ }
+
+ //Reduce the total price by the take percentage
+ $invoiceAmount = $totalPrice * $config['mining_tax'];
+ $invoiceAmount = round($invoiceAmount, 2);
+
+ //Get the character name from the character id
+ $charName = $lookup->CharacterIdToName($charId);
+
+ //Generate a unique invoice id
+ $invoiceId = uniqid();
+ //Set the due date of the invoice
+ $dateDue = Carbon::now()->addDays(7);
+ $invoiceDate = Carbon::now();
+
+ //Format the mining tax into a human readable number
+ $numberMiningTax = number_format(($config['mining_tax'] * 100.00), 2, ".", ",");
+
+ //Create the mail body
+ $body .= "Dear Miner,
";
+ $body .= "Mining Taxes are due for the following ores mined from alliance moons:
";
+ foreach($ores as $ore => $quantity) {
+ $oreName = $lookup->ItemIdToName($ore);
+ $body .= $oreName . ": " . number_format($quantity, 0, ".", ",") . "
";
+ }
+ $body .= "Total Value of Ore Mined: " . number_format($totalPrice, 2, ".", ",") . " ISK.";
+ $body .= "
";
+ $body .= "Please remit " . number_format($invoiceAmount, 2, ".", ",") . " ISK to Spatial Forces by " . $dateDue . "
";
+ $body .= "Set the reason for transfer as MMT: " . $invoiceId . "
";
+ $body .= "The mining taxes are currently set to " . $numberMiningTax . "%.
";
+ $body .= "
";
+ $body .= "You can also send a contract with the following ores in the contract with the reason set as MMT: " . $invoiceId . "
";
+ foreach($ores as $ore => $quantity) {
+ $oreName = $lookup->ItemIdToName($ore);
+ $body .= $oreName . ": " . number_format(round($quantity * $config['mining_tax']), 0, ".", ",") . "
";
+ }
+ $body .= "
";
+ $body .= "
Sincerely,
Warped Intentions Leadership
";
+
+ //Check if the mail body is greater than 2000 characters. If greater than 2,000 characters, then
+ if(sizeof($body) > 2000) {
+ $body = "Dear Miner,
";
+ $body .= "Total Value of Ore Mined: " . number_format($totalPrice, 2, ".", ",") . " ISK.";
+ $body .= "
";
+ $body .= "Please remit " . number_format($invoiceAmount, 2, ".", ",") . " ISK to Spatial Forces by " . $dateDue . "
";
+ $body .= "Set the reason for transfer as MMT: " . $invoiceId . "
";
+ $body .= "The mining taxes are currently set to " . $numberMiningTax . "%.
";
+ $body .= "
";
+ $body .= "
Sincerely,
Warped Intentions Leadership
";
+ }
+
+ //Mail the invoice to the character if the character is in
+ //Warped Intentions or Legacy
+ $subject = 'Warped Intentions Mining Taxes';
+ $sender = $config['primary'];
+ $recipientType = 'character';
+ $recipient = $charId;
+
+ //Send the Eve Mail Job to the queue to be dispatched
+ ProcessSendEveMailJob::dispatch($body, $recipient, $recipientType, $subject, $sender)->onQueue('mail')->delay(Carbon::now()->addSeconds($mailDelay));
+
+ //Save the invoice model
+ $invoice = new Invoice;
+ $invoice->character_id = $charId;
+ $invoice->character_name = $charName;
+ $invoice->invoice_id = $invoiceId;
+ $invoice->invoice_amount = $invoiceAmount;
+ $invoice->date_issued = $invoiceDate;
+ $invoice->date_due = $dateDue;
+ $invoice->status = 'Pending';
+ $invoice->mail_body = $body;
+ $invoice->save();
+
+ //Update the ledger entries
+ Ledger::where([
+ 'character_id' => $charId,
+ 'invoiced' => 'No',
+ ])->update([
+ 'invoiced' => 'Yes',
+ 'invoice_id' => $invoiceId,
+ ]);
+
+ //update the delay
+ $mailDelay = $mailDelay + 20;
+ }
+
+ }
+
+ //Set the task as stopped
+ $task->SetStopStatus();
+
+ return 0;
+ }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index afdd037db..e90fe14f9 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -33,6 +33,7 @@ class Kernel extends ConsoleKernel
* Mining Tax Commands
*/
Commands\MiningTaxes\MiningTaxesInvoices::class,
+ Commands\MiningTaxes\MiningTaxesInvoicesNew::class,
Commands\MiningTaxes\MiningTaxesLedgers::class,
Commands\MiningTaxes\MiningTaxesObservers::class,
Commands\MiningTaxes\MiningTaxesPayments::class,
diff --git a/resources/views/admin/dashboards/userspaged.blade.php b/resources/views/admin/dashboards/userspaged.blade.php
index e66a6a729..3efeab9ab 100644
--- a/resources/views/admin/dashboards/userspaged.blade.php
+++ b/resources/views/admin/dashboards/userspaged.blade.php
@@ -7,7 +7,7 @@