Commit graph

606 commits

Author SHA1 Message Date
Dennis
1858cf0db2
Merge pull request #315 from IceToast/servercreation_resouce_card
servers/create - updated UI
2021-12-20 22:56:49 +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
a6f200ca55 refactor: ♻️ removed unused case in stripe webhook 2021-12-20 10:59:07 +01:00
IceToast
d33eef6523 fix: 🐛 translation strings 2021-12-20 09:20:43 +01:00
IceToast
ccefb51b32 Merge branch 'stripe_integration' of github.com:IceToast/dashboard into stripe_integration 2021-12-17 11:39:35 +01:00
IceToast
bbe95dcbc5 chore: 📝 updated .env.example 2021-12-17 11:39:31 +01:00
IceToast
d4ab798221 chore: 📝 updated .env.example 2021-12-17 11:38:40 +01:00
IceToast
84ec3e583c feat: Added invoice creation on stripe route & webhook 2021-12-17 11:22:37 +01:00
IceToast
97b01d9428 chore: ⬆️ updated composer packages 2021-12-17 10:45:00 +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
c679a257dc docs: 📝 Added Stripe Intergration to readme 2021-12-17 10:01:35 +01:00
IceToast
31efac93f0 feat: Added stripe webhook payment succeed handler 2021-12-17 10:00:33 +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
Dennis
7f6c4f5761
Merge pull request #334 from 1day2die/development
Fixed Typo. Translated Invoice E-mail
2021-12-16 19:42:27 +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
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
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
Dennis
b07a1e3007
Merge pull request #332 from 1day2die/update_readme
Update readme
2021-12-15 15:38:44 +01:00
IceToast
17158ea20c Merge branch 'stripe_integration' of github.com:IceToast/dashboard into stripe_integration 2021-12-15 15:06:24 +01:00
IceToast
fc0ffcb295 feat: added payment method selection & localized strings 2021-12-15 15:06:21 +01:00
IceToast
67ac187f26 feat: added payment method selection & localized strings 2021-12-15 15:02:31 +01:00
Dennis
b42c11ca25
Update README.md 2021-12-15 14:57:52 +01:00
Dennis
9213cb593d
Update README.md 2021-12-15 14:57:27 +01:00
Dennis
09bee5ac72
Update README.md 2021-12-15 14:55:57 +01:00
Dennis
b46d52e17d
Hindi Language support 2021-12-15 13:59:57 +01:00
IceToast
53bc28376e chore: 🐛 changed seeder name 2021-12-15 13:39:28 +01:00
IceToast
2ba2c9ab82 chore: 🎨 added localization strings 2021-12-15 13:37:29 +01:00
IceToast
bd56c6b320 fix: 🐛 payments migration 2021-12-15 13:30:32 +01:00
IceToast
ae47ebfcc6 feat: Added payment table migration 2021-12-15 13:07:51 +01:00
IceToast
1e9850c594 chore: 🔧 updated naming dashboard -> controlpanel.gg 2021-12-15 12:34:08 +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
Dennis
33d52eae2a
Merge pull request #331 from 1day2die/invoice-translations
Updated Translations
2021-12-15 11:53:38 +01:00
1Day
2dd7997d28 Updated Translations 2021-12-15 11:50:04 +01:00
IceToast
34a8d566a7 feat: modified db payment table 2021-12-15 11:41:57 +01:00
Dennis
f4ffe2325e
Merge pull request #330 from 1day2die/invoice-translations
Invoice translations ||  Remove translations-manager-package
2021-12-15 11:41:39 +01:00
1Day
3b5b01f862 Delete .gitkeep 2021-12-15 11:37:25 +01:00