Apply Laravel coding style
Shift automatically applies the Laravel coding style - which uses the PSR-12 coding style as a base with some minor additions. You may customize the code style applied by configuring [Pint](https://laravel.com/docs/pint), [PHP CS Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer), or [PHP CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) for your project root. For more information on customizing the code style applied by Shift, [watch this short video](https://laravelshift.com/videos/shift-code-style).
This commit is contained in:
Shift
parent
d55a6b1944
commit
70208d2157
|
|
@ -5,8 +5,8 @@ namespace App\Classes;
|
|||
use App\Models\Egg;
|
||||
use App\Models\Nest;
|
||||
use App\Models\Node;
|
||||
use App\Models\Server;
|
||||
use App\Models\Product;
|
||||
use App\Models\Server;
|
||||
use Exception;
|
||||
use Illuminate\Http\Client\PendingRequest;
|
||||
use Illuminate\Http\Client\Response;
|
||||
|
|
@ -22,136 +22,160 @@ class Pterodactyl
|
|||
public static function client()
|
||||
{
|
||||
return Http::withHeaders([
|
||||
'Authorization' => 'Bearer ' . config("SETTINGS::SYSTEM:PTERODACTYL:TOKEN"),
|
||||
'Content-type' => 'application/json',
|
||||
'Accept' => 'Application/vnd.pterodactyl.v1+json',
|
||||
])->baseUrl(config("SETTINGS::SYSTEM:PTERODACTYL:URL") . '/api');
|
||||
'Authorization' => 'Bearer '.config('SETTINGS::SYSTEM:PTERODACTYL:TOKEN'),
|
||||
'Content-type' => 'application/json',
|
||||
'Accept' => 'Application/vnd.pterodactyl.v1+json',
|
||||
])->baseUrl(config('SETTINGS::SYSTEM:PTERODACTYL:URL').'/api');
|
||||
}
|
||||
|
||||
public static function clientAdmin()
|
||||
{
|
||||
return Http::withHeaders([
|
||||
'Authorization' => 'Bearer ' . config("SETTINGS::SYSTEM:PTERODACTYL:ADMIN_USER_TOKEN"),
|
||||
'Content-type' => 'application/json',
|
||||
'Accept' => 'Application/vnd.pterodactyl.v1+json',
|
||||
])->baseUrl(config("SETTINGS::SYSTEM:PTERODACTYL:URL") . '/api');
|
||||
'Authorization' => 'Bearer '.config('SETTINGS::SYSTEM:PTERODACTYL:ADMIN_USER_TOKEN'),
|
||||
'Content-type' => 'application/json',
|
||||
'Accept' => 'Application/vnd.pterodactyl.v1+json',
|
||||
])->baseUrl(config('SETTINGS::SYSTEM:PTERODACTYL:URL').'/api');
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Exception
|
||||
*/
|
||||
private static function getException(string $message = "", int $status = 0): Exception
|
||||
private static function getException(string $message = '', int $status = 0): Exception
|
||||
{
|
||||
if ($status == 404) {
|
||||
return new Exception("Ressource does not exist on pterodactyl - " . $message, 404);
|
||||
return new Exception('Ressource does not exist on pterodactyl - '.$message, 404);
|
||||
}
|
||||
|
||||
if ($status == 403) {
|
||||
return new Exception("No permission on pterodactyl, check pterodactyl token and permissions - " . $message, 403);
|
||||
return new Exception('No permission on pterodactyl, check pterodactyl token and permissions - '.$message, 403);
|
||||
}
|
||||
|
||||
if ($status == 401) {
|
||||
return new Exception("No pterodactyl token set - " . $message, 401);
|
||||
return new Exception('No pterodactyl token set - '.$message, 401);
|
||||
}
|
||||
|
||||
if ($status == 500) {
|
||||
return new Exception("Pterodactyl server error - " . $message, 500);
|
||||
return new Exception('Pterodactyl server error - '.$message, 500);
|
||||
}
|
||||
|
||||
return new Exception('Request Failed, is pterodactyl set-up correctly? - ' . $message);
|
||||
return new Exception('Request Failed, is pterodactyl set-up correctly? - '.$message);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Nest $nest
|
||||
* @param Nest $nest
|
||||
* @return mixed
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function getEggs(Nest $nest)
|
||||
{
|
||||
try {
|
||||
$response = self::client()->get("/application/nests/{$nest->id}/eggs?include=nest,variables&per_page=" . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT"));
|
||||
$response = self::client()->get("/application/nests/{$nest->id}/eggs?include=nest,variables&per_page=".config('SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT'));
|
||||
} catch (Exception $e) {
|
||||
throw self::getException($e->getMessage());
|
||||
}
|
||||
if ($response->failed()) throw self::getException("Failed to get eggs from pterodactyl - ", $response->status());
|
||||
if ($response->failed()) {
|
||||
throw self::getException('Failed to get eggs from pterodactyl - ', $response->status());
|
||||
}
|
||||
|
||||
return $response->json()['data'];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function getNodes()
|
||||
{
|
||||
try {
|
||||
$response = self::client()->get('/application/nodes?per_page=' . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT"));
|
||||
$response = self::client()->get('/application/nodes?per_page='.config('SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT'));
|
||||
} catch (Exception $e) {
|
||||
throw self::getException($e->getMessage());
|
||||
}
|
||||
if ($response->failed()) throw self::getException("Failed to get nodes from pterodactyl - ", $response->status());
|
||||
if ($response->failed()) {
|
||||
throw self::getException('Failed to get nodes from pterodactyl - ', $response->status());
|
||||
}
|
||||
|
||||
return $response->json()['data'];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*
|
||||
* @throws Exception
|
||||
* @description Returns the infos of a single node
|
||||
*/
|
||||
public static function getNode($id) {
|
||||
public static function getNode($id)
|
||||
{
|
||||
try {
|
||||
$response = self::client()->get('/application/nodes/' . $id);
|
||||
} catch(Exception $e) {
|
||||
throw self::getException($e->getMessage());
|
||||
}
|
||||
if($response->failed()) throw self::getException("Failed to get node id " . $id . " - " . $response->status());
|
||||
return $response->json()['attributes'];
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static function getServers() {
|
||||
try {
|
||||
$response = self::client()->get('/application/servers?per_page=' . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT"));
|
||||
$response = self::client()->get('/application/nodes/'.$id);
|
||||
} catch (Exception $e) {
|
||||
throw self::getException($e->getMessage());
|
||||
}
|
||||
if($response->failed()) throw self::getException("Failed to get list of servers - ", $response->status());
|
||||
if ($response->failed()) {
|
||||
throw self::getException('Failed to get node id '.$id.' - '.$response->status());
|
||||
}
|
||||
|
||||
return $response->json()['attributes'];
|
||||
}
|
||||
|
||||
public static function getServers()
|
||||
{
|
||||
try {
|
||||
$response = self::client()->get('/application/servers?per_page='.config('SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT'));
|
||||
} catch (Exception $e) {
|
||||
throw self::getException($e->getMessage());
|
||||
}
|
||||
if ($response->failed()) {
|
||||
throw self::getException('Failed to get list of servers - ', $response->status());
|
||||
}
|
||||
|
||||
return $response->json()['data'];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return null
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function getNests()
|
||||
{
|
||||
try {
|
||||
$response = self::client()->get('/application/nests?per_page=' . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT"));
|
||||
$response = self::client()->get('/application/nests?per_page='.config('SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT'));
|
||||
} catch (Exception $e) {
|
||||
throw self::getException($e->getMessage());
|
||||
}
|
||||
if ($response->failed()) throw self::getException("Failed to get nests from pterodactyl", $response->status());
|
||||
if ($response->failed()) {
|
||||
throw self::getException('Failed to get nests from pterodactyl', $response->status());
|
||||
}
|
||||
|
||||
return $response->json()['data'];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function getLocations()
|
||||
{
|
||||
try {
|
||||
$response = self::client()->get('/application/locations?per_page=' . config("SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT"));
|
||||
$response = self::client()->get('/application/locations?per_page='.config('SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT'));
|
||||
} catch (Exception $e) {
|
||||
throw self::getException($e->getMessage());
|
||||
}
|
||||
if ($response->failed()) throw self::getException("Failed to get locations from pterodactyl - ", $response->status());
|
||||
if ($response->failed()) {
|
||||
throw self::getException('Failed to get locations from pterodactyl - ', $response->status());
|
||||
}
|
||||
|
||||
return $response->json()['data'];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Node $node
|
||||
* @param Node $node
|
||||
* @return mixed
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function getFreeAllocationId(Node $node)
|
||||
|
|
@ -160,8 +184,9 @@ class Pterodactyl
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Node $node
|
||||
* @param Node $node
|
||||
* @return array|mixed|null
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function getFreeAllocations(Node $node)
|
||||
|
|
@ -170,9 +195,11 @@ class Pterodactyl
|
|||
$freeAllocations = [];
|
||||
|
||||
if (isset($response['data'])) {
|
||||
if (!empty($response['data'])) {
|
||||
if (! empty($response['data'])) {
|
||||
foreach ($response['data'] as $allocation) {
|
||||
if (!$allocation['attributes']['assigned']) array_push($freeAllocations, $allocation);
|
||||
if (! $allocation['attributes']['assigned']) {
|
||||
array_push($freeAllocations, $allocation);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -181,8 +208,9 @@ class Pterodactyl
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Node $node
|
||||
* @param Node $node
|
||||
* @return array|mixed
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function getAllocations(Node $node)
|
||||
|
|
@ -193,51 +221,53 @@ class Pterodactyl
|
|||
} catch (Exception $e) {
|
||||
throw self::getException($e->getMessage());
|
||||
}
|
||||
if ($response->failed()) throw self::getException("Failed to get allocations from pterodactyl - ", $response->status());
|
||||
if ($response->failed()) {
|
||||
throw self::getException('Failed to get allocations from pterodactyl - ', $response->status());
|
||||
}
|
||||
|
||||
return $response->json();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param String $route
|
||||
* @param string $route
|
||||
* @return string
|
||||
*/
|
||||
public static function url(string $route): string
|
||||
{
|
||||
return config("SETTINGS::SYSTEM:PTERODACTYL:URL") . $route;
|
||||
return config('SETTINGS::SYSTEM:PTERODACTYL:URL').$route;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @param Egg $egg
|
||||
* @param int $allocationId
|
||||
* @param Server $server
|
||||
* @param Egg $egg
|
||||
* @param int $allocationId
|
||||
* @return Response
|
||||
*/
|
||||
public static function createServer(Server $server, Egg $egg, int $allocationId)
|
||||
{
|
||||
return self::client()->post("/application/servers", [
|
||||
"name" => $server->name,
|
||||
"external_id" => $server->id,
|
||||
"user" => $server->user->pterodactyl_id,
|
||||
"egg" => $egg->id,
|
||||
"docker_image" => $egg->docker_image,
|
||||
"startup" => $egg->startup,
|
||||
"environment" => $egg->getEnvironmentVariables(),
|
||||
"limits" => [
|
||||
"memory" => $server->product->memory,
|
||||
"swap" => $server->product->swap,
|
||||
"disk" => $server->product->disk,
|
||||
"io" => $server->product->io,
|
||||
"cpu" => $server->product->cpu
|
||||
return self::client()->post('/application/servers', [
|
||||
'name' => $server->name,
|
||||
'external_id' => $server->id,
|
||||
'user' => $server->user->pterodactyl_id,
|
||||
'egg' => $egg->id,
|
||||
'docker_image' => $egg->docker_image,
|
||||
'startup' => $egg->startup,
|
||||
'environment' => $egg->getEnvironmentVariables(),
|
||||
'limits' => [
|
||||
'memory' => $server->product->memory,
|
||||
'swap' => $server->product->swap,
|
||||
'disk' => $server->product->disk,
|
||||
'io' => $server->product->io,
|
||||
'cpu' => $server->product->cpu,
|
||||
],
|
||||
"feature_limits" => [
|
||||
"databases" => $server->product->databases,
|
||||
"backups" => $server->product->backups,
|
||||
"allocations" => $server->product->allocations,
|
||||
'feature_limits' => [
|
||||
'databases' => $server->product->databases,
|
||||
'backups' => $server->product->backups,
|
||||
'allocations' => $server->product->allocations,
|
||||
],
|
||||
'allocation' => [
|
||||
'default' => $allocationId,
|
||||
],
|
||||
"allocation" => [
|
||||
"default" => $allocationId
|
||||
]
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -248,7 +278,9 @@ class Pterodactyl
|
|||
} catch (Exception $e) {
|
||||
throw self::getException($e->getMessage());
|
||||
}
|
||||
if ($response->failed()) throw self::getException("Failed to suspend server from pterodactyl - ", $response->status());
|
||||
if ($response->failed()) {
|
||||
throw self::getException('Failed to suspend server from pterodactyl - ', $response->status());
|
||||
}
|
||||
|
||||
return $response;
|
||||
}
|
||||
|
|
@ -260,14 +292,17 @@ class Pterodactyl
|
|||
} catch (Exception $e) {
|
||||
throw self::getException($e->getMessage());
|
||||
}
|
||||
if ($response->failed()) throw self::getException("Failed to unsuspend server from pterodactyl - ", $response->status());
|
||||
if ($response->failed()) {
|
||||
throw self::getException('Failed to unsuspend server from pterodactyl - ', $response->status());
|
||||
}
|
||||
|
||||
return $response;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get user by pterodactyl id
|
||||
* @param int $pterodactylId
|
||||
*
|
||||
* @param int $pterodactylId
|
||||
* @return mixed
|
||||
*/
|
||||
public function getUser(int $pterodactylId)
|
||||
|
|
@ -277,14 +312,17 @@ class Pterodactyl
|
|||
} catch (Exception $e) {
|
||||
throw self::getException($e->getMessage());
|
||||
}
|
||||
if ($response->failed()) throw self::getException("Failed to get user from pterodactyl - ", $response->status());
|
||||
if ($response->failed()) {
|
||||
throw self::getException('Failed to get user from pterodactyl - ', $response->status());
|
||||
}
|
||||
|
||||
return $response->json()['attributes'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Get serverAttributes by pterodactyl id
|
||||
* @param int $pterodactylId
|
||||
*
|
||||
* @param int $pterodactylId
|
||||
* @return mixed
|
||||
*/
|
||||
public static function getServerAttributes(int $pterodactylId, bool $deleteOn404 = false)
|
||||
|
|
@ -297,51 +335,55 @@ class Pterodactyl
|
|||
|
||||
//print response body
|
||||
|
||||
|
||||
|
||||
if ($response->failed()){
|
||||
if($deleteOn404){ //Delete the server if it does not exist (server deleted on pterodactyl)
|
||||
if ($response->failed()) {
|
||||
if ($deleteOn404) { //Delete the server if it does not exist (server deleted on pterodactyl)
|
||||
Server::where('pterodactyl_id', $pterodactylId)->first()->delete();
|
||||
|
||||
return;
|
||||
} else {
|
||||
throw self::getException('Failed to get server attributes from pterodactyl - ', $response->status());
|
||||
}
|
||||
else throw self::getException("Failed to get server attributes from pterodactyl - ", $response->status());
|
||||
}
|
||||
|
||||
return $response->json()['attributes'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Update Server Resources
|
||||
* @param Server $server
|
||||
* @param Product $product
|
||||
*
|
||||
* @param Server $server
|
||||
* @param Product $product
|
||||
* @return Response
|
||||
*/
|
||||
public static function updateServer(Server $server, Product $product)
|
||||
{
|
||||
return self::client()->patch("/application/servers/{$server->pterodactyl_id}/build", [
|
||||
"allocation" => $server->allocation,
|
||||
"memory" => $product->memory,
|
||||
"swap" => $product->swap,
|
||||
"disk" => $product->disk,
|
||||
"io" => $product->io,
|
||||
"cpu" => $product->cpu,
|
||||
"threads" => null,
|
||||
"feature_limits" => [
|
||||
"databases" => $product->databases,
|
||||
"backups" => $product->backups,
|
||||
"allocations" => $product->allocations,
|
||||
]
|
||||
'allocation' => $server->allocation,
|
||||
'memory' => $product->memory,
|
||||
'swap' => $product->swap,
|
||||
'disk' => $product->disk,
|
||||
'io' => $product->io,
|
||||
'cpu' => $product->cpu,
|
||||
'threads' => null,
|
||||
'feature_limits' => [
|
||||
'databases' => $product->databases,
|
||||
'backups' => $product->backups,
|
||||
'allocations' => $product->allocations,
|
||||
],
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Power Action Specific Server
|
||||
* @param Server $server
|
||||
* @param string $action
|
||||
*
|
||||
* @param Server $server
|
||||
* @param string $action
|
||||
* @return Response
|
||||
*/
|
||||
public static function powerAction(Server $server, $action)
|
||||
{
|
||||
return self::clientAdmin()->post("/client/servers/{$server->identifier}/power", [
|
||||
"signal" => $action
|
||||
'signal' => $action,
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -350,16 +392,16 @@ class Pterodactyl
|
|||
*/
|
||||
public static function getClientUser()
|
||||
{
|
||||
return self::clientAdmin()->get("/client/account");
|
||||
return self::clientAdmin()->get('/client/account');
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Check if node has enough free resources to allocate the given resources
|
||||
* @param Node $node
|
||||
* @param int $requireMemory
|
||||
* @param int $requireDisk
|
||||
* @return boolean
|
||||
*
|
||||
* @param Node $node
|
||||
* @param int $requireMemory
|
||||
* @param int $requireDisk
|
||||
* @return bool
|
||||
*/
|
||||
public static function checkNodeResources(Node $node, int $requireMemory, int $requireDisk)
|
||||
{
|
||||
|
|
@ -369,14 +411,15 @@ class Pterodactyl
|
|||
throw self::getException($e->getMessage());
|
||||
}
|
||||
$node = $response['attributes'];
|
||||
$freeMemory = ($node['memory']*($node['memory_overallocate']+100)/100) - $node['allocated_resources']['memory'];
|
||||
$freeDisk = ($node['disk']*($node['disk_overallocate']+100)/100) - $node['allocated_resources']['disk'];
|
||||
$freeMemory = ($node['memory'] * ($node['memory_overallocate'] + 100) / 100) - $node['allocated_resources']['memory'];
|
||||
$freeDisk = ($node['disk'] * ($node['disk_overallocate'] + 100) / 100) - $node['allocated_resources']['disk'];
|
||||
if ($freeMemory < $requireMemory) {
|
||||
return false;
|
||||
}
|
||||
if ($freeDisk < $requireDisk) {
|
||||
}
|
||||
if ($freeDisk < $requireDisk) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,9 +10,8 @@ class Invoices
|
|||
{
|
||||
public function __construct()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function updateSettings(Request $request)
|
||||
{
|
||||
|
|
@ -22,29 +21,27 @@ class Invoices
|
|||
|
||||
$values = [
|
||||
//SETTINGS::VALUE => REQUEST-VALUE (coming from the html-form)
|
||||
"SETTINGS::INVOICE:COMPANY_NAME" => "company-name",
|
||||
"SETTINGS::INVOICE:COMPANY_ADDRESS" => "company-address",
|
||||
"SETTINGS::INVOICE:COMPANY_PHONE" => "company-phone",
|
||||
"SETTINGS::INVOICE:COMPANY_MAIL" => "company-mail",
|
||||
"SETTINGS::INVOICE:COMPANY_VAT" => "company-vat",
|
||||
"SETTINGS::INVOICE:COMPANY_WEBSITE" => "company-web",
|
||||
"SETTINGS::INVOICE:PREFIX" => "invoice-prefix",
|
||||
"SETTINGS::INVOICE:ENABLED" => "enable-invoices",
|
||||
'SETTINGS::INVOICE:COMPANY_NAME' => 'company-name',
|
||||
'SETTINGS::INVOICE:COMPANY_ADDRESS' => 'company-address',
|
||||
'SETTINGS::INVOICE:COMPANY_PHONE' => 'company-phone',
|
||||
'SETTINGS::INVOICE:COMPANY_MAIL' => 'company-mail',
|
||||
'SETTINGS::INVOICE:COMPANY_VAT' => 'company-vat',
|
||||
'SETTINGS::INVOICE:COMPANY_WEBSITE' => 'company-web',
|
||||
'SETTINGS::INVOICE:PREFIX' => 'invoice-prefix',
|
||||
'SETTINGS::INVOICE:ENABLED' => 'enable-invoices',
|
||||
];
|
||||
|
||||
foreach ($values as $key => $value) {
|
||||
$param = $request->get($value);
|
||||
|
||||
Settings::where('key', $key)->updateOrCreate(['key' => $key], ['value' => $param]);
|
||||
Cache::forget("setting" . ':' . $key);
|
||||
Cache::forget('setting'.':'.$key);
|
||||
}
|
||||
|
||||
|
||||
if ($request->hasFile('logo')) {
|
||||
$request->file('logo')->storeAs('public', 'logo.png');
|
||||
}
|
||||
|
||||
|
||||
return redirect(route('admin.settings.index') . '#invoices')->with('success', __('Invoice settings updated!'));
|
||||
return redirect(route('admin.settings.index').'#invoices')->with('success', __('Invoice settings updated!'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,14 +8,12 @@ use Illuminate\Support\Facades\Cache;
|
|||
use Illuminate\Support\Facades\Session;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
|
||||
|
||||
class Language
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function updateSettings(Request $request)
|
||||
{
|
||||
|
|
@ -28,34 +26,31 @@ class Language
|
|||
'datatable-language' => 'required|string',
|
||||
]);
|
||||
|
||||
|
||||
if ($validator->fails()) {
|
||||
return redirect(route('admin.settings.index') . '#language')->with('error', __('Language settings have not been updated!'))->withErrors($validator);
|
||||
return redirect(route('admin.settings.index').'#language')->with('error', __('Language settings have not been updated!'))->withErrors($validator);
|
||||
}
|
||||
|
||||
$values = [
|
||||
//SETTINGS::VALUE => REQUEST-VALUE (coming from the html-form)
|
||||
"SETTINGS::LOCALE:DEFAULT" => "defaultLanguage",
|
||||
"SETTINGS::LOCALE:DYNAMIC" => "autotranslate",
|
||||
"SETTINGS::LOCALE:CLIENTS_CAN_CHANGE" => "canClientChangeLanguage",
|
||||
"SETTINGS::LOCALE:AVAILABLE" => "languages",
|
||||
"SETTINGS::LOCALE:DATATABLES" => "datatable-language"
|
||||
'SETTINGS::LOCALE:DEFAULT' => 'defaultLanguage',
|
||||
'SETTINGS::LOCALE:DYNAMIC' => 'autotranslate',
|
||||
'SETTINGS::LOCALE:CLIENTS_CAN_CHANGE' => 'canClientChangeLanguage',
|
||||
'SETTINGS::LOCALE:AVAILABLE' => 'languages',
|
||||
'SETTINGS::LOCALE:DATATABLES' => 'datatable-language',
|
||||
];
|
||||
|
||||
|
||||
foreach ($values as $key => $value) {
|
||||
$param = $request->get($value);
|
||||
|
||||
if (is_array($param)) {
|
||||
$param = implode(",", $param);
|
||||
$param = implode(',', $param);
|
||||
}
|
||||
|
||||
Settings::where('key', $key)->updateOrCreate(['key' => $key], ['value' => $param]);
|
||||
Cache::forget("setting" . ':' . $key);
|
||||
Session::remove("locale");
|
||||
Cache::forget('setting'.':'.$key);
|
||||
Session::remove('locale');
|
||||
}
|
||||
|
||||
|
||||
return redirect(route('admin.settings.index') . '#language')->with('success', __('Language settings updated!'));
|
||||
return redirect(route('admin.settings.index').'#language')->with('success', __('Language settings updated!'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,12 +7,11 @@ use Illuminate\Http\Request;
|
|||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
|
||||
|
||||
class Misc
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
public function updateSettings(Request $request)
|
||||
|
|
@ -48,14 +47,14 @@ class Misc
|
|||
|
||||
$validator->after(function ($validator) use ($request) {
|
||||
// if enable-recaptcha is true then recaptcha-site-key and recaptcha-secret-key must be set
|
||||
if ($request->get('enable-recaptcha') == 'true' && (!$request->get('recaptcha-site-key') || !$request->get('recaptcha-secret-key'))) {
|
||||
if ($request->get('enable-recaptcha') == 'true' && (! $request->get('recaptcha-site-key') || ! $request->get('recaptcha-secret-key'))) {
|
||||
$validator->errors()->add('recaptcha-site-key', 'The site key is required if recaptcha is enabled.');
|
||||
$validator->errors()->add('recaptcha-secret-key', 'The secret key is required if recaptcha is enabled.');
|
||||
}
|
||||
});
|
||||
|
||||
if ($validator->fails()) {
|
||||
return redirect(route('admin.settings.index') . '#misc')->with('error', __('Misc settings have not been updated!'))->withErrors($validator)
|
||||
return redirect(route('admin.settings.index').'#misc')->with('error', __('Misc settings have not been updated!'))->withErrors($validator)
|
||||
->withInput();
|
||||
}
|
||||
|
||||
|
|
@ -67,31 +66,30 @@ class Misc
|
|||
}
|
||||
|
||||
$values = [
|
||||
"SETTINGS::DISCORD:BOT_TOKEN" => "discord-bot-token",
|
||||
"SETTINGS::DISCORD:CLIENT_ID" => "discord-client-id",
|
||||
"SETTINGS::DISCORD:CLIENT_SECRET" => "discord-client-secret",
|
||||
"SETTINGS::DISCORD:GUILD_ID" => "discord-guild-id",
|
||||
"SETTINGS::DISCORD:INVITE_URL" => "discord-invite-url",
|
||||
"SETTINGS::DISCORD:ROLE_ID" => "discord-role-id",
|
||||
"SETTINGS::RECAPTCHA:SITE_KEY" => "recaptcha-site-key",
|
||||
"SETTINGS::RECAPTCHA:SECRET_KEY" => "recaptcha-secret-key",
|
||||
"SETTINGS::RECAPTCHA:ENABLED" => "enable-recaptcha",
|
||||
"SETTINGS::MAIL:MAILER" => "mailservice",
|
||||
"SETTINGS::MAIL:HOST" => "mailhost",
|
||||
"SETTINGS::MAIL:PORT" => "mailport",
|
||||
"SETTINGS::MAIL:USERNAME" => "mailusername",
|
||||
"SETTINGS::MAIL:PASSWORD" => "mailpassword",
|
||||
"SETTINGS::MAIL:ENCRYPTION" => "mailencryption",
|
||||
"SETTINGS::MAIL:FROM_ADDRESS" => "mailfromadress",
|
||||
"SETTINGS::MAIL:FROM_NAME" => "mailfromname",
|
||||
"SETTINGS::REFERRAL::ENABLED" => "enable_referral",
|
||||
"SETTINGS::REFERRAL::REWARD" => "referral_reward",
|
||||
"SETTINGS::REFERRAL::ALLOWED" => "referral_allowed",
|
||||
"SETTINGS::REFERRAL:MODE" => "referral_mode",
|
||||
"SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION" => "always_give_commission",
|
||||
"SETTINGS::REFERRAL:PERCENTAGE" => "referral_percentage",
|
||||
"SETTINGS::TICKET:ENABLED" => "ticket_enabled"
|
||||
|
||||
'SETTINGS::DISCORD:BOT_TOKEN' => 'discord-bot-token',
|
||||
'SETTINGS::DISCORD:CLIENT_ID' => 'discord-client-id',
|
||||
'SETTINGS::DISCORD:CLIENT_SECRET' => 'discord-client-secret',
|
||||
'SETTINGS::DISCORD:GUILD_ID' => 'discord-guild-id',
|
||||
'SETTINGS::DISCORD:INVITE_URL' => 'discord-invite-url',
|
||||
'SETTINGS::DISCORD:ROLE_ID' => 'discord-role-id',
|
||||
'SETTINGS::RECAPTCHA:SITE_KEY' => 'recaptcha-site-key',
|
||||
'SETTINGS::RECAPTCHA:SECRET_KEY' => 'recaptcha-secret-key',
|
||||
'SETTINGS::RECAPTCHA:ENABLED' => 'enable-recaptcha',
|
||||
'SETTINGS::MAIL:MAILER' => 'mailservice',
|
||||
'SETTINGS::MAIL:HOST' => 'mailhost',
|
||||
'SETTINGS::MAIL:PORT' => 'mailport',
|
||||
'SETTINGS::MAIL:USERNAME' => 'mailusername',
|
||||
'SETTINGS::MAIL:PASSWORD' => 'mailpassword',
|
||||
'SETTINGS::MAIL:ENCRYPTION' => 'mailencryption',
|
||||
'SETTINGS::MAIL:FROM_ADDRESS' => 'mailfromadress',
|
||||
'SETTINGS::MAIL:FROM_NAME' => 'mailfromname',
|
||||
'SETTINGS::REFERRAL::ENABLED' => 'enable_referral',
|
||||
'SETTINGS::REFERRAL::REWARD' => 'referral_reward',
|
||||
'SETTINGS::REFERRAL::ALLOWED' => 'referral_allowed',
|
||||
'SETTINGS::REFERRAL:MODE' => 'referral_mode',
|
||||
'SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION' => 'always_give_commission',
|
||||
'SETTINGS::REFERRAL:PERCENTAGE' => 'referral_percentage',
|
||||
'SETTINGS::TICKET:ENABLED' => 'ticket_enabled',
|
||||
|
||||
];
|
||||
|
||||
|
|
@ -99,10 +97,9 @@ class Misc
|
|||
$param = $request->get($value);
|
||||
|
||||
Settings::where('key', $key)->updateOrCreate(['key' => $key], ['value' => $param]);
|
||||
Cache::forget("setting" . ':' . $key);
|
||||
Cache::forget('setting'.':'.$key);
|
||||
}
|
||||
|
||||
|
||||
return redirect(route('admin.settings.index') . '#misc')->with('success', __('Misc settings updated!'));
|
||||
return redirect(route('admin.settings.index').'#misc')->with('success', __('Misc settings updated!'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,55 +7,52 @@ use Illuminate\Http\Request;
|
|||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
|
||||
|
||||
class Payments
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function updateSettings(Request $request)
|
||||
{
|
||||
$validator = Validator::make($request->all(), [
|
||||
"paypal-client_id" => "nullable|string",
|
||||
"paypal-client-secret" => "nullable|string",
|
||||
"paypal-sandbox-secret" => "nullable|string",
|
||||
"stripe-secret-key" => "nullable|string",
|
||||
"stripe-endpoint-secret" => "nullable|string",
|
||||
"stripe-test-secret-key" => "nullable|string",
|
||||
"stripe-test-endpoint-secret" => "nullable|string",
|
||||
"stripe-methods" => "nullable|string",
|
||||
"sales-tax" => "nullable|numeric",
|
||||
'paypal-client_id' => 'nullable|string',
|
||||
'paypal-client-secret' => 'nullable|string',
|
||||
'paypal-sandbox-secret' => 'nullable|string',
|
||||
'stripe-secret-key' => 'nullable|string',
|
||||
'stripe-endpoint-secret' => 'nullable|string',
|
||||
'stripe-test-secret-key' => 'nullable|string',
|
||||
'stripe-test-endpoint-secret' => 'nullable|string',
|
||||
'stripe-methods' => 'nullable|string',
|
||||
'sales-tax' => 'nullable|numeric',
|
||||
]);
|
||||
if ($validator->fails()) {
|
||||
return redirect(route('admin.settings.index') . '#payment')->with('error', __('Payment settings have not been updated!'))->withErrors($validator)
|
||||
return redirect(route('admin.settings.index').'#payment')->with('error', __('Payment settings have not been updated!'))->withErrors($validator)
|
||||
->withInput();
|
||||
}
|
||||
|
||||
$values = [
|
||||
//SETTINGS::VALUE => REQUEST-VALUE (coming from the html-form)
|
||||
"SETTINGS::PAYMENTS:PAYPAL:SECRET" => "paypal-client-secret",
|
||||
"SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID" => "paypal-client-id",
|
||||
"SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET" => "paypal-sandbox-secret",
|
||||
"SETTINGS::PAYMENTS:PAYPAL:SANDBOX_CLIENT_ID" => "paypal-sandbox-id",
|
||||
"SETTINGS::PAYMENTS:STRIPE:SECRET" => "stripe-secret",
|
||||
"SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET" => "stripe-endpoint-secret",
|
||||
"SETTINGS::PAYMENTS:STRIPE:TEST_SECRET" => "stripe-test-secret",
|
||||
"SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET" => "stripe-endpoint-test-secret",
|
||||
"SETTINGS::PAYMENTS:STRIPE:METHODS" => "stripe-methods",
|
||||
"SETTINGS::PAYMENTS:SALES_TAX" => "sales-tax"
|
||||
'SETTINGS::PAYMENTS:PAYPAL:SECRET' => 'paypal-client-secret',
|
||||
'SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID' => 'paypal-client-id',
|
||||
'SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET' => 'paypal-sandbox-secret',
|
||||
'SETTINGS::PAYMENTS:PAYPAL:SANDBOX_CLIENT_ID' => 'paypal-sandbox-id',
|
||||
'SETTINGS::PAYMENTS:STRIPE:SECRET' => 'stripe-secret',
|
||||
'SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET' => 'stripe-endpoint-secret',
|
||||
'SETTINGS::PAYMENTS:STRIPE:TEST_SECRET' => 'stripe-test-secret',
|
||||
'SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET' => 'stripe-endpoint-test-secret',
|
||||
'SETTINGS::PAYMENTS:STRIPE:METHODS' => 'stripe-methods',
|
||||
'SETTINGS::PAYMENTS:SALES_TAX' => 'sales-tax',
|
||||
];
|
||||
|
||||
|
||||
foreach ($values as $key => $value) {
|
||||
$param = $request->get($value);
|
||||
|
||||
Settings::where('key', $key)->updateOrCreate(['key' => $key], ['value' => $param]);
|
||||
Cache::forget("setting" . ':' . $key);
|
||||
Cache::forget('setting'.':'.$key);
|
||||
}
|
||||
|
||||
return redirect(route('admin.settings.index') . '#payment')->with('success', __('Payment settings updated!'));
|
||||
return redirect(route('admin.settings.index').'#payment')->with('success', __('Payment settings updated!'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,101 +10,101 @@ use Illuminate\Support\Facades\Validator;
|
|||
|
||||
class System
|
||||
{
|
||||
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
public function checkPteroClientkey(){
|
||||
$response = Pterodactyl::getClientUser();
|
||||
public function checkPteroClientkey()
|
||||
{
|
||||
$response = Pterodactyl::getClientUser();
|
||||
|
||||
if ($response->failed()){ return redirect()->back()->with('error', __('Your Key or URL is not correct')); }
|
||||
return redirect()->back()->with('success', __('Everything is good!'));
|
||||
}
|
||||
if ($response->failed()) {
|
||||
return redirect()->back()->with('error', __('Your Key or URL is not correct'));
|
||||
}
|
||||
|
||||
return redirect()->back()->with('success', __('Everything is good!'));
|
||||
}
|
||||
|
||||
public function updateSettings(Request $request)
|
||||
{
|
||||
$validator = Validator::make($request->all(), [
|
||||
"register-ip-check" => "string",
|
||||
"server-create-charge-first-hour" => "string",
|
||||
"credits-display-name" => "required|string",
|
||||
"allocation-limit" => "required|min:0|integer",
|
||||
"force-email-verification" => "string",
|
||||
"force-discord-verification" => "string",
|
||||
"initial-credits" => "required|min:0|integer",
|
||||
"initial-server-limit" => "required|min:0|integer",
|
||||
"credits-reward-amount-discord" => "required|min:0|integer",
|
||||
"credits-reward-amount-email" => "required|min:0|integer",
|
||||
"server-limit-discord" => "required|min:0|integer",
|
||||
"server-limit-email" => "required|min:0|integer",
|
||||
"server-limit-purchase" => "required|min:0|integer",
|
||||
"pterodactyl-api-key" => "required|string",
|
||||
"pterodactyl-url" => "required|string",
|
||||
"per-page-limit" => "required|min:0|integer",
|
||||
"pterodactyl-admin-api-key" => "required|string",
|
||||
"enable-upgrades" => "string",
|
||||
"enable-disable-servers" => "string",
|
||||
"show-imprint" => "string",
|
||||
"show-privacy" => "string",
|
||||
"show-tos" => "string",
|
||||
'register-ip-check' => 'string',
|
||||
'server-create-charge-first-hour' => 'string',
|
||||
'credits-display-name' => 'required|string',
|
||||
'allocation-limit' => 'required|min:0|integer',
|
||||
'force-email-verification' => 'string',
|
||||
'force-discord-verification' => 'string',
|
||||
'initial-credits' => 'required|min:0|integer',
|
||||
'initial-server-limit' => 'required|min:0|integer',
|
||||
'credits-reward-amount-discord' => 'required|min:0|integer',
|
||||
'credits-reward-amount-email' => 'required|min:0|integer',
|
||||
'server-limit-discord' => 'required|min:0|integer',
|
||||
'server-limit-email' => 'required|min:0|integer',
|
||||
'server-limit-purchase' => 'required|min:0|integer',
|
||||
'pterodactyl-api-key' => 'required|string',
|
||||
'pterodactyl-url' => 'required|string',
|
||||
'per-page-limit' => 'required|min:0|integer',
|
||||
'pterodactyl-admin-api-key' => 'required|string',
|
||||
'enable-upgrades' => 'string',
|
||||
'enable-disable-servers' => 'string',
|
||||
'show-imprint' => 'string',
|
||||
'show-privacy' => 'string',
|
||||
'show-tos' => 'string',
|
||||
]);
|
||||
|
||||
$validator->after(function ($validator) use ($request) {
|
||||
// if enable-recaptcha is true then recaptcha-site-key and recaptcha-secret-key must be set
|
||||
if ($request->get('enable-upgrades') == 'true' && (!$request->get('pterodactyl-admin-api-key'))) {
|
||||
if ($request->get('enable-upgrades') == 'true' && (! $request->get('pterodactyl-admin-api-key'))) {
|
||||
$validator->errors()->add('pterodactyl-admin-api-key', 'The admin api key is required when upgrades are enabled.');
|
||||
}
|
||||
});
|
||||
|
||||
if ($validator->fails()) {
|
||||
return redirect(route('admin.settings.index') . '#system')->with('error', __('System settings have not been updated!'))->withErrors($validator)
|
||||
return redirect(route('admin.settings.index').'#system')->with('error', __('System settings have not been updated!'))->withErrors($validator)
|
||||
->withInput();
|
||||
}
|
||||
|
||||
// update Icons from request
|
||||
$this->updateIcons($request);
|
||||
|
||||
|
||||
$values = [
|
||||
"SETTINGS::SYSTEM:REGISTER_IP_CHECK" => "register-ip-check",
|
||||
"SETTINGS::SYSTEM:SERVER_CREATE_CHARGE_FIRST_HOUR" => "server-create-charge-first-hour",
|
||||
"SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME" => "credits-display-name",
|
||||
"SETTINGS::SERVER:ALLOCATION_LIMIT" => "allocation-limit",
|
||||
"SETTINGS::USER:FORCE_DISCORD_VERIFICATION" => "force-discord-verification",
|
||||
"SETTINGS::USER:FORCE_EMAIL_VERIFICATION" => "force-email-verification",
|
||||
"SETTINGS::USER:INITIAL_CREDITS" => "initial-credits",
|
||||
"SETTINGS::USER:INITIAL_SERVER_LIMIT" => "initial-server-limit",
|
||||
"SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD" => "credits-reward-amount-discord",
|
||||
"SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL" => "credits-reward-amount-email",
|
||||
"SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD" => "server-limit-discord",
|
||||
"SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL" => "server-limit-email",
|
||||
"SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE" => "server-limit-purchase",
|
||||
"SETTINGS::MISC:PHPMYADMIN:URL" => "phpmyadmin-url",
|
||||
"SETTINGS::SYSTEM:PTERODACTYL:URL" => "pterodactyl-url",
|
||||
'SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT' => "per-page-limit",
|
||||
"SETTINGS::SYSTEM:PTERODACTYL:TOKEN" => "pterodactyl-api-key",
|
||||
"SETTINGS::SYSTEM:ENABLE_LOGIN_LOGO" => "enable-login-logo",
|
||||
"SETTINGS::SYSTEM:PTERODACTYL:ADMIN_USER_TOKEN" => "pterodactyl-admin-api-key",
|
||||
"SETTINGS::SYSTEM:ENABLE_UPGRADE" => "enable-upgrade",
|
||||
"SETTINGS::SYSTEM:CREATION_OF_NEW_SERVERS" => "enable-disable-servers",
|
||||
"SETTINGS::SYSTEM:CREATION_OF_NEW_USERS" => "enable-disable-new-users",
|
||||
"SETTINGS::SYSTEM:SHOW_IMPRINT" => "show-imprint",
|
||||
"SETTINGS::SYSTEM:SHOW_PRIVACY" => "show-privacy",
|
||||
"SETTINGS::SYSTEM:SHOW_TOS" => "show-tos",
|
||||
'SETTINGS::SYSTEM:REGISTER_IP_CHECK' => 'register-ip-check',
|
||||
'SETTINGS::SYSTEM:SERVER_CREATE_CHARGE_FIRST_HOUR' => 'server-create-charge-first-hour',
|
||||
'SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME' => 'credits-display-name',
|
||||
'SETTINGS::SERVER:ALLOCATION_LIMIT' => 'allocation-limit',
|
||||
'SETTINGS::USER:FORCE_DISCORD_VERIFICATION' => 'force-discord-verification',
|
||||
'SETTINGS::USER:FORCE_EMAIL_VERIFICATION' => 'force-email-verification',
|
||||
'SETTINGS::USER:INITIAL_CREDITS' => 'initial-credits',
|
||||
'SETTINGS::USER:INITIAL_SERVER_LIMIT' => 'initial-server-limit',
|
||||
'SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD' => 'credits-reward-amount-discord',
|
||||
'SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL' => 'credits-reward-amount-email',
|
||||
'SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD' => 'server-limit-discord',
|
||||
'SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL' => 'server-limit-email',
|
||||
'SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE' => 'server-limit-purchase',
|
||||
'SETTINGS::MISC:PHPMYADMIN:URL' => 'phpmyadmin-url',
|
||||
'SETTINGS::SYSTEM:PTERODACTYL:URL' => 'pterodactyl-url',
|
||||
'SETTINGS::SYSTEM:PTERODACTYL:PER_PAGE_LIMIT' => 'per-page-limit',
|
||||
'SETTINGS::SYSTEM:PTERODACTYL:TOKEN' => 'pterodactyl-api-key',
|
||||
'SETTINGS::SYSTEM:ENABLE_LOGIN_LOGO' => 'enable-login-logo',
|
||||
'SETTINGS::SYSTEM:PTERODACTYL:ADMIN_USER_TOKEN' => 'pterodactyl-admin-api-key',
|
||||
'SETTINGS::SYSTEM:ENABLE_UPGRADE' => 'enable-upgrade',
|
||||
'SETTINGS::SYSTEM:CREATION_OF_NEW_SERVERS' => 'enable-disable-servers',
|
||||
'SETTINGS::SYSTEM:CREATION_OF_NEW_USERS' => 'enable-disable-new-users',
|
||||
'SETTINGS::SYSTEM:SHOW_IMPRINT' => 'show-imprint',
|
||||
'SETTINGS::SYSTEM:SHOW_PRIVACY' => 'show-privacy',
|
||||
'SETTINGS::SYSTEM:SHOW_TOS' => 'show-tos',
|
||||
];
|
||||
|
||||
|
||||
foreach ($values as $key => $value) {
|
||||
$param = $request->get($value);
|
||||
|
||||
Settings::where('key', $key)->updateOrCreate(['key' => $key], ['value' => $param]);
|
||||
Cache::forget("setting" . ':' . $key);
|
||||
Cache::forget('setting'.':'.$key);
|
||||
}
|
||||
return redirect(route('admin.settings.index') . '#system')->with('success', __('System settings updated!'));
|
||||
}
|
||||
|
||||
return redirect(route('admin.settings.index').'#system')->with('success', __('System settings updated!'));
|
||||
}
|
||||
|
||||
private function updateIcons(Request $request)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ class ChargeCreditsCommand extends Command
|
|||
*/
|
||||
protected $description = 'Charge all users with active servers';
|
||||
|
||||
|
||||
/**
|
||||
* A list of users that have to be notified
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $usersToNotify = [];
|
||||
|
|
@ -56,24 +56,23 @@ class ChargeCreditsCommand extends Command
|
|||
/** @var User $user */
|
||||
$user = $server->user;
|
||||
|
||||
#charge credits / suspend server
|
||||
//charge credits / suspend server
|
||||
if ($user->credits >= $product->getHourlyPrice()) {
|
||||
$this->line("<fg=blue>{$user->name}</> Current credits: <fg=green>{$user->credits}</> Credits to be removed: <fg=red>{$product->getHourlyPrice()}</>");
|
||||
$user->decrement('credits', $product->getHourlyPrice());
|
||||
} else {
|
||||
try {
|
||||
#suspend server
|
||||
//suspend server
|
||||
$this->line("<fg=yellow>{$server->name}</> from user: <fg=blue>{$user->name}</> has been <fg=red>suspended!</>");
|
||||
$server->suspend();
|
||||
|
||||
#add user to notify list
|
||||
if (!in_array($user, $this->usersToNotify)) {
|
||||
//add user to notify list
|
||||
if (! in_array($user, $this->usersToNotify)) {
|
||||
array_push($this->usersToNotify, $user);
|
||||
}
|
||||
} catch (\Exception $exception) {
|
||||
$this->error($exception->getMessage());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -86,7 +85,7 @@ class ChargeCreditsCommand extends Command
|
|||
*/
|
||||
public function notifyUsers()
|
||||
{
|
||||
if (!empty($this->usersToNotify)) {
|
||||
if (! empty($this->usersToNotify)) {
|
||||
/** @var User $user */
|
||||
foreach ($this->usersToNotify as $user) {
|
||||
$this->line("<fg=yellow>Notified user:</> <fg=blue>{$user->name}</>");
|
||||
|
|
@ -94,8 +93,9 @@ class ChargeCreditsCommand extends Command
|
|||
}
|
||||
}
|
||||
|
||||
#reset array
|
||||
$this->usersToNotify = array();
|
||||
//reset array
|
||||
$this->usersToNotify = [];
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ class ImportUsersFromPteroCommand extends Command
|
|||
* @var string
|
||||
*/
|
||||
private $importFileName = 'users.json';
|
||||
|
||||
/**
|
||||
* The name and signature of the console command.
|
||||
*
|
||||
|
|
@ -39,25 +40,28 @@ class ImportUsersFromPteroCommand extends Command
|
|||
/**
|
||||
* Execute the console command.
|
||||
*
|
||||
* @return boolean
|
||||
* @return bool
|
||||
*/
|
||||
public function handle()
|
||||
{
|
||||
|
||||
//check if json file exists
|
||||
if (!Storage::disk('local')->exists('users.json')) {
|
||||
$this->error('[ERROR] ' . storage_path('app') . '/' . $this->importFileName . ' is missing');
|
||||
if (! Storage::disk('local')->exists('users.json')) {
|
||||
$this->error('[ERROR] '.storage_path('app').'/'.$this->importFileName.' is missing');
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
//check if json file is valid
|
||||
$json = json_decode(Storage::disk('local')->get('users.json'));
|
||||
if (!array_key_exists(2, $json)) {
|
||||
if (! array_key_exists(2, $json)) {
|
||||
$this->error('[ERROR] Invalid json file');
|
||||
|
||||
return false;
|
||||
}
|
||||
if (!$json[2]->data) {
|
||||
if (! $json[2]->data) {
|
||||
$this->error('[ERROR] Invalid json file / No users found!');
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -69,12 +73,14 @@ class ImportUsersFromPteroCommand extends Command
|
|||
//cancel
|
||||
if ($confirm !== 'y') {
|
||||
$this->error('[ERROR] Stopped import script!');
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
//import users
|
||||
$this->deleteCurrentUserBase();
|
||||
$this->importUsingJsonFile($json, $initial_credits, $initial_server_limit);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -84,7 +90,9 @@ class ImportUsersFromPteroCommand extends Command
|
|||
private function deleteCurrentUserBase()
|
||||
{
|
||||
$currentUserCount = User::count();
|
||||
if ($currentUserCount == 0) return;
|
||||
if ($currentUserCount == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
$this->line("Deleting ({$currentUserCount}) users..");
|
||||
foreach (User::all() as $user) {
|
||||
|
|
@ -104,20 +112,20 @@ class ImportUsersFromPteroCommand extends Command
|
|||
$role = $user->root_admin == '0' ? 'member' : 'admin';
|
||||
|
||||
User::create([
|
||||
"pterodactyl_id" => $user->id,
|
||||
"name" => $user->name_first,
|
||||
"email" => $user->email,
|
||||
"password" => $user->password,
|
||||
"role" => $role,
|
||||
"credits" => $initial_credits,
|
||||
"server_limit" => $initial_server_limit,
|
||||
"created_at" => $user->created_at,
|
||||
"updated_at" => $user->updated_at,
|
||||
'pterodactyl_id' => $user->id,
|
||||
'name' => $user->name_first,
|
||||
'email' => $user->email,
|
||||
'password' => $user->password,
|
||||
'role' => $role,
|
||||
'credits' => $initial_credits,
|
||||
'server_limit' => $initial_server_limit,
|
||||
'created_at' => $user->created_at,
|
||||
'updated_at' => $user->updated_at,
|
||||
]);
|
||||
});
|
||||
|
||||
$this->newLine();
|
||||
$this->line("Done importing, you can now login using your pterodactyl credentials.");
|
||||
$this->line('Done importing, you can now login using your pterodactyl credentials.');
|
||||
$this->newLine();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ use App\Models\User;
|
|||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
||||
class MakeUserCommand extends Command
|
||||
{
|
||||
|
|
@ -59,6 +58,7 @@ class MakeUserCommand extends Command
|
|||
|
||||
if ($validator->fails()) {
|
||||
$this->error($validator->errors()->first());
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -66,9 +66,16 @@ class MakeUserCommand extends Command
|
|||
$response = $this->pterodactyl->getUser($ptero_id);
|
||||
|
||||
if (isset($response['errors'])) {
|
||||
if (isset($response['errors'][0]['code'])) $this->error("code: {$response['errors'][0]['code']}");
|
||||
if (isset($response['errors'][0]['status'])) $this->error("status: {$response['errors'][0]['status']}");
|
||||
if (isset($response['errors'][0]['detail'])) $this->error("detail: {$response['errors'][0]['detail']}");
|
||||
if (isset($response['errors'][0]['code'])) {
|
||||
$this->error("code: {$response['errors'][0]['code']}");
|
||||
}
|
||||
if (isset($response['errors'][0]['status'])) {
|
||||
$this->error("status: {$response['errors'][0]['status']}");
|
||||
}
|
||||
if (isset($response['errors'][0]['detail'])) {
|
||||
$this->error("detail: {$response['errors'][0]['detail']}");
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -77,7 +84,7 @@ class MakeUserCommand extends Command
|
|||
'email' => $response['email'],
|
||||
'role' => 'admin',
|
||||
'password' => Hash::make($password),
|
||||
'pterodactyl_id' => $response['id']
|
||||
'pterodactyl_id' => $response['id'],
|
||||
]);
|
||||
|
||||
$this->table(['Field', 'Value'], [
|
||||
|
|
|
|||
|
|
@ -36,12 +36,13 @@ class notify extends Command
|
|||
/**
|
||||
* Execute the console command.
|
||||
*
|
||||
* @param int $id
|
||||
* @param int $id
|
||||
* @return int
|
||||
*/
|
||||
public function handle()
|
||||
{
|
||||
User::findOrFail($this->argument('id'))->notify(new ServerCreationError(Server::all()[0]));
|
||||
|
||||
return 'message send';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use Illuminate\Console\Command;
|
||||
use Closure;
|
||||
use Symfony\Component\Process\Process;
|
||||
use Illuminate\Console\Command;
|
||||
use Symfony\Component\Console\Helper\ProgressBar;
|
||||
use Symfony\Component\Process\Process;
|
||||
|
||||
class update extends Command
|
||||
{
|
||||
|
|
@ -45,7 +45,7 @@ class update extends Command
|
|||
$this->output->warning('This command does just pull the newest changes from the github repo. Verify the github repo before running this');
|
||||
|
||||
if (version_compare(PHP_VERSION, '8.0.0') < 0) {
|
||||
$this->error('Cannot execute self-upgrade process. The minimum required PHP version required is 8.0.0, you have [' . PHP_VERSION . '].');
|
||||
$this->error('Cannot execute self-upgrade process. The minimum required PHP version required is 8.0.0, you have ['.PHP_VERSION.'].');
|
||||
}
|
||||
|
||||
$user = 'www-data';
|
||||
|
|
@ -55,7 +55,7 @@ class update extends Command
|
|||
$userDetails = posix_getpwuid(fileowner('public'));
|
||||
$user = $userDetails['name'] ?? 'www-data';
|
||||
|
||||
if (!$this->confirm("Your webserver user has been detected as [{$user}]: is this correct?", true)) {
|
||||
if (! $this->confirm("Your webserver user has been detected as [{$user}]: is this correct?", true)) {
|
||||
$user = $this->anticipate(
|
||||
'Please enter the name of the user running your webserver process. This varies from system to system, but is generally "www-data", "nginx", or "apache".',
|
||||
[
|
||||
|
|
@ -71,7 +71,7 @@ class update extends Command
|
|||
$groupDetails = posix_getgrgid(filegroup('public'));
|
||||
$group = $groupDetails['name'] ?? 'www-data';
|
||||
|
||||
if (!$this->confirm("Your webserver group has been detected as [{$group}]: is this correct?", true)) {
|
||||
if (! $this->confirm("Your webserver group has been detected as [{$group}]: is this correct?", true)) {
|
||||
$group = $this->anticipate(
|
||||
'Please enter the name of the group running your webserver process. Normally this is the same as your user.',
|
||||
[
|
||||
|
|
@ -85,24 +85,21 @@ class update extends Command
|
|||
|
||||
ini_set('output_buffering', 0);
|
||||
|
||||
if (!$this->confirm('Are you sure you want to run the upgrade process for your Dashboard?')) {
|
||||
if (! $this->confirm('Are you sure you want to run the upgrade process for your Dashboard?')) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
$bar = $this->output->createProgressBar(9);
|
||||
$bar->start();
|
||||
|
||||
|
||||
$this->withProgress($bar, function () {
|
||||
$this->line("\$upgrader> git pull");
|
||||
$process = Process::fromShellCommandline("git pull");
|
||||
$this->line('$upgrader> git pull');
|
||||
$process = Process::fromShellCommandline('git pull');
|
||||
$process->run(function ($type, $buffer) {
|
||||
$this->{$type === Process::ERR ? 'error' : 'line'}($buffer);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
$this->withProgress($bar, function () {
|
||||
$this->line('$upgrader> php artisan down');
|
||||
$this->call('down');
|
||||
|
|
@ -118,12 +115,12 @@ class update extends Command
|
|||
|
||||
$this->withProgress($bar, function () {
|
||||
$command = ['composer', 'install', '--no-ansi'];
|
||||
if (config('app.env') === 'production' && !config('app.debug')) {
|
||||
if (config('app.env') === 'production' && ! config('app.debug')) {
|
||||
$command[] = '--optimize-autoloader';
|
||||
$command[] = '--no-dev';
|
||||
}
|
||||
|
||||
$this->line('$upgrader> ' . implode(' ', $command));
|
||||
$this->line('$upgrader> '.implode(' ', $command));
|
||||
$process = new Process($command);
|
||||
$process->setTimeout(10 * 60);
|
||||
$process->run(function ($type, $buffer) {
|
||||
|
|
@ -162,10 +159,9 @@ class update extends Command
|
|||
|
||||
$this->newLine();
|
||||
$this->info('Finished running upgrade.');
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
protected function withProgress(ProgressBar $bar, Closure $callback)
|
||||
{
|
||||
$bar->clear();
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class Kernel extends ConsoleKernel
|
|||
/**
|
||||
* Define the application's command schedule.
|
||||
*
|
||||
* @param \Illuminate\Console\Scheduling\Schedule $schedule
|
||||
* @param \Illuminate\Console\Scheduling\Schedule $schedule
|
||||
* @return void
|
||||
*/
|
||||
protected function schedule(Schedule $schedule)
|
||||
|
|
@ -29,7 +29,7 @@ class Kernel extends ConsoleKernel
|
|||
|
||||
//log cronjob activity
|
||||
$schedule->call(function () {
|
||||
Storage::disk('logs')->put('cron.log' , "Last activity from cronjobs - " . now());
|
||||
Storage::disk('logs')->put('cron.log', 'Last activity from cronjobs - '.now());
|
||||
})->everyMinute();
|
||||
}
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ class Kernel extends ConsoleKernel
|
|||
*/
|
||||
protected function commands()
|
||||
{
|
||||
$this->load(__DIR__ . '/Commands');
|
||||
$this->load(__DIR__.'/Commands');
|
||||
|
||||
require base_path('routes/console.php');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,11 +3,7 @@
|
|||
namespace App\Events;
|
||||
|
||||
use App\Models\User;
|
||||
use Illuminate\Broadcasting\Channel;
|
||||
use Illuminate\Broadcasting\InteractsWithSockets;
|
||||
use Illuminate\Broadcasting\PresenceChannel;
|
||||
use Illuminate\Broadcasting\PrivateChannel;
|
||||
use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
|
||||
use Illuminate\Foundation\Events\Dispatchable;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
|
|
@ -23,7 +19,7 @@ class UserUpdateCreditsEvent
|
|||
/**
|
||||
* Create a new event instance.
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
*/
|
||||
public function __construct(User $user)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -24,17 +24,16 @@ class ActivityLogController extends Controller
|
|||
$cronLogs = Storage::disk('logs')->exists('cron.log') ? Storage::disk('logs')->get('cron.log') : null;
|
||||
|
||||
if ($request->input('search')) {
|
||||
$query = Activity::whereHasMorph('causer' , [User::class] , function($query) use ($request) {
|
||||
$query->where('name', 'like' , "%{$request->input('search')}%");
|
||||
})->orderBy('created_at' , 'desc')->paginate(20);
|
||||
$query = Activity::whereHasMorph('causer', [User::class], function ($query) use ($request) {
|
||||
$query->where('name', 'like', "%{$request->input('search')}%");
|
||||
})->orderBy('created_at', 'desc')->paginate(20);
|
||||
} else {
|
||||
$query = Activity::orderBy('created_at' , 'desc')->paginate(20);
|
||||
$query = Activity::orderBy('created_at', 'desc')->paginate(20);
|
||||
}
|
||||
|
||||
|
||||
return view('admin.activitylogs.index')->with([
|
||||
'logs' => $query,
|
||||
'cronlogs' => $cronLogs
|
||||
'cronlogs' => $cronLogs,
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -51,7 +50,7 @@ class ActivityLogController extends Controller
|
|||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
|
|
@ -84,7 +83,7 @@ class ActivityLogController extends Controller
|
|||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @return Response
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ use Illuminate\Http\JsonResponse;
|
|||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class ApplicationApiController extends Controller
|
||||
{
|
||||
|
|
@ -39,17 +38,17 @@ class ApplicationApiController extends Controller
|
|||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'memo' => 'nullable|string|max:60'
|
||||
'memo' => 'nullable|string|max:60',
|
||||
]);
|
||||
|
||||
ApplicationApi::create([
|
||||
'memo' => $request->input('memo')
|
||||
'memo' => $request->input('memo'),
|
||||
]);
|
||||
|
||||
return redirect()->route('admin.api.index')->with('success', __('api key created!'));
|
||||
|
|
@ -58,7 +57,7 @@ class ApplicationApiController extends Controller
|
|||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param ApplicationApi $applicationApi
|
||||
* @param ApplicationApi $applicationApi
|
||||
* @return Response
|
||||
*/
|
||||
public function show(ApplicationApi $applicationApi)
|
||||
|
|
@ -69,27 +68,27 @@ class ApplicationApiController extends Controller
|
|||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param ApplicationApi $applicationApi
|
||||
* @param ApplicationApi $applicationApi
|
||||
* @return Application|Factory|View|Response
|
||||
*/
|
||||
public function edit(ApplicationApi $applicationApi)
|
||||
{
|
||||
return view('admin.api.edit' , [
|
||||
'applicationApi' => $applicationApi
|
||||
return view('admin.api.edit', [
|
||||
'applicationApi' => $applicationApi,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param ApplicationApi $applicationApi
|
||||
* @param Request $request
|
||||
* @param ApplicationApi $applicationApi
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(Request $request, ApplicationApi $applicationApi)
|
||||
{
|
||||
$request->validate([
|
||||
'memo' => 'nullable|string|max:60'
|
||||
'memo' => 'nullable|string|max:60',
|
||||
]);
|
||||
|
||||
$applicationApi->update($request->all());
|
||||
|
|
@ -100,18 +99,20 @@ class ApplicationApiController extends Controller
|
|||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param ApplicationApi $applicationApi
|
||||
* @param ApplicationApi $applicationApi
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function destroy(ApplicationApi $applicationApi)
|
||||
{
|
||||
$applicationApi->delete();
|
||||
|
||||
return redirect()->back()->with('success', __('api key has been removed!'));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return JsonResponse|mixed
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function dataTable(Request $request)
|
||||
|
|
@ -121,21 +122,21 @@ class ApplicationApiController extends Controller
|
|||
return datatables($query)
|
||||
->addColumn('actions', function (ApplicationApi $apiKey) {
|
||||
return '
|
||||
<a data-content="'.__("Edit").'" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.api.edit', $apiKey->token) . '" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.api.destroy', $apiKey->token) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("DELETE") . '
|
||||
<button data-content="'.__("Delete").'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
<a data-content="'.__('Edit').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.api.edit', $apiKey->token).'" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="'.route('admin.api.destroy', $apiKey->token).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('DELETE').'
|
||||
<button data-content="'.__('Delete').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
</form>
|
||||
';
|
||||
})
|
||||
->editColumn('token' , function (ApplicationApi $apiKey) {
|
||||
->editColumn('token', function (ApplicationApi $apiKey) {
|
||||
return "<code>{$apiKey->token}</code>";
|
||||
})
|
||||
->editColumn('last_used' , function (ApplicationApi $apiKey) {
|
||||
->editColumn('last_used', function (ApplicationApi $apiKey) {
|
||||
return $apiKey->last_used ? $apiKey->last_used->diffForHumans() : '';
|
||||
})
|
||||
->rawColumns(['actions' , 'token'])
|
||||
->rawColumns(['actions', 'token'])
|
||||
->make();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,15 +10,14 @@ use ZipArchive;
|
|||
|
||||
class InvoiceController extends Controller
|
||||
{
|
||||
|
||||
public function downloadAllInvoices()
|
||||
{
|
||||
$zip = new ZipArchive;
|
||||
$zip_safe_path = storage_path('invoices.zip');
|
||||
$res = $zip->open($zip_safe_path, ZipArchive::CREATE | ZipArchive::OVERWRITE);
|
||||
$result = $this::rglob(storage_path('app/invoice/*'));
|
||||
if ($res === TRUE) {
|
||||
$zip->addFromString("1. Info.txt", __("Created at") . " " . now()->format("d.m.Y"));
|
||||
if ($res === true) {
|
||||
$zip->addFromString('1. Info.txt', __('Created at').' '.now()->format('d.m.Y'));
|
||||
foreach ($result as $file) {
|
||||
if (file_exists($file) && is_file($file)) {
|
||||
$zip->addFile($file, basename($file));
|
||||
|
|
@ -26,6 +25,7 @@ class InvoiceController extends Controller
|
|||
}
|
||||
$zip->close();
|
||||
}
|
||||
|
||||
return response()->download($zip_safe_path);
|
||||
}
|
||||
|
||||
|
|
@ -37,9 +37,10 @@ class InvoiceController extends Controller
|
|||
public function rglob($pattern, $flags = 0)
|
||||
{
|
||||
$files = glob($pattern, $flags);
|
||||
foreach (glob(dirname($pattern) . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
|
||||
$files = array_merge($files, $this::rglob($dir . '/' . basename($pattern), $flags));
|
||||
foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
|
||||
$files = array_merge($files, $this::rglob($dir.'/'.basename($pattern), $flags));
|
||||
}
|
||||
|
||||
return $files;
|
||||
}
|
||||
|
||||
|
|
@ -53,16 +54,15 @@ class InvoiceController extends Controller
|
|||
try {
|
||||
$query = Invoice::where('payment_id', '=', $id)->firstOrFail();
|
||||
} catch (Throwable $e) {
|
||||
return redirect()->back()->with("error", __("Error!"));
|
||||
return redirect()->back()->with('error', __('Error!'));
|
||||
}
|
||||
|
||||
$invoice_path = storage_path('app/invoice/' . $query->invoice_user . '/' . $query->created_at->format("Y") . '/' . $query->invoice_name . '.pdf');
|
||||
$invoice_path = storage_path('app/invoice/'.$query->invoice_user.'/'.$query->created_at->format('Y').'/'.$query->invoice_name.'.pdf');
|
||||
|
||||
if (!file_exists($invoice_path)) {
|
||||
return redirect()->back()->with("error", __("Invoice does not exist on filesystem!"));
|
||||
if (! file_exists($invoice_path)) {
|
||||
return redirect()->back()->with('error', __('Invoice does not exist on filesystem!'));
|
||||
}
|
||||
|
||||
|
||||
return response()->download($invoice_path);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,18 +2,17 @@
|
|||
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Classes\Pterodactyl;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Egg;
|
||||
use App\Models\Location;
|
||||
use App\Models\Nest;
|
||||
use App\Models\Node;
|
||||
use App\Models\Payment;
|
||||
use App\Models\Server;
|
||||
use App\Models\User;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use App\Classes\Pterodactyl;
|
||||
use App\Models\Product;
|
||||
use App\Models\Server;
|
||||
use App\Models\Ticket;
|
||||
use App\Models\User;
|
||||
use Carbon\Carbon;
|
||||
|
||||
class OverViewController extends Controller
|
||||
|
|
@ -26,7 +25,7 @@ class OverViewController extends Controller
|
|||
$counters = collect();
|
||||
//Set basic variables in the collection
|
||||
$counters->put('users', User::query()->count());
|
||||
$counters->put('credits', number_format(User::query()->where("role","!=","admin")->sum('credits'), 2, '.', ''));
|
||||
$counters->put('credits', number_format(User::query()->where('role', '!=', 'admin')->sum('credits'), 2, '.', ''));
|
||||
$counters->put('payments', Payment::query()->count());
|
||||
$counters->put('eggs', Egg::query()->count());
|
||||
$counters->put('nests', Nest::query()->count());
|
||||
|
|
@ -53,7 +52,6 @@ class OverViewController extends Controller
|
|||
$counters['payments']['lastMonth']->timeStart = Carbon::today()->startOfMonth()->subMonth()->toDateString();
|
||||
$counters['payments']['lastMonth']->timeEnd = Carbon::today()->endOfMonth()->subMonth()->toDateString();
|
||||
|
||||
|
||||
//Prepare subCollection 'taxPayments'
|
||||
$counters->put('taxPayments', collect());
|
||||
//Get and save taxPayments from last 2 years for later filtering and looping
|
||||
|
|
@ -65,33 +63,33 @@ class OverViewController extends Controller
|
|||
$counters['taxPayments']['thisYear']->timeEnd = Carbon::today()->toDateString();
|
||||
$counters['taxPayments']['lastYear']->timeStart = Carbon::today()->startOfYear()->subYear()->toDateString();
|
||||
$counters['taxPayments']['lastYear']->timeEnd = Carbon::today()->endOfYear()->subYear()->toDateString();
|
||||
|
||||
|
||||
//Fill out variables for each currency separately
|
||||
foreach($payments->where('created_at', '>=', Carbon::today()->startOfMonth()) as $payment){
|
||||
foreach ($payments->where('created_at', '>=', Carbon::today()->startOfMonth()) as $payment) {
|
||||
$paymentCurrency = $payment->currency_code;
|
||||
if(!isset($counters['payments']['thisMonth'][$paymentCurrency])){
|
||||
if (! isset($counters['payments']['thisMonth'][$paymentCurrency])) {
|
||||
$counters['payments']['thisMonth']->put($paymentCurrency, collect());
|
||||
$counters['payments']['thisMonth'][$paymentCurrency]->total = 0;
|
||||
$counters['payments']['thisMonth'][$paymentCurrency]->count = 0;
|
||||
}
|
||||
$counters['payments']['thisMonth'][$paymentCurrency]->total += $payment->total_price;
|
||||
$counters['payments']['thisMonth'][$paymentCurrency]->count ++;
|
||||
$counters['payments']['thisMonth'][$paymentCurrency]->count++;
|
||||
}
|
||||
foreach($payments->where('created_at', '<', Carbon::today()->startOfMonth()) as $payment){
|
||||
foreach ($payments->where('created_at', '<', Carbon::today()->startOfMonth()) as $payment) {
|
||||
$paymentCurrency = $payment->currency_code;
|
||||
if(!isset($counters['payments']['lastMonth'][$paymentCurrency])){
|
||||
if (! isset($counters['payments']['lastMonth'][$paymentCurrency])) {
|
||||
$counters['payments']['lastMonth']->put($paymentCurrency, collect());
|
||||
$counters['payments']['lastMonth'][$paymentCurrency]->total = 0;
|
||||
$counters['payments']['lastMonth'][$paymentCurrency]->count = 0;
|
||||
}
|
||||
$counters['payments']['lastMonth'][$paymentCurrency]->total += $payment->total_price;
|
||||
$counters['payments']['lastMonth'][$paymentCurrency]->count ++;
|
||||
$counters['payments']['lastMonth'][$paymentCurrency]->count++;
|
||||
}
|
||||
$counters['payments']->total = Payment::query()->count();
|
||||
|
||||
foreach($taxPayments->where('created_at', '>=', Carbon::today()->startOfYear()->subYear()) as $taxPayment){
|
||||
foreach ($taxPayments->where('created_at', '>=', Carbon::today()->startOfYear()->subYear()) as $taxPayment) {
|
||||
$paymentCurrency = $payment->currency_code;
|
||||
if(!isset($counters['taxPayments']['thisYear'][$paymentCurrency])){
|
||||
if (! isset($counters['taxPayments']['thisYear'][$paymentCurrency])) {
|
||||
$counters['taxPayments']['thisYear']->put($paymentCurrency, collect());
|
||||
$counters['taxPayments']['thisYear'][$paymentCurrency]->total = 0;
|
||||
$counters['taxPayments']['thisYear'][$paymentCurrency]->count = 0;
|
||||
|
|
@ -99,13 +97,13 @@ class OverViewController extends Controller
|
|||
$counters['taxPayments']['thisYear'][$paymentCurrency]->taxes = 0;
|
||||
}
|
||||
$counters['taxPayments']['thisYear'][$paymentCurrency]->total += $taxPayment->total_price;
|
||||
$counters['taxPayments']['thisYear'][$paymentCurrency]->count ++;
|
||||
$counters['taxPayments']['thisYear'][$paymentCurrency]->count++;
|
||||
$counters['taxPayments']['thisYear'][$paymentCurrency]->price += $taxPayment->price;
|
||||
$counters['taxPayments']['thisYear'][$paymentCurrency]->taxes += $taxPayment->tax_value;
|
||||
}
|
||||
foreach($taxPayments->where('created_at', '<', Carbon::today()->startOfYear()) as $taxPayment){
|
||||
foreach ($taxPayments->where('created_at', '<', Carbon::today()->startOfYear()) as $taxPayment) {
|
||||
$paymentCurrency = $payment->currency_code;
|
||||
if(!isset($counters['taxPayments']['lastYear'][$paymentCurrency])){
|
||||
if (! isset($counters['taxPayments']['lastYear'][$paymentCurrency])) {
|
||||
$counters['taxPayments']['lastYear']->put($paymentCurrency, collect());
|
||||
$counters['taxPayments']['lastYear'][$paymentCurrency]->total = 0;
|
||||
$counters['taxPayments']['lastYear'][$paymentCurrency]->count = 0;
|
||||
|
|
@ -113,29 +111,29 @@ class OverViewController extends Controller
|
|||
$counters['taxPayments']['lastYear'][$paymentCurrency]->taxes = 0;
|
||||
}
|
||||
$counters['taxPayments']['lastYear'][$paymentCurrency]->total += $taxPayment->total_price;
|
||||
$counters['taxPayments']['lastYear'][$paymentCurrency]->count ++;
|
||||
$counters['taxPayments']['lastYear'][$paymentCurrency]->count++;
|
||||
$counters['taxPayments']['lastYear'][$paymentCurrency]->price += $taxPayment->price;
|
||||
$counters['taxPayments']['lastYear'][$paymentCurrency]->taxes += $taxPayment->tax_value;
|
||||
}
|
||||
|
||||
$lastEgg = Egg::query()->latest('updated_at')->first();
|
||||
$syncLastUpdate = $lastEgg ? $lastEgg->updated_at->isoFormat('LLL') : __('unknown');
|
||||
|
||||
|
||||
|
||||
//Get node information and prepare collection
|
||||
$pteroNodeIds = [];
|
||||
foreach(Pterodactyl::getNodes() as $pteroNode){
|
||||
foreach (Pterodactyl::getNodes() as $pteroNode) {
|
||||
array_push($pteroNodeIds, $pteroNode['attributes']['id']);
|
||||
}
|
||||
$nodes = collect();
|
||||
foreach($DBnodes = Node::query()->get() as $DBnode){ //gets all node information and prepares the structure
|
||||
foreach ($DBnodes = Node::query()->get() as $DBnode) { //gets all node information and prepares the structure
|
||||
$nodeId = $DBnode['id'];
|
||||
if(!in_array($nodeId, $pteroNodeIds)) continue; //Check if node exists on pterodactyl too, if not, skip
|
||||
if (! in_array($nodeId, $pteroNodeIds)) {
|
||||
continue;
|
||||
} //Check if node exists on pterodactyl too, if not, skip
|
||||
$nodes->put($nodeId, collect());
|
||||
$nodes[$nodeId]->name = $DBnode['name'];
|
||||
$pteroNode = Pterodactyl::getNode($nodeId);
|
||||
$nodes[$nodeId]->usagePercent = round(max($pteroNode['allocated_resources']['memory']/($pteroNode['memory']*($pteroNode['memory_overallocate']+100)/100), $pteroNode['allocated_resources']['disk']/($pteroNode['disk']*($pteroNode['disk_overallocate']+100)/100))*100, 2);
|
||||
$nodes[$nodeId]->usagePercent = round(max($pteroNode['allocated_resources']['memory'] / ($pteroNode['memory'] * ($pteroNode['memory_overallocate'] + 100) / 100), $pteroNode['allocated_resources']['disk'] / ($pteroNode['disk'] * ($pteroNode['disk_overallocate'] + 100) / 100)) * 100, 2);
|
||||
$counters['totalUsagePercent'] += $nodes[$nodeId]->usagePercent;
|
||||
|
||||
$nodes[$nodeId]->totalServers = 0;
|
||||
|
|
@ -143,31 +141,29 @@ class OverViewController extends Controller
|
|||
$nodes[$nodeId]->totalEarnings = 0;
|
||||
$nodes[$nodeId]->activeEarnings = 0;
|
||||
}
|
||||
$counters['totalUsagePercent'] = ($DBnodes->count())?round($counters['totalUsagePercent']/$DBnodes->count(), 2):0;
|
||||
$counters['totalUsagePercent'] = ($DBnodes->count()) ? round($counters['totalUsagePercent'] / $DBnodes->count(), 2) : 0;
|
||||
|
||||
foreach(Pterodactyl::getServers() as $server){ //gets all servers from Pterodactyl and calculates total of credit usage for each node separately + total
|
||||
foreach (Pterodactyl::getServers() as $server) { //gets all servers from Pterodactyl and calculates total of credit usage for each node separately + total
|
||||
$nodeId = $server['attributes']['node'];
|
||||
|
||||
if($CPServer = Server::query()->where('pterodactyl_id', $server['attributes']['id'])->first()){
|
||||
|
||||
if ($CPServer = Server::query()->where('pterodactyl_id', $server['attributes']['id'])->first()) {
|
||||
$price = Product::query()->where('id', $CPServer->product_id)->first()->price;
|
||||
if (!$CPServer->suspended){
|
||||
if (! $CPServer->suspended) {
|
||||
$counters['earnings']->active += $price;
|
||||
$counters['servers']->active ++;
|
||||
$counters['servers']->active++;
|
||||
$nodes[$nodeId]->activeEarnings += $price;
|
||||
$nodes[$nodeId]->activeServers ++;
|
||||
$nodes[$nodeId]->activeServers++;
|
||||
}
|
||||
$counters['earnings']->total += $price;
|
||||
$counters['servers']->total ++;
|
||||
$counters['servers']->total++;
|
||||
$nodes[$nodeId]->totalEarnings += $price;
|
||||
$nodes[$nodeId]->totalServers ++;
|
||||
$nodes[$nodeId]->totalServers++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
//Get latest tickets
|
||||
$tickets = collect();
|
||||
foreach(Ticket::query()->latest()->take(5)->get() as $ticket){
|
||||
foreach (Ticket::query()->latest()->take(5)->get() as $ticket) {
|
||||
$tickets->put($ticket->ticket_id, collect());
|
||||
$tickets[$ticket->ticket_id]->title = $ticket->title;
|
||||
$user = User::query()->where('id', $ticket->user_id)->first();
|
||||
|
|
@ -192,14 +188,14 @@ class OverViewController extends Controller
|
|||
}
|
||||
|
||||
return view('admin.overview.index', [
|
||||
'counters' => $counters,
|
||||
'nodes' => $nodes,
|
||||
'counters' => $counters,
|
||||
'nodes' => $nodes,
|
||||
'syncLastUpdate' => $syncLastUpdate,
|
||||
'deletedNodesPresent'=> ($DBnodes->count() != count($pteroNodeIds))?true:false,
|
||||
'perPageLimit' => ($counters['servers']->total != Server::query()->count())?true:false,
|
||||
'tickets' => $tickets
|
||||
'deletedNodesPresent' => ($DBnodes->count() != count($pteroNodeIds)) ? true : false,
|
||||
'perPageLimit' => ($counters['servers']->total != Server::query()->count()) ? true : false,
|
||||
'tickets' => $tickets,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @description Sync locations,nodes,nests,eggs with the linked pterodactyl panel
|
||||
|
|
|
|||
|
|
@ -4,14 +4,13 @@ namespace App\Http\Controllers\Admin;
|
|||
|
||||
use App\Events\UserUpdateCreditsEvent;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\InvoiceSettings;
|
||||
use App\Models\PartnerDiscount;
|
||||
use App\Models\Payment;
|
||||
use App\Models\ShopProduct;
|
||||
use App\Models\Settings;
|
||||
use App\Models\ShopProduct;
|
||||
use App\Models\User;
|
||||
use App\Notifications\InvoiceNotification;
|
||||
use App\Notifications\ConfirmPaymentNotification;
|
||||
use App\Notifications\InvoiceNotification;
|
||||
use Exception;
|
||||
use Illuminate\Contracts\Foundation\Application;
|
||||
use Illuminate\Contracts\View\Factory;
|
||||
|
|
@ -36,41 +35,39 @@ use PayPalHttp\HttpException;
|
|||
use Stripe\Stripe;
|
||||
use Symfony\Component\Intl\Currencies;
|
||||
|
||||
|
||||
class PaymentController extends Controller
|
||||
{
|
||||
|
||||
/**
|
||||
* @return Application|Factory|View
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
return view('admin.payments.index')->with([
|
||||
'payments' => Payment::paginate(15)
|
||||
'payments' => Payment::paginate(15),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param ShopProduct $shopProduct
|
||||
* @param Request $request
|
||||
* @param ShopProduct $shopProduct
|
||||
* @return Application|Factory|View
|
||||
*/
|
||||
public function checkOut(Request $request, ShopProduct $shopProduct)
|
||||
{
|
||||
return view('store.checkout')->with([
|
||||
'product' => $shopProduct,
|
||||
'discountpercent' => PartnerDiscount::getDiscount(),
|
||||
'discountvalue' => PartnerDiscount::getDiscount() * $shopProduct->price/100,
|
||||
'discountedprice' => $shopProduct->getPriceAfterDiscount(),
|
||||
'taxvalue' => $shopProduct->getTaxValue(),
|
||||
'taxpercent' => $shopProduct->getTaxPercent(),
|
||||
'total' => $shopProduct->getTotalPrice()
|
||||
'product' => $shopProduct,
|
||||
'discountpercent' => PartnerDiscount::getDiscount(),
|
||||
'discountvalue' => PartnerDiscount::getDiscount() * $shopProduct->price / 100,
|
||||
'discountedprice' => $shopProduct->getPriceAfterDiscount(),
|
||||
'taxvalue' => $shopProduct->getTaxValue(),
|
||||
'taxpercent' => $shopProduct->getTaxPercent(),
|
||||
'total' => $shopProduct->getTotalPrice(),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param ShopProduct $shopProduct
|
||||
* @param Request $request
|
||||
* @param ShopProduct $shopProduct
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function PaypalPay(Request $request, ShopProduct $shopProduct)
|
||||
|
|
@ -78,43 +75,40 @@ class PaymentController extends Controller
|
|||
$request = new OrdersCreateRequest();
|
||||
$request->prefer('return=representation');
|
||||
$request->body = [
|
||||
"intent" => "CAPTURE",
|
||||
"purchase_units" => [
|
||||
'intent' => 'CAPTURE',
|
||||
'purchase_units' => [
|
||||
[
|
||||
"reference_id" => uniqid(),
|
||||
"description" => $shopProduct->display . (PartnerDiscount::getDiscount()?(" (" . __('Discount') . " " . PartnerDiscount::getDiscount() . '%)'):""),
|
||||
"amount" => [
|
||||
"value" => $shopProduct->getTotalPrice(),
|
||||
'reference_id' => uniqid(),
|
||||
'description' => $shopProduct->display.(PartnerDiscount::getDiscount() ? (' ('.__('Discount').' '.PartnerDiscount::getDiscount().'%)') : ''),
|
||||
'amount' => [
|
||||
'value' => $shopProduct->getTotalPrice(),
|
||||
'currency_code' => strtoupper($shopProduct->currency_code),
|
||||
'breakdown' => [
|
||||
'item_total' =>
|
||||
[
|
||||
'item_total' => [
|
||||
'currency_code' => strtoupper($shopProduct->currency_code),
|
||||
'value' => $shopProduct->getPriceAfterDiscount(),
|
||||
],
|
||||
'tax_total' =>
|
||||
[
|
||||
'tax_total' => [
|
||||
'currency_code' => strtoupper($shopProduct->currency_code),
|
||||
'value' => $shopProduct->getTaxValue(),
|
||||
]
|
||||
]
|
||||
]
|
||||
]
|
||||
],
|
||||
],
|
||||
],
|
||||
],
|
||||
],
|
||||
'application_context' => [
|
||||
'cancel_url' => route('payment.Cancel'),
|
||||
'return_url' => route('payment.PaypalSuccess', ['product' => $shopProduct->id]),
|
||||
'brand_name' => config('app.name', 'Laravel'),
|
||||
'shipping_preference' => 'NO_SHIPPING',
|
||||
],
|
||||
"application_context" => [
|
||||
"cancel_url" => route('payment.Cancel'),
|
||||
"return_url" => route('payment.PaypalSuccess', ['product' => $shopProduct->id]),
|
||||
'brand_name' => config('app.name', 'Laravel'),
|
||||
'shipping_preference' => 'NO_SHIPPING'
|
||||
]
|
||||
|
||||
|
||||
];
|
||||
|
||||
|
||||
try {
|
||||
// Call API with your client and get a response for your call
|
||||
$response = $this->getPayPalClient()->execute($request);
|
||||
|
||||
return redirect()->away($response->result->links[1]->href);
|
||||
|
||||
// If call returns body in response, you can get the deserialized version from the result attribute of the response
|
||||
|
|
@ -141,7 +135,7 @@ class PaymentController extends Controller
|
|||
*/
|
||||
protected function getPaypalClientId()
|
||||
{
|
||||
return env('APP_ENV') == 'local' ? config("SETTINGS::PAYMENTS:PAYPAL:SANDBOX_CLIENT_ID") : config("SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID");
|
||||
return env('APP_ENV') == 'local' ? config('SETTINGS::PAYMENTS:PAYPAL:SANDBOX_CLIENT_ID') : config('SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -149,11 +143,11 @@ class PaymentController extends Controller
|
|||
*/
|
||||
protected function getPaypalClientSecret()
|
||||
{
|
||||
return env('APP_ENV') == 'local' ? config("SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET") : config("SETTINGS::PAYMENTS:PAYPAL:SECRET");
|
||||
return env('APP_ENV') == 'local' ? config('SETTINGS::PAYMENTS:PAYPAL:SANDBOX_SECRET') : config('SETTINGS::PAYMENTS:PAYPAL:SECRET');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $laravelRequest
|
||||
* @param Request $laravelRequest
|
||||
*/
|
||||
public function PaypalSuccess(Request $laravelRequest)
|
||||
{
|
||||
|
|
@ -178,26 +172,25 @@ class PaymentController extends Controller
|
|||
}
|
||||
|
||||
//update User with bought item
|
||||
if ($shopProduct->type=="Credits") {
|
||||
if ($shopProduct->type == 'Credits') {
|
||||
$user->increment('credits', $shopProduct->quantity);
|
||||
}elseif ($shopProduct->type=="Server slots"){
|
||||
} elseif ($shopProduct->type == 'Server slots') {
|
||||
$user->increment('server_limit', $shopProduct->quantity);
|
||||
}
|
||||
|
||||
//give referral commission always
|
||||
if((config("SETTINGS::REFERRAL:MODE") == "commission" || config("SETTINGS::REFERRAL:MODE") == "both") && $shopProduct->type=="Credits" && config("SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION") == "true"){
|
||||
if($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', $user->id)->first()){
|
||||
if ((config('SETTINGS::REFERRAL:MODE') == 'commission' || config('SETTINGS::REFERRAL:MODE') == 'both') && $shopProduct->type == 'Credits' && config('SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION') == 'true') {
|
||||
if ($ref_user = DB::table('user_referrals')->where('registered_user_id', '=', $user->id)->first()) {
|
||||
$ref_user = User::findOrFail($ref_user->referral_id);
|
||||
$increment = number_format($shopProduct->quantity*(PartnerDiscount::getCommission($ref_user->id))/100,0,"","");
|
||||
$increment = number_format($shopProduct->quantity * (PartnerDiscount::getCommission($ref_user->id)) / 100, 0, '', '');
|
||||
$ref_user->increment('credits', $increment);
|
||||
|
||||
//LOGS REFERRALS IN THE ACTIVITY LOG
|
||||
activity()
|
||||
->performedOn($user)
|
||||
->causedBy($ref_user)
|
||||
->log('gained '. $increment.' '.config("SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME").' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
|
||||
->log('gained '.$increment.' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//update role give Referral-reward
|
||||
|
|
@ -205,21 +198,19 @@ class PaymentController extends Controller
|
|||
$user->update(['role' => 'client']);
|
||||
|
||||
//give referral commission only on first purchase
|
||||
if((config("SETTINGS::REFERRAL:MODE") == "commission" || config("SETTINGS::REFERRAL:MODE") == "both") && $shopProduct->type=="Credits" && config("SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION") == "false"){
|
||||
if($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', $user->id)->first()){
|
||||
if ((config('SETTINGS::REFERRAL:MODE') == 'commission' || config('SETTINGS::REFERRAL:MODE') == 'both') && $shopProduct->type == 'Credits' && config('SETTINGS::REFERRAL::ALWAYS_GIVE_COMMISSION') == 'false') {
|
||||
if ($ref_user = DB::table('user_referrals')->where('registered_user_id', '=', $user->id)->first()) {
|
||||
$ref_user = User::findOrFail($ref_user->referral_id);
|
||||
$increment = number_format($shopProduct->quantity*(PartnerDiscount::getCommission($ref_user->id))/100,0,"","");
|
||||
$increment = number_format($shopProduct->quantity * (PartnerDiscount::getCommission($ref_user->id)) / 100, 0, '', '');
|
||||
$ref_user->increment('credits', $increment);
|
||||
|
||||
//LOGS REFERRALS IN THE ACTIVITY LOG
|
||||
activity()
|
||||
->performedOn($user)
|
||||
->causedBy($ref_user)
|
||||
->log('gained '. $increment.' '.config("SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME").' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
|
||||
->log('gained '.$increment.' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//store payment
|
||||
|
|
@ -230,7 +221,7 @@ class PaymentController extends Controller
|
|||
'type' => $shopProduct->type,
|
||||
'status' => 'paid',
|
||||
'amount' => $shopProduct->quantity,
|
||||
'price' => $shopProduct->price - ($shopProduct->price*PartnerDiscount::getDiscount()/100),
|
||||
'price' => $shopProduct->price - ($shopProduct->price * PartnerDiscount::getDiscount() / 100),
|
||||
'tax_value' => $shopProduct->getTaxValue(),
|
||||
'tax_percent' => $shopProduct->getTaxPercent(),
|
||||
'total_price' => $shopProduct->getTotalPrice(),
|
||||
|
|
@ -238,7 +229,6 @@ class PaymentController extends Controller
|
|||
'shop_item_product_id' => $shopProduct->id,
|
||||
]);
|
||||
|
||||
|
||||
event(new UserUpdateCreditsEvent($user));
|
||||
|
||||
//only create invoice if SETTINGS::INVOICE:ENABLED is true
|
||||
|
|
@ -246,12 +236,10 @@ class PaymentController extends Controller
|
|||
$this->createInvoice($user, $payment, 'paid', $shopProduct->currency_code);
|
||||
}
|
||||
|
||||
|
||||
//redirect back to home
|
||||
return redirect()->route('home')->with('success', __('Your credit balance has been increased!'));
|
||||
}
|
||||
|
||||
|
||||
// If call returns body in response, you can get the deserialized version from the result attribute of the response
|
||||
if (env('APP_ENV') == 'local') {
|
||||
dd($response);
|
||||
|
|
@ -268,9 +256,8 @@ class PaymentController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
*/
|
||||
public function Cancel(Request $request)
|
||||
{
|
||||
|
|
@ -278,22 +265,21 @@ class PaymentController extends Controller
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param ShopProduct $shopProduct
|
||||
* @param Request $request
|
||||
* @param ShopProduct $shopProduct
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function StripePay(Request $request, ShopProduct $shopProduct)
|
||||
{
|
||||
$stripeClient = $this->getStripeClient();
|
||||
|
||||
|
||||
$request = $stripeClient->checkout->sessions->create([
|
||||
'line_items' => [
|
||||
[
|
||||
'price_data' => [
|
||||
'currency' => $shopProduct->currency_code,
|
||||
'product_data' => [
|
||||
'name' => $shopProduct->display . (PartnerDiscount::getDiscount()?(" (" . __('Discount') . " " . PartnerDiscount::getDiscount() . '%)'):""),
|
||||
'name' => $shopProduct->display.(PartnerDiscount::getDiscount() ? (' ('.__('Discount').' '.PartnerDiscount::getDiscount().'%)') : ''),
|
||||
'description' => $shopProduct->description,
|
||||
],
|
||||
'unit_amount_decimal' => round($shopProduct->getPriceAfterDiscount() * 100, 2),
|
||||
|
|
@ -305,27 +291,25 @@ class PaymentController extends Controller
|
|||
'currency' => $shopProduct->currency_code,
|
||||
'product_data' => [
|
||||
'name' => __('Tax'),
|
||||
'description' => $shopProduct->getTaxPercent() . "%",
|
||||
'description' => $shopProduct->getTaxPercent().'%',
|
||||
],
|
||||
'unit_amount_decimal' => round($shopProduct->getTaxValue(), 2) * 100,
|
||||
],
|
||||
'quantity' => 1,
|
||||
]
|
||||
],
|
||||
],
|
||||
|
||||
'mode' => 'payment',
|
||||
"payment_method_types" => str_getcsv(config("SETTINGS::PAYMENTS:STRIPE:METHODS")),
|
||||
'success_url' => route('payment.StripeSuccess', ['product' => $shopProduct->id]) . '&session_id={CHECKOUT_SESSION_ID}',
|
||||
'payment_method_types' => str_getcsv(config('SETTINGS::PAYMENTS:STRIPE:METHODS')),
|
||||
'success_url' => route('payment.StripeSuccess', ['product' => $shopProduct->id]).'&session_id={CHECKOUT_SESSION_ID}',
|
||||
'cancel_url' => route('payment.Cancel'),
|
||||
]);
|
||||
|
||||
|
||||
|
||||
return redirect($request->url, 303);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
*/
|
||||
public function StripeSuccess(Request $request)
|
||||
{
|
||||
|
|
@ -346,9 +330,7 @@ class PaymentController extends Controller
|
|||
$paymentDbEntry = Payment::where('payment_id', $paymentSession->payment_intent)->count();
|
||||
|
||||
// check if payment is 100% completed and payment does not exist in db already
|
||||
if ($paymentSession->status == "complete" && $paymentIntent->status == "succeeded" && $paymentDbEntry == 0) {
|
||||
|
||||
|
||||
if ($paymentSession->status == 'complete' && $paymentIntent->status == 'succeeded' && $paymentDbEntry == 0) {
|
||||
|
||||
//update server limit
|
||||
if (config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) {
|
||||
|
|
@ -358,9 +340,9 @@ class PaymentController extends Controller
|
|||
}
|
||||
|
||||
//update User with bought item
|
||||
if ($shopProduct->type=="Credits") {
|
||||
if ($shopProduct->type == 'Credits') {
|
||||
$user->increment('credits', $shopProduct->quantity);
|
||||
}elseif ($shopProduct->type=="Server slots"){
|
||||
} elseif ($shopProduct->type == 'Server slots') {
|
||||
$user->increment('server_limit', $shopProduct->quantity);
|
||||
}
|
||||
|
||||
|
|
@ -368,21 +350,19 @@ class PaymentController extends Controller
|
|||
if ($user->role == 'member') {
|
||||
$user->update(['role' => 'client']);
|
||||
|
||||
if((config("SETTINGS::REFERRAL:MODE") == "commission" || config("SETTINGS::REFERRAL:MODE") == "both") && $shopProduct->type=="Credits"){
|
||||
if($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', $user->id)->first()){
|
||||
if ((config('SETTINGS::REFERRAL:MODE') == 'commission' || config('SETTINGS::REFERRAL:MODE') == 'both') && $shopProduct->type == 'Credits') {
|
||||
if ($ref_user = DB::table('user_referrals')->where('registered_user_id', '=', $user->id)->first()) {
|
||||
$ref_user = User::findOrFail($ref_user->referral_id);
|
||||
$increment = number_format($shopProduct->quantity/100*config("SETTINGS::REFERRAL:PERCENTAGE"),0,"","");
|
||||
$increment = number_format($shopProduct->quantity / 100 * config('SETTINGS::REFERRAL:PERCENTAGE'), 0, '', '');
|
||||
$ref_user->increment('credits', $increment);
|
||||
|
||||
//LOGS REFERRALS IN THE ACTIVITY LOG
|
||||
activity()
|
||||
->performedOn($user)
|
||||
->causedBy($ref_user)
|
||||
->log('gained '. $increment.' '.config("SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME").' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
|
||||
->log('gained '.$increment.' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//store paid payment
|
||||
|
|
@ -393,7 +373,7 @@ class PaymentController extends Controller
|
|||
'type' => $shopProduct->type,
|
||||
'status' => 'paid',
|
||||
'amount' => $shopProduct->quantity,
|
||||
'price' => $shopProduct->price - ($shopProduct->price*PartnerDiscount::getDiscount()/100),
|
||||
'price' => $shopProduct->price - ($shopProduct->price * PartnerDiscount::getDiscount() / 100),
|
||||
'tax_value' => $shopProduct->getTaxValue(),
|
||||
'total_price' => $shopProduct->getTotalPrice(),
|
||||
'tax_percent' => $shopProduct->getTaxPercent(),
|
||||
|
|
@ -414,7 +394,7 @@ class PaymentController extends Controller
|
|||
//redirect back to home
|
||||
return redirect()->route('home')->with('success', __('Your credit balance has been increased!'));
|
||||
} else {
|
||||
if ($paymentIntent->status == "processing") {
|
||||
if ($paymentIntent->status == 'processing') {
|
||||
|
||||
//store processing payment
|
||||
$payment = Payment::create([
|
||||
|
|
@ -440,7 +420,7 @@ class PaymentController extends Controller
|
|||
//redirect back to home
|
||||
return redirect()->route('home')->with('success', __('Your payment is being processed!'));
|
||||
}
|
||||
if ($paymentDbEntry == 0 && $paymentIntent->status != "processing") {
|
||||
if ($paymentDbEntry == 0 && $paymentIntent->status != 'processing') {
|
||||
$stripeClient->paymentIntents->cancel($paymentIntent->id);
|
||||
|
||||
//redirect back to home
|
||||
|
|
@ -460,7 +440,7 @@ class PaymentController extends Controller
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
*/
|
||||
protected function handleStripePaymentSuccessHook($paymentIntent)
|
||||
{
|
||||
|
|
@ -471,7 +451,6 @@ class PaymentController extends Controller
|
|||
|
||||
if ($paymentIntent->status == 'succeeded' && $payment->status == 'processing') {
|
||||
|
||||
|
||||
//update server limit
|
||||
if (config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE') !== 0) {
|
||||
if ($user->server_limit < config('SETTINGS::USER:SERVER_LIMIT_AFTER_IRL_PURCHASE')) {
|
||||
|
|
@ -479,9 +458,9 @@ class PaymentController extends Controller
|
|||
}
|
||||
}
|
||||
//update User with bought item
|
||||
if ($shopProduct->type=="Credits") {
|
||||
if ($shopProduct->type == 'Credits') {
|
||||
$user->increment('credits', $shopProduct->quantity);
|
||||
}elseif ($shopProduct->type=="Server slots"){
|
||||
} elseif ($shopProduct->type == 'Server slots') {
|
||||
$user->increment('server_limit', $shopProduct->quantity);
|
||||
}
|
||||
|
||||
|
|
@ -489,21 +468,19 @@ class PaymentController extends Controller
|
|||
if ($user->role == 'member') {
|
||||
$user->update(['role' => 'client']);
|
||||
|
||||
if((config("SETTINGS::REFERRAL:MODE") == "commission" || config("SETTINGS::REFERRAL:MODE") == "both")&& $shopProduct->type=="Credits"){
|
||||
if($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', $user->id)->first()){
|
||||
if ((config('SETTINGS::REFERRAL:MODE') == 'commission' || config('SETTINGS::REFERRAL:MODE') == 'both') && $shopProduct->type == 'Credits') {
|
||||
if ($ref_user = DB::table('user_referrals')->where('registered_user_id', '=', $user->id)->first()) {
|
||||
$ref_user = User::findOrFail($ref_user->referral_id);
|
||||
$increment = number_format($shopProduct->quantity/100*config("SETTINGS::REFERRAL:PERCENTAGE"),0,"","");
|
||||
$increment = number_format($shopProduct->quantity / 100 * config('SETTINGS::REFERRAL:PERCENTAGE'), 0, '', '');
|
||||
$ref_user->increment('credits', $increment);
|
||||
|
||||
//LOGS REFERRALS IN THE ACTIVITY LOG
|
||||
activity()
|
||||
->performedOn($user)
|
||||
->causedBy($ref_user)
|
||||
->log('gained '. $increment.' '.config("SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME").' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
|
||||
->log('gained '.$increment.' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').' for commission-referral of '.$user->name.' (ID:'.$user->id.')');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//update payment db entry status
|
||||
|
|
@ -524,7 +501,7 @@ class PaymentController extends Controller
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
*/
|
||||
public function StripeWebhooks(Request $request)
|
||||
{
|
||||
|
|
@ -556,7 +533,7 @@ class PaymentController extends Controller
|
|||
$this->handleStripePaymentSuccessHook($paymentIntent);
|
||||
break;
|
||||
default:
|
||||
echo 'Received unknown event type ' . $event->type;
|
||||
echo 'Received unknown event type '.$event->type;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -574,8 +551,8 @@ class PaymentController extends Controller
|
|||
protected function getStripeSecret()
|
||||
{
|
||||
return env('APP_ENV') == 'local'
|
||||
? config("SETTINGS::PAYMENTS:STRIPE:TEST_SECRET")
|
||||
: config("SETTINGS::PAYMENTS:STRIPE:SECRET");
|
||||
? config('SETTINGS::PAYMENTS:STRIPE:TEST_SECRET')
|
||||
: config('SETTINGS::PAYMENTS:STRIPE:SECRET');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -584,31 +561,29 @@ class PaymentController extends Controller
|
|||
protected function getStripeEndpointSecret()
|
||||
{
|
||||
return env('APP_ENV') == 'local'
|
||||
? config("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET")
|
||||
: config("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET");
|
||||
? config('SETTINGS::PAYMENTS:STRIPE:ENDPOINT_TEST_SECRET')
|
||||
: config('SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET');
|
||||
}
|
||||
|
||||
|
||||
protected function createInvoice($user, $payment, $paymentStatus, $currencyCode)
|
||||
{
|
||||
$shopProduct = ShopProduct::where('id', $payment->shop_item_product_id)->first();
|
||||
//create invoice
|
||||
$lastInvoiceID = \App\Models\Invoice::where("invoice_name", "like", "%" . now()->format('mY') . "%")->count("id");
|
||||
$lastInvoiceID = \App\Models\Invoice::where('invoice_name', 'like', '%'.now()->format('mY').'%')->count('id');
|
||||
$newInvoiceID = $lastInvoiceID + 1;
|
||||
$logoPath = storage_path('app/public/logo.png');
|
||||
|
||||
$seller = new Party([
|
||||
'name' => config("SETTINGS::INVOICE:COMPANY_NAME"),
|
||||
'phone' => config("SETTINGS::INVOICE:COMPANY_PHONE"),
|
||||
'address' => config("SETTINGS::INVOICE:COMPANY_ADDRESS"),
|
||||
'vat' => config("SETTINGS::INVOICE:COMPANY_VAT"),
|
||||
'name' => config('SETTINGS::INVOICE:COMPANY_NAME'),
|
||||
'phone' => config('SETTINGS::INVOICE:COMPANY_PHONE'),
|
||||
'address' => config('SETTINGS::INVOICE:COMPANY_ADDRESS'),
|
||||
'vat' => config('SETTINGS::INVOICE:COMPANY_VAT'),
|
||||
'custom_fields' => [
|
||||
'E-Mail' => config("SETTINGS::INVOICE:COMPANY_MAIL"),
|
||||
"Web" => config("SETTINGS::INVOICE:COMPANY_WEBSITE")
|
||||
'E-Mail' => config('SETTINGS::INVOICE:COMPANY_MAIL'),
|
||||
'Web' => config('SETTINGS::INVOICE:COMPANY_WEBSITE'),
|
||||
],
|
||||
]);
|
||||
|
||||
|
||||
$customer = new Buyer([
|
||||
'name' => $user->name,
|
||||
'custom_fields' => [
|
||||
|
|
@ -621,14 +596,13 @@ class PaymentController extends Controller
|
|||
->pricePerUnit($shopProduct->price);
|
||||
|
||||
$notes = [
|
||||
__("Payment method") . ": " . $payment->payment_method,
|
||||
__('Payment method').': '.$payment->payment_method,
|
||||
];
|
||||
$notes = implode("<br>", $notes);
|
||||
|
||||
$notes = implode('<br>', $notes);
|
||||
|
||||
$invoice = Invoice::make()
|
||||
->template('controlpanel')
|
||||
->name(__("Invoice"))
|
||||
->name(__('Invoice'))
|
||||
->buyer($customer)
|
||||
->seller($seller)
|
||||
->discountByPercent(PartnerDiscount::getDiscount())
|
||||
|
|
@ -637,9 +611,9 @@ class PaymentController extends Controller
|
|||
->addItem($item)
|
||||
->status(__($paymentStatus))
|
||||
->series(now()->format('mY'))
|
||||
->delimiter("-")
|
||||
->delimiter('-')
|
||||
->sequence($newInvoiceID)
|
||||
->serialNumberFormat(config("SETTINGS::INVOICE:PREFIX") . '{DELIMITER}{SERIES}{SEQUENCE}')
|
||||
->serialNumberFormat(config('SETTINGS::INVOICE:PREFIX').'{DELIMITER}{SERIES}{SEQUENCE}')
|
||||
->currencyCode($currencyCode)
|
||||
->currencySymbol(Currencies::getSymbol($currencyCode))
|
||||
->notes($notes);
|
||||
|
|
@ -649,10 +623,9 @@ class PaymentController extends Controller
|
|||
}
|
||||
|
||||
//Save the invoice in "storage\app\invoice\USER_ID\YEAR"
|
||||
$invoice->filename = $invoice->getSerialNumber() . '.pdf';
|
||||
$invoice->filename = $invoice->getSerialNumber().'.pdf';
|
||||
$invoice->render();
|
||||
Storage::disk("local")->put("invoice/" . $user->id . "/" . now()->format('Y') . "/" . $invoice->filename, $invoice->output);
|
||||
|
||||
Storage::disk('local')->put('invoice/'.$user->id.'/'.now()->format('Y').'/'.$invoice->filename, $invoice->output);
|
||||
|
||||
\App\Models\Invoice::create([
|
||||
'invoice_user' => $user->id,
|
||||
|
|
@ -666,6 +639,7 @@ class PaymentController extends Controller
|
|||
|
||||
/**
|
||||
* @return JsonResponse|mixed
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function dataTable()
|
||||
|
|
@ -674,8 +648,8 @@ class PaymentController extends Controller
|
|||
|
||||
return datatables($query)
|
||||
->editColumn('user', function (Payment $payment) {
|
||||
return
|
||||
($payment->user)?'<a href="'.route('admin.users.show', $payment->user->id).'">'.$payment->user->name.'</a>':__('Unknown user');
|
||||
return
|
||||
($payment->user) ? '<a href="'.route('admin.users.show', $payment->user->id).'">'.$payment->user->name.'</a>' : __('Unknown user');
|
||||
})
|
||||
->editColumn('price', function (Payment $payment) {
|
||||
return $payment->formatToCurrency($payment->price);
|
||||
|
|
@ -684,7 +658,7 @@ class PaymentController extends Controller
|
|||
return $payment->formatToCurrency($payment->tax_value);
|
||||
})
|
||||
->editColumn('tax_percent', function (Payment $payment) {
|
||||
return $payment->tax_percent . ' %';
|
||||
return $payment->tax_percent.' %';
|
||||
})
|
||||
->editColumn('total_price', function (Payment $payment) {
|
||||
return $payment->formatToCurrency($payment->total_price);
|
||||
|
|
@ -694,9 +668,9 @@ class PaymentController extends Controller
|
|||
return $payment->created_at ? $payment->created_at->diffForHumans() : '';
|
||||
})
|
||||
->addColumn('actions', function (Payment $payment) {
|
||||
return '<a data-content="' . __("Download") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.invoices.downloadSingleInvoice', "id=" . $payment->payment_id) . '" class="btn btn-sm text-white btn-info mr-1"><i class="fas fa-file-download"></i></a>';
|
||||
return '<a data-content="'.__('Download').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.invoices.downloadSingleInvoice', 'id='.$payment->payment_id).'" class="btn btn-sm text-white btn-info mr-1"><i class="fas fa-file-download"></i></a>';
|
||||
})
|
||||
->rawColumns(['actions', 'user'])
|
||||
->make(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ use App\Http\Controllers\Controller;
|
|||
use App\Models\Location;
|
||||
use App\Models\Nest;
|
||||
use App\Models\Product;
|
||||
use App\Models\Settings;
|
||||
use Exception;
|
||||
use Illuminate\Contracts\Foundation\Application;
|
||||
use Illuminate\Contracts\View\Factory;
|
||||
|
|
@ -52,33 +51,33 @@ class ProductController extends Controller
|
|||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
"name" => "required|max:30",
|
||||
"price" => "required|numeric|max:1000000|min:0",
|
||||
"memory" => "required|numeric|max:1000000|min:5",
|
||||
"cpu" => "required|numeric|max:1000000|min:0",
|
||||
"swap" => "required|numeric|max:1000000|min:0",
|
||||
"description" => "required|string|max:191",
|
||||
"disk" => "required|numeric|max:1000000|min:5",
|
||||
"minimum_credits" => "required|numeric|max:1000000|min:-1",
|
||||
"io" => "required|numeric|max:1000000|min:0",
|
||||
"databases" => "required|numeric|max:1000000|min:0",
|
||||
"backups" => "required|numeric|max:1000000|min:0",
|
||||
"allocations" => "required|numeric|max:1000000|min:0",
|
||||
"nodes.*" => "required|exists:nodes,id",
|
||||
"eggs.*" => "required|exists:eggs,id",
|
||||
"disabled" => "nullable",
|
||||
'name' => 'required|max:30',
|
||||
'price' => 'required|numeric|max:1000000|min:0',
|
||||
'memory' => 'required|numeric|max:1000000|min:5',
|
||||
'cpu' => 'required|numeric|max:1000000|min:0',
|
||||
'swap' => 'required|numeric|max:1000000|min:0',
|
||||
'description' => 'required|string|max:191',
|
||||
'disk' => 'required|numeric|max:1000000|min:5',
|
||||
'minimum_credits' => 'required|numeric|max:1000000|min:-1',
|
||||
'io' => 'required|numeric|max:1000000|min:0',
|
||||
'databases' => 'required|numeric|max:1000000|min:0',
|
||||
'backups' => 'required|numeric|max:1000000|min:0',
|
||||
'allocations' => 'required|numeric|max:1000000|min:0',
|
||||
'nodes.*' => 'required|exists:nodes,id',
|
||||
'eggs.*' => 'required|exists:eggs,id',
|
||||
'disabled' => 'nullable',
|
||||
]);
|
||||
|
||||
$disabled = !is_null($request->input('disabled'));
|
||||
$disabled = ! is_null($request->input('disabled'));
|
||||
$product = Product::create(array_merge($request->all(), ['disabled' => $disabled]));
|
||||
|
||||
#link nodes and eggs
|
||||
//link nodes and eggs
|
||||
$product->eggs()->attach($request->input('eggs'));
|
||||
$product->nodes()->attach($request->input('nodes'));
|
||||
|
||||
|
|
@ -88,21 +87,21 @@ class ProductController extends Controller
|
|||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param Product $product
|
||||
* @param Product $product
|
||||
* @return Application|Factory|View
|
||||
*/
|
||||
public function show(Product $product)
|
||||
{
|
||||
return view('admin.products.show', [
|
||||
'product' => $product,
|
||||
'minimum_credits' => config("SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER"),
|
||||
'minimum_credits' => config('SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER'),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param Product $product
|
||||
* @param Product $product
|
||||
* @return Application|Factory|View
|
||||
*/
|
||||
public function edit(Product $product)
|
||||
|
|
@ -117,34 +116,34 @@ class ProductController extends Controller
|
|||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Product $product
|
||||
* @param Request $request
|
||||
* @param Product $product
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(Request $request, Product $product): RedirectResponse
|
||||
{
|
||||
$request->validate([
|
||||
"name" => "required|max:30",
|
||||
"price" => "required|numeric|max:1000000|min:0",
|
||||
"memory" => "required|numeric|max:1000000|min:5",
|
||||
"cpu" => "required|numeric|max:1000000|min:0",
|
||||
"swap" => "required|numeric|max:1000000|min:0",
|
||||
"description" => "required|string|max:191",
|
||||
"disk" => "required|numeric|max:1000000|min:5",
|
||||
"io" => "required|numeric|max:1000000|min:0",
|
||||
"minimum_credits" => "required|numeric|max:1000000|min:-1",
|
||||
"databases" => "required|numeric|max:1000000|min:0",
|
||||
"backups" => "required|numeric|max:1000000|min:0",
|
||||
"allocations" => "required|numeric|max:1000000|min:0",
|
||||
"nodes.*" => "required|exists:nodes,id",
|
||||
"eggs.*" => "required|exists:eggs,id",
|
||||
"disabled" => "nullable",
|
||||
'name' => 'required|max:30',
|
||||
'price' => 'required|numeric|max:1000000|min:0',
|
||||
'memory' => 'required|numeric|max:1000000|min:5',
|
||||
'cpu' => 'required|numeric|max:1000000|min:0',
|
||||
'swap' => 'required|numeric|max:1000000|min:0',
|
||||
'description' => 'required|string|max:191',
|
||||
'disk' => 'required|numeric|max:1000000|min:5',
|
||||
'io' => 'required|numeric|max:1000000|min:0',
|
||||
'minimum_credits' => 'required|numeric|max:1000000|min:-1',
|
||||
'databases' => 'required|numeric|max:1000000|min:0',
|
||||
'backups' => 'required|numeric|max:1000000|min:0',
|
||||
'allocations' => 'required|numeric|max:1000000|min:0',
|
||||
'nodes.*' => 'required|exists:nodes,id',
|
||||
'eggs.*' => 'required|exists:eggs,id',
|
||||
'disabled' => 'nullable',
|
||||
]);
|
||||
|
||||
$disabled = !is_null($request->input('disabled'));
|
||||
$disabled = ! is_null($request->input('disabled'));
|
||||
$product->update(array_merge($request->all(), ['disabled' => $disabled]));
|
||||
|
||||
#link nodes and eggs
|
||||
//link nodes and eggs
|
||||
$product->eggs()->detach();
|
||||
$product->nodes()->detach();
|
||||
$product->eggs()->attach($request->input('eggs'));
|
||||
|
|
@ -154,13 +153,13 @@ class ProductController extends Controller
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Product $product
|
||||
* @param Request $request
|
||||
* @param Product $product
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function disable(Request $request, Product $product)
|
||||
{
|
||||
$product->update(['disabled' => !$product->disabled]);
|
||||
$product->update(['disabled' => ! $product->disabled]);
|
||||
|
||||
return redirect()->route('admin.products.index')->with('success', 'Product has been updated!');
|
||||
}
|
||||
|
|
@ -168,7 +167,7 @@ class ProductController extends Controller
|
|||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Product $product
|
||||
* @param Product $product
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function destroy(Product $product)
|
||||
|
|
@ -179,12 +178,13 @@ class ProductController extends Controller
|
|||
}
|
||||
|
||||
$product->delete();
|
||||
|
||||
return redirect()->back()->with('success', __('Product has been removed!'));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return JsonResponse|mixed
|
||||
*
|
||||
* @throws Exception|Exception
|
||||
*/
|
||||
public function dataTable()
|
||||
|
|
@ -194,14 +194,14 @@ class ProductController extends Controller
|
|||
return datatables($query)
|
||||
->addColumn('actions', function (Product $product) {
|
||||
return '
|
||||
<a data-content="' . __("Show") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.products.show', $product->id) . '" class="btn btn-sm text-white btn-warning mr-1"><i class="fas fa-eye"></i></a>
|
||||
<a data-content="' . __("Clone") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.products.clone', $product->id) . '" class="btn btn-sm text-white btn-primary mr-1"><i class="fas fa-clone"></i></a>
|
||||
<a data-content="' . __("Edit") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.products.edit', $product->id) . '" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
<a data-content="'.__('Show').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.products.show', $product->id).'" class="btn btn-sm text-white btn-warning mr-1"><i class="fas fa-eye"></i></a>
|
||||
<a data-content="'.__('Clone').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.products.clone', $product->id).'" class="btn btn-sm text-white btn-primary mr-1"><i class="fas fa-clone"></i></a>
|
||||
<a data-content="'.__('Edit').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.products.edit', $product->id).'" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.products.destroy', $product->id) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("DELETE") . '
|
||||
<button data-content="' . __("Delete") . '" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="'.route('admin.products.destroy', $product->id).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('DELETE').'
|
||||
<button data-content="'.__('Delete').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
</form>
|
||||
';
|
||||
})
|
||||
|
|
@ -216,14 +216,15 @@ class ProductController extends Controller
|
|||
return $product->eggs()->count();
|
||||
})
|
||||
->addColumn('disabled', function (Product $product) {
|
||||
$checked = $product->disabled == false ? "checked" : "";
|
||||
$checked = $product->disabled == false ? 'checked' : '';
|
||||
|
||||
return '
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.products.disable', $product->id) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("PATCH") . '
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="'.route('admin.products.disable', $product->id).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('PATCH').'
|
||||
<div class="custom-control custom-switch">
|
||||
<input ' . $checked . ' name="disabled" onchange="this.form.submit()" type="checkbox" class="custom-control-input" id="switch' . $product->id . '">
|
||||
<label class="custom-control-label" for="switch' . $product->id . '"></label>
|
||||
<input '.$checked.' name="disabled" onchange="this.form.submit()" type="checkbox" class="custom-control-input" id="switch'.$product->id.'">
|
||||
<label class="custom-control-label" for="switch'.$product->id.'"></label>
|
||||
</div>
|
||||
</form>
|
||||
';
|
||||
|
|
|
|||
|
|
@ -3,10 +3,8 @@
|
|||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Classes\Pterodactyl;
|
||||
use App\Classes\PterodactylWrapper;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Server;
|
||||
use App\Models\Settings;
|
||||
use Exception;
|
||||
use Illuminate\Contracts\Foundation\Application;
|
||||
use Illuminate\Contracts\View\Factory;
|
||||
|
|
@ -41,7 +39,7 @@ class ServerController extends Controller
|
|||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
|
|
@ -52,7 +50,7 @@ class ServerController extends Controller
|
|||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param Server $server
|
||||
* @param Server $server
|
||||
* @return Response
|
||||
*/
|
||||
public function show(Server $server)
|
||||
|
|
@ -63,28 +61,27 @@ class ServerController extends Controller
|
|||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param Server $server
|
||||
* @param Server $server
|
||||
* @return Response
|
||||
*/
|
||||
|
||||
public function edit(Server $server)
|
||||
{
|
||||
return view('admin.servers.edit')->with([
|
||||
'server' => $server
|
||||
'server' => $server,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Server $server
|
||||
* @param Request $request
|
||||
* @param Server $server
|
||||
* @return Response
|
||||
*/
|
||||
public function update(Request $request, Server $server)
|
||||
{
|
||||
$request->validate([
|
||||
"identifier" => "required|string",
|
||||
'identifier' => 'required|string',
|
||||
]);
|
||||
|
||||
$server->update($request->all());
|
||||
|
|
@ -95,27 +92,28 @@ class ServerController extends Controller
|
|||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Server $server
|
||||
* @param Server $server
|
||||
* @return RedirectResponse|Response
|
||||
*/
|
||||
public function destroy(Server $server)
|
||||
{
|
||||
try {
|
||||
$server->delete();
|
||||
|
||||
return redirect()->route('admin.servers.index')->with('success', __('Server removed'));
|
||||
} catch (Exception $e) {
|
||||
return redirect()->route('admin.servers.index')->with('error', __('An exception has occurred while trying to remove a resource "') . $e->getMessage() . '"');
|
||||
return redirect()->route('admin.servers.index')->with('error', __('An exception has occurred while trying to remove a resource "').$e->getMessage().'"');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Server $server
|
||||
* @param Server $server
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function toggleSuspended(Server $server)
|
||||
{
|
||||
try {
|
||||
$server->isSuspended() ? $server->unSuspend() : $server->suspend();
|
||||
$server->isSuspended() ? $server->unSuspend() : $server->suspend();
|
||||
} catch (Exception $exception) {
|
||||
return redirect()->back()->with('error', $exception->getMessage());
|
||||
}
|
||||
|
|
@ -130,20 +128,20 @@ class ServerController extends Controller
|
|||
|
||||
$CPIDArray = [];
|
||||
$renameCount = 0;
|
||||
foreach($CPServers as $CPServer)//go thru all CP servers and make array with IDs as keys. All values are false.
|
||||
{
|
||||
if($CPServer->pterodactyl_id) $CPIDArray[$CPServer->pterodactyl_id] = false;
|
||||
foreach ($CPServers as $CPServer) {//go thru all CP servers and make array with IDs as keys. All values are false.
|
||||
if ($CPServer->pterodactyl_id) {
|
||||
$CPIDArray[$CPServer->pterodactyl_id] = false;
|
||||
}
|
||||
}
|
||||
|
||||
foreach($pteroServers as $server)//go thru all ptero servers, if server exists, change value to true in array.
|
||||
{
|
||||
if(isset($CPIDArray[$server['attributes']['id']])){
|
||||
$CPIDArray[$server['attributes']['id']]=true;
|
||||
foreach ($pteroServers as $server) {//go thru all ptero servers, if server exists, change value to true in array.
|
||||
if (isset($CPIDArray[$server['attributes']['id']])) {
|
||||
$CPIDArray[$server['attributes']['id']] = true;
|
||||
|
||||
if(isset($server['attributes']['name'])){//failsafe
|
||||
if (isset($server['attributes']['name'])) {//failsafe
|
||||
//Check if a server got renamed
|
||||
$savedServer = Server::query()->where('pterodactyl_id', $server['attributes']['id'])->first();
|
||||
if($savedServer->name != $server['attributes']['name']){
|
||||
if ($savedServer->name != $server['attributes']['name']) {
|
||||
$savedServer->name = $server['attributes']['name'];
|
||||
$savedServer->save();
|
||||
$renameCount++;
|
||||
|
|
@ -151,58 +149,66 @@ class ServerController extends Controller
|
|||
}
|
||||
}
|
||||
}
|
||||
$filteredArray = array_filter($CPIDArray, function($v, $k) { return $v == false; }, ARRAY_FILTER_USE_BOTH); //Array of servers, that dont exist on ptero (value == false)
|
||||
$filteredArray = array_filter($CPIDArray, function ($v, $k) {
|
||||
return $v == false;
|
||||
}, ARRAY_FILTER_USE_BOTH); //Array of servers, that dont exist on ptero (value == false)
|
||||
$deleteCount = 0;
|
||||
foreach($filteredArray as $key => $CPID)//delete servers that dont exist on ptero anymore
|
||||
{
|
||||
if(!Pterodactyl::getServerAttributes($key, true)) $deleteCount++;
|
||||
foreach ($filteredArray as $key => $CPID) {//delete servers that dont exist on ptero anymore
|
||||
if (! Pterodactyl::getServerAttributes($key, true)) {
|
||||
$deleteCount++;
|
||||
}
|
||||
}
|
||||
|
||||
return redirect()->back()->with('success', __('Servers synced successfully' . (($renameCount)?(',\n' . __('renamed') . ' ' . $renameCount . ' ' . __('servers')):'') . ((count($filteredArray))?(',\n' . __('deleted') . ' ' . $deleteCount . '/' . count($filteredArray) . ' ' . __('old servers')):''))) . '.';
|
||||
return redirect()->back()->with('success', __('Servers synced successfully'.(($renameCount) ? (',\n'.__('renamed').' '.$renameCount.' '.__('servers')) : '').((count($filteredArray)) ? (',\n'.__('deleted').' '.$deleteCount.'/'.count($filteredArray).' '.__('old servers')) : ''))).'.';
|
||||
}
|
||||
|
||||
/**
|
||||
* @return JsonResponse|mixed
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function dataTable(Request $request)
|
||||
{
|
||||
$query = Server::with(['user', 'product']);
|
||||
if ($request->has('product')) $query->where('product_id', '=', $request->input('product'));
|
||||
if ($request->has('user')) $query->where('user_id', '=', $request->input('user'));
|
||||
if ($request->has('product')) {
|
||||
$query->where('product_id', '=', $request->input('product'));
|
||||
}
|
||||
if ($request->has('user')) {
|
||||
$query->where('user_id', '=', $request->input('user'));
|
||||
}
|
||||
$query->select('servers.*');
|
||||
|
||||
|
||||
return datatables($query)
|
||||
->addColumn('user', function (Server $server) {
|
||||
return '<a href="' . route('admin.users.show', $server->user->id) . '">' . $server->user->name . '</a>';
|
||||
return '<a href="'.route('admin.users.show', $server->user->id).'">'.$server->user->name.'</a>';
|
||||
})
|
||||
->addColumn('resources', function (Server $server) {
|
||||
return $server->product->description;
|
||||
})
|
||||
->addColumn('actions', function (Server $server) {
|
||||
$suspendColor = $server->isSuspended() ? "btn-success" : "btn-warning";
|
||||
$suspendIcon = $server->isSuspended() ? "fa-play-circle" : "fa-pause-circle";
|
||||
$suspendText = $server->isSuspended() ? __("Unsuspend") : __("Suspend");
|
||||
$suspendColor = $server->isSuspended() ? 'btn-success' : 'btn-warning';
|
||||
$suspendIcon = $server->isSuspended() ? 'fa-play-circle' : 'fa-pause-circle';
|
||||
$suspendText = $server->isSuspended() ? __('Unsuspend') : __('Suspend');
|
||||
|
||||
return '
|
||||
<a data-content="' . __("Edit") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.servers.edit', $server->id) . '" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
<form class="d-inline" method="post" action="' . route('admin.servers.togglesuspend', $server->id) . '">
|
||||
' . csrf_field() . '
|
||||
<button data-content="' . $suspendText . '" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm ' . $suspendColor . ' text-white mr-1"><i class="far ' . $suspendIcon . '"></i></button>
|
||||
<a data-content="'.__('Edit').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.servers.edit', $server->id).'" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
<form class="d-inline" method="post" action="'.route('admin.servers.togglesuspend', $server->id).'">
|
||||
'.csrf_field().'
|
||||
<button data-content="'.$suspendText.'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm '.$suspendColor.' text-white mr-1"><i class="far '.$suspendIcon.'"></i></button>
|
||||
</form>
|
||||
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.servers.destroy', $server->id) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("DELETE") . '
|
||||
<button data-content="' . __("Delete") . '" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="'.route('admin.servers.destroy', $server->id).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('DELETE').'
|
||||
<button data-content="'.__('Delete').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
</form>
|
||||
|
||||
';
|
||||
})
|
||||
->addColumn('status', function (Server $server) {
|
||||
$labelColor = $server->isSuspended() ? 'text-danger' : 'text-success';
|
||||
return '<i class="fas ' . $labelColor . ' fa-circle mr-2"></i>';
|
||||
|
||||
return '<i class="fas '.$labelColor.' fa-circle mr-2"></i>';
|
||||
})
|
||||
->editColumn('created_at', function (Server $server) {
|
||||
return $server->created_at ? $server->created_at->diffForHumans() : '';
|
||||
|
|
@ -211,7 +217,7 @@ class ServerController extends Controller
|
|||
return $server->suspended ? $server->suspended->diffForHumans() : '';
|
||||
})
|
||||
->editColumn('name', function (Server $server) {
|
||||
return '<a class="text-info" target="_blank" href="' . config("SETTINGS::SYSTEM:PTERODACTYL:URL") . '/admin/servers/view/' . $server->pterodactyl_id . '">' . strip_tags($server->name) . '</a>';
|
||||
return '<a class="text-info" target="_blank" href="'.config('SETTINGS::SYSTEM:PTERODACTYL:URL').'/admin/servers/view/'.$server->pterodactyl_id.'">'.strip_tags($server->name).'</a>';
|
||||
})
|
||||
->rawColumns(['user', 'actions', 'status', 'name'])
|
||||
->make();
|
||||
|
|
|
|||
|
|
@ -3,11 +3,9 @@
|
|||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Settings;
|
||||
use Illuminate\Contracts\Foundation\Application;
|
||||
use Illuminate\Contracts\View\Factory;
|
||||
use Illuminate\Contracts\View\View;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
class SettingsController extends Controller
|
||||
|
|
@ -22,7 +20,7 @@ class SettingsController extends Controller
|
|||
//Get all tabs as laravel view paths
|
||||
$tabs = [];
|
||||
foreach (glob(resource_path('views/admin/settings/tabs/*.blade.php')) as $filename) {
|
||||
$tabs[] = 'admin.settings.tabs.' . basename($filename, '.blade.php');
|
||||
$tabs[] = 'admin.settings.tabs.'.basename($filename, '.blade.php');
|
||||
}
|
||||
|
||||
//Generate a html list item for each tab based on tabs file basename, set first tab as active
|
||||
|
|
@ -30,8 +28,8 @@ class SettingsController extends Controller
|
|||
foreach ($tabs as $tab) {
|
||||
$tabName = str_replace('admin.settings.tabs.', '', $tab);
|
||||
$tabListItems[] = '<li class="nav-item">
|
||||
<a class="nav-link ' . (empty($tabListItems) ? 'active' : '') . '" data-toggle="pill" href="#' . $tabName . '">
|
||||
' . __(ucfirst($tabName)) . '
|
||||
<a class="nav-link '.(empty($tabListItems) ? 'active' : '').'" data-toggle="pill" href="#'.$tabName.'">
|
||||
'.__(ucfirst($tabName)).'
|
||||
</a></li>';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Models\ShopProduct;
|
||||
use App\Models\Settings;
|
||||
use Illuminate\Contracts\Foundation\Application;
|
||||
use Illuminate\Contracts\View\Factory;
|
||||
use Illuminate\Contracts\View\View;
|
||||
|
|
@ -26,12 +25,14 @@ class ShopProductController extends Controller
|
|||
|
||||
if (
|
||||
env('APP_ENV') == 'local' ||
|
||||
config("SETTINGS::PAYMENTS:PAYPAL:SECRET") && config("SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID") ||
|
||||
config("SETTINGS::PAYMENTS:STRIPE:SECRET") && config("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET") && config("SETTINGS::PAYMENTS:STRIPE:METHODS")
|
||||
) $isPaymentSetup = true;
|
||||
config('SETTINGS::PAYMENTS:PAYPAL:SECRET') && config('SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID') ||
|
||||
config('SETTINGS::PAYMENTS:STRIPE:SECRET') && config('SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET') && config('SETTINGS::PAYMENTS:STRIPE:METHODS')
|
||||
) {
|
||||
$isPaymentSetup = true;
|
||||
}
|
||||
|
||||
return view('admin.store.index', [
|
||||
'isPaymentSetup' => $isPaymentSetup
|
||||
'isPaymentSetup' => $isPaymentSetup,
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -43,29 +44,29 @@ class ShopProductController extends Controller
|
|||
public function create()
|
||||
{
|
||||
return view('admin.store.create', [
|
||||
'currencyCodes' => config('currency_codes')
|
||||
'currencyCodes' => config('currency_codes'),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
"disabled" => "nullable",
|
||||
"type" => "required|string",
|
||||
"currency_code" => ["required", "string", "max:3", Rule::in(config('currency_codes'))],
|
||||
"price" => "required|regex:/^\d+(\.\d{1,2})?$/",
|
||||
"quantity" => "required|numeric",
|
||||
"description" => "required|string|max:60",
|
||||
"display" => "required|string|max:60",
|
||||
'disabled' => 'nullable',
|
||||
'type' => 'required|string',
|
||||
'currency_code' => ['required', 'string', 'max:3', Rule::in(config('currency_codes'))],
|
||||
'price' => "required|regex:/^\d+(\.\d{1,2})?$/",
|
||||
'quantity' => 'required|numeric',
|
||||
'description' => 'required|string|max:60',
|
||||
'display' => 'required|string|max:60',
|
||||
]);
|
||||
|
||||
$disabled = !is_null($request->input('disabled'));
|
||||
$disabled = ! is_null($request->input('disabled'));
|
||||
ShopProduct::create(array_merge($request->all(), ['disabled' => $disabled]));
|
||||
|
||||
return redirect()->route('admin.store.index')->with('success', __('Store item has been created!'));
|
||||
|
|
@ -74,7 +75,7 @@ class ShopProductController extends Controller
|
|||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param ShopProduct $shopProduct
|
||||
* @param ShopProduct $shopProduct
|
||||
* @return Response
|
||||
*/
|
||||
public function show(ShopProduct $shopProduct)
|
||||
|
|
@ -85,50 +86,50 @@ class ShopProductController extends Controller
|
|||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param ShopProduct $shopProduct
|
||||
* @param ShopProduct $shopProduct
|
||||
* @return Application|Factory|View|Response
|
||||
*/
|
||||
public function edit(ShopProduct $shopProduct)
|
||||
{
|
||||
return view('admin.store.edit', [
|
||||
'currencyCodes' => config('currency_codes'),
|
||||
'shopProduct' => $shopProduct
|
||||
'shopProduct' => $shopProduct,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param ShopProduct $shopProduct
|
||||
* @param Request $request
|
||||
* @param ShopProduct $shopProduct
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(Request $request, ShopProduct $shopProduct)
|
||||
{
|
||||
$request->validate([
|
||||
"disabled" => "nullable",
|
||||
"type" => "required|string",
|
||||
"currency_code" => ["required", "string", "max:3", Rule::in(config('currency_codes'))],
|
||||
"price" => "required|regex:/^\d+(\.\d{1,2})?$/",
|
||||
"quantity" => "required|numeric|max:100000000",
|
||||
"description" => "required|string|max:60",
|
||||
"display" => "required|string|max:60",
|
||||
'disabled' => 'nullable',
|
||||
'type' => 'required|string',
|
||||
'currency_code' => ['required', 'string', 'max:3', Rule::in(config('currency_codes'))],
|
||||
'price' => "required|regex:/^\d+(\.\d{1,2})?$/",
|
||||
'quantity' => 'required|numeric|max:100000000',
|
||||
'description' => 'required|string|max:60',
|
||||
'display' => 'required|string|max:60',
|
||||
]);
|
||||
|
||||
$disabled = !is_null($request->input('disabled'));
|
||||
$disabled = ! is_null($request->input('disabled'));
|
||||
$shopProduct->update(array_merge($request->all(), ['disabled' => $disabled]));
|
||||
|
||||
return redirect()->route('admin.store.index')->with('success', __('Store item has been updated!'));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param ShopProduct $shopProduct
|
||||
* @param Request $request
|
||||
* @param ShopProduct $shopProduct
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function disable(Request $request, ShopProduct $shopProduct)
|
||||
{
|
||||
$shopProduct->update(['disabled' => !$shopProduct->disabled]);
|
||||
$shopProduct->update(['disabled' => ! $shopProduct->disabled]);
|
||||
|
||||
return redirect()->route('admin.store.index')->with('success', __('Product has been updated!'));
|
||||
}
|
||||
|
|
@ -136,16 +137,16 @@ class ShopProductController extends Controller
|
|||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param ShopProduct $shopProduct
|
||||
* @param ShopProduct $shopProduct
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function destroy(ShopProduct $shopProduct)
|
||||
{
|
||||
$shopProduct->delete();
|
||||
|
||||
return redirect()->back()->with('success', __('Store item has been removed!'));
|
||||
}
|
||||
|
||||
|
||||
public function dataTable()
|
||||
{
|
||||
$query = ShopProduct::query();
|
||||
|
|
@ -153,24 +154,25 @@ class ShopProductController extends Controller
|
|||
return datatables($query)
|
||||
->addColumn('actions', function (ShopProduct $shopProduct) {
|
||||
return '
|
||||
<a data-content="' . __("Edit") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.store.edit', $shopProduct->id) . '" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
<a data-content="'.__('Edit').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.store.edit', $shopProduct->id).'" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.store.destroy', $shopProduct->id) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("DELETE") . '
|
||||
<button data-content="' . __("Delete") . '" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="'.route('admin.store.destroy', $shopProduct->id).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('DELETE').'
|
||||
<button data-content="'.__('Delete').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
</form>
|
||||
';
|
||||
})
|
||||
->addColumn('disabled', function (ShopProduct $shopProduct) {
|
||||
$checked = $shopProduct->disabled == false ? "checked" : "";
|
||||
$checked = $shopProduct->disabled == false ? 'checked' : '';
|
||||
|
||||
return '
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.store.disable', $shopProduct->id) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("PATCH") . '
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="'.route('admin.store.disable', $shopProduct->id).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('PATCH').'
|
||||
<div class="custom-control custom-switch">
|
||||
<input ' . $checked . ' name="disabled" onchange="this.form.submit()" type="checkbox" class="custom-control-input" id="switch' . $shopProduct->id . '">
|
||||
<label class="custom-control-label" for="switch' . $shopProduct->id . '"></label>
|
||||
<input '.$checked.' name="disabled" onchange="this.form.submit()" type="checkbox" class="custom-control-input" id="switch'.$shopProduct->id.'">
|
||||
<label class="custom-control-label" for="switch'.$shopProduct->id.'"></label>
|
||||
</div>
|
||||
</form>
|
||||
';
|
||||
|
|
|
|||
|
|
@ -36,27 +36,27 @@ class UsefulLinkController extends Controller
|
|||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
|
||||
$request->validate([
|
||||
'icon' => 'required|string',
|
||||
'title' => 'required|string|max:60',
|
||||
'link' => 'required|url|string|max:191',
|
||||
'description' => 'required|string|max:2000',
|
||||
'icon' => 'required|string',
|
||||
'title' => 'required|string|max:60',
|
||||
'link' => 'required|url|string|max:191',
|
||||
'description' => 'required|string|max:2000',
|
||||
]);
|
||||
|
||||
UsefulLink::create($request->all());
|
||||
|
||||
return redirect()->route('admin.usefullinks.index')->with('success', __('link has been created!'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param UsefulLink $usefullink
|
||||
* @param UsefulLink $usefullink
|
||||
* @return Response
|
||||
*/
|
||||
public function show(UsefulLink $usefullink)
|
||||
|
|
@ -67,21 +67,21 @@ class UsefulLinkController extends Controller
|
|||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param UsefulLink $usefullink
|
||||
* @param UsefulLink $usefullink
|
||||
* @return Application|Factory|View
|
||||
*/
|
||||
public function edit(UsefulLink $usefullink)
|
||||
{
|
||||
return view('admin.usefullinks.edit' , [
|
||||
'link' => $usefullink
|
||||
return view('admin.usefullinks.edit', [
|
||||
'link' => $usefullink,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param UsefulLink $usefullink
|
||||
* @param Request $request
|
||||
* @param UsefulLink $usefullink
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(Request $request, UsefulLink $usefullink)
|
||||
|
|
@ -94,18 +94,20 @@ class UsefulLinkController extends Controller
|
|||
]);
|
||||
|
||||
$usefullink->update($request->all());
|
||||
|
||||
return redirect()->route('admin.usefullinks.index')->with('success', __('link has been updated!'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param UsefulLink $usefullink
|
||||
* @param UsefulLink $usefullink
|
||||
* @return Response
|
||||
*/
|
||||
public function destroy(UsefulLink $usefullink)
|
||||
{
|
||||
$usefullink->delete();
|
||||
|
||||
return redirect()->back()->with('success', __('product has been removed!'));
|
||||
}
|
||||
|
||||
|
|
@ -116,12 +118,12 @@ class UsefulLinkController extends Controller
|
|||
return datatables($query)
|
||||
->addColumn('actions', function (UsefulLink $link) {
|
||||
return '
|
||||
<a data-content="'.__("Edit").'" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.usefullinks.edit', $link->id) . '" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
<a data-content="'.__('Edit').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.usefullinks.edit', $link->id).'" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.usefullinks.destroy', $link->id) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("DELETE") . '
|
||||
<button data-content="'.__("Delete").'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="'.route('admin.usefullinks.destroy', $link->id).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('DELETE').'
|
||||
<button data-content="'.__('Delete').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
</form>
|
||||
';
|
||||
})
|
||||
|
|
@ -131,7 +133,7 @@ class UsefulLinkController extends Controller
|
|||
->editColumn('icon', function (UsefulLink $link) {
|
||||
return "<i class='{$link->icon}'></i>";
|
||||
})
|
||||
->rawColumns(['actions' , 'icon'])
|
||||
->rawColumns(['actions', 'icon'])
|
||||
->make();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,8 @@ namespace App\Http\Controllers\Admin;
|
|||
use App\Classes\Pterodactyl;
|
||||
use App\Events\UserUpdateCreditsEvent;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Settings;
|
||||
use App\Models\User;
|
||||
use App\Notifications\DynamicNotification;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Spatie\QueryBuilder\QueryBuilder;
|
||||
use Exception;
|
||||
use Illuminate\Contracts\Foundation\Application;
|
||||
use Illuminate\Contracts\View\Factory;
|
||||
|
|
@ -19,11 +16,13 @@ use Illuminate\Http\Request;
|
|||
use Illuminate\Http\Response;
|
||||
use Illuminate\Notifications\Messages\MailMessage;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Notification;
|
||||
use Illuminate\Support\HtmlString;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use Spatie\QueryBuilder\QueryBuilder;
|
||||
|
||||
class UserController extends Controller
|
||||
{
|
||||
|
|
@ -37,7 +36,7 @@ class UserController extends Controller
|
|||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return Application|Factory|View|Response
|
||||
*/
|
||||
public function index(Request $request)
|
||||
|
|
@ -48,23 +47,23 @@ class UserController extends Controller
|
|||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
* @return Application|Factory|View|Response
|
||||
*/
|
||||
public function show(User $user)
|
||||
{
|
||||
//QUERY ALL REFERRALS A USER HAS
|
||||
//i am not proud of this at all.
|
||||
$allReferals = array();
|
||||
$referrals = DB::table("user_referrals")->where("referral_id","=",$user->id)->get();
|
||||
foreach($referrals as $referral){
|
||||
array_push($allReferals, $allReferals["id"] = User::query()->findOrFail($referral->registered_user_id));
|
||||
}
|
||||
array_pop($allReferals);
|
||||
$allReferals = [];
|
||||
$referrals = DB::table('user_referrals')->where('referral_id', '=', $user->id)->get();
|
||||
foreach ($referrals as $referral) {
|
||||
array_push($allReferals, $allReferals['id'] = User::query()->findOrFail($referral->registered_user_id));
|
||||
}
|
||||
array_pop($allReferals);
|
||||
|
||||
return view('admin.users.show')->with([
|
||||
'user' => $user,
|
||||
'referrals' => $allReferals
|
||||
'referrals' => $allReferals,
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -92,50 +91,51 @@ class UserController extends Controller
|
|||
return $item;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
* @return Application|Factory|View|Response
|
||||
*/
|
||||
public function edit(User $user)
|
||||
{
|
||||
return view('admin.users.edit')->with([
|
||||
'user' => $user
|
||||
'user' => $user,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param User $user
|
||||
* @param Request $request
|
||||
* @param User $user
|
||||
* @return RedirectResponse
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function update(Request $request, User $user)
|
||||
{
|
||||
|
||||
$request->validate([
|
||||
"name" => "required|string|min:4|max:30",
|
||||
"pterodactyl_id" => "required|numeric|unique:users,pterodactyl_id,{$user->id}",
|
||||
"email" => "required|string|email",
|
||||
"credits" => "required|numeric|min:0|max:99999999",
|
||||
"server_limit" => "required|numeric|min:0|max:1000000",
|
||||
"role" => Rule::in(['admin', 'moderator', 'client', 'member']),
|
||||
"referral_code" => "required|string|min:2|max:32|unique:users,referral_code,{$user->id}",
|
||||
'name' => 'required|string|min:4|max:30',
|
||||
'pterodactyl_id' => "required|numeric|unique:users,pterodactyl_id,{$user->id}",
|
||||
'email' => 'required|string|email',
|
||||
'credits' => 'required|numeric|min:0|max:99999999',
|
||||
'server_limit' => 'required|numeric|min:0|max:1000000',
|
||||
'role' => Rule::in(['admin', 'moderator', 'client', 'member']),
|
||||
'referral_code' => "required|string|min:2|max:32|unique:users,referral_code,{$user->id}",
|
||||
]);
|
||||
|
||||
if (isset($this->pterodactyl->getUser($request->input('pterodactyl_id'))['errors'])) {
|
||||
throw ValidationException::withMessages([
|
||||
'pterodactyl_id' => [__("User does not exists on pterodactyl's panel")]
|
||||
'pterodactyl_id' => [__("User does not exists on pterodactyl's panel")],
|
||||
]);
|
||||
}
|
||||
|
||||
if (!is_null($request->input('new_password'))) {
|
||||
if (! is_null($request->input('new_password'))) {
|
||||
$request->validate([
|
||||
'new_password' => 'required|string|min:8',
|
||||
'new_password_confirmation' => 'required|same:new_password'
|
||||
'new_password_confirmation' => 'required|same:new_password',
|
||||
]);
|
||||
|
||||
$user->update([
|
||||
|
|
@ -152,53 +152,58 @@ class UserController extends Controller
|
|||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function destroy(User $user)
|
||||
{
|
||||
$user->delete();
|
||||
|
||||
return redirect()->back()->with('success', __('user has been removed!'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Verifys the users email
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function verifyEmail(Request $request, User $user)
|
||||
{
|
||||
$user->verifyEmail();
|
||||
|
||||
return redirect()->back()->with('success', __('Email has been verified!'));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param User $user
|
||||
* @param Request $request
|
||||
* @param User $user
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function loginAs(Request $request, User $user)
|
||||
{
|
||||
$request->session()->put('previousUser', Auth::user()->id);
|
||||
Auth::login($user);
|
||||
|
||||
return redirect()->route('home');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function logBackIn(Request $request)
|
||||
{
|
||||
Auth::loginUsingId($request->session()->get('previousUser'), true);
|
||||
$request->session()->remove('previousUser');
|
||||
|
||||
return redirect()->route('admin.users.index');
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for seding notifications to the specified resource.
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
* @return Application|Factory|View|Response
|
||||
*/
|
||||
public function notifications(User $user)
|
||||
|
|
@ -209,50 +214,52 @@ class UserController extends Controller
|
|||
/**
|
||||
* Notify the specified resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param User $user
|
||||
* @param Request $request
|
||||
* @param User $user
|
||||
* @return RedirectResponse
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function notify(Request $request)
|
||||
{
|
||||
$data = $request->validate([
|
||||
"via" => "required|min:1|array",
|
||||
"via.*" => "required|string|in:mail,database",
|
||||
"all" => "required_without:users|boolean",
|
||||
"users" => "required_without:all|min:1|array",
|
||||
"users.*" => "exists:users,id",
|
||||
"title" => "required|string|min:1",
|
||||
"content" => "required|string|min:1"
|
||||
'via' => 'required|min:1|array',
|
||||
'via.*' => 'required|string|in:mail,database',
|
||||
'all' => 'required_without:users|boolean',
|
||||
'users' => 'required_without:all|min:1|array',
|
||||
'users.*' => 'exists:users,id',
|
||||
'title' => 'required|string|min:1',
|
||||
'content' => 'required|string|min:1',
|
||||
]);
|
||||
|
||||
$mail = null;
|
||||
$database = null;
|
||||
if (in_array('database', $data["via"])) {
|
||||
if (in_array('database', $data['via'])) {
|
||||
$database = [
|
||||
"title" => $data["title"],
|
||||
"content" => $data["content"]
|
||||
'title' => $data['title'],
|
||||
'content' => $data['content'],
|
||||
];
|
||||
}
|
||||
if (in_array('mail', $data["via"])) {
|
||||
if (in_array('mail', $data['via'])) {
|
||||
$mail = (new MailMessage)
|
||||
->subject($data["title"])
|
||||
->line(new HtmlString($data["content"]));
|
||||
->subject($data['title'])
|
||||
->line(new HtmlString($data['content']));
|
||||
}
|
||||
$all = $data["all"] ?? false;
|
||||
$users = $all ? User::all() : User::whereIn("id", $data["users"])->get();
|
||||
Notification::send($users, new DynamicNotification($data["via"], $database, $mail));
|
||||
$all = $data['all'] ?? false;
|
||||
$users = $all ? User::all() : User::whereIn('id', $data['users'])->get();
|
||||
Notification::send($users, new DynamicNotification($data['via'], $database, $mail));
|
||||
|
||||
return redirect()->route('admin.users.notifications')->with('success', __('Notification sent!'));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function toggleSuspended(User $user)
|
||||
{
|
||||
try {
|
||||
!$user->isSuspended() ? $user->suspend() : $user->unSuspend();
|
||||
! $user->isSuspended() ? $user->suspend() : $user->unSuspend();
|
||||
} catch (Exception $exception) {
|
||||
return redirect()->back()->with('error', $exception->getMessage());
|
||||
}
|
||||
|
|
@ -261,7 +268,6 @@ class UserController extends Controller
|
|||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function dataTable()
|
||||
|
|
@ -270,10 +276,10 @@ class UserController extends Controller
|
|||
|
||||
return datatables($query)
|
||||
->addColumn('avatar', function (User $user) {
|
||||
return '<img width="28px" height="28px" class="rounded-circle ml-1" src="' . $user->getAvatar() . '">';
|
||||
return '<img width="28px" height="28px" class="rounded-circle ml-1" src="'.$user->getAvatar().'">';
|
||||
})
|
||||
->addColumn('credits', function (User $user) {
|
||||
return '<i class="fas fa-coins mr-2"></i> ' . $user->credits();
|
||||
return '<i class="fas fa-coins mr-2"></i> '.$user->credits();
|
||||
})
|
||||
->addColumn('verified', function (User $user) {
|
||||
return $user->getVerifiedStatus();
|
||||
|
|
@ -282,32 +288,33 @@ class UserController extends Controller
|
|||
return $user->servers->count();
|
||||
})
|
||||
->addColumn('referrals', function (User $user) {
|
||||
return DB::table('user_referrals')->where("referral_id","=",$user->id)->count();
|
||||
return DB::table('user_referrals')->where('referral_id', '=', $user->id)->count();
|
||||
})
|
||||
->addColumn('discordId', function (User $user) {
|
||||
return $user->discordUser ? $user->discordUser->id : '';
|
||||
})
|
||||
->addColumn('last_seen', function (User $user) {
|
||||
return ['display' => $user->last_seen ? $user->last_seen->diffForHumans() : '',
|
||||
'raw' => $user->last_seen ? strtotime($user->last_seen) : ''];
|
||||
'raw' => $user->last_seen ? strtotime($user->last_seen) : '', ];
|
||||
})
|
||||
->addColumn('actions', function (User $user) {
|
||||
$suspendColor = $user->isSuspended() ? "btn-success" : "btn-warning";
|
||||
$suspendIcon = $user->isSuspended() ? "fa-play-circle" : "fa-pause-circle";
|
||||
$suspendText = $user->isSuspended() ? __("Unsuspend") : __("Suspend");
|
||||
$suspendColor = $user->isSuspended() ? 'btn-success' : 'btn-warning';
|
||||
$suspendIcon = $user->isSuspended() ? 'fa-play-circle' : 'fa-pause-circle';
|
||||
$suspendText = $user->isSuspended() ? __('Unsuspend') : __('Suspend');
|
||||
|
||||
return '
|
||||
<a data-content="' . __("Login as User") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.users.loginas', $user->id) . '" class="btn btn-sm btn-primary mr-1"><i class="fas fa-sign-in-alt"></i></a>
|
||||
<a data-content="' . __("Verify") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.users.verifyEmail', $user->id) . '" class="btn btn-sm btn-secondary mr-1"><i class="fas fa-envelope"></i></a>
|
||||
<a data-content="' . __("Show") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.users.show', $user->id) . '" class="btn btn-sm text-white btn-warning mr-1"><i class="fas fa-eye"></i></a>
|
||||
<a data-content="' . __("Edit") . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.users.edit', $user->id) . '" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
<form class="d-inline" method="post" action="' . route('admin.users.togglesuspend', $user->id) . '">
|
||||
' . csrf_field() . '
|
||||
<button data-content="' . $suspendText . '" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm ' . $suspendColor . ' text-white mr-1"><i class="far ' . $suspendIcon . '"></i></button>
|
||||
<a data-content="'.__('Login as User').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.users.loginas', $user->id).'" class="btn btn-sm btn-primary mr-1"><i class="fas fa-sign-in-alt"></i></a>
|
||||
<a data-content="'.__('Verify').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.users.verifyEmail', $user->id).'" class="btn btn-sm btn-secondary mr-1"><i class="fas fa-envelope"></i></a>
|
||||
<a data-content="'.__('Show').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.users.show', $user->id).'" class="btn btn-sm text-white btn-warning mr-1"><i class="fas fa-eye"></i></a>
|
||||
<a data-content="'.__('Edit').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.users.edit', $user->id).'" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
<form class="d-inline" method="post" action="'.route('admin.users.togglesuspend', $user->id).'">
|
||||
'.csrf_field().'
|
||||
<button data-content="'.$suspendText.'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm '.$suspendColor.' text-white mr-1"><i class="far '.$suspendIcon.'"></i></button>
|
||||
</form>
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.users.destroy', $user->id) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("DELETE") . '
|
||||
<button data-content="' . __("Delete") . '" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="'.route('admin.users.destroy', $user->id).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('DELETE').'
|
||||
<button data-content="'.__('Delete').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
</form>
|
||||
';
|
||||
})
|
||||
|
|
@ -327,10 +334,10 @@ class UserController extends Controller
|
|||
break;
|
||||
}
|
||||
|
||||
return '<span class="badge ' . $badgeColor . '">' . $user->role . '</span>';
|
||||
return '<span class="badge '.$badgeColor.'">'.$user->role.'</span>';
|
||||
})
|
||||
->editColumn('name', function (User $user) {
|
||||
return '<a class="text-info" target="_blank" href="' . config("SETTINGS::SYSTEM:PTERODACTYL:URL") . '/admin/users/view/' . $user->pterodactyl_id . '">' . strip_tags($user->name) . '</a>';
|
||||
return '<a class="text-info" target="_blank" href="'.config('SETTINGS::SYSTEM:PTERODACTYL:URL').'/admin/users/view/'.$user->pterodactyl_id.'">'.strip_tags($user->name).'</a>';
|
||||
})
|
||||
/*->orderColumn('last_seen', function ($query) {
|
||||
$query->orderBy('last_seen', "desc");
|
||||
|
|
|
|||
|
|
@ -40,16 +40,16 @@ class VoucherController extends Controller
|
|||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'memo' => 'nullable|string|max:191',
|
||||
'code' => 'required|string|alpha_dash|max:36|min:4|unique:vouchers',
|
||||
'uses' => 'required|numeric|max:2147483647|min:1',
|
||||
'credits' => 'required|numeric|between:0,99999999',
|
||||
'memo' => 'nullable|string|max:191',
|
||||
'code' => 'required|string|alpha_dash|max:36|min:4|unique:vouchers',
|
||||
'uses' => 'required|numeric|max:2147483647|min:1',
|
||||
'credits' => 'required|numeric|between:0,99999999',
|
||||
'expires_at' => 'nullable|multiple_date_format:d-m-Y H:i:s,d-m-Y|after:now|before:10 years',
|
||||
]);
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ class VoucherController extends Controller
|
|||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param Voucher $voucher
|
||||
* @param Voucher $voucher
|
||||
* @return Response
|
||||
*/
|
||||
public function show(Voucher $voucher)
|
||||
|
|
@ -72,30 +72,30 @@ class VoucherController extends Controller
|
|||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param Voucher $voucher
|
||||
* @param Voucher $voucher
|
||||
* @return Application|Factory|View
|
||||
*/
|
||||
public function edit(Voucher $voucher)
|
||||
{
|
||||
return view('admin.vouchers.edit', [
|
||||
'voucher' => $voucher
|
||||
'voucher' => $voucher,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Voucher $voucher
|
||||
* @param Request $request
|
||||
* @param Voucher $voucher
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(Request $request, Voucher $voucher)
|
||||
{
|
||||
$request->validate([
|
||||
'memo' => 'nullable|string|max:191',
|
||||
'code' => "required|string|alpha_dash|max:36|min:4|unique:vouchers,code,{$voucher->id}",
|
||||
'uses' => 'required|numeric|max:2147483647|min:1',
|
||||
'credits' => 'required|numeric|between:0,99999999',
|
||||
'memo' => 'nullable|string|max:191',
|
||||
'code' => "required|string|alpha_dash|max:36|min:4|unique:vouchers,code,{$voucher->id}",
|
||||
'uses' => 'required|numeric|max:2147483647|min:1',
|
||||
'credits' => 'required|numeric|between:0,99999999',
|
||||
'expires_at' => 'nullable|multiple_date_format:d-m-Y H:i:s,d-m-Y|after:now|before:10 years',
|
||||
]);
|
||||
|
||||
|
|
@ -107,61 +107,71 @@ class VoucherController extends Controller
|
|||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Voucher $voucher
|
||||
* @param Voucher $voucher
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function destroy(Voucher $voucher)
|
||||
{
|
||||
$voucher->delete();
|
||||
|
||||
return redirect()->back()->with('success', __('voucher has been removed!'));
|
||||
}
|
||||
|
||||
public function users(Voucher $voucher)
|
||||
{
|
||||
return view('admin.vouchers.users', [
|
||||
'voucher' => $voucher
|
||||
'voucher' => $voucher,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return JsonResponse
|
||||
*
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function redeem(Request $request)
|
||||
{
|
||||
#general validations
|
||||
//general validations
|
||||
$request->validate([
|
||||
'code' => 'required|exists:vouchers,code'
|
||||
'code' => 'required|exists:vouchers,code',
|
||||
]);
|
||||
|
||||
#get voucher by code
|
||||
//get voucher by code
|
||||
$voucher = Voucher::where('code', '=', $request->input('code'))->firstOrFail();
|
||||
|
||||
#extra validations
|
||||
if ($voucher->getStatus() == 'USES_LIMIT_REACHED') throw ValidationException::withMessages([
|
||||
'code' => __('This voucher has reached the maximum amount of uses')
|
||||
]);
|
||||
//extra validations
|
||||
if ($voucher->getStatus() == 'USES_LIMIT_REACHED') {
|
||||
throw ValidationException::withMessages([
|
||||
'code' => __('This voucher has reached the maximum amount of uses'),
|
||||
]);
|
||||
}
|
||||
|
||||
if ($voucher->getStatus() == 'EXPIRED') throw ValidationException::withMessages([
|
||||
'code' => __('This voucher has expired')
|
||||
]);
|
||||
if ($voucher->getStatus() == 'EXPIRED') {
|
||||
throw ValidationException::withMessages([
|
||||
'code' => __('This voucher has expired'),
|
||||
]);
|
||||
}
|
||||
|
||||
if (!$request->user()->vouchers()->where('id', '=', $voucher->id)->get()->isEmpty()) throw ValidationException::withMessages([
|
||||
'code' => __('You already redeemed this voucher code')
|
||||
]);
|
||||
if (! $request->user()->vouchers()->where('id', '=', $voucher->id)->get()->isEmpty()) {
|
||||
throw ValidationException::withMessages([
|
||||
'code' => __('You already redeemed this voucher code'),
|
||||
]);
|
||||
}
|
||||
|
||||
if ($request->user()->credits + $voucher->credits >= 99999999) throw ValidationException::withMessages([
|
||||
'code' => "You can't redeem this voucher because you would exceed the limit of " . CREDITS_DISPLAY_NAME
|
||||
]);
|
||||
if ($request->user()->credits + $voucher->credits >= 99999999) {
|
||||
throw ValidationException::withMessages([
|
||||
'code' => "You can't redeem this voucher because you would exceed the limit of ".CREDITS_DISPLAY_NAME,
|
||||
]);
|
||||
}
|
||||
|
||||
#redeem voucher
|
||||
//redeem voucher
|
||||
$voucher->redeem($request->user());
|
||||
|
||||
event(new UserUpdateCreditsEvent($request->user()));
|
||||
|
||||
return response()->json([
|
||||
'success' => "{$voucher->credits} " . CREDITS_DISPLAY_NAME ." ". __("have been added to your balance!")
|
||||
'success' => "{$voucher->credits} ".CREDITS_DISPLAY_NAME.' '.__('have been added to your balance!'),
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -171,10 +181,10 @@ class VoucherController extends Controller
|
|||
|
||||
return datatables($users)
|
||||
->editColumn('name', function (User $user) {
|
||||
return '<a class="text-info" target="_blank" href="' . route('admin.users.show', $user->id) . '">' . $user->name . '</a>';
|
||||
return '<a class="text-info" target="_blank" href="'.route('admin.users.show', $user->id).'">'.$user->name.'</a>';
|
||||
})
|
||||
->addColumn('credits', function (User $user) {
|
||||
return '<i class="fas fa-coins mr-2"></i> ' . $user->credits();
|
||||
return '<i class="fas fa-coins mr-2"></i> '.$user->credits();
|
||||
})
|
||||
->addColumn('last_seen', function (User $user) {
|
||||
return $user->last_seen ? $user->last_seen->diffForHumans() : '';
|
||||
|
|
@ -182,6 +192,7 @@ class VoucherController extends Controller
|
|||
->rawColumns(['name', 'credits', 'last_seen'])
|
||||
->make();
|
||||
}
|
||||
|
||||
public function dataTable()
|
||||
{
|
||||
$query = Voucher::query();
|
||||
|
|
@ -189,20 +200,23 @@ class VoucherController extends Controller
|
|||
return datatables($query)
|
||||
->addColumn('actions', function (Voucher $voucher) {
|
||||
return '
|
||||
<a data-content="'.__("Users").'" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.vouchers.users', $voucher->id) . '" class="btn btn-sm btn-primary mr-1"><i class="fas fa-users"></i></a>
|
||||
<a data-content="'.__("Edit").'" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.vouchers.edit', $voucher->id) . '" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
<a data-content="'.__('Users').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.vouchers.users', $voucher->id).'" class="btn btn-sm btn-primary mr-1"><i class="fas fa-users"></i></a>
|
||||
<a data-content="'.__('Edit').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.vouchers.edit', $voucher->id).'" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.vouchers.destroy', $voucher->id) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("DELETE") . '
|
||||
<button data-content="'.__("Delete").'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="'.route('admin.vouchers.destroy', $voucher->id).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('DELETE').'
|
||||
<button data-content="'.__('Delete').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
</form>
|
||||
';
|
||||
})
|
||||
->addColumn('status', function (Voucher $voucher) {
|
||||
$color = 'success';
|
||||
if ($voucher->getStatus() != __('VALID')) $color = 'danger';
|
||||
return '<span class="badge badge-' . $color . '">' . $voucher->getStatus() . '</span>';
|
||||
if ($voucher->getStatus() != __('VALID')) {
|
||||
$color = 'danger';
|
||||
}
|
||||
|
||||
return '<span class="badge badge-'.$color.'">'.$voucher->getStatus().'</span>';
|
||||
})
|
||||
->editColumn('uses', function (Voucher $voucher) {
|
||||
return "{$voucher->used} / {$voucher->uses}";
|
||||
|
|
@ -211,7 +225,10 @@ class VoucherController extends Controller
|
|||
return number_format($voucher->credits, 2, '.', '');
|
||||
})
|
||||
->editColumn('expires_at', function (Voucher $voucher) {
|
||||
if (!$voucher->expires_at) return "";
|
||||
if (! $voucher->expires_at) {
|
||||
return '';
|
||||
}
|
||||
|
||||
return $voucher->expires_at ? $voucher->expires_at->diffForHumans() : '';
|
||||
})
|
||||
->editColumn('code', function (Voucher $voucher) {
|
||||
|
|
|
|||
|
|
@ -19,8 +19,9 @@ class NotificationController extends Controller
|
|||
{
|
||||
/**
|
||||
* Display all notifications of an user.
|
||||
* @param Request $request
|
||||
* @param int $userId
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $userId
|
||||
* @return Response
|
||||
*/
|
||||
public function index(Request $request, int $userId)
|
||||
|
|
@ -28,14 +29,14 @@ class NotificationController extends Controller
|
|||
$discordUser = DiscordUser::find($userId);
|
||||
$user = $discordUser ? $discordUser->user : User::findOrFail($userId);
|
||||
|
||||
return $user->notifications()->paginate($request->query("per_page", 50));
|
||||
return $user->notifications()->paginate($request->query('per_page', 50));
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a specific notification
|
||||
*
|
||||
* @param int $userId
|
||||
* @param int $notificationId
|
||||
* @param int $userId
|
||||
* @param int $notificationId
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function view(int $userId, $notificationId)
|
||||
|
|
@ -43,10 +44,10 @@ class NotificationController extends Controller
|
|||
$discordUser = DiscordUser::find($userId);
|
||||
$user = $discordUser ? $discordUser->user : User::findOrFail($userId);
|
||||
|
||||
$notification = $user->notifications()->where("id", $notificationId)->get()->first();
|
||||
$notification = $user->notifications()->where('id', $notificationId)->get()->first();
|
||||
|
||||
if (!$notification) {
|
||||
return response()->json(["message" => "Notification not found."], 404);
|
||||
if (! $notification) {
|
||||
return response()->json(['message' => 'Notification not found.'], 404);
|
||||
}
|
||||
|
||||
return $notification;
|
||||
|
|
@ -55,42 +56,43 @@ class NotificationController extends Controller
|
|||
/**
|
||||
* Send a notification to an user.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return JsonResponse
|
||||
*
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function send(Request $request)
|
||||
{
|
||||
$data = $request->validate([
|
||||
"via" => ["required", new Delimited("in:mail,database")],
|
||||
"all" => "required_without:users|boolean",
|
||||
"users" => ["required_without:all"],
|
||||
"title" => "required|string|min:1",
|
||||
"content" => "required|string|min:1"
|
||||
'via' => ['required', new Delimited('in:mail,database')],
|
||||
'all' => 'required_without:users|boolean',
|
||||
'users' => ['required_without:all'],
|
||||
'title' => 'required|string|min:1',
|
||||
'content' => 'required|string|min:1',
|
||||
]);
|
||||
$via = explode(",", $data["via"]);
|
||||
$via = explode(',', $data['via']);
|
||||
$mail = null;
|
||||
$database = null;
|
||||
|
||||
if (in_array("database", $via)) {
|
||||
if (in_array('database', $via)) {
|
||||
$database = [
|
||||
"title" => $data["title"],
|
||||
"content" => $data["content"]
|
||||
'title' => $data['title'],
|
||||
'content' => $data['content'],
|
||||
];
|
||||
}
|
||||
if (in_array("mail", $via)) {
|
||||
if (in_array('mail', $via)) {
|
||||
$mail = (new MailMessage)
|
||||
->subject($data["title"])
|
||||
->line(new HtmlString($data["content"]));
|
||||
->subject($data['title'])
|
||||
->line(new HtmlString($data['content']));
|
||||
}
|
||||
|
||||
$all = $data["all"] ?? false;
|
||||
$all = $data['all'] ?? false;
|
||||
if ($all) {
|
||||
$users = User::all();
|
||||
} else {
|
||||
$userIds = explode(",", $data["users"]);
|
||||
$userIds = explode(',', $data['users']);
|
||||
$users = User::query()
|
||||
->whereIn("id", $userIds)
|
||||
->whereIn('id', $userIds)
|
||||
->orWhereHas('discordUser', function (Builder $builder) use ($userIds) {
|
||||
$builder->whereIn('id', $userIds);
|
||||
})
|
||||
|
|
@ -104,13 +106,14 @@ class NotificationController extends Controller
|
|||
}
|
||||
|
||||
Notification::send($users, new DynamicNotification($via, $database, $mail));
|
||||
return response()->json(["message" => "Notification successfully sent.", 'user_count' => $users->count()]);
|
||||
|
||||
return response()->json(['message' => 'Notification successfully sent.', 'user_count' => $users->count()]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete all notifications from an user
|
||||
*
|
||||
* @param int $userId
|
||||
* @param int $userId
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function delete(int $userId)
|
||||
|
|
@ -120,15 +123,14 @@ class NotificationController extends Controller
|
|||
|
||||
$count = $user->notifications()->delete();
|
||||
|
||||
return response()->json(["message" => "All notifications have been successfully deleted.", "count" => $count]);
|
||||
return response()->json(['message' => 'All notifications have been successfully deleted.', 'count' => $count]);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Delete a specific notification
|
||||
*
|
||||
* @param int $userId
|
||||
* @param int $notificationId
|
||||
* @param int $userId
|
||||
* @param int $notificationId
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function deleteOne(int $userId, $notificationid)
|
||||
|
|
@ -136,13 +138,14 @@ class NotificationController extends Controller
|
|||
$discordUser = DiscordUser::find($userId);
|
||||
$user = $discordUser ? $discordUser->user : User::findOrFail($userId);
|
||||
|
||||
$notification = $user->notifications()->where("id", $notificationid)->get()->first();
|
||||
$notification = $user->notifications()->where('id', $notificationid)->get()->first();
|
||||
|
||||
if (!$notification) {
|
||||
return response()->json(["message" => "Notification not found."], 404);
|
||||
if (! $notification) {
|
||||
return response()->json(['message' => 'Notification not found.'], 404);
|
||||
}
|
||||
|
||||
$notification->delete();
|
||||
|
||||
return response()->json($notification);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,12 +15,13 @@ use Spatie\QueryBuilder\QueryBuilder;
|
|||
class ServerController extends Controller
|
||||
{
|
||||
public const ALLOWED_INCLUDES = ['product', 'user'];
|
||||
|
||||
public const ALLOWED_FILTERS = ['name', 'suspended', 'identifier', 'pterodactyl_id', 'user_id', 'product_id'];
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return LengthAwarePaginator
|
||||
*/
|
||||
public function index(Request $request)
|
||||
|
|
@ -35,8 +36,7 @@ class ServerController extends Controller
|
|||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param Server $server
|
||||
*
|
||||
* @param Server $server
|
||||
* @return Server|Collection|Model
|
||||
*/
|
||||
public function show(Server $server)
|
||||
|
|
@ -51,19 +51,20 @@ class ServerController extends Controller
|
|||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Server $server
|
||||
* @param Server $server
|
||||
* @return Server
|
||||
*/
|
||||
public function destroy(Server $server)
|
||||
{
|
||||
$server->delete();
|
||||
|
||||
return $server;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* suspend server
|
||||
* @param Server $server
|
||||
*
|
||||
* @param Server $server
|
||||
* @return Server|JsonResponse
|
||||
*/
|
||||
public function suspend(Server $server)
|
||||
|
|
@ -77,10 +78,10 @@ class ServerController extends Controller
|
|||
return $server->load('product');
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* unsuspend server
|
||||
* @param Server $server
|
||||
*
|
||||
* @param Server $server
|
||||
* @return Server|JsonResponse
|
||||
*/
|
||||
public function unSuspend(Server $server)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ use App\Classes\Pterodactyl;
|
|||
use App\Events\UserUpdateCreditsEvent;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\DiscordUser;
|
||||
use App\Models\Settings;
|
||||
use App\Models\User;
|
||||
use App\Notifications\ReferralNotification;
|
||||
use Carbon\Carbon;
|
||||
|
|
@ -29,12 +28,13 @@ use Spatie\QueryBuilder\QueryBuilder;
|
|||
class UserController extends Controller
|
||||
{
|
||||
const ALLOWED_INCLUDES = ['servers', 'notifications', 'payments', 'vouchers', 'discordUser'];
|
||||
|
||||
const ALLOWED_FILTERS = ['name', 'server_limit', 'email', 'pterodactyl_id', 'role', 'suspended'];
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return LengthAwarePaginator
|
||||
*/
|
||||
public function index(Request $request)
|
||||
|
|
@ -46,12 +46,10 @@ class UserController extends Controller
|
|||
return $query->paginate($request->input('per_page') ?? 50);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param int $id
|
||||
*
|
||||
* @param int $id
|
||||
* @return User|Builder|Collection|Model
|
||||
*/
|
||||
public function show(int $id)
|
||||
|
|
@ -70,12 +68,11 @@ class UserController extends Controller
|
|||
return $query->firstOrFail();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @return User
|
||||
*/
|
||||
public function update(Request $request, int $id)
|
||||
|
|
@ -84,28 +81,28 @@ class UserController extends Controller
|
|||
$user = $discordUser ? $discordUser->user : User::findOrFail($id);
|
||||
|
||||
$request->validate([
|
||||
"name" => "sometimes|string|min:4|max:30",
|
||||
"email" => "sometimes|string|email",
|
||||
"credits" => "sometimes|numeric|min:0|max:1000000",
|
||||
"server_limit" => "sometimes|numeric|min:0|max:1000000",
|
||||
"role" => ['sometimes', Rule::in(['admin', 'moderator', 'client', 'member'])],
|
||||
'name' => 'sometimes|string|min:4|max:30',
|
||||
'email' => 'sometimes|string|email',
|
||||
'credits' => 'sometimes|numeric|min:0|max:1000000',
|
||||
'server_limit' => 'sometimes|numeric|min:0|max:1000000',
|
||||
'role' => ['sometimes', Rule::in(['admin', 'moderator', 'client', 'member'])],
|
||||
]);
|
||||
|
||||
event(new UserUpdateCreditsEvent($user));
|
||||
|
||||
//Update Users Password on Pterodactyl
|
||||
//Username,Mail,First and Lastname are required aswell
|
||||
$response = Pterodactyl::client()->patch('/application/users/' . $user->pterodactyl_id, [
|
||||
"username" => $request->name,
|
||||
"first_name" => $request->name,
|
||||
"last_name" => $request->name,
|
||||
"email" => $request->email,
|
||||
$response = Pterodactyl::client()->patch('/application/users/'.$user->pterodactyl_id, [
|
||||
'username' => $request->name,
|
||||
'first_name' => $request->name,
|
||||
'last_name' => $request->name,
|
||||
'email' => $request->email,
|
||||
|
||||
]);
|
||||
if ($response->failed()) {
|
||||
throw ValidationException::withMessages([
|
||||
'pterodactyl_error_message' => $response->toException()->getMessage(),
|
||||
'pterodactyl_error_status' => $response->toException()->getCode()
|
||||
'pterodactyl_error_status' => $response->toException()->getCode(),
|
||||
]);
|
||||
}
|
||||
$user->update($request->all());
|
||||
|
|
@ -116,9 +113,10 @@ class UserController extends Controller
|
|||
/**
|
||||
* increments the users credits or/and server_limit
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @return User
|
||||
*
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function increment(Request $request, int $id)
|
||||
|
|
@ -127,22 +125,26 @@ class UserController extends Controller
|
|||
$user = $discordUser ? $discordUser->user : User::findOrFail($id);
|
||||
|
||||
$request->validate([
|
||||
"credits" => "sometimes|numeric|min:0|max:1000000",
|
||||
"server_limit" => "sometimes|numeric|min:0|max:1000000",
|
||||
'credits' => 'sometimes|numeric|min:0|max:1000000',
|
||||
'server_limit' => 'sometimes|numeric|min:0|max:1000000',
|
||||
]);
|
||||
|
||||
if ($request->credits) {
|
||||
if ($user->credits + $request->credits >= 99999999) throw ValidationException::withMessages([
|
||||
'credits' => "You can't add this amount of credits because you would exceed the credit limit"
|
||||
]);
|
||||
if ($user->credits + $request->credits >= 99999999) {
|
||||
throw ValidationException::withMessages([
|
||||
'credits' => "You can't add this amount of credits because you would exceed the credit limit",
|
||||
]);
|
||||
}
|
||||
event(new UserUpdateCreditsEvent($user));
|
||||
$user->increment('credits', $request->credits);
|
||||
}
|
||||
|
||||
if ($request->server_limit) {
|
||||
if ($user->server_limit + $request->server_limit >= 2147483647) throw ValidationException::withMessages([
|
||||
'server_limit' => "You cannot add this amount of servers because it would exceed the server limit."
|
||||
]);
|
||||
if ($user->server_limit + $request->server_limit >= 2147483647) {
|
||||
throw ValidationException::withMessages([
|
||||
'server_limit' => 'You cannot add this amount of servers because it would exceed the server limit.',
|
||||
]);
|
||||
}
|
||||
$user->increment('server_limit', $request->server_limit);
|
||||
}
|
||||
|
||||
|
|
@ -152,9 +154,10 @@ class UserController extends Controller
|
|||
/**
|
||||
* decrements the users credits or/and server_limit
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @return User
|
||||
*
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function decrement(Request $request, int $id)
|
||||
|
|
@ -163,21 +166,25 @@ class UserController extends Controller
|
|||
$user = $discordUser ? $discordUser->user : User::findOrFail($id);
|
||||
|
||||
$request->validate([
|
||||
"credits" => "sometimes|numeric|min:0|max:1000000",
|
||||
"server_limit" => "sometimes|numeric|min:0|max:1000000",
|
||||
'credits' => 'sometimes|numeric|min:0|max:1000000',
|
||||
'server_limit' => 'sometimes|numeric|min:0|max:1000000',
|
||||
]);
|
||||
|
||||
if ($request->credits) {
|
||||
if ($user->credits - $request->credits < 0) throw ValidationException::withMessages([
|
||||
'credits' => "You can't remove this amount of credits because you would exceed the minimum credit limit"
|
||||
]);
|
||||
if ($user->credits - $request->credits < 0) {
|
||||
throw ValidationException::withMessages([
|
||||
'credits' => "You can't remove this amount of credits because you would exceed the minimum credit limit",
|
||||
]);
|
||||
}
|
||||
$user->decrement('credits', $request->credits);
|
||||
}
|
||||
|
||||
if ($request->server_limit) {
|
||||
if ($user->server_limit - $request->server_limit < 0) throw ValidationException::withMessages([
|
||||
'server_limit' => "You cannot remove this amount of servers because it would exceed the minimum server."
|
||||
]);
|
||||
if ($user->server_limit - $request->server_limit < 0) {
|
||||
throw ValidationException::withMessages([
|
||||
'server_limit' => 'You cannot remove this amount of servers because it would exceed the minimum server.',
|
||||
]);
|
||||
}
|
||||
$user->decrement('server_limit', $request->server_limit);
|
||||
}
|
||||
|
||||
|
|
@ -187,9 +194,10 @@ class UserController extends Controller
|
|||
/**
|
||||
* Suspends the user
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @return bool
|
||||
*
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function suspend(Request $request, int $id)
|
||||
|
|
@ -210,9 +218,10 @@ class UserController extends Controller
|
|||
/**
|
||||
* Unsuspend the user
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @return bool
|
||||
*
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function unsuspend(Request $request, int $id)
|
||||
|
|
@ -220,9 +229,9 @@ class UserController extends Controller
|
|||
$discordUser = DiscordUser::find($id);
|
||||
$user = $discordUser ? $discordUser->user : User::findOrFail($id);
|
||||
|
||||
if (!$user->isSuspended()) {
|
||||
if (! $user->isSuspended()) {
|
||||
throw ValidationException::withMessages([
|
||||
'error' => "You cannot unsuspend an User who is not suspended."
|
||||
'error' => 'You cannot unsuspend an User who is not suspended.',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -230,17 +239,22 @@ class UserController extends Controller
|
|||
|
||||
return $user;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a unique Referral Code for User
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
protected function createReferralCode(){
|
||||
protected function createReferralCode()
|
||||
{
|
||||
$referralcode = STR::random(8);
|
||||
if (User::where('referral_code', '=', $referralcode)->exists()) {
|
||||
$this->createReferralCode();
|
||||
}
|
||||
|
||||
return $referralcode;
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws ValidationException
|
||||
*/
|
||||
|
|
@ -251,13 +265,13 @@ class UserController extends Controller
|
|||
'email' => ['required', 'string', 'email', 'max:64', 'unique:users'],
|
||||
'password' => ['required', 'string', 'min:8', 'max:191'],
|
||||
]);
|
||||
|
||||
|
||||
// Prevent the creation of new users via API if this is enabled.
|
||||
if (!config('SETTINGS::SYSTEM:CREATION_OF_NEW_USERS', 'true')) {
|
||||
if (! config('SETTINGS::SYSTEM:CREATION_OF_NEW_USERS', 'true')) {
|
||||
throw ValidationException::withMessages([
|
||||
'error' => "The creation of new users has been blocked by the system administrator."
|
||||
'error' => 'The creation of new users has been blocked by the system administrator.',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
$user = User::create([
|
||||
'name' => $request->input('name'),
|
||||
|
|
@ -269,45 +283,44 @@ class UserController extends Controller
|
|||
]);
|
||||
|
||||
$response = Pterodactyl::client()->post('/application/users', [
|
||||
"external_id" => App::environment('local') ? Str::random(16) : (string)$user->id,
|
||||
"username" => $user->name,
|
||||
"email" => $user->email,
|
||||
"first_name" => $user->name,
|
||||
"last_name" => $user->name,
|
||||
"password" => $request->input('password'),
|
||||
"root_admin" => false,
|
||||
"language" => "en"
|
||||
'external_id' => App::environment('local') ? Str::random(16) : (string) $user->id,
|
||||
'username' => $user->name,
|
||||
'email' => $user->email,
|
||||
'first_name' => $user->name,
|
||||
'last_name' => $user->name,
|
||||
'password' => $request->input('password'),
|
||||
'root_admin' => false,
|
||||
'language' => 'en',
|
||||
]);
|
||||
|
||||
if ($response->failed()) {
|
||||
$user->delete();
|
||||
throw ValidationException::withMessages([
|
||||
'pterodactyl_error_message' => $response->toException()->getMessage(),
|
||||
'pterodactyl_error_status' => $response->toException()->getCode()
|
||||
'pterodactyl_error_status' => $response->toException()->getCode(),
|
||||
]);
|
||||
}
|
||||
|
||||
$user->update([
|
||||
'pterodactyl_id' => $response->json()['attributes']['id']
|
||||
'pterodactyl_id' => $response->json()['attributes']['id'],
|
||||
]);
|
||||
//INCREMENT REFERRAL-USER CREDITS
|
||||
if(!empty($request->input("referral_code"))){
|
||||
$ref_code = $request->input("referral_code");
|
||||
if (! empty($request->input('referral_code'))) {
|
||||
$ref_code = $request->input('referral_code');
|
||||
$new_user = $user->id;
|
||||
if($ref_user = User::query()->where('referral_code', '=', $ref_code)->first()) {
|
||||
if(config("SETTINGS::REFERRAL:MODE") == "register" || config("SETTINGS::REFERRAL:MODE") == "both") {
|
||||
$ref_user->increment('credits', config("SETTINGS::REFERRAL::REWARD"));
|
||||
if ($ref_user = User::query()->where('referral_code', '=', $ref_code)->first()) {
|
||||
if (config('SETTINGS::REFERRAL:MODE') == 'register' || config('SETTINGS::REFERRAL:MODE') == 'both') {
|
||||
$ref_user->increment('credits', config('SETTINGS::REFERRAL::REWARD'));
|
||||
$ref_user->notify(new ReferralNotification($ref_user->id, $new_user));
|
||||
}
|
||||
//INSERT INTO USER_REFERRALS TABLE
|
||||
DB::table('user_referrals')->insert([
|
||||
'referral_id' => $ref_user->id,
|
||||
'registered_user_id' => $user->id,
|
||||
'created_at' => Carbon::now(),
|
||||
'updated_at' => Carbon::now()
|
||||
'created_at' => Carbon::now(),
|
||||
'updated_at' => Carbon::now(),
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
||||
$user->sendEmailVerificationNotification();
|
||||
|
||||
|
|
@ -317,7 +330,7 @@ class UserController extends Controller
|
|||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param int $id
|
||||
* @param int $id
|
||||
* @return Application|Response|ResponseFactory
|
||||
*/
|
||||
public function destroy(int $id)
|
||||
|
|
@ -326,6 +339,7 @@ class UserController extends Controller
|
|||
$user = $discordUser ? $discordUser->user : User::findOrFail($id);
|
||||
|
||||
$user->delete();
|
||||
|
||||
return response($user, 200);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ use Spatie\QueryBuilder\QueryBuilder;
|
|||
class VoucherController extends Controller
|
||||
{
|
||||
const ALLOWED_INCLUDES = ['users'];
|
||||
|
||||
const ALLOWED_FILTERS = ['code', 'memo', 'credits', 'uses'];
|
||||
|
||||
/**
|
||||
|
|
@ -44,7 +45,7 @@ class VoucherController extends Controller
|
|||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
|
|
@ -54,7 +55,7 @@ class VoucherController extends Controller
|
|||
'code' => 'required|string|alpha_dash|max:36|min:4|unique:vouchers',
|
||||
'uses' => 'required|numeric|max:2147483647|min:1',
|
||||
'credits' => 'required|numeric|between:0,99999999',
|
||||
'expires_at' => 'nullable|multiple_date_format:d-m-Y H:i:s,d-m-Y|after:now|before:10 years'
|
||||
'expires_at' => 'nullable|multiple_date_format:d-m-Y H:i:s,d-m-Y|after:now|before:10 years',
|
||||
]);
|
||||
|
||||
return Voucher::create($request->all());
|
||||
|
|
@ -63,8 +64,7 @@ class VoucherController extends Controller
|
|||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param int $id
|
||||
*
|
||||
* @param int $id
|
||||
* @return Voucher|Collection|Model
|
||||
*/
|
||||
public function show(int $id)
|
||||
|
|
@ -79,7 +79,7 @@ class VoucherController extends Controller
|
|||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param int $id
|
||||
* @param int $id
|
||||
* @return Response
|
||||
*/
|
||||
public function edit($id)
|
||||
|
|
@ -90,8 +90,8 @@ class VoucherController extends Controller
|
|||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @return Response
|
||||
*/
|
||||
public function update(Request $request, int $id)
|
||||
|
|
@ -103,7 +103,7 @@ class VoucherController extends Controller
|
|||
'code' => "required|string|alpha_dash|max:36|min:4|unique:vouchers,code,{$voucher->id}",
|
||||
'uses' => 'required|numeric|max:2147483647|min:1',
|
||||
'credits' => 'required|numeric|between:0,99999999',
|
||||
'expires_at' => 'nullable|multiple_date_format:d-m-Y H:i:s,d-m-Y|after:now|before:10 years'
|
||||
'expires_at' => 'nullable|multiple_date_format:d-m-Y H:i:s,d-m-Y|after:now|before:10 years',
|
||||
]);
|
||||
|
||||
$voucher->update($request->all());
|
||||
|
|
@ -114,21 +114,22 @@ class VoucherController extends Controller
|
|||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param int $id
|
||||
* @param int $id
|
||||
* @return Response
|
||||
*/
|
||||
public function destroy(int $id)
|
||||
{
|
||||
$voucher = Voucher::findOrFail($id);
|
||||
$voucher->delete();
|
||||
|
||||
return $voucher;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* get linked users
|
||||
* @param Request $request
|
||||
* @param Voucher $voucher
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Voucher $voucher
|
||||
* @return LengthAwarePaginator
|
||||
*/
|
||||
public function users(Request $request, Voucher $voucher)
|
||||
|
|
@ -138,7 +139,7 @@ class VoucherController extends Controller
|
|||
'nullable',
|
||||
'string',
|
||||
Rule::in(['discorduser']),
|
||||
]
|
||||
],
|
||||
]);
|
||||
|
||||
if ($request->input('include') == 'discorduser') {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ namespace App\Http\Controllers\Auth;
|
|||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class ForgotPasswordController extends Controller
|
||||
|
|
@ -32,7 +31,6 @@ class ForgotPasswordController extends Controller
|
|||
$this->middleware('guest');
|
||||
}
|
||||
|
||||
|
||||
protected function validateEmail(Request $request)
|
||||
{
|
||||
$this->validate($request, [
|
||||
|
|
@ -44,8 +42,5 @@ class ForgotPasswordController extends Controller
|
|||
'g-recaptcha-response' => 'required|recaptcha',
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ use App\Providers\RouteServiceProvider;
|
|||
use Illuminate\Foundation\Auth\AuthenticatesUsers;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class LoginController extends Controller
|
||||
{
|
||||
|
|
@ -44,18 +43,15 @@ class LoginController extends Controller
|
|||
|
||||
public function login(Request $request)
|
||||
{
|
||||
|
||||
$validationRules = [
|
||||
$this->username() => 'required|string',
|
||||
'password' => 'required|string',
|
||||
$this->username() => 'required|string',
|
||||
'password' => 'required|string',
|
||||
];
|
||||
if (config('SETTINGS::RECAPTCHA:ENABLED') == 'true') {
|
||||
$validationRules['g-recaptcha-response'] = ['required', 'recaptcha'];
|
||||
}
|
||||
$request->validate($validationRules);
|
||||
|
||||
|
||||
|
||||
// If the class is using the ThrottlesLogins trait, we can automatically throttle
|
||||
// the login attempts for this application. We'll key this by the username and
|
||||
// the IP address of the client making these requests into this application.
|
||||
|
|
@ -72,6 +68,7 @@ class LoginController extends Controller
|
|||
$user = Auth::user();
|
||||
$user->last_seen = now();
|
||||
$user->save();
|
||||
|
||||
return $this->sendLoginResponse($request);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,14 +4,12 @@ namespace App\Http\Controllers\Auth;
|
|||
|
||||
use App\Classes\Pterodactyl;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Settings;
|
||||
use App\Models\User;
|
||||
use App\Notifications\ReferralNotification;
|
||||
use App\Providers\RouteServiceProvider;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Foundation\Auth\RegistersUsers;
|
||||
use Illuminate\Support\Facades\App;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
|
@ -54,15 +52,15 @@ class RegisterController extends Controller
|
|||
/**
|
||||
* Get a validator for an incoming registration request.
|
||||
*
|
||||
* @param array $data
|
||||
* @param array $data
|
||||
* @return \Illuminate\Contracts\Validation\Validator
|
||||
*/
|
||||
protected function validator(array $data)
|
||||
{
|
||||
$validationRules = [
|
||||
'name' => ['required', 'string', 'max:30', 'min:4', 'alpha_num', 'unique:users'],
|
||||
'email' => ['required', 'string', 'email', 'max:64', 'unique:users'],
|
||||
'password' => ['required', 'string', 'min:8', 'confirmed'],
|
||||
'name' => ['required', 'string', 'max:30', 'min:4', 'alpha_num', 'unique:users'],
|
||||
'email' => ['required', 'string', 'email', 'max:64', 'unique:users'],
|
||||
'password' => ['required', 'string', 'min:8', 'confirmed'],
|
||||
];
|
||||
if (config('SETTINGS::RECAPTCHA:ENABLED') == 'true') {
|
||||
$validationRules['g-recaptcha-response'] = ['required', 'recaptcha'];
|
||||
|
|
@ -75,10 +73,13 @@ class RegisterController extends Controller
|
|||
|
||||
//check if ip has already made an account
|
||||
$data['ip'] = session()->get('ip') ?? request()->ip();
|
||||
if (User::where('ip', '=', request()->ip())->exists()) session()->put('ip', request()->ip());
|
||||
$validationRules['ip'] = ['unique:users'];
|
||||
if (User::where('ip', '=', request()->ip())->exists()) {
|
||||
session()->put('ip', request()->ip());
|
||||
}
|
||||
$validationRules['ip'] = ['unique:users'];
|
||||
|
||||
return Validator::make($data, $validationRules, [
|
||||
'ip.unique' => "You have already made an account! Please contact support if you think this is incorrect."
|
||||
'ip.unique' => 'You have already made an account! Please contact support if you think this is incorrect.',
|
||||
|
||||
]);
|
||||
}
|
||||
|
|
@ -88,43 +89,46 @@ class RegisterController extends Controller
|
|||
|
||||
/**
|
||||
* Create a unique Referral Code for User
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
protected function createReferralCode(){
|
||||
protected function createReferralCode()
|
||||
{
|
||||
$referralcode = STR::random(8);
|
||||
if (User::where('referral_code', '=', $referralcode)->exists()) {
|
||||
$this->createReferralCode();
|
||||
}
|
||||
|
||||
return $referralcode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new user instance after a valid registration.
|
||||
*
|
||||
* @param array $data
|
||||
* @param array $data
|
||||
* @return User
|
||||
*/
|
||||
protected function create(array $data)
|
||||
{
|
||||
$user = User::create([
|
||||
'name' => $data['name'],
|
||||
'email' => $data['email'],
|
||||
'credits' => config('SETTINGS::USER:INITIAL_CREDITS', 150),
|
||||
'name' => $data['name'],
|
||||
'email' => $data['email'],
|
||||
'credits' => config('SETTINGS::USER:INITIAL_CREDITS', 150),
|
||||
'server_limit' => config('SETTINGS::USER:INITIAL_SERVER_LIMIT', 1),
|
||||
'password' => Hash::make($data['password']),
|
||||
'password' => Hash::make($data['password']),
|
||||
'referral_code' => $this->createReferralCode(),
|
||||
|
||||
]);
|
||||
|
||||
$response = Pterodactyl::client()->post('/application/users', [
|
||||
"external_id" => App::environment('local') ? Str::random(16) : (string)$user->id,
|
||||
"username" => $user->name,
|
||||
"email" => $user->email,
|
||||
"first_name" => $user->name,
|
||||
"last_name" => $user->name,
|
||||
"password" => $data['password'],
|
||||
"root_admin" => false,
|
||||
"language" => "en"
|
||||
'external_id' => App::environment('local') ? Str::random(16) : (string) $user->id,
|
||||
'username' => $user->name,
|
||||
'email' => $user->email,
|
||||
'first_name' => $user->name,
|
||||
'last_name' => $user->name,
|
||||
'password' => $data['password'],
|
||||
'root_admin' => false,
|
||||
'language' => 'en',
|
||||
]);
|
||||
|
||||
if ($response->failed()) {
|
||||
|
|
@ -135,33 +139,32 @@ class RegisterController extends Controller
|
|||
}
|
||||
|
||||
$user->update([
|
||||
'pterodactyl_id' => $response->json()['attributes']['id']
|
||||
'pterodactyl_id' => $response->json()['attributes']['id'],
|
||||
]);
|
||||
|
||||
//INCREMENT REFERRAL-USER CREDITS
|
||||
if(!empty($data['referral_code'])){
|
||||
if (! empty($data['referral_code'])) {
|
||||
$ref_code = $data['referral_code'];
|
||||
$new_user = $user->id;
|
||||
if($ref_user = User::query()->where('referral_code', '=', $ref_code)->first()) {
|
||||
if(config("SETTINGS::REFERRAL:MODE") == "sign-up" || config("SETTINGS::REFERRAL:MODE") == "both") {
|
||||
$ref_user->increment('credits', config("SETTINGS::REFERRAL::REWARD"));
|
||||
if ($ref_user = User::query()->where('referral_code', '=', $ref_code)->first()) {
|
||||
if (config('SETTINGS::REFERRAL:MODE') == 'sign-up' || config('SETTINGS::REFERRAL:MODE') == 'both') {
|
||||
$ref_user->increment('credits', config('SETTINGS::REFERRAL::REWARD'));
|
||||
$ref_user->notify(new ReferralNotification($ref_user->id, $new_user));
|
||||
|
||||
//LOGS REFERRALS IN THE ACTIVITY LOG
|
||||
activity()
|
||||
->performedOn($user)
|
||||
->causedBy($ref_user)
|
||||
->log('gained '. config("SETTINGS::REFERRAL::REWARD").' '.config("SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME").' for sign-up-referral of '.$user->name.' (ID:'.$user->id.')');
|
||||
->log('gained '.config('SETTINGS::REFERRAL::REWARD').' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').' for sign-up-referral of '.$user->name.' (ID:'.$user->id.')');
|
||||
}
|
||||
//INSERT INTO USER_REFERRALS TABLE
|
||||
DB::table('user_referrals')->insert([
|
||||
'referral_id' => $ref_user->id,
|
||||
'registered_user_id' => $user->id,
|
||||
'created_at' => Carbon::now(),
|
||||
'updated_at' => Carbon::now()
|
||||
'created_at' => Carbon::now(),
|
||||
'updated_at' => Carbon::now(),
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return $user;
|
||||
|
|
|
|||
|
|
@ -4,10 +4,7 @@ namespace App\Http\Controllers\Auth;
|
|||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\DiscordUser;
|
||||
use App\Models\Settings;
|
||||
use App\Models\User;
|
||||
use App\Models\Voucher;
|
||||
use Exception;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Laravel\Socialite\Facades\Socialite;
|
||||
|
|
@ -16,7 +13,7 @@ class SocialiteController extends Controller
|
|||
{
|
||||
public function redirect()
|
||||
{
|
||||
$scopes = !empty(config("SETTINGS::DISCORD:BOT_TOKEN")) && !empty(config("SETTINGS::DISCORD:GUILD_ID")) ? ['guilds.join'] : [];
|
||||
$scopes = ! empty(config('SETTINGS::DISCORD:BOT_TOKEN')) && ! empty(config('SETTINGS::DISCORD:GUILD_ID')) ? ['guilds.join'] : [];
|
||||
|
||||
return Socialite::driver('discord')
|
||||
->scopes($scopes)
|
||||
|
|
@ -32,40 +29,39 @@ class SocialiteController extends Controller
|
|||
/** @var User $user */
|
||||
$user = Auth::user();
|
||||
$discord = Socialite::driver('discord')->user();
|
||||
$botToken = config("SETTINGS::DISCORD:BOT_TOKEN");
|
||||
$guildId = config("SETTINGS::DISCORD:GUILD_ID");
|
||||
$roleId = config("SETTINGS::DISCORD:ROLE_ID");
|
||||
$botToken = config('SETTINGS::DISCORD:BOT_TOKEN');
|
||||
$guildId = config('SETTINGS::DISCORD:GUILD_ID');
|
||||
$roleId = config('SETTINGS::DISCORD:ROLE_ID');
|
||||
|
||||
//save / update discord_users
|
||||
//save / update discord_users
|
||||
|
||||
//check if discord account is already linked to an cpgg account
|
||||
if (is_null($user->discordUser)) {
|
||||
$discordLinked = DiscordUser::where('id', '=', $discord->id)->first();
|
||||
if ($discordLinked !== null) {
|
||||
return redirect()->route('profile.index')->with(
|
||||
//check if discord account is already linked to an cpgg account
|
||||
if (is_null($user->discordUser)) {
|
||||
$discordLinked = DiscordUser::where('id', '=', $discord->id)->first();
|
||||
if ($discordLinked !== null) {
|
||||
return redirect()->route('profile.index')->with(
|
||||
'error',
|
||||
'Discord account already linked!'
|
||||
);
|
||||
}
|
||||
|
||||
//create discord user in db
|
||||
DiscordUser::create(array_merge($discord->user, ['user_id' => Auth::user()->id]));
|
||||
|
||||
//update user
|
||||
Auth::user()->increment('credits', config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD'));
|
||||
Auth::user()->increment('server_limit', config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD'));
|
||||
Auth::user()->update(['discord_verified_at' => now()]);
|
||||
|
||||
} else {
|
||||
$user->discordUser->update($discord->user);
|
||||
}
|
||||
|
||||
//create discord user in db
|
||||
DiscordUser::create(array_merge($discord->user, ['user_id' => Auth::user()->id]));
|
||||
|
||||
//update user
|
||||
Auth::user()->increment('credits', config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD'));
|
||||
Auth::user()->increment('server_limit', config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD'));
|
||||
Auth::user()->update(['discord_verified_at' => now()]);
|
||||
} else {
|
||||
$user->discordUser->update($discord->user);
|
||||
}
|
||||
|
||||
//force user into discord server
|
||||
//TODO Add event on failure, to notify ppl involved
|
||||
if (!empty($guildId) && !empty($botToken)) {
|
||||
if (! empty($guildId) && ! empty($botToken)) {
|
||||
$response = Http::withHeaders(
|
||||
[
|
||||
'Authorization' => 'Bot ' . $botToken,
|
||||
'Authorization' => 'Bot '.$botToken,
|
||||
'Content-Type' => 'application/json',
|
||||
]
|
||||
)->put(
|
||||
|
|
@ -74,10 +70,10 @@ class SocialiteController extends Controller
|
|||
);
|
||||
|
||||
//give user a role in the discord server
|
||||
if (!empty($roleId)) {
|
||||
if (! empty($roleId)) {
|
||||
$response = Http::withHeaders(
|
||||
[
|
||||
'Authorization' => 'Bot ' . $botToken,
|
||||
'Authorization' => 'Bot '.$botToken,
|
||||
'Content-Type' => 'application/json',
|
||||
]
|
||||
)->put(
|
||||
|
|
|
|||
|
|
@ -12,22 +12,26 @@ use Illuminate\Support\Facades\Http;
|
|||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
|
||||
|
||||
class HomeController extends Controller
|
||||
{
|
||||
const TIME_LEFT_BG_SUCCESS = "bg-success";
|
||||
const TIME_LEFT_BG_WARNING = "bg-warning";
|
||||
const TIME_LEFT_BG_DANGER = "bg-danger";
|
||||
const TIME_LEFT_BG_SUCCESS = 'bg-success';
|
||||
|
||||
const TIME_LEFT_BG_WARNING = 'bg-warning';
|
||||
|
||||
const TIME_LEFT_BG_DANGER = 'bg-danger';
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth');
|
||||
}
|
||||
|
||||
public function callHome(){
|
||||
if(Storage::exists("callHome")){return;}
|
||||
public function callHome()
|
||||
{
|
||||
if (Storage::exists('callHome')) {
|
||||
return;
|
||||
}
|
||||
Http::asForm()->post('https://market.controlpanel.gg/callhome.php', [
|
||||
'id' => Hash::make(URL::current())
|
||||
'id' => Hash::make(URL::current()),
|
||||
]);
|
||||
Storage::put('callHome', 'This is only used to count the installations of cpgg.');
|
||||
}
|
||||
|
|
@ -35,8 +39,7 @@ class HomeController extends Controller
|
|||
/**
|
||||
* @description Get the Background Color for the Days-Left-Box in HomeView
|
||||
*
|
||||
* @param float $daysLeft
|
||||
*
|
||||
* @param float $daysLeft
|
||||
* @return string
|
||||
*/
|
||||
public function getTimeLeftBoxBackground(float $daysLeft): string
|
||||
|
|
@ -47,36 +50,40 @@ class HomeController extends Controller
|
|||
if ($daysLeft <= 7) {
|
||||
return $this::TIME_LEFT_BG_DANGER;
|
||||
}
|
||||
|
||||
return $this::TIME_LEFT_BG_WARNING;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @description Set "hours", "days" or nothing behind the remaining time
|
||||
*
|
||||
* @param float $daysLeft
|
||||
* @param float $hoursLeft
|
||||
*
|
||||
* @param float $daysLeft
|
||||
* @param float $hoursLeft
|
||||
* @return string|void
|
||||
*/
|
||||
public function getTimeLeftBoxUnit(float $daysLeft, float $hoursLeft)
|
||||
{
|
||||
if ($daysLeft > 1) return __('days');
|
||||
return $hoursLeft < 1 ? null : __("hours");
|
||||
if ($daysLeft > 1) {
|
||||
return __('days');
|
||||
}
|
||||
|
||||
return $hoursLeft < 1 ? null : __('hours');
|
||||
}
|
||||
|
||||
/**
|
||||
* @description Get the Text for the Days-Left-Box in HomeView
|
||||
*
|
||||
* @param float $daysLeft
|
||||
* @param float $hoursLeft
|
||||
*
|
||||
* @param float $daysLeft
|
||||
* @param float $hoursLeft
|
||||
* @return string
|
||||
*/
|
||||
public function getTimeLeftBoxText(float $daysLeft, float $hoursLeft)
|
||||
{
|
||||
if ($daysLeft > 1) return strval(number_format($daysLeft, 0));
|
||||
return ($hoursLeft < 1 ? __("You ran out of Credits") : strval($hoursLeft));
|
||||
if ($daysLeft > 1) {
|
||||
return strval(number_format($daysLeft, 0));
|
||||
}
|
||||
|
||||
return $hoursLeft < 1 ? __('You ran out of Credits') : strval($hoursLeft);
|
||||
}
|
||||
|
||||
/** Show the application dashboard. */
|
||||
|
|
@ -84,9 +91,9 @@ class HomeController extends Controller
|
|||
{
|
||||
$usage = Auth::user()->creditUsage();
|
||||
$credits = Auth::user()->Credits();
|
||||
$bg = "";
|
||||
$boxText = "";
|
||||
$unit = "";
|
||||
$bg = '';
|
||||
$boxText = '';
|
||||
$unit = '';
|
||||
|
||||
/** Build our Time-Left-Box */
|
||||
if ($credits > 0.01 and $usage > 0) {
|
||||
|
|
@ -95,7 +102,7 @@ class HomeController extends Controller
|
|||
|
||||
$bg = $this->getTimeLeftBoxBackground($daysLeft);
|
||||
$boxText = $this->getTimeLeftBoxText($daysLeft, $hoursLeft);
|
||||
$unit = $daysLeft < 1 ? ($hoursLeft < 1 ? null : __("hours")) : __("days");
|
||||
$unit = $daysLeft < 1 ? ($hoursLeft < 1 ? null : __('hours')) : __('days');
|
||||
}
|
||||
|
||||
$this->callhome();
|
||||
|
|
@ -108,9 +115,9 @@ class HomeController extends Controller
|
|||
'bg' => $bg,
|
||||
'boxText' => $boxText,
|
||||
'unit' => $unit,
|
||||
'numberOfReferrals' => DB::table('user_referrals')->where("referral_id","=",Auth::user()->id)->count(),
|
||||
'numberOfReferrals' => DB::table('user_referrals')->where('referral_id', '=', Auth::user()->id)->count(),
|
||||
'partnerDiscount' => PartnerDiscount::where('user_id', Auth::user()->id)->first(),
|
||||
'myDiscount' => PartnerDiscount::getDiscount()
|
||||
'myDiscount' => PartnerDiscount::getDiscount(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,63 +2,71 @@
|
|||
|
||||
namespace App\Http\Controllers\Moderation;
|
||||
|
||||
use App\Models\User;
|
||||
use App\Models\Ticket;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Server;
|
||||
use App\Models\Ticket;
|
||||
use App\Models\TicketBlacklist;
|
||||
use App\Models\TicketCategory;
|
||||
use App\Models\TicketComment;
|
||||
use App\Models\TicketBlacklist;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use App\Models\User;
|
||||
use App\Notifications\Ticket\User\ReplyNotification;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use App\Notifications\Ticket\User\ReplyNotification;
|
||||
|
||||
class TicketsController extends Controller
|
||||
{
|
||||
public function index() {
|
||||
$tickets = Ticket::orderBy('id','desc')->paginate(10);
|
||||
public function index()
|
||||
{
|
||||
$tickets = Ticket::orderBy('id', 'desc')->paginate(10);
|
||||
$ticketcategories = TicketCategory::all();
|
||||
return view("moderator.ticket.index", compact("tickets", "ticketcategories"));
|
||||
|
||||
return view('moderator.ticket.index', compact('tickets', 'ticketcategories'));
|
||||
}
|
||||
public function show($ticket_id) {
|
||||
$ticket = Ticket::where("ticket_id", $ticket_id)->firstOrFail();
|
||||
|
||||
public function show($ticket_id)
|
||||
{
|
||||
$ticket = Ticket::where('ticket_id', $ticket_id)->firstOrFail();
|
||||
$ticketcomments = $ticket->ticketcomments;
|
||||
$ticketcategory = $ticket->ticketcategory;
|
||||
$server = Server::where('id', $ticket->server)->first();
|
||||
return view("moderator.ticket.show", compact("ticket", "ticketcategory", "ticketcomments", "server"));
|
||||
|
||||
return view('moderator.ticket.show', compact('ticket', 'ticketcategory', 'ticketcomments', 'server'));
|
||||
}
|
||||
|
||||
public function close($ticket_id) {
|
||||
$ticket = Ticket::where("ticket_id", $ticket_id)->firstOrFail();
|
||||
$ticket->status = "Closed";
|
||||
public function close($ticket_id)
|
||||
{
|
||||
$ticket = Ticket::where('ticket_id', $ticket_id)->firstOrFail();
|
||||
$ticket->status = 'Closed';
|
||||
$ticket->save();
|
||||
$ticketOwner = $ticket->user;
|
||||
return redirect()->back()->with('success', __('A ticket has been closed, ID: #') . $ticket->ticket_id);
|
||||
|
||||
return redirect()->back()->with('success', __('A ticket has been closed, ID: #').$ticket->ticket_id);
|
||||
}
|
||||
|
||||
public function delete($ticket_id){
|
||||
$ticket = Ticket::where("ticket_id", $ticket_id)->firstOrFail();
|
||||
TicketComment::where("ticket_id", $ticket->id)->delete();
|
||||
public function delete($ticket_id)
|
||||
{
|
||||
$ticket = Ticket::where('ticket_id', $ticket_id)->firstOrFail();
|
||||
TicketComment::where('ticket_id', $ticket->id)->delete();
|
||||
$ticket->delete();
|
||||
return redirect()->back()->with('success', __('A ticket has been deleted, ID: #') . $ticket_id);
|
||||
|
||||
return redirect()->back()->with('success', __('A ticket has been deleted, ID: #').$ticket_id);
|
||||
}
|
||||
|
||||
public function reply(Request $request) {
|
||||
$this->validate($request, array("ticketcomment" => "required"));
|
||||
$ticket = Ticket::where('id', $request->input("ticket_id"))->firstOrFail();
|
||||
$ticket->status = "Answered";
|
||||
public function reply(Request $request)
|
||||
{
|
||||
$this->validate($request, ['ticketcomment' => 'required']);
|
||||
$ticket = Ticket::where('id', $request->input('ticket_id'))->firstOrFail();
|
||||
$ticket->status = 'Answered';
|
||||
$ticket->update();
|
||||
TicketComment::create(array(
|
||||
"ticket_id" => $request->input("ticket_id"),
|
||||
"user_id" => Auth::user()->id,
|
||||
"ticketcomment" => $request->input("ticketcomment"),
|
||||
));
|
||||
TicketComment::create([
|
||||
'ticket_id' => $request->input('ticket_id'),
|
||||
'user_id' => Auth::user()->id,
|
||||
'ticketcomment' => $request->input('ticketcomment'),
|
||||
]);
|
||||
$user = User::where('id', $ticket->user_id)->firstOrFail();
|
||||
$newmessage = $request->input("ticketcomment");
|
||||
$newmessage = $request->input('ticketcomment');
|
||||
$user->notify(new ReplyNotification($ticket, $user, $newmessage));
|
||||
|
||||
return redirect()->back()->with('success', __('Your comment has been submitted'));
|
||||
}
|
||||
|
||||
|
|
@ -71,23 +79,23 @@ class TicketsController extends Controller
|
|||
return $tickets->ticketcategory->name;
|
||||
})
|
||||
->editColumn('title', function (Ticket $tickets) {
|
||||
return '<a class="text-info" href="' . route('moderator.ticket.show', ['ticket_id' => $tickets->ticket_id]) . '">' . "#" . $tickets->ticket_id . " - " . $tickets->title . '</a>';
|
||||
return '<a class="text-info" href="'.route('moderator.ticket.show', ['ticket_id' => $tickets->ticket_id]).'">'.'#'.$tickets->ticket_id.' - '.$tickets->title.'</a>';
|
||||
})
|
||||
->editColumn('user_id', function (Ticket $tickets) {
|
||||
return '<a href="' . route('admin.users.show', $tickets->user->id) . '">' . $tickets->user->name . '</a>';
|
||||
return '<a href="'.route('admin.users.show', $tickets->user->id).'">'.$tickets->user->name.'</a>';
|
||||
})
|
||||
->addColumn('actions', function (Ticket $tickets) {
|
||||
return '
|
||||
<a data-content="'.__("View").'" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('moderator.ticket.show', ['ticket_id' => $tickets->ticket_id]) . '" class="btn btn-sm text-white btn-info mr-1"><i class="fas fa-eye"></i></a>
|
||||
<form class="d-inline" method="post" action="' . route('moderator.ticket.close', ['ticket_id' => $tickets->ticket_id ]) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("POST") . '
|
||||
<button data-content="'.__("Close").'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm text-white btn-warning mr-1"><i class="fas fa-times"></i></button>
|
||||
<a data-content="'.__('View').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('moderator.ticket.show', ['ticket_id' => $tickets->ticket_id]).'" class="btn btn-sm text-white btn-info mr-1"><i class="fas fa-eye"></i></a>
|
||||
<form class="d-inline" method="post" action="'.route('moderator.ticket.close', ['ticket_id' => $tickets->ticket_id]).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('POST').'
|
||||
<button data-content="'.__('Close').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm text-white btn-warning mr-1"><i class="fas fa-times"></i></button>
|
||||
</form>
|
||||
<form class="d-inline" method="post" action="' . route('moderator.ticket.delete', ['ticket_id' => $tickets->ticket_id ]) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("POST") . '
|
||||
<button data-content="'.__("Delete").'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm text-white btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
<form class="d-inline" method="post" action="'.route('moderator.ticket.delete', ['ticket_id' => $tickets->ticket_id]).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('POST').'
|
||||
<button data-content="'.__('Delete').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm text-white btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
</form>
|
||||
';
|
||||
})
|
||||
|
|
@ -107,7 +115,7 @@ class TicketsController extends Controller
|
|||
break;
|
||||
}
|
||||
|
||||
return '<span class="badge ' . $badgeColor . '">' . $tickets->status . '</span>';
|
||||
return '<span class="badge '.$badgeColor.'">'.$tickets->status.'</span>';
|
||||
})
|
||||
->editColumn('updated_at', function (Ticket $tickets) {
|
||||
return $tickets->updated_at ? $tickets->updated_at->diffForHumans() : '';
|
||||
|
|
@ -116,84 +124,89 @@ class TicketsController extends Controller
|
|||
->make(true);
|
||||
}
|
||||
|
||||
public function blacklist() {
|
||||
return view("moderator.ticket.blacklist");
|
||||
public function blacklist()
|
||||
{
|
||||
return view('moderator.ticket.blacklist');
|
||||
}
|
||||
|
||||
public function blacklistAdd(Request $request) {
|
||||
public function blacklistAdd(Request $request)
|
||||
{
|
||||
$user = User::where('id', $request->user_id)->first();
|
||||
$check = TicketBlacklist::where('user_id', $user->id)->first();
|
||||
if($check){
|
||||
if ($check) {
|
||||
$check->reason = $request->reason;
|
||||
$check->status = "True";
|
||||
$check->status = 'True';
|
||||
$check->save();
|
||||
|
||||
return redirect()->back()->with('info', __('Target User already in blacklist. Reason updated'));
|
||||
}
|
||||
TicketBlacklist::create(array(
|
||||
"user_id" => $user->id,
|
||||
"status" => "True",
|
||||
"reason" => $request->reason,
|
||||
));
|
||||
return redirect()->back()->with('success', __('Successfully add User to blacklist, User name: ' . $user->name));
|
||||
TicketBlacklist::create([
|
||||
'user_id' => $user->id,
|
||||
'status' => 'True',
|
||||
'reason' => $request->reason,
|
||||
]);
|
||||
|
||||
return redirect()->back()->with('success', __('Successfully add User to blacklist, User name: '.$user->name));
|
||||
}
|
||||
|
||||
|
||||
public function blacklistDelete($id) {
|
||||
public function blacklistDelete($id)
|
||||
{
|
||||
$blacklist = TicketBlacklist::where('id', $id)->first();
|
||||
$blacklist->delete();
|
||||
return redirect()->back()->with('success', __('Successfully remove User from blacklist, User name: ' . $blacklist->user->name));
|
||||
|
||||
return redirect()->back()->with('success', __('Successfully remove User from blacklist, User name: '.$blacklist->user->name));
|
||||
}
|
||||
|
||||
public function blacklistChange($id) {
|
||||
public function blacklistChange($id)
|
||||
{
|
||||
$blacklist = TicketBlacklist::where('id', $id)->first();
|
||||
if($blacklist->status == "True")
|
||||
{
|
||||
$blacklist->status = "False";
|
||||
|
||||
if ($blacklist->status == 'True') {
|
||||
$blacklist->status = 'False';
|
||||
} else {
|
||||
$blacklist->status = "True";
|
||||
$blacklist->status = 'True';
|
||||
}
|
||||
$blacklist->update();
|
||||
return redirect()->back()->with('success', __('Successfully change status blacklist from, User name: ' . $blacklist->user->name));
|
||||
|
||||
return redirect()->back()->with('success', __('Successfully change status blacklist from, User name: '.$blacklist->user->name));
|
||||
}
|
||||
|
||||
public function dataTableBlacklist()
|
||||
{
|
||||
$query = TicketBlacklist::with(['user']);
|
||||
$query->select('ticket_blacklists.*');
|
||||
|
||||
return datatables($query)
|
||||
->editColumn('user', function (TicketBlacklist $blacklist) {
|
||||
return '<a href="' . route('admin.users.show', $blacklist->user->id) . '">' . $blacklist->user->name . '</a>';
|
||||
return '<a href="'.route('admin.users.show', $blacklist->user->id).'">'.$blacklist->user->name.'</a>';
|
||||
})
|
||||
->editColumn('status', function (TicketBlacklist $blacklist) {
|
||||
switch ($blacklist->status) {
|
||||
case 'True':
|
||||
$text = "Blocked";
|
||||
$text = 'Blocked';
|
||||
$badgeColor = 'badge-danger';
|
||||
break;
|
||||
default:
|
||||
$text = "Unblocked";
|
||||
$text = 'Unblocked';
|
||||
$badgeColor = 'badge-success';
|
||||
break;
|
||||
}
|
||||
|
||||
return '<span class="badge ' . $badgeColor . '">' . $text . '</span>';
|
||||
return '<span class="badge '.$badgeColor.'">'.$text.'</span>';
|
||||
})
|
||||
->editColumn('reason', function (TicketBlacklist $blacklist) {
|
||||
return $blacklist->reason;
|
||||
})
|
||||
->addColumn('actions', function (TicketBlacklist $blacklist) {
|
||||
return '
|
||||
<form class="d-inline" method="post" action="' . route('moderator.ticket.blacklist.change', ['id' => $blacklist->id ]) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("POST") . '
|
||||
<button data-content="'.__("Change Status").'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm text-white btn-warning mr-1"><i class="fas fa-sync-alt"></i></button>
|
||||
<form class="d-inline" method="post" action="'.route('moderator.ticket.blacklist.change', ['id' => $blacklist->id]).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('POST').'
|
||||
<button data-content="'.__('Change Status').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm text-white btn-warning mr-1"><i class="fas fa-sync-alt"></i></button>
|
||||
</form>
|
||||
<form class="d-inline" method="post" action="' . route('moderator.ticket.blacklist.delete', ['id' => $blacklist->id ]) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("POST") . '
|
||||
<button data-content="'.__("Delete").'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm text-white btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
<form class="d-inline" method="post" action="'.route('moderator.ticket.blacklist.delete', ['id' => $blacklist->id]).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('POST').'
|
||||
<button data-content="'.__('Delete').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm text-white btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
</form>
|
||||
';
|
||||
})
|
||||
|
|
@ -203,5 +216,4 @@ class TicketsController extends Controller
|
|||
->rawColumns(['user', 'status', 'reason', 'created_at', 'actions'])
|
||||
->make(true);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,8 +10,9 @@ class NotificationController extends Controller
|
|||
public function index()
|
||||
{
|
||||
$notifications = Auth::user()->notifications()->paginate();
|
||||
|
||||
return view('notifications.index')->with([
|
||||
'notifications' => $notifications
|
||||
'notifications' => $notifications,
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -21,17 +22,19 @@ class NotificationController extends Controller
|
|||
$notification = Auth::user()->notifications()->findOrFail($id);
|
||||
|
||||
$notification->markAsRead();
|
||||
|
||||
return view('notifications.show')->with([
|
||||
'notification' => $notification
|
||||
'notification' => $notification,
|
||||
]);
|
||||
}
|
||||
|
||||
public function readAll(){
|
||||
public function readAll()
|
||||
{
|
||||
$notifications = Auth::user()->notifications()->get();
|
||||
foreach($notifications as $notification){
|
||||
foreach ($notifications as $notification) {
|
||||
$notification->markAsRead();
|
||||
}
|
||||
return redirect()->back();
|
||||
|
||||
return redirect()->back();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,23 +21,23 @@ class PartnerController extends Controller
|
|||
public function create()
|
||||
{
|
||||
return view('admin.partners.create', [
|
||||
'partners' =>PartnerDiscount::get(),
|
||||
'users' => User::orderBy('name')->get()
|
||||
'partners' => PartnerDiscount::get(),
|
||||
'users' => User::orderBy('name')->get(),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'user_id' => 'required|integer|min:0',
|
||||
'partner_discount' => 'required|integer|max:100|min:0',
|
||||
'registered_user_discount' => 'required|integer|max:100|min:0'
|
||||
'user_id' => 'required|integer|min:0',
|
||||
'partner_discount' => 'required|integer|max:100|min:0',
|
||||
'registered_user_discount' => 'required|integer|max:100|min:0',
|
||||
]);
|
||||
|
||||
PartnerDiscount::create($request->all());
|
||||
|
|
@ -48,7 +48,7 @@ class PartnerController extends Controller
|
|||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param Voucher $voucher
|
||||
* @param Voucher $voucher
|
||||
* @return Response
|
||||
*/
|
||||
public function show(Voucher $voucher)
|
||||
|
|
@ -59,32 +59,32 @@ class PartnerController extends Controller
|
|||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param Voucher $voucher
|
||||
* @param Voucher $voucher
|
||||
* @return Application|Factory|View
|
||||
*/
|
||||
public function edit(PartnerDiscount $partner)
|
||||
{
|
||||
return view('admin.partners.edit', [
|
||||
'partners' =>PartnerDiscount::get(),
|
||||
'partner' => $partner,
|
||||
'users' => User::orderBy('name')->get()
|
||||
'partners' => PartnerDiscount::get(),
|
||||
'partner' => $partner,
|
||||
'users' => User::orderBy('name')->get(),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Voucher $voucher
|
||||
* @param Request $request
|
||||
* @param Voucher $voucher
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(Request $request, PartnerDiscount $partner)
|
||||
{
|
||||
//dd($request);
|
||||
$request->validate([
|
||||
'user_id' => 'required|integer|min:0',
|
||||
'partner_discount' => 'required|integer|max:100|min:0',
|
||||
'registered_user_discount' => 'required|integer|max:100|min:0'
|
||||
'user_id' => 'required|integer|min:0',
|
||||
'partner_discount' => 'required|integer|max:100|min:0',
|
||||
'registered_user_discount' => 'required|integer|max:100|min:0',
|
||||
]);
|
||||
|
||||
$partner->update($request->all());
|
||||
|
|
@ -95,61 +95,71 @@ class PartnerController extends Controller
|
|||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Voucher $voucher
|
||||
* @param Voucher $voucher
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function destroy(PartnerDiscount $partner)
|
||||
{
|
||||
$partner->delete();
|
||||
|
||||
return redirect()->back()->with('success', __('partner has been removed!'));
|
||||
}
|
||||
|
||||
public function users(Voucher $voucher)
|
||||
{
|
||||
return view('admin.vouchers.users', [
|
||||
'voucher' => $voucher
|
||||
'voucher' => $voucher,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Request $request
|
||||
* @param Request $request
|
||||
* @return JsonResponse
|
||||
*
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function redeem(Request $request)
|
||||
{
|
||||
#general validations
|
||||
//general validations
|
||||
$request->validate([
|
||||
'code' => 'required|exists:vouchers,code'
|
||||
'code' => 'required|exists:vouchers,code',
|
||||
]);
|
||||
|
||||
#get voucher by code
|
||||
//get voucher by code
|
||||
$voucher = Voucher::where('code', '=', $request->input('code'))->firstOrFail();
|
||||
|
||||
#extra validations
|
||||
if ($voucher->getStatus() == 'USES_LIMIT_REACHED') throw ValidationException::withMessages([
|
||||
'code' => __('This voucher has reached the maximum amount of uses')
|
||||
]);
|
||||
//extra validations
|
||||
if ($voucher->getStatus() == 'USES_LIMIT_REACHED') {
|
||||
throw ValidationException::withMessages([
|
||||
'code' => __('This voucher has reached the maximum amount of uses'),
|
||||
]);
|
||||
}
|
||||
|
||||
if ($voucher->getStatus() == 'EXPIRED') throw ValidationException::withMessages([
|
||||
'code' => __('This voucher has expired')
|
||||
]);
|
||||
if ($voucher->getStatus() == 'EXPIRED') {
|
||||
throw ValidationException::withMessages([
|
||||
'code' => __('This voucher has expired'),
|
||||
]);
|
||||
}
|
||||
|
||||
if (!$request->user()->vouchers()->where('id', '=', $voucher->id)->get()->isEmpty()) throw ValidationException::withMessages([
|
||||
'code' => __('You already redeemed this voucher code')
|
||||
]);
|
||||
if (! $request->user()->vouchers()->where('id', '=', $voucher->id)->get()->isEmpty()) {
|
||||
throw ValidationException::withMessages([
|
||||
'code' => __('You already redeemed this voucher code'),
|
||||
]);
|
||||
}
|
||||
|
||||
if ($request->user()->credits + $voucher->credits >= 99999999) throw ValidationException::withMessages([
|
||||
'code' => "You can't redeem this voucher because you would exceed the limit of " . CREDITS_DISPLAY_NAME
|
||||
]);
|
||||
if ($request->user()->credits + $voucher->credits >= 99999999) {
|
||||
throw ValidationException::withMessages([
|
||||
'code' => "You can't redeem this voucher because you would exceed the limit of ".CREDITS_DISPLAY_NAME,
|
||||
]);
|
||||
}
|
||||
|
||||
#redeem voucher
|
||||
//redeem voucher
|
||||
$voucher->redeem($request->user());
|
||||
|
||||
event(new UserUpdateCreditsEvent($request->user()));
|
||||
|
||||
return response()->json([
|
||||
'success' => "{$voucher->credits} " . CREDITS_DISPLAY_NAME ." ". __("have been added to your balance!")
|
||||
'success' => "{$voucher->credits} ".CREDITS_DISPLAY_NAME.' '.__('have been added to your balance!'),
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -159,10 +169,10 @@ class PartnerController extends Controller
|
|||
|
||||
return datatables($users)
|
||||
->editColumn('name', function (User $user) {
|
||||
return '<a class="text-info" target="_blank" href="' . route('admin.users.show', $user->id) . '">' . $user->name . '</a>';
|
||||
return '<a class="text-info" target="_blank" href="'.route('admin.users.show', $user->id).'">'.$user->name.'</a>';
|
||||
})
|
||||
->addColumn('credits', function (User $user) {
|
||||
return '<i class="fas fa-coins mr-2"></i> ' . $user->credits();
|
||||
return '<i class="fas fa-coins mr-2"></i> '.$user->credits();
|
||||
})
|
||||
->addColumn('last_seen', function (User $user) {
|
||||
return $user->last_seen ? $user->last_seen->diffForHumans() : '';
|
||||
|
|
@ -170,6 +180,7 @@ class PartnerController extends Controller
|
|||
->rawColumns(['name', 'credits', 'last_seen'])
|
||||
->make();
|
||||
}
|
||||
|
||||
public function dataTable()
|
||||
{
|
||||
$query = PartnerDiscount::query();
|
||||
|
|
@ -177,30 +188,30 @@ class PartnerController extends Controller
|
|||
return datatables($query)
|
||||
->addColumn('actions', function (PartnerDiscount $partner) {
|
||||
return '
|
||||
<a data-content="'.__("Edit").'" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.partners.edit', $partner->id) . '" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.partners.destroy', $partner->id) . '">
|
||||
' . csrf_field() . '
|
||||
' . method_field("DELETE") . '
|
||||
<button data-content="'.__("Delete").'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
<a data-content="'.__('Edit').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.partners.edit', $partner->id).'" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
||||
<form class="d-inline" onsubmit="return submitResult();" method="post" action="'.route('admin.partners.destroy', $partner->id).'">
|
||||
'.csrf_field().'
|
||||
'.method_field('DELETE').'
|
||||
<button data-content="'.__('Delete').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
||||
</form>
|
||||
';
|
||||
})
|
||||
->addColumn('user', function (PartnerDiscount $partner) {
|
||||
return ($user=User::where('id', $partner->user_id)->first())?'<a href="'.route('admin.users.show', $partner->user_id).'">'.$user->name.'</a>':__('Unknown user');
|
||||
return ($user = User::where('id', $partner->user_id)->first()) ? '<a href="'.route('admin.users.show', $partner->user_id).'">'.$user->name.'</a>' : __('Unknown user');
|
||||
})
|
||||
->editColumn('created_at', function (PartnerDiscount $partner) {
|
||||
return $partner->created_at ? $partner->created_at->diffForHumans() : '';
|
||||
})
|
||||
->editColumn('partner_discount', function (PartnerDiscount $partner) {
|
||||
return $partner->partner_discount ? $partner->partner_discount . "%" : "0%";
|
||||
return $partner->partner_discount ? $partner->partner_discount.'%' : '0%';
|
||||
})
|
||||
->editColumn('registered_user_discount', function (PartnerDiscount $partner) {
|
||||
return $partner->registered_user_discount ? $partner->registered_user_discount . "%" : "0%";
|
||||
return $partner->registered_user_discount ? $partner->registered_user_discount.'%' : '0%';
|
||||
})
|
||||
->editColumn('referral_system_commission', function (PartnerDiscount $partner) {
|
||||
return $partner->referral_system_commission>=0 ? $partner->referral_system_commission . "%" : __('Default') . " (" . config("SETTINGS::REFERRAL:PERCENTAGE") . "%)";
|
||||
return $partner->referral_system_commission >= 0 ? $partner->referral_system_commission.'%' : __('Default').' ('.config('SETTINGS::REFERRAL:PERCENTAGE').'%)';
|
||||
})
|
||||
->rawColumns(['user', 'actions'])
|
||||
->make();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,15 +16,18 @@ class ProductController extends Controller
|
|||
{
|
||||
/**
|
||||
* @description get product locations based on selected egg
|
||||
* @param Request $request
|
||||
* @param Egg $egg
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Egg $egg
|
||||
* @return Collection|JsonResponse
|
||||
*/
|
||||
public function getNodesBasedOnEgg(Request $request, Egg $egg)
|
||||
{
|
||||
if (is_null($egg->id)) return response()->json('Egg ID is required', '400');
|
||||
if (is_null($egg->id)) {
|
||||
return response()->json('Egg ID is required', '400');
|
||||
}
|
||||
|
||||
#get products that include this egg
|
||||
//get products that include this egg
|
||||
$products = Product::query()
|
||||
->with('nodes')
|
||||
->where('disabled', '=', false)
|
||||
|
|
@ -34,31 +37,33 @@ class ProductController extends Controller
|
|||
|
||||
$nodes = collect();
|
||||
|
||||
#filter unique nodes
|
||||
//filter unique nodes
|
||||
$products->each(function (Product $product) use ($nodes) {
|
||||
$product->nodes->each(function (Node $node) use ($nodes) {
|
||||
if (!$nodes->contains('id', $node->id) && !$node->disabled) {
|
||||
if (! $nodes->contains('id', $node->id) && ! $node->disabled) {
|
||||
$nodes->add($node);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
return $nodes;
|
||||
}
|
||||
|
||||
/**
|
||||
* @description get product locations based on selected egg
|
||||
* @param Request $request
|
||||
* @param Egg $egg
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Egg $egg
|
||||
* @return Collection|JsonResponse
|
||||
*/
|
||||
public function getLocationsBasedOnEgg(Request $request, Egg $egg)
|
||||
{
|
||||
$nodes = $this->getNodesBasedOnEgg($request, $egg);
|
||||
foreach($nodes as $key => $node){
|
||||
foreach ($nodes as $key => $node) {
|
||||
$pteroNode = Pterodactyl::getNode($node->id);
|
||||
if($pteroNode['allocated_resources']['memory']>=($pteroNode['memory']*($pteroNode['memory_overallocate']+100)/100)||$pteroNode['allocated_resources']['disk']>=($pteroNode['disk']*($pteroNode['disk_overallocate']+100)/100)) $nodes->forget($key);
|
||||
if ($pteroNode['allocated_resources']['memory'] >= ($pteroNode['memory'] * ($pteroNode['memory_overallocate'] + 100) / 100) || $pteroNode['allocated_resources']['disk'] >= ($pteroNode['disk'] * ($pteroNode['disk_overallocate'] + 100) / 100)) {
|
||||
$nodes->forget($key);
|
||||
}
|
||||
}
|
||||
$locations = collect();
|
||||
|
||||
|
|
@ -67,7 +72,7 @@ class ProductController extends Controller
|
|||
/** @var Location $location */
|
||||
$location = $node->location;
|
||||
|
||||
if (!$locations->contains('id', $location->id)) {
|
||||
if (! $locations->contains('id', $location->id)) {
|
||||
$nodeIds = $nodes->map(function ($node) {
|
||||
return $node->id;
|
||||
});
|
||||
|
|
@ -84,13 +89,15 @@ class ProductController extends Controller
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Node $node
|
||||
* @param Egg $egg
|
||||
* @param Node $node
|
||||
* @param Egg $egg
|
||||
* @return Collection|JsonResponse
|
||||
*/
|
||||
public function getProductsBasedOnNode(Egg $egg, Node $node)
|
||||
{
|
||||
if (is_null($egg->id) || is_null($node->id)) return response()->json('node and egg id is required', '400');
|
||||
if (is_null($egg->id) || is_null($node->id)) {
|
||||
return response()->json('node and egg id is required', '400');
|
||||
}
|
||||
|
||||
$products = Product::query()
|
||||
->where('disabled', '=', false)
|
||||
|
|
@ -103,8 +110,10 @@ class ProductController extends Controller
|
|||
->get();
|
||||
|
||||
$pteroNode = Pterodactyl::getNode($node->id);
|
||||
foreach($products as $key => $product){
|
||||
if($product->memory>($pteroNode['memory']*($pteroNode['memory_overallocate']+100)/100)-$pteroNode['allocated_resources']['memory']||$product->disk>($pteroNode['disk']*($pteroNode['disk_overallocate']+100)/100)-$pteroNode['allocated_resources']['disk']) $product->doesNotFit = true;
|
||||
foreach ($products as $key => $product) {
|
||||
if ($product->memory > ($pteroNode['memory'] * ($pteroNode['memory_overallocate'] + 100) / 100) - $pteroNode['allocated_resources']['memory'] || $product->disk > ($pteroNode['disk'] * ($pteroNode['disk_overallocate'] + 100) / 100) - $pteroNode['allocated_resources']['disk']) {
|
||||
$product->doesNotFit = true;
|
||||
}
|
||||
}
|
||||
|
||||
return $products;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
|
||||
use App\Classes\Pterodactyl;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
|
|
@ -30,6 +29,7 @@ class ProfileController extends Controller
|
|||
$badgeColor = 'badge-secondary';
|
||||
break;
|
||||
}
|
||||
|
||||
return view('profile.index')->with([
|
||||
'user' => Auth::user(),
|
||||
'credits_reward_after_verify_discord' => config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD'),
|
||||
|
|
@ -39,80 +39,81 @@ class ProfileController extends Controller
|
|||
]);
|
||||
}
|
||||
|
||||
public function selfDestroyUser()
|
||||
{
|
||||
$user = Auth::user();
|
||||
//if ($user->role == "admin") return back()->with("error", "You cannot delete yourself as an admin!");
|
||||
|
||||
$user->delete();
|
||||
|
||||
public function selfDestroyUser(){
|
||||
|
||||
$user = Auth::user();
|
||||
//if ($user->role == "admin") return back()->with("error", "You cannot delete yourself as an admin!");
|
||||
|
||||
$user->delete();
|
||||
return redirect("/login")->with('success', __("Account permanently deleted!"));
|
||||
|
||||
return redirect('/login')->with('success', __('Account permanently deleted!'));
|
||||
}
|
||||
|
||||
/** Update the specified resource in storage.
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(Request $request, int $id)
|
||||
{
|
||||
//prevent other users from editing a user
|
||||
if ($id != Auth::user()->id) dd(401);
|
||||
if ($id != Auth::user()->id) {
|
||||
dd(401);
|
||||
}
|
||||
$user = User::findOrFail($id);
|
||||
|
||||
//update password if necessary
|
||||
if (!is_null($request->input('new_password'))) {
|
||||
if (! is_null($request->input('new_password'))) {
|
||||
|
||||
//validate password request
|
||||
$request->validate([
|
||||
'current_password' => [
|
||||
'required',
|
||||
function ($attribute, $value, $fail) use ($user) {
|
||||
if (!Hash::check($value, $user->password)) {
|
||||
$fail('The ' . $attribute . ' is invalid.');
|
||||
if (! Hash::check($value, $user->password)) {
|
||||
$fail('The '.$attribute.' is invalid.');
|
||||
}
|
||||
},
|
||||
],
|
||||
'new_password' => 'required|string|min:8',
|
||||
'new_password_confirmation' => 'required|same:new_password'
|
||||
'new_password_confirmation' => 'required|same:new_password',
|
||||
]);
|
||||
|
||||
//Update Users Password on Pterodactyl
|
||||
//Username,Mail,First and Lastname are required aswell
|
||||
$response = Pterodactyl::client()->patch('/application/users/'.$user->pterodactyl_id, [
|
||||
"password" => $request->input('new_password'),
|
||||
"username" => $request->input('name'),
|
||||
"first_name" => $request->input('name'),
|
||||
"last_name" => $request->input('name'),
|
||||
"email" => $request->input('email'),
|
||||
'password' => $request->input('new_password'),
|
||||
'username' => $request->input('name'),
|
||||
'first_name' => $request->input('name'),
|
||||
'last_name' => $request->input('name'),
|
||||
'email' => $request->input('email'),
|
||||
|
||||
]);
|
||||
if ($response->failed()) {
|
||||
throw ValidationException::withMessages([
|
||||
'pterodactyl_error_message' => $response->toException()->getMessage(),
|
||||
'pterodactyl_error_status' => $response->toException()->getCode()
|
||||
'pterodactyl_error_status' => $response->toException()->getCode(),
|
||||
]);
|
||||
}
|
||||
//update password
|
||||
$user->update([
|
||||
'password' => Hash::make($request->input('new_password')),
|
||||
]);
|
||||
|
||||
}
|
||||
|
||||
//validate request
|
||||
$request->validate([
|
||||
'name' => 'required|min:4|max:30|alpha_num|unique:users,name,' . $id . ',id',
|
||||
'email' => 'required|email|max:64|unique:users,email,' . $id . ',id',
|
||||
'avatar' => 'nullable'
|
||||
'name' => 'required|min:4|max:30|alpha_num|unique:users,name,'.$id.',id',
|
||||
'email' => 'required|email|max:64|unique:users,email,'.$id.',id',
|
||||
'avatar' => 'nullable',
|
||||
]);
|
||||
|
||||
//update avatar
|
||||
if (!is_null($request->input('avatar'))) {
|
||||
if (! is_null($request->input('avatar'))) {
|
||||
$avatar = json_decode($request->input('avatar'));
|
||||
if ($avatar->input->size > 3000000) abort(500);
|
||||
if ($avatar->input->size > 3000000) {
|
||||
abort(500);
|
||||
}
|
||||
|
||||
$user->update([
|
||||
'avatar' => $avatar->output->image,
|
||||
|
|
@ -125,16 +126,16 @@ class ProfileController extends Controller
|
|||
|
||||
//update name and email on Pterodactyl
|
||||
$response = Pterodactyl::client()->patch('/application/users/'.$user->pterodactyl_id, [
|
||||
"username" => $request->input('name'),
|
||||
"first_name" => $request->input('name'),
|
||||
"last_name" => $request->input('name'),
|
||||
"email" => $request->input('email'),
|
||||
'username' => $request->input('name'),
|
||||
'first_name' => $request->input('name'),
|
||||
'last_name' => $request->input('name'),
|
||||
'email' => $request->input('email'),
|
||||
]);
|
||||
|
||||
if ($response->failed()) {
|
||||
throw ValidationException::withMessages([
|
||||
'pterodactyl_error_message' => $response->toException()->getMessage(),
|
||||
'pterodactyl_error_status' => $response->toException()->getCode()
|
||||
'pterodactyl_error_status' => $response->toException()->getCode(),
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -147,7 +148,7 @@ class ProfileController extends Controller
|
|||
if ($request->input('email') != Auth::user()->email) {
|
||||
$user->reVerifyEmail();
|
||||
$user->sendEmailVerificationNotification();
|
||||
};
|
||||
}
|
||||
|
||||
return redirect()->route('profile.index')->with('success', __('Profile updated'));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,9 @@ class ServerController extends Controller
|
|||
|
||||
//Get server infos from ptero
|
||||
$serverAttributes = Pterodactyl::getServerAttributes($server->pterodactyl_id, true);
|
||||
if(!$serverAttributes) continue;
|
||||
if (! $serverAttributes) {
|
||||
continue;
|
||||
}
|
||||
$serverRelationships = $serverAttributes['relationships'];
|
||||
$serverLocationAttributes = $serverRelationships['location']['attributes'];
|
||||
|
||||
|
|
@ -47,7 +49,7 @@ class ServerController extends Controller
|
|||
|
||||
//Check if a server got renamed on Pterodactyl
|
||||
$savedServer = Server::query()->where('id', $server->id)->first();
|
||||
if($savedServer->name != $serverAttributes['name']){
|
||||
if ($savedServer->name != $serverAttributes['name']) {
|
||||
$savedServer->name = $serverAttributes['name'];
|
||||
$server->name = $serverAttributes['name'];
|
||||
$savedServer->save();
|
||||
|
|
@ -59,14 +61,16 @@ class ServerController extends Controller
|
|||
}
|
||||
|
||||
return view('servers.index')->with([
|
||||
'servers' => $servers
|
||||
'servers' => $servers,
|
||||
]);
|
||||
}
|
||||
|
||||
/** Show the form for creating a new resource. */
|
||||
public function create()
|
||||
{
|
||||
if (!is_null($this->validateConfigurationRules())) return $this->validateConfigurationRules();
|
||||
if (! is_null($this->validateConfigurationRules())) {
|
||||
return $this->validateConfigurationRules();
|
||||
}
|
||||
|
||||
$productCount = Product::query()->where('disabled', '=', false)->count();
|
||||
$locations = Location::all();
|
||||
|
|
@ -90,11 +94,11 @@ class ServerController extends Controller
|
|||
|
||||
return view('servers.create')->with([
|
||||
'productCount' => $productCount,
|
||||
'nodeCount' => $nodeCount,
|
||||
'nests' => $nests,
|
||||
'locations' => $locations,
|
||||
'eggs' => $eggs,
|
||||
'user' => Auth::user(),
|
||||
'nodeCount' => $nodeCount,
|
||||
'nests' => $nests,
|
||||
'locations' => $locations,
|
||||
'eggs' => $eggs,
|
||||
'user' => Auth::user(),
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -109,8 +113,8 @@ class ServerController extends Controller
|
|||
}
|
||||
|
||||
// minimum credits && Check for Allocation
|
||||
if (FacadesRequest::has("product")) {
|
||||
$product = Product::findOrFail(FacadesRequest::input("product"));
|
||||
if (FacadesRequest::has('product')) {
|
||||
$product = Product::findOrFail(FacadesRequest::input('product'));
|
||||
|
||||
// Get node resource allocation info
|
||||
$node = $product->nodes()->findOrFail(FacadesRequest::input('node'));
|
||||
|
|
@ -118,7 +122,9 @@ class ServerController extends Controller
|
|||
|
||||
// Check if node has enough memory and disk space
|
||||
$checkResponse = Pterodactyl::checkNodeResources($node, $product->memory, $product->disk);
|
||||
if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to allocate this product."));
|
||||
if ($checkResponse == false) {
|
||||
return redirect()->route('servers.index')->with('error', __("The node '".$nodeName."' doesn't have the required memory or disk left to allocate this product."));
|
||||
}
|
||||
|
||||
// Min. Credits
|
||||
if (
|
||||
|
|
@ -127,24 +133,24 @@ class ServerController extends Controller
|
|||
? config('SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER', 50)
|
||||
: $product->minimum_credits)
|
||||
) {
|
||||
return redirect()->route('servers.index')->with('error', "You do not have the required amount of " . CREDITS_DISPLAY_NAME . " to use this product!");
|
||||
return redirect()->route('servers.index')->with('error', 'You do not have the required amount of '.CREDITS_DISPLAY_NAME.' to use this product!');
|
||||
}
|
||||
}
|
||||
|
||||
//Required Verification for creating an server
|
||||
if (config('SETTINGS::USER:FORCE_EMAIL_VERIFICATION', 'false') === 'true' && !Auth::user()->hasVerifiedEmail()) {
|
||||
return redirect()->route('profile.index')->with('error', __("You are required to verify your email address before you can create a server."));
|
||||
}
|
||||
|
||||
//Required Verification for creating an server
|
||||
|
||||
if (!config('SETTINGS::SYSTEM:CREATION_OF_NEW_SERVERS', 'true') && Auth::user()->role != "admin") {
|
||||
return redirect()->route('servers.index')->with('error', __("The system administrator has blocked the creation of new servers."));
|
||||
if (config('SETTINGS::USER:FORCE_EMAIL_VERIFICATION', 'false') === 'true' && ! Auth::user()->hasVerifiedEmail()) {
|
||||
return redirect()->route('profile.index')->with('error', __('You are required to verify your email address before you can create a server.'));
|
||||
}
|
||||
|
||||
//Required Verification for creating an server
|
||||
if (config('SETTINGS::USER:FORCE_DISCORD_VERIFICATION', 'false') === 'true' && !Auth::user()->discordUser) {
|
||||
return redirect()->route('profile.index')->with('error', __("You are required to link your discord account before you can create a server."));
|
||||
|
||||
if (! config('SETTINGS::SYSTEM:CREATION_OF_NEW_SERVERS', 'true') && Auth::user()->role != 'admin') {
|
||||
return redirect()->route('servers.index')->with('error', __('The system administrator has blocked the creation of new servers.'));
|
||||
}
|
||||
|
||||
//Required Verification for creating an server
|
||||
if (config('SETTINGS::USER:FORCE_DISCORD_VERIFICATION', 'false') === 'true' && ! Auth::user()->discordUser) {
|
||||
return redirect()->route('profile.index')->with('error', __('You are required to link your discord account before you can create a server.'));
|
||||
}
|
||||
|
||||
return null;
|
||||
|
|
@ -156,14 +162,15 @@ class ServerController extends Controller
|
|||
/** @var Node $node */
|
||||
/** @var Egg $egg */
|
||||
/** @var Product $product */
|
||||
|
||||
if (!is_null($this->validateConfigurationRules())) return $this->validateConfigurationRules();
|
||||
if (! is_null($this->validateConfigurationRules())) {
|
||||
return $this->validateConfigurationRules();
|
||||
}
|
||||
|
||||
$request->validate([
|
||||
"name" => "required|max:191",
|
||||
"node" => "required|exists:nodes,id",
|
||||
"egg" => "required|exists:eggs,id",
|
||||
"product" => "required|exists:products,id"
|
||||
'name' => 'required|max:191',
|
||||
'node' => 'required|exists:nodes,id',
|
||||
'egg' => 'required|exists:eggs,id',
|
||||
'product' => 'required|exists:products,id',
|
||||
]);
|
||||
|
||||
//get required resources
|
||||
|
|
@ -172,23 +179,27 @@ class ServerController extends Controller
|
|||
$node = $product->nodes()->findOrFail($request->input('node'));
|
||||
|
||||
$server = $request->user()->servers()->create([
|
||||
'name' => $request->input('name'),
|
||||
'name' => $request->input('name'),
|
||||
'product_id' => $request->input('product'),
|
||||
]);
|
||||
|
||||
//get free allocation ID
|
||||
$allocationId = Pterodactyl::getFreeAllocationId($node);
|
||||
if (!$allocationId) return $this->noAllocationsError($server);
|
||||
if (! $allocationId) {
|
||||
return $this->noAllocationsError($server);
|
||||
}
|
||||
|
||||
//create server on pterodactyl
|
||||
$response = Pterodactyl::createServer($server, $egg, $allocationId);
|
||||
if ($response->failed()) return $this->serverCreationFailed($response, $server);
|
||||
if ($response->failed()) {
|
||||
return $this->serverCreationFailed($response, $server);
|
||||
}
|
||||
|
||||
$serverAttributes = $response->json()['attributes'];
|
||||
//update server with pterodactyl_id
|
||||
$server->update([
|
||||
'pterodactyl_id' => $serverAttributes['id'],
|
||||
'identifier' => $serverAttributes['identifier']
|
||||
'identifier' => $serverAttributes['identifier'],
|
||||
]);
|
||||
|
||||
if (config('SETTINGS::SYSTEM:SERVER_CREATE_CHARGE_FIRST_HOUR', 'true') == 'true') {
|
||||
|
|
@ -202,7 +213,8 @@ class ServerController extends Controller
|
|||
|
||||
/**
|
||||
* return redirect with error
|
||||
* @param Server $server
|
||||
*
|
||||
* @param Server $server
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
private function noAllocationsError(Server $server)
|
||||
|
|
@ -210,13 +222,15 @@ class ServerController extends Controller
|
|||
$server->delete();
|
||||
|
||||
Auth::user()->notify(new ServerCreationError($server));
|
||||
|
||||
return redirect()->route('servers.index')->with('error', __('No allocations satisfying the requirements for automatic deployment on this node were found.'));
|
||||
}
|
||||
|
||||
/**
|
||||
* return redirect with error
|
||||
* @param Response $response
|
||||
* @param Server $server
|
||||
*
|
||||
* @param Response $response
|
||||
* @param Server $server
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
private function serverCreationFailed(Response $response, Server $server)
|
||||
|
|
@ -231,18 +245,19 @@ class ServerController extends Controller
|
|||
{
|
||||
try {
|
||||
$server->delete();
|
||||
|
||||
return redirect()->route('servers.index')->with('success', __('Server removed'));
|
||||
} catch (Exception $e) {
|
||||
return redirect()->route('servers.index')->with('error', __('An exception has occurred while trying to remove a resource "') . $e->getMessage() . '"');
|
||||
return redirect()->route('servers.index')->with('error', __('An exception has occurred while trying to remove a resource "').$e->getMessage().'"');
|
||||
}
|
||||
}
|
||||
|
||||
/** Show Server Settings */
|
||||
public function show(Server $server)
|
||||
{
|
||||
|
||||
|
||||
if($server->user_id != Auth::user()->id){ return back()->with('error', __('´This is not your Server!'));}
|
||||
if ($server->user_id != Auth::user()->id) {
|
||||
return back()->with('error', __('´This is not your Server!'));
|
||||
}
|
||||
$serverAttributes = Pterodactyl::getServerAttributes($server->pterodactyl_id);
|
||||
$serverRelationships = $serverAttributes['relationships'];
|
||||
$serverLocationAttributes = $serverRelationships['location']['attributes'];
|
||||
|
|
@ -261,7 +276,7 @@ class ServerController extends Controller
|
|||
|
||||
$pteroNode = Pterodactyl::getNode($serverRelationships['node']['attributes']['id']);
|
||||
|
||||
$products = Product::orderBy("created_at")
|
||||
$products = Product::orderBy('created_at')
|
||||
->whereHas('nodes', function (Builder $builder) use ($serverRelationships) { //Only show products for that node
|
||||
$builder->where('id', '=', $serverRelationships['node']['attributes']['id']);
|
||||
})
|
||||
|
|
@ -270,20 +285,23 @@ class ServerController extends Controller
|
|||
// Set the each product eggs array to just contain the eggs name
|
||||
foreach ($products as $product) {
|
||||
$product->eggs = $product->eggs->pluck('name')->toArray();
|
||||
if($product->memory-$currentProduct->memory>($pteroNode['memory']*($pteroNode['memory_overallocate']+100)/100)-$pteroNode['allocated_resources']['memory']||$product->disk-$currentProduct->disk>($pteroNode['disk']*($pteroNode['disk_overallocate']+100)/100)-$pteroNode['allocated_resources']['disk']) $product->doesNotFit = true;
|
||||
if ($product->memory - $currentProduct->memory > ($pteroNode['memory'] * ($pteroNode['memory_overallocate'] + 100) / 100) - $pteroNode['allocated_resources']['memory'] || $product->disk - $currentProduct->disk > ($pteroNode['disk'] * ($pteroNode['disk_overallocate'] + 100) / 100) - $pteroNode['allocated_resources']['disk']) {
|
||||
$product->doesNotFit = true;
|
||||
}
|
||||
}
|
||||
|
||||
return view('servers.settings')->with([
|
||||
'server' => $server,
|
||||
'products' => $products
|
||||
'products' => $products,
|
||||
]);
|
||||
}
|
||||
|
||||
public function upgrade(Server $server, Request $request)
|
||||
{
|
||||
if($server->user_id != Auth::user()->id) return redirect()->route('servers.index');
|
||||
if(!isset($request->product_upgrade))
|
||||
{
|
||||
if ($server->user_id != Auth::user()->id) {
|
||||
return redirect()->route('servers.index');
|
||||
}
|
||||
if (! isset($request->product_upgrade)) {
|
||||
return redirect()->route('servers.show', ['server' => $server->id])->with('error', __('this product is the only one'));
|
||||
}
|
||||
$user = Auth::user();
|
||||
|
|
@ -299,32 +317,35 @@ class ServerController extends Controller
|
|||
|
||||
// Check if node has enough memory and disk space
|
||||
$requireMemory = $newProduct->memory - $oldProduct->memory;
|
||||
$requiredisk = $newProduct->disk - $oldProduct->disk;
|
||||
$requiredisk = $newProduct->disk - $oldProduct->disk;
|
||||
$checkResponse = Pterodactyl::checkNodeResources($node, $requireMemory, $requiredisk);
|
||||
if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to upgrade the server."));
|
||||
if ($checkResponse == false) {
|
||||
return redirect()->route('servers.index')->with('error', __("The node '".$nodeName."' doesn't have the required memory or disk left to upgrade the server."));
|
||||
}
|
||||
|
||||
$priceupgrade = $newProduct->getHourlyPrice();
|
||||
|
||||
if ($priceupgrade < $oldProduct->getHourlyPrice()) {
|
||||
$priceupgrade = 0;
|
||||
$priceupgrade = 0;
|
||||
}
|
||||
if ($user->credits >= $priceupgrade && $user->credits >= $newProduct->minimum_credits)
|
||||
{
|
||||
|
||||
if ($user->credits >= $priceupgrade && $user->credits >= $newProduct->minimum_credits) {
|
||||
$server->product_id = $request->product_upgrade;
|
||||
$server->update();
|
||||
$server->allocation = $serverAttributes['allocation'];
|
||||
$response = Pterodactyl::updateServer($server, $newProduct);
|
||||
if ($response->failed()) return $this->serverCreationFailed($response, $server);
|
||||
if ($response->failed()) {
|
||||
return $this->serverCreationFailed($response, $server);
|
||||
}
|
||||
//update user balance
|
||||
$user->decrement('credits', $priceupgrade);
|
||||
//restart the server
|
||||
$response = Pterodactyl::powerAction($server, "restart");
|
||||
if ($response->failed()) return redirect()->route('servers.index')->with('error', $response->json()['errors'][0]['detail']);
|
||||
$response = Pterodactyl::powerAction($server, 'restart');
|
||||
if ($response->failed()) {
|
||||
return redirect()->route('servers.index')->with('error', $response->json()['errors'][0]['detail']);
|
||||
}
|
||||
|
||||
return redirect()->route('servers.show', ['server' => $server->id])->with('success', __('Server Successfully Upgraded'));
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
return redirect()->route('servers.show', ['server' => $server->id])->with('error', __('Not Enough Balance for Upgrade'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\ShopProduct;
|
||||
use App\Models\Settings;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class StoreController extends Controller
|
||||
|
|
@ -15,18 +14,20 @@ class StoreController extends Controller
|
|||
|
||||
if (
|
||||
env('APP_ENV') == 'local' ||
|
||||
config("SETTINGS::PAYMENTS:PAYPAL:SECRET") && config("SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID") ||
|
||||
config("SETTINGS::PAYMENTS:STRIPE:SECRET") && config("SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET") && config("SETTINGS::PAYMENTS:STRIPE:METHODS")
|
||||
) $isPaymentSetup = true;
|
||||
|
||||
//Required Verification for creating an server
|
||||
if (config('SETTINGS::USER:FORCE_EMAIL_VERIFICATION', false) === 'true' && !Auth::user()->hasVerifiedEmail()) {
|
||||
return redirect()->route('profile.index')->with('error', __("You are required to verify your email address before you can purchase credits."));
|
||||
config('SETTINGS::PAYMENTS:PAYPAL:SECRET') && config('SETTINGS::PAYMENTS:PAYPAL:CLIENT_ID') ||
|
||||
config('SETTINGS::PAYMENTS:STRIPE:SECRET') && config('SETTINGS::PAYMENTS:STRIPE:ENDPOINT_SECRET') && config('SETTINGS::PAYMENTS:STRIPE:METHODS')
|
||||
) {
|
||||
$isPaymentSetup = true;
|
||||
}
|
||||
|
||||
//Required Verification for creating an server
|
||||
if (config('SETTINGS::USER:FORCE_DISCORD_VERIFICATION', false) === 'true' && !Auth::user()->discordUser) {
|
||||
return redirect()->route('profile.index')->with('error', __("You are required to link your discord account before you can purchase Credits"));
|
||||
if (config('SETTINGS::USER:FORCE_EMAIL_VERIFICATION', false) === 'true' && ! Auth::user()->hasVerifiedEmail()) {
|
||||
return redirect()->route('profile.index')->with('error', __('You are required to verify your email address before you can purchase credits.'));
|
||||
}
|
||||
|
||||
//Required Verification for creating an server
|
||||
if (config('SETTINGS::USER:FORCE_DISCORD_VERIFICATION', false) === 'true' && ! Auth::user()->discordUser) {
|
||||
return redirect()->route('profile.index')->with('error', __('You are required to link your discord account before you can purchase Credits'));
|
||||
}
|
||||
|
||||
return view('store.index')->with([
|
||||
|
|
|
|||
|
|
@ -2,113 +2,121 @@
|
|||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Session;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\Support\Facades\Notification;
|
||||
|
||||
use App\Models\Ticket;
|
||||
use App\Models\Server;
|
||||
use App\Models\TicketComment;
|
||||
use App\Models\TicketCategory;
|
||||
use App\Models\Ticket;
|
||||
use App\Models\TicketBlacklist;
|
||||
use App\Notifications\Ticket\User\CreateNotification;
|
||||
use App\Models\TicketCategory;
|
||||
use App\Models\TicketComment;
|
||||
use App\Models\User;
|
||||
use App\Notifications\Ticket\Admin\AdminCreateNotification;
|
||||
use App\Notifications\Ticket\Admin\AdminReplyNotification;
|
||||
|
||||
use App\Notifications\Ticket\User\CreateNotification;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Notification;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class TicketsController extends Controller
|
||||
{
|
||||
public function index()
|
||||
{
|
||||
$tickets = Ticket::where("user_id", Auth::user()->id)->paginate(10);
|
||||
$tickets = Ticket::where('user_id', Auth::user()->id)->paginate(10);
|
||||
$ticketcategories = TicketCategory::all();
|
||||
|
||||
return view("ticket.index", compact("tickets", "ticketcategories"));
|
||||
|
||||
return view('ticket.index', compact('tickets', 'ticketcategories'));
|
||||
}
|
||||
public function create() {
|
||||
#check in blacklist
|
||||
|
||||
public function create()
|
||||
{
|
||||
//check in blacklist
|
||||
$check = TicketBlacklist::where('user_id', Auth::user()->id)->first();
|
||||
if($check && $check->status == "True"){
|
||||
return redirect()->route('ticket.index')->with('error', __("You can't make a ticket because you're on the blacklist for a reason: '" . $check->reason . "', please contact the administrator"));
|
||||
if ($check && $check->status == 'True') {
|
||||
return redirect()->route('ticket.index')->with('error', __("You can't make a ticket because you're on the blacklist for a reason: '".$check->reason."', please contact the administrator"));
|
||||
}
|
||||
$ticketcategories = TicketCategory::all();
|
||||
$servers = Auth::user()->servers;
|
||||
return view("ticket.create", compact("ticketcategories", "servers"));
|
||||
|
||||
return view('ticket.create', compact('ticketcategories', 'servers'));
|
||||
}
|
||||
public function store(Request $request) {
|
||||
$this->validate($request, array(
|
||||
"title" => "required",
|
||||
"ticketcategory" => "required",
|
||||
"priority" => "required",
|
||||
"message" => "required")
|
||||
);
|
||||
$ticket = new Ticket(array(
|
||||
"title" => $request->input("title"),
|
||||
"user_id" => Auth::user()->id,
|
||||
"ticket_id" => strtoupper(Str::random(5)),
|
||||
"ticketcategory_id" => $request->input("ticketcategory"),
|
||||
"priority" => $request->input("priority"),
|
||||
"message" => $request->input("message"),
|
||||
"status" => "Open",
|
||||
"server" => $request->input("server"))
|
||||
);
|
||||
|
||||
public function store(Request $request)
|
||||
{
|
||||
$this->validate($request, [
|
||||
'title' => 'required',
|
||||
'ticketcategory' => 'required',
|
||||
'priority' => 'required',
|
||||
'message' => 'required', ]
|
||||
);
|
||||
$ticket = new Ticket([
|
||||
'title' => $request->input('title'),
|
||||
'user_id' => Auth::user()->id,
|
||||
'ticket_id' => strtoupper(Str::random(5)),
|
||||
'ticketcategory_id' => $request->input('ticketcategory'),
|
||||
'priority' => $request->input('priority'),
|
||||
'message' => $request->input('message'),
|
||||
'status' => 'Open',
|
||||
'server' => $request->input('server'), ]
|
||||
);
|
||||
$ticket->save();
|
||||
$user = Auth::user();
|
||||
$admin = User::where('role', 'admin')->orWhere('role', 'mod')->get();
|
||||
$user->notify(new CreateNotification($ticket));
|
||||
Notification::send($admin, new AdminCreateNotification($ticket, $user));
|
||||
|
||||
return redirect()->route('ticket.index')->with('success', __('A ticket has been opened, ID: #') . $ticket->ticket_id);
|
||||
|
||||
return redirect()->route('ticket.index')->with('success', __('A ticket has been opened, ID: #').$ticket->ticket_id);
|
||||
}
|
||||
public function show($ticket_id) {
|
||||
$ticket = Ticket::where("ticket_id", $ticket_id)->firstOrFail();
|
||||
|
||||
public function show($ticket_id)
|
||||
{
|
||||
$ticket = Ticket::where('ticket_id', $ticket_id)->firstOrFail();
|
||||
$ticketcomments = $ticket->ticketcomments;
|
||||
$ticketcategory = $ticket->ticketcategory;
|
||||
$server = Server::where('id', $ticket->server)->first();
|
||||
return view("ticket.show", compact("ticket", "ticketcategory", "ticketcomments", "server"));
|
||||
|
||||
return view('ticket.show', compact('ticket', 'ticketcategory', 'ticketcomments', 'server'));
|
||||
}
|
||||
public function reply(Request $request) {
|
||||
#check in blacklist
|
||||
|
||||
public function reply(Request $request)
|
||||
{
|
||||
//check in blacklist
|
||||
$check = TicketBlacklist::where('user_id', Auth::user()->id)->first();
|
||||
if($check && $check->status == "True"){
|
||||
return redirect()->route('ticket.index')->with('error', __("You can't reply a ticket because you're on the blacklist for a reason: '" . $check->reason . "', please contact the administrator"));
|
||||
if ($check && $check->status == 'True') {
|
||||
return redirect()->route('ticket.index')->with('error', __("You can't reply a ticket because you're on the blacklist for a reason: '".$check->reason."', please contact the administrator"));
|
||||
}
|
||||
$this->validate($request, array("ticketcomment" => "required"));
|
||||
$ticket = Ticket::where('id', $request->input("ticket_id"))->firstOrFail();
|
||||
$ticket->status = "Client Reply";
|
||||
$this->validate($request, ['ticketcomment' => 'required']);
|
||||
$ticket = Ticket::where('id', $request->input('ticket_id'))->firstOrFail();
|
||||
$ticket->status = 'Client Reply';
|
||||
$ticket->update();
|
||||
$ticketcomment = TicketComment::create(array(
|
||||
"ticket_id" => $request->input("ticket_id"),
|
||||
"user_id" => Auth::user()->id,
|
||||
"ticketcomment" => $request->input("ticketcomment"),
|
||||
"message" => $request->input("message")
|
||||
));
|
||||
$ticketcomment = TicketComment::create([
|
||||
'ticket_id' => $request->input('ticket_id'),
|
||||
'user_id' => Auth::user()->id,
|
||||
'ticketcomment' => $request->input('ticketcomment'),
|
||||
'message' => $request->input('message'),
|
||||
]);
|
||||
$user = Auth::user();
|
||||
$admin = User::where('role', 'admin')->orWhere('role', 'mod')->get();
|
||||
$newmessage = $request->input("ticketcomment");
|
||||
$newmessage = $request->input('ticketcomment');
|
||||
Notification::send($admin, new AdminReplyNotification($ticket, $user, $newmessage));
|
||||
|
||||
return redirect()->back()->with('success', __('Your comment has been submitted'));
|
||||
}
|
||||
|
||||
public function dataTable()
|
||||
{
|
||||
$query = Ticket::where("user_id", Auth::user()->id)->get();
|
||||
$query = Ticket::where('user_id', Auth::user()->id)->get();
|
||||
|
||||
return datatables($query)
|
||||
->addColumn('category', function (Ticket $tickets) {
|
||||
return $tickets->ticketcategory->name;
|
||||
})
|
||||
->editColumn('title', function (Ticket $tickets) {
|
||||
return '<a class="text-info" href="' . route('ticket.show', ['ticket_id' => $tickets->ticket_id]) . '">' . "#" . $tickets->ticket_id . " - " . $tickets->title . '</a>';
|
||||
return '<a class="text-info" href="'.route('ticket.show', ['ticket_id' => $tickets->ticket_id]).'">'.'#'.$tickets->ticket_id.' - '.$tickets->title.'</a>';
|
||||
})
|
||||
->editColumn('status', function (Ticket $tickets) {
|
||||
switch ($tickets->status) {
|
||||
case 'Open':
|
||||
$badgeColor = 'badge-success';
|
||||
break;
|
||||
break;
|
||||
case 'Closed':
|
||||
$badgeColor = 'badge-danger';
|
||||
break;
|
||||
|
|
@ -120,7 +128,7 @@ class TicketsController extends Controller
|
|||
break;
|
||||
}
|
||||
|
||||
return '<span class="badge ' . $badgeColor . '">' . $tickets->status . '</span>';
|
||||
return '<span class="badge '.$badgeColor.'">'.$tickets->status.'</span>';
|
||||
})
|
||||
->editColumn('updated_at', function (Ticket $tickets) {
|
||||
return $tickets->updated_at ? $tickets->updated_at->diffForHumans() : '';
|
||||
|
|
|
|||
|
|
@ -8,16 +8,15 @@ use Illuminate\Support\Facades\Session;
|
|||
class TranslationController extends Controller
|
||||
{
|
||||
/**
|
||||
*
|
||||
* Change session locale
|
||||
* @param Request $request
|
||||
*
|
||||
* @param Request $request
|
||||
* @return Response
|
||||
*/
|
||||
public function changeLocale(Request $request)
|
||||
{
|
||||
Session::put('locale', $request->inputLocale);
|
||||
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ class Kernel extends HttpKernel
|
|||
'api' => [
|
||||
'throttle:api',
|
||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||
GlobalNames::class
|
||||
GlobalNames::class,
|
||||
],
|
||||
];
|
||||
|
||||
|
|
@ -75,6 +75,6 @@ class Kernel extends HttpKernel
|
|||
'admin' => isAdmin::class,
|
||||
'moderator' => isMod::class,
|
||||
'api.token' => ApiAuthToken::class,
|
||||
'checkSuspended' => CheckSuspended::class
|
||||
'checkSuspended' => CheckSuspended::class,
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,18 +11,23 @@ class ApiAuthToken
|
|||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle(Request $request, Closure $next)
|
||||
{
|
||||
if (empty($request->bearerToken())) return response()->json(['message' => 'Missing Authorization header'], 403);
|
||||
if (empty($request->bearerToken())) {
|
||||
return response()->json(['message' => 'Missing Authorization header'], 403);
|
||||
}
|
||||
|
||||
$token = ApplicationApi::find($request->bearerToken());
|
||||
if (is_null($token)) return response()->json(['message' => 'Invalid Authorization token'], 401);
|
||||
if (is_null($token)) {
|
||||
return response()->json(['message' => 'Invalid Authorization token'], 401);
|
||||
}
|
||||
|
||||
$token->updateLastUsed();
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ class CheckSuspended
|
|||
|
||||
return redirect()->route('login')->withMessage($message);
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use App\Models\Configuration;
|
||||
use App\Models\Settings;
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
|
|
@ -12,15 +10,15 @@ class GlobalNames
|
|||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle(Request $request, Closure $next)
|
||||
{
|
||||
define('CREDITS_DISPLAY_NAME', config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME', 'Credits'));
|
||||
|
||||
$unsupported_lang_array = explode(',', config("app.unsupported_locales"));
|
||||
$unsupported_lang_array = explode(',', config('app.unsupported_locales'));
|
||||
$unsupported_lang_array = array_map('strtolower', $unsupported_lang_array);
|
||||
define('UNSUPPORTED_LANGS', $unsupported_lang_array);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
namespace App\Http\Middleware;
|
||||
|
||||
use Closure;
|
||||
use DateTime;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
|
|
@ -12,17 +11,17 @@ class LastSeen
|
|||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle(Request $request, Closure $next)
|
||||
{
|
||||
if (env('APP_ENV' , 'local') == 'local'){
|
||||
if (env('APP_ENV', 'local') == 'local') {
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
if (!Auth::check()) {
|
||||
if (! Auth::check()) {
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
|
|
@ -32,7 +31,7 @@ class LastSeen
|
|||
|
||||
Auth::user()->update([
|
||||
'last_seen' => now(),
|
||||
'ip' => $request->ip()
|
||||
'ip' => $request->ip(),
|
||||
]);
|
||||
|
||||
return $next($request);
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use App\Models\Settings;
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\App;
|
||||
|
|
@ -10,27 +9,25 @@ use Illuminate\Support\Facades\Session;
|
|||
|
||||
class SetLocale
|
||||
{
|
||||
|
||||
/**
|
||||
*
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
if (Session::has('locale')) {
|
||||
$locale = Session::get('locale', config("SETTINGS::LOCALE:DEFAULT"));
|
||||
$locale = Session::get('locale', config('SETTINGS::LOCALE:DEFAULT'));
|
||||
} else {
|
||||
if (config("SETTINGS::LOCALE:DYNAMIC") !== "true") {
|
||||
$locale = config("SETTINGS::LOCALE:DEFAULT");
|
||||
if (config('SETTINGS::LOCALE:DYNAMIC') !== 'true') {
|
||||
$locale = config('SETTINGS::LOCALE:DEFAULT');
|
||||
} else {
|
||||
$locale = substr($request->server('HTTP_ACCEPT_LANGUAGE'), 0, 2);
|
||||
|
||||
if (!in_array($locale, explode(',', config("SETTINGS::LOCALE:AVAILABLE")))) {
|
||||
$locale = config("SETTINGS::LOCALE:DEFAULT");
|
||||
if (! in_array($locale, explode(',', config('SETTINGS::LOCALE:AVAILABLE')))) {
|
||||
$locale = config('SETTINGS::LOCALE:DEFAULT');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ class VerifyCsrfToken extends Middleware
|
|||
* @var array
|
||||
*/
|
||||
protected $except = [
|
||||
'payment/StripeWebhooks'
|
||||
'payment/StripeWebhooks',
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ class isAdmin
|
|||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle(Request $request, Closure $next)
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ class isMod
|
|||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle(Request $request, Closure $next)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ namespace App\Listeners;
|
|||
|
||||
use App\Events\UserUpdateCreditsEvent;
|
||||
use App\Models\Server;
|
||||
use App\Models\Settings;
|
||||
use Exception;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
|
||||
|
|
@ -13,8 +12,9 @@ class UnsuspendServers implements ShouldQueue
|
|||
/**
|
||||
* Handle the event.
|
||||
*
|
||||
* @param UserUpdateCreditsEvent $event
|
||||
* @param UserUpdateCreditsEvent $event
|
||||
* @return void
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function handle(UserUpdateCreditsEvent $event)
|
||||
|
|
@ -22,7 +22,9 @@ class UnsuspendServers implements ShouldQueue
|
|||
if ($event->user->credits > config('SETTINGS::USER:MINIMUM_REQUIRED_CREDITS_TO_MAKE_SERVER', 50)) {
|
||||
/** @var Server $server */
|
||||
foreach ($event->user->servers as $server) {
|
||||
if ($server->isSuspended()) $server->unSuspend();
|
||||
if ($server->isSuspended()) {
|
||||
$server->unSuspend();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@ class Verified
|
|||
/**
|
||||
* Handle the event.
|
||||
*
|
||||
* @param object $event
|
||||
* @param object $event
|
||||
* @return void
|
||||
*/
|
||||
public function handle($event)
|
||||
{
|
||||
if (!$event->user->email_verified_reward) {
|
||||
if (! $event->user->email_verified_reward) {
|
||||
$event->user->increment('server_limit', config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL'));
|
||||
$event->user->increment('credits', config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL'));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class ApplicationApi extends Model
|
|||
{
|
||||
use HasFactory;
|
||||
|
||||
protected $fillable = ['token', 'memo' , 'last_used'];
|
||||
protected $fillable = ['token', 'memo', 'last_used'];
|
||||
|
||||
protected $primaryKey = 'token';
|
||||
|
||||
|
|
@ -29,7 +29,8 @@ class ApplicationApi extends Model
|
|||
});
|
||||
}
|
||||
|
||||
public function updateLastUsed(){
|
||||
public function updateLastUsed()
|
||||
{
|
||||
$this->update(['last_used' => now()]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,18 +11,18 @@ class DiscordUser extends Model
|
|||
use HasFactory;
|
||||
|
||||
protected $fillable = [
|
||||
"id",
|
||||
"user_id",
|
||||
"username",
|
||||
"avatar",
|
||||
"discriminator",
|
||||
"public_flags",
|
||||
"flags",
|
||||
"locale",
|
||||
"mfa_enabled",
|
||||
"premium_type",
|
||||
"email",
|
||||
"verified",
|
||||
'id',
|
||||
'user_id',
|
||||
'username',
|
||||
'avatar',
|
||||
'discriminator',
|
||||
'public_flags',
|
||||
'flags',
|
||||
'locale',
|
||||
'mfa_enabled',
|
||||
'premium_type',
|
||||
'email',
|
||||
'verified',
|
||||
];
|
||||
|
||||
public $incrementing = false;
|
||||
|
|
@ -30,14 +30,16 @@ class DiscordUser extends Model
|
|||
/**
|
||||
* @return BelongsTo
|
||||
*/
|
||||
public function user(){
|
||||
public function user()
|
||||
{
|
||||
return $this->belongsTo(User::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function getAvatar(){
|
||||
return "https://cdn.discordapp.com/avatars/" . $this->id . "/" . $this->avatar . ".png";
|
||||
public function getAvatar()
|
||||
{
|
||||
return 'https://cdn.discordapp.com/avatars/'.$this->id.'/'.$this->avatar.'.png';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,8 +61,8 @@ class Egg extends Model
|
|||
$array['environment'] = json_encode([$environment]);
|
||||
|
||||
self::query()->updateOrCreate([
|
||||
'id' => $array['id']
|
||||
], array_diff_key($array, array_flip(["id"]))
|
||||
'id' => $array['id'],
|
||||
], array_diff_key($array, array_flip(['id']))
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -72,8 +72,9 @@ class Egg extends Model
|
|||
|
||||
/**
|
||||
* @description remove eggs that have been deleted on pterodactyl
|
||||
* @param Nest $nest
|
||||
* @param array $eggs
|
||||
*
|
||||
* @param Nest $nest
|
||||
* @param array $eggs
|
||||
*/
|
||||
private static function removeDeletedEggs(Nest $nest, array $eggs): void
|
||||
{
|
||||
|
|
@ -82,7 +83,9 @@ class Egg extends Model
|
|||
}, $eggs);
|
||||
|
||||
$nest->eggs()->each(function (Egg $egg) use ($ids) {
|
||||
if (!in_array($egg->id, $ids)) $egg->delete();
|
||||
if (! in_array($egg->id, $ids)) {
|
||||
$egg->delete();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ class Invoice extends Model
|
|||
protected $fillable = [
|
||||
'invoice_name',
|
||||
'invoice_user',
|
||||
'payment_id'
|
||||
'payment_id',
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ class Location extends Model
|
|||
|
||||
/**
|
||||
* Sync locations with pterodactyl panel
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public static function syncLocations()
|
||||
|
|
@ -36,21 +37,21 @@ class Location extends Model
|
|||
|
||||
//map response
|
||||
$locations = array_map(function ($val) {
|
||||
return array(
|
||||
'id' => $val['attributes']['id'],
|
||||
'name' => $val['attributes']['short'],
|
||||
'description' => $val['attributes']['long']
|
||||
);
|
||||
return [
|
||||
'id' => $val['attributes']['id'],
|
||||
'name' => $val['attributes']['short'],
|
||||
'description' => $val['attributes']['long'],
|
||||
];
|
||||
}, $locations);
|
||||
|
||||
//update or create
|
||||
foreach ($locations as $location) {
|
||||
self::query()->updateOrCreate(
|
||||
[
|
||||
'id' => $location['id']
|
||||
'id' => $location['id'],
|
||||
],
|
||||
[
|
||||
'name' => $location['name'],
|
||||
'name' => $location['name'],
|
||||
'description' => $location['name'],
|
||||
]
|
||||
);
|
||||
|
|
@ -61,7 +62,8 @@ class Location extends Model
|
|||
|
||||
/**
|
||||
* @description remove locations that have been deleted on pterodactyl
|
||||
* @param array $locations
|
||||
*
|
||||
* @param array $locations
|
||||
*/
|
||||
private static function removeDeletedLocation(array $locations): void
|
||||
{
|
||||
|
|
@ -70,7 +72,9 @@ class Location extends Model
|
|||
}, $locations);
|
||||
|
||||
self::all()->each(function (Location $location) use ($ids) {
|
||||
if (!in_array($location->id, $ids)) $location->delete();
|
||||
if (! in_array($location->id, $ids)) {
|
||||
$location->delete();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -78,5 +82,4 @@ class Location extends Model
|
|||
{
|
||||
return $this->hasMany(Node::class, 'location_id', 'id');
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,20 +36,20 @@ class Nest extends Model
|
|||
|
||||
//map response
|
||||
$nests = array_map(function ($nest) {
|
||||
return array(
|
||||
'id' => $nest['attributes']['id'],
|
||||
'name' => $nest['attributes']['name'],
|
||||
return [
|
||||
'id' => $nest['attributes']['id'],
|
||||
'name' => $nest['attributes']['name'],
|
||||
'description' => $nest['attributes']['description'],
|
||||
);
|
||||
];
|
||||
}, $nests);
|
||||
|
||||
foreach ($nests as $nest) {
|
||||
self::query()->updateOrCreate([
|
||||
'id' => $nest['id']
|
||||
'id' => $nest['id'],
|
||||
], [
|
||||
'name' => $nest['name'],
|
||||
'name' => $nest['name'],
|
||||
'description' => $nest['description'],
|
||||
'disabled' => false
|
||||
'disabled' => false,
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -58,7 +58,8 @@ class Nest extends Model
|
|||
|
||||
/**
|
||||
* @description remove nests that have been deleted on pterodactyl
|
||||
* @param array $nests
|
||||
*
|
||||
* @param array $nests
|
||||
*/
|
||||
private static function removeDeletedNests(array $nests): void
|
||||
{
|
||||
|
|
@ -67,7 +68,9 @@ class Nest extends Model
|
|||
}, $nests);
|
||||
|
||||
self::all()->each(function (Nest $nest) use ($ids) {
|
||||
if (!in_array($nest->id, $ids)) $nest->delete();
|
||||
if (! in_array($nest->id, $ids)) {
|
||||
$nest->delete();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ class Node extends Model
|
|||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
|
|
@ -37,25 +36,25 @@ class Node extends Model
|
|||
|
||||
//map response
|
||||
$nodes = array_map(function ($node) {
|
||||
return array(
|
||||
'id' => $node['attributes']['id'],
|
||||
return [
|
||||
'id' => $node['attributes']['id'],
|
||||
'location_id' => $node['attributes']['location_id'],
|
||||
'name' => $node['attributes']['name'],
|
||||
'name' => $node['attributes']['name'],
|
||||
'description' => $node['attributes']['description'],
|
||||
);
|
||||
];
|
||||
}, $nodes);
|
||||
|
||||
//update or create
|
||||
foreach ($nodes as $node) {
|
||||
self::query()->updateOrCreate(
|
||||
[
|
||||
'id' => $node['id']
|
||||
'id' => $node['id'],
|
||||
],
|
||||
[
|
||||
'name' => $node['name'],
|
||||
'name' => $node['name'],
|
||||
'description' => $node['description'],
|
||||
'location_id' => $node['location_id'],
|
||||
'disabled' => false
|
||||
'disabled' => false,
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -64,7 +63,8 @@ class Node extends Model
|
|||
|
||||
/**
|
||||
* @description remove nodes that have been deleted on pterodactyl
|
||||
* @param array $nodes
|
||||
*
|
||||
* @param array $nodes
|
||||
*/
|
||||
private static function removeDeletedNodes(array $nodes): void
|
||||
{
|
||||
|
|
@ -73,7 +73,9 @@ class Node extends Model
|
|||
}, $nodes);
|
||||
|
||||
self::all()->each(function (Node $node) use ($ids) {
|
||||
if (!in_array($node->id, $ids)) $node->delete();
|
||||
if (! in_array($node->id, $ids)) {
|
||||
$node->delete();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,27 +15,32 @@ class PartnerDiscount extends Model
|
|||
'user_id',
|
||||
'partner_discount',
|
||||
'registered_user_discount',
|
||||
'referral_system_commission'
|
||||
'referral_system_commission',
|
||||
];
|
||||
|
||||
public static function getDiscount()
|
||||
{
|
||||
if($partnerDiscount = PartnerDiscount::where('user_id', Auth::user()->id)->first()){
|
||||
if ($partnerDiscount = PartnerDiscount::where('user_id', Auth::user()->id)->first()) {
|
||||
return $partnerDiscount->partner_discount;
|
||||
}
|
||||
else if($ref_user = DB::table("user_referrals")->where('registered_user_id', '=', Auth::user()->id)->first()){
|
||||
if($partnerDiscount = PartnerDiscount::where('user_id', $ref_user->referral_id)->first()){
|
||||
} elseif ($ref_user = DB::table('user_referrals')->where('registered_user_id', '=', Auth::user()->id)->first()) {
|
||||
if ($partnerDiscount = PartnerDiscount::where('user_id', $ref_user->referral_id)->first()) {
|
||||
return $partnerDiscount->registered_user_discount;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static function getCommission($user_id)
|
||||
{
|
||||
if($partnerDiscount = PartnerDiscount::where('user_id', $user_id)->first()){
|
||||
if($partnerDiscount->referral_system_commission>=0) return $partnerDiscount->referral_system_commission>=0;
|
||||
if ($partnerDiscount = PartnerDiscount::where('user_id', $user_id)->first()) {
|
||||
if ($partnerDiscount->referral_system_commission >= 0) {
|
||||
return $partnerDiscount->referral_system_commission >= 0;
|
||||
}
|
||||
}
|
||||
return config("SETTINGS::REFERRAL:PERCENTAGE");
|
||||
|
||||
return config('SETTINGS::REFERRAL:PERCENTAGE');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,14 +55,14 @@ class Payment extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* @param mixed $value
|
||||
* @param string $locale
|
||||
*
|
||||
* @param mixed $value
|
||||
* @param string $locale
|
||||
* @return float
|
||||
*/
|
||||
public function formatToCurrency($value, $locale = 'en_US')
|
||||
{
|
||||
$formatter = new NumberFormatter($locale, NumberFormatter::CURRENCY);
|
||||
|
||||
return $formatter->formatCurrency($value, $this->currency_code);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
|
|||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
use Spatie\Activitylog\Traits\LogsActivity;
|
||||
|
||||
class Product extends Model
|
||||
|
|
@ -29,7 +28,7 @@ class Product extends Model
|
|||
$product->{$product->getKeyName()} = $client->generateId($size = 21);
|
||||
});
|
||||
|
||||
static::deleting(function(Product $product) {
|
||||
static::deleting(function (Product $product) {
|
||||
$product->nodes()->detach();
|
||||
$product->eggs()->detach();
|
||||
});
|
||||
|
|
@ -42,12 +41,12 @@ class Product extends Model
|
|||
|
||||
public function getDailyPrice()
|
||||
{
|
||||
return ($this->price / 30);
|
||||
return $this->price / 30;
|
||||
}
|
||||
|
||||
public function getWeeklyPrice()
|
||||
{
|
||||
return ($this->price / 4);
|
||||
return $this->price / 4;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -61,14 +60,16 @@ class Product extends Model
|
|||
/**
|
||||
* @return BelongsToMany
|
||||
*/
|
||||
public function eggs() {
|
||||
public function eggs()
|
||||
{
|
||||
return $this->belongsToMany(Egg::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return BelongsToMany
|
||||
*/
|
||||
public function nodes() {
|
||||
public function nodes()
|
||||
{
|
||||
return $this->belongsToMany(Node::class);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ use Spatie\Activitylog\Traits\LogsActivity;
|
|||
|
||||
/**
|
||||
* Class Server
|
||||
* @package App\Models
|
||||
*/
|
||||
class Server extends Model
|
||||
{
|
||||
|
|
@ -41,24 +40,21 @@ class Server extends Model
|
|||
* @var string[]
|
||||
*/
|
||||
protected $fillable = [
|
||||
"name",
|
||||
"description",
|
||||
"suspended",
|
||||
"identifier",
|
||||
"product_id",
|
||||
"pterodactyl_id",
|
||||
'name',
|
||||
'description',
|
||||
'suspended',
|
||||
'identifier',
|
||||
'product_id',
|
||||
'pterodactyl_id',
|
||||
];
|
||||
|
||||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
protected $dates = [
|
||||
'suspended'
|
||||
'suspended',
|
||||
];
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public static function boot()
|
||||
{
|
||||
parent::boot();
|
||||
|
|
@ -71,7 +67,7 @@ class Server extends Model
|
|||
|
||||
static::deleting(function (Server $server) {
|
||||
$response = Pterodactyl::client()->delete("/application/servers/{$server->pterodactyl_id}");
|
||||
if ($response->failed() && !is_null($server->pterodactyl_id)) {
|
||||
if ($response->failed() && ! is_null($server->pterodactyl_id)) {
|
||||
//only return error when it's not a 404 error
|
||||
if ($response['errors'][0]['status'] != '404') {
|
||||
throw new Exception($response['errors'][0]['code']);
|
||||
|
|
@ -85,10 +81,9 @@ class Server extends Model
|
|||
*/
|
||||
public function isSuspended()
|
||||
{
|
||||
return !is_null($this->suspended);
|
||||
return ! is_null($this->suspended);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return PromiseInterface|Response
|
||||
*/
|
||||
|
|
@ -98,7 +93,6 @@ class Server extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function suspend()
|
||||
|
|
@ -107,7 +101,7 @@ class Server extends Model
|
|||
|
||||
if ($response->successful()) {
|
||||
$this->update([
|
||||
'suspended' => now()
|
||||
'suspended' => now(),
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -123,14 +117,13 @@ class Server extends Model
|
|||
|
||||
if ($response->successful()) {
|
||||
$this->update([
|
||||
'suspended' => null
|
||||
'suspended' => null,
|
||||
]);
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return HasOne
|
||||
*/
|
||||
|
|
@ -146,5 +139,4 @@ class Server extends Model
|
|||
{
|
||||
return $this->belongsTo(User::class, 'user_id', 'id');
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,19 +31,20 @@ class Settings extends Model
|
|||
parent::boot();
|
||||
|
||||
static::updated(function (Settings $settings) {
|
||||
Cache::forget(self::CACHE_TAG .':'. $settings->key);
|
||||
Cache::forget(self::CACHE_TAG.':'.$settings->key);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $key
|
||||
* @param string $key
|
||||
* @param $default
|
||||
* @return mixed
|
||||
*/
|
||||
public static function getValueByKey(string $key, $default = null)
|
||||
{
|
||||
return Cache::rememberForever(self::CACHE_TAG .':'. $key, function () use ($default, $key) {
|
||||
return Cache::rememberForever(self::CACHE_TAG.':'.$key, function () use ($default, $key) {
|
||||
$settings = self::find($key);
|
||||
|
||||
return $settings ? $settings->value : $default;
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ use Hidehalo\Nanoid\Client;
|
|||
use Illuminate\Database\Eloquent\Model;
|
||||
use NumberFormatter;
|
||||
use Spatie\Activitylog\Traits\LogsActivity;
|
||||
use App\Models\Configuration;
|
||||
|
||||
class ShopProduct extends Model
|
||||
{
|
||||
use LogsActivity;
|
||||
|
||||
/**
|
||||
* @var bool
|
||||
*/
|
||||
|
|
@ -20,13 +20,13 @@ class ShopProduct extends Model
|
|||
* @var string[]
|
||||
*/
|
||||
protected $fillable = [
|
||||
"type",
|
||||
"price",
|
||||
"description",
|
||||
"display",
|
||||
"currency_code",
|
||||
"quantity",
|
||||
"disabled",
|
||||
'type',
|
||||
'price',
|
||||
'description',
|
||||
'display',
|
||||
'currency_code',
|
||||
'quantity',
|
||||
'disabled',
|
||||
];
|
||||
|
||||
public static function boot()
|
||||
|
|
@ -41,14 +41,14 @@ class ShopProduct extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* @param mixed $value
|
||||
* @param string $locale
|
||||
*
|
||||
* @param mixed $value
|
||||
* @param string $locale
|
||||
* @return float
|
||||
*/
|
||||
public function formatToCurrency($value, $locale = 'en_US')
|
||||
{
|
||||
$formatter = new NumberFormatter($locale, NumberFormatter::CURRENCY);
|
||||
|
||||
return $formatter->formatCurrency($value, $this->currency_code);
|
||||
}
|
||||
|
||||
|
|
@ -59,7 +59,8 @@ class ShopProduct extends Model
|
|||
*/
|
||||
public function getTaxPercent()
|
||||
{
|
||||
$tax = config("SETTINGS::PAYMENTS:SALES_TAX");
|
||||
$tax = config('SETTINGS::PAYMENTS:SALES_TAX');
|
||||
|
||||
return $tax < 0 ? 0 : $tax;
|
||||
}
|
||||
|
||||
|
|
@ -87,4 +88,4 @@ class ShopProduct extends Model
|
|||
{
|
||||
return number_format($this->getPriceAfterDiscount() + $this->getTaxValue(), 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,18 +4,24 @@ namespace App\Models;
|
|||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class Ticket extends Model {
|
||||
class Ticket extends Model
|
||||
{
|
||||
protected $fillable = [
|
||||
'user_id', 'ticketcategory_id', 'ticket_id', 'title', 'priority', 'message', 'status', 'server'
|
||||
'user_id', 'ticketcategory_id', 'ticket_id', 'title', 'priority', 'message', 'status', 'server',
|
||||
];
|
||||
|
||||
public function ticketcategory(){
|
||||
return $this->belongsTo(TicketCategory::class);}
|
||||
public function ticketcategory()
|
||||
{
|
||||
return $this->belongsTo(TicketCategory::class);
|
||||
}
|
||||
|
||||
public function ticketcomments(){
|
||||
return $this->hasMany(TicketComment::class);}
|
||||
public function ticketcomments()
|
||||
{
|
||||
return $this->hasMany(TicketComment::class);
|
||||
}
|
||||
|
||||
public function user(){
|
||||
return $this->belongsTo(User::class);}
|
||||
}
|
||||
|
||||
public function user()
|
||||
{
|
||||
return $this->belongsTo(User::class);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@ namespace App\Models;
|
|||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class TicketBlacklist extends Model {
|
||||
class TicketBlacklist extends Model
|
||||
{
|
||||
protected $fillable = [
|
||||
'user_id', 'status', 'reason'
|
||||
'user_id', 'status', 'reason',
|
||||
];
|
||||
|
||||
public function user()
|
||||
{
|
||||
return $this->belongsTo(User::class, 'user_id', 'id');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,10 +4,12 @@ namespace App\Models;
|
|||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class TicketCategory extends Model {
|
||||
class TicketCategory extends Model
|
||||
{
|
||||
protected $fillable = ['name'];
|
||||
|
||||
public function tickets(){
|
||||
return $this->hasMany(Ticket::class);}
|
||||
|
||||
public function tickets()
|
||||
{
|
||||
return $this->hasMany(Ticket::class);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -4,18 +4,24 @@ namespace App\Models;
|
|||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class TicketComment extends Model {
|
||||
protected $fillable = [
|
||||
'ticket_id', 'user_id', 'ticketcomment'
|
||||
];
|
||||
class TicketComment extends Model
|
||||
{
|
||||
protected $fillable = [
|
||||
'ticket_id', 'user_id', 'ticketcomment',
|
||||
];
|
||||
|
||||
public function ticketcategory(){
|
||||
return $this->belongsTo(TicketCategory::class);}
|
||||
public function ticketcategory()
|
||||
{
|
||||
return $this->belongsTo(TicketCategory::class);
|
||||
}
|
||||
|
||||
public function ticket(){
|
||||
return $this->belongsTo(Ticket::class);}
|
||||
public function ticket()
|
||||
{
|
||||
return $this->belongsTo(Ticket::class);
|
||||
}
|
||||
|
||||
public function user(){
|
||||
return $this->belongsTo(User::class);}
|
||||
public function user()
|
||||
{
|
||||
return $this->belongsTo(User::class);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -15,6 +15,6 @@ class UsefulLink extends Model
|
|||
'icon',
|
||||
'title',
|
||||
'link',
|
||||
'description'
|
||||
'description',
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ use Spatie\Activitylog\Traits\LogsActivity;
|
|||
|
||||
/**
|
||||
* Class User
|
||||
* @package App\Models
|
||||
*/
|
||||
class User extends Authenticatable implements MustVerifyEmail
|
||||
{
|
||||
|
|
@ -38,7 +37,7 @@ class User extends Authenticatable implements MustVerifyEmail
|
|||
'server_limit',
|
||||
'last_seen',
|
||||
'ip',
|
||||
'pterodactyl_id'
|
||||
'pterodactyl_id',
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -60,7 +59,7 @@ class User extends Authenticatable implements MustVerifyEmail
|
|||
'discord_verified_at',
|
||||
'avatar',
|
||||
'suspended',
|
||||
'referral_code'
|
||||
'referral_code',
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -85,9 +84,6 @@ class User extends Authenticatable implements MustVerifyEmail
|
|||
'server_limit' => 'float',
|
||||
];
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public static function boot()
|
||||
{
|
||||
parent::boot();
|
||||
|
|
@ -119,7 +115,6 @@ class User extends Authenticatable implements MustVerifyEmail
|
|||
|
||||
$user->vouchers()->detach();
|
||||
|
||||
|
||||
$user->discordUser()->delete();
|
||||
|
||||
Pterodactyl::client()->delete("/application/users/{$user->pterodactyl_id}");
|
||||
|
|
@ -174,9 +169,6 @@ class User extends Authenticatable implements MustVerifyEmail
|
|||
return $this->hasOne(DiscordUser::class);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function sendEmailVerificationNotification()
|
||||
{
|
||||
$this->notify(new QueuedVerifyEmail);
|
||||
|
|
@ -199,7 +191,6 @@ class User extends Authenticatable implements MustVerifyEmail
|
|||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function suspend()
|
||||
|
|
@ -209,7 +200,7 @@ class User extends Authenticatable implements MustVerifyEmail
|
|||
}
|
||||
|
||||
$this->update([
|
||||
'suspended' => true
|
||||
'suspended' => true,
|
||||
]);
|
||||
|
||||
return $this;
|
||||
|
|
@ -227,7 +218,7 @@ class User extends Authenticatable implements MustVerifyEmail
|
|||
}
|
||||
|
||||
$this->update([
|
||||
'suspended' => false
|
||||
'suspended' => false,
|
||||
]);
|
||||
|
||||
return $this;
|
||||
|
|
@ -256,8 +247,7 @@ class User extends Authenticatable implements MustVerifyEmail
|
|||
// $avatar = "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email)));
|
||||
// }
|
||||
|
||||
return "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email)));
|
||||
|
||||
return 'https://www.gravatar.com/avatar/'.md5(strtolower(trim($this->email)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -279,9 +269,14 @@ class User extends Authenticatable implements MustVerifyEmail
|
|||
public function getVerifiedStatus()
|
||||
{
|
||||
$status = '';
|
||||
if ($this->hasVerifiedEmail()) $status .= 'email ';
|
||||
if ($this->discordUser()->exists()) $status .= 'discord';
|
||||
if ($this->hasVerifiedEmail()) {
|
||||
$status .= 'email ';
|
||||
}
|
||||
if ($this->discordUser()->exists()) {
|
||||
$status .= 'discord';
|
||||
}
|
||||
$status = str_replace(' ', '/', $status);
|
||||
|
||||
return $status;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ use Spatie\Activitylog\Traits\LogsActivity;
|
|||
|
||||
/**
|
||||
* Class Voucher
|
||||
* @package App\Models
|
||||
*/
|
||||
class Voucher extends Model
|
||||
{
|
||||
|
|
@ -28,7 +27,7 @@ class Voucher extends Model
|
|||
];
|
||||
|
||||
protected $dates = [
|
||||
'expires_at'
|
||||
'expires_at',
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -38,7 +37,7 @@ class Voucher extends Model
|
|||
*/
|
||||
protected $casts = [
|
||||
'credits' => 'float',
|
||||
'uses' => 'integer'
|
||||
'uses' => 'integer',
|
||||
];
|
||||
|
||||
protected $appends = ['used', 'status'];
|
||||
|
|
@ -59,9 +58,6 @@ class Voucher extends Model
|
|||
return $this->getStatus();
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public static function boot()
|
||||
{
|
||||
parent::boot();
|
||||
|
|
@ -84,17 +80,22 @@ class Voucher extends Model
|
|||
*/
|
||||
public function getStatus()
|
||||
{
|
||||
if ($this->users()->count() >= $this->uses) return 'USES_LIMIT_REACHED';
|
||||
if (!is_null($this->expires_at)) {
|
||||
if ($this->expires_at->isPast()) return __('EXPIRED');
|
||||
if ($this->users()->count() >= $this->uses) {
|
||||
return 'USES_LIMIT_REACHED';
|
||||
}
|
||||
if (! is_null($this->expires_at)) {
|
||||
if ($this->expires_at->isPast()) {
|
||||
return __('EXPIRED');
|
||||
}
|
||||
}
|
||||
|
||||
return __('VALID');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
* @return float
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function redeem(User $user)
|
||||
|
|
@ -111,7 +112,7 @@ class Voucher extends Model
|
|||
}
|
||||
|
||||
/**
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
* @return null
|
||||
*/
|
||||
private function logRedeem(User $user)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ use Illuminate\Notifications\Notification;
|
|||
|
||||
class ConfirmPaymentNotification extends Notification implements ShouldQueue
|
||||
{
|
||||
|
||||
//THIS IS BASICALLY NOT USED ANYMORE WITH INVOICENOTIFICATION IN PLACE
|
||||
|
||||
use Queueable;
|
||||
|
|
@ -48,20 +47,20 @@ class ConfirmPaymentNotification extends Notification implements ShouldQueue
|
|||
{
|
||||
return (new MailMessage)
|
||||
->subject(__('Payment Confirmation'))
|
||||
->markdown('mail.payment.confirmed' , ['payment' => $this->payment]);
|
||||
->markdown('mail.payment.confirmed', ['payment' => $this->payment]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
'title' => __("Payment Confirmed!"),
|
||||
'content' => __("Payment Confirmed!"),
|
||||
'title' => __('Payment Confirmed!'),
|
||||
'content' => __('Payment Confirmed!'),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,27 +6,30 @@ use Illuminate\Bus\Queueable;
|
|||
use Illuminate\Notifications\Notification;
|
||||
|
||||
class DynamicNotification extends Notification
|
||||
|
||||
{
|
||||
use Queueable;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
private $via;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
private $database;
|
||||
|
||||
/**
|
||||
* @var MailMessage
|
||||
*/
|
||||
private $mail;
|
||||
|
||||
/**
|
||||
* Create a new notification instance.
|
||||
*
|
||||
* @param array $via
|
||||
* @param array $database
|
||||
* @param MailMessage $mail
|
||||
* @param array $via
|
||||
* @param array $database
|
||||
* @param MailMessage $mail
|
||||
*/
|
||||
public function __construct($via, $database, $mail)
|
||||
{
|
||||
|
|
@ -38,7 +41,7 @@ class DynamicNotification extends Notification
|
|||
/**
|
||||
* Get the notification's delivery channels.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function via()
|
||||
|
|
@ -50,10 +53,11 @@ class DynamicNotification extends Notification
|
|||
{
|
||||
return $this->mail;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function toArray()
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ use Illuminate\Notifications\Notification;
|
|||
use LaravelDaily\Invoices\Invoice;
|
||||
|
||||
class InvoiceNotification extends Notification
|
||||
|
||||
{
|
||||
use Queueable;
|
||||
|
||||
|
|
@ -20,13 +19,15 @@ class InvoiceNotification extends Notification
|
|||
* * @var invoice
|
||||
*/
|
||||
private $invoice;
|
||||
|
||||
private $user;
|
||||
|
||||
private $payment;
|
||||
|
||||
/**
|
||||
* Create a new notification instance.
|
||||
*
|
||||
* @param Invoice $invoice
|
||||
* @param Invoice $invoice
|
||||
*/
|
||||
public function __construct(Invoice $invoice, User $user, Payment $payment)
|
||||
{
|
||||
|
|
@ -38,7 +39,7 @@ class InvoiceNotification extends Notification
|
|||
/**
|
||||
* Get the notification's delivery channels.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function via($notifiable)
|
||||
|
|
@ -49,7 +50,7 @@ class InvoiceNotification extends Notification
|
|||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return MailMessage
|
||||
*/
|
||||
public function toMail($notifiable)
|
||||
|
|
@ -57,13 +58,13 @@ class InvoiceNotification extends Notification
|
|||
return (new MailMessage)
|
||||
->subject(__('Your Payment was successful!'))
|
||||
->greeting(__('Hello').',')
|
||||
->line(__("Your payment was processed successfully!"))
|
||||
->line(__('Status').': ' . $this->payment->status)
|
||||
->line(__('Price').': ' . $this->payment->formatToCurrency($this->payment->total_price))
|
||||
->line(__('Type').': ' . $this->payment->type)
|
||||
->line(__('Amount').': ' . $this->payment->amount)
|
||||
->line(__('Balance').': ' . number_format($this->user->credits,2))
|
||||
->line(__('User ID').': ' . $this->payment->user_id)
|
||||
->attach(storage_path('app/invoice/' . $this->user->id . '/' . now()->format('Y') . '/' . $this->invoice->filename));
|
||||
->line(__('Your payment was processed successfully!'))
|
||||
->line(__('Status').': '.$this->payment->status)
|
||||
->line(__('Price').': '.$this->payment->formatToCurrency($this->payment->total_price))
|
||||
->line(__('Type').': '.$this->payment->type)
|
||||
->line(__('Amount').': '.$this->payment->amount)
|
||||
->line(__('Balance').': '.number_format($this->user->credits, 2))
|
||||
->line(__('User ID').': '.$this->payment->user_id)
|
||||
->attach(storage_path('app/invoice/'.$this->user->id.'/'.now()->format('Y').'/'.$this->invoice->filename));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,12 +5,11 @@ namespace App\Notifications;
|
|||
use App\Models\User;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Notifications\Notification;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class ReferralNotification extends Notification
|
||||
|
||||
{
|
||||
use Queueable;
|
||||
|
||||
/**
|
||||
* @var User
|
||||
*/
|
||||
|
|
@ -19,7 +18,7 @@ class ReferralNotification extends Notification
|
|||
/**
|
||||
* Create a new notification instance.
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
*/
|
||||
public function __construct(int $user, int $ref_user)
|
||||
{
|
||||
|
|
@ -30,7 +29,7 @@ class ReferralNotification extends Notification
|
|||
/**
|
||||
* Get the notification's delivery channels.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function via($notifiable)
|
||||
|
|
@ -41,19 +40,19 @@ class ReferralNotification extends Notification
|
|||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
'title' => __("Someone registered using your Code!"),
|
||||
'content' => "
|
||||
<p>You received ".config('SETTINGS::REFERRAL::REWARD')." ".config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME')."</p>
|
||||
<p>because ".$this->ref_user->name." registered with your Referral-Code!</p>
|
||||
'title' => __('Someone registered using your Code!'),
|
||||
'content' => '
|
||||
<p>You received '.config('SETTINGS::REFERRAL::REWARD').' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').'</p>
|
||||
<p>because '.$this->ref_user->name.' registered with your Referral-Code!</p>
|
||||
<p>Thank you very much for supporting us!.</p>
|
||||
<p>".config('app.name', 'Laravel')."</p>
|
||||
",
|
||||
<p>'.config('app.name', 'Laravel').'</p>
|
||||
',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,14 +3,13 @@
|
|||
namespace App\Notifications;
|
||||
|
||||
use App\Models\Server;
|
||||
use App\Models\User;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Notifications\Notification;
|
||||
|
||||
class ServerCreationError extends Notification
|
||||
|
||||
{
|
||||
use Queueable;
|
||||
|
||||
/**
|
||||
* @var Server
|
||||
*/
|
||||
|
|
@ -19,7 +18,7 @@ class ServerCreationError extends Notification
|
|||
/**
|
||||
* Create a new notification instance.
|
||||
*
|
||||
* @param Server $server
|
||||
* @param Server $server
|
||||
*/
|
||||
public function __construct(Server $server)
|
||||
{
|
||||
|
|
@ -29,7 +28,7 @@ class ServerCreationError extends Notification
|
|||
/**
|
||||
* Get the notification's delivery channels.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function via($notifiable)
|
||||
|
|
@ -40,19 +39,19 @@ class ServerCreationError extends Notification
|
|||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
'title' => __("Server Creation Error"),
|
||||
'title' => __('Server Creation Error'),
|
||||
'content' => "
|
||||
<p>Hello <strong>{$this->server->User->name}</strong>, An unexpected error has occurred...</p>
|
||||
<p>There was a problem creating your server on our pterodactyl panel. There are likely no allocations or rooms left on the selected node. Please contact one of our support members through our discord server to get this resolved asap!</p>
|
||||
<p>We thank you for your patience and our deepest apologies for this inconvenience.</p>
|
||||
<p>".config('app.name', 'Laravel')."</p>
|
||||
",
|
||||
<p>".config('app.name', 'Laravel').'</p>
|
||||
',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ class ServersSuspendedNotification extends Notification implements ShouldQueue
|
|||
*/
|
||||
public function via($notifiable)
|
||||
{
|
||||
return ['mail' , 'database'];
|
||||
return ['mail', 'database'];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -43,7 +43,7 @@ class ServersSuspendedNotification extends Notification implements ShouldQueue
|
|||
return (new MailMessage)
|
||||
->subject(__('Your servers have been suspended!'))
|
||||
->greeting(__('Your servers have been suspended!'))
|
||||
->line(__("To automatically re-enable your server/s, you need to purchase more credits."))
|
||||
->line(__('To automatically re-enable your server/s, you need to purchase more credits.'))
|
||||
->action(__('Purchase credits'), route('store.index'))
|
||||
->line(__('If you have any questions please let us know.'));
|
||||
}
|
||||
|
|
@ -57,13 +57,13 @@ class ServersSuspendedNotification extends Notification implements ShouldQueue
|
|||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
'title' => __('Your servers have been suspended!'),
|
||||
'content' => "
|
||||
<h5>". __('Your servers have been suspended!')."</h5>
|
||||
<p>". __("To automatically re-enable your server/s, you need to purchase more credits.")."</p>
|
||||
<p>". __('If you have any questions please let us know.')."</p>
|
||||
<p>". __('Regards').",<br />" . config('app.name', 'Laravel') . "</p>
|
||||
",
|
||||
'title' => __('Your servers have been suspended!'),
|
||||
'content' => '
|
||||
<h5>'.__('Your servers have been suspended!').'</h5>
|
||||
<p>'.__('To automatically re-enable your server/s, you need to purchase more credits.').'</p>
|
||||
<p>'.__('If you have any questions please let us know.').'</p>
|
||||
<p>'.__('Regards').',<br />'.config('app.name', 'Laravel').'</p>
|
||||
',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ use Illuminate\Notifications\Notification;
|
|||
|
||||
class AdminCreateNotification extends Notification implements ShouldQueue
|
||||
{
|
||||
|
||||
//THIS IS BASICALLY NOT USED ANYMORE WITH INVOICENOTIFICATION IN PLACE
|
||||
|
||||
use Queueable;
|
||||
|
||||
private Ticket $ticket;
|
||||
|
||||
private User $user;
|
||||
|
||||
/**
|
||||
|
|
@ -27,7 +27,7 @@ class AdminCreateNotification extends Notification implements ShouldQueue
|
|||
public function __construct(Ticket $ticket, User $user)
|
||||
{
|
||||
$this->ticket = $ticket;
|
||||
$this->user = $user;
|
||||
$this->user = $user;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -38,7 +38,8 @@ class AdminCreateNotification extends Notification implements ShouldQueue
|
|||
*/
|
||||
public function via($notifiable)
|
||||
{
|
||||
$via = ['mail','database'];
|
||||
$via = ['mail', 'database'];
|
||||
|
||||
return $via;
|
||||
}
|
||||
|
||||
|
|
@ -51,20 +52,20 @@ class AdminCreateNotification extends Notification implements ShouldQueue
|
|||
public function toMail($notifiable)
|
||||
{
|
||||
return (new MailMessage)
|
||||
->subject('[Ticket ID: ' . $this->ticket->ticket_id . '] ' . $this->ticket->title)
|
||||
->markdown('mail.ticket.admin.create' , ['ticket' => $this->ticket, 'user' => $this->user]);
|
||||
->subject('[Ticket ID: '.$this->ticket->ticket_id.'] '.$this->ticket->title)
|
||||
->markdown('mail.ticket.admin.create', ['ticket' => $this->ticket, 'user' => $this->user]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
'title' => '[Ticket ID: ' . $this->ticket->ticket_id . '] ' . $this->ticket->title,
|
||||
'title' => '[Ticket ID: '.$this->ticket->ticket_id.'] '.$this->ticket->title,
|
||||
'content' => "Ticket With ID : {$this->ticket->ticket_id} has been opened by <strong>{$this->user->name}</strong>",
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,13 +11,14 @@ use Illuminate\Notifications\Notification;
|
|||
|
||||
class AdminReplyNotification extends Notification implements ShouldQueue
|
||||
{
|
||||
|
||||
//THIS IS BASICALLY NOT USED ANYMORE WITH INVOICENOTIFICATION IN PLACE
|
||||
|
||||
use Queueable;
|
||||
|
||||
private Ticket $ticket;
|
||||
|
||||
private User $user;
|
||||
|
||||
private $newmessage;
|
||||
|
||||
/**
|
||||
|
|
@ -27,8 +28,8 @@ class AdminReplyNotification extends Notification implements ShouldQueue
|
|||
*/
|
||||
public function __construct(Ticket $ticket, User $user, $newmessage)
|
||||
{
|
||||
$this->ticket = $ticket;
|
||||
$this->user = $user;
|
||||
$this->ticket = $ticket;
|
||||
$this->user = $user;
|
||||
$this->newmessage = $newmessage;
|
||||
}
|
||||
|
||||
|
|
@ -40,7 +41,8 @@ class AdminReplyNotification extends Notification implements ShouldQueue
|
|||
*/
|
||||
public function via($notifiable)
|
||||
{
|
||||
$via = ['mail','database'];
|
||||
$via = ['mail', 'database'];
|
||||
|
||||
return $via;
|
||||
}
|
||||
|
||||
|
|
@ -53,20 +55,20 @@ class AdminReplyNotification extends Notification implements ShouldQueue
|
|||
public function toMail($notifiable)
|
||||
{
|
||||
return (new MailMessage)
|
||||
->subject('[Ticket ID: ' . $this->ticket->ticket_id . '] ' . $this->ticket->title)
|
||||
->markdown('mail.ticket.admin.reply' , ['ticket' => $this->ticket, 'user' => $this->user, 'newmessage' => $this->newmessage]);
|
||||
->subject('[Ticket ID: '.$this->ticket->ticket_id.'] '.$this->ticket->title)
|
||||
->markdown('mail.ticket.admin.reply', ['ticket' => $this->ticket, 'user' => $this->user, 'newmessage' => $this->newmessage]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
'title' => '[Ticket ID: ' . $this->ticket->ticket_id . '] ' . $this->ticket->title,
|
||||
'title' => '[Ticket ID: '.$this->ticket->ticket_id.'] '.$this->ticket->title,
|
||||
'content' => "
|
||||
<p>Ticket With ID : {$this->ticket->ticket_id} has had a new reply posted by <strong>{$this->user->name}</strong></p>
|
||||
<br>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ use Illuminate\Notifications\Notification;
|
|||
|
||||
class CreateNotification extends Notification implements ShouldQueue
|
||||
{
|
||||
|
||||
//THIS IS BASICALLY NOT USED ANYMORE WITH INVOICENOTIFICATION IN PLACE
|
||||
|
||||
use Queueable;
|
||||
|
|
@ -35,7 +34,8 @@ class CreateNotification extends Notification implements ShouldQueue
|
|||
*/
|
||||
public function via($notifiable)
|
||||
{
|
||||
$via = ['mail','database'];
|
||||
$via = ['mail', 'database'];
|
||||
|
||||
return $via;
|
||||
}
|
||||
|
||||
|
|
@ -48,20 +48,20 @@ class CreateNotification extends Notification implements ShouldQueue
|
|||
public function toMail($notifiable)
|
||||
{
|
||||
return (new MailMessage)
|
||||
->subject('[Ticket ID: ' . $this->ticket->ticket_id . '] ' . $this->ticket->title)
|
||||
->markdown('mail.ticket.user.create' , ['ticket' => $this->ticket]);
|
||||
->subject('[Ticket ID: '.$this->ticket->ticket_id.'] '.$this->ticket->title)
|
||||
->markdown('mail.ticket.user.create', ['ticket' => $this->ticket]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
'title' => '[Ticket ID: ' . $this->ticket->ticket_id . '] ' . $this->ticket->title,
|
||||
'title' => '[Ticket ID: '.$this->ticket->ticket_id.'] '.$this->ticket->title,
|
||||
'content' => "Your Ticket has been Created With ID : {$this->ticket->ticket_id}",
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
namespace App\Notifications\Ticket\User;
|
||||
|
||||
use App\Models\User;
|
||||
use App\Models\Ticket;
|
||||
use App\Models\User;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Notifications\Messages\MailMessage;
|
||||
|
|
@ -11,13 +11,14 @@ use Illuminate\Notifications\Notification;
|
|||
|
||||
class ReplyNotification extends Notification implements ShouldQueue
|
||||
{
|
||||
|
||||
//THIS IS BASICALLY NOT USED ANYMORE WITH INVOICENOTIFICATION IN PLACE
|
||||
|
||||
use Queueable;
|
||||
|
||||
private Ticket $ticket;
|
||||
|
||||
private User $user;
|
||||
|
||||
private $newmessage;
|
||||
|
||||
/**
|
||||
|
|
@ -27,8 +28,8 @@ class ReplyNotification extends Notification implements ShouldQueue
|
|||
*/
|
||||
public function __construct(Ticket $ticket, User $user, $newmessage)
|
||||
{
|
||||
$this->ticket = $ticket;
|
||||
$this->user = $user;
|
||||
$this->ticket = $ticket;
|
||||
$this->user = $user;
|
||||
$this->newmessage = $newmessage;
|
||||
}
|
||||
|
||||
|
|
@ -40,7 +41,8 @@ class ReplyNotification extends Notification implements ShouldQueue
|
|||
*/
|
||||
public function via($notifiable)
|
||||
{
|
||||
$via = ['mail','database'];
|
||||
$via = ['mail', 'database'];
|
||||
|
||||
return $via;
|
||||
}
|
||||
|
||||
|
|
@ -53,20 +55,20 @@ class ReplyNotification extends Notification implements ShouldQueue
|
|||
public function toMail($notifiable)
|
||||
{
|
||||
return (new MailMessage)
|
||||
->subject('[Ticket ID: ' . $this->ticket->ticket_id . '] ' . $this->ticket->title)
|
||||
->markdown('mail.ticket.user.reply' , ['ticket' => $this->ticket, 'user' => $this->user, 'newmessage' => $this->newmessage]);
|
||||
->subject('[Ticket ID: '.$this->ticket->ticket_id.'] '.$this->ticket->title)
|
||||
->markdown('mail.ticket.user.reply', ['ticket' => $this->ticket, 'user' => $this->user, 'newmessage' => $this->newmessage]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
return [
|
||||
'title' => '[Ticket ID: ' . $this->ticket->ticket_id . '] ' . $this->ticket->title,
|
||||
'title' => '[Ticket ID: '.$this->ticket->ticket_id.'] '.$this->ticket->title,
|
||||
'content' => "
|
||||
<p>Ticket With ID : {$this->ticket->ticket_id} A response has been added to your ticket. Please see below for our response!</p>
|
||||
<br>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace App\Notifications;
|
||||
|
||||
use App\Models\Settings;
|
||||
use App\Models\User;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
|
|
@ -20,7 +19,7 @@ class WelcomeMessage extends Notification implements ShouldQueue
|
|||
/**
|
||||
* Create a new notification instance.
|
||||
*
|
||||
* @param User $user
|
||||
* @param User $user
|
||||
*/
|
||||
public function __construct(User $user)
|
||||
{
|
||||
|
|
@ -30,56 +29,56 @@ class WelcomeMessage extends Notification implements ShouldQueue
|
|||
/**
|
||||
* Get the notification's delivery channels.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function via($notifiable)
|
||||
{
|
||||
return ['database'];
|
||||
}
|
||||
|
||||
public function AdditionalLines()
|
||||
{
|
||||
|
||||
$AdditionalLine = "";
|
||||
$AdditionalLine = '';
|
||||
if (config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL') != 0) {
|
||||
$AdditionalLine .= __("Verifying your e-mail address will grant you ") . config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL'). " " . __("additional") . " " . config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME') . ". <br />";
|
||||
$AdditionalLine .= __('Verifying your e-mail address will grant you ').config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL').' '.__('additional').' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').'. <br />';
|
||||
}
|
||||
if (config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL') != 0) {
|
||||
$AdditionalLine .= __("Verifying your e-mail will also increase your Server Limit by ") . config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL') . ". <br />";
|
||||
$AdditionalLine .= __('Verifying your e-mail will also increase your Server Limit by ').config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL').'. <br />';
|
||||
}
|
||||
$AdditionalLine .= "<br />";
|
||||
$AdditionalLine .= '<br />';
|
||||
if (config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD') != 0) {
|
||||
$AdditionalLine .= __("You can also verify your discord account to get another ") . config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD') . " " . config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME') . ". <br />";
|
||||
$AdditionalLine .= __('You can also verify your discord account to get another ').config('SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD').' '.config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME').'. <br />';
|
||||
}
|
||||
if (config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD') != 0) {
|
||||
$AdditionalLine .= __("Verifying your Discord account will also increase your Server Limit by ") . config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD') . ". <br />";
|
||||
$AdditionalLine .= __('Verifying your Discord account will also increase your Server Limit by ').config('SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD').'. <br />';
|
||||
}
|
||||
|
||||
return $AdditionalLine;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the array representation of the notification.
|
||||
*
|
||||
* @param mixed $notifiable
|
||||
* @param mixed $notifiable
|
||||
* @return array
|
||||
*/
|
||||
public function toArray($notifiable)
|
||||
{
|
||||
|
||||
return [
|
||||
'title' => __("Getting started!"),
|
||||
'content' => "
|
||||
<p> ".__("Hello")." <strong>{$this->user->name}</strong>, ".__("Welcome to our dashboard")."!</p>
|
||||
<h5>".__("Verification")."</h5>
|
||||
<p>".__("You can verify your e-mail address and link/verify your Discord account.")."</p>
|
||||
'title' => __('Getting started!'),
|
||||
'content' => '
|
||||
<p> '.__('Hello')." <strong>{$this->user->name}</strong>, ".__('Welcome to our dashboard').'!</p>
|
||||
<h5>'.__('Verification').'</h5>
|
||||
<p>'.__('You can verify your e-mail address and link/verify your Discord account.').'</p>
|
||||
<p>
|
||||
" . $this->AdditionalLines() . "
|
||||
'.$this->AdditionalLines().'
|
||||
</p>
|
||||
<h5>".__("Information")."</h5>
|
||||
<p>".__("This dashboard can be used to create and delete servers").".<br /> ".__("These servers can be used and managed on our pterodactyl panel").".<br /> ".__("If you have any questions, please join our Discord server and #create-a-ticket").".</p>
|
||||
<p>".__("We hope you can enjoy this hosting experience and if you have any suggestions please let us know")."!</p>
|
||||
<p>".__("Regards").",<br />" . config('app.name', 'Laravel') . "</p>
|
||||
",
|
||||
<h5>'.__('Information').'</h5>
|
||||
<p>'.__('This dashboard can be used to create and delete servers').'.<br /> '.__('These servers can be used and managed on our pterodactyl panel').'.<br /> '.__('If you have any questions, please join our Discord server and #create-a-ticket').'.</p>
|
||||
<p>'.__('We hope you can enjoy this hosting experience and if you have any suggestions please let us know').'!</p>
|
||||
<p>'.__('Regards').',<br />'.config('app.name', 'Laravel').'</p>
|
||||
',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
namespace App\Providers;
|
||||
|
||||
use App\Models\Settings;
|
||||
use Exception;
|
||||
use Illuminate\Pagination\Paginator;
|
||||
use Illuminate\Support\Facades\Artisan;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use Exception;
|
||||
|
||||
class AppServiceProvider extends ServiceProvider
|
||||
{
|
||||
|
|
@ -44,9 +44,9 @@ class AppServiceProvider extends ServiceProvider
|
|||
}
|
||||
|
||||
//if none of result array is true. it sets ok to false
|
||||
if (!in_array(true, $result)) {
|
||||
if (! in_array(true, $result)) {
|
||||
$ok = false;
|
||||
$validator->setCustomMessages(['multiple_date_format' => 'The format must be one of ' . join(",", $parameters)]);
|
||||
$validator->setCustomMessages(['multiple_date_format' => 'The format must be one of '.implode(',', $parameters)]);
|
||||
}
|
||||
|
||||
return $ok;
|
||||
|
|
@ -88,10 +88,9 @@ class AppServiceProvider extends ServiceProvider
|
|||
Artisan::call('queue:restart');
|
||||
}
|
||||
|
||||
|
||||
// Set Recaptcha API Config
|
||||
// Load recaptcha package if recaptcha is enabled
|
||||
if(config('SETTINGS::RECAPTCHA:ENABLED') == 'true') {
|
||||
if (config('SETTINGS::RECAPTCHA:ENABLED') == 'true') {
|
||||
$this->app->register(\Biscolab\ReCaptcha\ReCaptchaServiceProvider::class);
|
||||
}
|
||||
|
||||
|
|
@ -107,29 +106,27 @@ class AppServiceProvider extends ServiceProvider
|
|||
Artisan::call('cache:clear');
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
$stringfromfile = file(base_path().'/.git/HEAD');
|
||||
|
||||
$firstLine = $stringfromfile[0]; //get the string from the array
|
||||
|
||||
$explodedstring = explode("/", $firstLine, 3); //seperate out by the "/" in the string
|
||||
$explodedstring = explode('/', $firstLine, 3); //seperate out by the "/" in the string
|
||||
|
||||
$branchname = $explodedstring[2]; //get the one that is always the branch name
|
||||
} catch (Exception $e) {
|
||||
$branchname = "unknown";
|
||||
$branchname = 'unknown';
|
||||
Log::error($e);
|
||||
}
|
||||
config(['BRANCHNAME' => $branchname]);
|
||||
|
||||
|
||||
// Set Discord-API Config
|
||||
config(['services.discord.client_id' => config('SETTINGS::DISCORD:CLIENT_ID')]);
|
||||
config(['services.discord.client_secret' => config('SETTINGS::DISCORD:CLIENT_SECRET')]);
|
||||
} catch (Exception $e) {
|
||||
error_log("Settings Error: Could not load settings from database. The Installation probably is not done yet.");
|
||||
error_log('Settings Error: Could not load settings from database. The Installation probably is not done yet.');
|
||||
error_log($e);
|
||||
Log::error("Settings Error: Could not load settings from database. The Installation probably is not done yet.");
|
||||
Log::error('Settings Error: Could not load settings from database. The Installation probably is not done yet.');
|
||||
Log::error($e);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
namespace App\Providers;
|
||||
|
||||
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
|
||||
use Illuminate\Support\Facades\Gate;
|
||||
|
||||
class AuthServiceProvider extends ServiceProvider
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ class EventServiceProvider extends ServiceProvider
|
|||
SendEmailVerificationNotification::class,
|
||||
],
|
||||
UserUpdateCreditsEvent::class => [
|
||||
UnsuspendServers::class
|
||||
UnsuspendServers::class,
|
||||
],
|
||||
SocialiteWasCalled::class => [
|
||||
// ... other providers
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ class RouteServiceProvider extends ServiceProvider
|
|||
Route::middleware('web')
|
||||
->namespace($this->namespace)
|
||||
->group(base_path('routes/web.php'));
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ return [
|
|||
|
|
||||
*/
|
||||
|
||||
'debug' => (bool)env('APP_DEBUG', false),
|
||||
'debug' => (bool) env('APP_DEBUG', false),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
@ -71,7 +71,6 @@ return [
|
|||
|
||||
'timezone' => env('APP_TIMEZONE', 'UTC'),
|
||||
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Application Locale Configuration
|
||||
|
|
@ -83,7 +82,7 @@ return [
|
|||
|
|
||||
*/
|
||||
|
||||
'locale' => "en",
|
||||
'locale' => 'en',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
@ -96,8 +95,7 @@ return [
|
|||
|
|
||||
*/
|
||||
|
||||
'available_locales' => array_map('basename', preg_replace('/\\.[^.\\s]{3,4}$/', '', glob(resource_path() . "/lang/*.json", GLOB_BRACE))),
|
||||
|
||||
'available_locales' => array_map('basename', preg_replace('/\\.[^.\\s]{3,4}$/', '', glob(resource_path().'/lang/*.json', GLOB_BRACE))),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
@ -179,7 +177,6 @@ return [
|
|||
Illuminate\Validation\ValidationServiceProvider::class,
|
||||
Illuminate\View\ViewServiceProvider::class,
|
||||
|
||||
|
||||
/*
|
||||
* Package Service Providers...
|
||||
*/
|
||||
|
|
@ -196,7 +193,6 @@ return [
|
|||
|
||||
KKomelin\TranslatableStringExporter\Providers\ExporterServiceProvider::class,
|
||||
|
||||
|
||||
],
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?php
|
||||
|
||||
return [
|
||||
"AUD", "BRL", "CAD", "CNY", "CZK", "DKK", "EUR", "HKD", "HUF", "ILS", "JPY", "MYR", "MXN", "TWD", "NZD", "NOK", "PHP", "PLN", "GBP", "RUB", "SGD", "SEK", "CHF", "THB", "USD",
|
||||
'AUD', 'BRL', 'CAD', 'CNY', 'CZK', 'DKK', 'EUR', 'HKD', 'HUF', 'ILS', 'JPY', 'MYR', 'MXN', 'TWD', 'NZD', 'NOK', 'PHP', 'PLN', 'GBP', 'RUB', 'SGD', 'SEK', 'CHF', 'THB', 'USD',
|
||||
];
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@ return [
|
|||
'visibility' => 'public',
|
||||
],
|
||||
|
||||
|
||||
's3' => [
|
||||
'driver' => 's3',
|
||||
'key' => env('AWS_ACCESS_KEY_ID'),
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ return [
|
|||
],
|
||||
|
||||
'serial_number' => [
|
||||
'series' => 'AA',
|
||||
'series' => 'AA',
|
||||
'sequence' => 1,
|
||||
/*
|
||||
* Sequence will be padded accordingly, for ex. 00001
|
||||
*/
|
||||
'sequence_padding' => 5,
|
||||
'delimiter' => '.',
|
||||
'delimiter' => '.',
|
||||
/*
|
||||
* Supported tags {SERIES}, {DELIMITER}, {SEQUENCE}
|
||||
* Example: AA.00001
|
||||
|
|
@ -36,7 +36,7 @@ return [
|
|||
* Example: Amount in words: Eight hundred fifty thousand sixty-eight EUR and fifteen ct.
|
||||
*/
|
||||
'fraction' => 'ct.',
|
||||
'symbol' => '€',
|
||||
'symbol' => '€',
|
||||
/*
|
||||
* Example: 19.00
|
||||
*/
|
||||
|
|
@ -59,7 +59,7 @@ return [
|
|||
|
||||
'paper' => [
|
||||
// A4 = 210 mm x 297 mm = 595 pt x 842 pt
|
||||
'size' => 'a4',
|
||||
'size' => 'a4',
|
||||
'orientation' => 'portrait',
|
||||
],
|
||||
|
||||
|
|
@ -78,11 +78,11 @@ return [
|
|||
* Default attributes for Seller::class
|
||||
*/
|
||||
'attributes' => [
|
||||
'name' => 'Towne, Smith and Ebert',
|
||||
'address' => '89982 Pfeffer Falls Damianstad, CO 66972-8160',
|
||||
'code' => '41-1985581',
|
||||
'vat' => '123456789',
|
||||
'phone' => '760-355-3930',
|
||||
'name' => 'Towne, Smith and Ebert',
|
||||
'address' => '89982 Pfeffer Falls Damianstad, CO 66972-8160',
|
||||
'code' => '41-1985581',
|
||||
'vat' => '123456789',
|
||||
'phone' => '760-355-3930',
|
||||
'custom_fields' => [
|
||||
/*
|
||||
* Custom attributes for Seller::class
|
||||
|
|
|
|||
|
|
@ -14,134 +14,119 @@
|
|||
return [
|
||||
|
||||
/**
|
||||
*
|
||||
* The site key
|
||||
* get site key @ www.google.com/recaptcha/admin
|
||||
*
|
||||
*/
|
||||
'api_site_key' => env('RECAPTCHA_SITE_KEY', ''),
|
||||
'api_site_key' => env('RECAPTCHA_SITE_KEY', ''),
|
||||
|
||||
/**
|
||||
*
|
||||
* The secret key
|
||||
* get secret key @ www.google.com/recaptcha/admin
|
||||
*
|
||||
*/
|
||||
'api_secret_key' => env('RECAPTCHA_SECRET_KEY', ''),
|
||||
'api_secret_key' => env('RECAPTCHA_SECRET_KEY', ''),
|
||||
|
||||
/**
|
||||
*
|
||||
* ReCATCHA version
|
||||
* Supported: "v2", "invisible", "v3",
|
||||
*
|
||||
* get more info @ https://developers.google.com/recaptcha/docs/versions
|
||||
*
|
||||
*/
|
||||
'version' => 'v2',
|
||||
'version' => 'v2',
|
||||
|
||||
/**
|
||||
*
|
||||
* The curl timout in seconds to validate a recaptcha token
|
||||
*
|
||||
* @since v3.5.0
|
||||
*
|
||||
*/
|
||||
'curl_timeout' => 10,
|
||||
'curl_timeout' => 10,
|
||||
|
||||
/**
|
||||
*
|
||||
* IP addresses for which validation will be skipped
|
||||
*
|
||||
*/
|
||||
'skip_ip' => [],
|
||||
'skip_ip' => [],
|
||||
|
||||
/**
|
||||
*
|
||||
* Default route called to check the Google reCAPTCHA token
|
||||
* @since v3.2.0
|
||||
*
|
||||
* @since v3.2.0
|
||||
*/
|
||||
'default_validation_route' => 'biscolab-recaptcha/validate',
|
||||
'default_validation_route' => 'biscolab-recaptcha/validate',
|
||||
|
||||
/**
|
||||
*
|
||||
* The name of the parameter used to send Google reCAPTCHA token to verify route
|
||||
* @since v3.2.0
|
||||
*
|
||||
* @since v3.2.0
|
||||
*/
|
||||
'default_token_parameter_name' => 'token',
|
||||
|
||||
/**
|
||||
*
|
||||
* The default Google reCAPTCHA language code
|
||||
* It has no effect with v3
|
||||
*
|
||||
* @see https://developers.google.com/recaptcha/docs/language
|
||||
* @since v3.6.0
|
||||
*
|
||||
*/
|
||||
'default_language' => null,
|
||||
'default_language' => null,
|
||||
|
||||
/**
|
||||
*
|
||||
* The default form ID. Only for "invisible" reCAPTCHA
|
||||
* @since v4.0.0
|
||||
*
|
||||
* @since v4.0.0
|
||||
*/
|
||||
'default_form_id' => 'biscolab-recaptcha-invisible-form',
|
||||
'default_form_id' => 'biscolab-recaptcha-invisible-form',
|
||||
|
||||
/**
|
||||
*
|
||||
* Deferring the render can be achieved by specifying your onload callback function and adding parameters to the JavaScript resource.
|
||||
* It has no effect with v3 and invisible
|
||||
*
|
||||
* @see https://developers.google.com/recaptcha/docs/display#explicit_render
|
||||
* @since v4.0.0
|
||||
* Supported true, false
|
||||
*
|
||||
*/
|
||||
'explicit' => false,
|
||||
'explicit' => false,
|
||||
|
||||
/**
|
||||
*
|
||||
* Set API domain. You can use "www.recaptcha.net" in case "www.google.com" is not accessible.
|
||||
* (no check will be made on the entered value)
|
||||
*
|
||||
* @see https://developers.google.com/recaptcha/docs/faq#can-i-use-recaptcha-globally
|
||||
* @since v4.3.0
|
||||
* Default 'www.google.com' (ReCaptchaBuilder::DEFAULT_RECAPTCHA_API_DOMAIN)
|
||||
*
|
||||
*/
|
||||
'api_domain' => 'www.google.com',
|
||||
'api_domain' => 'www.google.com',
|
||||
|
||||
/**
|
||||
*
|
||||
* g-recaptcha tag attributes and grecaptcha.render parameters (v2 only)
|
||||
*
|
||||
* @see https://developers.google.com/recaptcha/docs/display#render_param
|
||||
* @since v4.0.0
|
||||
*/
|
||||
'tag_attributes' => [
|
||||
'tag_attributes' => [
|
||||
|
||||
/**
|
||||
* The color theme of the widget.
|
||||
* Supported "light", "dark"
|
||||
*/
|
||||
'theme' => 'dark',
|
||||
'theme' => 'dark',
|
||||
|
||||
/**
|
||||
* The size of the widget.
|
||||
* Supported "normal", "compact"
|
||||
*/
|
||||
'size' => 'normal',
|
||||
'size' => 'normal',
|
||||
|
||||
/**
|
||||
* The tabindex of the widget and challenge.
|
||||
* If other elements in your page use tabindex, it should be set to make user navigation easier.
|
||||
*/
|
||||
'tabindex' => 0,
|
||||
'tabindex' => 0,
|
||||
|
||||
/**
|
||||
* The name of your callback function, executed when the user submits a successful response.
|
||||
* The g-recaptcha-response token is passed to your callback.
|
||||
* DO NOT SET "biscolabOnloadCallback"
|
||||
*/
|
||||
'callback' => null,
|
||||
'callback' => null,
|
||||
|
||||
/**
|
||||
* The name of your callback function, executed when the reCAPTCHA response expires and the user needs to re-verify.
|
||||
|
|
@ -154,6 +139,6 @@ return [
|
|||
* If you specify a function here, you are responsible for informing the user that they should retry.
|
||||
* DO NOT SET "biscolabOnloadCallback"
|
||||
*/
|
||||
'error-callback' => null,
|
||||
]
|
||||
'error-callback' => null,
|
||||
],
|
||||
];
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@ return [
|
|||
'discord' => [
|
||||
'client_id' => env('DISCORD_CLIENT_ID'),
|
||||
'client_secret' => env('DISCORD_CLIENT_SECRET'),
|
||||
'redirect' => env('APP_URL' , 'http://localhost') . "/auth/callback",
|
||||
'redirect' => env('APP_URL', 'http://localhost').'/auth/callback',
|
||||
|
||||
// optional
|
||||
'allow_gif_avatars' => (bool)env('DISCORD_AVATAR_GIF', true),
|
||||
'allow_gif_avatars' => (bool) env('DISCORD_AVATAR_GIF', true),
|
||||
'avatar_default_extension' => env('DISCORD_EXTENSION_DEFAULT', 'jpg'), // only pick from jpg, png, webp
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -51,4 +51,4 @@ return [
|
|||
* \Symfony\Component\HttpFoundation\Request::$trustedHeaders
|
||||
*/
|
||||
'headers' => \Illuminate\Http\Request::HEADER_X_FORWARDED_ALL,
|
||||
];
|
||||
];
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ class ApplicationApiFactory extends Factory
|
|||
public function definition()
|
||||
{
|
||||
return [
|
||||
'memo' => $this->faker->word()
|
||||
'memo' => $this->faker->word(),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ class DiscordUserFactory extends Factory
|
|||
public function definition()
|
||||
{
|
||||
return [
|
||||
'id' => $this->faker->numberBetween(186902438396035072 , 986902438396035072),
|
||||
'id' => $this->faker->numberBetween(186902438396035072, 986902438396035072),
|
||||
'user_id' => function () {
|
||||
return User::factory()->create()->id;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ class PaymentFactory extends Factory
|
|||
'payment_id' => Str::random(30),
|
||||
'payer_id' => Str::random(30),
|
||||
'user_id' => User::factory(),
|
||||
'type' => "Credits",
|
||||
'status' => "Completed",
|
||||
'type' => 'Credits',
|
||||
'status' => 'Completed',
|
||||
'amount' => $this->faker->numberBetween(10, 10000),
|
||||
'price' => $this->faker->numerify('##.##'),
|
||||
'currency_code' => ['EUR', 'USD'][rand(0,1)],
|
||||
'currency_code' => ['EUR', 'USD'][rand(0, 1)],
|
||||
'payer' => '{}',
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,10 +24,10 @@ class ProductFactory extends Factory
|
|||
return [
|
||||
'name' => $this->faker->name,
|
||||
'description' => $this->faker->text(60),
|
||||
'price' => $this->faker->numberBetween(0 , 1000),
|
||||
'memory' => $this->faker->numberBetween(32 , 1024),
|
||||
'disk' => $this->faker->numberBetween(500 , 5000),
|
||||
'databases' => $this->faker->numberBetween(1 , 10)
|
||||
'price' => $this->faker->numberBetween(0, 1000),
|
||||
'memory' => $this->faker->numberBetween(32, 1024),
|
||||
'disk' => $this->faker->numberBetween(500, 5000),
|
||||
'databases' => $this->faker->numberBetween(1, 10),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue