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

add shipping rules

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-07-16 14:45:42 +02:00
parent 297dcc62d2
commit 39c80ce6d1
459 changed files with 6219 additions and 5416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/Http/Controllers/Admin/Auth/ConfirmPasswordController.php
View File

@@ -1,40 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\ConfirmsPasswords;
class ConfirmPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Confirm Password Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password confirmations and
| uses a simple trait to include the behavior. You're free to explore
| this trait and override any functions that require customization.
|
*/
use ConfirmsPasswords;
/**
* Where to redirect users when the intended url fails.
*
* @var string
*/
protected $redirectTo = '/admin';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth');
}
}

38
app/Http/Controllers/Admin/Auth/ForgotPasswordController.php
View File

@@ -1,38 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
class ForgotPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset emails and
| includes a trait which assists in sending these notifications from
| your application to your users. Feel free to explore this trait.
|
*/
use SendsPasswordResetEmails;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
public function showLinkRequestForm()
{
$data = \App\Repositories\Config::init();
return view('auth.passwords.email', $data);
}
}

35
app/Http/Controllers/Admin/Auth/LoginController.php
View File

@@ -1,35 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
class LoginController extends Controller
{
use AuthenticatesUsers;
protected $redirectTo = '/admin';
public function __construct()
{
$this->middleware('guest')->except('logout');
$this->middleware('guest:web')->except('logout');
}
public function showLoginForm()
{
return view('auth.login');
}
public function authenticated(Request $request, $user)
{
return redirect()->intended($this->redirectPath());
}
public function username()
{
return 'username';
}
}

71
app/Http/Controllers/Admin/Auth/PasswordSecurityController.php
View File

@@ -1,71 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Auth;
use App\Http\Controllers\Controller;
use App\User;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
class PasswordSecurityController extends Controller
{
// reset password form
public function resetPasswordForm(Request $request)
{
$password_expired_id = $request->session()->get('password_expired_id');
if (!isset($password_expired_id)) {
return redirect('/login');
}
return view('auth.reset_password');
}
// reset password
public function resetPassword(Request $request)
{
// check expire id
$password_expired_id = $request->session()->get('password_expired_id');
if (!isset($password_expired_id)) {
return redirect('/login');
}
// validate
$validatedData = $request->validate(
[
'current_password' => 'required',
'new_password' => 'required|string|min:6|confirmed',
]
);
// the requests
$request_current_password = $request->current_password;
$request_new_password = $request->new_password;
$request_new_password_confirm = $request->new_password_confirm;
// the passwords matches
$user = User::find($password_expired_id);
if (!(Hash::check($request_current_password, $user->password))) {
return redirect()->back()->with("error", "Your current password does not matches with the password you provided. Please try again.");
}
// current password and new password are same
if (strcmp($request_current_password, $request->new_password) == 0) {
return redirect()->back()->with("error", "New password cannot be same as your current password. Please choose a different password.");
}
// new password and new password confirm doesn't match
if (strcmp($request_new_password, $request_new_password_confirm) == 1) {
return redirect()->back()->with("error", "New password doesn't match with confirm password.");
}
// change Password
$user->password = bcrypt($request->new_password);
$user->save();
// update password update time
$user->passwordSecurity->password_updated_at = Carbon::now();
$user->passwordSecurity->save();
return redirect('/login')->with("status", "Password changed successfully. Now you can login!");
}
}

76
app/Http/Controllers/Admin/Auth/RegisterController.php
View File

@@ -1,76 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Auth;
use App\User;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
use Illuminate\Foundation\Auth\RegistersUsers;
class RegisterController extends Controller
{
/*
|--------------------------------------------------------------------------
| Register Controller
|--------------------------------------------------------------------------
|
| This controller handles the registration of new users as well as their
| validation and creation. By default this controller uses a trait to
| provide this functionality without requiring any additional code.
|
*/
use RegistersUsers;
/**
* Where to redirect users after registration.
*
* @var string
*/
protected $redirectTo = '/admin';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth');
}
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make(
$data, [
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
]
);
}
/**
* Create a new user instance after a valid registration.
*
* @param array $data
* @return \App\User
*/
protected function create(array $data)
{
return User::create(
[
'name' => $data['name'],
'email' => $data['email'],
'password' => Hash::make($data['password']),
]
);
}
}

47
app/Http/Controllers/Admin/Auth/ResetPasswordController.php
View File

@@ -1,47 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Auth;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
class ResetPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset requests
| and uses a simple trait to include this behavior. You're free to
| explore this trait and override any methods you wish to tweak.
|
*/
use ResetsPasswords;
/**
* Where to redirect users after resetting their password.
*
* @var string
*/
protected $redirectTo = '/home';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
public function showResetForm(Request $request, $token = null)
{
$data['token'] = $token;
$data['email'] = $request->email;
return view('auth.passwords.reset', $data);
}
}

41
app/Http/Controllers/Admin/Auth/VerificationController.php
View File

@@ -1,41 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\VerifiesEmails;
class VerificationController extends Controller
{
/*
|--------------------------------------------------------------------------
| Email Verification Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling email verification for any
| user that recently registered with the application. Emails may also
| be re-sent if the user didn't receive the original email message.
|
*/
use VerifiesEmails;
/**
* Where to redirect users after verification.
*
* @var string
*/
protected $redirectTo = '/home';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('auth');
$this->middleware('signed')->only('verify');
$this->middleware('throttle:6,1')->only('verify', 'resend');
}
}

8
app/Http/Controllers/Admin/Botanic/FamilyController.php
View File

