Commit graph

130 commits

Author SHA1 Message Date
S0ly bacf1fa668
Merge branch 'development' into 2FA-Progress 2024-05-17 14:55:30 +02:00
AGuyNamedJens eac672a870 2FA initial 2023-12-10 21:59:14 +01:00
Ferks-FK ee5b99ce71 fix: 🐛 Fix the infinite credits exploit in development. 2023-10-01 09:59:32 -04:00
Ferks-FK 7ecc29487e fix: 🐛 Fix infinite credit exploit when checking email several times. 2023-09-16 13:20:31 -04:00
IceToast fc84e7d1db feat: Enhance coupon validation and application 2023-06-08 20:24:15 +02:00
Ferks-FK 6d50834f9c Just by improving the code. 2023-06-08 20:24:15 +02:00
Ferks-FK 24ce267962 Implement coupons for the other gateways. 2023-06-08 20:24:15 +02:00
Ferks-FK bad9d0ec12 It is good to set the application's timezone. 2023-06-08 20:24:15 +02:00
Ferks-FK 490e11572d Use casts instead of converting values 2023-06-08 20:24:15 +02:00
Ferks-FK 8f7ad95506 Some improvements, and some not so much... 2023-06-08 20:24:15 +02:00
Ferks-FK 72f3decd3f Feat: Let's implement the coupons now 2023-06-08 20:24:15 +02:00
IceToast e8a6adb4e6 fix: 🚚 Typo cancelled -> canceled 2023-06-08 16:10:42 +02:00
1day2die 9da53bd02f Monthly calculation on server index 2023-05-17 09:51:04 +02:00
1day2die b58040c457 Fix Notifications 2023-05-09 18:04:40 +02:00
1day2die 6f74a7379f Show referredBy on User 2023-05-08 23:00:29 +02:00
IceToast 5b95dd4d13 Merge branch 'billing_system' into feature/billing_cycles
# Conflicts:
#	app/Http/Controllers/Admin/ProductController.php
#	app/Http/Controllers/ServerController.php
#	app/Models/Server.php
#	app/Models/User.php
#	lang/cs.json
#	lang/en.json
#	themes/default/views/admin/products/create.blade.php
#	themes/default/views/admin/products/edit.blade.php
#	themes/default/views/admin/settings/tabs/system.blade.php
#	themes/default/views/servers/create.blade.php
#	themes/default/views/servers/index.blade.php
#	themes/default/views/servers/settings.blade.php
2023-05-08 11:03:10 +02:00
IceToast bc56f713ad fix: 🐛 Call parent constructor on model 2023-05-07 21:24:26 +02:00
1day2die 0ffceb535d simple starting permissions. only admin 2023-04-30 02:22:59 +02:00
IceToast ce544019eb
refactor: 🚚 Rename pterodactyl application api accordingly 2023-04-04 01:16:39 +02:00
Ferks-FK 2073aa632d Remove unnecessary import 2023-02-24 14:02:28 +01:00
Ferks-FK 9cd25034fc Another ton of modifications 2023-02-24 14:02:28 +01:00
Ferks-FK 1d2548a174 Update all imports 2023-02-24 14:02:28 +01:00
Ferks-FK 16ca760901 Several modifications, something already works 2023-02-24 14:02:28 +01:00
Ferks-FK 2229586b58 feat: implement laravel-settings 2023-02-24 14:02:28 +01:00
IceToast 255671e20d
fix: 🐛 Merge issues 2023-02-06 14:45:44 +01:00
IceToast e254b2acfe
feat: Added Quartely billing period 2023-02-06 14:21:16 +01:00
IceToast e310dba243
fix: 🐛 Credt usage at dashboard 2023-02-06 14:21:15 +01:00
IceToast 7fa9bf2062
feat: Added Server Cancelation route method and charging 2023-02-06 14:20:32 +01:00
IceToast 2e6c03e3cc
feat: Update last_billed to current time on unsuspend server 2023-02-06 14:17:52 +01:00
IceToast da0dd37559
feat: Added last_billed to server model & always charge first & fixed Charge Server command 2023-02-06 14:17:43 +01:00
IceToast 3522dfe4c7
Merge branch 'ControlPanel-gg:development' into development 2023-02-05 16:37:18 +01:00
IceToast 7283f6e887
fix: 🚑️ Delete all Tickets on user deletion 2023-02-05 16:36:55 +01:00
IceToast 9d383600bc
fix: 🐛 Missing primary key on payments table 2023-02-02 23:20:19 +01:00
1day2die 630ebc6b88 Editable Ticket categories 2023-02-01 11:07:37 +01:00
1day2die b343134c01 using enums, adding more positions 2023-01-26 15:22:42 +01:00
1day2die f923eef868 Useful Links in Topbar 2023-01-25 22:32:59 +01:00
IceToast 6216892594 fix: 🐛 PartnerDiscount expected auth login -> not possible on webhooks 2023-01-20 23:42:53 +01:00
IceToast f00a11da0e refactor: 🔥 Remove activtiylog from payment model -> no spam 2023-01-15 00:42:20 +01:00
1day2die 8bff4f857b fixes 2023-01-11 16:22:19 +01:00
1day2die 94fe7d245c Alert on Homepage 2023-01-10 19:45:19 +01:00
1day2die 2304b64d9a fixes 2023-01-05 19:33:46 +01:00
Shift 0e3f6c98aa
Shift cleanup 2023-01-05 17:03:38 +00:00
Shift e947abcab2
Convert deprecated $dates property to $casts 2023-01-05 17:02:42 +00: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
Dennis 8b8d73c3b2
Merge pull request #575 from ok236449/Partners-and-discounts
Partners and discounts
2023-01-02 13:09:18 +01:00
1day2die c15d0f4ef6 Fix Ticket System 2022-11-29 09:20:24 +01:00
Ferks-FK 9390f6f4d6 Closes #581 2022-11-02 16:53:52 +00:00
ok236449 7537286d3a actually fixing it... 2022-10-14 21:30:07 +02:00
ok236449 8dbd4be6ce fix discount returning null and error 500 2022-10-14 21:05:19 +02:00
ok236449 3a53ddbc59 partner discounts and their referrals 2022-08-27 18:59:07 +02:00