Commit graph

463 commits

Author SHA1 Message Date
1Day 88538ab391 Update UserController.php 2022-08-12 12:44:15 +02:00
SahrulGnwn bc5a17157d Fix Delete/Switch Broken 2022-08-12 17:36:08 +07:00
1Day 8cfb069f60 change to paginate 2022-08-12 12:12:58 +02:00
1Day 7e822be443 spelling. Reason updating. 2022-08-12 11:59:20 +02:00
SahrulGnwn 9b3fce2808 Ticket Blacklist 2022-08-12 16:01:51 +07:00
SahrulGnwn 7bb3caa494 Fix checking free resource node 2022-08-11 21:55:24 +07:00
SahrulGnwn 69d9fe5fb0 Restart After Upgrade 2022-08-11 20:50:33 +07:00
SahrulGnwn 278ebb4130 Merge branch 'development' of https://github.com/SahrulGnwn/controlpanel into development 2022-08-11 18:48:08 +07:00
SahrulGnwn c1f765af01 Add Throttle Rate Limit 2022-08-11 18:45:27 +07:00
Sahrul Gunawan fe4779d6bf
Merge pull request #1 from SahrulGnwn/dev---upgradesystem
Dev   upgradesystem
2022-08-11 18:40:58 +07:00
Dennis 1f9301ef0e
Merge pull request #520 from ControlPanel-gg/dev---upgradesystem
Dev   upgradesystem
2022-08-11 12:07:56 +02:00
SahrulGnwn 7ad56dad8d Fix Delete 2022-08-11 16:59:04 +07:00
Dennis c32d6f5e2e
Check for Node allocations 2022-08-11 08:10:24 +02:00
Dennis 487dd09f3e
Merge pull request #517 from jozefbonnar/email
Allows admins to force verify a users email
2022-08-10 20:25:42 +02:00
Jozef Bonnar 266057b666
Add forced email verify for admins 2022-08-10 19:11:02 +01:00
SahrulGnwn ae25b79f92 Change index table to DataTable 2022-08-10 23:53:13 +07:00
Dennis 915d5e9854
OrderTickets 2022-08-09 07:42:15 +02:00
IceToast e9348eca52 fix: 🐛 Check if product supports the exact egg as server installed on 2022-08-03 16:43:41 +02:00
Dennis 80390846ad
Merge pull request #504 from SahrulGnwn/main
Upgrade / Downgrade
2022-08-03 14:41:19 +02:00
SahrulGnwn 6b5986881d Upgrade / Downgrade 2022-08-03 19:34:00 +07:00
1day2die c823a03466 cleaning up some stuff. changing routes. making it work actually... 2022-08-02 17:37:59 +02:00
SahrulGnwn 94bbea2690 Ticket System 2022-08-01 23:52:16 +07:00
Jens 97f766db27
Update UserController.php
Fixes an issue when you update a user, it's impossible to update it, the check for referral_code is invalid.