@@ -2,10 +2,9 @@
namespace App\Http\Controllers\Admin\Botanic;
use Illuminate\Http\Request;
use App\Repositories\Botanic\Families;
use App\Datatables\Botanic\FamiliesDataTable;
use App\Repositories\Botanic\Families;
use Illuminate\Http\Request;
class FamilyController extends Controller
{
@@ -23,18 +22,21 @@ class FamilyController extends Controller
{
$data = $request->all();
$ret = Families::store($data);
return redirect()->route('Admin.Botanic.Families.index');
}
public function show($id)
{
$data = Families::get($id);
return view('Admin.Botanic.Families.view', $data);
}
public function edit($id)
{
$data['family'] = Families::get($id)->toArray();
return view('Admin.Botanic.Families.edit', $data);
}

11
app/Http/Controllers/Admin/Botanic/GenreController.php
View File

@@ -2,11 +2,10 @@
namespace App\Http\Controllers\Admin\Botanic;
use Illuminate\Http\Request;
use App\Repositories\Botanic\Genres;
use App\Repositories\Botanic\Families;
use App\Datatables\Botanic\GenresDataTable;
use App\Repositories\Botanic\Families;
use App\Repositories\Botanic\Genres;
use Illuminate\Http\Request;
class GenreController extends Controller
{
@@ -23,6 +22,7 @@ class GenreController extends Controller
public function create()
{
$data['families'] = Families::getOptions();
return view('Admin.Botanic.Genres.create', $data);
}
@@ -30,12 +30,14 @@ class GenreController extends Controller
{
$data = $request->all();
$ret = Genres::store($data);
return redirect()->route('Admin.Botanic.Genres.index');
}
public function show($id)
{
$data['genre'] = Genres::get($id);
return view('Admin.Botanic.Genres.view', $data);
}
@@ -43,6 +45,7 @@ class GenreController extends Controller
{
$data['genre'] = Genres::get($id);
$data['families'] = Families::getOptions();
return view('Admin.Botanic.Genres.edit', $data);
}

15
app/Http/Controllers/Admin/Botanic/SpecieController.php
View File

@@ -2,12 +2,11 @@
namespace App\Http\Controllers\Admin\Botanic;
use Illuminate\Http\Request;
use App\Repositories\Botanic\Species;
use App\Repositories\Botanic\Genres;
use App\Repositories\Shop\TagGroups;
use App\Datatables\Botanic\SpeciesDataTable;
use App\Repositories\Botanic\Genres;
use App\Repositories\Botanic\Species;
use App\Repositories\Shop\TagGroups;
use Illuminate\Http\Request;
class SpecieController extends Controller
{
@@ -25,6 +24,7 @@ class SpecieController extends Controller
{
$data['genres'] = Genres::getOptions();
$data['tags_list'] = TagGroups::getTreeTags();
return view('Admin.Botanic.Species.create', $data);
}
@@ -32,12 +32,14 @@ class SpecieController extends Controller
{
$data = $request->all();
$ret = Species::storeFull($data);
return redirect()->route('Admin.Botanic.Species.index');
}
public function show($id)
{
$data = Species::get($id);
return view('Admin.Botanic.Species.view', $data);
}
@@ -46,6 +48,7 @@ class SpecieController extends Controller
$data['specie'] = Species::getFull($id);
$data['genres'] = Genres::getOptions();
$data['tags_list'] = TagGroups::getTreeTags();
return view('Admin.Botanic.Species.edit', $data);
}
@@ -59,6 +62,7 @@ class SpecieController extends Controller
$id = $id ? $id : $request->input('id');
$data['images'] = Species::getImages($id);
$data['can_edit'] = $can_edit;
return view('components.uploader.mini-gallery-items', $data);
}
@@ -66,6 +70,7 @@ class SpecieController extends Controller
{
$id = $request->input('id');
$index = $request->input('index');
return Species::deleteImage($id, $index);
}

16
app/Http/Controllers/Admin/Botanic/VarietyController.php
View File

@@ -2,14 +2,11 @@
namespace App\Http\Controllers\Admin\Botanic;
use Illuminate\Http\Request;
use App\Repositories\Botanic\Varieties;
use App\Repositories\Botanic\Species;
use App\Repositories\Shop\TagGroups;
use App\Datatables\Botanic\VarietiesDataTable;
use App\Models\Shop\Variety;
use App\Repositories\Botanic\Species;
use App\Repositories\Botanic\Varieties;
use App\Repositories\Shop\TagGroups;
use Illuminate\Http\Request;
class VarietyController extends Controller
{
@@ -27,6 +24,7 @@ class VarietyController extends Controller
{
$data['species'] = Species::getOptions();
$data['tags_list'] = TagGroups::getTreeTags();
return view('Admin.Botanic.Varieties.create', $data);
}
@@ -34,6 +32,7 @@ class VarietyController extends Controller
{
$data = $request->all();
Varieties::storeFull($data);
return redirect()->route('Admin.Botanic.Varieties.index');
}
@@ -47,6 +46,7 @@ class VarietyController extends Controller
$data['variety'] = Varieties::getFull($id);
$data['species'] = Species::getOptions();
$data['tags_list'] = TagGroups::getTreeTags();
return view('Admin.Botanic.Varieties.edit', $data);
}
@@ -60,6 +60,7 @@ class VarietyController extends Controller
$id = $id ? $id : $request->input('id');
$data['images'] = Varieties::getImages($id);
$data['can_edit'] = $can_edit;
return view('components.uploader.mini-gallery-items', $data);
}
@@ -67,6 +68,7 @@ class VarietyController extends Controller
{
$id = $request->input('id');
$index = $request->input('index');
return Varieties::deleteImage($id, $index);
}

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

@@ -2,20 +2,16 @@
namespace App\Http\Controllers\Admin\Core\App;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Storage;
use Yajra\DataTables\DataTables;
use App\Repositories\Core\App\Applications;
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);
}
@@ -24,12 +20,14 @@ class ApplicationController extends Controller
$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]);
}
@@ -37,12 +35,14 @@ class ApplicationController extends Controller
{
$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]);
}
}

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

@@ -2,19 +2,17 @@
namespace App\Http\Controllers\Admin\Core\App;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Storage;
use App\Repositories\Core\App\Applications;
use App\Repositories\Core\App\ApplicationModules;
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);
}
@@ -22,6 +20,7 @@ class ApplicationModuleController extends Controller
{
$data = \App\Repositories\Config::init();
$data['applications'] = Applications::getOptions();
return view('Admin.Core.App.ApplicationModule.create', $data);
}
@@ -31,12 +30,14 @@ class ApplicationModuleController extends Controller
$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']);
}
@@ -45,12 +46,14 @@ class ApplicationModuleController extends Controller
{
$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]);
}
}

15
app/Http/Controllers/Admin/Core/Auth/PermissionController.php
View File

@@ -2,14 +2,12 @@
namespace App\Http\Controllers\Admin\Core\Auth;
use Illuminate\Http\Request;
use App\Repositories\Core\App\Applications;
use App\Datatables\Admin\Core\Auth\PermissionsDataTable;
use App\Repositories\Core\App\ApplicationModules;
use App\Repositories\Core\App\Applications;
use App\Repositories\Core\Auth\Permissions;
use App\Repositories\Core\Auth\Users;
use App\Datatables\Admin\Core\Auth\PermissionsDataTable;
use Illuminate\Http\Request;
class PermissionController extends Controller
{
@@ -21,6 +19,7 @@ class PermissionController extends Controller
public function index(PermissionsDataTable $dataTable)
{
$data = \App\Repositories\Config::init();
return $dataTable->render('admin.Core.Auth.Permission.index', $data);
}
@@ -30,6 +29,7 @@ class PermissionController extends Controller
$data['roles'] = Users::getRolesToEdit();
$data['applications'] = Applications::getOptions();
$data['application_modules'] = ApplicationModules::getOptions();
return view('Admin.Core.Auth.Permission.create', $data);
}
@@ -41,6 +41,7 @@ class PermissionController extends Controller
$data['roles'] = Users::getRolesToEdit();
$data['applications'] = Applications::getOptions();
$data['application_modules'] = ApplicationModules::getOptions();
return view('Admin.Core.Auth.Permission.edit', $data);
}
@@ -49,7 +50,7 @@ class PermissionController extends Controller
$data = $request->all();
unset($data['roles']);
unset($data['_token']);
/*
$this->validate($request, [
'name' => 'required|unique:permissions,name',
@@ -60,12 +61,14 @@ class PermissionController extends Controller
*/
Permissions::store($data);
return redirect()->route('Admin.Core.Auth.Permission.index')->with('growl', [__('permissions.successadd'), 'success']);
}
public function destroy($id)
{
Permissions::delete($id);
return response()->json(['error' => 0]);
}
}

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

@@ -2,35 +2,35 @@
namespace App\Http\Controllers\Admin\Core\Auth;
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\Core\Auth\Roles;
use Illuminate\Http\Request;
use Yajra\DataTables\DataTables;
use App\Models\Core\Auth\Role;
use App\Models\Core\Auth\Permission;
use App\Models\Core\App\ApplicationModule;
use App\Repositories\Core\Auth\Permissions;
use App\Repositories\Core\Auth\Roles;
use App\Datatables\Admin\Core\Auth\RolesDataTable;
class RoleController extends Controller
{
public function index(RolesDataTable $dataTable)
{
$data = \App\Repositories\Config::init();
$data['modules'] = ApplicationModule::with('permissions')->get()->toArray();
return $dataTable->render('admin.Core.Auth.Role.index', $data);
}
public function getTable(Request $request)
{
$model = Role::orderBy('name')->get();
return Datatables::of($model)->make(true);
}
public function create()
{
$data = \App\Repositories\Config::init();
return view('Admin.Core.Auth.Role.create', $data);
}
@@ -47,6 +47,7 @@ class RoleController extends Controller
public function store(Request $request)
{
Roles::store($request->all());
return response()->json(['error' => 0]);
}
@@ -54,6 +55,7 @@ class RoleController extends Controller
{
$id = $id ? $id : $request->input('id');
Roles::delete($id);
return response()->json(['error' => 0]);
}
@@ -74,6 +76,7 @@ class RoleController extends Controller
// Debug::fdump($permissions);
// exit;
$data['permissions'] = $data;
return view('Admin.Core.Auth.Role.manage', $data);
}
@@ -85,12 +88,14 @@ class RoleController extends Controller
$permission = Permission::find($key);
$role->attachPermission($permission);
}
return response()->json(['error' => 0]);
}
public function toggleActive(Request $request)
{
$data = Roles::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}

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

