commit 08-2025

app/Http/Controllers/SalesController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers;
 
 use Request;
 use App\Models\Setting;
-use App\Models\UserShop;
 use App\Services\Payment;
 use App\Models\ShoppingUser;
 use App\Models\ShoppingOrder;
@@ -13,6 +12,7 @@ use App\Models\ShoppingPayment;
 use App\Models\PaymentTransaction;
 use App\Services\CustomerPriority;
 use App\Repositories\InvoiceRepository;
+use App\Services\PaymentService;
 
 class SalesController extends Controller
 {
@@ -21,7 +21,167 @@ class SalesController extends Controller
         $this->middleware('admin');
     }
 
-    public function users(){
+    public function index(){
+
+        if(Request::get('reset') === 'filter'){
+            set_user_attr('filter_txaction', null);
+            set_user_attr('filter_member_id', null);
+            set_user_attr('filter_art', null);
+            set_user_attr('filter_shipped', null);
+            return redirect(route('admin_sales'));
+        }
+        //set Filter!
+        $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();
+        $data = [
+            'filter_members' => $filter_members,
+        ];
+        return view('admin.sales.index', $data);
+    }
+
+    public function detail($id){
+
+        $ShoppingOrder = ShoppingOrder::find($id);
+        if($ShoppingOrder->shipped == 0){
+            $ShoppingOrder->shipped = 1;
+            $ShoppingOrder->save();
+        }
+        $data = [
+            'shopping_order' => $ShoppingOrder,
+            'isAdmin' => true,
+            'isView' => $ShoppingOrder->auth_user_id ? 'sales_user' : 'sales_customer',
+        ];
+
+        return view('admin.sales.detail', $data);
+    }
+
+    public function detailStore($id){
+
+        $data = Request::all();
+        $change_member_error = false;
+        if($data['action']==='shopping-order-change-member'){
+            if(!isset($data['change_member_key']) || $data['change_member_key'] !== config('main.edit_data_pass')){
+                $change_member_error = "Das Passwort ist falsch.";
+            }else{
+                //change
+                $shopping_order = ShoppingOrder::findOrFail($data['id']);
+                CustomerPriority::newMemberForOrder($shopping_order, $data['change_member_id'], $data['customer_set_member_for']);
+                \Session()->flash('alert-save', true);
+                return redirect(route('admin_sales_detail', [$shopping_order->id]));
+            }
+        }
+        if($data['action']==='shopping-user-is-like-member'){
+            if(!isset($data['change_member_key']) || $data['change_member_key'] !== config('main.edit_data_pass')){
+                    \Session()->flash('alert-error', 'Das Passwort ist falsch.');
+                    return redirect($data['back']);
+            }else{
+                if(!isset($data['is_like_shopping_user_id'])){
+                    \Session()->flash('alert-error', 'Keine Änderung ausgewählt');
+                    return redirect($data['back']);
+                }
+                $shopping_user = ShoppingUser::findOrFail($data['id']);
+                $set_like_shopping_user = ShoppingUser::findOrFail($data['is_like_shopping_user_id']);
+                $send_member_mail = isset($data['send_member_mail']) ? true : false;
+                $change_shopping_user = isset($data['change_shopping_user']) ? true : false;
+                //Mail send in setIsLike
+                CustomerPriority::setIsLike($shopping_user, $set_like_shopping_user, $send_member_mail, $change_shopping_user);
+                \Session()->flash('alert-save', true);
+                return redirect($data['back']);
+            }
+        }
+        $ShoppingOrder = ShoppingOrder::find($id);
+        $data = [
+            'change_member_error' => $change_member_error,
+            'shopping_order' => $ShoppingOrder,
+            'isAdmin' => true,
+            'isView' => $ShoppingOrder->auth_user_id ? 'sales_user' : 'sales_customer',
+        ];
+        return view('admin.sales.detail', $data);
+    }
+
+    public function datatable(){
+
+        $query = ShoppingOrder::with('shopping_user', 'shopping_payments')->select('shopping_orders.*');
+
+        set_user_attr('filter_txaction', Request::get('filter_txaction'));
+        if(Request::get('filter_txaction') != ""){
+            if(Request::get('filter_txaction') === 'NULL'){
+                $query->where('txaction', '=', NULL);
+
+            }else{
+                $query->where('txaction', '=', Request::get('filter_txaction'));
+            }
+        }
+        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'));
+        }
+        
+        set_user_attr('filter_art', Request::get('filter_art'));
+        if(Request::get('filter_art') != ""){
+            if(Request::get('filter_art') === 'user_order'){
+                $query->where('shopping_orders.auth_user_id', '!=', NULL)->where('payment_for', '!=', 6);
+            }elseif(Request::get('filter_art') === 'customer_order'){
+                $query->where('shopping_orders.auth_user_id', NULL);
+            }elseif(Request::get('filter_art') === 'user_for_customer'){
+                $query->where('shopping_user_id', '!=', NULL)->where('payment_for', '=', 6);
+            }
+          //  $query->where('payment_for', '=', Request::get('filter_art'));
+        }
+        set_user_attr('filter_shipped', Request::get('filter_shipped'));
+        if(Request::get('filter_shipped') != ""){
+            $query->where('shipped', '=', Request::get('filter_shipped'));
+        }
+        return \DataTables::eloquent($query)
+            ->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
+                return '<a href="' . route('admin_sales_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('payment_for', function (ShoppingOrder $ShoppingOrder) {
+                return Payment::getPaymentForTypeBadge($ShoppingOrder);
+            })
+            ->addColumn('reference', function (ShoppingOrder $ShoppingOrder) {
+                return $ShoppingOrder->getLastShoppingPayment('reference');
+            })
+            ->addColumn('member_id', function (ShoppingOrder $ShoppingOrder) {
+                if($ShoppingOrder->member_id) {
+                    return $ShoppingOrder->member_id ? '<a href="' . route('admin_lead_edit', [$ShoppingOrder->member_id]) . '">' . $ShoppingOrder->member->getFullName() . '</a>' : '';
+                }
+                if($ShoppingOrder->shopping_user && $ShoppingOrder->shopping_user->is_like){
+                    return '<button type="button" class="btn btn-xs btn-outline-info" data-toggle="modal" data-target="#modals-load-content"
+                               data-id="'.$ShoppingOrder->shopping_user->id.'"
+                               data-action="shopping-user-is-like-member" 
+                               data-back="'.route('admin_sales').'" 
+                               data-modal="modal-xl" 
+                               data-route="'.route('modal_load').'"><span class="fa fa-edit"></span> Vertriebspartner zuordnen</button>';
+                }
+                return '';
+            })
+
+            ->orderColumn('id', 'id $1')
+            ->orderColumn('txaction', 'txaction $1')
+            ->orderColumn('payment_for', 'payment_for $1')
+            ->orderColumn('member_id', 'member_id $1')
+            ->orderColumn('shipped', 'shipped $1')
+            ->orderColumn('total_shipping', 'total_shipping $1')
+            ->rawColumns(['id', 'member_id', 'txaction', 'user_shop_id', 'payment_for', 'shipped'])
+            ->make(true);
+    }
+
+    /*public function users(){
 
         if(Request::get('reset') === 'filter'){
             return redirect(route('admin_sales_users'));
@@ -105,7 +265,7 @@ class SalesController extends Controller
         if(Request::get('reset') === 'filter'){
             set_user_attr('filter_txaction', null);
             set_user_attr('filter_member_id', null);
-            return redirect(route('admin_sales_customers'));
+            return redirect(route('admin_sales'));
         }
         $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 = [
@@ -141,7 +301,7 @@ class SalesController extends Controller
                 $shopping_order = ShoppingOrder::findOrFail($data['id']);
                 CustomerPriority::newMemberForOrder($shopping_order, $data['change_member_id'], $data['customer_set_member_for']);
                 \Session()->flash('alert-save', true);
-                return redirect(route('admin_sales_customers_detail', [$shopping_order->id]));
+                return redirect(route('admin_sales_detail', [$shopping_order->id]));
             }
         }
         if($data['action']==='shopping-user-is-like-member'){
@@ -169,7 +329,7 @@ class SalesController extends Controller
             'isAdmin' => true,
             'isView' => 'sales_customer',
         ];
-        return view('admin.sales.customer_detail', $data);
+        return view('admin.sales._detail', $data);
     }
 
     public function customersDatatable(){
@@ -192,7 +352,7 @@ class SalesController extends Controller
 
         return \DataTables::eloquent($query)
             ->addColumn('id', function (ShoppingOrder $ShoppingOrder) {
-                return '<a href="' . route('admin_sales_customers_detail', [$ShoppingOrder->id]) . '" class="btn icon-btn btn-sm btn-primary"><span class="fa fa-edit"></span></a>';
+                return '<a href="' . route('admin_sales_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");
@@ -223,7 +383,7 @@ class SalesController extends Controller
                     return '<button type="button" class="btn btn-xs btn-outline-info" data-toggle="modal" data-target="#modals-load-content"
                                data-id="'.$ShoppingOrder->shopping_user->id.'"
                                data-action="shopping-user-is-like-member" 
-                               data-back="'.route('admin_sales_customers').'" 
+                               data-back="'.route('admin_sales').'" 
                                data-modal="modal-xl" 
                                data-route="'.route('modal_load').'"><span class="fa fa-edit"></span> Vertriebspartner zuordnen</button>';
                 }
@@ -238,7 +398,7 @@ class SalesController extends Controller
             ->orderColumn('total_shipping', 'total_shipping $1')
             ->rawColumns(['id', 'member_id', 'txaction', 'user_shop_id', 'payment_for', 'shipped'])
             ->make(true);
-    }
+    }*/
 
     public function store(){
         $data = Request::all();
@@ -306,67 +466,11 @@ class SalesController extends Controller
 
             }
             
