From c20deac3fe7386ae2b4ae28733a97bc3f129ecaf Mon Sep 17 00:00:00 2001
From: Kevin Adametz <kevinadametz@Kevins-iMac.local>
Date: Mon, 25 Feb 2019 22:16:08 +0100
Subject: [PATCH] save order

---
 .idea/workspace.xml                           | 608 ++++++++++--------
 app/Http/Controllers/Pay/PayoneController.php |  10 +-
 .../Controllers/Web/CheckoutController.php    |  17 +-
 app/Models/PaymentTransaction.php             |  10 +
 app/Models/ShoppingOrder.php                  |  10 +
 app/Models/ShoppingOrderItem.php              |  10 +
 app/Models/ShoppingPayment.php                |  10 +
 app/Models/ShoppingUser.php                   |  10 +
 ..._23_161530_create_shopping_users_table.php |  66 ++
 ...23_163527_create_shopping_orders_table.php |  58 ++
 ...3724_create_shopping_order_items_table.php |  47 ++
 ..._163832_create_shopping_payments_table.php |  48 ++
 ...0014_create_payment_transactions_table.php |  56 ++
 .../views/web/templates/checkout.blade.php    |  43 +-
 .../web/templates/produkte-item.blade.php     |  37 +-
 15 files changed, 739 insertions(+), 301 deletions(-)
 create mode 100644 app/Models/PaymentTransaction.php
 create mode 100644 app/Models/ShoppingOrder.php
 create mode 100644 app/Models/ShoppingOrderItem.php
 create mode 100644 app/Models/ShoppingPayment.php
 create mode 100644 app/Models/ShoppingUser.php
 create mode 100644 database/migrations/2019_02_23_161530_create_shopping_users_table.php
 create mode 100644 database/migrations/2019_02_23_163527_create_shopping_orders_table.php
 create mode 100644 database/migrations/2019_02_23_163724_create_shopping_order_items_table.php
 create mode 100644 database/migrations/2019_02_23_163832_create_shopping_payments_table.php
 create mode 100644 database/migrations/2019_02_25_090014_create_payment_transactions_table.php

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6a0d2e3..2453cbb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,11 @@
 <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/Pay/PayoneController.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/Services/Payone.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/config/payone.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/Pay/PayoneController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.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/Services/Yard.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/Yard.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" />
-      <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/produkte-item.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/web/templates/produkte-item.blade.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -26,16 +22,16 @@
     <session id="396433632">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="37" />
+          <entry key="project.closed" value="38" />
           <entry key="project.open.time.0" value="16" />
           <entry key="project.open.time.1" value="4" />
           <entry key="project.open.time.2" value="1" />
           <entry key="project.open.time.3" value="4" />
           <entry key="project.open.time.4" value="5" />
           <entry key="project.open.time.5" value="4" />
-          <entry key="project.open.time.6" value="2" />
+          <entry key="project.open.time.6" value="3" />
           <entry key="project.open.time.8" value="1" />
-          <entry key="project.opened" value="37" />
+          <entry key="project.opened" value="38" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
@@ -47,7 +43,7 @@
           <entry key="js" value="11" />
           <entry key="json" value="14" />
           <entry key="less" value="1" />
-          <entry key="php" value="1194" />
+          <entry key="php" value="1239" />
           <entry key="png" value="1" />
           <entry key="scss" value="19" />
         </counts>
@@ -55,13 +51,13 @@
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key=".env file" value="14" />
-          <entry key="Blade" value="427" />
+          <entry key="Blade" value="432" />
           <entry key="CSS" value="6" />
           <entry key="Image" value="3" />
           <entry key="JSON" value="14" />
           <entry key="JavaScript" value="11" />
           <entry key="Less" value="1" />
-          <entry key="PHP" value="767" />
+          <entry key="PHP" value="807" />
           <entry key="SCSS" value="19" />
           <entry key="htaccess" value="2" />
         </counts>
@@ -69,11 +65,11 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="css" value="110" />
-          <entry key="dummy" value="48" />
+          <entry key="dummy" value="50" />
           <entry key="env" value="154" />
           <entry key="js" value="6" />
           <entry key="json" value="1421" />
-          <entry key="php" value="31585" />
+          <entry key="php" value="32184" />
           <entry key="scss" value="2" />
           <entry key="txt" value="878" />
         </counts>
@@ -81,12 +77,12 @@
       <usages-collector id="statistics.file.types.edit">
         <counts>
           <entry key=".env file" value="154" />
-          <entry key="Blade" value="13395" />
+          <entry key="Blade" value="13661" />
           <entry key="CSS" value="110" />
           <entry key="JSON" value="1421" />
           <entry key="JavaScript" value="6" />
-          <entry key="PHP" value="18190" />
-          <entry key="PLAIN_TEXT" value="926" />
+          <entry key="PHP" value="18523" />
+          <entry key="PLAIN_TEXT" value="928" />
           <entry key="SCSS" value="2" />
         </counts>
       </usages-collector>
