add shipping rules
This commit is contained in:
@@ -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]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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',
|
||||
]
|
||||
);
|
||||
|
||||
|
||||
@@ -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]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user