1Day
b245a54eee
fix some db-handling errors
2022-01-07 08:04:33 +01:00
IceToast
ac190ecd17
refactor: 🚚 renamed Settings Classes
2022-01-05 21:54:49 +01:00
1Day
301dc99431
Reset locale when changes are made - added to translation file
2022-01-05 15:29:08 +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
63888f11e5
ability to slam all settings into one database
2022-01-05 08:57:41 +01:00
IceToast
035be9f201
feat: ✨ Added "voucher" as store parameter -> opens voucher redeem modal and fill the input
2022-01-04 20:54:21 +01:00
1Day
16eebcb02a
Formatting
2022-01-04 10:20:43 +01:00
1Day
6f1d372512
basics for the language-settings
2022-01-04 10:03:03 +01:00
1Day
c2988787e6
Invoice Settings looks nicer
2022-01-04 09:33:38 +01:00
1Day
acc3371ba8
Download Invoices in Payment-View
2022-01-04 09:05:53 +01:00
IceToast
f056a183c7
chore: 🌐 localized "dashboard icons string"
2022-01-03 02:10:36 +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
ef732d5426
feat: ✨ Moved InvoiceSettings Tab content to "tabs" directory -> modular approach
2022-01-02 19:38:13 +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
IceToast
669939f8c3
refactor: ♻️ Removed PAYPAL_EMAIL env -> not being used && removed info row in checkout -> unnecessary | closes #353
2021-12-28 13:35:58 +01:00
Dennis
c668ac4d2e
Add more Languages
2021-12-28 07:52:10 +01:00
Dennis
f579c9ab99
Newest english, german and italian translations
2021-12-27 14:15:23 +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
8a583424db
Fix
2021-12-27 08:39:50 +01:00
Dennis
5f57b4d784
Update register.blade.php
2021-12-27 07:59:00 +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
Dennis
5b7374d41a
Merge pull request #339 from IceToast/servers-servercard
...
servers card UI redesign
2021-12-24 00:11:16 +01:00
IceToast
55b67ea95b
fix: 🎨 spacing between server cards
2021-12-24 00:03:32 +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
840da10a38
fix: 💄 improved mobile design -> centering
2021-12-23 00:27:43 +01:00
IceToast
e4aabaec78
style: 🚚 Renamed divided cpu by 100 and renamed unit to vCores -> more realistic naming
2021-12-22 20:34:27 +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
277d28df85
chore: 🐛 removed invoices::invoice.string localization -> no need to translate
2021-12-22 14:51:29 +01:00
IceToast
f0852498ed
revert: 🎨 removed random formatting lol
2021-12-22 14:50:00 +01:00
IceToast
f10933104c
feat: ✨ Added Localization generation
2021-12-22 14:31:09 +01:00
1Day
ae1fecef33
Add payment methode to invoice
2021-12-22 13:48:21 +01:00
Dennis
c614e03526
Merge pull request #328 from IceToast/stripe_integration
...
feature: Stripe integration
2021-12-22 13:06:46 +01:00
IceToast
5ed46a1640
chore: 🌐 added localization strings
2021-12-22 11:07:38 +01:00
IceToast
fe153fdc90
feat: ✨ Added Sweetalert confirmation over window.confirm
2021-12-22 11:04:35 +01:00
IceToast
c436bdb4b9
fix: 🐛 removed magic string
2021-12-22 10:14:58 +01:00
IceToast
1e8732158b
style: 💄 changed price credit display name & added max width to card container
2021-12-22 10:12:03 +01:00
IceToast
0cbae51666
feat: ✨ Added delete button and handler
2021-12-22 09:34:05 +01:00
IceToast
174985244f
chore: 🌐 Added localization strings
2021-12-21 19:44:31 +01:00
IceToast
48ebc8c09e
feat: ✨ Added pterodactyl serverinfo integration
2021-12-21 19:41:04 +01:00
Dennis
7e19f77e4d
Merge pull request #336 from 1day2die/translate_nodes_eggs_view
...
Translate nodes+eggs adminview
2021-12-21 15:50:20 +01:00
1day2die
6531dd957f
Update index.blade.php
2021-12-21 15:49:25 +01:00
1day2die
eef27ca8fe
translation strings
2021-12-21 15:48:40 +01:00
IceToast
d485602140
style: 💄 changed servercard to display mock data in new format
2021-12-21 15:15:18 +01:00
IceToast
c332216e32
Merge branch 'development' into servers-servercard
2021-12-21 14:56:12 +01:00
Dennis
732d8548fb
Update en.json
2021-12-21 09:02:01 +01:00
Dennis
dce6aef535
Hotfix Quote-marks
2021-12-21 08:21:59 +01:00
IceToast
67767ef860
Merge branch 'development' into servercreation_resouce_card
2021-12-20 22:15:03 +01:00
Dennis
88d460c661
Update confirmed.blade.php
2021-12-20 19:23:41 +01:00
IceToast
e306dd8104
chore: 🌐 changed payment method missing text
2021-12-20 18:56:25 +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
9d8361641b
feat: ✨ Added conditional payment methods options
2021-12-20 11:05:51 +01:00
IceToast
d33eef6523
fix: 🐛 translation strings
2021-12-20 09:20:43 +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
Dennis
e8cf7c8184
Update es.json
2021-12-16 22:39:10 +01:00
Dennis
3992000a68
Newest language files
2021-12-16 22:37:03 +01:00
1day2die
67c2deeb42
Merge branch 'development' of https://github.com/1day2die/dashboard into development
2021-12-16 19:38:39 +01:00
1day2die
586bea8795
Translate Invoice-Email. Fix Typo
2021-12-16 19:38:25 +01:00
1Day
4b99893ee6
ive forgotten about language strings hue
2021-12-16 15:33:08 +01:00
1Day
43e89dc8b9
language selection on dashboard
2021-12-16 15:03:41 +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
fc0ffcb295
feat: ✨ added payment method selection & localized strings
2021-12-15 15:06:21 +01:00
Dennis
b46d52e17d
Hindi Language support
2021-12-15 13:59:57 +01:00
IceToast
2ba2c9ab82
chore: 🎨 added localization strings
2021-12-15 13:37:29 +01:00
IceToast
1e9850c594
chore: 🔧 updated naming dashboard -> controlpanel.gg
2021-12-15 12:34:08 +01:00
IceToast
45b7d703a5
feat: ♻️ Changed payment Status to "paid" && Updated admin/payment table
2021-12-15 12:16:30 +01:00
1Day
2dd7997d28
Updated Translations
2021-12-15 11:50:04 +01:00
1Day
3b5b01f862
Delete .gitkeep
2021-12-15 11:37:25 +01:00
1Day
1d8e0e22dd
Fully translate invoices
2021-12-15 11:25:37 +01:00
Dennis
49f32c174a
adding some base languages
...
French
Italian
Spanish
Dutch
Polish
Czech
2021-12-15 10:25:08 +01:00
AVMG20
9ebca3aec3
logo padding fix
2021-12-14 19:36:44 +01:00
Dennis
26eb7c349e
Merge branch 'Invoices' into development
2021-12-14 19:31:14 +01:00
AVMG20
b8741b8e10
Merge remote-tracking branch 'origin/development' into development
2021-12-14 19:17:52 +01:00
AVMG20
505bf7b6fa
added translation manager
2021-12-14 19:17:44 +01:00
1day2die
9ac3a86129
Fix shop page
2021-12-14 19:03:40 +01:00
Dennis
63c44e6c0b
Merge branch 'development' into Invoices
2021-12-14 18:54:58 +01:00
1Day
d9b9eb369e
fix spaces
2021-12-14 16:08:51 +01:00
Dennis
d572a603d3
Merge branch 'development' into localization
2021-12-14 16:06:45 +01:00
1Day
82ce13fcbd
resolve conflicts
2021-12-14 16:05:27 +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
47b7402db8
fix column
2021-12-14 15:24:53 +01:00
1Day
2e29c3e084
German Laravel default
2021-12-14 09:00:38 +01:00
1Day
8c2c943b2b
added english translation for reference
2021-12-14 07:59:14 +01:00
IceToast
fdd0f2131a
style: 💄 fixed code formatting
2021-12-14 00:38:45 +01:00
1day2die
e2328cb328
Translate Datatables
2021-12-13 22:39:40 +01:00
1Day
ae67bd9a42
fix vouchers
2021-12-13 16:27:56 +01:00
1Day
f54bed1c4a
notification translations
2021-12-13 15:46:04 +01:00
1Day
60ad5fcd6b
update localization file
2021-12-13 14:22:34 +01:00
1Day
1b6e059c99
removed multilines
2021-12-13 13:29:18 +01:00
1Day
3411418d15
Updated for invoices
2021-12-13 13:28:37 +01:00
1Day
60b310bc0c
multilanguage support
2021-12-13 13:28:01 +01:00
1Day
fbc5fed216
german translation
2021-12-13 12:54:45 +01:00
1Day
ff9be6b543
invoice translation
2021-12-13 12:52:13 +01:00
1Day
ad31f2a49f
fixes
2021-12-13 11:48:47 +01:00
1Day
7ef8fdff4e
guess im done?
2021-12-13 11:47:35 +01:00
1Day
6bc01d5ae6
All blade files
2021-12-13 11:14:42 +01:00
1Day
1a1223424a
quicksafe
2021-12-13 10:42:22 +01:00
1Day
70828b6d48
fully translateable backend
2021-12-13 10:12:32 +01:00
1Day
88eafb72c5
quicksave
2021-12-13 08:59:27 +01:00
1Day
24ee173326
saving progress
2021-12-13 08:42:53 +01:00
IceToast
546f4a25e2
Styling
2021-12-13 00:29:32 +01:00
1day2die
9644fe0fe2
first steps
2021-12-06 17:11:48 +01:00
1day2die
a6de39bc32
small fixes, logo update, prefix update
2021-12-05 20:08:09 +01:00
1Day
75c550e0c1
Fixes requested by IceToast
2021-12-02 12:01:11 +01:00
WBLKLeipe
86716961f3
download all invoices button
2021-12-02 09:54:30 +01:00
IceToast
cda13a2007
feat: added basic product sorting -> by price
2021-12-01 21:58:21 +01:00
WBLKLeipe
f62583a007
clean UI
2021-12-01 13:30:40 +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
WBLKLeipe
928086953c
Logo, Template and Invoice stuff
2021-11-30 15:50:43 +01:00
IceToast
38f1273d2d
fix: 🚑 ️ swapped nodes/eggs column naming -> now correct order
2021-11-29 09:24:18 +01:00
IceToast
0512f81b8b
fix: credits_display_name placerholder & removed old code
2021-11-27 14:02:38 +01:00
IceToast
da57e37008
fix: form submit -> post request payload was missing product
2021-11-27 13:51:48 +01:00
1day2die
21b9d70035
invoice DB, counting up, format stuff
2021-11-27 02:47:36 +01:00
1day2die
c3a777bdf4
First COmmit
2021-11-26 20:42:38 +01:00
IceToast
e07ad87ea9
style: 💄 Styling & added price to cards
2021-11-25 22:21:06 +01:00
IceToast
08a26004c3
feat: 💄 removed config card, changed layout
2021-11-25 16:16:03 +01:00
IceToast
c652d3078f
feat: 💄 Styled resouce card -> restyled "row" formatting for resources
2021-11-25 13:34:01 +01:00
IceToast
801ae567dc
fix: 🎨 weird formatting
2021-11-20 23:39:59 +01:00
IceToast
679e4d4670
feat: 💄 Added basic resource cards
2021-11-20 23:38:44 +01:00
IceToast
eeaae72f87
feat: 💄 restyled server info card at servers-view
2021-11-20 03:54:03 +01:00
AVMG20
836784be48
Re-sync bug
2021-11-18 19:22:09 +01:00
AVMG20
251614c507
hotfix, create page node not properly updating with multiple locations
2021-11-12 23:16:59 +01:00
AVMG20
47c251e48d
removed out of credits info
2021-11-12 20:59:33 +01:00
AVMG20
d15a9dabdb
cloning minimum credits fixed
2021-11-12 20:42:12 +01:00
AVMG
a0155a22eb
Merge pull request #283 from ControlPanel-gg/product_linking
...
oops
2021-11-12 21:27:11 +01:00
AVMG
fccf0a19b0
Merge pull request #282 from ControlPanel-gg/product_linking
...
fixed the most annoying bug where the pre-selected node id was incorrect
2021-11-12 21:24:32 +01:00
AVMG20
6bad46e4e7
oops
2021-11-12 20:26:39 +01:00
AVMG20
d7f1cf4c3a
fixed the most annoying bug where the pre-selected node id was incorrect
2021-11-12 20:21:50 +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
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
Dennis
20e14bb3e7
Fixed Spacing
2021-09-27 10:12:13 +02:00
Dennis
2ece359140
fixed placeholders
2021-09-27 10:11:13 +02:00
Dennis
82006f24af
Added re-sync Discord and Discord Card to Profile
2021-09-27 10:08:44 +02:00
AVMG
4ea4a6910c
Merge pull request #202 from GeckoBoy84/patch-1
...
Update checkout.blade.php
2021-09-26 21:54:41 +02:00