Fixed:
- Deletes the custom check and uses laravel's check to ensure it's valid.
2022-07-19 20:27:16 +02:00
1Day 0c77046c93 Experimental Server Edit 2022-07-19 10:36:40 +02:00
1Day d197a2e251 Custom Ref ID 2022-07-12 07:33:48 +02:00
1Day 0071c2218b click to copy Ref URL // Badge Color on Profile 2022-06-08 11:01:28 +02:00
1Day 2bc5e91c25 small rewrite of activity log // log refs 2022-06-08 10:11:55 +02:00
1day2die ad8c8b5ebe fixed the worst error ive ever experienced 2022-06-07 21:58:04 +02:00
1day2die 5d53353521 fix ) 2022-06-07 16:21:03 +02:00
1day2die ef6a655ce0 Add referral to API i guess? 2022-06-07 16:19:14 +02:00
1day2die d2608c995c Add "both" mode to referrals 2022-06-07 16:04:41 +02:00
Dennis 7eacc4863b
Merge pull request #433 from 1day2die/referral_codes
Full Referral System
2022-06-07 10:10:47 +02:00
1Day 33a39fccd9 Switch Modes / Commission - Sign-Up 2022-06-07 10:05:19 +02:00
Dennis ce159e9cd6
Merge pull request #432 from 1day2die/readall_button_notifications
Added read all Button for Notifications
2022-06-04 15:54:37 +02:00
1Day 378187aea0 Referal System 2022-06-02 16:11:24 +02:00
1Day 2e17cab295 On NavBar aswell 2022-06-02 08:50:44 +02:00
1Day c97b1fa186 Added Readall Button 2022-06-02 08:44:54 +02:00
1Day 272c75a071 Update SocialiteController.php 2022-05-31 08:39:45 +02:00
1Day 8908f4af8f Fix User order on admin/user 2022-05-30 13:33:24 +02:00
1Day 60a8fa1056 Delete Nests and Nodes Controller 2022-05-30 11:13:37 +02:00
1Day e19ca05723 Refactoring 2022-05-30 11:07:10 +02:00
1Day 8e052572f7 Remove Discord button if not set || translation strings on welcome || total credits no admins 2022-05-30 09:53:11 +02:00
1Day a7b199c01a Add the ability to sell server slots 2022-05-30 09:23:35 +02:00
1day2die 4d3b88e59b Fixed Javascript exploit 2022-04-20 12:12:48 +02:00
IceToast f44641389a feat: 🥅 Updated non "Invoice does not exist" error message 2022-02-15 12:23:05 +01:00
Dennis 87f47b9a74
Hotfix Typo 2022-02-15 10:14:19 +01:00
IceToast e9e539c8c5 fix: 🚑️ Icon uploading 2022-02-07 15:30:47 +01:00
IceToast 53f6e0586c feat: Added basic currency support for invoices 2022-02-06 21:10:05 +01:00
IceToast 128b10bbb1 fix: replaced Settings::getValueByKey with config() 2022-01-25 22:52:19 +01:00
IceToast 9b797cf779
Merge branch 'development' into settings_rewrite 2022-01-23 15:00:23 +01:00
IceToast 99dff634b0 feat: Added Mail Settings & Fixed ReCaptcha bug on DB Change (reload config correctly) 2022-01-21 17:20:23 +01:00
IceToast 9b11e16ed6 refactor: ♻️ changed Settings::getValueByKey to config() 2022-01-15 18:16:51 +01:00
IceToast 8e739ccf74 fix: 🚑️ Fixed Config Variable Name 2022-01-15 17:53:47 +01:00
IceToast c8071b64d9 feat: Added Enable/Disable Invoices 2022-01-15 17:52:19 +01:00
IceToast 7ca6438f35 fix: 🚑️ Added more improved validation & Fixed Language Settings 2022-01-15 01:25:27 +01:00
IceToast cb7a757a3a feat: Added ReCaptcha Settings in Class 2022-01-15 00:48:38 +01:00
Dennis 89406f5c98
Merge pull request #362 from LogischJo/development
feat:  Add api routes for suspending and unsuspending an User
2022-01-14 19:24:55 +01:00
IceToast 881d3e4b45 fix: 🚑️ create settings db entries if not existing & moved settingsController out of folder 2022-01-14 10:19:41 +01:00
Dennis 0c2cf8712e
Translation String 2022-01-10 21:02:43 +01:00
1day2die 089b61d097 fix stupid mistake 2022-01-10 20:46:36 +01:00
1Day f001960eab discord seettings. cleaning up 2022-01-07 11:20:10 +01:00
1Day b9d5f83652 ptero settings in DB, phpmyadmin in db 2022-01-07 10:16:33 +01:00
1Day e959cc79cb payment settings in database 2022-01-07 09:54:01 +01:00
LogischJo 7c4622c622
Update UserController.php 2022-01-05 18:08:41 +01:00
1Day d89c394ba5 localization, fixes, formatting 2022-01-05 15:19:48 +01:00
1Day 7bd0f2a9d3 cleanup language 2022-01-05 15:03:29 +01:00
1Day df47880fd7 Dynamic locale 2022-01-05 14:51:12 +01:00
1Day 831e6a7ee1 Language settings. DYNAMC IS STILL MISSING 2022-01-05 13:30:05 +01:00
1Day 39177651a3 Invoice-Settings in new Settingsformat 2022-01-05 10:32:17 +01:00
1Day 41d79186bd List only main-Configs in the Main-Config-Table 2022-01-05 09:12:21 +01:00
1Day 63888f11e5 ability to slam all settings into one database 2022-01-05 08:57:41 +01:00
1Day efd8274088 Split InvoiceSettings and InvoiceController 2022-01-04 10:20:27 +01:00
1Day 6f1d372512 basics for the language-settings 2022-01-04 10:03:03 +01:00
1Day acc3371ba8 Download Invoices in Payment-View 2022-01-04 09:05:53 +01:00
Johannes F b831bd0c22 feat: Add api routes for suspending and unsuspending an User
This commit adresses #359
2022-01-03 22:14:45 +01:00
IceToast 51c7361d73 feat: Moved "Configurations" to settings 2022-01-03 02:08:09 +01:00
IceToast c84b32c4b2 refactor: 🎨 Moved InvoiceSettingsController to Classes directory -> its not a controller -> needs renaming after db refactor 2022-01-03 01:59:40 +01:00
IceToast 267f28e6e9 feat: Added auto list item generation -> based on files in tabs directory 2022-01-03 01:52:44 +01:00
IceToast cd91931bc0 feat: 🎨 Moved Settingscontroller to their own directory 2022-01-02 19:34:51 +01:00
Dennis 74bdcffe75
Merge pull request #357 from IceToast/development
fix: 🐛 remove whitespaces before request of stripe payment_methods
2021-12-29 16:12:02 +01:00
IceToast 9a54ab67e1 fix: 🐛 remove whitespaces before request of stripe payment_methods list in .env 2021-12-29 16:04:44 +01:00
Dennis 0bfecf6633
Merge pull request #348 from 1day2die/update_user_updates_pterodactyl
Update user on cpgg updates user on pterodactyl
2021-12-28 22:46:00 +01:00
Dennis cb821fc3d9
Merge pull request #347 from 1day2die/throw_pteroerror_if_account_exists
Throw error on registration if account exists on pterodactyl
2021-12-28 22:45:51 +01:00
IceToast 2db5a580ce fix: 🎨 fixed typo 2021-12-28 20:05:03 +01:00
Dennis 0fadf3494d
Merge pull request #346 from 1day2die/fix_api_verification_mail
send verification mail when using "POST Create User"
2021-12-28 08:31:19 +01:00
Dennis 70b261f2ab
Merge pull request #333 from 1day2die/dynamic_language_selection
Dynamic language depending on users browserlanguage - Ability to change Language manually
2021-12-27 13:59:41 +01:00
1Day b72009aa84 Added API Route 2021-12-27 09:10:38 +01:00
1Day 8a583424db Fix 2021-12-27 08:39:50 +01:00
Dennis c1ca96d67c
Update RegisterController.php 2021-12-27 07:58:46 +01:00
1day2die 7b974c17d2 Fixed errors appearing multiple times 2021-12-26 23:45:40 +01:00
1day2die d79ca41033 fix 2021-12-26 23:37:16 +01:00
1day2die 83657cc6df Update UserController.php 2021-12-26 22:48:43 +01:00
IceToast c715479fa2 feat: Added Nodename to server card -> info icon popover 2021-12-23 14:48:04 +01:00
1Day 72b25e53c3 Option to disable certain languages completely 2021-12-23 09:09:39 +01:00
IceToast 5a05c5f846 feat: Added Resource plan-/product-data to server card 2021-12-22 20:18:48 +01:00
IceToast 2bfe26247a Merge branch 'development' into servers-servercard 2021-12-22 15:14:21 +01:00
IceToast d09004df17 feat: 🔒️ Added error handling on server attribute fetching 2021-12-22 15:11:13 +01:00
1Day ae1fecef33 Add payment methode to invoice 2021-12-22 13:48:21 +01:00
IceToast 7a10021ab1 chore: ♻️ Removed unused import & code duplication 2021-12-21 19:52:30 +01:00
IceToast 48ebc8c09e feat: Added pterodactyl serverinfo integration 2021-12-21 19:41:04 +01:00
IceToast b775ce6cc7 fix: 🚑️ changed the payment setup detection 2021-12-20 18:50:18 +01:00
IceToast 7989ff57b9 feat: Added Notification if Stripe isnt setup (like paypal) in store 2021-12-20 11:18:35 +01:00
IceToast a6f200ca55 refactor: ♻️ removed unused case in stripe webhook 2021-12-20 10:59:07 +01:00
IceToast 84ec3e583c feat: Added invoice creation on stripe route & webhook 2021-12-17 11:22:37 +01:00
IceToast 754a3e38b8 Merge branch 'development' into stripe_integration
# Conflicts:
#	app/Http/Controllers/Admin/CreditProductController.php
#	app/Http/Controllers/Admin/PaymentController.php
#	composer.lock
#	resources/views/admin/payments/index.blade.php
#	resources/views/admin/store/edit.blade.php
#	resources/views/store/checkout.blade.php
#	resources/views/store/index.blade.php
2021-12-17 10:41:32 +01:00
IceToast 31efac93f0 feat: Added stripe webhook payment succeed handler 2021-12-17 10:00:33 +01:00
1day2die 586bea8795 Translate Invoice-Email. Fix Typo 2021-12-16 19:38:25 +01:00
IceToast 16f7f4cb99 feat: Added StripeWebhook Route 2021-12-16 18:03:38 +01:00
IceToast 06eedeef68 feat: Added Stripe_METHODS to .env variables -> csl of methods to support 2021-12-16 16:19:14 +01:00
1Day 130b4cda04 Updated: Enable/Disable dynamic localization. Dropdown to change language for users 2021-12-16 14:30:28 +01:00
1Day 9943fb28dd Updates 2021-12-16 11:06:54 +01:00
1Day 22d4a4edf6 Dynamic language depending on users browserlanguage
Also includes Italian and Chinese translation
2021-12-16 09:53:03 +01:00
IceToast 2ba2c9ab82 chore: 🎨 added localization strings 2021-12-15 13:37:29 +01:00
IceToast 962ddb2fc3 fix: 🚑️ getStripeClient() 2021-12-15 12:31:16 +01:00
IceToast ef2c271257 refactor: 🔒️ Changed getStripeSecret Method -> differentiates between local/prod 2021-12-15 12:24:03 +01:00
IceToast 45b7d703a5 feat: ♻️ Changed payment Status to "paid" && Updated admin/payment table 2021-12-15 12:16:30 +01:00
IceToast 34a8d566a7 feat: modified db payment table 2021-12-15 11:41:57 +01:00
1Day 1d8e0e22dd Fully translate invoices 2021-12-15 11:25:37 +01:00
IceToast 1d72bac7fa feat: Added StripeClient generation 2021-12-15 10:56:58 +01:00
AVMG20 c6cfa6cd2f cleanup 2021-12-14 19:50:36 +01:00
Dennis 63c44e6c0b
Merge branch 'development' into Invoices 2021-12-14 18:54:58 +01:00
IceToast 921135c5dd feat: added StripeSuccess Route with session handling 2021-12-14 15:47:50 +01:00
IceToast 27794078cc feat: added correct currency code for stripe api 2021-12-14 15:47:50 +01:00
IceToast a77455c5fd feat: added StripePay Route 2021-12-14 15:47:50 +01:00
IceToast e3b8ff5045 Rename PaypalProduct -> CreditProduct 2021-12-14 15:47:50 +01:00
1Day 720622ae02 Fixed Datatables 2021-12-14 15:47:17 +01:00
1Day ae67bd9a42 fix vouchers 2021-12-13 16:27:56 +01:00
1Day 60b310bc0c multilanguage support 2021-12-13 13:28:01 +01:00
1Day b7bf406c57 beautify 2021-12-13 13:09:08 +01:00
1Day ff9be6b543 invoice translation 2021-12-13 12:52:13 +01:00
1Day 7ef8fdff4e guess im done? 2021-12-13 11:47:35 +01:00
1day2die 39af10ff95 formatting 2021-12-07 20:27:54 +01:00
1day2die f9206fd7ce Update SettingsController.php 2021-12-07 20:27:06 +01:00
1day2die cb89f65885 Update SettingsController.php 2021-12-07 20:26:20 +01:00
1day2die b826173bcb Update SettingsController.php 2021-12-07 20:25:56 +01:00
1day2die 16edf98dae Fialsafe if no invoices exist 2021-12-07 20:24:25 +01:00
1Day f8e099e133 Update SettingsController.php 2021-12-07 13:16:44 +01:00
1day2die a6de39bc32 small fixes, logo update, prefix update 2021-12-05 20:08:09 +01:00
1day2die 57e3cd8430 Upper/Lowercase fixes- PSR4 2021-12-04 16:35:04 +01:00
WBLKLeipe 86716961f3 download all invoices button 2021-12-02 09:54:30 +01:00
WBLKLeipe 9fff368662 fix small mistake 2021-12-01 13:32:47 +01:00
WBLKLeipe f62583a007 clean UI 2021-12-01 13:30:40 +01:00
WBLKLeipe afd2e2eb21 re-enable email notifications 2021-12-01 12:32:46 +01:00
WBLKLeipe 7f4503d228 invoice settings via DB and changeable 2021-12-01 12:19:06 +01:00
Dennis 9d64eaf73f
Merge branch 'ControlPanel-gg:main' into Invoices 2021-11-30 21:05:41 +01:00
1day2die a11a9cf99c garkein bock mehr alter 2021-11-30 18:54:01 +01:00
1day2die ef3cc1e756 prepare the UI 2021-11-30 18:40:56 +01:00
1day2die c12e825b2e Attach invoice to mail 2021-11-30 18:18:15 +01:00
WBLKLeipe 8cfabf7088 small fixes 2021-11-30 16:30:48 +01:00
WBLKLeipe 69c41620b8 remove wrong save 2021-11-30 16:00:26 +01:00
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