Commit graph

301 commits

Author SHA1 Message Date
Dennis
89406f5c98
Merge pull request #362 from LogischJo/development
feat:  Add api routes for suspending and unsuspending an User
2022-01-14 19:24:55 +01:00
Dennis
0c2cf8712e
Translation String 2022-01-10 21:02:43 +01:00
LogischJo
7c4622c622
Update UserController.php 2022-01-05 18:08:41 +01:00
Johannes F
b831bd0c22 feat: Add api routes for suspending and unsuspending an User
This commit adresses #359
2022-01-03 22:14:45 +01:00
Dennis
74bdcffe75
Merge pull request #357 from IceToast/development
fix: 🐛 remove whitespaces before request of stripe payment_methods
2021-12-29 16:12:02 +01:00
IceToast
9a54ab67e1 fix: 🐛 remove whitespaces before request of stripe payment_methods list in .env 2021-12-29 16:04:44 +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
Dennis
0fadf3494d
Merge pull request #346 from 1day2die/fix_api_verification_mail
send verification mail when using "POST Create User"
2021-12-28 08:31:19 +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
b72009aa84 Added API Route 2021-12-27 09:10:38 +01:00
1Day
8a583424db Fix 2021-12-27 08:39:50 +01:00
Dennis
c1ca96d67c
Update RegisterController.php 2021-12-27 07:58:46 +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
1day2die
83657cc6df Update UserController.php 2021-12-26 22:48:43 +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
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
d09004df17 feat: 🔒️ Added error handling on server attribute fetching 2021-12-22 15:11:13 +01:00
1Day
ae1fecef33 Add payment methode to invoice 2021-12-22 13:48:21 +01:00
IceToast
7a10021ab1 chore: ♻️ Removed unused import & code duplication 2021-12-21 19:52:30 +01:00
IceToast
48ebc8c09e feat: Added pterodactyl serverinfo integration 2021-12-21 19:41:04 +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
a6f200ca55 refactor: ♻️ removed unused case in stripe webhook 2021-12-20 10:59:07 +01:00
IceToast
84ec3e583c feat: Added invoice creation on stripe route & webhook 2021-12-17 11:22:37 +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
IceToast
31efac93f0 feat: Added stripe webhook payment succeed handler 2021-12-17 10:00:33 +01:00
1day2die
586bea8795 Translate Invoice-Email. Fix Typo 2021-12-16 19:38:25 +01:00
IceToast
16f7f4cb99 feat: Added StripeWebhook Route 2021-12-16 18:03:38 +01:00
IceToast
06eedeef68 feat: Added Stripe_METHODS to .env variables -> csl of methods to support 2021-12-16 16:19:14 +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
2ba2c9ab82 chore: 🎨 added localization strings 2021-12-15 13:37:29 +01:00
IceToast
962ddb2fc3 fix: 🚑️ getStripeClient() 2021-12-15 12:31:16 +01:00
IceToast
ef2c271257 refactor: 🔒️ Changed getStripeSecret Method -> differentiates between local/prod 2021-12-15 12:24:03 +01:00
IceToast
45b7d703a5 feat: ♻️ Changed payment Status to "paid" && Updated admin/payment table 2021-12-15 12:16:30 +01:00
IceToast
34a8d566a7 feat: modified db payment table 2021-12-15 11:41:57 +01:00
1Day
1d8e0e22dd Fully translate invoices 2021-12-15 11:25:37 +01:00
IceToast
1d72bac7fa feat: Added StripeClient generation 2021-12-15 10:56:58 +01:00
AVMG20
c6cfa6cd2f cleanup 2021-12-14 19:50:36 +01:00
Dennis
63c44e6c0b
Merge branch 'development' into Invoices 2021-12-14 18:54:58 +01:00
1day2die
9d812b77ee fix cent bug 2021-12-14 16:48:00 +01:00
Dennis
d572a603d3
Merge branch 'development' into localization 2021-12-14 16:06:45 +01:00
IceToast
921135c5dd feat: added StripeSuccess Route with session handling 2021-12-14 15:47:50 +01:00
IceToast
27794078cc feat: added correct currency code for stripe api 2021-12-14 15:47:50 +01:00