Categories, Netto Homeparty

app/Http/Controllers/Api/AuthController.php

@@ -45,6 +45,15 @@ class AuthController extends Controller
             $token->expires_at = Carbon::now()->addDays(1);
         }
 
+        \DB::table('oauth_access_tokens')
+        ->whereDate('expires_at', '<', now()->addWeeks(1))
+        ->delete();
+
+        \DB::table('oauth_refresh_tokens')
+        ->whereDate('expires_at', '<', now()->addWeeks(1))
+        ->delete();
+
+
         $token->save();
         return response()->json([
             'access_token' => $tokenResult->accessToken,

app/Http/Controllers/Api/ShoppingUserController.php

@@ -275,7 +275,7 @@ class ShoppingUserController extends Controller
                 'user' => $user,
                 'customer_priority' => $priority,
                 'customer_number' => $shopping_user->number,
-                'member_email' =>  $shopping_user->member->email
+                'member_email' => ($shopping_user && $shopping_user->member) ? $shopping_user->member->email : false,
             ],
             'time' => Carbon::now()->toDateTimeString()
         ], 200);
@@ -385,7 +385,7 @@ class ShoppingUserController extends Controller
                     'user' => $user,
                     'order' => $order,
                     'customer_number' => $shopping_user->number,
-                    'member_email' =>  $shopping_user->member->email,
+                    'member_email' => ($shopping_user && $shopping_user->member) ? $shopping_user->member->email : false,
                     'status' => $shopping_user->getAPIShippedType(),
                 ],
                 'time' => Carbon::now()->toDateTimeString()

app/Http/Controllers/CronController.php

@@ -105,7 +105,7 @@ class CronController extends Controller
         dump($user->email." | ".$user->getPaymentAccountDateFormat());
         die();*/
         foreach ($users as $user){
-           // $this->checkReminderPayments($user);
+           $this->checkReminderPayments($user);
            $this->userInitAboPayment($user);      
         }
         return "TOSK";

app/Http/Controllers/User/HomepartyController.php

@@ -268,8 +268,8 @@ class HomepartyController extends Controller
                                 'points' => $product->points,
                                 'margin' => $margin,
                                 'ek-price' => $product->getPriceWith(false, true),
+                                'ek-price_net' => $product->getPriceWith(true, true),
                                 'slug' => $product->slug
-
                             ]);
                         }
 
@@ -368,7 +368,7 @@ class HomepartyController extends Controller
         $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]);
+        Yard::instance('shopping')->add($homeparty->id, 'Bestellung Homeparty '.$date, 1, \App\Services\HomepartyCart::$ek_price, ['image' => "", 'slug' => $time, 'weight' => 0]);
         do {
             $identifier = Util::getToken();
         } while( ShoppingInstance::where('identifier', $identifier)->count() );
@@ -377,8 +377,8 @@ class HomepartyController extends Controller
 
         $data = [];
         $data['is_from'] = 'homeparty';
-        $data['shop_price_net'] = HomepartyCart::getFormattedPriceNet();
-        $data['shop_price_tax'] = HomepartyCart::getFormattedPriceTax();
+        $data['shop_price_net'] = HomepartyCart::getFormattedEkPriceNet();
+        $data['shop_price_tax'] = HomepartyCart::getFormattedEkPriceTax();
         $data['homeparty_id'] = $homeparty->id;
         $data['is_for'] = 'hp';
 

app/Http/Controllers/UserUpdateEmailController.php

@@ -34,7 +34,7 @@ class UserUpdateEmailController extends Controller
 
     }
 
-    public function update(Request $request)
+    public function update()
     {
         $user = Auth::user();
 

app/Http/Controllers/UserUpdatePasswordController.php

@@ -27,11 +27,8 @@ class UserUpdatePasswordController extends Controller
     }
 
 
-    /**
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
-     */
-    public function updatePasswordStore(Request $request)
+   
+    public function updatePasswordStore()
     {
         $rules = array(
             'old_password' => 'required|old_password:' . Auth::user()->password,
@@ -54,8 +51,10 @@ class UserUpdatePasswordController extends Controller
             return view('user.update_password')->withErrors($validator);
 
         }
-        $request->user()->fill([
-            'password' => Hash::make($request->password)
+        $user = Auth::user();
+        $data = Request::all();
+        $user->fill([
+            'password' => Hash::make($data['password'])
         ])->save();
 
 
@@ -75,11 +74,8 @@ class UserUpdatePasswordController extends Controller
         return redirect(route('user_update_password'));
     }
 
-    /**
-     * @param Request $request
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
-     */
-    public function updatePasswordFirstStore(Request $request)
+   
+    public function updatePasswordFirstStore()
     {
         $rules = array(
             'password' => 'required|string|min:6|confirmed',
@@ -96,12 +92,14 @@ class UserUpdatePasswordController extends Controller
             return view('user.update_password_first')->withErrors($validator);
 
         }
-
-        $request->user()->fill([
-            'password' => Hash::make($request->password)
+        $user = Auth::user();
+        $data = Request::all();
+        $user->fill([
+            'password' => Hash::make($data['password'])
         ])->save();
 
 
+
         \Session()->flash('alert-save', '1');
         return redirect('/home');
     }