jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix devops error

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

48
app/Http/Controllers/Admin/Core/App/ApplicationController.php
View File

@@ -1,48 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Core\App;
use App\Datatables\Admin\Core\App\ApplicationsDataTable;
use App\Repositories\Core\App\Applications;
use Illuminate\Http\Request;
class ApplicationController extends Controller
{
public function index(ApplicationsDataTable $dataTable)
{
$data = \App\Repositories\Config::init();
return $dataTable->render('admin.Core.App.Application.index', $data);
}
public function edit(Request $request, $id = false)
{
$id = $id ? $id : $request->input('id');
$data = \App\Repositories\Config::init();
$data = Applications::get($id);
return view('Admin.Core.App.Application.edit', $data);
}
public function store(Request $request)
{
Applications::store($request->all());
return response()->json(['error' => 0]);
}
public function destroy(Request $request, $id = false)
{
$id = $id ? $id : $request->input('id');
Applications::destroy($id);
return response()->json(['error' => 0]);
}
public function toggleActive(Request $request)
{
$data = Applications::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}

59
app/Http/Controllers/Admin/Core/App/ApplicationModuleController.php
View File

@@ -1,59 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Core\App;
use App\Datatables\Admin\Core\App\ApplicationModulesDataTable;
use App\Repositories\Core\App\ApplicationModules;
use App\Repositories\Core\App\Applications;
use Illuminate\Http\Request;
class ApplicationModuleController extends Controller
{
public function index(ApplicationModulesDataTable $dataTable)
{
$data = \App\Repositories\Config::init();
return $dataTable->render('admin.Core.App.ApplicationModule.index', $data);
}
public function create()
{
$data = \App\Repositories\Config::init();
$data['applications'] = Applications::getOptions();
return view('Admin.Core.App.ApplicationModule.create', $data);
}
public function edit(Request $request, $id = false)
{
$id = $id ? $id : $request->input('id');
$data = \App\Repositories\Config::init();
$data = ApplicationModules::get($id)->toArray();
$data['applications'] = Applications::getOptions();
return view('Admin.Core.App.ApplicationModule.edit', $data);
}
public function store(Request $request)
{
ApplicationModules::store($request->all());
return redirect()->route('admin.Core.App.ApplicationModule.index')
->with('growl', [__('admin.successadd'), 'success']);
}
public function destroy(Request $request, $id = false)
{
$id = $id ? $id : $request->input('id');
ApplicationModules::destroy($id);
return response()->json(['error' => 0]);
}
public function toggleActive(Request $request)
{
$data = ApplicationModules::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}

9
app/Http/Controllers/Admin/Core/App/Controller.php
View File

@@ -1,9 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Core\App;
use App\Http\Controllers\Controller as ParentController;
class Controller extends ParentController
{
}

12
app/Http/Controllers/Admin/Core/Auth/RoleController.php
View File

@@ -6,6 +6,7 @@ use App\Datatables\Admin\Core\Auth\RolesDataTable;
use App\Models\Core\App\ApplicationModule;
use App\Models\Core\Auth\Permission;
use App\Models\Core\Auth\Role;
use App\Repositories\Config;
use App\Repositories\Core\Auth\Roles;
use Illuminate\Http\Request;
use Yajra\DataTables\DataTables;
@@ -14,7 +15,7 @@ class RoleController extends Controller
{
public function index(RolesDataTable $dataTable)
{
$data = \App\Repositories\Config::init();
$data = Config::init();
$data['modules'] = ApplicationModule::with('permissions')->get()->toArray();
return $dataTable->render('admin.Core.Auth.Role.index', $data);
@@ -29,7 +30,7 @@ class RoleController extends Controller
public function create()
{
$data = \App\Repositories\Config::init();
$data = Config::init();
return view('Admin.Core.Auth.Role.create', $data);
}
@@ -37,7 +38,7 @@ class RoleController extends Controller
public function edit(Request $request, $id = false)
{
$id = $id ? $id : $request->input('id');
$data = \App\Repositories\Config::init();
$data = Config::init();
$data['role'] = Roles::getWithPermissions($id);
$data['modules'] = ApplicationModule::with('permissions')->get()->toArray();
@@ -72,9 +73,6 @@ class RoleController extends Controller
'id' => $permission->id,
];
}
// Debug::fdump($data);
// Debug::fdump($permissions);
// exit;
$data['permissions'] = $data;
return view('Admin.Core.Auth.Role.manage', $data);
@@ -94,7 +92,7 @@ class RoleController extends Controller
public function toggleActive(Request $request)
{
$data = Roles::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
$data = Roles::toggle_active($request->input('id'), ($request->input('active') === 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}

6
app/Http/Controllers/Admin/Core/Auth/TeamController.php
View File

@@ -31,7 +31,8 @@ class TeamController extends Controller
$request->replace($input);
$this->validate(
$request, [
$request,
[
'name' => 'required|unique:teams,name',
'display_name' => 'required',
'description' => 'required',
@@ -55,7 +56,8 @@ class TeamController extends Controller
public function update(Request $request, $id)
{
$this->validate(
$request, [
$request,
[
'display_name' => 'required',
'description' => 'required',
]

47
app/Http/Controllers/Admin/Core/Auth/UserController.php
View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin\Core\Auth;
use App\Datatables\Admin\Core\Auth\UsersDataTable;
use App\Models\Core\Auth\User;
use App\Repositories\Config;
use App\Repositories\Core\Auth\Users;
use Carbon\Carbon;
use Illuminate\Http\Request;
@@ -15,14 +16,16 @@ class UserController extends Controller
{
public function index(UsersDataTable $dataTable)
{
$data = \App\Repositories\Config::init();
$data = Config::init();
return $dataTable->render('admin.Core.Auth.User.index', $data);
}
public function modalCreate()
{
$data['roles'] = Users::getRolesToEdit();
$data = [
'roles' => Users::getRolesToEdit(),
];
return view('Admin.Core.Auth.User.modal', $data);
}
@@ -55,13 +58,6 @@ class UserController extends Controller
public function store(Request $request)
{
/*
$this->validate($request, [
'last_name' => 'required',
'first_name' => 'required',
'email' => 'required|email|unique:users,email,NULL,id,deleted_at,NULL',
]);
*/
$input = $request->all();
if (empty($input['password'])) {
unset($input['password']);
@@ -74,7 +70,7 @@ class UserController extends Controller
public function edit($id)
{
$data = \App\Repositories\Config::init();
$data = Config::init();
$data['roles'] = Users::getRolesToEdit();
$data['user'] = Users::get($id);
@@ -95,13 +91,11 @@ class UserController extends Controller
public function firstLoginPost(Request $request)
{
$this->validate(
$request, [
'token' => 'required',
'password' => 'required|min:8',
'password_confirmation' => 'required|same:password',
]
);
$this->validate($request, [
'token' => 'required',
'password' => 'required|min:8',
'password_confirmation' => 'required|same:password',
]);
$user = User::where(['remember_token' => $request->input('token')])->first();
@@ -128,19 +122,18 @@ class UserController extends Controller
public function profilePost(Request $request)
{
$this->validate(
$request, [
'avatar' => 'mimes:jpeg,png|max:10000',
'last_name' => 'required',
'first_name' => 'required',
'password_confirmation' => 'same:password',
]
);
$this->validate($request, [
'avatar' => 'mimes:jpeg,png|max:10000',
'last_name' => 'required',
'first_name' => 'required',
'password_confirmation' => 'same:password',
]);
$avatar = $request->file('avatar');
$user = Auth::user();
$file = $avatar->isValid();
if ($avatar && $file = $avatar->isValid()) {
if ($avatar && $file) {
$destinationPath = dirname($user->avatar_path);
if (! is_dir($destinationPath)) {
mkdir($destinationPath, 0766, true);
@@ -181,7 +174,7 @@ class UserController extends Controller
public function toggleActive(Request $request)
{
$data = Users::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
$data = Users::toggle_active($request->input('id'), ($request->input('active') === 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}

30
app/Http/Controllers/Admin/Shop/ArticleController.php
View File

@@ -67,24 +67,32 @@ class ArticleController extends Controller
return Articles::destroy($id);
}
public function getProductDescription($product_id, $model)
public function getProductDescription($productId, $model)
{
$data['article']['inherited'] = Articles::getInheritedByProduct($product_id, base64_decode($model));
$data = [
'article' => [
'inherited' => Articles::getInheritedByProduct($productId, base64_decode($model)),
],
];
return view('Admin.Shop.Articles.partials.product.description', $data);
}
public function getProductTags($product_id, $model)
public function getProductTags($productId, $model)
{
$data = Articles::getInheritedByProduct($product_id, base64_decode($model));
$data = Articles::getInheritedByProduct($productId, base64_decode($model));
return view('Admin.Shop.Articles.partials.product.tags', $data);
}
public function getProductImages($product_id, $model)
public function getProductImages($productId)
{
$data['article']['product_id'] = $product_id;
$data['no_popup'] = false;
$data = [
'article' => [
'product_id' => $productId,
],
'no_popup' => false,
];
return view('Admin.Shop.Articles.partials.product.images', $data);
}
@@ -92,7 +100,9 @@ class ArticleController extends Controller
public function getImages(Request $request, $id = false)
{
$id = $id ? $id : $request->input('id');
$data['images'] = Articles::getImages($id);
$data = [
'images' => Articles::getImages($id),
];
return view('components.uploader.mini-gallery-items', $data);
}
@@ -107,14 +117,14 @@ class ArticleController extends Controller
public function toggleVisible(Request $request)
{
$data = Articles::toggleVisible($request->input('id'), ($request->input('visible') == 'true') ? 1 : 0);
$data = Articles::toggleVisible($request->input('id'), ($request->input('visible') === 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
public function toggleHomepage(Request $request)
{
$data = Articles::toggleHomepage($request->input('id'), ($request->input('homepage') == 'true') ? 1 : 0);
$data = Articles::toggleHomepage($request->input('id'), ($request->input('homepage') === 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}

4
app/Http/Controllers/Admin/Shop/CategoryController.php
View File

@@ -80,14 +80,14 @@ class CategoryController extends Controller
public function toggleVisible(Request $request)
{
$data = Categories::toggle_visible($request->input('id'), ($request->input('visible') == 'true') ? 1 : 0);
$data = Categories::toggleVisible($request->input('id'), ($request->input('visible') === 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
public function toggleHomepage(Request $request)
{
$data = Categories::toggleHomepage($request->input('id'), ($request->input('homepage') == 'true') ? 1 : 0);
$data = Categories::toggleHomepage($request->input('id'), ($request->input('homepage') === 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}

2
app/Http/Controllers/Admin/Shop/DeliveryController.php
View File

@@ -53,7 +53,7 @@ class DeliveryController extends Controller
public function toggleActive(Request $request)
{
$data = Deliveries::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
$data = Deliveries::toggle_active($request->input('id'), ($request->input('active') === 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}

5
app/Http/Controllers/Admin/Shop/InvoiceController.php
View File

@@ -38,11 +38,6 @@ class InvoiceController extends Controller
{
$data = Invoices::init();
$data['invoice'] = Invoices::getFull($id)->toArray();
/*
$model = new InvoicePaymentsDataTable();
$data['invoice_payments'] = $model->html();
*/
// dump($data);
return view('Admin.Shop.Invoices.edit', $data);
}

80
app/Http/Controllers/Admin/Shop/InvoiceItemController.php
View File

@@ -1,80 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Shop;
use App\Http\Controllers\Controller;
use App\InvoiceItem;
use Illuminate\Http\Request;
class InvoiceItemController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function show(InvoiceItem $invoiceItem)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function edit(InvoiceItem $invoiceItem)
{
//
}
/**
* Update the specified resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, InvoiceItem $invoiceItem)
{
//
}
/**
* Remove the specified resource from storage.
*
* @return \Illuminate\Http\Response
*/
public function destroy(InvoiceItem $invoiceItem)
{
//
}
}

2
app/Http/Controllers/Admin/Shop/OfferController.php
View File

@@ -83,7 +83,7 @@ class OfferController extends Controller
public function toggleActive(Request $request)
{
$data = Offers::toggle_active($request->input('id'), ($request->input('status_id') == 'true') ? 1 : 0);
$data = Offers::toggle_active($request->input('id'), ($request->input('status_id') === 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}

5
app/Http/Controllers/Admin/Shop/PackageController.php
View File

@@ -53,11 +53,6 @@ class PackageController extends Controller
return view('Admin.Shop.Packages.edit', $data);
}
public function update(Request $request)
{
//
}
public function destroy($id)
{
return Packages::destroy($id);

5
app/Http/Controllers/Admin/Shop/TagController.php
View File

@@ -45,11 +45,6 @@ class TagController extends Controller
return view('Admin.Shop.Tags.edit', $data);
}
public function update(Request $request)
{
//
}
public function destroy($id)
{
return Tags::destroy($id);

2
app/Http/Controllers/Admin/Shop/TagGroupController.php
View File

@@ -51,7 +51,7 @@ class TagGroupController extends Controller
public function toggleVisible(Request $request)
{
$data = TagGroups::toggleVisible($request->input('id'), ($request->input('visible') == 'true') ? 1 : 0);
$data = TagGroups::toggleVisible($request->input('id'), ($request->input('visible') === 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}

4
app/Http/Controllers/Shop/ArticleController.php
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);
}
}

10
app/Http/Controllers/Shop/Auth/ForgotPasswordController.php
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');
}
}

17
app/Http/Controllers/Shop/Auth/LoginController.php
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');
}
}

49
app/Http/Controllers/Shop/Auth/RegisterController.php
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'));
}
}

10
app/Http/Controllers/Shop/Auth/ResetPasswordController.php
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');

4
app/Http/Controllers/Shop/InvoiceController.php
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);
}
}

21
app/Http/Controllers/Shop/OrderController.php
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()