Commit graph

192 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
d2608c995c Add "both" mode to referrals 2022-06-07 16:04:41 +02:00
1Day
33a39fccd9 Switch Modes / Commission - Sign-Up 2022-06-07 10:05:19 +02:00
1Day
378187aea0 Referal System 2022-06-02 16:11:24 +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
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