@@ -3,10 +3,9 @@
namespace App\Http\Controllers\Admin\Core\Auth;
use App\Http\Controllers\Controller;
use App\Models\Core\Auth\Team;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use App\Models\Core\Auth\Team;
use App\Models\Core\Auth\Role;
class TeamController extends Controller
{
@@ -33,9 +32,9 @@ class TeamController extends Controller
$this->validate(
$request, [
'name' => 'required|unique:teams,name',
'display_name' => 'required',
'description' => 'required',
'name' => 'required|unique:teams,name',
'display_name' => 'required',
'description' => 'required',
]
);
@@ -49,6 +48,7 @@ class TeamController extends Controller
public function edit($id)
{
$team = Team::find($id);
return view('Admin.Core.Auth.Team.edit', compact('team'));
}
@@ -56,8 +56,8 @@ class TeamController extends Controller
{
$this->validate(
$request, [
'display_name' => 'required',
'description' => 'required',
'display_name' => 'required',
'description' => 'required',
]
);

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

@@ -2,29 +2,28 @@
namespace App\Http\Controllers\Admin\Core\Auth;
use Illuminate\Support\Facades\Auth;
use Intervention\Image\Facades\Image;
use App\Datatables\Admin\Core\Auth\UsersDataTable;
use App\Models\Core\Auth\User;
use App\Repositories\Core\Auth\Users;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Str;
use App\Models\Core\Auth\Role;
use App\Models\Core\Auth\User;
use App\Repositories\Core\Auth\Users;
use App\Datatables\Admin\Core\Auth\UsersDataTable;
use Intervention\Image\Facades\Image;
class UserController extends Controller
{
public function index(UsersDataTable $dataTable)
{
$data = \App\Repositories\Config::init();
return $dataTable->render('admin.Core.Auth.User.index', $data);
}
public function modalCreate()
{
$data['roles'] = Users::getRolesToEdit();
return view('Admin.Core.Auth.User.modal', $data);
}
@@ -34,6 +33,7 @@ class UserController extends Controller
$data['roles'] = Users::getRolesToEdit();
$data['user'] = $user ? $user->toArray() : [];
$data['user']['roles'] = $user->roles->pluck('id')->toArray();
return view('Admin.Core.Auth.User.modal', $data);
}
@@ -41,6 +41,7 @@ class UserController extends Controller
{
$data = $request->all();
$ret = Users::store($data);
return response()->json(['code' => '200']);
}
@@ -48,6 +49,7 @@ class UserController extends Controller
{
$data = \App\Repositories\Config::init();
$data['roles'] = Users::getRolesToEdit();
return view('Admin.Core.Auth.User.create', $data);
}
@@ -75,6 +77,7 @@ class UserController extends Controller
$data = \App\Repositories\Config::init();
$data['roles'] = Users::getRolesToEdit();
$data['user'] = Users::get($id);
return view('Admin.Core.Auth.User.edit', $data);
}
@@ -94,9 +97,9 @@ class UserController extends Controller
{
$this->validate(
$request, [
'token' => 'required',
'password' => 'required|min:8',
'password_confirmation' => 'required|same:password',
'token' => 'required',
'password' => 'required|min:8',
'password_confirmation' => 'required|same:password',
]
);
@@ -119,6 +122,7 @@ class UserController extends Controller
$data['user'] = $user ? $user->toArray() : [];
$data['user']['name'] = $user->name;
$data['user']['avatar'] = Users::getAvatar($user->id);
return view('Admin.Core.Auth.User.modalProfile', $data);
}
@@ -126,10 +130,10 @@ class UserController extends Controller
{
$this->validate(
$request, [
'avatar' => 'mimes:jpeg,png|max:10000',
'last_name' => 'required',
'first_name' => 'required',
'password_confirmation' => 'same:password',
'avatar' => 'mimes:jpeg,png|max:10000',
'last_name' => 'required',
'first_name' => 'required',
'password_confirmation' => 'same:password',
]
);
@@ -138,7 +142,7 @@ class UserController extends Controller
if ($avatar && $file = $avatar->isValid()) {
$destinationPath = dirname($user->avatar_path);
if (!is_dir($destinationPath)) {
if (! is_dir($destinationPath)) {
mkdir($destinationPath, 0766, true);
}
$extension = $avatar->getClientOriginalExtension();
@@ -178,6 +182,7 @@ class UserController extends Controller
public function toggleActive(Request $request)
{
$data = Users::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}

13
app/Http/Controllers/Admin/Core/CommentController.php
View File

@@ -2,23 +2,24 @@
namespace App\Http\Controllers\Admin\Core;
use Illuminate\Http\Request;
use App\Repositories\Core\Comments;
use App\Datatables\Admin\Core\CommentsDataTable;
use App\Repositories\Core\Comments;
use Illuminate\Http\Request;
class CommentController extends Controller
{
public function index($model, $model_id)
{
$data['comments'] = Comments::getCommentsByModel($model, $model_id);
return view('Admin.Core.Comments.partials.list-comments', $data);
}
public function list(CommentsDataTable $dataTable, $model, $model_id)
{
$data['model'] = $model;
$data['model_id'] = $model_id;
return $dataTable->render('Admin.Core.Comment.index', $data);
}
@@ -26,6 +27,7 @@ class CommentController extends Controller
{
$data['comment']['commentable_type'] = $model;
$data['comment']['commentable_id'] = $model_id;
return view('Admin.Core.Comments.partials.modal', $data);
}
@@ -33,6 +35,7 @@ class CommentController extends Controller
{
$id = $id ? $id : $request->input('id');
$data = Comments::get($id);
return view('Admin.Core.Comments.partials.modal', $data);
}
@@ -40,6 +43,7 @@ class CommentController extends Controller
{
$data = $request->all();
Comments::store($data);
return response()->json(['error' => 0]);
}
@@ -47,6 +51,7 @@ class CommentController extends Controller
{
$id = $id ? $id : $request->input('id');
Comments::destroy($id);
return response()->json(['error' => 0]);
}
}

BIN
app/Http/Controllers/Admin/Core/Controller.php
View File

Binary file not shown.

1
app/Http/Controllers/Admin/Core/Mail/MailTemplateController.php
View File

@@ -21,6 +21,7 @@ class MailTemplateController extends Controller
public function modalCreate()
{
$data = MailTemplates::init();
return view('Admin.Core.Mail.MailTemplate.modal', $data ?? []);
}

2
app/Http/Controllers/Admin/HomeController.php
View File

@@ -2,9 +2,9 @@
namespace App\Http\Controllers\Admin;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Dashboards;
use Illuminate\Http\Request;
class HomeController extends Controller
{

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

@@ -2,20 +2,19 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Repositories\Shop\Articles;
use App\Datatables\Shop\ArticlesDataTable;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\Categories;
use App\Repositories\Shop\Tags;
use App\Datatables\Shop\ArticlesDataTable;
use Illuminate\Http\Request;
class ArticleController extends Controller
{
public function autocomplete(Request $request, $str = false)
{
$str = $str ? $str : $request->input('q');
return response()->json(Articles::autocomplete($str));
}
@@ -24,12 +23,14 @@ class ArticleController extends Controller
$data['article_natures'] = ArticleNatures::getOptions();
$data['categories'] = Categories::getOptions();
$data['tags'] = Tags::getOptionsFullName();
return $dataTable->render('Admin.Shop.Articles.list', $data);
}
public function create()
{
$data = Articles::getMeta();
return view('Admin.Shop.Articles.create', $data);
}
@@ -37,18 +38,21 @@ class ArticleController extends Controller
{
$data = $request->all();
Articles::storeFull($data);
return redirect()->route('Admin.Shop.Articles.index');
}
public function show($id)
{
$data['article'] = Articles::get($id);
return view('Admin.Shop.Articles.view', $data);
}
public function edit($id)
{
$data = Articles::getFull($id);
return view('Admin.Shop.Articles.edit', $data);
}
@@ -60,12 +64,14 @@ class ArticleController extends Controller
public function getProductDescription($product_id, $model)
{
$data['article']['inherited'] = Articles::getInheritedByProduct($product_id, base64_decode($model));
return view('Admin.Shop.Articles.partials.product.description', $data);
}
public function getProductTags($product_id, $model)
{
$data = Articles::getInheritedByProduct($product_id, base64_decode($model));
return view('Admin.Shop.Articles.partials.product.tags', $data);
}
@@ -73,6 +79,7 @@ class ArticleController extends Controller
{
$data['article']['product_id'] = $product_id;
$data['no_popup'] = false;
return view('Admin.Shop.Articles.partials.product.images', $data);
}
@@ -80,6 +87,7 @@ class ArticleController extends Controller
{
$id = $id ? $id : $request->input('id');
$data['images'] = Articles::getImages($id);
return view('components.uploader.mini-gallery-items', $data);
}
@@ -87,18 +95,21 @@ class ArticleController extends Controller
{
$id = $request->input('id');
$index = $request->input('index');
return Articles::deleteImage($id, $index);
}
public function toggleVisible(Request $request)
{
$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);
return response()->json(['error' => 0]);
}
}

8
app/Http/Controllers/Admin/Shop/ArticleNatureController.php
View File

@@ -2,10 +2,9 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Repositories\Shop\ArticleNatures;
use App\Datatables\Shop\ArticleNaturesDataTable;
use App\Repositories\Shop\ArticleNatures;
use Illuminate\Http\Request;
class ArticleNatureController extends Controller
{
@@ -22,12 +21,14 @@ class ArticleNatureController extends Controller
public function store(Request $request)
{
$ret = ArticleNatures::store($request->all());
return redirect()->route('Admin.Shop.ArticleNatures.index');
}
public function show($id)
{
$data['article_nature'] = ArticleNatures::get($id);
return view('Admin.Shop.ArticleNatures.view', $data);
}
@@ -48,6 +49,7 @@ class ArticleNatureController extends Controller
public static function getOptions(Request $request)
{
$data = ArticleNatures::getOptionsByProductTypeModel($request->input('product_type'));
return response()->json(['0' => ''] + $data);
}
}

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

@@ -2,11 +2,10 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\CategoriesDataTable;
use App\Repositories\Shop\Categories;
use App\Repositories\Shop\TagGroups;
use App\Datatables\Shop\CategoriesDataTable;
use Illuminate\Http\Request;
class CategoryController extends Controller
{
@@ -22,18 +21,21 @@ class CategoryController extends Controller
'categories' => Categories::getOptions(),
'tags_list' => TagGroups::getTreeTags(),
];
return view('Admin.Shop.Categories.create', $data);
}
public function store(Request $request)
{
$ret = Categories::storeFull($request->all());
return redirect()->route('Admin.Shop.Categories.index');
}
public function show($id)
{
$data = Categories::get($id);
return view('Admin.Shop.Categories.view', $data);
}
@@ -42,6 +44,7 @@ class CategoryController extends Controller
$data['category'] = Categories::getFull($id);
$data['categories'] = Categories::getOptions();
$data['tags_list'] = TagGroups::getTreeTags();
return view('Admin.Shop.Categories.edit', $data);
}
@@ -54,6 +57,7 @@ class CategoryController extends Controller
{
$id = $id ? $id : $request->input('id');
$data['images'] = Categories::getImages($id);
return view('components.uploader.mini-gallery-items', $data);
}
@@ -61,6 +65,7 @@ class CategoryController extends Controller
{
$id = $request->input('id');
$index = $request->input('index');
return Categories::deleteImage($id, $index);
}
@@ -69,18 +74,21 @@ class CategoryController extends Controller
$node_id = $request->input('node_id');
$target_id = $request->input('target_id');
$type = $request->input('type');
return Categories::moveTree($node_id, $target_id, $type);
}
public function toggleVisible(Request $request)
{
$data = Categories::toggle_visible($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);
return response()->json(['error' => 0]);
}
}