@@ -111,8 +107,8 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="800">
-                  <caret line="77" column="47" lean-forward="true" selection-start-line="77" selection-start-column="47" selection-end-line="77" selection-end-column="47" />
+                <state relative-caret-position="1204">
+                  <caret line="92" column="14" selection-start-line="92" selection-start-column="14" selection-end-line="92" selection-end-column="14" />
                 </state>
               </provider>
             </entry>
@@ -120,8 +116,8 @@
           <file pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="562">
-                  <caret line="154" column="5" lean-forward="true" selection-start-line="154" selection-start-column="5" selection-end-line="154" selection-end-column="5" />
+                <state relative-caret-position="680">
+                  <caret line="58" column="32" selection-start-line="58" selection-start-column="25" selection-end-line="58" selection-end-column="32" />
                   <folding>
                     <element signature="e#44#80#0#PHP" expanded="true" />
                   </folding>
@@ -141,8 +137,8 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Checkout.php">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="630">
-                  <caret line="45" selection-start-line="45" selection-end-line="45" />
+                <state relative-caret-position="700">
+                  <caret line="50" selection-start-line="50" selection-end-line="50" />
                   <folding>
                     <element signature="e#39#71#0#PHP" expanded="true" />
                   </folding>
@@ -150,6 +146,15 @@
               </provider>
             </entry>
           </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="456">
+                  <caret line="435" column="40" selection-start-line="435" selection-start-column="40" selection-end-line="435" selection-end-column="40" />
+                </state>
+              </provider>
+            </entry>
+          </file>
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/app/Http/Kernel.php">
               <provider selected="true" editor-type-id="text-editor">
@@ -162,7 +167,7 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/routes/web.php">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="743">
+                <state relative-caret-position="3304">
                   <caret line="245" selection-start-line="245" selection-end-line="245" />
                 </state>
               </provider>
@@ -172,51 +177,88 @@
       </split-first>
       <split-second>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php">
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/database/migrations/2019_02_25_090014_create_payment_transactions_table.php">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="576">
-                  <caret line="123" column="21" selection-start-line="123" selection-start-column="21" selection-end-line="123" selection-end-column="21" />
+                <state relative-caret-position="294">
+                  <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
                 </state>
               </provider>
             </entry>
           </file>
           <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php">
+            <entry file="file://$PROJECT_DIR$/database/migrations/2019_02_23_163832_create_shopping_payments_table.php">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="1288">
-                  <caret line="92" selection-start-line="92" selection-end-line="92" />
+                <state relative-caret-position="280">
+                  <caret line="22" column="54" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="67" />
                 </state>
               </provider>
             </entry>
           </file>
           <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/application.blade.php">
+            <entry file="file://$PROJECT_DIR$/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="406">
+                  <caret line="31" column="41" selection-start-line="31" selection-start-column="41" selection-end-line="31" selection-end-column="41" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/database/migrations/2019_02_23_163527_create_shopping_orders_table.php">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="476">
+                  <caret line="36" selection-start-line="33" selection-start-column="9" selection-end-line="36" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/database/migrations/2019_02_23_161530_create_shopping_users_table.php">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="329">
+                  <caret line="26" column="58" selection-start-line="26" selection-end-line="27" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_06_004849_create_shipping_prices_table.php">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="504">
+                  <caret line="38" selection-start-line="38" selection-end-line="38" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_06_004815_create_shippings_table.php">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="294">
+                  <caret line="23" column="54" selection-start-line="23" selection-end-line="24" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_03_162833_create_user_shops_table.php">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="418">
+                  <caret line="37" column="51" selection-start-line="37" selection-start-column="51" selection-end-line="37" selection-end-column="51" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/database/migrations/2018_10_21_164005_create_product_categories_table.php">
+              <provider selected="true" editor-type-id="text-editor" />
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/database/migrations/2018_10_21_164007_create_product_images_table.php">
               <provider selected="true" editor-type-id="text-editor">
                 <state relative-caret-position="154">
-                  <caret line="11" selection-start-line="11" selection-end-line="11" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/app/Services/Payone.php">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="466">
-                  <caret line="70" selection-start-line="70" selection-end-line="70" />
-                  <folding>
-                    <element signature="e#6#1055#0#PHP" expanded="true" />
-                    <element signature="e#1116#1130#0#PHP" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="589">
-                  <caret line="401" column="134" selection-start-line="401" selection-start-column="134" selection-end-line="401" selection-end-column="152" />
+                  <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
                 </state>
               </provider>
             </entry>
@@ -227,7 +269,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>form&gt;</find>
       <find>date</find>
       <find>birthdatepicker</find>
       <find>data</find>
@@ -257,6 +298,7 @@
       <find>setShippingCountry</find>
       <find>Util</find>
       <find>use Util</find>
+      <find>hidde</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$/app</dir>
@@ -297,11 +339,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/resources/views/emails/contact.blade.php" />
-        <option value="$PROJECT_DIR$/resources/views/web/templates/produkte.blade.php" />
-        <option value="$PROJECT_DIR$/database/migrations/2019_01_03_162833_create_user_shops_table.php" />
-        <option value="$PROJECT_DIR$/resources/views/user/components/user_shop_image.blade.php" />
-        <option value="$PROJECT_DIR$/resources/lang/de.json" />
         <option value="$PROJECT_DIR$/app/Models/ProductImage.php" />
         <option value="$PROJECT_DIR$/database/migrations/2019_01_21_173306_create_user_shop_on_sites_table.php" />
         <option value="$PROJECT_DIR$/app/Models/Product.php" />
