0ct0pu5/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1315 commits 7 branches 34 tags 24 MiB
Commit graph

214 commits

Author SHA1 Message Date
IceToast
da19554a46 Update Billing-System to V0.9 
# Conflicts:
#	app/Console/Kernel.php
#	app/Http/Controllers/Admin/ProductController.php
#	app/Http/Controllers/Admin/ServerController.php
#	app/Http/Controllers/ServerController.php
#	app/Models/Server.php
#	composer.lock
#	database/seeders/Seeds/ProductSeeder.php
#	lang/bg.json
#	lang/bs.json
#	lang/cs.json
#	lang/de.json
#	lang/en.json
#	lang/es.json
#	lang/he.json
#	themes/default/views/servers/create.blade.php
#	themes/default/views/servers/index.blade.php
 2023-01-23 16:19:32 +01:00
IceToast
3909202958 feat: ✨ Added several functions to the ExtensionHelper 2023-01-21 01:03:47 +01:00
IceToast
dba8e2ebb8 refactor: ♻️ So stupid function calls... 2023-01-20 23:43:23 +01:00
Dennis
e978cb9914
[FEATURE] Server owner transfer 
[FEATURE] Server owner transfer
 2023-01-19 11:29:42 +01:00
IceToast
7d81fa6247 feat: ✨ Added Server owner transfer 2023-01-19 11:18:51 +01:00
1day2die
a088b81366 remove unused imports 2023-01-16 18:53:09 +01:00
IceToast
c0ae772981 chore: ⚰️ Remove dead "use" 2023-01-15 02:24:16 +01:00
IceToast
a34825a692 feat: ✨ Moved Stripe functions to extension 2023-01-15 01:41:16 +01:00
IceToast
b72d142a81 chore: 🔥 Remove Paypal Code from payment controller 2023-01-15 00:41:57 +01:00
IceToast
69dd7a6855 fix: 🐛 Removed PayPal Routes -> to own extension 2023-01-14 23:33:30 +01:00
IceToast
3cb42a8b60 Merge branch 'development' into feature/extendable_payment_gateways 
# Conflicts:
#	app/Http/Controllers/Admin/PaymentController.php
 2023-01-14 21:51:20 +01:00
1day2die
9b7ca02f00 add theme support 2023-01-11 11:08:22 +01:00
Dennis
aacbd6780c
Merge branch 'development' into shift-77419 2023-01-06 00:13:50 +01:00
Dennis
7c717ec61c
Many Many small Fixes 
adding minimum credits field in settings (it was present only in the database)
added frontend checks for settings fields (numbers)
added close ticket button for non-admin users
fixed some datatable´s sorting, adding some field, removing dupes,... (etc. Payments table, Products table, Tickets tables)
TOS, imprint and privacy policy in footer - as default they are now disabled
Made partner discounts a little bit easier to understand
little changes to delete user popup (in their profile)
removed the hamburger menu from server cards and made only a single phpmyadmin button
 2023-01-06 00:09:48 +01:00
Dennis
81756c2587
Merge pull request #612 from ok236449/Partners-and-discounts 
Partners and discounts - finishing it up
 2023-01-06 00:09:33 +01:00
ok236449
7ca842e712 many many fixes 2023-01-06 00:01:23 +01:00
Shift
70208d2157
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).
 2023-01-05 17:01:42 +00:00
ok236449
ed5a968d11 finishing up of Partner checkout 
support for 100% discount
 2023-01-04 18:59:52 +01:00
ok236449
b6e45c443c fix admin overview year conditions 
sort currencies
 2023-01-04 18:57:57 +01:00
IceToast
23cb226196 feat: ✨ Added payment.pay route and enhanced checkOut route controller to serve gateways to view 2023-01-03 21:17:25 +01:00
Dennis
8b8d73c3b2
Merge pull request #575 from ok236449/Partners-and-discounts 
Partners and discounts
 2023-01-02 13:09:18 +01:00
IceToast
549b2830f9 chore: ✅ Update to latest cpgg version 2022-11-11 13:40:31 +01:00
ok236449
3e99461a70 Fix admin overview error when node got deleted 
on pterodactyl
 2022-10-26 19:13:56 +02:00
ok236449
17e2d284af rename temporary price variable 2022-10-23 10:46:02 +02:00
ok236449
c7ec586157 sync servers button - deleted on ptero + names 2022-10-21 21:12:07 +02:00
ok236449
86cf2981c1 commission from first/every purchase 2022-10-18 23:33:33 +02:00
ok236449
63a30a1e57 Yearly tax overview, stop caching ticket overview 2022-10-14 22:59:02 +02:00
IceToast
35479c9cfc chore: ✅ Update to newest CPGG Main version 2022-10-13 23:34:12 +02:00
ok236449
d41a68c63e add discount to invoices 2022-08-27 20:35:17 +02:00
ok236449
dc0737e803 fix users table sorting and add users to payments 2022-08-27 19:44:27 +02:00
ok236449
3a53ddbc59 partner discounts and their referrals 2022-08-27 18:59:07 +02:00
ok236449
c763dac689 Stop caching nodes and counters - hotfix 2022-08-24 22:18:29 +02:00
Dennis
5996a4cd8d
Merge pull request #573 from ok236449/Delete-server-on-404 
Some fixes that shouldn´t have been necessary
 2022-08-23 21:10:37 +02:00
ok236449
da9bd9d547 fix division by zero 2022-08-23 20:09:42 +02:00
ok236449
dfc3d0bd42 fix division by zero 2022-08-23 20:08:49 +02:00
ok236449
4871272670 Added latest tickets to admin overview 2022-08-20 21:19:27 +02:00
ok236449
5fc4103a7c Latest payments section 2022-08-20 17:07:54 +02:00
ok236449
043edf9a9b Show individual node status on admin overview 2022-08-19 19:18:44 +02:00
IceToast
7365cdee18 Merge branch 'main' into billing_system 
# Conflicts:
#	app/Http/Controllers/ServerController.php
#	composer.lock
#	resources/lang/de.json
#	resources/lang/en.json
#	resources/views/servers/index.blade.php
 2022-08-15 12:39:58 +02:00
1Day
88538ab391 Update UserController.php 2022-08-12 12:44:15 +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
1day2die
c823a03466 cleaning up some stuff. changing routes. making it work actually... 2022-08-02 17:37:59 +02:00
IceToast
1fb855a684 feat: ✨ Added Quartely billing period 2022-07-22 05:31:05 +02:00
IceToast
7369e8a643 refactor: 🚚 Rename Yearly -> Annually 2022-07-22 04:09:34 +02:00
IceToast
08208cab72 feat: ✨ Added yearly and half-yearly billing periods 2022-07-22 04:00:23 +02:00
IceToast
78a6787607 feat: ✨ Added Server Cancelation route method and charging 2022-07-22 03:52:49 +02:00
IceToast
16eb9eeca6 Merge branch 'main' of https://github.com/ControlPanel-gg/dashboard into billing_system 2022-07-20 23:16:41 +02: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