Commit graph

301 commits

Author SHA1 Message Date
1day2die
a2e4798b3d PSR12 2021-10-26 17:55:55 +02:00
1day2die
fe588c5069 more variables 2021-10-26 17:51:15 +02:00
WBLKLeipe
c92b435f65 Comments 2021-10-26 16:54:51 +02:00
WBLKLeipe
903ca36b7b The ways supposed to be 2021-10-26 16:53:53 +02:00
WBLKLeipe
3055c2f550 Fixed Redundant code 2021-10-26 16:24:57 +02:00
WBLKLeipe
70b937324e formatting? 2021-10-26 16:18:16 +02:00
WBLKLeipe
ed3edd181b Fix 2021-10-26 16:12:47 +02:00
Jozef
015f735a4f Added to it shows the currency of your coins in the notification 2021-10-26 14:53:11 +01:00
Dennis
8ee876b30a
Fix for " redeclare"-error 2021-10-26 14:13:42 +02:00
AVMG
1e987bbbbc
Merge pull request #229 from 1day2die/fix_welcomemessage
Disable Discord/Email Credit WelcomeMessages if not set
2021-10-20 08:22:10 +02:00
AVMG
d71bc134fb
Merge pull request #230 from 1day2die/fix_SERVER_LIMIT_REWARD_
Fix server limit reward
2021-10-19 19:49:45 +02:00
AVMG20
deb4e89701 temp removed discord images 2021-10-14 20:32:44 +02:00
Dennis
e89c25cdcf
Hotfix HotFix to change Hard-Coded Server-limit-after-IRL-Purchase
This is absolutely not tested as i have no dev env right now
2021-10-14 09:08:20 +02:00
Dennis
c2dadbf996
Reverse changes 2021-10-14 09:03:59 +02:00
Dennis
306536206b
Update WelcomeMessage.php 2021-10-13 23:29:42 +02:00
Dennis
8b963f170c
Update WelcomeMessage.php 2021-10-13 23:26:18 +02:00
Dennis
c8c8ae753d
Disable Discord/Email Credit Messages if not set
This is a quick and dirty way I suppose? But it works and makes Companys that dont give away free servers not look that dumb
2021-10-13 23:21:53 +02:00
AVMG20
2249738446 Return value was placed in an array, this altered the response from the array which could break existing implementations 2021-10-13 22:34:05 +02:00
Dennis
73fe6a502a
space 2021-10-13 22:05:37 +02:00
Dennis
4f838d89bb
Fixed error with discord pics not loading 2021-10-13 19:24:40 +02:00
Dennis
6325cd8f87
Beautify as AVMG wishes spacespacespaceenter 2021-10-13 18:47:45 +02:00
Dennis
228d55c389
If discord is connected, use discord avatar instead of gravatar 2021-10-13 18:39:51 +02:00
AVMG20
01b5ec80a6 cleanup 2021-10-12 21:37:11 +02:00
AVMG20
1f8b34e684 improved api endpoints
added includes and filters on most GET request routes
added discord id support for notifications
added register user endpoint
2021-10-12 21:36:13 +02:00
AVMG20
3665b9ff55 improved user controller 2021-10-11 23:46:06 +02:00
LogischJo
e53a055bc2
Merge pull request #211 from j122j/minimum-credits
Add minimal credits per product
2021-10-06 21:55:11 +02:00
Dennis
4f953474cd
Merge pull request #216 from j122j/config-types
Change input type based on configuration type
2021-10-04 13:34:10 +02:00
Dennis
0ddeadfd27
Merge pull request #214 from j122j/voucher-users
Shows who redeemed vouchers
2021-10-04 13:33:39 +02:00
Jovan Jovanovic
76595aa7bb Change input type based on configuration type 2021-10-03 23:47:06 +02:00
Jovan Jovanovic
4d3c6c7a13 Fix select if using global limit 2021-10-03 15:18:08 +02:00
Jovan Jovanovic
7d229ec25b Remove the global check for minimum required credits 2021-10-03 14:47:51 +02:00
Jovan Jovanovic
6be22c0eea Add voucher users 2021-10-03 00:55:10 +02:00
Jovan Jovanovic
76d7710d0e Add form data casts for numbers 2021-10-02 18:29:32 +02:00
Jovan Jovanovic
28af0c0530 Add minimal credits per product 2021-10-01 23:21:49 +02:00
Johannes
241014134f Fix formatting 2021-09-27 20:27:06 +02:00
Johannes
b1ca573dd1 User server gets suspended / unsuspended if an user accounts get suspended / unsuspended 2021-09-27 18:43:07 +02:00
Johannes
4c060fd270 Add the ability to Suspend Users 2021-09-26 17:50:13 +02:00
AVMG20
f4237b2e88 Charges the first hour worth of credits upon creating a server. 2021-09-15 08:37:43 +02:00
AVMG20
822d3b9540 fixed admin delete server, when server couldn't be found
when you try to delete a server which has already been deleted in pterodactyl, the delete will trow an error.
2021-09-15 08:30:15 +02:00
AVMG20
5877ddbe81 update auto unsuspend servers to be server resource friendlier 2021-09-09 21:09:57 +02:00
AVMG20
b8c8cb7404 cleanup + auto unsuspend servers when credits update 2021-09-09 20:50:16 +02:00
Jovan Jovanovic
5333139204 Use product limmit instead of hardcoded one 2021-08-10 00:49:28 +02:00
Jovan Jovanovic
e764327e32
Merge branch 'development' into custom-notifications 2021-08-04 23:15:04 +02:00
Jovan Jovanovic
e58b8c2aad Add array separator 2021-08-04 22:17:50 +02:00
Jovan Jovanovic
e97ae55725 Send notification to multiple users 2021-08-04 22:01:50 +02:00
Jovan Jovanovic
a19cbb1575 Merge database and mail fields 2021-08-03 22:46:58 +02:00
Jovan Jovanovic
0597b4aabe Add admin ui 2021-08-03 04:03:02 +02:00
Jovan Jovanovic
aa19844d8e Remove required_if 2021-08-03 00:25:55 +02:00
Jovan Jovanovic
2f92967a9c Add notifications api 2021-08-03 00:10:59 +02:00
AVMG20
e9bc2e8827 CREDITS_DISPLAY_NAME 2021-08-02 20:32:22 +02:00
AVMG20
3f78d7dd1d small addition to the delete 2021-08-02 19:44:14 +02:00
AVMG20
370c85585c added the option to change the credits display name 2021-08-02 19:25:33 +02:00
AVMG20
cd4a01db7b make user command, made password field invis 2021-08-02 17:52:26 +02:00
AVMG20
07454ddd78 500 | Server Error on Duplicate Voucher #133
Fixed!
2021-08-02 17:49:37 +02:00
AVMG20
a07749e04b fixed a bug: is ptero is down don't delete the server from our side
if pterodactylpanel would be down and you would delete your server then it would be removed from controlpanel but not from pterodactyl, it now makes sure to delete on pterodactyl before deleting on controlpanel
2021-08-02 16:47:22 +02:00
AVMG20
27028c9711 cleanup 2021-08-02 16:33:34 +02:00
AVMG
a857aa488a
Merge pull request #152 from Hiekki4/development
increment & decrement endpoints
2021-08-02 16:20:52 +02:00
António Duarte
f177ae53ce
Update UserController.php 2021-08-01 18:52:44 +01:00
AVMG
9abd00f97a
Merge pull request #156 from j122j/vouchers-add-time
Vouchers add time
2021-07-29 19:48:15 +02:00
Jovan Jovanovic
f0a31fd4e2 Add support to add time for voucher expires_at 2021-07-28 18:22:12 +02:00
Jovan Jovanovic
916fbad8af Clean up some code 2021-07-28 16:56:02 +02:00
Hiekki
adba5b1fdb Validation for negative values 2021-07-28 09:47:10 +01:00
AVMG20
a5d030e710 improved the make user command to give better feedback 2021-07-28 10:05:01 +02:00
Hiekki
b12007aea3 decrement and increment endpoints 2021-07-27 13:20:31 +01:00
Hiekki
696ce64df3 [WIP] increment 2021-07-27 09:15:10 +01:00
Jovan Jovanovic
bdc1981c36 Add DynamicNotification and notification api endpoints 2021-07-26 04:24:55 +02:00
Hiekki
f331049ec0 AVMG 2021-07-25 23:38:12 +01:00
António Duarte
57edcd0b57
Update UserController.php 2021-07-25 19:20:43 +01:00
António Duarte
dbf389e717
Update UserController.php 2021-07-25 19:19:59 +01:00
Hiekki
32f6fb5198 AddCredits endpoint is working 2021-07-25 17:07:03 +01:00
Hiekki
28ab548094 credits endpoint [WORK IN PROGRESS] 2021-07-23 20:41:49 +01:00
AVMG20
cb4ade5a5d Fixed 500 error when linking discord accounts 2021-07-16 09:21:30 +02:00
AVMG20
4d0c9deab9 added voucher api 2021-07-15 22:16:26 +02:00
AVMG20
fc2d972183 Fixed a bug where deleting a user wouldn't delete the linked discord acc 2021-07-13 21:33:08 +02:00
AVMG20
a4863075eb small error response change 2021-07-12 13:47:57 +02:00
AVMG20
735097d722 tested voucher controller 2021-07-12 13:44:26 +02:00
AVMG20
78d298c119 added datetime picker and better date validation 2021-07-12 12:54:59 +02:00
AVMG20
4e9ba7866f improved force verify, added login recaptcha
+ removed store when paypal isn't set-up correctly
2021-07-11 11:03:35 +02:00
AVMG20
7c4fedfa93 added activity log to vouchers, added rate limits to voucher redeem form 2021-07-10 09:41:24 +02:00
AVMG20
348868d6bd detach all vouchers from the user when deleting the user 2021-07-10 09:24:14 +02:00
AVMG20
8b4ccaabc9 made voucher memo nullable 2021-07-10 09:15:47 +02:00
AVMG20
7aa6acb5d8 added the ability to edit vouchers 2021-07-10 09:10:42 +02:00
AVMG20
55b2223435 Added Voucher system 2021-07-10 08:58:11 +02:00
AVMG20
a7f8d71f92 Added voucher system 2021-07-10 00:18:22 +02:00
AVMG20
c31d67e2f4 added clone function to clone products 2021-07-06 23:19:25 +02:00
AVMG20
bd45b3b713 Linking of products to nodes and/or eggs 2021-07-06 21:38:13 +02:00
AVMG20
77444496a2 cleanup 2021-07-05 21:49:28 +02:00
AVMG20
c0f9436ffd tiny validation fixes 2021-07-05 21:06:13 +02:00
AVMG20
6a431edd8b Allocation limit added 2021-07-05 20:47:29 +02:00
AVMG20
2279cc492e import script for pterodactyl users 2021-07-01 14:33:52 +02:00
AVMG20
2862c64979 added some more error logging to server creation 2021-06-30 23:53:28 +02:00
AVMG20
823cde9cf9 Added REGISTER_IP_CHECK config option
Prevent users from making multiple accounts using the same IP address
2021-06-27 15:53:49 +02:00
AVMG
a8f455c6c4
Bool to null 2021-06-27 00:02:27 +02:00
AVMG20
7d34a15860 minor tweaks to force verification 2021-06-26 23:56:54 +02:00
Johannes
19e34dee81 Small addition 2021-06-26 23:11:15 +02:00
Johannes
bfa7a84e0b Fix: Force Verification 2021-06-26 22:04:23 +02:00
AVMG20
f54b596128 notification additions 2021-06-26 16:57:03 +02:00
AVMG20
5171f01852 added suspended server notification 2021-06-26 00:24:44 +02:00
AVMG20
eeee4fffb0 cleanup charge credits command 2021-06-25 23:42:53 +02:00
AVMG
131321b83f
Merge branch 'development' into patch-1 2021-06-23 12:49:21 +02:00
AnonDev
c8a2143b9d
Not needed 2021-06-23 12:32:20 +02:00
AVMG20
2f9dce8ddf Adding the correct currency_code to payments 2021-06-23 12:22:08 +02:00
AVMG20
b445cf7003 Some love to payments
Fixed a bug with the new payment changes
Improved the payments table and changes
2021-06-23 11:28:57 +02:00
AVMG20
9c6317d32f Made notifications queueble, added payment confirmation notification 2021-06-22 23:22:57 +02:00
AVMG20
fff45d4f75 changed the required CPU minimum from 5 to 0 in products 2021-06-22 21:39:32 +02:00
AVMG20
e40b2c49b2 added extra config option for server limit after purchases 2021-06-22 21:25:04 +02:00
Anon Dev
cdd75b4841
Show description instead of display 2021-06-17 20:35:13 +02:00
Anon Dev
e587c3a23b
Update PaymentController.php 2021-06-16 16:35:07 +02:00
AVMG20
137f54818d Isseu: Pterodactyl zero allocations found #24 2021-06-15 17:39:43 +02:00
AVMG20
a0b5434c13 removed Que worker from cron jobs 2021-06-15 11:23:44 +02:00
AVMG20
4b628988ee role to discord user
added the ability to give a role to the discord user that has verified there discord
2021-06-12 17:29:08 +02:00
AVMG20
c9571988a5 removed the resend verification in the admin panel 2021-06-12 17:11:44 +02:00
AVMG20
5aeacbd7fc small bug fix where ptero id validation stopped working 2021-06-12 17:05:54 +02:00
AVMG20
6969b7fadf Discord 0Auth more optional, .env.example cleanup 2021-06-12 14:54:00 +02:00
AVMG20
6c175c9160 cleanup 2021-06-12 14:40:40 +02:00
AVMG20
0e5eda1470 clickable link to pterodactyl when clicking on the users name 2021-06-12 14:15:36 +02:00
AVMG20
662135451e Remind to verify email #30 2021-06-12 14:00:28 +02:00
AVMG20
5f6221e88a Testing usefulLinkController 2021-06-11 10:33:26 +02:00
AVMG20
d7a9e47d62 usefullinks bug fix cuss of merge request :) 2021-06-10 23:38:37 +02:00
AVMG
e0199589dc
Merge branch 'development' into useful_links_and_menu 2021-06-10 23:36:50 +02:00
AVMG20
690abe03ba Auto stash before revert of "Merge remote-tracking branch 'origin/development' into development"
Added all the plugins from adminlite, added usefulllinks tab
2021-06-10 23:29:25 +02:00
AVMG20
ffa6035c2b Auto stash before revert of "Merge remote-tracking branch 'origin/development' into development"
Added all the plugins from adminlite, added usefulllinks tab
2021-06-10 23:25:13 +02:00
AVMG20
acdf7965ea API authorization and Testing WIP 2021-06-10 21:09:37 +02:00
AVMG20
0a7e000550 Fixed a bug where you couldn't edit a user due to pterodactyl id 2021-06-10 14:37:48 +02:00
RamonRobben
b32352e925
Custom useful links via database / command (#41)
* Small change to the test command

* Custom useful links via database and command
2021-06-10 00:16:34 +02:00
RamonRobben
bfdbe62cd7
General improvements to testing environment and removed clutter (#36) 2021-06-09 20:53:58 +02:00
LogischJo
5aba2c27bc
Password Changes from Admin User Edit (#33)
* Password Changes from Admin User Edit

With this Commit Admins can change the user password from the admin user edit page

* Admin Password Change: UI Changes
2021-06-09 00:16:31 +02:00
AVMG20
d0e6dc0367 Changes the way discord verification works 2021-06-08 00:04:33 +02:00
LogischJo
405bfb8360
Format code 2021-06-07 17:47:50 +02:00
LogischJo
865d703ba4
Create the update command 2021-06-07 17:44:01 +02:00
AVMG20
c786fd3891 Make User command class name fix
i changed the name of the file, i forgot to change the class name :( oops....
2021-06-07 00:52:58 +02:00
AVMG20
3cedf3da29 7.4 support 2021-06-06 23:27:09 +02:00
AVMG20
f7c23e9fc5 clean up 2021-06-06 23:04:04 +02:00
AVMG20
9180a445b8 Cleanup 2021-06-06 22:53:23 +02:00
AVMG
bc99dd6f32
Merge pull request #16 from ControlPanel-gg/api
API implementation
2021-06-06 22:24:39 +02:00
AVMG20
8693761666 cleanup 2021-06-06 22:21:26 +02:00
AVMG20
cb9cdd8ff2 cleanup 2021-06-06 22:21:10 +02:00
AVMG
c019c56946
Merge pull request #14 from LogischJo/main
Add a command to create a user
2021-06-06 22:07:15 +02:00
LogischJo
e5ede534ce
Check if password is atleast 8 characters long 2021-06-06 22:01:42 +02:00
Arno
2aabdfdc94 Api routes and server controller 2021-06-06 21:11:42 +02:00
RamonRobben
ee13c115cc
Merge main onto develop
Merge main onto develop
2021-06-06 20:49:06 +02:00
LogischJo
22a59fcf58
Add return true / flase 2021-06-06 20:34:25 +02:00
Arno
ecc3c66589 WIP added api keys and user api endpoint 2021-06-06 20:22:40 +02:00
Ramon Robben
02a2449350 Cleaned up controllers with for PHP 8 2021-06-06 20:17:52 +02:00
LogischJo
a78410d09e
Add an createUser command 2021-06-06 20:17:30 +02:00
AVMG20
a039f4def5 btf 2021-06-06 12:14:21 +02:00
AVMG20
7c644b3960 added the ability to edit users pterodactyl id 2021-06-06 12:11:35 +02:00
Anon Dev
56ea86ad50
Update WelcomeMessage.php 2021-06-06 11:29:53 +02:00
AnonDev
4f5c4f0d97
Update UserController.php 2021-06-05 19:25:48 +02:00
AVMG20
f4d9754212 fixed hardcoded credit value 2021-06-05 18:47:35 +02:00
AVMG20
e5d638ee5e first init 2021-06-05 11:26:32 +02:00