#53, #52, #51 change Points

app/Http/Controllers/BusinessPointsController.php

@@ -0,0 +1,130 @@
+<?php
+
+
+namespace App\Http\Controllers;
+use Carbon;
+use Request;
+use App\Services\Payment;
+use App\Models\UserInvoice;
+use App\Services\HTMLHelper;
+
+class BusinessPointsController extends Controller
+{
+
+    private $startYear;
+    private $endYear;
+    private $rangeYears;
+    private $activeYear;
+
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function index()
+    {
+       
+        $this->setFilterVars();
+        $data = [
+            'filter_months' => HTMLHelper::$months,
+            'filter_years' => HTMLHelper::getYearRange(),
+        ];
+        return view('admin.payment.invoice', $data);
+    }
+
+    private function setFilterVars(){
+
+        if(!session('invoice_filter_month')){
+            session(['invoice_filter_month' => intval(date('m'))]);
+        }
+        if(!session('invoice_filter_year')){
+            session(['invoice_filter_year' => intval(date('Y'))]);
+        }
+        if(Request::get('invoice_filter_name')){
+            session(['invoice_filter_name' => Request::get('invoice_filter_name')]);
+        }
+        if(Request::get('invoice_filter_month')){
+            session(['invoice_filter_month' => Request::get('invoice_filter_month')]);
+        }
+        if(Request::get('invoice_filter_year')){
+            session(['invoice_filter_year' => Request::get('invoice_filter_year')]);
+        }
+    }
+
+    private function initSearch($archive = false, $request = true)
+    {
+        $this->setFilterVars();
+    
+        $query = UserInvoice::with('shopping_order')->with('shopping_order.shopping_user')->select('user_invoices.*')
+        ->where('user_invoices.month', '=', Request::get('invoice_filter_month'))
+        ->where('user_invoices.year', '=', Request::get('invoice_filter_year'));
+
+        if(Request::get('invoice_filter_name')){
+            $query->where('shopping_order.shopping_user.billing_firstname', 'LIKE', '%'.Request::get('invoice_filter_name').'%');
+            $query->where('shopping_order.shopping_user.billing_lastname', 'LIKE', '%'.Request::get('invoice_filter_name').'%');
+            $query->where('shopping_order.shopping_user.billing_email', 'LIKE', '%'.Request::get('invoice_filter_name').'%');
+        }
+
+        //->orderBy('created_at', 'DESC');
+       /* $query = FlexHour::leftJoin("flex_hour_items", function($join) {
+            $join->on("flex_hour_items.flex_hour_id","=","flex_hours.id");
+            $join->where("flex_hour_items.date","=", FlexHourItemBot::$date);
+        })*/
+        return $query;
+    }
+
+    public function datatable(){
+
+        $query = $this->initSearch();
+        return \DataTables::eloquent($query)
+            ->addColumn('id', function (UserInvoice $UserInvoice) {
+                if($UserInvoice->shopping_order->auth_user_id){
+                    return '<a href="' . route('admin_sales_users_detail', [$UserInvoice->shopping_order->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
+                }
+                return '<a href="' . route('admin_sales_customers_detail', [$UserInvoice->shopping_order->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
+
+            })
+            ->addColumn('total_shipping', function (UserInvoice $UserInvoice) {
+                return '<span class="no-line-break">'.$UserInvoice->shopping_order->getFormattedTotalShipping()." €</span>";
+            })
+            ->addColumn('created_at', function (UserInvoice $UserInvoice) {
+                return $UserInvoice->created_at->format("d.m.Y");
+            })
+            /*
+            ->addColumn('shipping_order', function (UserInvoice $UserInvoice) {
+                $ret = "";
+                foreach($UserInvoice->shopping_order_items as $shopping_order_item){
+                    $ret .= $shopping_order_item->product->name."<br>"; 
+                }
+                return $ret;
+            })
+            */
+            ->addColumn('txaction', function (UserInvoice $UserInvoice) {
+                if($UserInvoice->shopping_order){
+                    return Payment::getShoppingOrderBadge($UserInvoice->shopping_order);
+                }
+                return "-";
+            })
+            ->addColumn('status', function (UserInvoice $UserInvoice) {
+                return '<a href="#" data-toggle="modal" data-target="#modals-load-content" data-modal="modal-lg"
+                data-id="'.$UserInvoice->id.'" data-route="'.route('modal_load').'" data-action="user-credit-status" data-view="">
+                <span class="badge  badge-pill badge-'.$UserInvoice->getStatusColor().'">'.$UserInvoice->getStatusType().'</span>
+                    </a>';
+            })
+            ->addColumn('invoice', function (UserInvoice $UserInvoice) {
+                $ret = "";
+                $ret .= '<a href="'.route('storage_file', [$UserInvoice->shopping_order->id, 'invoice', 'download']).'" class="btn btn-primary btn-xs"><i class="fa fa-download"></i></a> ';
+                $ret .= '<a href="'.route('storage_file', [$UserInvoice->shopping_order->id, 'invoice', 'stream']).'" target="_blank" class="btn btn-warning btn-xs"><i class="fa fa-eye"></i></a>';
+              
+                return $ret;
+            })
+
+            ->orderColumn('id', 'id $1')
+            ->orderColumn('invoice_number', 'invoice_number $1')
+            ->orderColumn('txaction', 'txaction $1')
+            ->orderColumn('shipped', 'shipped $1')
+            ->orderColumn('total_shipping', 'total_shipping $1')
+            ->rawColumns(['id', 'shipping_order', 'txaction', 'total_shipping', 'status', 'txaction', 'invoice'])
+            ->make(true);
+    }
+}

app/Http/Controllers/MembershipController.php

@@ -54,8 +54,8 @@ class MembershipController extends Controller
         
         $data = [
             'user' => $user,
-            'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['4', '5'])->orderBy('pos', 'ASC')->get(),
-            'upgrade' => Product::where('active', true)->whereJsonContains('show_on', '5')->where('identifier', 'upgrade')->get(),
+            'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(),
+            'upgrade' => Product::where('active', true)->whereJsonContains('show_on', '8')->where('identifier', 'upgrade')->get(),
             'diff_months' => $diff_months,
             'userHistoryPaymentOrder' => $userHistoryPaymentOrder,
             'userHistoryUpgradeOrder' => $userHistoryUpgradeOrder,

app/Http/Controllers/ModalController.php

@@ -48,6 +48,11 @@ class ModalController extends Controller
                 }
                 $ret = view("admin.modal.is_like_member", compact('current', 'possibles', 'data'))->render();
             }
+            if($data['action'] === 'shopping-order-change-points'){
+                $value = ShoppingOrder::find($data['id']);
+                $route = route('admin_sales_customers_detail', [$value->id]);
+                $ret = view("admin.modal.change_points", compact('value', 'data', 'route'))->render();
+            }
             if($data['action'] === 'user-order-show-product'){
                 $product = Product::find($data['id']); //current user form order
                 $ret = view("admin.modal.show_product", compact('product', 'data'))->render();
@@ -61,13 +66,24 @@ class ModalController extends Controller
             if($data['action'] === 'shop-user-order-detail'){
                 $user = \Auth::user();       
                 $shopping_order = ShoppingOrder::findOrFail($data['id']);
-                if(!$user->isAdmin() || $shopping_order->member_id !== $user->id){
+                if(!$user->isAdmin() && $shopping_order->member_id !== $user->id){
                     abort(404);
                 }
                 $isAdmin = false ;
                 $ret = view("user.shop.sales.modal_api_order_detail", compact('shopping_order', 'isAdmin', 'data'))->render();
             }
 
+            if($data['action'] === 'shop-user-order-shipping-detail'){
+                $user = \Auth::user();       
+                $shopping_order = ShoppingOrder::findOrFail($data['id']);
+                if(!$user->isAdmin() && $shopping_order->auth_user_id !== $user->id){
+                    abort(404);
+                }
+                $isAdmin = false ;
+                $ret = view("user.shop.sales.modal_api_order_shipping_detail", compact('shopping_order', 'isAdmin', 'data'))->render();
+            }
+
+
             if($data['action'] === 'user-order-my-delivery-show'){
                 $user = \Auth::user();
                 $ret = view("admin.modal.show_user_customers", compact('user', 'data'))->render();

app/Http/Controllers/PaymentPointsController.php

@@ -0,0 +1,130 @@
+<?php
+
+
+namespace App\Http\Controllers;
+use Carbon;
+use Request;
+use App\Services\Payment;
+use App\Models\UserInvoice;
+use App\Services\HTMLHelper;
+
+class PaymentPointsController extends Controller
+{
+
+    private $startYear;
+    private $endYear;
+    private $rangeYears;
+    private $activeYear;
+
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function index()
+    {
+       
+        $this->setFilterVars();
+        $data = [
+            'filter_months' => HTMLHelper::$months,
+            'filter_years' => HTMLHelper::getYearRange(),
+        ];
+        return view('admin.payment.invoice', $data);
+    }
+
+    private function setFilterVars(){
+
+        if(!session('invoice_filter_month')){
+            session(['invoice_filter_month' => intval(date('m'))]);
+        }
+        if(!session('invoice_filter_year')){
+            session(['invoice_filter_year' => intval(date('Y'))]);
+        }
+        if(Request::get('invoice_filter_name')){
+            session(['invoice_filter_name' => Request::get('invoice_filter_name')]);
+        }
+        if(Request::get('invoice_filter_month')){
+            session(['invoice_filter_month' => Request::get('invoice_filter_month')]);
+        }
+        if(Request::get('invoice_filter_year')){
+            session(['invoice_filter_year' => Request::get('invoice_filter_year')]);
+        }
+    }
+
+    private function initSearch($archive = false, $request = true)
+    {
+        $this->setFilterVars();
+    
+        $query = UserInvoice::with('shopping_order')->with('shopping_order.shopping_user')->select('user_invoices.*')
+        ->where('user_invoices.month', '=', Request::get('invoice_filter_month'))
+        ->where('user_invoices.year', '=', Request::get('invoice_filter_year'));
+
+        if(Request::get('invoice_filter_name')){
+            $query->where('shopping_order.shopping_user.billing_firstname', 'LIKE', '%'.Request::get('invoice_filter_name').'%');
+            $query->where('shopping_order.shopping_user.billing_lastname', 'LIKE', '%'.Request::get('invoice_filter_name').'%');
+            $query->where('shopping_order.shopping_user.billing_email', 'LIKE', '%'.Request::get('invoice_filter_name').'%');
+        }
+
+        //->orderBy('created_at', 'DESC');
+       /* $query = FlexHour::leftJoin("flex_hour_items", function($join) {
+            $join->on("flex_hour_items.flex_hour_id","=","flex_hours.id");
+            $join->where("flex_hour_items.date","=", FlexHourItemBot::$date);
+        })*/
+        return $query;
+    }
+
+    public function datatable(){
+
+        $query = $this->initSearch();
+        return \DataTables::eloquent($query)
+            ->addColumn('id', function (UserInvoice $UserInvoice) {
+                if($UserInvoice->shopping_order->auth_user_id){
+                    return '<a href="' . route('admin_sales_users_detail', [$UserInvoice->shopping_order->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
+                }
+                return '<a href="' . route('admin_sales_customers_detail', [$UserInvoice->shopping_order->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
+
+            })
+            ->addColumn('total_shipping', function (UserInvoice $UserInvoice) {
+                return '<span class="no-line-break">'.$UserInvoice->shopping_order->getFormattedTotalShipping()." €</span>";
+            })
+            ->addColumn('created_at', function (UserInvoice $UserInvoice) {
+                return $UserInvoice->created_at->format("d.m.Y");
+            })
+            /*
+            ->addColumn('shipping_order', function (UserInvoice $UserInvoice) {
+                $ret = "";
+                foreach($UserInvoice->shopping_order_items as $shopping_order_item){
+                    $ret .= $shopping_order_item->product->name."<br>"; 
+                }
+                return $ret;
+            })
+            */
+            ->addColumn('txaction', function (UserInvoice $UserInvoice) {
+                if($UserInvoice->shopping_order){
+                    return Payment::getShoppingOrderBadge($UserInvoice->shopping_order);
+                }
+                return "-";
+            })
+            ->addColumn('status', function (UserInvoice $UserInvoice) {
+                return '<a href="#" data-toggle="modal" data-target="#modals-load-content" data-modal="modal-lg"
+                data-id="'.$UserInvoice->id.'" data-route="'.route('modal_load').'" data-action="user-credit-status" data-view="">
+                <span class="badge  badge-pill badge-'.$UserInvoice->getStatusColor().'">'.$UserInvoice->getStatusType().'</span>
+                    </a>';
+            })
+            ->addColumn('invoice', function (UserInvoice $UserInvoice) {
+                $ret = "";
+                $ret .= '<a href="'.route('storage_file', [$UserInvoice->shopping_order->id, 'invoice', 'download']).'" class="btn btn-primary btn-xs"><i class="fa fa-download"></i></a> ';
+                $ret .= '<a href="'.route('storage_file', [$UserInvoice->shopping_order->id, 'invoice', 'stream']).'" target="_blank" class="btn btn-warning btn-xs"><i class="fa fa-eye"></i></a>';
+              
+                return $ret;
+            })
+
+            ->orderColumn('id', 'id $1')
+            ->orderColumn('invoice_number', 'invoice_number $1')
+            ->orderColumn('txaction', 'txaction $1')
+            ->orderColumn('shipped', 'shipped $1')
+            ->orderColumn('total_shipping', 'total_shipping $1')
+            ->rawColumns(['id', 'shipping_order', 'txaction', 'total_shipping', 'status', 'txaction', 'invoice'])
+            ->make(true);
+    }
+}

app/Http/Controllers/SalesController.php

@@ -11,6 +11,7 @@ use App\Models\ShoppingPayment;
 use App\Models\PaymentTransaction;
 use App\Services\CustomerPriority;
 use App\Repositories\InvoiceRepository;
+use App\Services\BusinessPlan\SalesPointsVolume;
 
 class SalesController extends Controller
 {
@@ -33,6 +34,10 @@ class SalesController extends Controller
     public function usersDetail($id)
     {
         $ShoppingOrder = ShoppingOrder::find($id);
+        if( $ShoppingOrder->payment_for === 6 || $ShoppingOrder->payment_for === 7){
+            return redirect(route('admin_sales_customers_detail', [$ShoppingOrder->id]));
+            abort(403, 'Kundenbestellung');
+        }
         if($ShoppingOrder->shipped === 0){
             $ShoppingOrder->shipped = 1;
             $ShoppingOrder->save();
@@ -77,6 +82,15 @@ class SalesController extends Controller
                 return $ShoppingOrder->getLastShoppingPayment('getPaymentType');
             })
             ->addColumn('shipped', function (ShoppingOrder $ShoppingOrder) {
+                if($ShoppingOrder->payment_for === 8){
+                    return '<button type="button" class="btn btn-xs btn-info btn-round" data-toggle="modal" data-target="#modals-load-content"
+                    data-id="'.$ShoppingOrder->id.'"
+                    data-action="shop-user-order-shipping-detail" 
+                    data-back="" 
+                    data-modal="modal-xl" 
+                    data-init_from="user" 
+                    data-route="'.route('modal_load').'"><span class="far fa-eye"></span></button>';   
+                }
                 return '<span class="badge badge-pill badge-'.$ShoppingOrder->getShippedColor().'">'.$ShoppingOrder->getShippedType().'</span>';
             })
             ->addColumn('payment_for', function (ShoppingOrder $ShoppingOrder) {
@@ -118,7 +132,7 @@ class SalesController extends Controller
             set_user_attr('filter_member_id', null);
             return redirect(route('admin_sales_customers'));
         }
-        $filter_user_shops = ShoppingOrder::join('user_shops', 'user_shop_id', '=', 'user_shops.id')->get()->pluck('slug', 'id')->unique()->toArray();
+        $filter_user_shops = ShoppingOrder::join('user_shops', 'user_shop_id', '=', 'user_shops.id')->orderBy('slug')->get()->pluck('slug', 'id')->unique()->toArray();
         $filter_members = ShoppingOrder::join('users', 'member_id', '=', 'users.id')->groupBy('member_id')->join('user_accounts', 'account_id', '=', 'user_accounts.id')->select('users.id', 'users.email', 'user_accounts.first_name', 'user_accounts.last_name')->get(); //->pluck('email', 'id')->unique()->toArray();
         $data = [
             'filter_user_shops' => $filter_user_shops,
@@ -130,6 +144,10 @@ class SalesController extends Controller
     public function customersDetail($id)
     {
         $ShoppingOrder = ShoppingOrder::find($id);
+        if( $ShoppingOrder->payment_for !== 6 && $ShoppingOrder->payment_for !== 7){
+            return redirect(route('admin_sales_users_detail', [$ShoppingOrder->id]));
+            abort(403, 'Beraterbestellung');
+        }
         if($ShoppingOrder->shipped === 0){
             $ShoppingOrder->shipped = 1;
             $ShoppingOrder->save();
@@ -176,6 +194,20 @@ class SalesController extends Controller
                 return redirect($data['back']);
             }
         }
+        if($data['action']==='shopping-order-change-points'){
+            if(!isset($data['change_member_key']) || $data['change_member_key'] !== config('mivita.edit_data_pass')){
+                    \Session()->flash('alert-error', 'Das Passwort ist falsch.');
+                    return back();
+            }else{
+                if(!isset($data['change_points'])){
+                    \Session()->flash('alert-error', 'Keine Änderung ausgewählt');
+                    return back();
+                }
+                $shopping_order = ShoppingOrder::findOrFail($data['id']);
+                SalesPointsVolume::changeSalesPointsVolumeUser($shopping_order, $data['change_member_id']);
+                return redirect(route('admin_sales_customers_detail', [$shopping_order->id]));
+            }
+        }
         $data = [
             'change_member_error' => $change_member_error,
             'shopping_order' => ShoppingOrder::find($id),
@@ -220,6 +252,12 @@ class SalesController extends Controller
                 return '<span class="no-line-break">'.$ShoppingOrder->getFormattedTotalShipping()." €</span>";
             })
             ->addColumn('payment', function (ShoppingOrder $ShoppingOrder) {
+                if($ShoppingOrder->txaction === 'extern_paid'){
+                    $shopping_oder_id = isset($ShoppingOrder->api_notice['shopping_order_id']) ? $ShoppingOrder->api_notice['shopping_order_id'] : null;
+                    if($shopping_oder_id){
+                        return '<a class="btn btn-xs btn-default btn-round" href="'.route('admin_sales_users_detail', [$shopping_oder_id]).'"><i class="fa fa-check fa-check-circle-o"> '.$shopping_oder_id.'</a>';
+                    }
+                }
                 return $ShoppingOrder->getLastShoppingPayment('getPaymentType');
             })
             ->addColumn('shipped', function (ShoppingOrder $ShoppingOrder) {
@@ -229,7 +267,7 @@ class SalesController extends Controller
                 return '<span class="badge badge-pill badge-'.$ShoppingOrder->getPaymentForColor().'">'.$ShoppingOrder->getPaymentForType().'</span>';
             })
             ->addColumn('invoice', function (ShoppingOrder $ShoppingOrder) {
-            if($ShoppingOrder->txaction === 'extern' && $ShoppingOrder->wp_invoice_path){
+            if(($ShoppingOrder->txaction === 'extern' || $ShoppingOrder->txaction === 'extern_paid') && $ShoppingOrder->wp_invoice_path){
                 return '<span class="no-line-break"><a href="'.$ShoppingOrder->wp_invoice_path.'" class="btn btn-secondary btn-xs"><i class="fa fa-external-link-alt"></i> <i class="fa fa-download"></i></a> </div>';
             }
                 return $ShoppingOrder->isInvoice() ? '<span class="no-line-break"><a href="'.route('storage_file', [$ShoppingOrder->id, 'invoice', 'download']).'" class="btn btn-primary btn-xs"><i class="fa fa-download"></i></a> 
@@ -264,7 +302,7 @@ class SalesController extends Controller
             ->orderColumn('shipped', 'shipped $1')
             ->orderColumn('payment_for', 'payment_for $1')
             ->orderColumn('total_shipping', 'total_shipping $1')
-            ->rawColumns(['id', 'member_id', 'txaction', 'user_shop_id', 'payment_for', 'total_shipping', 'invoice', 'shipped'])
+            ->rawColumns(['id', 'member_id', 'txaction', 'user_shop_id', 'payment_for', 'payment', 'total_shipping', 'invoice', 'shipped'])
             ->make(true);
     }
 

app/Http/Controllers/SyS/SysController.php

@@ -10,6 +10,7 @@ use App\Services\SyS\Cronjobs;
 use App\Services\SyS\Customers;
 use App\Services\SyS\DomainSSL;
 use App\Http\Controllers\Controller;
+use App\Models\UserSalesVolume;
 use App\Services\SyS\Correction;
 use App\Services\SyS\ShoppingOrders;
 
@@ -25,6 +26,21 @@ class SysController extends Controller
 
     public function index()
     { 
+        $UserSalesVolumes =UserSalesVolume::all();
+
+        foreach($UserSalesVolumes as $UserSalesVolume){
+            if($UserSalesVolume->shopping_order->member_id !== NULL && $UserSalesVolume->user_id !== $UserSalesVolume->shopping_order->member_id){
+                if($UserSalesVolume->shopping_order->member_id !== 6){
+                    dump($UserSalesVolume->shopping_order_id);
+                    dump($UserSalesVolume->shopping_order->member_id);
+                    dump($UserSalesVolume->user_id);
+    
+                    dump("##");
+                }
+          
+            }
+        }
+        dd("ebd");
         return view('sys.index');
     }
 

app/Http/Controllers/User/HomepartyController.php

@@ -564,7 +564,7 @@ class HomepartyController extends Controller
 
     public function datatable($homeparty_id){
 
-        $query = Product::select('products.*')->where('active', true)->whereJsonContains('show_on', '3');
+        $query = Product::select('products.*')->where('active', true)->whereJsonContains('show_on', '4');
         $homeparty = Homeparty::findOrFail($homeparty_id);
 
         return \DataTables::eloquent($query)

app/Http/Controllers/User/OrderController.php

@@ -43,6 +43,10 @@ class OrderController extends Controller
         if($shopping_order->auth_user_id !== $user->id){
             abort(404);
         }
+        if( $shopping_order->payment_for === 6 || $shopping_order->payment_for === 7){
+            return redirect(route('user_shop_order_detail', [$shopping_order->id]));
+            abort(403, 'Kundenbestellung');
+        }
         $shopping_order->getLastShoppingPayment();
 
         $data = [
@@ -59,7 +63,7 @@ class OrderController extends Controller
 
         return \DataTables::eloquent($query)
             ->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
-                return '<a href="' . route('user_order_detail', [$ShoppingOrder->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
+                return '<a href="'.route('user_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");
@@ -74,6 +78,15 @@ class OrderController extends Controller
                 return $ShoppingOrder->getLastShoppingPayment('getPaymentType');
             })
             ->addColumn('shipped', function (ShoppingOrder $ShoppingOrder) {
+                if($ShoppingOrder->payment_for === 8){
+                    return '<button type="button" class="btn btn-xs btn-info btn-round" data-toggle="modal" data-target="#modals-load-content"
+                    data-id="'.$ShoppingOrder->id.'"
+                    data-action="shop-user-order-shipping-detail" 
+                    data-back="" 
+                    data-modal="modal-xl" 
+                    data-init_from="user" 
+                    data-route="'.route('modal_load').'"><span class="far fa-eye"></span></button>';   
+                }
                 return '<span class="badge badge-pill badge-'.$ShoppingOrder->getShippedColor().'">'.$ShoppingOrder->getShippedType().'</span>';
             })
             ->addColumn('payment_for', function (ShoppingOrder $ShoppingOrder) {
@@ -277,7 +290,7 @@ class OrderController extends Controller
         if(Request::get('shipping_is_for') === 'me'){
             $query = Product::select('products.*')->where('active', true)->whereJsonContains('show_on', '2');
         }else{
-            $query = Product::select('products.*')->where('active', true)->whereJsonContains('show_on', '1');
+            $query = Product::select('products.*')->where('active', true)->whereJsonContains('show_on', '3');
         }
         return \DataTables::eloquent($query)
 
@@ -465,7 +478,7 @@ class OrderController extends Controller
 
     private function getCompProducts($for){
         if($for === 'me'){
-           return Product::whereActive(true)->whereJsonContains('show_on', ['1', '2', '3'])->where('shipping_addon', true)->orderBy('pos', 'DESC')->get();
+           return Product::whereActive(true)->whereJsonContains('show_on', ['1', '2', '3', '4'])->where('shipping_addon', true)->orderBy('pos', 'DESC')->get();
         }
         return null;
     }

app/Http/Controllers/User/ShopApiController.php

@@ -15,8 +15,8 @@ use App\Repositories\ShopApiRepository;
 class ShopApiController extends Controller
 {
 
-    private $api_action = [0 => 'bitte wählen', 'order' => 'markierte bestellen', 'remove' => 'markierte entfernen', 'reset' => 'markierte zurücksetzen/offen'];
-    private $filter_show = [10 => 'alle anzeigen', 1 => 'offen', 2 => 'bestellt', 5 => 'entfernt'];
+    private $api_action = [0 => 'bitte wählen', 'order' => 'markierte bezahlen', 'remove' => 'markierte entfernen', 'reset' => 'markierte zurücksetzen/bestellt'];
+    private $filter_show = [10 => 'alle anzeigen', 1 => 'bestellt', 2 => 'bezahlt', 5 => 'entfernt'];
     protected $shopApiRepository;
 
     public function __construct(ShopApiRepository $shopApiRepository)
@@ -28,7 +28,6 @@ class ShopApiController extends Controller
     public function orders()
     {
         $this->setFilterVars();
-
          $data = [
             'api_action' => $this->api_action,
             'filter_show' => $this->filter_show,

app/Http/Controllers/User/ShopSalesController.php

@@ -30,6 +30,10 @@ class ShopSalesController extends Controller
         if($shopping_order->member_id !== $user->id){
             abort(404);
         }
+        if( $shopping_order->payment_for !== 6 && $shopping_order->payment_for !== 7){
+            return redirect(route('user_order_detail', [$shopping_order->id]));
+            abort(403, 'Beraterbestellung');
+        }
         $data = [
              'shopping_order' => $shopping_order,
              'isAdmin' => false,

app/Http/Controllers/WizardController.php

@@ -62,8 +62,8 @@ class WizardController extends Controller
         $data = [
             'user' => Auth::user(),
             'step' => $step,
-            'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['4', '5'])->orderBy('pos', 'ASC')->get(),
-            'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '6')->orderBy('pos', 'ASC')->get(),
+            'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(),
+            'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '9')->orderBy('pos', 'ASC')->get(),
             'userHistoryWizardPayment' => $userHistoryWizardPayment,
         ];
 
@@ -97,8 +97,8 @@ class WizardController extends Controller
         $data = [
             'user' => Auth::user(),
             'step' => $step,
-            'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['4', '5'])->orderBy('pos', 'ASC')->get(),
-            'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '6')->orderBy('pos', 'ASC')->get(),
+            'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(),
+            'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '9')->orderBy('pos', 'ASC')->get(),
         ];
         if($step == 5){
             if($user->active){
@@ -139,8 +139,8 @@ class WizardController extends Controller
         $data = [
             'user' => Auth::user(),
             'step' => 0,
-            'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['4', '5'])->orderBy('pos', 'ASC')->get(),
-            'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '6')->orderBy('pos', 'ASC')->get(),
+            'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(),
+            'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '9')->orderBy('pos', 'ASC')->get(),
             'userHistoryWizardPayment' => $userHistoryWizardPayment,
             'yard_info' => UserService::getYardInfo(),
         ];
@@ -192,8 +192,8 @@ class WizardController extends Controller
                 $data = [
                     'user' => Auth::user(),
                     'step' => $step,
-                    'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['4', '5'])->orderBy('pos', 'ASC')->get(),
-                    'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '6')->orderBy('pos', 'ASC')->get(),
+                    'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(),
+                    'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '9')->orderBy('pos', 'ASC')->get(),
                 ];
                 $user->wizard = 0;
                 $user->save();
@@ -369,8 +369,8 @@ class WizardController extends Controller
                 $data = [
                     'user' => Auth::user(),
                     'step' => $step,
-                    'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['4', '5'])->orderBy('pos', 'ASC')->get(),
-                    'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '6')->orderBy('pos', 'ASC')->get(),
+                    'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(),
+                    'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '9')->orderBy('pos', 'ASC')->get(),
                 ];
                 $user->wizard = 10;
                 $user->save();
@@ -408,8 +408,8 @@ class WizardController extends Controller
                 $data = [
                     'user' => Auth::user(),
                     'step' => $step,
-                    'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['4', '5'])->whereJsonContains('show_on', ['4', '5'])->orderBy('pos', 'ASC')->get(),
-                    'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '6')->orderBy('pos', 'ASC')->get(),
+                    'products' =>  Product::where('active', true)->whereJsonContains('show_on', ['7', '8'])->orderBy('pos', 'ASC')->get(),
+                    'products_on_board' => Product::where('active', true)->whereJsonContains('show_on', '9')->orderBy('pos', 'ASC')->get(),
                 ];
                 return view('user.wizard.create', $data)->withErrors($validator);
             }