Commit graph

463 commits

Author SHA1 Message Date
WBLKLeipe 928086953c Logo, Template and Invoice stuff 2021-11-30 15:50:43 +01:00
WBLKLeipe 92f048c4bd save invoice in correct path 2021-11-30 14:52:36 +01:00
1day2die 21b9d70035 invoice DB, counting up, format stuff 2021-11-27 02:47:36 +01:00
1day2die bf848f0bcb lul 2021-11-26 20:46:26 +01:00
1day2die c3a777bdf4 First COmmit 2021-11-26 20:42:38 +01:00
AVMG20 836784be48 Re-sync bug 2021-11-18 19:22:09 +01:00
AVMG20 47c251e48d removed out of credits info 2021-11-12 20:59:33 +01:00
AVMG c93cf6166a
Merge pull request #281 from ControlPanel-gg/product_linking
fixed product disabled not working properly
2021-11-12 21:02:22 +01:00
AVMG20 180afb9ef5 fixed product disabled not working properly 2021-11-12 20:01:35 +01:00
AVMG 8e9895a40a
Merge pull request #276 from 1day2die/Out_of_credits_adminview
Show Client running out of Credits in Admin overview
2021-11-12 19:55:06 +01:00
AVMG 3be4c367e8
Merge pull request #275 from 1day2die/fix_creditsleft
Fix "You Ran out of Credits - hours"
2021-11-12 19:53:28 +01:00
1day2die cccc4bf9aa FIX SPACES AVMG 2021-11-12 19:53:12 +01:00
1day2die 93ce540b3f remove space 2021-11-12 19:48:28 +01:00
1day2die 021df3af4f Shortening - Magic 2021-11-12 19:47:13 +01:00
AVMG 0acd97026e
Merge pull request #280 from ControlPanel-gg/product_linking
Product linking
2021-11-12 19:19:48 +01:00
AVMG20 53a4faa662 Fixed the file uploads in settings 2021-11-12 18:23:06 +01:00
AVMG20 c6ea21dd6d Fixed a bug where disabled products were stilled used in server create 2021-11-12 18:19:06 +01:00
AVMG 126eedc610
Merge branch 'development' into product_linking 2021-11-11 22:06:47 +01:00
AVMG20 20f9ddeae2 Fixed a bug where products where only fetched using node and not egg,node 2021-11-11 22:05:42 +01:00
Dennis 8b1445ae0d
Removed unnessecary comment 2021-11-11 17:16:25 +01:00
WBLKLeipe e9017c9087 Days -> DaysLeft 2021-11-11 16:25:29 +01:00
WBLKLeipe c981add07c Smaller, Better, PHPstorm. Refactored some Variabled 2021-11-11 16:19:16 +01:00
WBLKLeipe 88944235f2 Show Client running out of Credits in Admin overview 2021-11-08 11:52:09 +01:00
WBLKLeipe 14bceeb311 Fix "You Ran out of Credits - hours" 2021-11-08 07:38:29 +01:00
Dennis 3fac4f87c0
Merge pull request #265 from 1day2die/fix_Tax
Full configurable Tax support
2021-11-07 20:57:11 +01:00
AnonDev 18e2a88e06
Update PaypalProductController.php 2021-11-07 18:06:32 +01:00
AnonDev c66f820462
Update ProductController.php 2021-11-07 18:05:47 +01:00
AnonDev 574dd24871
Update ServerController.php 2021-11-07 18:04:56 +01:00
AnonDev 84a214aedd
Update ProductController.php 2021-11-07 18:01:23 +01:00
AnonDev 5b8ca6e9c5
Update ProfileController.php 2021-11-07 18:00:29 +01:00
AnonDev 23424d4ed4
Update ServerController.php 2021-11-07 17:58:01 +01:00
AVMG 7d36d3b1a4
Merge pull request #270 from ControlPanel-gg/product_linking
added node location in node select
2021-11-07 16:30:03 +01:00
AVMG20 88f2c22804 added node location in node select 2021-11-07 16:29:18 +01:00
AVMG20 2eb4d6ba74 updated side nav bar 2021-11-07 12:16:46 +01:00
AVMG20 bf5c36b232 cleanup 2021-11-07 12:10:46 +01:00
AVMG20 8c7c938c6a fine tuning :) 2021-11-07 12:07:30 +01:00
AVMG20 24e6d48496 removed pterodactyl pages, added overview page, made server create work 2021-11-07 01:47:16 +01:00
AVMG20 16a7d174e9 new server create page w.i.p 2021-11-06 01:56:57 +01:00
Jovan Jovanovic 9ac391d75b fix(tax): formatCurrency -> formatToCurrency 2021-11-06 01:32:51 +01:00
AVMG20 75622d3958 Merge remote-tracking branch 'origin/product_links' into development 2021-11-05 19:46:50 +01:00
1day2die 9e8abe314b Refactor as J22j suggested 2021-11-05 17:38:05 +01:00
WBLKLeipe 3f67ac5f21 Fixing FormatCurrency 2021-11-05 09:00:18 +01:00
WBLKLeipe 93d8dfcf0b EVERYTHING WORKING - Safing 2021-11-05 08:45:29 +01:00
WBLKLeipe c69c28bd89 Brackets! 2021-11-05 07:59:25 +01:00
WBLKLeipe 6797410cb4 Adding Tax, beautify 2021-11-05 07:43:57 +01:00
1day2die bff97e836d basically added tax 2021-11-04 21:42:17 +01:00
1day2die 1056e1db8b let magic make this even better
Right DataTypes, Removed unnessecary function
2021-10-27 19:09:09 +02:00
WBLKLeipe aca06b5441 Fixing OUT_OF_CREDITS Text 2021-10-27 09:13:52 +02:00
WBLKLeipe 85c188182d PSR12 2021-10-27 08:41:07 +02:00
WBLKLeipe d2705cb838 Space space space enter 2021-10-27 07:48:41 +02:00
WBLKLeipe 46173d7bfb Beautify 2021-10-27 07:48:00 +02:00
Dennis 1edb4eb583
pass credits 2021-10-26 19:26:41 +02:00
Dennis 72165b0d95
fix strings to int 2021-10-26 19:24:08 +02:00
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
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
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
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
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 28af0c0530 Add minimal credits per product 2021-10-01 23:21:49 +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 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 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 370c85585c added the option to change the credits display name 2021-08-02 19:25:33 +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 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 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 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
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 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 0e5eda1470 clickable link to pterodactyl when clicking on the users name 2021-06-12 14:15:36 +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
AVMG20 3cedf3da29 7.4 support 2021-06-06 23:27:09 +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
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
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
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
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