first commit

app/Http/Controllers/User/CheckoutController.php

@@ -0,0 +1,533 @@
+<?php
+
+namespace App\Http\Controllers\User;
+
+
+use App\Http\Controllers\Controller;
+use App\Http\Controllers\Pay\PayController;
+use App\Http\Controllers\Pay\PayoneController;
+use App\Models\Homeparty;
+use App\Models\PaymentMethod;
+use App\Models\PaymentTransaction;
+use App\Models\ShippingCountry;
+use App\Models\ShoppingOrder;
+use App\Models\ShoppingOrderItem;
+use App\Models\ShoppingPayment;
+use App\Models\ShoppingUser;
+use App\Services\CustomerPriority;
+use App\Services\Payment;
+use App\Services\Shop;
+use App\User;
+use Illuminate\Session\SessionManager;
+use Illuminate\Support\Collection;
+use Validator;
+use App\Services\Util;
+use Yard;
+use Request;
+
+class CheckoutController extends Controller
+{
+    private $session;
+    private $instance;
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct(SessionManager $session)
+    {
+        $this->session = $session;
+        $this->instance = sprintf('%s.%s', 'cart', 'payments');
+    }
+
+
+    public function checkout($identifier){
+
+       // dump(Request::all());
+//        $user_shop = Util::getUserShop();
+
+        //user shop
+        /*
+        $user_shop = $shopping_instance->user_shop;
+        if($user_shop &&  $user_shop->active == 1 && $user_shop->user->isActiveShop()){
+            Util::setPostRoute('user/');
+            \Session::put('user_shop', $user_shop);
+            \Session::put('user_shop_domain', $shopping_instance->subdomain);
+            \Session::put('user_shop_payment', $shopping_instance->payment);
+            \Session::put('user_shop_identifier', $shopping_instance->identifier);
+            \Session::put('isCheckout', true);
+
+            if($shopping_instance->auth_user_id){
+                \Session::put('auth_user', $shopping_instance->auth_user);
+            }
+        }
+        if($shopping_instance->back){
+            \Session::put('back_link', $shopping_instance->back);
+        }
+        \Session::put('new_session', true);
+        Yard::instance('shopping')->destroy();
+        //restore yard
+        Yard::instance('shopping')->restore($request->route('identifier'));
+
+        Yard::instance('shopping')->putYardExtra('user_shop_payment', $shopping_instance->payment);
+
+        Yard::instance('shopping')->putYardExtra('shopping_data', $shopping_instance->shopping_data);
+        $is_for = isset($shopping_instance->shopping_data['is_for']) ? $shopping_instance->shopping_data['is_for'] : 'ot';
+        Yard::instance('shopping')->setShippingCountryWithPrice($shopping_instance->country_id, $is_for);
+        */
+
+
+         $shopping_data = Yard::instance('shopping')->getYardExtra('shopping_data');
+         $is_from =  isset($shopping_data['is_from']) ? $shopping_data['is_from'] : 'shopping';
+         $is_for = isset($shopping_data['is_for']) ? $shopping_data['is_for'] : false;
+         $shopping_user = null;
+
+        if(\Session::has('new_session')){
+            $this->destroy();
+            \Session::forget('new_session');
+        }
+
+        if(!$this->getPayments('shopping_user_id')){
+              if($shopping_data && $is_from !== 'shopping'){
+                  //can  wizard membership user_order
+                  //$shopping_user_id = isset($shopping_data['shopping_user_id']) ? $shopping_data['shopping_user_id'] : false;
+                  $shopping_user = $this->shoppingUserAuthData($is_from, $is_for, $shopping_data);
+                  $shopping_user->save();
+                  $this->putPayments('shopping_user_id', $shopping_user->id);
+              }elseif($is_from === 'shopping') {
+                  $shopping_user = new ShoppingUser();
+                  $shopping_user->is_for = $is_for;
+                  $shopping_user->is_from = $is_from;
+                  $shopping_user->homeparty_id = $homeparty_id;
+                  $shopping_user->mode = 'prev';
+              }
+        }else{
+            $shopping_user = ShoppingUser::findOrFail($this->getPayments('shopping_user_id'));
+            $shopping_user->billing_state = Shop::getCountryShippingCountryId($shopping_user->billing_country_id);
+            $shopping_user->shipping_state = Shop::getCountryShippingCountryId($shopping_user->shipping_country_id);
+        }
+        if($shopping_user->same_as_billing === NULL){
+            $shopping_user->same_as_billing = false;
+        }
+
+        if(old('selected_country') && old('selected_country') === 'change'){
+            \Session::forget('_old_input.selected_country');
+            $shopping_user->billing_state = old('billing_state');
+            $shopping_user->shipping_state = old('shipping_state');
+        }else{
+            $shopping_user->billing_state = Yard::instance('shopping')->getShippingCountryId();
+            $shopping_user->shipping_state = Yard::instance('shopping')->getShippingCountryId();
+        }
+
+        /*if(Util::getAuthUser()){
+            $shopping_user->abo_options = Util::getUserHistoryValue('abo_options');
+            //$shopping_user->save();
+        }*/
+
+        if($is_from !== 'shopping' && Util::getAuthUser()){
+            $user = Util::getAuthUser();
+            $payment_methods = $user->payment_methods;
+            $payment_data = $user->account->payment_data;
+        }else{
+            $payment_methods = PaymentMethod::getDefaultAsArray()->toArray();
+            $payment_data = false;
+        }
+
+        $payment_methods_active = \App\Models\PaymentMethod::where('active', true)->get()->pluck( 'id', 'short')->toArray();
+        $data = [
+            'is_from' => $is_from,
+            'is_for' => $is_for,
+            'shopping_data' => $shopping_data,
+            'user_shop' => Util::getUserShop(),
+            'shopping_user' => $shopping_user,
+            'shopping_mode' => Util::getUserShoppingMode(),
+            'payment_methods' => $payment_methods,
+            'payment_methods_active' => $payment_methods_active,
+            'identifier' => $identifier,
+            'payment_data' => $payment_data,
+            'back' => url()->previous(),
+        ];
+        return view('user.checkout.checkout', $data);
+    }
+
+    private function shoppingUserAuthData($is_from, $is_for, $data = []){
+
+        $user = Util::getAuthUser();
+        $shopping_user = new ShoppingUser();
+        $shopping_user->auth_user_id = $user->id;
+        $shopping_user->mode = 'prev';
+
+        $shopping_user->billing_salutation = $user->account->salutation;
+        $shopping_user->billing_company = $user->account->company;
+        $shopping_user->billing_firstname = $user->account->first_name;
+        $shopping_user->billing_lastname = $user->account->last_name;
+        $shopping_user->billing_address = $user->account->address;
+        $shopping_user->billing_address_2 = $user->account->address_2;
+        $shopping_user->billing_zipcode = $user->account->zipcode;
+        $shopping_user->billing_city = $user->account->city;
+        $shopping_user->billing_country_id = $user->account->country_id;
+        $shopping_user->billing_phone = $user->account->phone;
+        $shopping_user->billing_email = $user->email;
+        $shopping_user->faker_mail = false;
+        $shopping_user->shipping_email = $user->email;
+
+        $shopping_user->accepted_data_checkbox = 1;
+        $shopping_user->is_for = $is_for;
+        $shopping_user->is_from = $is_from;
+
+        //Lieferadresse
+        if($is_from === 'user_order'){
+            if(isset($data['shopping_user_id']) && $data['is_for'] === 'ot'){
+                $s_user = ShoppingUser::findOrFail($data['shopping_user_id']);
+              /*  $shopping_user->billing_salutation = $s_user->billing_salutation;
+                $shopping_user->billing_company = $s_user->billing_company;
+                $shopping_user->billing_firstname = $s_user->billing_firstname;
+                $shopping_user->billing_lastname = $s_user->billing_lastname;
+                $shopping_user->billing_address = $s_user->billing_address;
+                $shopping_user->billing_address_2 = $s_user->billing_address_2;
+                $shopping_user->billing_zipcode = $s_user->billing_zipcode;
+                $shopping_user->billing_city = $s_user->billing_city;
+                $shopping_user->billing_country_id = $s_user->billing_country_id;
+                $shopping_user->billing_phone = $s_user->billing_phone;
+                $shopping_user->billing_email = $s_user->billing_email;
+                ;*/
+                $shopping_user->faker_mail = $s_user->faker_mail;
+                if(!$s_user->faker_mail){
+                    $shopping_user->shipping_email = $s_user->billing_email;
+                }
+                $shopping_user->shopping_user_id = $data['shopping_user_id'];
+                $shopping_user->member_id = $s_user->member_id;
+            }
+            $shopping_user->same_as_billing = true;
+            $shopping_user->shipping_salutation = isset($data['shipping_salutation']) ? $data['shipping_salutation'] : '';
+            $shopping_user->shipping_company = isset($data['shipping_company']) ? $data['shipping_company'] : '';
+            $shopping_user->shipping_firstname = isset($data['shipping_firstname']) ? $data['shipping_firstname'] : '';
+            $shopping_user->shipping_lastname = isset($data['shipping_lastname']) ? $data['shipping_lastname'] : '';
+            $shopping_user->shipping_address = isset($data['shipping_address']) ? $data['shipping_address'] : '';
+            $shopping_user->shipping_address_2 = isset($data['shipping_address_2']) ? $data['shipping_address_2'] : '';
+            $shopping_user->shipping_zipcode = isset($data['shipping_zipcode']) ? $data['shipping_zipcode'] : '';
+            $shopping_user->shipping_city = isset($data['shipping_city']) ? $data['shipping_city'] : '';
+            $shopping_user->shipping_country_id = Yard::instance('shopping')->getShippingCountryCountryId();
+            $shopping_user->shipping_phone = isset($data['shipping_phone']) ? $data['shipping_phone'] : '';
+
+        }else{
+            $shopping_user->same_as_billing = $user->account->same_as_billing ? false : true;
+            $shopping_user->shipping_salutation = $user->account->shipping_salutation;
+            $shopping_user->shipping_company = $user->account->shipping_company;
+            $shopping_user->shipping_firstname = $user->account->shipping_firstname;
+            $shopping_user->shipping_lastname = $user->account->shipping_lastname;
+            $shopping_user->shipping_address = $user->account->shipping_address;
+            $shopping_user->shipping_address_2 = $user->account->shipping_address_2;
+            $shopping_user->shipping_zipcode = $user->account->shipping_zipcode;
+            $shopping_user->shipping_city = $user->account->shipping_city;
+            $shopping_user->shipping_country_id = $user->account->shipping_country_id;
+            $shopping_user->shipping_phone = $user->account->shipping_phone;
+        }
+
+        return $shopping_user;
+    }
+
+    public function store($identifier){
+
+
+        $data = Request::all();
+        //change selected Country
+        /*if(isset($data['selected_country']) && $data['selected_country'] === 'change'){
+            if(!Request::get('same_as_billing')){
+                Yard::instance('shopping')->setShippingCountryWithPrice($data['billing_state'], $data['is_for']);
+            }else{
+                Yard::instance('shopping')->setShippingCountryWithPrice($data['shipping_state'], $data['is_for']);
+            }
+            return back()->withInput(Request::all());
+        }*/
+
+        $rules = array(
+            'billing_salutation' => 'required',
+            'billing_firstname'=>'required',
+            'billing_lastname'=>'required',
+            'billing_email'=>'required|email',
+            'billing_address'=>'required',
+            'billing_zipcode'=>'required',
+            'billing_city' => 'required',
+            'accepted_data_checkbox' => 'accepted',
+        );
+
+        if(Request::get('same_as_billing')){
+            $rules = array_merge($rules, [
+                'shipping_firstname'=>'required',
+                'shipping_lastname'=>'required',
+                'shipping_address'=>'required',
+                'shipping_zipcode'=>'required',
+                'shipping_city' => 'required',
+                'shipping_salutation' => 'required'
+
+            ]);
+        }
+        $validator = Validator::make(Request::all(), $rules);
+        if ($validator->fails()) {
+            return back()->withErrors($validator)->withInput(Request::all());
+        }
+
+        $data = Request::all();
+        //make User
+        $shopping_user = $this->makeShoppingUser($data);
+
+        //make Order and Items
+        $shopping_order =  $this->makeShoppingOrder($shopping_user);
+        //CustomerPriority
+        if($shopping_user->is_from === 'shopping'){
+            CustomerPriority::checkOne(ShoppingUser::find($shopping_user->id), true);
+        }
+        Util::setUserHistoryValue(['status'=>2, 'shopping_order_id'=>$shopping_order->id]);
+
+        //check credit Card
+        if(Request::get('payment_method')){
+
+            $ret = [];
+            //Rechnungskauf ohne PAYONE
+            if(Request::get('payment_method') === 'fnc#MIV'){
+
+            }
+            //other
+            $pay = new PayController();
+            $pay->init($shopping_user, $shopping_order);
+            $amount = Yard::instance('shopping')->totalWithShipping(2, '.', '') * 100;
+            $reference = $pay->setPrePayment(Request::get('payment_method'), $amount, 'EUR', $ret);
+            $this->putPayments('payment_reference', $reference);
+            $pay->setPersonalData();
+            return $pay->ResponseData($identifier);
+        }
+
+        return redirect()->back();
+    }
+
+
+    public function transactionStatus($status, $reference){
+
+        $shopping_order_id = $this->getPayments('shopping_order_id');
+
+        $ShoppingPayment = ShoppingPayment::where('shopping_order_id', $shopping_order_id)->where('reference', $reference)->first();
+        if(!$ShoppingPayment){
+            //TODO log this
+            Util::setUserHistoryValue(['status'=>21]);
+
+            \Session::flash('checkout-error', 'Der Zahlungsvorgang konnte nicht abgeschlossen werden, die Zahlung wurde nicht gefunden: '.$reference);
+            return redirect(route('checkout.checkout_card'));
+        }
+        $ShoppingPayment->status = $status;
+        $ShoppingPayment->save();
+
+        if($status === "success"){
+
+                Yard::instance('shopping')->destroy();
+                $this->destroy();
+
+                $payt = $ShoppingPayment->payment_transactions->last();
+
+                $data = [
+                    'user_shop' => Util::getUserShop(),
+                    'order_reference' => $reference,
+                    'pay_trans' => $payt,
+                ];
+                return view('web.templates.checkout-final', $data);
+        }
+        if($status === "cancel"){
+            Util::setUserHistoryValue(['status'=>22]);
+            \Session::flash('checkout-error', 'Der Zahlungsvorgang wurde abgebrochen, die Bestellung konnte nicht ausgeführt werden.');
+            return redirect(route('checkout.checkout_card'));
+
+        }
+        if($status === "error"){
+            Util::setUserHistoryValue(['status'=>23]);
+            \Session::flash('checkout-error', 'Der Zahlungsvorgang wurde abgebrochen, die Bestellung konnte nicht ausgeführt werden.');
+            return redirect(route('checkout.checkout_card'));
+
+        }
+    }
+
+    public function final($transactionId, $reference, $identifier)  {
+
+        $payt = PaymentTransaction::findOrFail($transactionId);
+        if($payt->shopping_payment->reference != $reference){
+            abort(404);
+        }
+        Yard::instance('shopping')->destroy();
+        $this->destroy();
+
+        if($payt->status === 'fnc' || $payt->status === 'vor'){
+            $this->directPaymentStatus($payt);
+        }
+
+        $data = [
+            'order_reference' => $payt->shopping_payment->reference,
+            'pay_trans' => $payt,
+        ];
+        return view('user.checkout.final', $data);
+    }
+
+    /*private function storeUserPaymentsData($shopping_user, $ret){
+        if($shopping_user->auth_user_id){
+            $user = User::find($shopping_user->auth_user_id);
+            if($user && $user->account){
+                if(isset($ret['elv']) && is_array($ret['elv'])){
+                    $user->account->payment_data = $ret['elv'];
+                    $user->account->save();
+                }
+            }
+        }
+    }*/
+
+    private function makeShoppingUser($data){
+
+        $data['same_as_billing'] = isset($data['same_as_billing']) ? false : true; //reinvert
+        $data['accepted_data_checkbox'] = isset($data['accepted_data_checkbox']) ? true : false;
+
+        $shopping_user = false;
+        if($this->getPayments('shopping_user_id')){
+            $shopping_user = ShoppingUser::find($this->getPayments('shopping_user_id'));
+            if($shopping_user){
+                $shopping_user->fill($data);
+                $shopping_user->mode = null;
+                $shopping_user->save();
+            }
+        }
+        if(!$shopping_user){
+            $shopping_user = ShoppingUser::create($data);
+        }
+        $this->putPayments('shopping_user_id', $shopping_user->id);
+
+        return $shopping_user;
+    }
+
+    private function makeShoppingOrder($shopping_user){
+
+        $user_shop = Util::getUserShop();
+
+
+        $data = [
+            'shopping_user_id' => $shopping_user->id,
+            'auth_user_id' => $shopping_user->auth_user_id,
+            'country_id' => Yard::instance('shopping')->getShippingCountryId(),
+            'payment_for' => Util::getUserPaymentFor(),
+            'total' => Yard::instance('shopping')->total(2, '.', ''),
+            'subtotal' => Yard::instance('shopping')->subtotal(2, '.', ''),
+            'shipping' => Yard::instance('shopping')->shipping(2, '.', ','),
+            'shipping_net' => Yard::instance('shopping')->shippingNet(2, '.', ''),
+            'subtotal_ws' => Yard::instance('shopping')->subtotalWithShipping(2, '.', ''),
+            'tax' => Yard::instance('shopping')->taxWithShipping(2, '.', ''),
+            'total_shipping' => Yard::instance('shopping')->totalWithShipping(2, '.', ''),
+            'points' => Yard::instance('shopping')->points(),
+            'weight' => Yard::instance('shopping')->weight(),
+            'txaction' => 'prev',
+            'mode' => Util::getUserShoppingMode(),
+        ];
+
+
+        $shopping_order= false;
+        if($this->getPayments('shopping_order_id')){
+            $shopping_order = ShoppingOrder::find($this->getPayments('shopping_order_id'));
+            if($shopping_order){
+                $shopping_order->fill($data);
+                $shopping_order->save();
+            }
+        }
+        if(!$shopping_order){
+            $shopping_order = ShoppingOrder::create($data);
+        }
+        $this->putPayments('shopping_order_id', $shopping_order->id);
+
+         $items = Yard::instance('shopping')->getContentByOrder();
+         $shopping_order->shopping_order_items()->each(function($model) use ($items, $shopping_order, $shopping_user) {
+             foreach ($items as $item) {
+                    if ($model->row_id === $item->rowId) {
+                        $data = [
+                            'shopping_order_id' => $shopping_order->id,
+                            'row_id' =>  $item->rowId,
+                            'product_id' => $item->id,
+                            'comp' => $item->options->comp,
+                            'qty' => $item->qty,
+                            'price' => $item->price,
+                            'price_net' => Yard::instance('shopping')->rowPriceNet($item, 3, '.', ''),
+                            'tax_rate' => $item->taxRate,
+                            'slug' => $item->options->slug,
+                        ];
+                        $model->fill($data)->save();
+                        return false;
+                    }
+                }
+                return $model->delete();
+        });
+
+
+        foreach ($items as $item) {
+            if (!ShoppingOrderItem::where('shopping_order_id', $shopping_order->id)->where('row_id', $item->rowId)->count()){
+                $data = [
+                    'shopping_order_id' => $shopping_order->id,
+                    'row_id' =>  $item->rowId,
+                    'product_id' => $item->id,
+                    'comp' => $item->options->comp,
+                    'qty' => $item->qty,
+                    'price' => $item->price,
+                    'price_net' => Yard::instance('shopping')->rowPriceNet($item, 3, '.', ''),
+                    'tax_rate' => $item->taxRate,
+                    'slug' => $item->options->slug
+                ];
+                $shopping_order_item = ShoppingOrderItem::create($data);
+            }
+        }
+        return $shopping_order;
+    }
+
+    private function putPayments($key, $value){
+        $content = $this->getContent();
+        $content->put($key, $value);
+        $this->session->put($this->instance, $content);
+
+    }
+
+    private function getPayments($key){
+        $content = $this->getContent();
+        if ($content->has($key)){
+            return $content->get($key);
+        }
+        return false;
+    }
+
+    private function getContent()
+    {
+        if (is_null($this->session->get($this->instance))) {
+            return new Collection([]);
+        }
+        return $this->session->get($this->instance);
+    }
+
+    public function destroy()
+    {
+        $this->session->remove($this->instance);
+    }
+
+    private function directPaymentStatus(PaymentTransaction $payt){
+
+        if(isset($payt->transmitted_data['param'])){
+            $shopping_order = ShoppingOrder::find($payt->transmitted_data['param']);
+            $shopping_order->txaction = 'open';
+            $shopping_order->save();
+            $shopping_payment = ShoppingPayment::where('reference', $payt->transmitted_data['reference'])->first();
+            if($shopping_payment){
+                $shopping_payment->txaction = 'open';
+                $shopping_payment->save();
+            }
+            //$send_link = Payment::paymentStatusPaidAction($shopping_order, false);
+            //$payt->request = "approved";
+            //$payt->save();
+            $data = [
+               'mode' => $payt->transmitted_data['mode'],
+                'txaction' => $payt->txaction,
+                'send_link' => false,
+            ];
+            Payment::paymentStatusSendMail($shopping_order, $shopping_payment, $data);
+        }
+
+    }
+
+}

