From f03862b523267250ac0d6df725f6027f93d7e633 Mon Sep 17 00:00:00 2001
From: Kevin Adametz <register@adametz.media>
Date: Thu, 2 Jan 2020 14:07:59 +0100
Subject: [PATCH] Credit Card + php 7.3

---
 .env                                          |   4 +-
 .idea/composerJson.xml                        |  10 ++
 .idea/mivita.care.iml                         |   1 +
 .idea/workspace.xml                           | 111 +++++-------------
 app/Http/Controllers/Pay/PayoneController.php |   3 +-
 app/Http/Controllers/UserShopController.php   |   2 +-
 .../views/web/templates/checkout.blade.php    |   6 +-
 7 files changed, 46 insertions(+), 91 deletions(-)
 create mode 100644 .idea/composerJson.xml

diff --git a/.env b/.env
index 039e4ea..1412732 100644
--- a/.env
+++ b/.env
@@ -11,8 +11,8 @@ APP_URL_MAIN=
 APP_URL_CHECKOUT=checkout.
 #APP_URL_MAIN=dev.
 APP_URL_CRM=my.
-APP_CHECKOUT_MAIL=no-replay@mivita.care
-
+APP_CHECKOUT_MAIL=register@adametz.media
+#APP_CHECKOUT_MAIL=no-replay@mivita.care
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
diff --git a/.idea/composerJson.xml b/.idea/composerJson.xml
new file mode 100644
index 0000000..1b07430
--- /dev/null
+++ b/.idea/composerJson.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ComposerJsonPluginSettings">
+    <unboundedVersionInspectionSettings>
+      <excludedPackages />
+    </unboundedVersionInspectionSettings>
+    <customRepositories />
+    <composerUpdateOptions />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/mivita.care.iml b/.idea/mivita.care.iml
index f1fcdb1..30111a5 100644
--- a/.idea/mivita.care.iml
+++ b/.idea/mivita.care.iml
@@ -4,6 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Tests\" />
       <sourceFolder url="file://$MODULE_DIR$/app" isTestSource="false" packagePrefix="App\" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/askedio/laravel5-profanity-filter" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/barryvdh/laravel-ide-helper" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/barryvdh/reflection-docblock" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2746dfc..93a2515 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,87 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="2fbaac5f-25ba-4502-a970-cc14728d7d55" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/KasSLLController.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/Http/Controllers/SitesController.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/Http/Controllers/Sys/AdminToolsController.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/Http/Middleware/SysAdmin.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/Models/IqImage.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/Models/IqSite.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/database/migrations/2018_10_21_163950_create_iq_images_table.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/database/migrations/2019_10_10_163950_create_iq_sites_table.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resources/views/admin/category/edit.blade.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resources/views/admin/category/form.blade.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resources/views/admin/category/images.blade.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resources/views/admin/site/edit.blade.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resources/views/admin/site/form.blade.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resources/views/admin/site/images.blade.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/resources/views/sys/admin/index.blade.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/composerJson.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/mivita.care.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/mivita.care.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.phpstorm.meta.php" beforeDir="false" afterPath="$PROJECT_DIR$/.phpstorm.meta.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/_ide_helper.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/_ide_helper_models.php" beforeDir="false" afterPath="$PROJECT_DIR$/_ide_helper_models.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/KasController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/KasController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/AttributeController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/AttributeController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/CategoryController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/CategoryController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/ProductController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/ProductController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Http/Controllers/UserShopController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/UserShopController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/CardController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/CardController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Web/SiteController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Web/SiteController.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Kernel.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Kernel.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Middleware/Checkout.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Middleware/Checkout.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Middleware/Subdomain.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Middleware/Subdomain.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/Attribute.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Attribute.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/Category.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Category.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/PaymentTransaction.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/PaymentTransaction.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/Product.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Product.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/Shipping.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Shipping.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/ShippingCountry.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShippingCountry.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/ShippingPrice.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShippingPrice.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/ShoppingInstance.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingInstance.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/ShoppingOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingOrder.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/ShoppingOrderItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingOrderItem.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/ShoppingPayment.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingPayment.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/ShoppingUser.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ShoppingUser.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/UserAccount.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserAccount.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/UserShop.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserShop.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/UserShopOnSite.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserShopOnSite.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/UserUpdateEmail.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/UserUpdateEmail.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Providers/RouteServiceProvider.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Providers/RouteServiceProvider.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Services/HTMLHelper.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/HTMLHelper.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Services/Util.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Util.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/User.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/app.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/database/migrations/2018_10_21_163959_create_categories_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_21_163959_create_categories_table.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/database/migrations/2018_10_21_164007_create_product_images_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/migrations/2018_10_21_164007_create_product_images_table.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/.htaccess" beforeDir="false" afterPath="$PROJECT_DIR$/public/.htaccess" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/assets/css/custom-style.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/css/custom-style.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/admin/category/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/category/index.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/admin/product/form.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/product/form.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/admin/product/images.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/admin/product/images.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/emails/auth.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/auth.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/emails/checkout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/checkout.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/checkout_status.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/emails/contact.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/contact.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/includes/layout-sidenav.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/web/layouts/application.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/layouts/application.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/web/templates/_categories.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/_categories.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/web/templates/card.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/card.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/web/templates/produkte-item.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/produkte-item.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/web/templates/produkte-show.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/produkte-show.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/web/templates/produkte.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/produkte.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/web/user/layouts/application.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/application.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/views/web/user/start.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/user/start.blade.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" afterDir="false" />
     </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -246,6 +173,11 @@
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
   <component name="PropertiesComponent">
     <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
