Commit graph

231 commits

Author SHA1 Message Date
IceToast 035be9f201 feat: Added "voucher" as store parameter -> opens voucher redeem modal and fill the input 2022-01-04 20:54:21 +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 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
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 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
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
IceToast fc0ffcb295 feat: added payment method selection & localized strings 2021-12-15 15:06:21 +01:00
IceToast 2ba2c9ab82 chore: 🎨 added localization strings 2021-12-15 13:37:29 +01:00