@@ -314,7 +351,6 @@
         <option value="$PROJECT_DIR$/app/Models/UserShop.php" />
         <option value="$PROJECT_DIR$/resources/views/user/components/user_shop_edit.blade.php" />
         <option value="$PROJECT_DIR$/public/css/application.css" />
-        <option value="$PROJECT_DIR$/resources/views/web/templates/produkte-item.blade.php" />
         <option value="$PROJECT_DIR$/resources/views/web/layouts/includes/footer.blade.php" />
         <option value="$PROJECT_DIR$/resources/views/web/layouts/application.blade.php" />
         <option value="$PROJECT_DIR$/resources/views/web/user/layouts/layout.blade.php" />
@@ -335,7 +371,6 @@
         <option value="$PROJECT_DIR$/app/Models/ShoppingInstance.php" />
         <option value="$PROJECT_DIR$/.env" />
         <option value="$PROJECT_DIR$/config/app.php" />
-        <option value="$PROJECT_DIR$/app/Http/Middleware/Checkout.php" />
         <option value="$PROJECT_DIR$/app/Services/Util.php" />
         <option value="$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php" />
         <option value="$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php" />
@@ -345,9 +380,16 @@
         <option value="$PROJECT_DIR$/config/payone.php" />
         <option value="$PROJECT_DIR$/app/Services/Payone.php" />
         <option value="$PROJECT_DIR$/routes/web.php" />
+        <option value="$PROJECT_DIR$/resources/views/web/templates/produkte-item.blade.php" />
+        <option value="$PROJECT_DIR$/database/migrations/2019_02_23_161530_create_shopping_users_table.php" />
+        <option value="$PROJECT_DIR$/database/migrations/2019_02_23_163527_create_shopping_orders_table.php" />
         <option value="$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php" />
+        <option value="$PROJECT_DIR$/app/Http/Middleware/Checkout.php" />
         <option value="$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php" />
         <option value="$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php" />
+        <option value="$PROJECT_DIR$/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php" />
+        <option value="$PROJECT_DIR$/database/migrations/2019_02_23_163832_create_shopping_payments_table.php" />
+        <option value="$PROJECT_DIR$/database/migrations/2019_02_25_090014_create_payment_transactions_table.php" />
       </list>
     </option>
   </component>
@@ -482,8 +524,8 @@
     </include_path>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="15" />
-    <option name="y" value="64" />
+    <option name="x" value="27" />
+    <option name="y" value="23" />
     <option name="width" value="2477" />
     <option name="height" value="1415" />
   </component>
@@ -493,6 +535,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -547,12 +590,13 @@
             <path>
               <item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
               <item name="mivita.care" type="462c0819:PsiDirectoryNode" />
-              <item name="config" type="462c0819:PsiDirectoryNode" />
+              <item name="database" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
               <item name="mivita.care" type="462c0819:PsiDirectoryNode" />
               <item name="database" type="462c0819:PsiDirectoryNode" />
+              <item name="migrations" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
@@ -565,6 +609,13 @@
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="views" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
+              <item name="mivita.care" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="user" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
               <item name="mivita.care" type="462c0819:PsiDirectoryNode" />
@@ -597,16 +648,6 @@
               <item name="user" type="462c0819:PsiDirectoryNode" />
               <item name="layouts" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
-              <item name="mivita.care" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
-              <item name="user" type="462c0819:PsiDirectoryNode" />
-              <item name="layouts" type="462c0819:PsiDirectoryNode" />
-              <item name="includes" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="mivita.care" type="b2602c69:ProjectViewProjectNode" />
               <item name="mivita.care" type="462c0819:PsiDirectoryNode" />
@@ -616,7 +657,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -698,11 +738,12 @@
       <workItem from="1550736184159" duration="1000" />
       <workItem from="1550765848683" duration="10855000" />
       <workItem from="1550838986113" duration="11950000" />
+      <workItem from="1550935201261" duration="6226000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="222843000" />
+    <option name="totallyTimeSpent" value="229069000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -714,10 +755,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="15" y="64" width="2477" height="1415" extended-state="0" />
+    <frame x="27" y="23" width="2477" height="1415" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49811035" visible="true" weight="0.13921972" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49811035" visible="true" weight="0.19425051" />
       <window_info id="Structure" order="1" sideWeight="0.50188965" side_tool="true" weight="0.13921972" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -747,119 +788,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/Services/Facade/Yard.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/views/web/templates/produkte-show.blade.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="839">
