Commit graph

122 commits

Author SHA1 Message Date
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 0acd97026e
Merge pull request #280 from ControlPanel-gg/product_linking
Product linking
2021-11-12 19:19:48 +01:00
AVMG b7a1bf93bc
Merge pull request #278 from ControlPanel-gg/product_linking
automatically select first options if there is only 1
2021-11-12 18:40:19 +01:00
AVMG20 53a4faa662 Fixed the file uploads in settings 2021-11-12 18:23:06 +01:00
AVMG e9bea605c3
Merge branch 'product_linking' into patch-3 2021-11-12 18:45:00 +01:00
AVMG20 baf7425193 automatically select first options if there is only 1 2021-11-12 17:01:32 +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
WBLKLeipe 88944235f2 Show Client running out of Credits in Admin overview 2021-11-08 11:52:09 +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 e0a1a499e5
Update create.blade.php 2021-11-07 18:58:08 +01:00
AnonDev 6717df5bea
Update index.blade.php 2021-11-07 18:57:29 +01:00
AnonDev 848373da42
Change disk to storage as it's displayed on server creation page 2021-11-07 18:47:43 +01:00
AnonDev 5bb7423080
Update create.blade.php 2021-11-07 18:43:32 +01:00
AVMG20 0c3111bb3a added resource specs in server create 2021-11-07 17:02:44 +01:00
AVMG20 ea2074f621 server create, made help text for admins 2021-11-07 16:39:29 +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 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
WBLKLeipe fd32a4aa97 Update index.blade.php 2021-11-05 09:04:22 +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
1day2die bff97e836d basically added tax 2021-11-04 21:42:17 +01:00
AVMG fbfbbda8f3
Merge pull request #243 from 1day2die/Fix_HomeView_CreditsLeft
Credits-Left box from View to Controller
2021-11-03 20:10:06 +01:00
WBLKLeipe 46173d7bfb Beautify 2021-10-27 07:48:00 +02:00
Dennis a024d7ce6a
removed old code 2021-10-26 19:28:51 +02:00
Dennis 82a2dace25
use $credits 2021-10-26 19:27:19 +02:00
WBLKLeipe 903ca36b7b The ways supposed to be 2021-10-26 16:53:53 +02:00
WBLKLeipe ed3edd181b Fix 2021-10-26 16:12:47 +02:00
Dennis 822fa4b7bf
Added Select markers to all Dropdown Menus 2021-10-26 13:47:46 +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
Dennis 0ddeadfd27
Merge pull request #214 from j122j/voucher-users
Shows who redeemed vouchers
2021-10-04 13:33:39 +02:00
Jovan Jovanovic 11135e14dd Fix servers page 2021-10-04 08:51:51 +02:00
Jovan Jovanovic 76595aa7bb Change input type based on configuration type 2021-10-03 23:47:06 +02:00
Jovan Jovanovic 4bc9d4cdce Fix tooltips 2021-10-03 21:28:34 +02:00
Jovan Jovanovic 4d3c6c7a13 Fix select if using global limit 2021-10-03 15:18:08 +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
AVMG 991bd17528
Merge pull request #205 from LogischJo/feature/SuspendUsers
Add the ability to Suspend Users
2021-09-27 21:46:04 +02:00
Dennis df3efe8b0a
Merge branch 'ControlPanel-gg:development' into development 2021-09-27 18:48:05 +02:00
Dennis e708e2fc24
Update home.blade.php
This will add the "Out of credits in..." Box when you have and never had Credits.

It will show the box and the text "You ran out of Credits" if you purchased Credits and your servers got Suspended
2021-09-27 18:42:55 +02:00
AVMG b24428d8bf
Merge pull request #209 from 1day2die/better_loggin
Better loggin
2021-09-27 18:11:00 +02:00
Dennis 8bdeed08af
Added "ran out of Credits" 2021-09-27 17:21:17 +02:00
Dennis 2d21d2d2ca
Added better Logs 2021-09-27 15:32:27 +02:00