reorganize

This commit is contained in:
Ludovic CANDELLIER
2022-11-11 13:24:24 +01:00
parent 7df2421373
commit caee665758
21 changed files with 25 additions and 30 deletions

View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\Auth;
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;

View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\Auth;
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;

View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\Auth;
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
@@ -37,7 +37,7 @@ class LoginController extends Controller
if ($this->guard()->attempt($credentials, $request->get('remember'))) {
$request->session()->regenerate();
return (back()->getTargetUrl() == route('Shop.login')) ? redirect()->intended(route('home')) : back();
return (back()->getTargetUrl() == route('login')) ? redirect()->intended(route('home')) : back();
}
return back()->withInput($request->only('email', 'remember'));
}

View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\Auth;
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use Carbon\Carbon;

View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\Auth;
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;

View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers\Auth;
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\VerifiesEmails;

View File

@@ -20,12 +20,5 @@ class Orders
'route' => 'Admin.Shop.Invoices.index',
])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(2);
$menu->addTo('orders', 'Avoirs', [
'route' => 'Admin.Shop.Invoices.index',
])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(3);
$menu->addTo('orders', 'Bons de livraison', [
'route' => 'Admin.Shop.Invoices.index',
])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(4);
}
}

View File

@@ -15,11 +15,14 @@ class Customers
public static function editProfile($id = false)
{
$id = $id ? $id : self::getId();
dump($id);
exit;
$data = [
'customer' => self::get($id, ['addresses', 'deliveries', 'orders'])->toArray(),
'customer' => self::get($id, ['addresses', 'deliveries', 'orders']),
'deliveries' => Deliveries::getAll('sale_channel')->toArray(),
];
dump($data);
exit;
return $data;
}