-          <caret line="123" column="32" selection-start-line="123" selection-start-column="32" selection-end-line="123" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/Services/HTMLHelper.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1064">
-          <caret line="207" column="69" lean-forward="true" selection-start-line="207" selection-start-column="69" selection-end-line="207" selection-end-column="69" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/views/layouts/layout-1.blade.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="546">
-          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/views/user/edit.blade.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="19" column="29" lean-forward="true" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/views/user/delete_account.blade.php">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/assets/js/jquery.contact-form.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/assets/js/contact.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/assets/js/scripts.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="705">
-          <caret line="141" column="44" lean-forward="true" selection-start-line="141" selection-start-column="44" selection-end-line="141" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/lang/de/validation.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="196">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/views/web/templates/kontakt.blade.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="16" column="5" selection-start-line="14" selection-start-column="3" selection-end-line="16" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Web/SiteController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Web/ContactController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/Mail/MailContact.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="15" column="20" lean-forward="true" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/assets/css/custom-style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1250">
-          <caret line="175" selection-start-line="175" selection-end-line="175" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_06_004849_create_shipping_prices_table.php">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_06_004815_create_shippings_table.php">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_21_173306_create_user_shop_on_sites_table.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="20" column="51" lean-forward="true" selection-start-line="20" selection-end-line="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/database/migrations/2018_09_29_145839_create_user_update_emails_table.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-end-line="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/vendor/gloudemans/shoppingcart/database/migrations/0000_00_00_000000_create_shoppingcart_table.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="294">
@@ -867,20 +795,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_03_162833_create_user_shops_table.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="490">
-          <caret line="37" column="51" lean-forward="true" selection-start-line="37" selection-start-column="51" selection-end-line="37" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_06_004907_create_shipping_countries_table.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/Models/ShippingCountry.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="364">
@@ -895,13 +809,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/database/migrations/2019_02_21_195012_create_shopping_instances_table.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="532">
-          <caret line="40" column="7" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/layout.blade.php">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -978,34 +885,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Http/Kernel.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="308">
-          <caret line="22" column="6" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="576">
-          <caret line="123" column="21" selection-start-line="123" selection-start-column="21" selection-end-line="123" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1288">
-          <caret line="92" selection-start-line="92" selection-end-line="92" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/application.blade.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="11" selection-start-line="11" selection-end-line="11" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/Services/Slim.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="252">
@@ -1017,22 +896,141 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="431">
           <caret line="62" lean-forward="true" selection-start-line="62" selection-end-line="62" />
-          <folding>
-            <element signature="e#45#81#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/Services/Yard.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="546">
-          <caret line="44" selection-start-line="44" selection-end-line="44" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/config/broadcasting.php">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/Http/Kernel.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="308">
+          <caret line="22" column="6" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/routes/web.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3304">
+          <caret line="245" selection-start-line="245" selection-end-line="245" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/views/web/templates/produkte-item.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="16" column="28" lean-forward="true" selection-start-line="16" selection-start-column="28" selection-end-line="16" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/views/web/templates/produkte.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="18" column="9" lean-forward="true" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/views/web/templates/produkte-show.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="886">
+          <caret line="123" column="32" selection-start-line="123" selection-start-column="32" selection-end-line="123" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/application.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/includes/footer.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="12" column="21" lean-forward="true" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/views/web/user/layouts/includes/header.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="576">
+          <caret line="123" column="21" selection-start-line="123" selection-start-column="21" selection-end-line="123" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/views/user/form.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="91" column="18" lean-forward="true" selection-start-line="91" selection-start-column="18" selection-end-line="91" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2018_09_29_145839_create_user_update_emails_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="18" column="45" lean-forward="true" selection-start-line="18" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2018_09_29_145909_create_countries_table.php">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2018_09_29_170559_create_user_accounts_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="536">
+          <caret line="51" column="33" lean-forward="true" selection-start-line="51" selection-start-column="33" selection-end-line="51" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2018_11_20_174609_create_shoppingcart_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/Services/Yard.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="216" column="28" selection-start-line="216" selection-start-column="20" selection-end-line="216" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2018_10_21_164001_create_products_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="490">
+          <caret line="37" column="49" lean-forward="true" selection-start-line="37" selection-start-column="49" selection-end-line="37" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/Services/Payone.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="396">
+          <caret line="65" selection-start-line="65" selection-end-line="65" />
+          <folding>
+            <element signature="e#6#1055#0#PHP" expanded="true" />
+            <element signature="e#1116#1130#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="456">
+          <caret line="435" column="40" selection-start-line="435" selection-start-column="40" selection-end-line="435" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Checkout.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="700">
+          <caret line="50" selection-start-line="50" selection-end-line="50" />
+          <folding>
+            <element signature="e#39#71#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/config/payone.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="140">
@@ -1040,57 +1038,109 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Http/Middleware/Checkout.php">
+    <entry file="file://$PROJECT_DIR$/database/migrations/2019_02_21_195012_create_shopping_instances_table.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="630">
-          <caret line="45" selection-start-line="45" selection-end-line="45" />
-          <folding>
-            <element signature="e#39#71#0#PHP" expanded="true" />
-          </folding>
+        <state relative-caret-position="462">
+          <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Services/Payone.php">
+    <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_21_173306_create_user_shop_on_sites_table.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="70" selection-start-line="70" selection-end-line="70" />
-          <folding>
-            <element signature="e#6#1055#0#PHP" expanded="true" />
-            <element signature="e#1116#1130#0#PHP" expanded="true" />
-          </folding>
+        <state relative-caret-position="252">
+          <caret line="20" column="51" selection-start-line="20" selection-end-line="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/routes/web.php">
+    <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_06_004907_create_shipping_countries_table.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="743">
-          <caret line="245" selection-start-line="245" selection-end-line="245" />
+        <state relative-caret-position="420">
+          <caret line="32" column="5" selection-start-line="32" selection-start-column="5" selection-end-line="32" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_06_004849_create_shipping_prices_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="504">
+          <caret line="38" selection-start-line="38" selection-end-line="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_03_162833_create_user_shops_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="37" column="51" selection-start-line="37" selection-start-column="51" selection-end-line="37" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2018_10_21_164005_create_product_categories_table.php">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2018_10_21_164007_create_product_images_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="154">
+          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2019_01_06_004815_create_shippings_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="23" column="54" selection-start-line="23" selection-end-line="24" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Web/CheckoutController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="800">
-          <caret line="77" column="47" lean-forward="true" selection-start-line="77" selection-start-column="47" selection-end-line="77" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/resources/views/web/templates/checkout.blade.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="589">
-          <caret line="401" column="134" selection-start-line="401" selection-start-column="134" selection-end-line="401" selection-end-column="152" />
+        <state relative-caret-position="1204">
+          <caret line="92" column="14" selection-start-line="92" selection-start-column="14" selection-end-line="92" selection-end-column="14" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/Http/Controllers/Pay/PayoneController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="562">
-          <caret line="154" column="5" lean-forward="true" selection-start-line="154" selection-start-column="5" selection-end-line="154" selection-end-column="5" />
+        <state relative-caret-position="680">
+          <caret line="58" column="32" selection-start-line="58" selection-start-column="25" selection-end-line="58" selection-end-column="32" />
           <folding>
             <element signature="e#44#80#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2019_02_23_163527_create_shopping_orders_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="476">
