promotion 1.0

app/Http/Controllers/User/CheckoutController.php

@@ -106,7 +106,6 @@ class CheckoutController extends Controller
             $shopping_user->billing_state = Shop::getCountryShippingCountryId($shopping_user->billing_country_id);
             $shopping_user->shipping_state = Shop::getCountryShippingCountryId($shopping_user->shipping_country_id);
             $shopping_user->same_as_billing = $shopping_user->same_as_billing ? false : true; //reinvert
-
         }
         if($shopping_user->same_as_billing === NULL){
             $shopping_user->same_as_billing = false;
@@ -518,6 +517,7 @@ class CheckoutController extends Controller
             $this->putPayments('shopping_order_margin_id', $shopping_order_margin->id);
         }
     }
+
     private function putPayments($key, $value){
         $content = $this->getContent();
         $content->put($key, $value);
@@ -581,8 +581,6 @@ class CheckoutController extends Controller
             ];
             Payment::paymentStatusSendMail($shopping_order, $shopping_payment, $data);
         }
-   
-
     }
 
 }

app/Http/Controllers/User/PaymentController.php

@@ -45,10 +45,12 @@ class PaymentController extends Controller
             ->addColumn('message', function (UserPayCredit $user_pay_credit) {
                 if($user_pay_credit->status === 3){
                     return nl2br($user_pay_credit->message);
+                }elseif($user_pay_credit->status === 5 || $user_pay_credit->status === 6){
+                    return trans('payment.'.$user_pay_credit->message).
+                    ' &nbsp; <a class="btn btn-outline-secondary btn-xs" href="'.route('user_sales_order_detail', [$user_pay_credit->shopping_order_id]).'"><i class="ion ion-md-eye"></i></a>';
                 }else{
                     return trans('payment.'.$user_pay_credit->message).
                     ' &nbsp; <a class="btn btn-outline-secondary btn-xs" href="'.route('user_order_detail', [$user_pay_credit->shopping_order_id]).'"><i class="ion ion-md-eye"></i></a>';
-
                 }
             })
             ->addColumn('credit', function (UserPayCredit $user_pay_credit) {

app/Http/Controllers/User/PromotionController.php

@@ -38,7 +38,10 @@ class PromotionController extends Controller
         if($user_promotion->user_id != Auth::user()->id){
             abort(404);
         }
-        $user_promotion->about_you = !$user_promotion->about_you ? $user_promotion->user->account->about_you : $user_promotion->about_you;
+
+        $user_promotion->description = $user_promotion->description ? $user_promotion->description : $user_promotion->promotion_admin->user_description;
+        $about_you = $user_promotion->user->account->about_you ?$user_promotion->user->account->about_you : $user_promotion->promotion_admin->user_about;
+        $user_promotion->about_you = $user_promotion->about_you ? $user_promotion->about_you : $about_you;
         $data = [
             'checkPaymentCredit' => $user_promotion->checkPaymentCredit(),
             'user_promotion_cart' => PromotionUser::preCalculateCart($user_promotion, 'user_promotion'),
@@ -66,7 +69,6 @@ class PromotionController extends Controller
                 return redirect(route('user_promotion_detail', [$id]))->withErrors($validator)->withInput(Request::all());
             }
             $model = $this->promoRepo->update($id, Request::all());
-
         }
         \Session()->flash('alert-save', true);
         return redirect(route('user_promotion_detail', [$model->id]));

app/Http/Controllers/User/SalesController.php

@@ -0,0 +1,84 @@
+<?php
+
+
+namespace App\Http\Controllers\User;
+use App\Http\Controllers\Controller;
+use App\Models\ShoppingOrder;
+use App\Services\Payment;
+use App\User;
+
+
+class SalesController extends Controller
+{
+
+    public function __construct()
+    {
+        $this->middleware('active.account');
+    }
+
+    public function orders()
+    {
+        $data = [
+        ];
+        return view('user.sales.orders', $data);
+    }
+
+    public function orderDetail($id)
+    {
+        $user = User::find(\Auth::user()->id);
+        $shopping_order = ShoppingOrder::findOrFail($id);
+        if($shopping_order->member_id !== $user->id){
+            abort(404);
+        }
+        $data = [
+             'shopping_order' => $shopping_order,
+             'isAdmin' => false,
+        ];
+        return view('user.sales.order_detail', $data);
+    }
+
+    public function ordersDatatable(){
+
+        $user = User::find(\Auth::user()->id);
+        $query = ShoppingOrder::with('shopping_user')->select('shopping_orders.*')->where('shopping_orders.member_id', $user->id);
+
+        return \DataTables::eloquent($query)
+            ->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
+                return '<a href="' . route('user_sales_order_detail', [$ShoppingOrder->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
+            })
+            ->addColumn('created_at', function (ShoppingOrder $ShoppingOrder) {
+                return $ShoppingOrder->created_at->format("d.m.Y");
+            })
+            ->addColumn('txaction', function (ShoppingOrder $ShoppingOrder) {
+                return Payment::getShoppingOrderBadge($ShoppingOrder);
+            })
+            ->addColumn('total_shipping', function (ShoppingOrder $ShoppingOrder) {
+                return $ShoppingOrder->getFormattedTotalShipping();
+            })
+            ->addColumn('orders', function (ShoppingOrder $ShoppingOrder) {
+                return $ShoppingOrder->shopping_user ? $ShoppingOrder->shopping_user->orders : '';
+            })
+            ->addColumn('user_shop_id', function (ShoppingOrder $ShoppingOrder) {
+                return $ShoppingOrder->user_shop ? '<a href="'.$ShoppingOrder->user_shop->getSubdomain(false).'" target="_blank">'.$ShoppingOrder->user_shop->getSubdomain(false).'</span>' : '';
+            })
+            ->addColumn('is_for', function (ShoppingOrder $ShoppingOrder) {
+                if($ShoppingOrder->shopping_user->is_for === 'me'){
+                    return '<span class="badge badge-pill badge-secondary">Vertriebspartnerbestellung</span>';
+                }
+                if($ShoppingOrder->shopping_user->is_for === 'ot'){
+                    return '<span class="badge badge-pill badge-info">Kundenbestellung</span>';
+                }
+                if($ShoppingOrder->shopping_user->is_for === 'pr'){
+                    return '<span class="badge badge-pill badge-dark">Promotion</span>';
+                }
+                return '-';
+            })
+            ->orderColumn('id', 'id $1')
+            ->orderColumn('txaction', 'txaction $1')
+            ->rawColumns(['id', 'is_for', 'txaction', 'user_shop_id'])
+            ->make(true);
+    }
+
+
+
+}

app/Http/Controllers/User/ShopSalesController.php

@@ -8,7 +8,7 @@ use App\Services\Payment;
 use App\User;
 
 
-class ShopSalesController extends Controller
+class SalesController extends Controller
 {
 
     public function __construct()