fix devops error

This commit is contained in:
ludo
2024-01-05 01:30:46 +01:00
parent 90b0af5b2d
commit 5144c1f7fd
128 changed files with 410 additions and 2580 deletions

View File

@@ -4,18 +4,14 @@ namespace App\Http\Controllers\Shop;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\Categories;
class ArticleController extends Controller
{
public function show($id)
{
$data['article'] = Articles::getArticleToSell($id);
// $data['breadcrumb'] = Categories::getAncestorsByCategory($category_id);
$data['offers2'] = Articles::getSiblings($id)->toArray();
// dump($data);
// exit;
return view('Shop.Articles.show', $data);
}
}

View File

@@ -11,11 +11,6 @@ class ForgotPasswordController extends Controller
{
use SendsPasswordResetEmails;
protected function guard()
{
return Auth::guard('customer');
}
public function broker()
{
return Password::broker('customers');
@@ -25,4 +20,9 @@ class ForgotPasswordController extends Controller
{
return view('Shop.auth.passwords.email');
}
protected function guard()
{
return Auth::guard('customer');
}
}

View File

@@ -18,11 +18,6 @@ class LoginController extends Controller
// $this->middleware('guest')->except('logout');
}
protected function guard()
{
return Auth::guard('customer');
}
public function showLoginForm()
{
return view('Shop.auth.login');
@@ -38,10 +33,12 @@ 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('Shop.login')) ? redirect()->intended(route('home')) : back();
}
return back()->withErrors(['msg' => 'Identifiant ou mot de passe incorrect'])->withInput($request->only('email', 'remember'));
return back()->withErrors([
'msg' => 'Identifiant ou mot de passe incorrect',
])->withInput($request->only('email', 'remember'));
}
public function logout(Request $request)
@@ -57,4 +54,10 @@ class LoginController extends Controller
{
return 'email';
}
protected function guard()
{
return Auth::guard('customer');
}
}

View File

@@ -5,29 +5,15 @@ namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\CustomerAddresses;
use App\Repositories\Shop\Customers;
use Illuminate\Auth\Events\Registered;
use Illuminate\Foundation\Auth\EmailVerificationRequest;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class RegisterController extends Controller
{
// use RegistersUsers;
protected $redirectTo;
protected function guard()
{
return Auth::guard('customer');
}
protected function redirectTo()
{
return route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard'));
}
public function showRegistrationForm()
{
return view('Shop.auth.register');
@@ -35,16 +21,12 @@ class RegisterController extends Controller
public function register(Request $request)
{
dump('ici');
exit;
// event(new Registered($user = $this->create($request->all())));
$user = $this->create($request->all());
dump($user);
exit;
$this->guard()->login($user);
$response = $this->registered($request, $user);
if ($response = $this->registered($request, $user)) {
if ($response) {
return $response;
}
@@ -53,14 +35,6 @@ class RegisterController extends Controller
: redirect($this->redirectPath());
}
protected function create(array $data)
{
$user = Customers::create($data);
CustomerAddresses::add($user->id, $data);
return $user;
}
public function emailVerify()
{
if (Auth::user()->hasVerifiedEmail()) {
@@ -83,4 +57,23 @@ class RegisterController extends Controller
return back()->with('message', 'Verification link sent!');
}
protected function create(array $data)
{
$user = Customers::create($data);
CustomerAddresses::add($user->id, $data);
return $user;
}
protected function guard()
{
return Auth::guard('customer');
}
protected function redirectTo()
{
return route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard'));
}
}

View File

@@ -14,6 +14,11 @@ class ResetPasswordController extends Controller
protected $redirectTo = '/';
public function broker()
{
return Password::broker('customers');
}
public function showResetForm(Request $request, $token = null)
{
return view('Shop.auth.passwords.reset')->with([
@@ -31,11 +36,6 @@ class ResetPasswordController extends Controller
];
}
public function broker()
{
return Password::broker('customers');
}
protected function guard()
{
return Auth::guard('customer');

View File

@@ -25,11 +25,7 @@ class InvoiceController extends Controller
\Debugbar::disable();
$data['invoice'] = Invoices::getByUUID($uuid);
$filename = 'invoice-'.$uuid.'.pdf';
$html = view('Shop.Invoices.pdf', $data)->toHtml();
// $html = '<h1>Hello world!</h1>';
// return PDF::convertHTML($html);
// return view('Shop.Invoices.pdf', $data);
return PDF::view('Shop.Invoices.pdf', $data, $filename);
}
}

View File

@@ -31,7 +31,9 @@ class OrderController extends Controller
public function pdf($uuid)
{
$data['order'] = Orders::getByUUID($uuid);
$data = [
'order' => Orders::getByUUID($uuid),
];
return view('Shop.Orders.pdf', $data);
}
@@ -45,15 +47,14 @@ class OrderController extends Controller
$data = [
'customer' => $customer ? $customer->toArray() : false,
'basket' => Baskets::getBasketTotal(),
// 'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(),
'deliveries' => $deliveries ? $deliveries->toArray() : [],
'delivery_types' => DeliveryTypes::getWithPrice(Baskets::getWeight()),
];
return view('Shop.Orders.order', $data);
} else {
return redirect()->route('home');
}
return redirect()->route('home');
}
public function store(Request $request)
@@ -64,17 +65,13 @@ class OrderController extends Controller
$data['basket'] = Baskets::getBasketSummary($data['sale_channel_id'], $data['delivery_type_id'] ?? false);
$order = Orders::saveOrder($data);
if ($order) {
if ($data['payment_type'] == '1') {
if ($data['payment_type'] === '1') {
return Paybox::makeAuthorizationRequest($order);
} else {
return redirect()->route('Shop.Orders.confirmed');
}
if ($ret) {
OrderMails::sendOrderConfirmed($order->id);
}
} else {
return view('Shop.Orders.order');
OrderMails::sendOrderConfirmed($order->id);
return redirect()->route('Shop.Orders.confirmed');
}
return view('Shop.Orders.order');
}
public function confirmed()