Commit graph

226 commits

Author SHA1 Message Date
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
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