+          <caret line="36" selection-start-line="33" selection-start-column="9" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2019_02_23_161530_create_shopping_users_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="329">
+          <caret line="26" column="58" selection-start-line="26" selection-end-line="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="31" column="41" selection-start-line="31" selection-start-column="41" selection-end-line="31" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2019_02_23_163832_create_shopping_payments_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="280">
+          <caret line="22" column="54" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="67" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/database/migrations/2019_02_25_090014_create_payment_transactions_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/Http/Controllers/Pay/PayoneController.php b/app/Http/Controllers/Pay/PayoneController.php
index 5062397..22f554f 100644
--- a/app/Http/Controllers/Pay/PayoneController.php
+++ b/app/Http/Controllers/Pay/PayoneController.php
@@ -24,6 +24,12 @@ fnc Financing
 class PayoneController extends Controller
 {
 
+    const PREAUTHORIZATION = 'preauthorization';
+    const AUTHORIZATION = 'authorization';
+    const CAPTURE = 'capture';
+    const REFUND = 'refund';
+    const DEBIT = 'debit';
+
 
     private $default = [];
 
@@ -38,6 +44,7 @@ class PayoneController extends Controller
     private $url = [];
 
 
+
     public function __construct($payment_method = null) {
 
         if($payment_method){
@@ -182,7 +189,8 @@ class PayoneController extends Controller
 
         //cc
 
-
+        var_dump($response);
+        die();
         if ($response["status"] == "REDIRECT") { // this happens when the card needs a 3d secure verification
             header("Location: " . $response["redirecturl"]); // or other redirect method
         } elseif ($response["status"] == "APPROVED") { // no 3d secure verification required, transaction went through
diff --git a/app/Http/Controllers/Web/CheckoutController.php b/app/Http/Controllers/Web/CheckoutController.php
index 41538e4..9136099 100755
--- a/app/Http/Controllers/Web/CheckoutController.php
+++ b/app/Http/Controllers/Web/CheckoutController.php
@@ -50,6 +50,7 @@ class CheckoutController extends Controller
             'billing.zipcode'=>'required',
             'billing.city' => 'required',
             'accepted_data_checkbox' => 'accepted',
+            'billing.salutation => 'required'
         );
 
         if(!Input::get('shipping.same_as_billing')){
@@ -59,6 +60,8 @@ class CheckoutController extends Controller
                 'shipping.address'=>'required',
                 'shipping.zipcode'=>'required',
                 'shipping.city' => 'required',
+                'shipping.salutation => 'required'
+
             ]);
         }
         $validator = Validator::make(Input::all(), $rules);
@@ -83,17 +86,19 @@ class CheckoutController extends Controller
 
     public function transactionStatus($check){
 
-        if($check == "cancel"){
-            \Session::flash('checkout-error', 'Der Zahlungsvorgang wurde abgebrochen, die Bestellung konnte nicht ausgeführt werden.');
-            return $this->checkout();
-        }
-        $pay = new PayoneController([]);
-        $pay->checkStatus();
         $data = \Request::all();
         var_dump($data);
         $data = \Input::all();
         var_dump($data);
         die();
+        if($check == "cancel"){
+
+            \Session::flash('checkout-error', 'Der Zahlungsvorgang wurde abgebrochen, die Bestellung konnte nicht ausgeführt werden.');
+            return $this->checkout();
+        }
+        $pay = new PayoneController([]);
+        $pay->checkStatus();
+
     }
 
     public function removeCard($rowId){
diff --git a/app/Models/PaymentTransaction.php b/app/Models/PaymentTransaction.php
new file mode 100644
index 0000000..fa9e9f7
--- /dev/null
+++ b/app/Models/PaymentTransaction.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class PaymentTransaction extends Model
+{
+    //
+}
diff --git a/app/Models/ShoppingOrder.php b/app/Models/ShoppingOrder.php
new file mode 100644
index 0000000..8a5dfbd
--- /dev/null
+++ b/app/Models/ShoppingOrder.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ShoppingOrder extends Model
+{
+    //
+}
diff --git a/app/Models/ShoppingOrderItem.php b/app/Models/ShoppingOrderItem.php
new file mode 100644
index 0000000..b05d823
--- /dev/null
+++ b/app/Models/ShoppingOrderItem.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ShoppingOrderItem extends Model
+{
+    //
+}
diff --git a/app/Models/ShoppingPayment.php b/app/Models/ShoppingPayment.php
new file mode 100644
index 0000000..6c37d98
--- /dev/null
+++ b/app/Models/ShoppingPayment.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ShoppingPayment extends Model
+{
+    //
+}
diff --git a/app/Models/ShoppingUser.php b/app/Models/ShoppingUser.php
new file mode 100644
index 0000000..116dd18
--- /dev/null
+++ b/app/Models/ShoppingUser.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ShoppingUser extends Model
+{
+    //
+}
diff --git a/database/migrations/2019_02_23_161530_create_shopping_users_table.php b/database/migrations/2019_02_23_161530_create_shopping_users_table.php
new file mode 100644
index 0000000..568bbd7
--- /dev/null
+++ b/database/migrations/2019_02_23_161530_create_shopping_users_table.php
@@ -0,0 +1,66 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateShoppingUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('shopping_users', function (Blueprint $table) {
+            $table->increments('id');
+
+            $table->char('billing_salutation', 2)->nullable();
+            $table->string('billing_company')->nullable();
+            $table->string('billing_firstname')->nullable();
+            $table->string('billing_lastname')->nullable();
+            $table->string('billing_address')->nullable();
+            $table->string('billing_address_2')->nullable();
+            $table->string('billing_zipcode')->nullable();
+            $table->string('billing_city')->nullable();
+            $table->unsignedInteger('billing_country_id');
+            $table->string('billing_phone')->nullable();
+            $table->string('billing_email')->nullable();
+
+            $table->boolean('same_as_billing')->default(true);
+
+            $table->char('shipping_salutation', 2)->nullable();
+            $table->string('shipping_company')->nullable();
+            $table->string('shipping_firstname')->nullable();
+            $table->string('shipping_lastname')->nullable();
+            $table->string('shipping_address')->nullable();
+            $table->string('shipping_address_2')->nullable();
+            $table->string('shipping_zipcode')->nullable();
+            $table->string('shipping_city')->nullable();
+            $table->unsignedInteger('shipping_country_id');
+            $table->string('shipping_phone')->nullable();
+
+            $table->timestamps();
+
+            $table->foreign('billing_country_id')
+                ->references('id')
+                ->on('countries');
+
+            $table->foreign('shipping_country_id')
+                ->references('id')
+                ->on('countries');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('shopping_users');
+    }
+}
diff --git a/database/migrations/2019_02_23_163527_create_shopping_orders_table.php b/database/migrations/2019_02_23_163527_create_shopping_orders_table.php
new file mode 100644
index 0000000..2ec8cbd
--- /dev/null
+++ b/database/migrations/2019_02_23_163527_create_shopping_orders_table.php
@@ -0,0 +1,58 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateShoppingOrdersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('shopping_orders', function (Blueprint $table) {
+            $table->increments('id');
+
+            $table->unsignedInteger('shopping_user_id');
+            $table->unsignedInteger('country_id');
+            $table->unsignedInteger('user_shop_id');
+
+            $table->decimal('total', 13, 2)->nullable();
+            $table->decimal('shipping', 8, 2)->nullable();
+            $table->decimal('subtotal', 13, 2)->nullable();
+            $table->decimal('tax_rate', 5, 2)->nullable();
+            $table->decimal('tax', 8, 2)->nullable();
+            $table->decimal('total_shipping', 13, 2)->nullable();
+
+            $table->unsignedInteger('weight')->nullable();
+
+            $table->timestamps();
+
+            $table->foreign('shopping_user_id')
+                ->references('id')
+                ->on('shopping_users');
+
+
+            $table->foreign('country_id')
+                ->references('id')
+                ->on('countries');
+
+            $table->foreign('user_shop_id')
+                ->references('id')
+                ->on('user_shops');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('shopping_orders');
+    }
+}
diff --git a/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php b/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php
new file mode 100644
index 0000000..bea89c7
--- /dev/null
+++ b/database/migrations/2019_02_23_163724_create_shopping_order_items_table.php
@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateShoppingOrderItemsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('shopping_order_items', function (Blueprint $table) {
+            $table->increments('id');
+
+            $table->unsignedInteger('shopping_order_id');
+            $table->unsignedInteger('product_id');
+            $table->decimal('price', 8, 2)->nullable();
+            $table->string('slug')->nullable();
+
+            $table->boolean('paid')->default(false);
+
+            $table->timestamps();
+
+            $table->foreign('shopping_order_id')
+                ->references('id')
+                ->on('shopping_orders');
+
+            $table->foreign('product_id')
+                ->references('id')
+                ->on('products');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('shopping_order_items');
+    }
+}
diff --git a/database/migrations/2019_02_23_163832_create_shopping_payments_table.php b/database/migrations/2019_02_23_163832_create_shopping_payments_table.php
new file mode 100644
index 0000000..646b7d0
--- /dev/null
+++ b/database/migrations/2019_02_23_163832_create_shopping_payments_table.php
@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateShoppingPaymentsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('shopping_payments', function (Blueprint $table) {
+            $table->increments('id');
+
+            $table->unsignedInteger('shopping_order_id');
+
+            $table->string('clearingtype',3);
+            $table->string('wallettype', 3)->nullable();
+            $table->string('onlinebanktransfertype',3)->nullable();
+
+            $table->string('reference', 20);
+            $table->unsignedInteger('amount');
+            $table->string('currency', 6);
+
+
+            $table->timestamps();
+
+            $table->foreign('shopping_order_id')
+                   ->references('id')
+                   ->on('shopping_orders');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('shopping_payments');
+    }
+}
diff --git a/database/migrations/2019_02_25_090014_create_payment_transactions_table.php b/database/migrations/2019_02_25_090014_create_payment_transactions_table.php
new file mode 100644
index 0000000..3a01103
--- /dev/null
+++ b/database/migrations/2019_02_25_090014_create_payment_transactions_table.php
@@ -0,0 +1,56 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePaymentTransactionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('payment_transactions', function (Blueprint $table) {
+            $table->increments('id');
+
+            $table->unsignedInteger('shopping_payment_id');
+
+            $table->string('request',20);
+            $table->unsignedInteger('txid');
+            $table->unsignedInteger('userid');
+
+            $table->string('status',20)->nullable();;
+
+
+            $table->string('key',40)->nullable();;
+            $table->string('txaction',20)->nullable();;
+
+            $table->text('transmitted_data')->nullable();;
+
+            $table->unsignedInteger('errorcode')->nullable();;
+            $table->string('errormessage')->nullable();;
+            $table->string('customermessage')->nullable();;
+
+
+            $table->timestamps();
+
+            $table->foreign('shopping_payment_id')
+                ->references('id')
+                ->on('shopping_payments');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('payment_transactions');
+    }
+}
diff --git a/resources/views/web/templates/checkout.blade.php b/resources/views/web/templates/checkout.blade.php
index 27c4472..ed352dd 100644
--- a/resources/views/web/templates/checkout.blade.php
+++ b/resources/views/web/templates/checkout.blade.php
@@ -85,6 +85,12 @@
             }
         }
 
