Commit graph

527 commits

Author SHA1 Message Date
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
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
1Day 1d8e0e22dd Fully translate invoices 2021-12-15 11:25:37 +01:00
1Day 53bc9b8051 remove translation manager 2021-12-15 11:10:27 +01:00
IceToast 1d72bac7fa feat: Added StripeClient generation 2021-12-15 10:56:58 +01:00
Dennis 49f32c174a
adding some base languages
French
Italian
Spanish
Dutch
Polish
Czech
2021-12-15 10:25:08 +01:00
AVMG20 c6cfa6cd2f cleanup 2021-12-14 19:50:36 +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
Dennis d7a26c1e17
Merge pull request #329 from 1day2die/localization
Fix shop page
2021-12-14 19:04:50 +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
Dennis 64d8283799
Merge pull request #327 from 1day2die/localization
Localization and multilanguage Support (German included)
2021-12-14 18:45:31 +01:00
1day2die 9d812b77ee fix cent bug 2021-12-14 16:48:00 +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 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