9
app/Http/Controllers/Admin/Shop/CustomerAddressController.php
View File

@@ -2,16 +2,16 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Repositories\Shop\CustomerAddresses;
use App\Datatables\Shop\CustomerAddressesDataTable;
use App\Repositories\Shop\CustomerAddresses;
use Illuminate\Http\Request;
class CustomerAddressController extends Controller
{
public function index(CustomerAddressesDataTable $dataTable)
{
$data = [];
return $dataTable->render('Admin.Shop.Customers.list', $data);
}
@@ -23,18 +23,21 @@ class CustomerAddressController extends Controller
public function store(Request $request)
{
$ret = CustomerAddresses::storeFull($request->all());
return redirect()->route('Admin.Shop.CustomerAddresses.index');
}
public function show($id)
{
$data['customer'] = CustomerAddresses::get($id);
return view('Admin.Shop.CustomerAddresses.view', $data);
}
public function edit($id)
{
$data['customer'] = CustomerAddresses::edit($id);
return view('Admin.Shop.CustomerAddresses.edit', $data);
}

12
app/Http/Controllers/Admin/Shop/CustomerController.php
View File

@@ -2,36 +2,39 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\CustomerAddressesDataTable;
use App\Datatables\Shop\CustomersDataTable;
use App\Repositories\Shop\Customers;
use App\Repositories\Shop\Deliveries;
use App\Datatables\Shop\CustomersDataTable;
use App\Datatables\Shop\CustomerAddressesDataTable;
use Illuminate\Http\Request;
class CustomerController extends Controller
{
public function index(CustomersDataTable $dataTable)
{
$data = [];
return $dataTable->render('Admin.Shop.Customers.list', $data);
}
public function create()
{
$data['deliveries'] = Deliveries::getOptions();
return view('Admin.Shop.Customers.create', $data);
}
public function store(Request $request)
{
$ret = Customers::storeFull($request->all());
return redirect()->route('Admin.Shop.Customers.index');
}
public function show($id)
{
$data['customer'] = Customers::get($id);
return view('Admin.Shop.Customers.view', $data);
}
@@ -41,6 +44,7 @@ class CustomerController extends Controller
$data['deliveries'] = Deliveries::getOptions();
$model = new CustomerAddressesDataTable();
$data['customer_addresses'] = $model->html();
return view('Admin.Shop.Customers.edit', $data);
}

3
app/Http/Controllers/Admin/Shop/DashboardController.php
View File

@@ -2,10 +2,9 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Dashboards;
use Illuminate\Http\Request;
class DashboardController extends Controller
{

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

@@ -2,35 +2,38 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\DeliveriesDataTable;
use App\Repositories\Shop\Deliveries;
use App\Repositories\Shop\SaleChannels;
use App\Datatables\Shop\DeliveriesDataTable;
use Illuminate\Http\Request;
class DeliveryController extends Controller
{
public function index(DeliveriesDataTable $dataTable)
{
$data = [];
return $dataTable->render('Admin.Shop.Deliveries.list', $data);
}
public function create()
{
$data['sale_channels'] = SaleChannels::getOptions();
return view('Admin.Shop.Deliveries.create', $data);
}
public function store(Request $request)
{
$ret = Deliveries::store($request->all());
return redirect()->route('Admin.Shop.Deliveries.index');
}
public function show($id)
{
$data['delivery'] = Deliveries::get($id);
return view('Admin.Shop.Deliveries.view', $data);
}
@@ -38,6 +41,7 @@ class DeliveryController extends Controller
{
$data['delivery'] = Deliveries::get($id)->toArray();
$data['sale_channels'] = SaleChannels::getOptions();
return view('Admin.Shop.Deliveries.edit', $data);
}
@@ -49,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);
return response()->json(['error' => 0]);
}
}

