Update leenooks/laravel and framework updates

This commit is contained in:
Deon George
2022-06-28 21:57:55 +10:00
parent 3723d644e6
commit 464407e7ee
5 changed files with 97 additions and 110 deletions

View File

@@ -1,6 +1,6 @@
<?php
use Leenooks\Controllers\AdminController as LeenooksAdminController;
use Leenooks\Controllers\SwitchUserController;
use App\Http\Controllers\{AdminController,
Auth\LoginController,
Auth\SocialLoginController,
@@ -26,8 +26,17 @@ use App\Http\Controllers\{AdminController,
|
*/
Auth::routes();
Route::get('logout',[LoginController::class,'logout']);
// Default Setup
Auth::routes([
'login' => true,
'logout' => true,
'register' => false,
'reset' => true, // for resetting passwords
'confirm' => false, // for additional password confirmations
'verify' => false, // for email verification
]);
Route::get('logout',[LoginController::class,'logout'])
->name('logout-get');
// Account linking to OPENID host
Route::group(['middleware'=>['theme:adminlte-be']],function() {
@@ -36,66 +45,82 @@ Route::group(['middleware'=>['theme:adminlte-be']],function() {
Route::get('auth/{socialProvider}/link',[SocialLoginController::class,'link']);
Route::post('auth/{socialProvider}/linkcomplete',[SocialLoginController::class,'linkcomplete']);
});
// Return from user switch
Route::get('admin/switch/stop',[SwitchUserController::class,'switch_stop'])
->middleware('auth')
->name('switch.stop');
// Generic Image Renderer - Render images that we dont have with a generic image
Route::get('image/generic/{width}/{height}/{color}/{name?}',[MediaController::class,'image'])->name('image');
Route::get('image/generic/{width}/{height}/{color}/{name?}',[MediaController::class,'image'])
->name('image');
// Our Admin Routes - for wholesalers
Route::group(['middleware'=>['theme:adminlte-be','auth','role:wholesaler'],'prefix'=>'a'],function() {
// Site Setup
Route::match(['get','post'],'setup',[AdminController::class,'setup']);
// Product Setup
Route::match(['get'],'product',[ProductController::class,'home']);
Route::match(['get','post'],'product/details/{o?}',[ProductController::class,'details']);
Route::match(['get','post'],'product/details/{o?}',[ProductController::class,'details'])
->where('o','[0-9]+');
// Supplier Setup
// @todo Move to Supplier Controller
Route::match(['get'],'supplier',[AdminController::class,'supplier']);
Route::match(['get','post'],'supplier/details/{o?}',[AdminController::class,'supplier_addedit']);
Route::match(['get','post'],'supplier/details/{o?}',[AdminController::class,'supplier_addedit'])
->where('o','[0-9]+');
//Route::get('report/products','Wholesale\ReportController@products');
// Route::get('service/{o}','AdminHomeController@service');
// Route::post('service/{o}','AdminHomeController@service_update');
// Route::get('report/products','Wholesale\ReportController@products');
// Supplier Costs - @todo Move to supplier/cost route
Route::get('cost/{o}',[CostController::class,'home'])
->where('o','[0-9]+');
// Charges
// Charges - @todo This should probably go to resellers
Route::match(['get','post'],'charge/addedit/{o?}',[AdminController::class,'charge_addedit']);
Route::get('charge/unprocessed',[AdminController::class,'charge_unprocessed']);
// Payments
// Payments - @todo This should probably go to resellers
Route::match(['get','post'],'payment/addedit/{o?}',[AdminController::class,'pay_addedit']);
Route::get('payment/unapplied',[AdminController::class,'pay_unapplied']);
// Services
// @todo This should probably go to resellers - implement a change audit log first
Route::post('service/edit/{o}',[ServiceController::class,'update'])
->where('o','[0-9]+')
->middleware('can:update,o');
//Route::get('accounting/connect','AccountingController@connect');
->where('o','[0-9]+');
Route::get('cost/{o}',[CostController::class,'home'])
->where('o','[0-9]+')
->middleware('can:view,o');
//@deprecated
// Route::get('service/{o}','AdminHomeController@service');
// Route::post('service/{o}','AdminHomeController@service_update');
// Route::get('accounting/connect','AccountingController@connect');
});
Route::get('admin/switch/stop',[LeenooksAdminController::class,'user_switch_stop'])->name('switch.user.start')->middleware('auth');
// Our Reseller Routes
Route::group(['middleware'=>['theme:adminlte-be','auth','role:reseller'],'prefix'=>'r'],function() {
// Route::get('supplier/index','SuppliersController@index');
// Route::get('supplier/create','SuppliersController@create');
// Route::post('supplier/store','SuppliersController@store');
Route::get('switch/start/{id}',[LeenooksAdminController::class,'user_switch_start'])->name('switch.user.stop');
// Enable user switch
Route::get('switch/start/{user}',[SwitchUserController::class,'switch_start'])
->middleware('can:assume,user')
->name('switch.start');
// Reseller Reports
Route::group(['middleware'=>['theme:adminlte-be','auth','role:reseller'],'prefix'=>'report'],function() {
Route::get('domain',[ServiceController::class,'domain_list']);
Route::get('email',[ServiceController::class,'email_list']);
Route::get('hosting',[ServiceController::class,'hosting_list']);
});
// Charges on an account
// Charges
Route::get('charges/{o}',[AdminController::class,'charge_pending_account'])
->middleware('can:view,o')
->where('o','[0-9]+');
// Reseller API calls
Route::post('service_change_charges/{o}',[ServiceController::class,'service_change_charges_display'])
->where('o','[0-9]+');
//@deprecated
// Route::get('supplier/index','SuppliersController@index');
// Route::get('supplier/create','SuppliersController@create');
// Route::post('supplier/store','SuppliersController@store');
});
// Our User Routes