+
+
+        .error .select2-selection {
+            border: #bf6464 2px dashed;
+        }
+
     </style>
     <!-- -->
     <!-- CART -->
@@ -151,6 +157,19 @@
                             </div>
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="col-md-12 col-sm-12">
+                            <div class="form-group {{($errors->has('billing.salutation') ? 'error' : '')}}">
+                                <label class="mt-0 fs-14 fw-400" for="billing_salutation">Anrede *</label>
+                                <select id="billing_salutation" name="billing[salutation]" class="form-control  select2">
+                                    {!!  HTMLHelper::getSalutation(1) !!}
+                                </select>
+                                @if ($errors->has('billing.salutation'))
+                                    <label for="billing_salutation" class="error text-danger small" style="display: block;">{{ $errors->first('billing.salutation') }}</label>
+                                @endif
+                            </div>
+                        </div>
+                    </div>
                     <div class="row">
                         <div class="col-md-6 col-sm-6">
                             <div class="form-group">
@@ -208,15 +227,14 @@
                                 <label for="billing_city" class="error text-danger small" style="display: block;">{{ $errors->first('billing.city') }}</label>
                             @endif
                         </div>
-
                     </div>
-
                     <div class="row">
                         <div class="col-md-12 col-sm-12">
                             <label class="mt-0 fs-14 fw-400" for="billing_state">Land *</label>
                             <select id="billing_state" name="billing[state]" class="form-control select2 required" disabled="true">
                                 {!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
                             </select>
+                            <input type="hidden" name="billing[country_id]" value="{{Yard::instance('shopping')->getShippingCountryId()}}">
                         </div>
                     </div>
 
@@ -284,6 +302,18 @@
                             </div>
                         </div>
 
+                        <div class="row">
+                            <div class="col-md-12 col-sm-12">
+                                <label class="mt-0 fs-14 fw-400" for="shipping_salutation">Anrede *</label>
+                                <select id="shipping_salutation" name="shipping[salutation]" class="form-control select2">
+                                    {!!  HTMLHelper::getSalutation(1) !!}
+                                </select>
+                                @if ($errors->has('shipping.firstname'))
+                                    <label for="shipping_salutation" class="error text-danger small" style="display: block;">{{ $errors->first('shipping.salutation') }}</label>
+                                @endif
+                            </div>
+                        </div>
+
                         <div class="row">
                             <div class="col-md-6 col-sm-6">
                                 <div class="form-group">
@@ -350,6 +380,7 @@
                                 <select id="shipping_state" name="shipping[state]" class="form-control select2 required" disabled="true">
                                     {!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
                                 </select>
+                                <input type="hidden" name="shipping[country_id]" value="{{Yard::instance('shopping')->getShippingCountryId()}}">
                             </div>
                         </div>
 
@@ -396,24 +427,26 @@
                                             <i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Visa oder MasterCard (inkl. Maestro)</span>
                                         </label>
                                     </div>
-                                    <div class="col-lg-12 nomargin clearfix">
+                                   {{--  <div class="col-lg-12 nomargin clearfix">
                                         <label class="mt-0 fs-14 fw-400 radio pull-left">
                                             <input name="payment_method" type="radio" value="sb#GPY" />
                                             <i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> giropay - Online-Überweisung</span>
                                         </label>
                                     </div>
+                                    --}}
                                     <div class="col-lg-12 nomargin clearfix">
                                         <label class="mt-0 fs-14 fw-400 radio pull-left">
                                             <input name="payment_method" type="radio" value="sb#PNT" />
                                             <i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Sofort - Online-Überweisung</span>
                                         </label>
                                     </div>
-                                    <div class="col-lg-12 nomargin clearfix">
+                                   {{-- <div class="col-lg-12 nomargin clearfix">
                                         <label class="mt-0 fs-14 fw-400 radio pull-left">
-                                            <input name="payment_method" type="radio" value="wlt#PSC" />
+                                            <input name="payment_method" type="radio" value="wlt#PDT" />
                                             <i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> paydirekt </span>
                                         </label>
                                     </div>
+                                     --}}
                                     <div class="col-lg-12 nomargin clearfix">
                                         <label class="mt-0 fs-14 fw-400 radio pull-left">
                                             <input name="payment_method" type="radio" value="fnc" />
diff --git a/resources/views/web/templates/produkte-item.blade.php b/resources/views/web/templates/produkte-item.blade.php
index 5bf54d9..26230a9 100644
--- a/resources/views/web/templates/produkte-item.blade.php
+++ b/resources/views/web/templates/produkte-item.blade.php
@@ -46,16 +46,33 @@
                                     </div>
                                     <!-- buttons -->
                                     <div class="shop-item-buttons text-left">
-                                        <a href="{{ route(Util::getPostRoute().'card_add_get', Util::addRoute([$product->id, 1, $product->slug])) }}"
-                                           data-quantity="1" data-product_id="{{ $product->id }}"
-                                           aria-label="{{ $product->getLang('name')  }} zu deinem Warenkorb hinzufügen"
-                                           class="btn btn-primary btn-xs btn-text-500 faa-parent animated-hover" rel="nofollow">
-                                            <i class="fa fa-cart-plus faa-horizontal"></i> In den Warenkorb
-                                        </a>
-                                        <a class="float-right btn btn-primary btn-xs btn-text-500 faa-parent animated-hover"
-                                           href="{{ url('/produkte/'.$subsite.'/'.$product->slug) }}">
-                                            <i class="fa fa-list faa-horizonta"></i> Details
-                                        </a>
+
+                                        <div class="hidden visible-xs visible-sm visible-md clearfix text-center">
+
+                                            <a href="{{ route(Util::getPostRoute().'card_add_get', Util::addRoute([$product->id, 1, $product->slug])) }}"
+                                               data-quantity="1" data-product_id="{{ $product->id }}"
+                                               aria-label="{{ $product->getLang('name')  }} zu deinem Warenkorb hinzufügen"
+                                               class="btn btn-primary btn-xs btn-text-500 faa-parent animated-hover" rel="nofollow">
+                                                <i class="fa fa-cart-plus faa-horizontal"></i> In den Warenkorb
+                                            </a>
+                                            <a class="mt-2 btn btn-primary btn-xs btn-text-500 faa-parent animated-hover"
+                                               href="{{ url('/produkte/'.$subsite.'/'.$product->slug) }}">
+                                                <i class="fa fa-list faa-horizonta"></i> Details
+                                            </a>
+                                        </div>
+                                        <div class="hidden visible-lg text-left">
+                                            <a href="{{ route(Util::getPostRoute().'card_add_get', Util::addRoute([$product->id, 1, $product->slug])) }}"
+                                               data-quantity="1" data-product_id="{{ $product->id }}"
+                                               aria-label="{{ $product->getLang('name')  }} zu deinem Warenkorb hinzufügen"
+                                               class="btn btn-primary btn-xs btn-text-500 faa-parent animated-hover" rel="nofollow">
+                                                <i class="fa fa-cart-plus faa-horizontal"></i> In den Warenkorb
+                                            </a>
+                                            <a class="float-right btn btn-primary btn-xs btn-text-500 faa-parent animated-hover"
+                                               href="{{ url('/produkte/'.$subsite.'/'.$product->slug) }}">
+                                                <i class="fa fa-list faa-horizonta"></i> Details
+                                            </a>
+                                        </div>
+
                                     </div>
                                     @else
                                         <div class="shop-item-buttons text-center">