@@ -271,15 +203,15 @@
       <recent name="$PROJECT_DIR$/app/Http/Controllers" />
     </key>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
+  <component name="ServiceViewManager">
+    <option name="viewStates">
       <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
+        <serviceView>
+          <treeState>
+            <expand />
+            <select />
+          </treeState>
+        </serviceView>
       </list>
     </option>
   </component>
@@ -378,6 +310,9 @@
       <workItem from="1574173803219" duration="19000" />
       <workItem from="1574495107293" duration="2126000" />
       <workItem from="1574498597084" duration="18390000" />
+      <workItem from="1574870171463" duration="442000" />
+      <workItem from="1575135233364" duration="233000" />
+      <workItem from="1577966622446" duration="2740000" />
     </task>
     <servers />
   </component>
@@ -406,6 +341,16 @@
       </map>
     </option>
   </component>
+  <component name="WindowStateProjectService">
+    <state x="939" y="488" width="683" height="486" key="find.popup" timestamp="1577968612015">
+      <screen x="0" y="23" width="2560" height="1417" />
+    </state>
+    <state x="939" y="488" width="683" height="486" key="find.popup/-2560.23.2560.1417/2560.-571.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1577968612015" />
+    <state x="945" y="377" width="670" height="676" key="search.everywhere.popup" timestamp="1577970102194">
+      <screen x="0" y="23" width="2560" height="1417" />
+    </state>
+    <state x="945" y="377" width="670" height="676" key="search.everywhere.popup/-2560.23.2560.1417/2560.-571.1440.2537/0.23.2560.1417@0.23.2560.1417" timestamp="1577970102194" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
diff --git a/app/Http/Controllers/Pay/PayoneController.php b/app/Http/Controllers/Pay/PayoneController.php
index 1ffc23e..b14447f 100644
--- a/app/Http/Controllers/Pay/PayoneController.php
+++ b/app/Http/Controllers/Pay/PayoneController.php
@@ -303,8 +303,7 @@ class PayoneController extends Controller
             "language" => 'de',
         ];
         $request = array_merge($this->default, $this->prepayment);
-        $response = Payone::sendRequest($request);
-        return $response;
+        return Payone::sendRequest($request);
 
     }
 
diff --git a/app/Http/Controllers/UserShopController.php b/app/Http/Controllers/UserShopController.php
index ac377df..17964ba 100755
--- a/app/Http/Controllers/UserShopController.php
+++ b/app/Http/Controllers/UserShopController.php
@@ -363,7 +363,7 @@ class UserShopController extends Controller
             'subdomain_name' => $slug,
             'domain_name' => $domain,
             'subdomain_path' => '/mein.mivita.care/public/',
-            //'php_version' => '7.1',
+            'php_version' => '7.3',
             //'ssl_proxy' => 'Y',
             //'redirect_status' => 0
         );
diff --git a/resources/views/web/templates/checkout.blade.php b/resources/views/web/templates/checkout.blade.php
index 52430e8..2f7f1bc 100644
--- a/resources/views/web/templates/checkout.blade.php
+++ b/resources/views/web/templates/checkout.blade.php
@@ -423,18 +423,18 @@
                                         <label class="mt-0 fs-14 fw-400 radio pull-left nomargin-top" style="width: 100%">
                                             {!! Form::radio('payment_method', 'wlt#PPE', (!old('payment_method') ? '1' : '')) !!}
                                             <i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> PayPal</span>
-                                            <img class="float-right" width="90" src="{{asset('images/payments-assets/paypal.png')}}" alt="Mastercard + Visa">
+                                            <img class="float-right" width="90" src="{{asset('images/payments-assets/paypal.png')}}" alt="PayPal">
 
                                         </label>
                                     </div>
-                                   <!-- <div class="col-lg-12 nomargin clearfix">
+                                   <div class="col-lg-12 nomargin clearfix">
                                         <label class="mt-4 fs-14 fw-400 radio pull-left nomargin-top" style="width: 100%">
                                             {!! Form::radio('payment_method', 'cc', '') !!}
                                             <i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Kreditkarte</span>
                                             <img class="float-right" width="90" src="{{asset('images/payments-assets/creditcard.png')}}" alt="Mastercard + Visa">
                                         </label>
                                     </div>
-                                    -->
+
                                    {{--  <div class="col-lg-12 nomargin clearfix">
                                         <label class="mt-0 fs-14 fw-400 radio pull-left" style="width: 100%">
                                             <input name="payment_method" type="radio" value="sb#GPY" />