59
app/Http/Controllers/Admin/Shop/DeliveryPackageController.php Normal file
View File

@@ -0,0 +1,59 @@
<?php
namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Shop\DeliveryPackagesDataTable;
use App\Repositories\Shop\DeliveryPackages;
use App\Repositories\Shop\SaleChannels;
use Illuminate\Http\Request;
class DeliveryPackageController extends Controller
{
public function index(DeliveryPackagesDataTable $dataTable)
{
$data = [];
return $dataTable->render('Admin.Shop.DeliveryPackages.list', $data);
}
public function create()
{
$data['sale_channels'] = SaleChannels::getOptions();
return view('Admin.Shop.DeliveryPackages.create', $data);
}
public function store(Request $request)
{
$ret = DeliveryPackages::store($request->all());
return redirect()->route('Admin.Shop.DeliveryPackages.index');
}
public function show($id)
{
$data['delivery'] = DeliveryPackages::get($id);
return view('Admin.Shop.DeliveryPackages.view', $data);
}
public function edit($id)
{
$data['delivery'] = DeliveryPackages::get($id)->toArray();
$data['sale_channels'] = SaleChannels::getOptions();
return view('Admin.Shop.DeliveryPackages.edit', $data);
}
public function destroy($id)
{
return DeliveryPackages::destroy($id);
}
public function toggleActive(Request $request)
{
$data = DeliveryPackages::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}

59
app/Http/Controllers/Admin/Shop/DeliveryTypeCalculationController.php Normal file
View File

@@ -0,0 +1,59 @@
<?php
namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Shop\DeliveryTypeCalculationsDataTable;
use App\Repositories\Shop\DeliveryTypeCalculations;
use App\Repositories\Shop\SaleChannels;
use Illuminate\Http\Request;
class DeliveryTypeCalculationController extends Controller
{
public function index(DeliveryTypeCalculationsDataTable $dataTable)
{
$data = [];
return $dataTable->render('Admin.Shop.DeliveryTypeCalculations.list', $data);
}
public function create()
{
$data = [];
return view('Admin.Shop.DeliveryTypeCalculations.create', $data);
}
public function store(Request $request)
{
$ret = DeliveryTypeCalculations::store($request->all());
return redirect()->route('Admin.Shop.DeliveryTypeCalculations.index');
}
public function show($id)
{
$data['delivery'] = DeliveryTypeCalculations::get($id);
return view('Admin.Shop.DeliveryTypeCalculations.view', $data);
}
public function edit($id)
{
$data['delivery'] = DeliveryTypeCalculations::get($id)->toArray();
$data['sale_channels'] = SaleChannels::getOptions();
return view('Admin.Shop.DeliveryTypeCalculations.edit', $data);
}
public function destroy($id)
{
return DeliveryTypeCalculations::destroy($id);
}
public function toggleActive(Request $request)
{
$data = DeliveryTypeCalculations::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}

59
app/Http/Controllers/Admin/Shop/DeliveryTypeController.php Normal file
View File

@@ -0,0 +1,59 @@
<?php
namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Shop\DeliveryTypesDataTable;
use App\Repositories\Shop\DeliveryTypes;
use App\Repositories\Shop\SaleChannels;
use Illuminate\Http\Request;
class DeliveryTypeController extends Controller
{
public function index(DeliveryTypesDataTable $dataTable)
{
$data = [];
return $dataTable->render('Admin.Shop.DeliveryTypes.list', $data);
}
public function create()
{
$data['sale_channels'] = SaleChannels::getOptions();
return view('Admin.Shop.DeliveryTypes.create', $data);
}
public function store(Request $request)
{
$ret = DeliveryTypes::store($request->all());
return redirect()->route('Admin.Shop.DeliveryTypes.index');
}
public function show($id)
{
$data['delivery'] = DeliveryTypes::get($id);
return view('Admin.Shop.DeliveryTypes.view', $data);
}
public function edit($id)
{
$data['delivery'] = DeliveryTypes::get($id)->toArray();
$data['sale_channels'] = SaleChannels::getOptions();
return view('Admin.Shop.DeliveryTypes.edit', $data);
}
public function destroy($id)
{
return DeliveryTypes::destroy($id);
}
public function toggleActive(Request $request)
{
$data = DeliveryTypes::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}

BIN
app/Http/Controllers/Admin/Shop/HomeController.php
View File

Binary file not shown.

7
app/Http/Controllers/Admin/Shop/HomepageController.php
View File

@@ -2,10 +2,9 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Repositories\Shop\Homepages;
use App\Datatables\Shop\HomepagesDataTable;
use App\Repositories\Shop\Homepages;
use Illuminate\Http\Request;
class HomepageController extends Controller
{
@@ -22,6 +21,7 @@ class HomepageController extends Controller
public function store(Request $request)
{
$ret = Homepages::store($request->all());
return redirect()->route('Admin.Shop.Homepages.index');
}
@@ -33,6 +33,7 @@ class HomepageController extends Controller
public function edit($id)
{
$data['homepage'] = Homepages::get($id);
return view('Admin.Shop.Homepages.edit', $data);
}

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

@@ -2,11 +2,10 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Invoices;
use App\Datatables\Shop\InvoicesDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Invoices;
use Illuminate\Http\Request;
class InvoiceController extends Controller
{
@@ -23,12 +22,14 @@ class InvoiceController extends Controller
public function store(Request $request)
{
$ret = Invoices::store($request->all());
return redirect()->route('Admin.Shop.Invoices.index');
}
public function show($id)
{
$data['invoice'] = Invoices::get($id)->toArray();
return view('Admin.Shop.Invoices.view', $data);
}
@@ -36,6 +37,7 @@ class InvoiceController extends Controller
{
$data['invoice'] = Invoices::get($id, ['order.customer', 'order.address', 'order.detail'])->toArray();
$data['statuses'] = Invoices::statuses();
return view('Admin.Shop.Invoices.edit', $data);
}

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

@@ -2,9 +2,9 @@
namespace App\Http\Controllers\Admin\Shop;
use App\Http\Controllers\Controller;
use App\InvoiceItem;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class InvoiceItemController extends Controller
{
@@ -31,7 +31,6 @@ class InvoiceItemController extends Controller
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
@@ -42,7 +41,6 @@ class InvoiceItemController extends Controller
/**
* Display the specified resource.
*
* @param \App\InvoiceItem $invoiceItem
* @return \Illuminate\Http\Response
*/
public function show(InvoiceItem $invoiceItem)
@@ -53,7 +51,6 @@ class InvoiceItemController extends Controller
/**
* Show the form for editing the specified resource.
*
* @param \App\InvoiceItem $invoiceItem
* @return \Illuminate\Http\Response
*/
public function edit(InvoiceItem $invoiceItem)
@@ -64,8 +61,6 @@ class InvoiceItemController extends Controller
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\InvoiceItem $invoiceItem
* @return \Illuminate\Http\Response
*/
public function update(Request $request, InvoiceItem $invoiceItem)
@@ -76,7 +71,6 @@ class InvoiceItemController extends Controller
/**
* Remove the specified resource from storage.
*
* @param \App\InvoiceItem $invoiceItem
* @return \Illuminate\Http\Response
*/
public function destroy(InvoiceItem $invoiceItem)

10
app/Http/Controllers/Admin/Shop/MerchandiseController.php
View File

@@ -2,12 +2,11 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\MerchandisesDataTable;
use App\Repositories\Shop\Merchandises;
use App\Repositories\Shop\Producers;
use App\Repositories\Shop\TagGroups;
use App\Datatables\Shop\MerchandisesDataTable;
use Illuminate\Http\Request;
class MerchandiseController extends Controller
{
@@ -20,6 +19,7 @@ class MerchandiseController extends Controller
{
$data['producers_list'] = Producers::getOptions();
$data['tags_list'] = TagGroups::getTreeTags();
return view('Admin.Shop.Merchandises.create', $data);
}
@@ -27,6 +27,7 @@ class MerchandiseController extends Controller
{
$data = $request->all();
Merchandises::storeFull($data);
return redirect()->route('Admin.Shop.Merchandises.index');
}
@@ -40,6 +41,7 @@ class MerchandiseController extends Controller
$data['merchandise'] = Merchandises::getFull($id);
$data['producers_list'] = Producers::getOptions();
$data['tags_list'] = TagGroups::getTreeTags();
return view('Admin.Shop.Merchandises.edit', $data);
}
@@ -53,6 +55,7 @@ class MerchandiseController extends Controller
$id = $id ? $id : $request->input('id');
$data['images'] = Merchandises::getImages($id);
$data['can_edit'] = $can_edit;
return view('components.uploader.mini-gallery-items', $data);
}
@@ -60,6 +63,7 @@ class MerchandiseController extends Controller
{
$id = $request->input('id');
$index = $request->input('index');
return Merchandises::deleteImage($id, $index);
}

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

@@ -2,16 +2,15 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\OffersDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\Offers;
use App\Repositories\Shop\Packages;
use App\Repositories\Shop\Tariffs;
use App\Repositories\Shop\Variations;
use App\Datatables\Shop\OffersDataTable;
use Illuminate\Http\Request;
class OfferController extends Controller
{
@@ -19,6 +18,7 @@ class OfferController extends Controller
{
$data['article_natures'] = ArticleNatures::getOptions();
$data['packages'] = Packages::getOptions();
return $dataTable->render('Admin.Shop.Offers.list', $data ?? []);
}
@@ -27,6 +27,7 @@ class OfferController extends Controller
$data['articles'] = Articles::getOptionsWithNature();
$data['tariffs'] = Tariffs::getOptions();
$data['variations'] = Variations::getOptions();
return view('Admin.Shop.Offers.create', $data);
}
@@ -36,6 +37,7 @@ class OfferController extends Controller
$data['articles'] = Articles::getOptionsWithNature();
$data['tariffs'] = Tariffs::getOptions();
$data['variations'] = Variations::getOptions();
return view('Admin.Shop.Offers.edit', $data);
}
@@ -43,12 +45,14 @@ class OfferController extends Controller
{
$data = $request->all();
$ret = Offers::store($data);
return redirect()->route('Admin.Shop.Offers.index');
}
public function show($id)
{
$data['offer'] = Offers::get($id)->toArray();
return view('Admin.Shop.Offers.view', $data);
}
@@ -60,25 +64,28 @@ class OfferController extends Controller
public function previewArticle($id)
{
$data['article'] = Articles::getArticle($id);
return view('Admin.Shop.Offers.partials.article', $data);
}
public function previewVariation($id)
{
$data['variation'] = Variations::get($id)->toArray();
return view('Admin.Shop.Offers.partials.variation', $data);
}
public function previewTariff($id)
{
$data['tariff'] = Tariffs::getPrices($id);
return view('Admin.Shop.Offers.partials.tariff', $data);
}
public function toggleActive(Request $request)
{
$data = Offers::toggle_active($request->input('id'), ($request->input('status_id') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}

10
app/Http/Controllers/Admin/Shop/OrderController.php
View File

@@ -2,11 +2,10 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Orders;
use App\Datatables\Shop\OrdersDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Orders;
use Illuminate\Http\Request;
class OrderController extends Controller
{
@@ -23,18 +22,21 @@ class OrderController extends Controller
public function show($id)
{
$data = Orders::get($id);
return view('Admin.Shop.Orders.view', $data);
}
public function edit($id)
{
$data = Orders::edit($id);
return view('Admin.Shop.Orders.edit', $data);
}
public function store(Request $request)
{
$ret = Orders::store($request->all());
return redirect()->route('Admin.Shop.Orders.index');
}

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

@@ -2,42 +2,46 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\PackagesDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\Packages;
use App\Datatables\Shop\PackagesDataTable;
use Illuminate\Http\Request;
class PackageController extends Controller
{
public function index(PackagesDataTable $dataTable)
{
$data['families'] = ArticleNatures::getOptions();
return $dataTable->render('Admin.Shop.Packages.list', $data);
}
public function getOptionsByFamily(Request $request)
{
$id = $request->input('family_id');
return response()->json(Packages::getSelectByFamily($id));
}
public function create()
{
$data['families'] = ArticleNatures::getOptions();
return view('Admin.Shop.Packages.create', $data);
}
public function store(Request $request)
{
$ret = Packages::store($request->all());
return redirect()->route('Admin.Shop.Packages.index');
}
public function show($id)
{
$data = Packages::get($id);
return view('Admin.Shop.Packages.view', $data);
}
@@ -45,6 +49,7 @@ class PackageController extends Controller
{
$data['package'] = Packages::get($id);
$data['families'] = ArticleNatures::getOptions();
return view('Admin.Shop.Packages.edit', $data);
}

9
app/Http/Controllers/Admin/Shop/PriceGenericCategoryController.php
View File

@@ -2,12 +2,11 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\PriceGenericCategoriesDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\PriceGenericCategories;
use App\Datatables\Shop\PriceGenericCategoriesDataTable;
use Illuminate\Http\Request;
class PriceGenericCategoryController extends Controller
{
@@ -19,6 +18,7 @@ class PriceGenericCategoryController extends Controller
public function create()
{
$data['families'] = ArticleNatures::getOptions();
return view('Admin.Shop.PriceGenericCategories.create', $data);
}
@@ -26,18 +26,21 @@ class PriceGenericCategoryController extends Controller
{
$data['families'] = ArticleNatures::getOptions();
$data['generic_category'] = PriceGenericCategories::get($id)->toArray();
return view('Admin.Shop.PriceGenericCategories.edit', $data);
}
public function store(Request $request)
{
$ret = PriceGenericCategories::store($request->all());
return redirect()->route('Admin.Shop.PriceGenericCategories.index');
}
public function show($id)
{
$data = PriceGenericCategories::get($id);
return view('Admin.Shop.PriceGenericCategories.view', $data);
}

24
app/Http/Controllers/Admin/Shop/PriceListController.php
View File

@@ -2,22 +2,20 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Models\Shop\PriceList;
use App\Repositories\Shop\PriceLists;
use App\Repositories\Shop\Taxes;
use App\Repositories\Shop\Tariffs;
use App\Repositories\Shop\SaleChannels;
use App\Repositories\Shop\Unities;
use App\Datatables\Shop\PriceListsDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\PriceLists;
use App\Repositories\Shop\SaleChannels;
use App\Repositories\Shop\Tariffs;
use App\Repositories\Shop\Taxes;
use Illuminate\Http\Request;
class PriceListController extends Controller
{
public function index(PriceListsDataTable $dataTable)
{
$data = [];
return $dataTable->render('Admin.Shop.PriceLists.list', $data);
}
@@ -25,6 +23,7 @@ class PriceListController extends Controller
{
$data = [];
$data['sale_channels'] = SaleChannels::getOptions();
return view('Admin.Shop.PriceLists.create', $data);
}
@@ -32,6 +31,7 @@ class PriceListController extends Controller
{
$data['price_list'] = PriceLists::get($id);
$data['sale_channels'] = SaleChannels::getOptions();
return view('Admin.Shop.PriceLists.edit', $data);
}
@@ -43,6 +43,7 @@ class PriceListController extends Controller
$data['sale_channels'] = SaleChannels::getOptions();
$data['statuses'] = Tariffs::getStatuses();
$data['taxes'] = Taxes::getOptions();
return view('Admin.Shop.PriceLists.modal', $data);
}
@@ -52,12 +53,14 @@ class PriceListController extends Controller
$data['sale_channels'] = SaleChannels::getOptions();
$data['statuses'] = Tariffs::getStatuses();
$data['taxes'] = Taxes::getOptions();
return view('Admin.Shop.PriceLists.modal', $data);
}
public function store(Request $request)
{
$ret = PriceLists::store($request->all());
return redirect()->route('Admin.Shop.PriceLists.index');
}
@@ -65,12 +68,14 @@ class PriceListController extends Controller
{
$data = $request->all();
$ret = PriceLists::store($data);
return response()->json(['code' => '200']);
}
public function show($id)
{
$data = PriceLists::get($id);
return view('Admin.Shop.PriceLists.view', $data);
}
@@ -82,6 +87,7 @@ class PriceListController extends Controller
public function getPrice($id)
{
$data['generic'] = PriceLists::getFull($id);
return view('Admin.Shop.PriceLists.partials.table-prices', $data);
}
}

25
app/Http/Controllers/Admin/Shop/PriceListValueController.php
View File

@@ -2,22 +2,21 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Models\Shop\PriceListValue;
use App\Repositories\Shop\PriceListValues;
use App\Repositories\Shop\PriceListValueCategories;
use App\Repositories\Shop\Taxes;
use App\Repositories\Shop\Packages;
use App\Repositories\Shop\Unities;
use App\Datatables\Shop\PriceListValuesDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Packages;
use App\Repositories\Shop\PriceListValueCategories;
use App\Repositories\Shop\PriceListValues;
use App\Repositories\Shop\Taxes;
use App\Repositories\Shop\Unities;
use Illuminate\Http\Request;
class PriceListValueController extends Controller
{
public function index(PriceListValuesDataTable $dataTable)
{
$data['categories'] = PriceListValueCategories::getOptions();
return $dataTable->render('Admin.Shop.PriceListValues.list', $data);
}
@@ -26,6 +25,7 @@ class PriceListValueController extends Controller
$data['unities'] = Unities::getOptions();
$data['taxes_options'] = Taxes::getOptions();
$data['categories'] = PriceListValueCategories::getOptions();
return view('Admin.Shop.PriceListValues.create', $data);
}
@@ -36,18 +36,21 @@ class PriceListValueController extends Controller
$data['unities'] = ($data['packages']['id'] ?? false) ? Unities::getSelectByPackage($data['packages']['id']) : [];
$data['taxes_options'] = Taxes::getOptions();
$data['categories'] = PriceListValueCategories::getOptions();
return view('Admin.Shop.PriceListValues.edit', $data);
}
public function store(Request $request)
{
$ret = PriceListValues::store($request->all());
return redirect()->route('Admin.Shop.PriceListValues.index');
}
public function show($id)
{
$data = PriceListValues::get($id);
return view('Admin.Shop.PriceListValues.view', $data);
}
@@ -59,14 +62,14 @@ class PriceListValueController extends Controller
public function getPrice($id)
{
$data['generic'] = PriceListValues::getFull($id);
return view('Admin.Shop.PriceListValues.partials.table-prices', $data);
}
public function addPrice($index)
{
$data['index'] = $index;
return view('Admin.Shop.PriceListValues.partials.row_price', $data);
}
}

12
app/Http/Controllers/Admin/Shop/ProducerController.php
View File

@@ -2,13 +2,10 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\ProducersDataTable;
use App\Repositories\Shop\Producers;
use App\Repositories\Shop\TagGroups;
use App\Datatables\Shop\ProducersDataTable;
use App\Models\Shop\Producer;
use Illuminate\Http\Request;
class ProducerController extends Controller
{
@@ -20,6 +17,7 @@ class ProducerController extends Controller
public function create()
{
$data['tags_list'] = TagGroups::getTreeTags();
return view('Admin.Shop.Producers.create', $data);
}
@@ -27,6 +25,7 @@ class ProducerController extends Controller
{
$data = $request->all();
Producers::storeFull($data);
return redirect()->route('Admin.Shop.Producers.index');
}
@@ -39,6 +38,7 @@ class ProducerController extends Controller
{
$data['producer'] = Producers::getFull($id);
$data['tags_list'] = TagGroups::getTreeTags();
return view('Admin.Shop.Producers.edit', $data);
}
@@ -52,6 +52,7 @@ class ProducerController extends Controller
$id = $id ? $id : $request->input('id');
$data['images'] = Producers::getImages($id);
$data['can_edit'] = $can_edit;
return view('components.uploader.mini-gallery-items', $data);
}
@@ -59,6 +60,7 @@ class ProducerController extends Controller
{
$id = $request->input('id');
$index = $request->input('index');
return Producers::deleteImage($id, $index);
}

10
app/Http/Controllers/Admin/Shop/SaleChannelController.php
View File

@@ -2,11 +2,10 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\SaleChannels;
use App\Datatables\Shop\SaleChannelsDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\SaleChannels;
use Illuminate\Http\Request;
class SaleChannelController extends Controller
{
@@ -23,18 +22,21 @@ class SaleChannelController extends Controller
public function store(Request $request)
{
$ret = SaleChannels::store($request->all());
return redirect()->route('Admin.Shop.SaleChannels.index');
}
public function show($id)
{
$data['sale_channel'] = SaleChannels::get($id);
return view('Admin.Shop.SaleChannels.view', $data);
}
public function edit($id)
{
$data['sale_channel'] = SaleChannels::get($id);
return view('Admin.Shop.SaleChannels.edit', $data);
}

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

@@ -2,12 +2,11 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Tags;
use App\Repositories\Shop\TagGroups;
use App\Datatables\Shop\TagsDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\TagGroups;
use App\Repositories\Shop\Tags;
use Illuminate\Http\Request;
class TagController extends Controller
{
@@ -20,18 +19,21 @@ class TagController extends Controller
{
$data = [];
$data['tag_groups'] = TagGroups::getOptions();
return view('Admin.Shop.Tags.create', $data);
}
public function store(Request $request)
{
$ret = Tags::store($request->all());
return redirect()->route('Admin.Shop.Tags.index');
}
public function show($id)
{
$data = Tags::get($id);
return view('Admin.Shop.Tags.view', $data);
}
@@ -39,6 +41,7 @@ class TagController extends Controller
{
$data = Tags::get($id);
$data['tag_groups'] = TagGroups::getOptions();
return view('Admin.Shop.Tags.edit', $data);
}

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

@@ -2,12 +2,11 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\TagGroups;
use App\Repositories\Shop\ArticleNatures;
use App\Datatables\Shop\TagGroupsDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\TagGroups;
use Illuminate\Http\Request;
class TagGroupController extends Controller
{
@@ -19,18 +18,21 @@ class TagGroupController extends Controller
public function create()
{
$data['article_families'] = ArticleNatures::getOptions();
return view('Admin.Shop.TagGroups.create', $data);
}
public function store(Request $request)
{
$ret = TagGroups::store($request->all());
return redirect()->route('Admin.Shop.TagGroups.index');
}
public function show($id)
{
$data = TagGroups::get($id);
return view('Admin.Shop.TagGroups.view', $data);
}
@@ -38,6 +40,7 @@ class TagGroupController extends Controller
{
$data = TagGroups::get($id);
$data['article_families'] = ArticleNatures::getOptions();
return view('Admin.Shop.TagGroups.edit', $data);
}
@@ -49,7 +52,7 @@ class TagGroupController extends Controller
public function toggleVisible(Request $request)
{
$data = TagGroups::toggleVisible($request->input('id'), ($request->input('visible') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}

10
app/Http/Controllers/Admin/Shop/TariffController.php
View File

@@ -2,19 +2,19 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\PriceListsDataTable;
use App\Datatables\Shop\TariffsDataTable;
use App\Repositories\Shop\SaleChannels;
use App\Repositories\Shop\Tariffs;
use App\Repositories\Shop\TariffUnities;
use App\Datatables\Shop\TariffsDataTable;
use App\Datatables\Shop\PriceListsDataTable;
use Illuminate\Http\Request;
class TariffController extends Controller
{
public function autocomplete(Request $request, $str = false)
{
$str = $str ? $str : $request->input('q');
return response()->json(Tariffs::autocomplete($str));
}
@@ -38,6 +38,7 @@ class TariffController extends Controller
public function show($id)
{
$data['tariff'] = Tariffs::getFull($id);
return view('Admin.Shop.Tariffs.view', $data);
}
@@ -57,6 +58,7 @@ class TariffController extends Controller
public function store(Request $request)
{
$ret = Tariffs::store($request->all());
return redirect()->route('Admin.Shop.Tariffs.index');
}

12
app/Http/Controllers/Admin/Shop/TariffUnityController.php
View File

@@ -2,13 +2,10 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\Packages;
use App\Repositories\Shop\TariffUnities;
use App\Datatables\Shop\TariffUnitiesDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\TariffUnities;
use Illuminate\Http\Request;
class TariffUnityController extends Controller
{
@@ -25,18 +22,21 @@ class TariffUnityController extends Controller
public function store(Request $request)
{
$ret = TariffUnities::store($request->all());
return redirect()->route('Admin.Shop.TariffUnities.index');
}
public function show($id)
{
$data = TariffUnities::get($id);
return view('Admin.Shop.TariffUnities.view', $data);
}
public function edit($id)
{
$data['tariff_unity'] = TariffUnities::get($id)->toArray();
return view('Admin.Shop.TariffUnities.edit', $data);
}

6
app/Http/Controllers/Admin/Shop/TaxController.php
View File

@@ -2,10 +2,9 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Taxes;
use Illuminate\Http\Request;
class TaxController extends Controller
{
@@ -22,18 +21,21 @@ class TaxController extends Controller
public function store(Request $request)
{
$ret = Taxes::store($request->all());
return redirect()->route('Admin.Shop.Taxes.index');
}
public function show($id)
{
$data = Taxes::get($id);
return view('Admin.Shop.Taxes.view', $data);
}
public function edit($id)
{
$data = Taxes::get($id);
return view('Admin.Shop.Taxes.edit', $data);
}

12
app/Http/Controllers/Admin/Shop/UnityController.php
View File

@@ -2,13 +2,10 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\Packages;
use App\Repositories\Shop\Unities;
use App\Datatables\Shop\UnitiesDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Unities;
use Illuminate\Http\Request;
class UnityController extends Controller
{
@@ -30,18 +27,21 @@ class UnityController extends Controller
public function store(Request $request)
{
$ret = Unities::store($request->all());
return redirect()->route('Admin.Shop.Unities.index');
}
public function show($id)
{
$data = Unities::get($id);
return view('Admin.Shop.Unities.view', $data);
}
public function edit($id)
{
$data['unity'] = Unities::get($id)->toArray();
return view('Admin.Shop.Unities.edit', $data);
}

11
app/Http/Controllers/Admin/Shop/VariationController.php
View File

@@ -2,19 +2,18 @@
namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\VariationsDataTable;
use App\Repositories\Shop\Packages;
use App\Repositories\Shop\Unities;
use App\Repositories\Shop\Variations;
use App\Datatables\Shop\VariationsDataTable;
use Illuminate\Http\Request;
class VariationController extends Controller
{
public function autocomplete(Request $request, $str = false)
{
$str = $str ? $str : $request->input('q');
return response()->json(Variations::autocomplete($str));
}
@@ -27,6 +26,7 @@ class VariationController extends Controller
{
$data['packages'] = Packages::getOptions();
$data['unities'] = Unities::getOptions();
return view('Admin.Shop.Variations.create', $data);
}
@@ -35,18 +35,21 @@ class VariationController extends Controller
$data['variation'] = Variations::get($id);
$data['packages'] = Packages::getOptions();
$data['unities'] = Unities::getOptions();
return view('Admin.Shop.Variations.edit', $data);
}
public function store(Request $request)
{
$ret = Variations::store($request->all());
return redirect()->route('Admin.Shop.Variations.index');
}
public function show($id)
{
$data = Variations::get($id);
return view('Admin.Shop.Variations.view', $data);
}

2
app/Http/Controllers/Shop/ArticleController.php
View File

@@ -2,9 +2,7 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\Categories;

1
app/Http/Controllers/Shop/Auth/ConfirmPasswordController.php
View File

@@ -3,7 +3,6 @@
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\ConfirmsPasswords;
class ConfirmPasswordController extends Controller

1
app/Http/Controllers/Shop/Auth/ForgotPasswordController.php
View File

@@ -3,7 +3,6 @@
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Password;

7
app/Http/Controllers/Shop/Auth/LoginController.php
View File

@@ -4,8 +4,8 @@ namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class LoginController extends Controller
{
@@ -31,14 +31,16 @@ class LoginController extends Controller
public function login(Request $request)
{
$credentials = $request->validate([
'email' => 'required|email',
'email' => 'required|email',
'password' => 'required|string',
]);
if ($this->guard()->attempt($credentials, $request->get('remember'))) {
$request->session()->regenerate();
return (back()->getTargetUrl() == route('Shop.login')) ? redirect()->intended(route('home')) : back();
}
return back()->withInput($request->only('email', 'remember'));
}
@@ -47,6 +49,7 @@ class LoginController extends Controller
$sessionKey = $this->guard()->getName();
$this->guard()->logout();
$request->session()->forget($sessionKey);
return redirect()->route('home');
}

21
app/Http/Controllers/Shop/Auth/RegisterController.php
View File

@@ -3,22 +3,14 @@
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use Carbon\Carbon;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use App\Repositories\Shop\CustomerAddresses;
use App\Repositories\Shop\Customers;
use Illuminate\Foundation\Auth\EmailVerificationRequest;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator;
use Sebastienheyd\Boilerplate\Rules\Password;
use App\Repositories\Shop\Customers;
use App\Repositories\Shop\CustomerAddresses;
use App\Models\Shop\Customer;
class RegisterController extends Controller
{
@@ -39,10 +31,10 @@ class RegisterController extends Controller
protected function validator(array $data)
{
return Validator::make($data, [
'last_name' => 'required|max:255',
'last_name' => 'required|max:255',
'first_name' => 'required|max:255',
'email' => 'required|email|max:255|unique:shop_customers,email,NULL,id,deleted_at,NULL',
'password' => ['required', 'confirmed', new Password()],
'email' => 'required|email|max:255|unique:shop_customers,email,NULL,id,deleted_at,NULL',
'password' => ['required', 'confirmed', new Password()],
]);
}
@@ -55,6 +47,7 @@ class RegisterController extends Controller
{
$user = Customers::create($data);
CustomerAddresses::add($user->id, $data);
return $user;
}
@@ -70,12 +63,14 @@ class RegisterController extends Controller
public function emailVerifyRequest(EmailVerificationRequest $request)
{
$request->fulfill();
return redirect(route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard')));
}
public function emailSendVerification(Request $request)
{
$request->user()->sendEmailVerificationNotification();
return back()->with('message', 'Verification link sent!');
}
}

3
app/Http/Controllers/Shop/Auth/ResetPasswordController.php
View File

@@ -3,11 +3,10 @@
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Password;
use Illuminate\Foundation\Auth\ResetsPasswords;
use App\Rules\Password as PasswordRules;
class ResetPasswordController extends Controller
{

BIN
app/Http/Controllers/Shop/BasketController.php
View File

Binary file not shown.

BIN
app/Http/Controllers/Shop/CategoryController.php
View File

Binary file not shown.