app/Http/Controllers/User/CustomerController.php

@@ -0,0 +1,270 @@
+<?php
+
+namespace App\Http\Controllers\User;
+
+use App\Http\Controllers\Controller;
+use App\Models\ShoppingUser;
+use App\Repositories\CustomerRepository;
+use App\Services\CustomerPriority;
+use App\Services\HTMLHelper;
+use App\User;
+use Illuminate\Support\Collection;
+use Request;
+use Validator;
+
+
+class CustomerController extends Controller
+{
+    protected $customerRepository;
+
+    public function __construct(CustomerRepository $customerRepository)
+    {
+        $this->middleware('active.account');
+        $this->customerRepository = $customerRepository;
+
+    }
+
+    public function index()
+    {
+        if(Request::get('reset') === 'filter'){
+           // set_user_attr('filter_member_id', null);
+           // set_user_attr('filter_customer_member', null);
+            return redirect(route('admin_customers'));
+        }
+        $data = [
+
+        ];
+        return view('user.customer.index', $data);
+    }
+
+
+    public function detail($id)
+    {
+        $shopping_user = ShoppingUser::findOrFail($id);
+        if($shopping_user->member_id != \Auth::user()->id){
+            abort(404);
+        }
+        $data = [
+            'shopping_user' => $shopping_user,
+            'isAdmin' => false,
+            'isView' => 'customer',
+
+        ];
+        return view('user.customer.detail', $data);
+    }
+
+    public function edit($id)
+    {
+        $shopping_user = ShoppingUser::findOrFail($id);
+        if($shopping_user->member_id != \Auth::user()->id){
+            abort(404);
+        }
+        $data = [
+            'shopping_user' => $shopping_user,
+            'isAdmin' => false,
+            'isView' => 'customer',
+
+        ];
+        return view('user.customer.edit', $data);
+    }
+
+    public function add($id, $step=0)
+    {
+        if($id === "new"){
+            $shopping_user = new ShoppingUser();
+            $shopping_user->id = "new";
+        }else{
+            $shopping_user = ShoppingUser::findOrFail($id);
+            if($shopping_user->member_id != \Auth::user()->id){
+                abort(404);
+            }
+        }
+
+        $billing_email = null;
+        if(!session('errors')){
+            if(old('email') || old('billing_email')){
+                $step = 1;
+                $shopping_user->same_as_billing = true;
+                $billing_email = old('email');
+            }
+            if(old('switcher-without-email') === 'true'){
+                $step = 1;
+                $shopping_user->same_as_billing = true;
+                $shopping_user->faker_mail = true;
+                $billing_email = time()."-faker@mivita.care";
+            }
+        }
+        $data = [
+            'shopping_user' => $shopping_user,
+            'isAdmin' => false,
+            'isView' => $step === 0 ? 'customer' : 'customer-add',
+            'step' => $step,
+            'billing_email' => $billing_email,
+
+        ];
+        return view('user.customer.add', $data);
+    }
+
+    private function checkShoppingUsersEmail($data){
+        $rules = array(
+            'email' => 'required|string|email|max:255|unique:shopping_users,billing_email',
+        );
+        $messages = [
+            'unique'    => __('validation.custom.unique_email_client'),
+        ];
+        $validator = Validator::make(Request::all(), $rules, $messages);
+        if ($validator->fails()) {
+            return back()->withErrors($validator)->withInput(Request::all());
+        }
+
+        $rules = array(
+            'email' => 'required|string|email|max:255|unique:users,email',
+        );
+        $messages = [
+            'unique'    => __('validation.custom.unique_email_member'),
+        ];
+        $validator = Validator::make(Request::all(), $rules, $messages);
+        if ($validator->fails()) {
+            return back()->withErrors($validator)->withInput(Request::all());
+        }
+
+        return back()->withInput(Request::all());
+    }
+
+    public function store($id)
+    {
+        $data = Request::all();
+
+        if($id === 'new' && $data['action'] === 'add_customer_with_email'){
+            return $this->checkShoppingUsersEmail($data);
+        }
+        if($id === 'new' && $data['action'] === 'add_customer_without_email'){
+            return back()->withInput(Request::all());
+        }
+
+        if($data['action'] === 'shopping-user-store-new' || $data['action']==='shopping-user-store'){
+            $rules = array(
+                'billing_salutation' => 'required',
+                'billing_firstname'=>'required',
+                'billing_lastname'=>'required',
+                'billing_email'=>'required|email',
+                'billing_address'=>'required',
+                'billing_zipcode'=>'required',
+                'billing_city' => 'required',
+                'billing_country_id' => 'required',
+            );
+
+            if(!Request::get('same_as_billing')){
+                $rules = array_merge($rules, [
+                    'shipping_firstname'=>'required',
+                    'shipping_lastname'=>'required',
+                    'shipping_address'=>'required',
+                    'shipping_zipcode'=>'required',
+                    'shipping_city' => 'required',
+                    'shipping_salutation' => 'required',
+                    'shipping_country_id' => 'required'
+                ]);
+            }
+            $validator = Validator::make(Request::all(), $rules);
+            if ($validator->fails()) {
+                return back()->withErrors($validator)->withInput(Request::all());
+            }
+        }
+
+        $data['faker_mail'] = isset($data['faker_mail']) ? true : false;
+        $data['has_buyed'] = isset($data['has_buyed']) ? true : false;
+        $data['subscribed'] = isset($data['subscribed']) ? true : false;
+        //subscribed can only true when has_buyed ist active
+        $data['subscribed'] = $data['has_buyed'] ? $data['subscribed'] : false;
+
+        $data['same_as_billing'] = isset($data['same_as_billing']) ? true : false;
+        $data['shipping_country_id'] = isset($data['shipping_country_id']) ? $data['shipping_country_id'] : $data['billing_country_id'];
+
+        if($id > 0 && $data['action'] === 'shopping-user-store'){
+            $shopping_user = ShoppingUser::findOrFail($id);
+            if($shopping_user->member_id != \Auth::user()->id){
+                abort(404);
+            }
+            CustomerPriority::checkChangeOne($shopping_user, $data, true);
+            $shopping_user->fill($data);
+            $shopping_user->save();
+
+        }
+
+        if($id === 'new' && $data['action'] === 'shopping-user-store-new') {
+            $shopping_user = ShoppingUser::create($data);
+            $shopping_user->member_id = \Auth::user()->id;
+            $shopping_user->save();
+            CustomerPriority::checkNewOne($shopping_user, true);
+        }
+        \App\Services\Shop::newUserOrder($shopping_user->number);
+
+        if($shopping_user->is_like){
+            \Session()->flash('custom-error', __('validation.custom.match_found'));
+        }
+
+        \Session()->flash('alert-save', true);
+        return redirect(route('user_customer_detail', [$shopping_user->id]));
+    }
+
+    public function getCustomers()
+    {
+        $user = User::find(\Auth::user()->id);
+
+        $query = ShoppingUser::select(['id', 'billing_company', 'billing_salutation', 'billing_firstname', 'billing_lastname', 'billing_email', 'faker_mail', 'billing_zipcode', 'billing_city', 'billing_country_id', 'orders', 'subscribed', 'created_at', 'number', 'mode', 'is_like', 'wp_order_number'])
+            ->where('shopping_users.member_id', '=', $user->id);
+            //->groupBy('shopping_users.number');
+
+        /*set_user_attr('filter_member_id', Request::get('filter_member_id'));
+        if(Request::get('filter_member_id') != ""){
+            $query->where('member_id', '=', Request::get('filter_member_id'));
+        }*/
+        return \DataTables::eloquent($query)
+
+            ->addColumn('send_to', function (ShoppingUser $ShoppingUser) {
+                return $ShoppingUser->is_like ? '<span class="badge badge-pill badge-warning"><i class="fa fa-clock"></i> in Prüfung</span>' : '<a href="' . route('user_order_my_delivery', ['ot', $ShoppingUser->id]) . '" class="btn btn-sm btn-secondary"><span class="fa fa-shopping-cart"></span> wählen</a>';
+            })
+            ->addColumn('billing_email', function (ShoppingUser $ShoppingUser) {
+                return $ShoppingUser->faker_mail ? "-" : $ShoppingUser->billing_email;
+            })
+            ->addColumn('id', function (ShoppingUser $ShoppingUser) {
+                return '<a href="' . route('user_customer_detail', [$ShoppingUser->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
+            })
+            ->addColumn('billing_salutation', function (ShoppingUser $ShoppingUser) {
+                return HTMLHelper::getSalutationLang($ShoppingUser->billing_salutation);
+            })
+            ->addColumn('billing_country_id', function (ShoppingUser $ShoppingUser) {
+                return $ShoppingUser->billing_country ? $ShoppingUser->billing_country->getLocated() : '';
+            })
+            ->addColumn('first_created_at', function (ShoppingUser $ShoppingUser) {
+                return $ShoppingUser->firstEntryByNumber()->created_at->format('d.m.Y');
+            })
+            ->addColumn('orders', function (ShoppingUser $ShoppingUser) {
+                return $ShoppingUser->lastEntryByNumber()->orders;
+            })
+            ->addColumn('subscribed', function (ShoppingUser $ShoppingUser) {
+                return get_active_badge($ShoppingUser->subscribed);
+            })
+            ->addColumn('status', function (ShoppingUser $ShoppingUser) {
+                return $ShoppingUser->is_like ? '<span class="badge badge-pill badge-warning"><i class="fa fa-clock"></i> in Prüfung</span> ' : '<span class="badge badge-pill badge-success"><i class="fa fa-check-circle"></i> zugewiesen</span>';
+            })
+            ->addColumn('extras', function (ShoppingUser $ShoppingUser) {
+                return $ShoppingUser->wp_order_number.($ShoppingUser->mode==='dev' ? ' <span class="badge badge-warning">dev</span>' : '');
+            })
+            ->filterColumn('billing_email', function($query, $keyword) {
+                if($keyword != ""){
+                    $query->where('billing_email', 'LIKE', '%'.$keyword.'%');
+                }
+            })
+            ->orderColumn('send_to', 'id $1')
+            ->orderColumn('id', 'id $1')
+            ->orderColumn('billing_email', 'billing_email $1')
+            ->orderColumn('billing_country_id', 'billing_country_id $1')
+            ->orderColumn('billing_salutation', 'billing_salutation $1')
+            ->orderColumn('first_created_at', 'created_at $1')
+            ->orderColumn('orders', 'orders $1')
+            ->orderColumn('subscribed', 'subscribed $1')
+            ->rawColumns(['send_to', 'id', 'subscribed', 'extras', 'status'])
+            ->make(true);
+    }
+}

app/Http/Controllers/User/HomepartyController.php

@@ -0,0 +1,501 @@
+<?php
+
+
+namespace App\Http\Controllers\User;
+use App\Http\Controllers\Controller;
+use App\Models\Homeparty;
+use App\Models\HomepartyUser;
+use App\Models\HomepartyUserOrderItem;
+use App\Models\Product;
+use App\Models\ShippingCountry;
+use App\Models\ShoppingInstance;
+use App\Models\ShoppingOrder;
+use App\Models\ShoppingUser;
+use App\Models\UserHistory;
+use App\Models\UserShop;
+use App\Services\HomepartyCart;
+use App\Services\Payment;
+use App\Services\Util;
+use App\User;
+use Auth;
+use Request;
+use Validator;
+use Yard;
+
+
+class HomepartyController extends Controller
+{
+
+    public function __construct()
+    {
+        $this->middleware('superadmin');
+
+        $this->middleware('active.account');
+    }
+
+    public function index()
+    {
+        $data = [
+            'homepartys' => Homeparty::where('auth_user_id', '=', \Auth::user()->id)->get(),
+        ];
+        return view('user.homeparty.index', $data);
+    }
+
+    public function detail($id)
+    {
+        if($id === 'new'){
+            $homeparty = new Homeparty();
+        }else{
+            $homeparty = $this->getHomparty($id);
+        }
+        if($homeparty->homeparty_host){
+            $homeparty_user = $homeparty->homeparty_host;
+        }else{
+            $homeparty_user = new HomepartyUser();
+            $homeparty_user->is_host = true;
+        }
+
+        if($homeparty->completed){
+            abort(404);
+        }
+
+        $data = [
+             'homeparty' => $homeparty,
+             'homeparty_user' => $homeparty_user,
+
+        ];
+        return view('user.homeparty.detail', $data);
+    }
+
+    public function store($id = null)
+    {
+        $data = Request::all();
+        if($data['action'] === 'homeparty-party-store'){
+            $rules = array(
+                'date' => 'required',
+                'name' => 'required',
+                'place' => 'required'
+            );
+        }
+        if($data['action'] === 'homeparty-user-store'){
+            $rules = array(
+                'billing_salutation' => 'required',
+                'billing_firstname' => 'required',
+                'billing_lastname' => 'required',
+                'billing_address' => 'required',
+                'billing_zipcode' => 'required',
+                'billing_city' => 'required',
+                'billing_country_id' => 'required',
+            );
+            if (!Request::get('same_as_billing')) {
+                $rules = array_merge($rules, [
+                    'shipping_firstname' => 'required',
+                    'shipping_lastname' => 'required',
+                    'shipping_address' => 'required',
+                    'shipping_zipcode' => 'required',
+                    'shipping_city' => 'required',
+                    'shipping_salutation' => 'required',
+                    'shipping_country_id' => 'required'
+                ]);
+            }
+        }
+
+        $validator = Validator::make(Request::all(), $rules);
+        if ($validator->fails()) {
+            return back()->withErrors($validator)->withInput(Request::all());
+        }
+
+        if($data['action'] === 'homeparty-party-store'){
+            if(!$id){
+                //first save create and empty user/host
+                do {
+                    $token = Util::uuidToken();
+                } while( Homeparty::where('token', $token)->count() );
+                $data['token'] = $token;
+                $data['auth_user_id'] = \Auth::user()->id;
+                $homeparty = Homeparty::create($data);
+
+                $homeparty_user = HomepartyUser::create([
+                    'homeparty_id' => $homeparty->id,
+                    'auth_user_id' => \Auth::user()->id,
+                    'is_host' => true,
+                ]);
+            }else {
+                $homeparty = $this->getHomparty($id);
+                $homeparty->fill($data)->save();
+            }
+        }
+
+        if($data['action'] === 'homeparty-user-store'){
+            $homeparty = $this->getHomparty($id);
+            $data['same_as_billing'] = isset($data['same_as_billing']) ? true : false;
+            $data['shipping_country_id'] = isset($data['shipping_country_id']) ? $data['shipping_country_id'] : $data['billing_country_id'];
+            $homeparty_user = $homeparty->homeparty_host;
+            $homeparty_user->fill($data)->save();
+        }
+
+        \Session()->flash('alert-save', '1');
+        return redirect(route('user_homeparty_detail', $homeparty->id));
+    }
+
+
+    public function guests($id = null)
+    {
+        $homeparty = $this->getHomparty($id);
+        $data = [
+            'homeparty' => $homeparty,
+        ];
+        return view('user.homeparty.guests', $data);
+    }
+
+
+    public function guestDetail($id = null, $gid = null)
+    {
+        $homeparty = $this->getHomparty($id);
+        if($gid === 'new'){
+            $homeparty_user = new HomepartyUser();
+        }else{
+            $homeparty_user = HomepartyUser::findOrFail($gid);
+            if($homeparty->id !== $homeparty_user->homeparty_id){
+                abort(404);
+            }
+        }
+        if($homeparty->completed){
+            abort(404);
+        }
+        $data = [
+            'homeparty' => $homeparty,
+            'homeparty_user' => $homeparty_user,
+        ];
+        return view('user.homeparty.guest_detail', $data);
+    }
+
+    public function guestStore($id = null, $gid = null)
+    {
+        $data = Request::all();
+        $rules = array(
+            'billing_salutation' => 'required',
+            'billing_firstname' => 'required',
+            'billing_lastname' => 'required',
+            'billing_address' => 'required',
+            'billing_zipcode' => 'required',
+            'billing_city' => 'required',
+            'billing_country_id' => 'required',
+        );
+        if (!Request::get('same_as_billing')) {
+            $rules = array_merge($rules, [
+                'shipping_firstname' => 'required',
+                'shipping_lastname' => 'required',
+                'shipping_address' => 'required',
+                'shipping_zipcode' => 'required',
+                'shipping_city' => 'required',
+                'shipping_salutation' => 'required',
+                'shipping_country_id' => 'required'
+            ]);
+        }
+        $validator = Validator::make(Request::all(), $rules);
+        if ($validator->fails()) {
+            return back()->withErrors($validator)->withInput(Request::all());
+        }
+
+        $homeparty = $this->getHomparty($id);
+        if($gid === null){
+            $homeparty_user = HomepartyUser::create([
+                'homeparty_id' => $homeparty->id,
+                'auth_user_id' => \Auth::user()->id,
+                'is_host' => false,
+                ]);
+        }else{
+            $homeparty_user = HomepartyUser::findOrFail($gid);
+        }
+        if($homeparty->id !== $homeparty_user->homeparty_id){
+            abort(404);
+        }
+        $data['same_as_billing'] = isset($data['same_as_billing']) ? true : false;
+        $data['shipping_country_id'] = isset($data['shipping_country_id']) ? $data['shipping_country_id'] : $data['billing_country_id'];
+        $homeparty_user->fill($data)->save();
+        \Session()->flash('alert-save', '1');
+        return redirect(route('user_homeparty_guests', [$homeparty->id]));
+    }
+
+
+    public function order($id = null)
+    {
+        $user = User::find(Auth::user()->id);
+
+        $homeparty = $this->getHomparty($id);
+        HomepartyCart::calculateHomeparty($homeparty);
+        $userHistoryPaymentOrder = UserHistory::whereUserId($user->id)->whereAction('payment_homeparty')->where('referenz', $homeparty->id)->get()->last();
+        $data = [
+            'homeparty' => $homeparty,
+            'userHistoryPaymentOrder' => $userHistoryPaymentOrder,
+        ];
+        return view('user.homeparty.order', $data);
+    }
+    //perform Request
+    public function orderStore($id = null)
+    {
+
+        $homeparty = $this->getHomparty($id);
+
+
+
+        if(Request::ajax()) {
+            $data = Request::all();
+
+            if($data['action'] === 'addProduct') {
+                if($data['homeparty_id'] == $homeparty->id){
+                    $homeparty_user = HomepartyUser::findOrFail($data['homeparty_user_id']);
+                    if($homeparty_user->homeparty_id !== $homeparty->id){
+                        abort(404);
+                    }
+                    if($product = Product::find($data['product_id'])){
+                        $margin = 0;
+                        if(\Auth::user() && \Auth::user()->user_level){
+                            $margin = \Auth::user()->user_level->margin;
+                        }
+                        $HomepartyUserOrderItem = HomepartyUserOrderItem::where('homeparty_user_id', $homeparty_user->id)->where('product_id', $product->id)->first();
+                        if($HomepartyUserOrderItem){
+                            $HomepartyUserOrderItem->qty = $HomepartyUserOrderItem->qty+1;
+                            $HomepartyUserOrderItem->save();
+                        }else{
+                            $HomepartyUserOrderItem = HomepartyUserOrderItem::create([
+                                'homeparty_id' => $homeparty->id,
+                                'homeparty_user_id' => $homeparty_user->id,
+                                'product_id' => $product->id,
+                                'qty' => 1,
+                                'price' => $product->price,
+                                'price_net' => $product->getPriceWith(true, false),
+                                'tax_rate' => $product->tax,
+                                'points' => $product->points,
+                                'margin' => $margin,
+                                'ek-price' => $product->getPriceWith(false, true),
+                                'slug' => $product->slug
+
+                            ]);
+                        }
+
+                    }
+
+                }
+                $homeparty_user = HomepartyUser::findOrFail($data['homeparty_user_id']);
+                HomepartyCart::calculateHomeparty($homeparty);
+                $html_user_cart = view("user.homeparty.show_products_order", ['homeparty' => $homeparty, 'homeparty_guest' => $homeparty_user])->render();
+                $html_bonus = view("user.homeparty.show_bonus", ['homeparty' => $homeparty])->render();
+                $html_host_bonus = view("user.homeparty.show_calc_bonus_host")->render();
+                $html_total = view("user.homeparty.show_total_order", ['homeparty' => $homeparty])->render();
+                return response()->json(['response' =>  true, 'data'=>$data, 'html_user_cart'=>$html_user_cart, 'html_bonus'=>$html_bonus, 'html_host_bonus'=>$html_host_bonus, 'html_total'=>$html_total]);
+            }
+
+            if($data['action'] === 'updateCart') {
+                if($data['homeparty_id'] == $homeparty->id){
+                    $homeparty_user = HomepartyUser::findOrFail($data['homeparty_user_id']);
+                    if($homeparty_user->homeparty_id !== $homeparty->id){
+                        abort(404);
+                    }
+                    if(isset($data['product_id']) && $product = Product::find($data['product_id'])){
+                        if(isset($data['order_item_id']) && $HomepartyUserOrderItem = HomepartyUserOrderItem::find($data['order_item_id'])){
+                            if(isset($data['qty'])){
+                                $qty = (int) $data['qty'];
+                                $qty = $qty < 1 ? 1 : $qty;
+                                $qty = $qty > 100 ? 100 : $qty;
+                                $HomepartyUserOrderItem->qty = $qty;
+                                $HomepartyUserOrderItem->save();
+                            }
+                        }
+                    }
+                }
+                $homeparty_user = HomepartyUser::findOrFail($data['homeparty_user_id']);
+                HomepartyCart::calculateHomeparty($homeparty);
+                $html_user_cart = view("user.homeparty.show_products_order", ['homeparty' => $homeparty, 'homeparty_guest' => $homeparty_user])->render();
+                $html_bonus = view("user.homeparty.show_bonus", ['homeparty' => $homeparty])->render();
+                $html_host_bonus = view("user.homeparty.show_calc_bonus_host")->render();
+                $html_total = view("user.homeparty.show_total_order", ['homeparty' => $homeparty])->render();
+                return response()->json(['response' =>  true, 'data'=>$data, 'html_user_cart'=>$html_user_cart, 'html_bonus'=>$html_bonus, 'html_host_bonus'=>$html_host_bonus, 'html_total'=>$html_total]);
+            }
+
+            if($data['action'] === 'removeFromCart') {
+                if($data['homeparty_id'] == $homeparty->id){
+                    $homeparty_user = HomepartyUser::findOrFail($data['homeparty_user_id']);
+                    if($homeparty_user->homeparty_id !== $homeparty->id){
+                        abort(404);
+                    }
+                    if(isset($data['product_id']) && $product = Product::find($data['product_id'])){
+                        if(isset($data['order_item_id']) && $HomepartyUserOrderItem = HomepartyUserOrderItem::find($data['order_item_id'])){
+                            $HomepartyUserOrderItem->delete();
+                        }
+                    }
+                }
+                $homeparty_user = HomepartyUser::findOrFail($data['homeparty_user_id']);
+                HomepartyCart::calculateHomeparty($homeparty);
+                $html_user_cart = view("user.homeparty.show_products_order", ['homeparty' => $homeparty, 'homeparty_guest' => $homeparty_user])->render();
+                $html_bonus = view("user.homeparty.show_bonus", ['homeparty' => $homeparty])->render();
+                $html_host_bonus = view("user.homeparty.show_calc_bonus_host")->render();
+                $html_total = view("user.homeparty.show_total_order", ['homeparty' => $homeparty])->render();
+                return response()->json(['response' =>  true, 'data'=>$data, 'html_user_cart'=>$html_user_cart, 'html_bonus'=>$html_bonus, 'html_host_bonus'=>$html_host_bonus, 'html_total'=>$html_total]);
+            }
+
+            if($data['action'] === 'updateDeliveryOption') {
+                if($data['homeparty_id'] == $homeparty->id){
+                    $homeparty_user = HomepartyUser::findOrFail($data['homeparty_user_id']);
+                    if($homeparty_user->homeparty_id !== $homeparty->id){
+                        abort(404);
+                    }
+                    if(isset($data['delivery'])){
+                        $homeparty_user->delivery = $data['delivery'];
+                        $homeparty_user->save();
+                    }
+                }
+                $homeparty_user = HomepartyUser::findOrFail($data['homeparty_user_id']);
+                HomepartyCart::calculateHomeparty($homeparty);
+                $html_user_cart = view("user.homeparty.show_products_order", ['homeparty' => $homeparty, 'homeparty_guest' => $homeparty_user])->render();
+                $html_bonus = view("user.homeparty.show_bonus", ['homeparty' => $homeparty])->render();
+                $html_host_bonus = view("user.homeparty.show_calc_bonus_host")->render();
+                $html_total = view("user.homeparty.show_total_order", ['homeparty' => $homeparty])->render();
+                return response()->json(['response' =>  true, 'data'=>$data, 'html_user_cart'=>$html_user_cart, 'html_bonus'=>$html_bonus, 'html_host_bonus'=>$html_host_bonus, 'html_total'=>$html_total]);
+            }
+
+
+            return response()->json(['response' =>  false, 'data'=>$data]);
+        }
+
+        HomepartyCart::calculateHomeparty($homeparty);
+        if(\App\Services\HomepartyCart::$price === 0){
+           \Session()->flash('alert-error', 'Dein Warenkorb ist leer, bitte füge erst Produkte hinzu.');
+           return redirect(route('user_homeparty_order', [$homeparty->id]));
+        }
+
+        //save the calucalte card!
+        $time = time();
+        $date = date('d.m.Y H:i:s', $time);
+        $user = User::find(Auth::user()->id);
+        Yard::instance('shopping')->destroy();
+        Yard::instance('shopping')->add($homeparty->id, 'Bestellung Homeparty '.$date, 1, \App\Services\HomepartyCart::$price, ['image' => "", 'slug' => $time, 'weight' => 0]);
+        do {
+            $identifier = Util::getToken();
+        } while( ShoppingInstance::where('identifier', $identifier)->count() );
+
+        HomepartyCart::store($identifier, $date);
+
+        $data = [];
+        $data['is_from'] = 'homeparty';
+        $data['shop_price_net'] = HomepartyCart::getFormattedPriceNet();
+        $data['shop_price_tax'] = HomepartyCart::getFormattedPriceTax();
+        $data['homeparty_id'] = $homeparty->id;
+        $data['is_for'] = 'hp';
+
+        ShoppingInstance::create([
+            'identifier' => $identifier,
+            'user_shop_id' => 1, //is first faker shop for nuy intern
+            'auth_user_id' => Auth::user()->id,
+            'payment' => 5, //Berater Membership
+            'subdomain' => url('/'),
+            'country_id' => Yard::instance('shopping')->getShippingCountryId(),
+            'shopping_data' => $data,
+            'back' => url()->previous(),
+
+        ]);
+
+        HomepartyCart::store($identifier, $date);
+        Yard::instance('shopping')->store($identifier);
+
+        $path = route('checkout.checkout_card', ['identifier'=>$identifier]);
+        UserHistory::create(['user_id' => $user->id, 'action'=>'payment_homeparty', 'status'=>1, 'referenz'=>$homeparty->id, 'identifier'=>$identifier]);
+        //$path = str_replace('http', 'https', $path);
+        return redirect()->secure($path);
+    }
+
+
+    public function delete($do, $id = null, $gid=null)
+    {
+        $homeparty = $this->getHomparty($id);
+
+        if($do === 'hpu'){
+            $homeparty_user = HomepartyUser::findOrFail($gid);
+            if($homeparty->id !== $homeparty_user->homeparty_id){
+                abort(404);
+            }
+            $homeparty_user->save();
+            $homeparty_user->delete();
+            \Session()->flash('alert-success', "Homeparty Gast gelöscht");
+            return redirect(route('user_homeparty_guests', [$homeparty->id]));
+
+        }
+        if($do === 'hp') {
+
+            foreach ($homeparty->homeparty_users as $homeparty_user){
+                if ($homeparty->id !== $homeparty_user->homeparty_id) {
+                    abort(404);
+                }
+                $homeparty_user->save();
+                $homeparty_user->delete();
+            }
+            $homeparty->delete();
+            \Session()->flash('alert-success', "Homeparty gelöscht");
+            return redirect(route('user_homepartys'));
+
+        }
+        abort(404);
+    }
+
+    private function getHomparty($id){
+        $homeparty = Homeparty::findOrFail($id);
+        if($homeparty->auth_user_id !== \Auth::user()->id){
+            abort(404);
+        }
+        return $homeparty;
+    }
+
+    public function datatable(){
+        $query = Product::select('products.*')->where('active', true)->where(function ($q) {
+            $q->where('show_at', '=', 0)
+                ->orWhere('show_at', '=', 1);
+        });
+
+        return \DataTables::eloquent($query)
+
+            ->addColumn('add_card', function (Product $product) {
+                return '<button type="button" class="btn btn-sm btn-md-extra btn-secondary add-product-basket" data-product-id="'.$product->id.'">
+                            <strong>&euro; '.$product->getFormattedPriceWith(false, false).'</strong>&nbsp; +<span class="ion ion-md-cart"></span>
+                        </button>';
+            })
+            ->addColumn('picture', function (Product $product) {
+                if(count($product->images)){
+                    return '<img class="img-fluid img-extra" alt="" src="'.route('product_image', [$product->images->first()->slug]).'">';
+                }
+                return "";
+            })
+            ->addColumn('price_net', function (Product $product) {
+                return $product->getFormattedPriceWith(true, true). " €";
+            })
+            ->addColumn('price_gross', function (Product $product) {
+                return $product->getFormattedPriceWith(false, true). " €";
+            })
+            ->addColumn('price_vk_gross', function (Product $product) {
+                return $product->getFormattedPriceWith(false, false). " €";
+            })
+            ->addColumn('action', function (Product $product) {
+                return '<button class="btn btn-default btn-sm icon-btn md-btn-flat product-tooltip" title="details" data-modal="modal-lg" 
+                        data-toggle="modal" data-target="#modals-load-content" data-id="'.$product->id.'" data-route="'.route('modal_load').'"
+                        data-action="user-order-show-product" data-view="customer"><i class="ion ion-md-eye"></i></button>';
+            })
+            ->filterColumn('product', function($query, $keyword) {
+                if($keyword != ""){
+                    $query->where('name', 'LIKE', '%'.$keyword.'%');
+                }
+            })
+            ->orderColumn('name', 'name $1')
+            ->orderColumn('product', 'name $1')
+            ->orderColumn('number', 'number $1')
+            ->orderColumn('points', 'points $1')
+            ->orderColumn('price_net', 'price_net $1')
+            ->orderColumn('price_gross', 'price_gross $1')
+            ->orderColumn('price_vk_gross', 'price $1')
+            ->orderColumn('contents_total', 'contents_total $1')
+            ->orderColumn('weight', 'weight $1')
+
+            ->rawColumns(['add_card', 'product', 'quantity', 'picture', 'action'])
+            ->make(true);
+    }
+
+}

app/Http/Controllers/User/OrderController.php

@@ -0,0 +1,495 @@
+<?php
+
+
+namespace App\Http\Controllers\User;
+use App\Http\Controllers\Controller;
+use App\Models\Product;
+use App\Models\ShippingCountry;
+use App\Models\ShoppingInstance;
+use App\Models\ShoppingOrder;
+use App\Models\ShoppingUser;
+use App\Models\UserHistory;
+use App\Models\UserShop;
+use App\Services\Payment;
+use App\Services\Util;
+use App\User;
+use Auth;
+use Request;
+use Validator;
+use Yard;
+
+
+class OrderController extends Controller
+{
+
+    public function __construct()
+    {
+        $this->middleware('superadmin');
+
+        $this->middleware('active.account');
+    }
+
+    public function index()
+    {
+
+        $data = [
+        ];
+        return view('user.order.index', $data);
+    }
+
+    public function detail($id)
+    {
+        $user = User::find(\Auth::user()->id);
+        $shopping_order = ShoppingOrder::findOrFail($id);
+        if($shopping_order->auth_user_id !== $user->id){
+            abort(404);
+        }
+        $shopping_order->getLastShoppingPayment();
+
+        $data = [
+             'shopping_order' => $shopping_order,
+             'isAdmin' => false,
+        ];
+        return view('user.order.detail', $data);
+    }
+
+    public function ordersDatatable(){
+
+        $user = User::find(\Auth::user()->id);
+        $query = ShoppingOrder::with('shopping_user', 'shopping_payments')->select('shopping_orders.*')->where('auth_user_id', '=', $user->id)->where('txaction', '!=', NULL);
+
+        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>';
+            })
+            ->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('payment', function (ShoppingOrder $ShoppingOrder) {
+                return $ShoppingOrder->getLastShoppingPayment('getPaymentType');
+            })
+            ->addColumn('shipped', function (ShoppingOrder $ShoppingOrder) {
+                return '<span class="badge badge-pill badge-'.$ShoppingOrder->getShippedColor().'">'.$ShoppingOrder->getShippedType().'</span>';
+            })
+            ->addColumn('is_for', function (ShoppingOrder $ShoppingOrder) {
+                if($ShoppingOrder->shopping_user->is_for === 'me'){
+                    return '<span class="badge badge-pill badge-secondary">Beraterbestellung</span>';
+                }
+                if($ShoppingOrder->shopping_user->is_for === 'ot'){
+                    return '<span class="badge badge-pill badge-info">Kundenbestellung</span>';
+                }
+                if($ShoppingOrder->shopping_user->is_for === 'hp'){
+                    return '<span class="badge badge-pill badge-dark">Homepartybestellung</span>';
+                }
+                return '-';
+            })
+            ->addColumn('reference', function (ShoppingOrder $ShoppingOrder) {
+                return $ShoppingOrder->getLastShoppingPayment('reference');
+            })
+            ->orderColumn('id', 'id $1')
+            ->orderColumn('txaction', 'txaction $1')
+            ->orderColumn('shipped', 'shipped $1')
+            ->orderColumn('total_shipping', 'total_shipping $1')
+            ->rawColumns(['id', 'txaction', 'is_for', 'shipped'])
+            ->make(true);
+    }
+
+
+    public function delivery($for, $id=null)
+    {
+        $user = User::find(\Auth::user()->id);
+
+        $shopping_user = null;
+        $delivery_id = null;
+        if($for === 'ot'){
+            $shopping_user = $this->checkShoppingUser($id, $user);
+            $delivery_id = $shopping_user->id;
+            if(!$this->checkShoppingCountry($for, $delivery_id) && !\Session()->has('custom-error')){
+                \Session()->flash('custom-error', __('validation.custom.shipping_not_found'));
+                return redirect(route('user_order_my_delivery', [$for, $delivery_id]));
+            }
+        }
+
+        if(Request::get('action') === 'next'){
+            Yard::instance('shopping')->destroy();
+            if(Request::get('switchers-radio-is-for') === 'ot'){
+                $delivery_id = $id;
+            }
+            return redirect(route('user_order_my_list', [Request::get('switchers-radio-is-for'), $delivery_id]));
+        }
+
+        $data = [
+            'shopping_user' => $shopping_user,
+            'isAdmin' => false,
+            'isView' => 'customer',
+            'for' => $for,
+            'delivery_id' => $delivery_id,
+        ];
+        return view('user.order.delivery', $data);
+    }
+
+    public function list($for, $id=null)
+    {
+        $user = User::find(\Auth::user()->id);
+        $shopping_user = null;
+        $delivery_id = null;
+
+        if($for === 'ot'){
+            $shopping_user = $this->checkShoppingUser($id, $user);
+            $delivery_id = $shopping_user->id;
+        }
+        $shipping_country_id = $this->checkShoppingCountry($for, $id);
+        if(!$shipping_country_id){
+            \Session()->flash('custom-error', __('validation.custom.shipping_not_found'));
+            return redirect(route('user_order_my_delivery', [$for, $delivery_id]));
+        }
+
+        Yard::instance('shopping')->setShippingCountryWithPrice($shipping_country_id, $for);
+
+        $data = [
+            'shopping_user' => $shopping_user,
+            'user' => $user,
+            'isAdmin' => false,
+            'isView' => 'customer',
+            'for' => $for,
+            'delivery_id' => $delivery_id,
+            'comp_products' => $this->getCompProducts($for),
+        ];
+        return view('user.order.list', $data);
+    }
+
+    public function payment($for, $id=null){
+        $data = Request::all();
+
+        $user = User::find(Auth::user()->id);
+        $rules = array(
+            'shipping_salutation' => 'required',
+            'shipping_firstname'=>'required',
+            'shipping_lastname'=>'required',
+            'shipping_address'=>'required',
+            'shipping_zipcode'=>'required',
+            'shipping_city' => 'required',
+            'shipping_state' => 'required',
+        );
+        $validator = Validator::make(Request::all(), $rules);
+
+        if ($validator->fails()) {
+            return back()->withErrors($validator)->withInput(Request::all());
+        }
+
+        if(Yard::instance('shopping')->getNumComp() > 0){
+            if(!isset($data['switchers-comp-product'])){
+                $validator->errors()->add('switchers-comp-product', __('Bitte wähle ein Kompensationsprodukt aus'));
+            }else{
+                if(!is_array($data['switchers-comp-product'])){
+                    $validator->errors()->add('switchers-comp-product', __('Bitte wähle ein Kompensationsprodukt aus'));
+                }else{
+                    if(count($data['switchers-comp-product']) !== Yard::instance('shopping')->getNumComp()){
+                        $validator->errors()->add('switchers-comp-product', __('Bitte wähle :count Kompensationsprodukte aus', ['count'=>Yard::instance('shopping')->getNumComp()]));
+                    }
+                }
+            }
+            if ($validator->errors()->count()) {
+                return back()->withErrors($validator)->withInput(Request::all());
+            }
+        }
+        do {
+            $identifier = Util::getToken();
+        } while( ShoppingInstance::where('identifier', $identifier)->count() );
+        $data['is_from'] = 'user_order';
+        $data['is_for'] = $for;
+        $data['shopping_user_id'] = $id;
+        unset($data['quantity']);
+        unset($data['_token']);
+
+        ShoppingInstance::create([
+            'identifier' => $identifier,
+            'user_shop_id' => 1, //is first faker shop for buy intern
+            'auth_user_id' => Auth::user()->id,
+            'payment' => 2, //Berater Shop
+            'subdomain' => url('/'),
+            'country_id' => Yard::instance('shopping')->getShippingCountryId(),
+            'shopping_data' => $data,
+            'back' => url()->previous(),
+
+        ]);
+        Yard::instance('shopping')->store($identifier);
+
+
+        //add to DB
+        $path = route('checkout.checkout_card', ['identifier'=>$identifier]);
+        UserHistory::create(['user_id' => $user->id, 'action'=>'user_order_payment', 'status'=>1, 'product_id'=>null, 'identifier'=>$identifier, 'abo_options'=>0]);
+        //$path = str_replace('http', 'https', $path);
+        return redirect()->secure($path);
+
+    }
+
+    private function checkShoppingCountry($for, $id=null){
+
+        $country_id = null;
+        if($for === 'me'){
+            $user = User::find(\Auth::user()->id);
+            if($user->same_as_billing){
+                $country_id = $user->account->country_id;
+            }else{
+                $country_id = $user->account->shipping_country_id;
+            }
+        }
+        if($for === 'ot' && $id){
+            $shopping_user = ShoppingUser::findOrFail($id);
+            if($shopping_user->same_as_billing){
+                $country_id = $shopping_user->billing_country_id;
+            }else{
+                $country_id = $shopping_user->shipping_country_id;
+            }
+        }
+
+        if($country_id){
+            if($shipping_country = ShippingCountry::whereCountryId($country_id)->first()){
+                return $shipping_country->id;
+            }
+        }
+        return false;
+    }
+
+    private function checkShoppingUser($id, $user){
+        if($id === null){
+            abort(403, 'Error: Keine User ID');
+        }
+        $shopping_user = ShoppingUser::findOrFail($id);
+        if($shopping_user->member_id !== $user->id){
+            abort(403, 'Error: Falsche User ID');
+        }
+        $shopping_user = ShoppingUser::findOrFail($id);
+        if($shopping_user->is_like){
+            abort(403, 'Error: Kunde in Prüfung');
+        }
+        return $shopping_user;
+    }
+
+    public function datatable(){
+
+        $show_at = 1;
+
+      //  $user = User::find(\Auth::user()->id);
+       ;
+
+        if(Request::get('shipping_is_for') === 'me'){
+            $query = Product::select('products.*')->where('active', true)->where(function ($q) {
+                $q->where('show_at', '=', 1)
+                    ->orWhere('show_at', '=', 2)
+                    ->orWhere('show_at', '=', 6);
+
+            });
+
+        }else{
+            $query = Product::select('products.*')->where('active', true)->where(function ($q) {
+                    $q->where('show_at', '=', 0)
+                        ->orWhere('show_at', '=', 1);
+                });
+
+        }
+
+
+            //Kunden und Berater
+            //->orWhere('show_at', '=', 2); // Nur Berater
+            //->orderBy('pos', 'DESC')
+            //->orderBy('id', 'DESC');
+
+        return \DataTables::eloquent($query)
+
+            ->addColumn('product', function (Product $product) {
+
+                $cartItem = Yard::instance('shopping')->getCartItemByProduct($product->id);
+                $qty = isset($cartItem->qty) ? $cartItem->qty : 0;
+                $rowId = isset($cartItem->rowId) ? $cartItem->rowId : '';
+                return '<strong>'.$product->name.'</strong><br><div class="no-line-break input-group-min-w">
+                        <div class="input-group d-inline-flex w-auto">
+                            <span class="input-group-prepend">
+                              <button type="button" class="btn btn-secondary icon-btn md-btn-extra remove-product-basket" data-row-id="'.$rowId.'" data-product-id="'.$product->id.'">-</button>
+                            </span>
+                            <input type="text" class="form-control text-center input-extra table-input-event-onchange" name="product_qty_'.$product->id.'" data-row-id="'.$rowId.'" data-product-id="'.$product->id.'" value="'.$qty.'">
+                            <span class="input-group-append">
+                              <button type="button" class="btn btn-secondary icon-btn md-btn-extra add-product-basket" data-row-id="'.$rowId.'" data-product-id="'.$product->id.'">+</button>
+                            </span>
+                        </div>
+                        </div>';
+            })
+            /*
+
+            ->addColumn('add_card', function (Product $product) {
+                return '<button type="button" class="btn btn-sm btn-md-extra btn-secondary add-product-basket" data-product-id="'.$product->id.'">
+                            <strong>&euro; '.$product->getFormattedPriceWith().'</strong>&nbsp; +<span class="ion ion-md-cart"></span>
+                        </button>';
+            })
+            ->addColumn('quantity', function (Product $product) {
+                $cartItem = Yard::instance('shopping')->getCartItemByProduct($product->id);
+                $qty = isset($cartItem->qty) ? $cartItem->qty : 0;
+                $rowId = isset($cartItem->rowId) ? $cartItem->rowId : '';
+                return '<div class="no-line-break input-group-min-w">
+                        <div class="input-group d-inline-flex w-auto">
+                            <span class="input-group-prepend">
+                              <button type="button" class="btn btn-secondary icon-btn md-btn-extra remove-product-basket" data-row-id="'.$rowId.'" data-product-id="'.$product->id.'">-</button>
+                            </span>
+                            <input type="text" class="form-control text-center input-extra table-input-event-onchange" name="product_qty_'.$product->id.'" data-row-id="'.$rowId.'" data-product-id="'.$product->id.'" value="'.$qty.'">
+                            <span class="input-group-append">
+                              <button type="button" class="btn btn-secondary icon-btn md-btn-extra add-product-basket" data-row-id="'.$rowId.'" data-product-id="'.$product->id.'">+</button>
+                            </span>
+                        </div>
+                        </div>';
+
+            })*/
+            ->addColumn('picture', function (Product $product) {
+                if(count($product->images)){
+                    return '<img class="img-fluid img-extra" alt="" src="'.route('product_image', [$product->images->first()->slug]).'">';
+                }
+                return "";
+            })
+            ->addColumn('price_net', function (Product $product) {
+                return $product->getFormattedPriceWith(true, true). " €";
+            })
+            ->addColumn('price_gross', function (Product $product) {
+                return $product->getFormattedPriceWith(false, true). " €";
+            })
+            ->addColumn('price_vk_gross', function (Product $product) {
+                return $product->getFormattedPriceWith(false, false). " €";
+            })
+            ->addColumn('action', function (Product $product) {
+                return '<button class="btn btn-default btn-sm icon-btn md-btn-flat product-tooltip" title="details" data-modal="modal-lg" 
+                        data-toggle="modal" data-target="#modals-load-content" data-id="'.$product->id.'" data-route="'.route('modal_load').'"
+                        data-action="user-order-show-product" data-view="customer"><i class="ion ion-md-eye"></i></button>';
+            })
+            ->filterColumn('product', function($query, $keyword) {
+                if($keyword != ""){
+                    $query->where('name', 'LIKE', '%'.$keyword.'%');
+                }
+            })
+            ->orderColumn('name', 'name $1')
+            ->orderColumn('product', 'name $1')
+            ->orderColumn('number', 'number $1')
+            ->orderColumn('points', 'points $1')
+            ->orderColumn('price_net', 'price_net $1')
+            ->orderColumn('price_gross', 'price_gross $1')
+            ->orderColumn('price_vk_gross', 'price $1')
+            ->orderColumn('contents_total', 'contents_total $1')
+            ->orderColumn('weight', 'weight $1')
+
+            ->rawColumns(['add_card', 'product', 'quantity', 'picture', 'action'])
+            ->make(true);
+    }
+
+
+    public function performRequest(){
+
+        if(Request::ajax()) {
+            $data = Request::all();
+
+            $is_for = isset($data['shipping_is_for']) ? $data['shipping_is_for'] : 'ot';
+            $data['comp_products'] = $this->getCompProducts($is_for);
+
+            if($data['action'] === 'updateCart' && isset($data['product_id'])){
+                if($product = Product::find($data['product_id'])){
+                    $image = "";
+                    if($product->images->count()){
+                        $image = $product->images->first()->slug;
+                    }
+
+                    //get the card item
+                    $cartItem = Yard::instance('shopping')->add($product->id, $product->getLang('name'), 1, $product->getPriceWith(false, true), ['image' => $image, 'slug' => $product->slug, 'weight' => $product->weight, 'points' => $product->points]);
+                    Yard::setTax($cartItem->rowId, $product->tax);
+
+                    if(isset($data['qty'])  && $data['qty'] > 0){
+                        Yard::instance('shopping')->update($cartItem->rowId, $data['qty']);
+                    }else{
+                        //if 0 get the item by qty:1 and remove it
+                        Yard::instance('shopping')->remove($cartItem->rowId);
+                    }
+                    //
+
+                    Yard::instance('shopping')->reCalculateShippingPrice();
+                    $this->checkCompProduct(Yard::instance('shopping')->getNumComp());
+                    $html_card = view("user.order.yard_view_form", $data)->render();
+                    $html_comp = view("user.order.comp_product", $data)->render();
+
+                    return response()->json(['response' =>  true, 'data'=>$data, 'html_card'=>$html_card, 'html_comp'=>$html_comp]);
+                }
+            }
+            if($data['action'] === 'clearCart') {
+                Yard::instance('shopping')->destroy();
+                return response()->json(['response' =>  true, 'data'=>Yard::instance('shopping')->count(), 'html_card'=>'', 'html_comp'=>'']);
+
+            }
+
+            if($data['action'] === 'updateShippingCountry') {
+                if(isset($data['shipping_country_id'])){
+                    if($shipping_country = ShippingCountry::find($data['shipping_country_id'])){
+                        Yard::instance('shopping')->setShippingCountryWithPrice($shipping_country->id, $is_for);
+                        $this->checkCompProduct(Yard::instance('shopping')->getNumComp());
+                    }
+                }
+                $html_card = view("user.order.yard_view_form", $data)->render();
+                $html_comp = view("user.order.comp_product", $data)->render();
+                return response()->json(['response' =>  true, 'data'=>$data, 'html_card'=>$html_card, 'html_comp'=>$html_comp]);
+
+            }
+            if($data['action'] === 'updateCompProduct'){
+                   // $data['comp_product_id']
+                   // $data['comp_num']
+                //count_comp_products
+                    $this->updateCompProduct($data);
+                    Yard::instance('shopping')->reCalculateShippingPrice();
+                    $html_card = view("user.order.yard_view_form", $data)->render();
+                    $html_comp = view("user.order.comp_product", $data)->render();
+
+                    return response()->json(['response' =>  true, 'data'=>$data, 'html_card'=>$html_card, 'html_comp'=>$html_comp]);
+
+            }
+            return response()->json(['response' =>  false, 'data'=>$data]);
+        }
+    }
+
+    private function checkCompProduct($count_comp_products){
+        foreach (Yard::instance('shopping')->content() as $row) {
+            //wenn gleich löschen, da neue Versandkosten
+            if($row->options->comp > $count_comp_products) {
+                Yard::instance('shopping')->remove($row->rowId);
+            }
+        }
+    }
+    private function updateCompProduct($data){
+          //clear old
+          foreach (Yard::instance('shopping')->content() as $row) {
+              //wenn kleiner wurde ein produkt entfernt aufgrund der Anzahl
+              //wenn gleich löschen, da neue Versandkosten
+              if($row->options->comp === $data['comp_num'] || $row->options->comp > $data['count_comp_products']) {
+                  Yard::instance('shopping')->remove($row->rowId);
+              }
+          }
+
+          if(isset($data['comp_product_id'])) {
+                if ($product = Product::find($data['comp_product_id'])) {
+                    $image = "";
+                    if ($product->images->count()) {
+                        $image = $product->images->first()->slug;
+                    }
+                    $cartItem = Yard::instance('shopping')->add($product->id, $product->getLang('name'), 1, 0,
+                        ['image' => $image, 'slug' => $product->slug, 'weight' => 0, 'points' => 0,
+                            'comp' => $data['comp_num'], 'product_id' => $product->id]);
+                    Yard::setTax($cartItem->rowId, 0);
+                }
+            }
+    }
+
+    private function getCompProducts($for){
+        if($for === 'me'){
+           return Product::whereActive(true)->where('show_at', '=', 1)->where('shipping_addon', true)->orderBy('pos', 'DESC')->get();
+        }
+        return null;
+    }
+}

