From 6db007fc824aba8d947e41d94504b99f6c3c0b1f Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Tue, 19 Mar 2019 15:45:46 +0100 Subject: [PATCH] last corrections for payments --- .idea/workspace.xml | 970 ++++++++---------- app/Http/Controllers/Api/PayoneController.php | 18 +- app/Http/Controllers/HomeController.php | 55 +- .../Controllers/TranslationController.php | 2 + .../Controllers/TranslationFileController.php | 2 +- app/Http/Controllers/UserShopController.php | 27 +- .../Controllers/Web/ContactController.php | 5 +- app/Http/Controllers/WizardController.php | 8 + app/Mail/MailActivateUser.php | 26 +- app/Mail/MailCheckout.php | 25 +- app/Mail/MailContact.php | 19 +- app/Mail/MailResetPassword.php | 30 +- app/Mail/MailVerifyAccount.php | 35 +- app/Mail/MailVerifyContact.php | 25 +- app/Requests/TranslationRequest.php | 73 ++ app/Services/Util.php | 13 + config/profanity.php | 11 + public/download/mivita_widerruf_formular.pdf | Bin 0 -> 57385 bytes resources/lang/de.json | 11 - resources/lang/de/email.php | 70 +- resources/lang/de/validation.php | 1 + resources/views/auth/login.blade.php | 4 +- .../views/auth/passwords/email.blade.php | 4 +- .../views/auth/passwords/reset.blade.php | 4 +- resources/views/auth/register.blade.php | 4 +- resources/views/emails/_auth.blade.php | 2 +- resources/views/emails/auth.blade.php | 21 +- resources/views/emails/checkout.blade.php | 76 +- .../views/emails/checkout_status.blade.php | 77 +- resources/views/emails/contact.blade.php | 51 +- resources/views/layouts/application.blade.php | 2 +- resources/views/layouts/auth.blade.php | 2 +- resources/views/legal/_agb.blade.php | 38 + .../views/legal/_data_protected.blade.php | 38 + resources/views/legal/_imprint.blade.php | 36 + resources/views/legal/agb.blade.php | 14 + resources/views/legal/agb_de.blade.php | 84 ++ .../views/legal/data_protect_de.blade.php | 440 ++++---- .../views/legal/data_protected.blade.php | 40 +- resources/views/legal/imprint.blade.php | 38 +- resources/views/legal/imprint_de.blade.php | 53 +- .../views/legal/shop_term_of_use_de.blade.php | 14 +- resources/views/translation/index.blade.php | 1 - .../user/components/user_shop_edit.blade.php | 3 +- .../components/user_shop_register.blade.php | 18 +- resources/views/user/shop.blade.php | 2 - .../views/web/layouts/application.blade.php | 26 +- .../web/layouts/includes/footer.blade.php | 6 + resources/views/web/templates/agb.blade.php | 84 ++ .../views/web/templates/checkout.blade.php | 7 +- .../web/user/layouts/application.blade.php | 25 + .../user/layouts/includes/footer.blade.php | 16 +- routes/web.php | 35 +- 53 files changed, 1514 insertions(+), 1177 deletions(-) create mode 100644 app/Requests/TranslationRequest.php create mode 100644 public/download/mivita_widerruf_formular.pdf create mode 100755 resources/views/legal/_agb.blade.php create mode 100755 resources/views/legal/_data_protected.blade.php create mode 100755 resources/views/legal/_imprint.blade.php create mode 100755 resources/views/legal/agb.blade.php create mode 100755 resources/views/legal/agb_de.blade.php create mode 100644 resources/views/web/templates/agb.blade.php diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 142f87a..6076174 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,32 +2,57 @@ - - + + + + + + + - - + + + + - - - + - - - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + - - - + + + - + +