mining taxes stuff
This commit is contained in:
@@ -2,9 +2,18 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers\MiningTaxes;
|
namespace App\Http\Controllers\MiningTaxes;
|
||||||
|
|
||||||
|
//Internal Library
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
//Application Library
|
||||||
|
|
||||||
|
//Models
|
||||||
|
use App\Models\MiningTax\Invoice;
|
||||||
|
use App\Models\MiningTax\Observer;
|
||||||
|
use App\Models\MiningTax\Ledger;
|
||||||
|
|
||||||
|
|
||||||
class MiningTaxesAdminController extends Controller
|
class MiningTaxesAdminController extends Controller
|
||||||
{
|
{
|
||||||
public function __construct() {
|
public function __construct() {
|
||||||
@@ -16,35 +25,70 @@ class MiningTaxesAdminController extends Controller
|
|||||||
* Display current unpaid invoices
|
* Display current unpaid invoices
|
||||||
*/
|
*/
|
||||||
public function DisplayUnpaidInvoice() {
|
public function DisplayUnpaidInvoice() {
|
||||||
|
$invoices = Invoice::where([
|
||||||
|
'status' => 'Pending',
|
||||||
|
])->orWhere([
|
||||||
|
'status' => 'Late',
|
||||||
|
])->orWhere([
|
||||||
|
'status' => 'Deferred',
|
||||||
|
])->get();
|
||||||
|
|
||||||
|
return view('miningtax.admin.display.unpaid')->with('invoices', $invoices);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mark an invoice paid
|
* Mark an invoice paid
|
||||||
*/
|
*/
|
||||||
public function UpdateInvoice() {
|
public function UpdateInvoice() {
|
||||||
|
$this->validate($request, [
|
||||||
|
'invoice_id' => 'required',
|
||||||
|
'status' => 'required',
|
||||||
|
]);
|
||||||
|
|
||||||
|
Invoice::where([
|
||||||
|
'invoice_id' => $request->invoice_id,
|
||||||
|
])->update([
|
||||||
|
'status' => $request->status,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return redirect('/admin/dashboard/miningtaxes')->with('success', 'Invoice successfully updated.');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete an invoice and mark items paid
|
* Delete an invoice and mark items paid
|
||||||
*/
|
*/
|
||||||
public function DeleteInvoice() {
|
public function DeleteInvoice() {
|
||||||
|
$this->validate($request, [
|
||||||
|
'invoice_id' => 'required',
|
||||||
|
]);
|
||||||
|
|
||||||
|
Invoice::where([
|
||||||
|
'invoice_id' => $request->invoice_id,
|
||||||
|
])->update([
|
||||||
|
'status' => 'Deleted',
|
||||||
|
]);
|
||||||
|
|
||||||
|
return redirect('/admin/dashboard/miningtaxes')->with('error', 'Invoice successfully deleted.');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display past paid invoices
|
* Display past paid invoices
|
||||||
*/
|
*/
|
||||||
public function DisplayPaidInvoices() {
|
public function DisplayPaidInvoices() {
|
||||||
|
$invoices = Invoice::where([
|
||||||
|
'status' => 'Paid',
|
||||||
|
])->orWhere([
|
||||||
|
'status' => 'Paid Late',
|
||||||
|
])->get();
|
||||||
|
|
||||||
|
return view('miningtax.admin.display.paidinvoices')->with('invoices', $invoices);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display admin mining ledgers by month
|
* Display admin mining ledgers by month
|
||||||
*/
|
*/
|
||||||
public function DisplayMonthlyMiningLedgers() {
|
public function DisplayMonthlyMiningLedgers() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,6 +59,8 @@ class CreateMiningTaxesInvoiceJob implements ShouldQueue
|
|||||||
//Generate an invoice id
|
//Generate an invoice id
|
||||||
$invoiceId = uniqid();
|
$invoiceId = uniqid();
|
||||||
|
|
||||||
|
//Get the mining ledgers, and totalize the price
|
||||||
|
|
||||||
$invoice = new Invoice;
|
$invoice = new Invoice;
|
||||||
$invoice->character_id = $this->charId;
|
$invoice->character_id = $this->charId;
|
||||||
$invoice->character_name = $charName;
|
$invoice->character_name = $charName;
|
||||||
@@ -75,6 +77,7 @@ class CreateMiningTaxesInvoiceJob implements ShouldQueue
|
|||||||
'invoiced' => 'No',
|
'invoiced' => 'No',
|
||||||
])->update([
|
])->update([
|
||||||
'invoiced' => 'Yes',
|
'invoiced' => 'Yes',
|
||||||
|
'invoice_id' => $invoiceId,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$body .= "Dear Miner,<br><br>";
|
$body .= "Dear Miner,<br><br>";
|
||||||
|
|||||||
@@ -25,5 +25,6 @@ class Ledger extends Model
|
|||||||
'quantity',
|
'quantity',
|
||||||
'amount',
|
'amount',
|
||||||
'invoiced',
|
'invoiced',
|
||||||
|
'invoice_id',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ class CreateMiningTaxTables extends Migration
|
|||||||
'Late',
|
'Late',
|
||||||
'Paid Late',
|
'Paid Late',
|
||||||
'Deferred',
|
'Deferred',
|
||||||
|
'Deleted',
|
||||||
])->default('Pending');
|
])->default('Pending');
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -20,15 +20,9 @@
|
|||||||
<!-- General Administrative Stuff -->
|
<!-- General Administrative Stuff -->
|
||||||
@include('layouts.admin.sidebarmenu.general')
|
@include('layouts.admin.sidebarmenu.general')
|
||||||
<!-- End General Administrative Stuff -->
|
<!-- End General Administrative Stuff -->
|
||||||
<!-- Moon Admin -->
|
|
||||||
@include('layouts.admin.sidebarmenu.moon')
|
|
||||||
<!-- End Moon Admin -->
|
|
||||||
<!-- SRP Admin -->
|
<!-- SRP Admin -->
|
||||||
@include('layouts.admin.sidebarmenu.srp')
|
@include('layouts.admin.sidebarmenu.srp')
|
||||||
<!-- End SRP Admin -->
|
<!-- End SRP Admin -->
|
||||||
<!-- System Rental Admin -->
|
|
||||||
@include('layouts.admin.sidebarmenu.rentalsystem')
|
|
||||||
<!-- End System Rental Admin -->
|
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
<!-- /.sidebar-menu -->
|
<!-- /.sidebar-menu -->
|
||||||
|
|||||||
@@ -22,18 +22,12 @@
|
|||||||
@include('layouts.user.sidebarmenu.general')
|
@include('layouts.user.sidebarmenu.general')
|
||||||
@endif
|
@endif
|
||||||
<!-- End General Items -->
|
<!-- End General Items -->
|
||||||
<!-- Moon Items -->
|
|
||||||
@include('layouts.user.sidebarmenu.moon')
|
|
||||||
<!-- End Moon Items -->
|
|
||||||
<!-- SRP Items -->
|
<!-- SRP Items -->
|
||||||
@include('layouts.user.sidebarmenu.srp')
|
@include('layouts.user.sidebarmenu.srp')
|
||||||
<!-- SRP Items -->
|
<!-- SRP Items -->
|
||||||
<!-- Contracts -->
|
<!-- Contracts -->
|
||||||
@include('layouts.user.sidebarmenu.contracts')
|
@include('layouts.user.sidebarmenu.contracts')
|
||||||
<!-- End Contracts -->
|
<!-- End Contracts -->
|
||||||
<!-- Structures -->
|
|
||||||
@include('layouts.user.sidebarmenu.structures')
|
|
||||||
<!-- End SRP Admin -->
|
|
||||||
<!-- Blacklist -->
|
<!-- Blacklist -->
|
||||||
@include('layouts.user.sidebarmenu.blacklist')
|
@include('layouts.user.sidebarmenu.blacklist')
|
||||||
<!-- End Blacklist -->
|
<!-- End Blacklist -->
|
||||||
|
|||||||
Reference in New Issue
Block a user