+        
+            /* txaction ändern
+                änderung der txaction von der Bestellung, Status Zahlung, offen, bezahlt, keine zahlung */
             if($data['action'] === 'store_txaction' && isset($data['txaction']) && isset($data['payment_id'])){
-                $shopping_order = ShoppingOrder::findOrFail($data['id']);
-                $shopping_payment = ShoppingPayment::findOrFail($data['payment_id']);
-
-                if($shopping_payment->txaction === $data['txaction']){
-                    return back();
-
-                }
-                //shopping_order_margin Bestellung im partner Center
-                if($shopping_order->shopping_order_margin && $shopping_order->shopping_order_margin->from_payment_credit > 0){
-                    $last_UserPayCredit = UserPayCredit::where('shopping_order_id', $shopping_order->id)->whereIn('status', [2, 4])->orderBy('id', 'DESC')->first();
-                    //Status Keine Zahlung, Guthaben zurückführen, wenn status 2 / deduction from payment
-                    if($last_UserPayCredit && $data['txaction'] === 'non' && $last_UserPayCredit->status === 2){
-                        Payment::handelUserPayCredits($shopping_order, 'return');
-                    }
-                    //Status Zahlung, voher gab es eine Storno, Guthaben abziehen wenn status 4 / return from order
-                    if($last_UserPayCredit && $last_UserPayCredit->status === 4 && ($data['txaction'] === 'open' || $data['txaction'] === 'paid')){
-                        Payment::handelUserPayCredits($shopping_order, 'deduction');
-                    }
-                }                
-                $payt = PaymentTransaction::create([
-                    'shopping_payment_id' => $shopping_payment->id,
-                    'request' =>  'transaction',
-                    'txid' => 0,
-                    'userid' => 0,
-                    'status' => $shopping_payment->clearingtype,
-                    'transmitted_data' => NULL,
-                    'txaction' => $data['txaction'],
-                    'mode' => $shopping_payment->mode,
-                ]);
-               
-                $shopping_order->txaction = $data['txaction'];
-                $shopping_order->paid = $payt->txaction === 'paid' ? true : false;
-                $shopping_order->save();
-                $shopping_payment->txaction = $data['txaction'];
-                $shopping_payment->save();
-                if($payt->status === 'vor' && $payt->txaction === 'paid'){
-                    $send_link = Payment::paymentStatusPaidAction($shopping_order, true);
-                }
-              
-                //handel credit loading by change when by $shopping_order_item->handl
-                if($shopping_order->shopping_user->is_for === 'cr'){
-                    $last_UserPayCredit = UserPayCredit::where('shopping_order_id', $shopping_order->id)->whereIn('status', [7, 8])->orderBy('id', 'DESC')->first();
-                    //Status Keine Zahlung, Guthaben abziehen, wenn status 7 <- wurde aufgeladen
-                    if($data['txaction'] === 'non' && $last_UserPayCredit && $last_UserPayCredit->status === 7){
-                        Payment::handelUserPayChargingCredits($shopping_order, 'remove');
-                    }
-                    //Status Zahlung, voher gab es eine Storno, Guthaben wieder aufladen, wenn bezahlt wenn status 8 
-                    if($last_UserPayCredit && $last_UserPayCredit->status === 8 && $data['txaction'] === 'paid'){
-                        Payment::handelUserPayChargingCredits($shopping_order, 'add');
-                    }
-                    
-                }
-
-                $edata = [
-                    'mode' => $payt->mode,
-                    'txaction' => $payt->txaction,
-                    'send_link' => false,
-                ];
-                //TODO can send MAIL
-                Payment::paymentStatusSendMail($shopping_order, $shopping_payment, $edata);
+                PaymentService::updateTransactionStatus($data['id'], $data['txaction'], $data['payment_id']);
             }
 
         }
@@ -391,9 +495,21 @@ class SalesController extends Controller
                 }else{
                     $user_invoice = $invoice_repo->create($data);
                 }
-                return redirect(route('admin_sales_users_detail', [$shopping_order->id]));
+                return redirect(route('admin_sales_detail', [$shopping_order->id]));
             }
         }
     }
 
+    public function sendLogisticMail($id){
+        $shopping_order = ShoppingOrder::findOrFail($id);
+       
+        if(\App\Services\Invoice::isInvoice($shopping_order)){
+            \App\Services\Invoice::sendLogisticMail($shopping_order);
+            \Session()->flash('alert-success', "Rechnung / Lieferschein wurde an den Versand gesendet.");
+        }else{
+            \Session()->flash('alert-error', "Keine Rechnung vorhanden.");
+        }
+        return redirect(route('admin_sales_detail', [$shopping_order->id]));
+    }
+
 }