app/Http/Controllers/User/ShopSalesController.php

@@ -0,0 +1,74 @@
+<?php
+
+
+namespace App\Http\Controllers\User;
+use App\Http\Controllers\Controller;
+use App\Models\ShoppingOrder;
+use App\Services\Payment;
+use App\User;
+
+
+class ShopSalesController extends Controller
+{
+
+    public function __construct()
+    {
+        $this->middleware('active.shop');
+    }
+
+    public function orders()
+    {
+        $data = [
+        ];
+        return view('user.shop.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.shop.sales.order_detail', $data);
+    }
+
+    public function ordersDatatable(){
+
+        $user = User::find(\Auth::user()->id);
+        $query = ShoppingOrder::with('shopping_user')->select('shopping_orders.*')->where('member_id', $user->id);
+
+        return \DataTables::eloquent($query)
+            ->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
+                return '<a href="' . route('user_shop_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>' : '';
+            })
+
+            ->orderColumn('id', 'id $1')
+            ->orderColumn('txaction', 'txaction $1')
+            ->orderColumn('user_shop_id', 'user_shop_id $1')
+            ->rawColumns(['id', 'txaction', 'user_shop_id'])
+            ->make(true);
+    }
+
+
+
+}

app/Http/Controllers/User/TeamController.php

@@ -0,0 +1,31 @@
+<?php
+
+
+namespace App\Http\Controllers\User;
+use App\Http\Controllers\Controller;
+use App\User;
+
+
+class TeamController extends Controller
+{
+
+    public function __construct()
+    {
+        $this->middleware('active.account');
+    }
+
+    public function members()
+    {
+        $user = User::find(\Auth::user()->id);
+        if($user->isActiveShop() && $user->shop){
+            $shop_register_link = $user->shop->getSubdomain(false)."/reg";
+        }else{
+            $member_id = 'm'.($user->id + config('mivita.add_number_id'));
+            $shop_register_link =  config('app.protocol').config('app.domain').config('app.tld_care').'/reg/'.$member_id;
+        }
+        $data = [
+            'shop_register_link' => $shop_register_link
+        ];
+        return view('user.team.members', $data);
+    }
+}